Clang-Format: Add namespace comments

.clang-format

@@ -33,6 +33,7 @@ ContinuationIndentWidth: 8
 Cpp11BracedListStyle: false
 DerivePointerAlignment: false
 DisableFormat: false
+FixNamespaceComments: true
 IndentCaseLabels: false
 IndentWidth: 8
 IndentWrappedFunctionNames: false

src/bindings/cpp/benchmarks/benchmark_thread.cpp

@@ -78,7 +78,7 @@ class Environment : public ThreadBoolean
 	ThreadString profile;
 	ThreadInteger bm;
 };
-}
+} // namespace kdb
 
 
 // benchmarking

src/bindings/cpp/examples/cpp_example_hierarchy.cpp

@@ -243,7 +243,7 @@ class KeyHierarchy
 
 	KeySet & m_keyset;
 };
-}
+} // namespace kdb
 
 
 /**

src/bindings/cpp/examples/cpp_example_userexception.cpp

@@ -97,7 +97,7 @@ class KeyTypeConversion : public KeyException
 		return "User Exception: Exception thrown by get/set";
 	}
 };
-}
+} // namespace kdb
 
 #define USER_DEFINED_EXCEPTIONS
 #include <key.hpp>
@@ -124,7 +124,7 @@ class KDBException : public Exception
 private:
 	Key m_key;
 };
-}
+} // namespace kdb
 
 
 #include <kdb.hpp>

src/bindings/cpp/include/kdbexcept.hpp

@@ -64,7 +64,7 @@ class KDBException : public Exception
 	Key m_key;
 	mutable std::string m_str;
 };
-}
+} // namespace kdb
 
 #endif
 

src/bindings/cpp/include/kdbio.hpp

@@ -93,7 +93,7 @@ inline std::ostream & printWarnings (std::ostream & os, kdb::Key const & error)
 
 	return os;
 }
-}
+} // namespace kdb
 
 #endif
 

src/bindings/cpp/include/kdbthread.hpp

@@ -458,6 +458,6 @@ using ThreadValue = Value<T, ContextPolicyIs<ThreadContext>, PolicySetter1, Poli
 typedef ThreadValue<uint32_t> ThreadInteger;
 typedef ThreadValue<bool> ThreadBoolean;
 typedef ThreadValue<std::string> ThreadString;
-}
+} // namespace kdb
 
 #endif

src/bindings/cpp/include/kdbvalue.hpp

@@ -807,6 +807,6 @@ std::ostream & operator<< (std::ostream & os,
 	os << static_cast<T> (v);
 	return os;
 }
-}
+} // namespace kdb
 
 #endif

src/bindings/cpp/include/keyexcept.hpp

@@ -81,7 +81,7 @@ class KeyInvalidName : public KeyException
 		       "or maybe you tried to change a key that is already in a KeySet.";
 	}
 };
-}
+} // namespace kdb
 
 #endif
 

src/bindings/cpp/include/keyio.hpp

@@ -80,6 +80,6 @@ inline std::istream & operator>> (std::istream & is, kdb::Key & k)
 
 	return is;
 }
-}
+} // namespace kdb
 
 #endif

src/bindings/cpp/include/keysetio.hpp

@@ -85,6 +85,6 @@ inline std::istream & operator>> (std::istream & is, kdb::KeySet & ks)
 
 	return is;
 }
-}
+} // namespace kdb
 
 #endif

src/bindings/cpp/tests/testcpp_ksget.cpp

@@ -74,7 +74,7 @@ struct KeySetTypeWrapper<Point>
 		return Point (x.get<int> (), y.get<int> ());
 	}
 };
-}
+} // namespace kdb
 
 TEST (ks, getOwnType)
 {

src/bindings/intercept/env/src/getenv.cpp

@@ -746,4 +746,4 @@ extern "C" char * secure_getenv (const char * name) // throw ()
 	elektraUnlockMutex ();
 	return ret;
 }
-}
+} // namespace ckdb

src/bindings/intercept/env/tests/main.cpp

@@ -15,7 +15,7 @@ extern ckdb::KeySet * elektraDocu;
 extern std::ostream * elektraLog;
 }
 void elektraSingleCleanup ();
-}
+} // namespace ckdb
 
 int main (int argc, char ** argv)
 {

src/include/kdbtypes.h

@@ -42,7 +42,7 @@ using char_t = unsigned char;	  // default: 0
 // using wchar_t; // default: 0 wchar_t not supported!
 using boolean_t = bool;  // default: false
 using octet_t = uint8_t; // default: 0
-}
+} // namespace kdb
 #endif // for c++
 
 

src/libs/tools/include/backend.hpp

@@ -202,7 +202,7 @@ class ImportExportBackend : public PluginAdder
 	void importFromFile (KeySet & ks, Key const & parentKey) const;
 	void exportToFile (KeySet const & ks, Key const & parentKey) const;
 };
-}
-}
+} // namespace tools
+} // namespace kdb
 
 #endif

src/libs/tools/include/backendbuilder.hpp

@@ -205,7 +205,7 @@ class MountBackendBuilder : public MountBackendInterface, public BackendBuilder
 	void status (std::ostream & os) const;
 	bool validated () const;
 };
-}
-}
+} // namespace tools
+} // namespace kdb
 
 #endif

src/libs/tools/include/backendparser.hpp

@@ -36,7 +36,7 @@ namespace detail
 {
 void processArgument (PluginSpecVector & arguments, size_t & counter, std::string argument);
 void fixArguments (PluginSpecVector & arguments);
-}
+} // namespace detail
 
 /**
  * @brief Parse a complete commandline that is already tokenized in pluginname pluginconfig
@@ -60,7 +60,7 @@ PluginSpecVector parseArguments (Iterator first, Iterator last)
 	detail::fixArguments (arguments);
 	return arguments;
 }
-}
-}
+} // namespace tools
+} // namespace kdb
 
 #endif

src/libs/tools/include/backends.hpp

@@ -50,7 +50,7 @@ class Backends
 
 	static const char * mountpointsPath;
 };
-}
-}
+} // namespace tools
+} // namespace kdb
 
 #endif

src/libs/tools/include/helper/comparison.hpp

@@ -43,8 +43,8 @@ bool keyDataEqual (const Key &, const Key &);
  * @return true if the keys have equal metadata, false otherwise
  */
 bool keyMetaEqual (Key &, Key &);
-}
-}
-}
+} // namespace helper
+} // namespace tools
+} // namespace kdb
 
 #endif /* COMPARISON_HPP_ */

src/libs/tools/include/helper/keyhelper.hpp

@@ -73,8 +73,8 @@ void removeNamespace (Key & key);
  * @return the longest common name found
  */
 Key commonKeyName (Key key1, Key key2);
-}
-}
-}
+} // namespace helper
+} // namespace tools
+} // namespace kdb
 
 #endif /* KEYHELPER_HPP_ */

src/libs/tools/include/merging/automergeconfiguration.hpp

@@ -27,8 +27,8 @@ class AutoMergeConfiguration : public MergeConfiguration
 public:
 	virtual void configureMerger (ThreeWayMerge & merger) override;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* AUTOMERGECONFIGURATION_HPP_ */

src/libs/tools/include/merging/automergestrategy.hpp

@@ -33,8 +33,8 @@ class AutoMergeStrategy : public MergeConflictStrategy
 public:
 	virtual void resolveConflict (const MergeTask & task, Key & conflictKey, MergeResult & result) override;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* AUTOMERGESTRATEGY_HPP_ */

src/libs/tools/include/merging/importmergeconfiguration.hpp

@@ -30,8 +30,8 @@ class ImportMergeConfiguration : public AutoMergeConfiguration
 public:
 	virtual void configureMerger (ThreeWayMerge & merger) override;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* IMPORTMERGECONFIGURATION_HPP_ */

src/libs/tools/include/merging/interactivemergestrategy.hpp

@@ -38,8 +38,8 @@ class InteractiveMergeStrategy : public MergeConflictStrategy
 	std::istream & inputStream;
 	std::ostream & outputStream;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif

src/libs/tools/include/merging/mergeconfiguration.hpp

@@ -43,9 +43,9 @@ class MergeConfiguration
 	};
 	virtual void configureMerger (ThreeWayMerge & merger) = 0;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 
 #endif /* MERGECONFIGURATION_HPP_ */

src/libs/tools/include/merging/mergeconflict.hpp

@@ -62,8 +62,8 @@ class MergeConflictOperation
 		throw InvalidConflictOperation ("The conflict operation \"" + name + "\" is unknown");
 	}
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* MERGECONFLICT_HPP_ */

src/libs/tools/include/merging/mergeconflictstrategy.hpp

@@ -38,8 +38,8 @@ class MergeConflictStrategy
 };
 
 typedef std::unique_ptr<MergeConflictStrategy> MergeConflictStrategyPtr;
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* MERGECONFLICTSTRATEGY_HPP_ */

src/libs/tools/include/merging/mergeresult.hpp

@@ -85,8 +85,8 @@ class MergeResult
 
 	void addConflictMeta (Key & key, std::string const & who, ConflictOperation operation);
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* MERGERESULT_HPP_ */

src/libs/tools/include/merging/mergetask.hpp

@@ -91,8 +91,8 @@ class MergeTask
 				  mergeRoot);
 	}
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* MERGETASK_HPP_ */

src/libs/tools/include/merging/mergingkdb.hpp

@@ -97,9 +97,9 @@ class MergingKDBException : public KDBException
 private:
 	KeySet m_conflicts;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 
 #endif /* KDBMERGE_HPP_ */

src/libs/tools/include/merging/metamergestrategy.hpp

@@ -47,8 +47,8 @@ class MetaMergeStrategy : public MergeConflictStrategy
 private:
 	KeySet getMetaKeys (Key & key);
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* METAMERGESTRATEGY_HPP_ */

src/libs/tools/include/merging/newkeystrategy.hpp

@@ -31,8 +31,8 @@ class NewKeyStrategy : public MergeConflictStrategy
 
 	virtual void resolveConflict (const MergeTask & task, Key & conflictKey, MergeResult & result) override;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* NEWKEYSTRATEGY_HPP_ */

src/libs/tools/include/merging/onesidemergeconfiguration.hpp

@@ -37,8 +37,8 @@ class OneSideMergeConfiguration : public AutoMergeConfiguration
 	}
 	virtual void configureMerger (ThreeWayMerge & merger) override;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* ONESIDEMERGECONFIGURATION_HPP_ */

src/libs/tools/include/merging/onesidestrategy.hpp

@@ -35,8 +35,8 @@ class OneSideStrategy : public MergeConflictStrategy
 
 	virtual void resolveConflict (const MergeTask & task, Key & conflictKey, MergeResult & result) override;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* ONESIDESTRATEGY_HPP_ */

src/libs/tools/include/merging/onesidevaluestrategy.hpp

@@ -35,8 +35,8 @@ class OneSideValueStrategy : public MergeConflictStrategy
 
 	virtual void resolveConflict (const MergeTask & task, Key & conflictKey, MergeResult & result) override;
 };
-}
-}
-}
+} // namespace merging
+} // namespace tools
+} // namespace kdb
 
 #endif /* ONESIDEVALUESTRATEGY_HPP_ */