From 2787db6427bbb9c404b7db60094b833f9902a344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20Schwaiger?= Date: Tue, 13 Mar 2018 15:23:24 +0100 Subject: [PATCH] Clang-Format: Add namespace comments --- .clang-format | 1 + src/bindings/cpp/benchmarks/benchmark_thread.cpp | 2 +- src/bindings/cpp/examples/cpp_example_hierarchy.cpp | 2 +- src/bindings/cpp/examples/cpp_example_userexception.cpp | 4 ++-- src/bindings/cpp/include/kdbexcept.hpp | 2 +- src/bindings/cpp/include/kdbio.hpp | 2 +- src/bindings/cpp/include/kdbthread.hpp | 2 +- src/bindings/cpp/include/kdbvalue.hpp | 2 +- src/bindings/cpp/include/keyexcept.hpp | 2 +- src/bindings/cpp/include/keyio.hpp | 2 +- src/bindings/cpp/include/keysetio.hpp | 2 +- src/bindings/cpp/tests/testcpp_ksget.cpp | 2 +- src/bindings/intercept/env/src/getenv.cpp | 2 +- src/bindings/intercept/env/tests/main.cpp | 2 +- src/include/kdbtypes.h | 2 +- src/libs/tools/include/backend.hpp | 4 ++-- src/libs/tools/include/backendbuilder.hpp | 4 ++-- src/libs/tools/include/backendparser.hpp | 6 +++--- src/libs/tools/include/backends.hpp | 4 ++-- src/libs/tools/include/helper/comparison.hpp | 6 +++--- src/libs/tools/include/helper/keyhelper.hpp | 6 +++--- src/libs/tools/include/merging/automergeconfiguration.hpp | 6 +++--- src/libs/tools/include/merging/automergestrategy.hpp | 6 +++--- .../tools/include/merging/importmergeconfiguration.hpp | 6 +++--- .../tools/include/merging/interactivemergestrategy.hpp | 6 +++--- src/libs/tools/include/merging/mergeconfiguration.hpp | 6 +++--- src/libs/tools/include/merging/mergeconflict.hpp | 6 +++--- src/libs/tools/include/merging/mergeconflictstrategy.hpp | 6 +++--- src/libs/tools/include/merging/mergeresult.hpp | 6 +++--- src/libs/tools/include/merging/mergetask.hpp | 6 +++--- src/libs/tools/include/merging/mergingkdb.hpp | 6 +++--- src/libs/tools/include/merging/metamergestrategy.hpp | 6 +++--- src/libs/tools/include/merging/newkeystrategy.hpp | 6 +++--- .../tools/include/merging/onesidemergeconfiguration.hpp | 6 +++--- src/libs/tools/include/merging/onesidestrategy.hpp | 6 +++--- src/libs/tools/include/merging/onesidevaluestrategy.hpp | 6 +++--- .../tools/include/merging/overwritemergeconfiguration.hpp | 6 +++--- src/libs/tools/include/merging/threewaymerge.hpp | 6 +++--- src/libs/tools/include/modules.hpp | 4 ++-- src/libs/tools/include/plugin.hpp | 4 ++-- src/libs/tools/include/plugindatabase.hpp | 4 ++-- src/libs/tools/include/plugins.hpp | 4 ++-- src/libs/tools/include/pluginspec.hpp | 4 ++-- src/libs/tools/include/specreader.hpp | 4 ++-- src/libs/tools/include/toolexcept.hpp | 4 ++-- src/libs/tools/src/backend.cpp | 8 ++++---- src/libs/tools/src/backendbuilder.cpp | 6 +++--- src/libs/tools/src/backendparser.cpp | 6 +++--- src/libs/tools/src/backends.cpp | 4 ++-- src/libs/tools/src/helper/comparison.cpp | 6 +++--- src/libs/tools/src/helper/keyhelper.cpp | 6 +++--- src/libs/tools/src/merging/automergeconfiguration.cpp | 6 +++--- src/libs/tools/src/merging/automergestrategy.cpp | 6 +++--- src/libs/tools/src/merging/importmergeconfiguration.cpp | 6 +++--- src/libs/tools/src/merging/interactivemergestrategy.cpp | 6 +++--- src/libs/tools/src/merging/mergeconflictstrategy.cpp | 6 +++--- src/libs/tools/src/merging/mergeresult.cpp | 6 +++--- src/libs/tools/src/merging/mergingkdb.cpp | 6 +++--- src/libs/tools/src/merging/metamergestrategy.cpp | 6 +++--- src/libs/tools/src/merging/newkeystrategy.cpp | 6 +++--- src/libs/tools/src/merging/onesidemergeconfiguration.cpp | 6 +++--- src/libs/tools/src/merging/onesidestrategy.cpp | 6 +++--- src/libs/tools/src/merging/onesidevaluestrategy.cpp | 6 +++--- .../tools/src/merging/overwritemergeconfiguration.cpp | 6 +++--- src/libs/tools/src/merging/threewaymerge.cpp | 6 +++--- src/libs/tools/src/modules.cpp | 4 ++-- src/libs/tools/src/plugin.cpp | 4 ++-- src/libs/tools/src/plugindatabase.cpp | 6 +++--- src/libs/tools/src/plugins.cpp | 6 +++--- src/libs/tools/src/pluginspec.cpp | 4 ++-- src/libs/tools/src/specreader.cpp | 6 +++--- src/plugins/simplespeclang/simplespeclang.cpp | 2 +- src/plugins/tcl/action.cpp | 2 +- src/plugins/tcl/tcl.hpp | 2 +- src/plugins/type/types.cpp | 2 +- src/plugins/xerces/util.hpp | 2 +- src/tools/kdb/cmdline.hpp | 2 +- src/tools/kdb/coloredkdbio.hpp | 2 +- src/tools/kdb/cp.cpp | 2 +- src/tools/kdb/get.cpp | 2 +- src/tools/kdb/globalmount.cpp | 2 +- src/tools/kdb/globalmount.hpp | 2 +- src/tools/kdb/mount.hpp | 2 +- src/tools/kdb/specmount.hpp | 2 +- src/tools/qt-gui/src/guisettings.cpp | 2 +- src/tools/qt-gui/src/treeviewmodel.cpp | 2 +- .../rest-backend/benchmarks/benchmark_kdbrest_elektra.cpp | 4 ++-- .../rest-backend/benchmarks/benchmark_kdbrest_mysql.cpp | 4 ++-- src/tools/rest-backend/benchmarks/testdata.cpp | 4 ++-- src/tools/rest-backend/benchmarks/testdata.hpp | 4 ++-- src/tools/rest-backend/benchmarks/timer.hpp | 4 ++-- src/tools/rest-backend/config.cpp | 2 +- src/tools/rest-backend/crypto.cpp | 4 ++-- tests/gtest-framework/gtest/gtest-elektra.h | 2 +- 94 files changed, 200 insertions(+), 199 deletions(-) diff --git a/.clang-format b/.clang-format index 2b071e0da36..4680fcaa0c2 100644 --- a/.clang-format +++ b/.clang-format @@ -33,6 +33,7 @@ ContinuationIndentWidth: 8 Cpp11BracedListStyle: false DerivePointerAlignment: false DisableFormat: false +FixNamespaceComments: true IndentCaseLabels: false IndentWidth: 8 IndentWrappedFunctionNames: false diff --git a/src/bindings/cpp/benchmarks/benchmark_thread.cpp b/src/bindings/cpp/benchmarks/benchmark_thread.cpp index 3ce8ae220b5..1cf8b4174a9 100644 --- a/src/bindings/cpp/benchmarks/benchmark_thread.cpp +++ b/src/bindings/cpp/benchmarks/benchmark_thread.cpp @@ -78,7 +78,7 @@ class Environment : public ThreadBoolean ThreadString profile; ThreadInteger bm; }; -} +} // namespace kdb // benchmarking diff --git a/src/bindings/cpp/examples/cpp_example_hierarchy.cpp b/src/bindings/cpp/examples/cpp_example_hierarchy.cpp index 0fc467ff17a..e8f4ab8a7c3 100644 --- a/src/bindings/cpp/examples/cpp_example_hierarchy.cpp +++ b/src/bindings/cpp/examples/cpp_example_hierarchy.cpp @@ -243,7 +243,7 @@ class KeyHierarchy KeySet & m_keyset; }; -} +} // namespace kdb /** diff --git a/src/bindings/cpp/examples/cpp_example_userexception.cpp b/src/bindings/cpp/examples/cpp_example_userexception.cpp index e3edc94c7e3..3b83a573019 100644 --- a/src/bindings/cpp/examples/cpp_example_userexception.cpp +++ b/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 @@ -124,7 +124,7 @@ class KDBException : public Exception private: Key m_key; }; -} +} // namespace kdb #include diff --git a/src/bindings/cpp/include/kdbexcept.hpp b/src/bindings/cpp/include/kdbexcept.hpp index b0a80e58898..e7fc6a4c9ab 100644 --- a/src/bindings/cpp/include/kdbexcept.hpp +++ b/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 diff --git a/src/bindings/cpp/include/kdbio.hpp b/src/bindings/cpp/include/kdbio.hpp index e74b8cf9911..05226114d73 100644 --- a/src/bindings/cpp/include/kdbio.hpp +++ b/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 diff --git a/src/bindings/cpp/include/kdbthread.hpp b/src/bindings/cpp/include/kdbthread.hpp index 1da4ffccc20..3ee8aac0478 100644 --- a/src/bindings/cpp/include/kdbthread.hpp +++ b/src/bindings/cpp/include/kdbthread.hpp @@ -458,6 +458,6 @@ using ThreadValue = Value, PolicySetter1, Poli typedef ThreadValue ThreadInteger; typedef ThreadValue ThreadBoolean; typedef ThreadValue ThreadString; -} +} // namespace kdb #endif diff --git a/src/bindings/cpp/include/kdbvalue.hpp b/src/bindings/cpp/include/kdbvalue.hpp index 4d7f865216d..cc5717c4070 100644 --- a/src/bindings/cpp/include/kdbvalue.hpp +++ b/src/bindings/cpp/include/kdbvalue.hpp @@ -807,6 +807,6 @@ std::ostream & operator<< (std::ostream & os, os << static_cast (v); return os; } -} +} // namespace kdb #endif diff --git a/src/bindings/cpp/include/keyexcept.hpp b/src/bindings/cpp/include/keyexcept.hpp index 71c24f37a3e..ec19aa2d2ed 100644 --- a/src/bindings/cpp/include/keyexcept.hpp +++ b/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 diff --git a/src/bindings/cpp/include/keyio.hpp b/src/bindings/cpp/include/keyio.hpp index 3f559f838ed..aa0167ee8c3 100644 --- a/src/bindings/cpp/include/keyio.hpp +++ b/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 diff --git a/src/bindings/cpp/include/keysetio.hpp b/src/bindings/cpp/include/keysetio.hpp index 556869f7869..022ed9bee08 100644 --- a/src/bindings/cpp/include/keysetio.hpp +++ b/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 diff --git a/src/bindings/cpp/tests/testcpp_ksget.cpp b/src/bindings/cpp/tests/testcpp_ksget.cpp index 1381545ad83..5f8541b86d8 100644 --- a/src/bindings/cpp/tests/testcpp_ksget.cpp +++ b/src/bindings/cpp/tests/testcpp_ksget.cpp @@ -74,7 +74,7 @@ struct KeySetTypeWrapper return Point (x.get (), y.get ()); } }; -} +} // namespace kdb TEST (ks, getOwnType) { diff --git a/src/bindings/intercept/env/src/getenv.cpp b/src/bindings/intercept/env/src/getenv.cpp index 3593b698676..bf02b6bdf80 100644 --- a/src/bindings/intercept/env/src/getenv.cpp +++ b/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 diff --git a/src/bindings/intercept/env/tests/main.cpp b/src/bindings/intercept/env/tests/main.cpp index 2266209d200..1dd557ff7fe 100644 --- a/src/bindings/intercept/env/tests/main.cpp +++ b/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) { diff --git a/src/include/kdbtypes.h b/src/include/kdbtypes.h index 024bca8e260..ad107626595 100644 --- a/src/include/kdbtypes.h +++ b/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++ diff --git a/src/libs/tools/include/backend.hpp b/src/libs/tools/include/backend.hpp index 518e3d4d998..dbdc7bd04ce 100644 --- a/src/libs/tools/include/backend.hpp +++ b/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 diff --git a/src/libs/tools/include/backendbuilder.hpp b/src/libs/tools/include/backendbuilder.hpp index 9b942549686..4aa30822749 100644 --- a/src/libs/tools/include/backendbuilder.hpp +++ b/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 diff --git a/src/libs/tools/include/backendparser.hpp b/src/libs/tools/include/backendparser.hpp index 607974a38fc..6776d064160 100644 --- a/src/libs/tools/include/backendparser.hpp +++ b/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 diff --git a/src/libs/tools/include/backends.hpp b/src/libs/tools/include/backends.hpp index 9fe5a7c67fc..fd6deaffd69 100644 --- a/src/libs/tools/include/backends.hpp +++ b/src/libs/tools/include/backends.hpp @@ -50,7 +50,7 @@ class Backends static const char * mountpointsPath; }; -} -} +} // namespace tools +} // namespace kdb #endif diff --git a/src/libs/tools/include/helper/comparison.hpp b/src/libs/tools/include/helper/comparison.hpp index 8f51b2fe03b..704ca6da83f 100644 --- a/src/libs/tools/include/helper/comparison.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/helper/keyhelper.hpp b/src/libs/tools/include/helper/keyhelper.hpp index b121a1c65ed..4a5858221e2 100644 --- a/src/libs/tools/include/helper/keyhelper.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/automergeconfiguration.hpp b/src/libs/tools/include/merging/automergeconfiguration.hpp index 53c4cc96c4a..6c4cb8559e3 100644 --- a/src/libs/tools/include/merging/automergeconfiguration.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/automergestrategy.hpp b/src/libs/tools/include/merging/automergestrategy.hpp index 8b616531591..5bacfb68e8d 100644 --- a/src/libs/tools/include/merging/automergestrategy.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/importmergeconfiguration.hpp b/src/libs/tools/include/merging/importmergeconfiguration.hpp index b1b3afb7d99..5491e60e484 100644 --- a/src/libs/tools/include/merging/importmergeconfiguration.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/interactivemergestrategy.hpp b/src/libs/tools/include/merging/interactivemergestrategy.hpp index 4f2d822874e..1956a53ddcd 100644 --- a/src/libs/tools/include/merging/interactivemergestrategy.hpp +++ b/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 diff --git a/src/libs/tools/include/merging/mergeconfiguration.hpp b/src/libs/tools/include/merging/mergeconfiguration.hpp index f318091ecb7..a4831e87ea8 100644 --- a/src/libs/tools/include/merging/mergeconfiguration.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/mergeconflict.hpp b/src/libs/tools/include/merging/mergeconflict.hpp index 85474163dc1..529fb7a6170 100644 --- a/src/libs/tools/include/merging/mergeconflict.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/mergeconflictstrategy.hpp b/src/libs/tools/include/merging/mergeconflictstrategy.hpp index b520cfe90d8..abd07d53afd 100644 --- a/src/libs/tools/include/merging/mergeconflictstrategy.hpp +++ b/src/libs/tools/include/merging/mergeconflictstrategy.hpp @@ -38,8 +38,8 @@ class MergeConflictStrategy }; typedef std::unique_ptr MergeConflictStrategyPtr; -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb #endif /* MERGECONFLICTSTRATEGY_HPP_ */ diff --git a/src/libs/tools/include/merging/mergeresult.hpp b/src/libs/tools/include/merging/mergeresult.hpp index b5471b93868..f8536a0c534 100644 --- a/src/libs/tools/include/merging/mergeresult.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/mergetask.hpp b/src/libs/tools/include/merging/mergetask.hpp index 512e4853121..7b04a91d8ec 100644 --- a/src/libs/tools/include/merging/mergetask.hpp +++ b/src/libs/tools/include/merging/mergetask.hpp @@ -91,8 +91,8 @@ class MergeTask mergeRoot); } }; -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb #endif /* MERGETASK_HPP_ */ diff --git a/src/libs/tools/include/merging/mergingkdb.hpp b/src/libs/tools/include/merging/mergingkdb.hpp index 53e7aa55e77..861dee57f91 100644 --- a/src/libs/tools/include/merging/mergingkdb.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/metamergestrategy.hpp b/src/libs/tools/include/merging/metamergestrategy.hpp index eb506b59f81..09d756ca6ac 100644 --- a/src/libs/tools/include/merging/metamergestrategy.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/newkeystrategy.hpp b/src/libs/tools/include/merging/newkeystrategy.hpp index 5693769e9fd..36a67d96fe0 100644 --- a/src/libs/tools/include/merging/newkeystrategy.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/onesidemergeconfiguration.hpp b/src/libs/tools/include/merging/onesidemergeconfiguration.hpp index 1d2f0444df3..a5c4910e84a 100644 --- a/src/libs/tools/include/merging/onesidemergeconfiguration.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/onesidestrategy.hpp b/src/libs/tools/include/merging/onesidestrategy.hpp index 31ea96eeb4d..0bac0405707 100644 --- a/src/libs/tools/include/merging/onesidestrategy.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/onesidevaluestrategy.hpp b/src/libs/tools/include/merging/onesidevaluestrategy.hpp index ba671948569..deb715a6bbb 100644 --- a/src/libs/tools/include/merging/onesidevaluestrategy.hpp +++ b/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_ */ diff --git a/src/libs/tools/include/merging/overwritemergeconfiguration.hpp b/src/libs/tools/include/merging/overwritemergeconfiguration.hpp index 11790558fee..406667eaf62 100644 --- a/src/libs/tools/include/merging/overwritemergeconfiguration.hpp +++ b/src/libs/tools/include/merging/overwritemergeconfiguration.hpp @@ -38,8 +38,8 @@ class OverwriteMergeConfiguration : public AutoMergeConfiguration } virtual void configureMerger (ThreeWayMerge & merger) override; }; -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb #endif /* OVERWRITEMERGECONFIGURATION_HPP_ */ diff --git a/src/libs/tools/include/merging/threewaymerge.hpp b/src/libs/tools/include/merging/threewaymerge.hpp index 0df6ff433ad..0357950c25a 100644 --- a/src/libs/tools/include/merging/threewaymerge.hpp +++ b/src/libs/tools/include/merging/threewaymerge.hpp @@ -73,8 +73,8 @@ class ThreeWayMerge std::vector strategies; void detectConflicts (const MergeTask & task, MergeResult & mergeResult, bool reverseConflictMeta); }; -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb #endif /* THREEWAYMERGE_HPP_ */ diff --git a/src/libs/tools/include/modules.hpp b/src/libs/tools/include/modules.hpp index e0cca060faf..4cbc9eef974 100644 --- a/src/libs/tools/include/modules.hpp +++ b/src/libs/tools/include/modules.hpp @@ -47,7 +47,7 @@ class Modules private: KeySet modules; }; -} -} +} // namespace tools +} // namespace kdb #endif diff --git a/src/libs/tools/include/plugin.hpp b/src/libs/tools/include/plugin.hpp index d41083ea04b..3734b09cf84 100644 --- a/src/libs/tools/include/plugin.hpp +++ b/src/libs/tools/include/plugin.hpp @@ -213,7 +213,7 @@ class Plugin }; typedef std::unique_ptr PluginPtr; -} -} +} // namespace tools +} // namespace kdb #endif diff --git a/src/libs/tools/include/plugindatabase.hpp b/src/libs/tools/include/plugindatabase.hpp index e3876e5e11f..3b6268ef593 100644 --- a/src/libs/tools/include/plugindatabase.hpp +++ b/src/libs/tools/include/plugindatabase.hpp @@ -332,7 +332,7 @@ class MockPluginDatabase : public ModulesPluginDatabase typedef std::shared_ptr PluginDatabasePtr; -} -} +} // namespace tools +} // namespace kdb #endif diff --git a/src/libs/tools/include/plugins.hpp b/src/libs/tools/include/plugins.hpp index c3f9cdd8821..d454968f36d 100644 --- a/src/libs/tools/include/plugins.hpp +++ b/src/libs/tools/include/plugins.hpp @@ -129,7 +129,7 @@ class ErrorPlugins : private Plugins void serialise (kdb::Key & baseKey, kdb::KeySet & ret); }; -} -} +} // namespace tools +} // namespace kdb #endif diff --git a/src/libs/tools/include/pluginspec.hpp b/src/libs/tools/include/pluginspec.hpp index b88ad059a8c..51e32290c3a 100644 --- a/src/libs/tools/include/pluginspec.hpp +++ b/src/libs/tools/include/pluginspec.hpp @@ -109,7 +109,7 @@ bool operator!= (PluginSpec const & self, PluginSpec const & other); typedef std::vector PluginSpecVector; std::ostream & operator<< (std::ostream & os, PluginSpec const & spec); -} -} +} // namespace tools +} // namespace kdb #endif diff --git a/src/libs/tools/include/specreader.hpp b/src/libs/tools/include/specreader.hpp index f0a1d19e993..8bd3d9b4a84 100644 --- a/src/libs/tools/include/specreader.hpp +++ b/src/libs/tools/include/specreader.hpp @@ -82,7 +82,7 @@ class SpecReader */ void readSpecification (KeySet const & ks); }; -} -} +} // namespace tools +} // namespace kdb #endif diff --git a/src/libs/tools/include/toolexcept.hpp b/src/libs/tools/include/toolexcept.hpp index 1fbfc3e7099..e9f65a931cf 100644 --- a/src/libs/tools/include/toolexcept.hpp +++ b/src/libs/tools/include/toolexcept.hpp @@ -453,7 +453,7 @@ struct VersionInfoMismatch : public PluginCheckException return "Version info does not match with library!"; } }; -} -} +} // namespace tools +} // namespace kdb #endif diff --git a/src/libs/tools/src/backend.cpp b/src/libs/tools/src/backend.cpp index 6609d71365c..dd66a640216 100644 --- a/src/libs/tools/src/backend.cpp +++ b/src/libs/tools/src/backend.cpp @@ -482,7 +482,7 @@ void append (std::string placement, std::string & where, std::string checkPlacem } } } -} +} // namespace struct Placements { @@ -533,7 +533,7 @@ void serializeConf (kdb::KeySet & ret, Key config, KeySet const & pluginConfig) } } } -} +} // namespace void GlobalPlugins::serialize (kdb::KeySet & ret) { @@ -644,5 +644,5 @@ void ImportExportBackend::exportToFile (KeySet const & cks, Key const & parentKe } } } -} -} +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/backendbuilder.cpp b/src/libs/tools/src/backendbuilder.cpp index b6ad3441654..63532646c6b 100644 --- a/src/libs/tools/src/backendbuilder.cpp +++ b/src/libs/tools/src/backendbuilder.cpp @@ -310,7 +310,7 @@ TEST(Backend, x) EXPECT_EQ(removeArray("should/_20/abc/__204"), "should/_20/abc/__204"); } */ -} +} // namespace /** * @brief resolve all needs that were not resolved by adding plugins. @@ -601,5 +601,5 @@ void MountBackendBuilder::serialize (kdb::KeySet & ret) mbi->useConfigFile (configfile); mbi->serialize (ret); } -} -} +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/backendparser.cpp b/src/libs/tools/src/backendparser.cpp index 1cfbeff05da..b79af7abffd 100644 --- a/src/libs/tools/src/backendparser.cpp +++ b/src/libs/tools/src/backendparser.cpp @@ -160,6 +160,6 @@ void fixArguments (PluginSpecVector & arguments) } } } -} -} -} +} // namespace detail +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/backends.cpp b/src/libs/tools/src/backends.cpp index a7475a01588..10bb7c9d668 100644 --- a/src/libs/tools/src/backends.cpp +++ b/src/libs/tools/src/backends.cpp @@ -155,5 +155,5 @@ std::string Backends::getBasePath (std::string mp) * @brief Below this path is the mountConf */ const char * Backends::mountpointsPath = "system/elektra/mountpoints"; -} -} +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/helper/comparison.cpp b/src/libs/tools/src/helper/comparison.cpp index 5d00bcab129..5ca88b720dc 100644 --- a/src/libs/tools/src/helper/comparison.cpp +++ b/src/libs/tools/src/helper/comparison.cpp @@ -63,6 +63,6 @@ bool keyMetaEqual (Key & k1, Key & k2) return true; } -} -} -} +} // namespace helper +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/helper/keyhelper.cpp b/src/libs/tools/src/helper/keyhelper.cpp index d4113c48a03..d8bf0d2136f 100644 --- a/src/libs/tools/src/helper/keyhelper.cpp +++ b/src/libs/tools/src/helper/keyhelper.cpp @@ -93,6 +93,6 @@ Key commonKeyName (Key key1, Key key2) } return ret; } -} -} -} +} // namespace helper +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/automergeconfiguration.cpp b/src/libs/tools/src/merging/automergeconfiguration.cpp index 0c48661dac1..b78453d0a2b 100644 --- a/src/libs/tools/src/merging/automergeconfiguration.cpp +++ b/src/libs/tools/src/merging/automergeconfiguration.cpp @@ -29,6 +29,6 @@ void AutoMergeConfiguration::configureMerger (ThreeWayMerge & merger) allocatedStrategies.push_back (autoMergeStrategy); merger.addConflictStrategy (autoMergeStrategy); } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/automergestrategy.cpp b/src/libs/tools/src/merging/automergestrategy.cpp index 929ce6f366e..11c92b71d51 100644 --- a/src/libs/tools/src/merging/automergestrategy.cpp +++ b/src/libs/tools/src/merging/automergestrategy.cpp @@ -68,6 +68,6 @@ void AutoMergeStrategy::resolveConflict (const MergeTask & task, Key & conflictK break; } } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/importmergeconfiguration.cpp b/src/libs/tools/src/merging/importmergeconfiguration.cpp index 4b8bac32404..bf7b05a855a 100644 --- a/src/libs/tools/src/merging/importmergeconfiguration.cpp +++ b/src/libs/tools/src/merging/importmergeconfiguration.cpp @@ -34,6 +34,6 @@ void ImportMergeConfiguration::configureMerger (ThreeWayMerge & merger) allocatedStrategies.push_back (oneSideValueStrategy); merger.addConflictStrategy (oneSideValueStrategy); } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/interactivemergestrategy.cpp b/src/libs/tools/src/merging/interactivemergestrategy.cpp index c4092bf356d..18396b8c8f8 100644 --- a/src/libs/tools/src/merging/interactivemergestrategy.cpp +++ b/src/libs/tools/src/merging/interactivemergestrategy.cpp @@ -105,6 +105,6 @@ void InteractiveMergeStrategy::resolveConflict (const MergeTask & task, Key & co strategy.resolveConflict (task, conflictKey, result); outputStream << "Key merged..." << endl; } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/mergeconflictstrategy.cpp b/src/libs/tools/src/merging/mergeconflictstrategy.cpp index 6f69478e29d..4ec117a2310 100644 --- a/src/libs/tools/src/merging/mergeconflictstrategy.cpp +++ b/src/libs/tools/src/merging/mergeconflictstrategy.cpp @@ -56,6 +56,6 @@ void MergeConflictStrategy::copyKeyValue (const Key & source, Key & destination) } } } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/mergeresult.cpp b/src/libs/tools/src/merging/mergeresult.cpp index 7b547e2766f..c90ff0b0ac7 100644 --- a/src/libs/tools/src/merging/mergeresult.cpp +++ b/src/libs/tools/src/merging/mergeresult.cpp @@ -69,6 +69,6 @@ void MergeResult::resolveConflict (Key & key) conflictSet.lookup (key, KDB_O_POP); resolvedKeys++; } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/mergingkdb.cpp b/src/libs/tools/src/merging/mergingkdb.cpp index 6b37e73d7a2..75c39ad2d45 100644 --- a/src/libs/tools/src/merging/mergingkdb.cpp +++ b/src/libs/tools/src/merging/mergingkdb.cpp @@ -90,6 +90,6 @@ int MergingKDB::synchronize (KeySet & returned, Key & parentKey, ThreeWayMerge & } } } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/metamergestrategy.cpp b/src/libs/tools/src/merging/metamergestrategy.cpp index 6fa31cee4a1..792f3b04ad4 100644 --- a/src/libs/tools/src/merging/metamergestrategy.cpp +++ b/src/libs/tools/src/merging/metamergestrategy.cpp @@ -90,6 +90,6 @@ void MetaMergeStrategy::resolveConflict (const MergeTask & task, Key & conflictK } } } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/newkeystrategy.cpp b/src/libs/tools/src/merging/newkeystrategy.cpp index 34a037103a6..e94dd184c1f 100644 --- a/src/libs/tools/src/merging/newkeystrategy.cpp +++ b/src/libs/tools/src/merging/newkeystrategy.cpp @@ -58,6 +58,6 @@ void NewKeyStrategy::resolveConflict (const MergeTask & task, Key & conflictKey, break; } } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/onesidemergeconfiguration.cpp b/src/libs/tools/src/merging/onesidemergeconfiguration.cpp index 40ce5ef2b58..51f333f3b0a 100644 --- a/src/libs/tools/src/merging/onesidemergeconfiguration.cpp +++ b/src/libs/tools/src/merging/onesidemergeconfiguration.cpp @@ -25,6 +25,6 @@ void OneSideMergeConfiguration::configureMerger (ThreeWayMerge & merger) allocatedStrategies.push_back (oneSideStrategy); merger.addConflictStrategy (oneSideStrategy); } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/onesidestrategy.cpp b/src/libs/tools/src/merging/onesidestrategy.cpp index b6196e3d293..d0d80535381 100644 --- a/src/libs/tools/src/merging/onesidestrategy.cpp +++ b/src/libs/tools/src/merging/onesidestrategy.cpp @@ -56,6 +56,6 @@ void OneSideStrategy::resolveConflict (const MergeTask & task, Key & conflictKey result.removeMergeKey (conflictKey); } } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/onesidevaluestrategy.cpp b/src/libs/tools/src/merging/onesidevaluestrategy.cpp index d7527b46724..6c5eb9537b2 100644 --- a/src/libs/tools/src/merging/onesidevaluestrategy.cpp +++ b/src/libs/tools/src/merging/onesidevaluestrategy.cpp @@ -63,6 +63,6 @@ void OneSideValueStrategy::resolveConflict (const MergeTask & task, Key & confli } } } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/overwritemergeconfiguration.cpp b/src/libs/tools/src/merging/overwritemergeconfiguration.cpp index 1b38730700b..70cac480ddc 100644 --- a/src/libs/tools/src/merging/overwritemergeconfiguration.cpp +++ b/src/libs/tools/src/merging/overwritemergeconfiguration.cpp @@ -29,6 +29,6 @@ void OverwriteMergeConfiguration::configureMerger (ThreeWayMerge & merger) allocatedStrategies.push_back (oneSideStrategy); merger.addConflictStrategy (oneSideStrategy); } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/merging/threewaymerge.cpp b/src/libs/tools/src/merging/threewaymerge.cpp index 88642f47f86..03f03eb2776 100644 --- a/src/libs/tools/src/merging/threewaymerge.cpp +++ b/src/libs/tools/src/merging/threewaymerge.cpp @@ -204,6 +204,6 @@ MergeResult ThreeWayMerge::mergeKeySet (const KeySet & base, const KeySet & ours return merged; } -} -} -} +} // namespace merging +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/modules.cpp b/src/libs/tools/src/modules.cpp index 2f2ee861625..e202ada3866 100644 --- a/src/libs/tools/src/modules.cpp +++ b/src/libs/tools/src/modules.cpp @@ -52,5 +52,5 @@ PluginPtr Modules::load (PluginSpec const & spec) return plugin; } -} -} +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/plugin.cpp b/src/libs/tools/src/plugin.cpp index 63d4e6e103f..b6d8747a242 100644 --- a/src/libs/tools/src/plugin.cpp +++ b/src/libs/tools/src/plugin.cpp @@ -452,5 +452,5 @@ std::string Plugin::refname () return std::string ("#") + spec.getRefName (); } } -} -} +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/plugindatabase.cpp b/src/libs/tools/src/plugindatabase.cpp index 61bf7aa2af8..24cbe91d4f6 100644 --- a/src/libs/tools/src/plugindatabase.cpp +++ b/src/libs/tools/src/plugindatabase.cpp @@ -122,7 +122,7 @@ bool hasProvides (PluginDatabase const & pd, std::string which) } return false; } -} +} // namespace // TODO: directly use data from CONTRACT.ini @@ -632,5 +632,5 @@ void MockPluginDatabase::setCheckconfFunction (const MockPluginDatabase::checkCo { checkconf = newCheckconf; } -} -} +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/plugins.cpp b/src/libs/tools/src/plugins.cpp index 36cf9c5c924..e680a891df9 100644 --- a/src/libs/tools/src/plugins.cpp +++ b/src/libs/tools/src/plugins.cpp @@ -415,7 +415,7 @@ void serializeConfig (std::string name, KeySet const & ks, KeySet & ret) if (k.getNamespace () == "user") ret.append (kdb::tools::helper::rebaseKey (k, oldParent, newParent)); } } -} +} // namespace void ErrorPlugins::serialise (Key & baseKey, KeySet & ret) @@ -469,5 +469,5 @@ void SetPlugins::serialise (Key & baseKey, KeySet & ret) if (fr) serializeConfig (name, plugins[i]->getConfig (), ret); } } -} -} +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/pluginspec.cpp b/src/libs/tools/src/pluginspec.cpp index feb4b84f637..778e0ca8b38 100644 --- a/src/libs/tools/src/pluginspec.cpp +++ b/src/libs/tools/src/pluginspec.cpp @@ -255,5 +255,5 @@ std::ostream & operator<< (std::ostream & os, PluginSpec const & spec) os << "name: " << spec.getName () << " refname: " << spec.getRefName () << " configsize: " << spec.getConfig ().size (); return os; } -} -} +} // namespace tools +} // namespace kdb diff --git a/src/libs/tools/src/specreader.cpp b/src/libs/tools/src/specreader.cpp index cd160bb5708..870ed10c7c8 100644 --- a/src/libs/tools/src/specreader.cpp +++ b/src/libs/tools/src/specreader.cpp @@ -86,7 +86,7 @@ bool isToBeIgnored (std::string const & name) name == "mountpoint" || startsWith (name, "config"); } -} +} // namespace void SpecMountpointReader::processKey (Key const & ck) { @@ -186,5 +186,5 @@ void SpecReader::readSpecification (KeySet const & cks) } } } -} -} +} // namespace tools +} // namespace kdb diff --git a/src/plugins/simplespeclang/simplespeclang.cpp b/src/plugins/simplespeclang/simplespeclang.cpp index 897e569ce53..8e1f3a91a2d 100644 --- a/src/plugins/simplespeclang/simplespeclang.cpp +++ b/src/plugins/simplespeclang/simplespeclang.cpp @@ -165,7 +165,7 @@ int unserialise (std::istream & is, ckdb::Key * errorKey, ckdb::KeySet * ks, Plu return 1; } -} +} // namespace extern "C" { diff --git a/src/plugins/tcl/action.cpp b/src/plugins/tcl/action.cpp index 047b382632e..ce335833413 100644 --- a/src/plugins/tcl/action.cpp +++ b/src/plugins/tcl/action.cpp @@ -65,4 +65,4 @@ void unserialise (istream & in, KeySet & input) } } -} // end namepace elektra +} // namespace elektra diff --git a/src/plugins/tcl/tcl.hpp b/src/plugins/tcl/tcl.hpp index e242fb9aa42..1003f43ce96 100644 --- a/src/plugins/tcl/tcl.hpp +++ b/src/plugins/tcl/tcl.hpp @@ -20,7 +20,7 @@ namespace elektra void serialise (std::ostream & os, kdb::KeySet & output); void unserialise (std::istream & os, kdb::KeySet & output); -} +} // namespace elektra extern "C" { diff --git a/src/plugins/type/types.cpp b/src/plugins/type/types.cpp index 63378d875c6..6c4aea5d2cb 100644 --- a/src/plugins/type/types.cpp +++ b/src/plugins/type/types.cpp @@ -15,4 +15,4 @@ namespace elektra Type::~Type () { } -} +} // namespace elektra diff --git a/src/plugins/xerces/util.hpp b/src/plugins/xerces/util.hpp index b0ba5b627b3..cdbea0f8a32 100644 --- a/src/plugins/xerces/util.hpp +++ b/src/plugins/xerces/util.hpp @@ -87,7 +87,7 @@ class XercesPluginException : public std::exception private: std::string msg; }; -} +} // namespace xerces #define ELEKTRA_XERCES_ORIGINAL_ROOT_NAME "xerces/rootname" diff --git a/src/tools/kdb/cmdline.hpp b/src/tools/kdb/cmdline.hpp index 4ecac43dbcb..72416bf2b79 100644 --- a/src/tools/kdb/cmdline.hpp +++ b/src/tools/kdb/cmdline.hpp @@ -31,7 +31,7 @@ namespace kdb { class Key; class KeySet; -} +} // namespace kdb class Cmdline { diff --git a/src/tools/kdb/coloredkdbio.hpp b/src/tools/kdb/coloredkdbio.hpp index fba266d353f..211c2bfda03 100644 --- a/src/tools/kdb/coloredkdbio.hpp +++ b/src/tools/kdb/coloredkdbio.hpp @@ -110,6 +110,6 @@ inline std::ostream & printWarnings (std::ostream & os, kdb::Key const & error) return os; } -} +} // namespace kdb #endif diff --git a/src/tools/kdb/cp.cpp b/src/tools/kdb/cp.cpp index 6d1cebdb190..913eab2e38a 100644 --- a/src/tools/kdb/cp.cpp +++ b/src/tools/kdb/cp.cpp @@ -37,7 +37,7 @@ void copySingleKey (Cmdline const & cl, Key const & rk, KeySet & tmpConf, KeySet } newConf.append (rk); } -} +} // namespace int CpCommand::execute (Cmdline const & cl) { diff --git a/src/tools/kdb/get.cpp b/src/tools/kdb/get.cpp index e29c9bdd1dc..89f3d39a87d 100644 --- a/src/tools/kdb/get.cpp +++ b/src/tools/kdb/get.cpp @@ -72,7 +72,7 @@ std::string getCascadingName (std::string name) if (name.find ('/') == std::string::npos) return "/"; return name.substr (name.find ('/')); } -} +} // namespace ckdb::Key * printTrace (ELEKTRA_UNUSED ckdb::KeySet * ks, ckdb::Key * key, ckdb::Key * found, option_t options) { diff --git a/src/tools/kdb/globalmount.cpp b/src/tools/kdb/globalmount.cpp index 597d3bffea3..f2cf41fdf95 100644 --- a/src/tools/kdb/globalmount.cpp +++ b/src/tools/kdb/globalmount.cpp @@ -91,7 +91,7 @@ void removePlugins (std::vector & plugins, std::string globalPlugin } } } -} +} // namespace void GlobalMountCommand::buildBackend (Cmdline const & cl) { diff --git a/src/tools/kdb/globalmount.hpp b/src/tools/kdb/globalmount.hpp index 0c02a841eac..df65a33c00d 100644 --- a/src/tools/kdb/globalmount.hpp +++ b/src/tools/kdb/globalmount.hpp @@ -19,7 +19,7 @@ namespace tools { class MountBackendInterface; } -} +} // namespace kdb class GlobalMountCommand : public MountBaseCommand { diff --git a/src/tools/kdb/mount.hpp b/src/tools/kdb/mount.hpp index fe1933ef156..576b302156c 100644 --- a/src/tools/kdb/mount.hpp +++ b/src/tools/kdb/mount.hpp @@ -19,7 +19,7 @@ namespace tools { class MountBackendInterface; } -} +} // namespace kdb class MountCommand : public MountBaseCommand { diff --git a/src/tools/kdb/specmount.hpp b/src/tools/kdb/specmount.hpp index 18425d38d0b..fa72031b853 100644 --- a/src/tools/kdb/specmount.hpp +++ b/src/tools/kdb/specmount.hpp @@ -19,7 +19,7 @@ namespace tools { class MountBackendInterface; } -} +} // namespace kdb class SpecMountCommand : public MountBaseCommand { diff --git a/src/tools/qt-gui/src/guisettings.cpp b/src/tools/qt-gui/src/guisettings.cpp index 4d8ba1896c2..a7df8593df7 100644 --- a/src/tools/qt-gui/src/guisettings.cpp +++ b/src/tools/qt-gui/src/guisettings.cpp @@ -26,7 +26,7 @@ inline QColor Key::get () const QColor c (str.c_str ()); return c; } -} +} // namespace kdb void GUISettings::setDefaults () { diff --git a/src/tools/qt-gui/src/treeviewmodel.cpp b/src/tools/qt-gui/src/treeviewmodel.cpp index 1b1de6baaae..159ae6c96eb 100644 --- a/src/tools/qt-gui/src/treeviewmodel.cpp +++ b/src/tools/qt-gui/src/treeviewmodel.cpp @@ -610,7 +610,7 @@ void printKeys (KeySet const & theirs, KeySet const & base, KeySet const & ours) } } #endif -} +} // namespace QStringList getConflicts (KeySet const & conflictSet) { diff --git a/src/tools/rest-backend/benchmarks/benchmark_kdbrest_elektra.cpp b/src/tools/rest-backend/benchmarks/benchmark_kdbrest_elektra.cpp index ac38fc4f792..9448e1c24a1 100644 --- a/src/tools/rest-backend/benchmarks/benchmark_kdbrest_elektra.cpp +++ b/src/tools/rest-backend/benchmarks/benchmark_kdbrest_elektra.cpp @@ -382,8 +382,8 @@ void benchmarkInsertData (int numUsers, int numEntriesPerUser, int numTagsPerEnt std::cout << std::endl; } -} -} +} // namespace benchmark +} // namespace kdbrest void printUsage (char * argv[]) diff --git a/src/tools/rest-backend/benchmarks/benchmark_kdbrest_mysql.cpp b/src/tools/rest-backend/benchmarks/benchmark_kdbrest_mysql.cpp index b739fc7392f..5cf5f978d5b 100644 --- a/src/tools/rest-backend/benchmarks/benchmark_kdbrest_mysql.cpp +++ b/src/tools/rest-backend/benchmarks/benchmark_kdbrest_mysql.cpp @@ -560,8 +560,8 @@ void benchmarkInsertData (sql::Connection * con, int numUsers, int numEntriesPer std::cout << std::endl; } -} -} +} // namespace benchmark +} // namespace kdbrest void printUsage (char * argv[]) diff --git a/src/tools/rest-backend/benchmarks/testdata.cpp b/src/tools/rest-backend/benchmarks/testdata.cpp index 41e07b6e50d..07cd602902e 100644 --- a/src/tools/rest-backend/benchmarks/testdata.cpp +++ b/src/tools/rest-backend/benchmarks/testdata.cpp @@ -92,5 +92,5 @@ std::vector createTestUsers (int num) return result; } -} -} +} // namespace benchmark +} // namespace kdbrest diff --git a/src/tools/rest-backend/benchmarks/testdata.hpp b/src/tools/rest-backend/benchmarks/testdata.hpp index 33216bbdcc9..ddec80e28c8 100644 --- a/src/tools/rest-backend/benchmarks/testdata.hpp +++ b/src/tools/rest-backend/benchmarks/testdata.hpp @@ -22,7 +22,7 @@ namespace benchmark std::vector createTestEntries (model::User user, int num, int numTags); std::vector createTestUsers (int num); -} -} +} // namespace benchmark +} // namespace kdbrest #endif diff --git a/src/tools/rest-backend/benchmarks/timer.hpp b/src/tools/rest-backend/benchmarks/timer.hpp index cd127daaef5..ab5a3e063c5 100644 --- a/src/tools/rest-backend/benchmarks/timer.hpp +++ b/src/tools/rest-backend/benchmarks/timer.hpp @@ -111,7 +111,7 @@ class Timer std::chrono::high_resolution_clock::time_point m_start; std::chrono::high_resolution_clock::time_point m_end; }; -} -} +} // namespace benchmark +} // namespace kdbrest #endif diff --git a/src/tools/rest-backend/config.cpp b/src/tools/rest-backend/config.cpp index 3a690762308..f74b8956d93 100644 --- a/src/tools/rest-backend/config.cpp +++ b/src/tools/rest-backend/config.cpp @@ -87,4 +87,4 @@ bool Config::initializeConfiguration (const cppcms::json::value & cfg, const std return !error; } -} +} // namespace kdbrest diff --git a/src/tools/rest-backend/crypto.cpp b/src/tools/rest-backend/crypto.cpp index c03e9a49545..7cc4134e571 100644 --- a/src/tools/rest-backend/crypto.cpp +++ b/src/tools/rest-backend/crypto.cpp @@ -58,5 +58,5 @@ bool sha256_encrypt (const std::string & input, std::string & output) return true; } -} -} +} // namespace crypto +} // namespace kdbrest diff --git a/tests/gtest-framework/gtest/gtest-elektra.h b/tests/gtest-framework/gtest/gtest-elektra.h index 4de5fb08c41..28dd7837181 100644 --- a/tests/gtest-framework/gtest/gtest-elektra.h +++ b/tests/gtest-framework/gtest/gtest-elektra.h @@ -178,4 +178,4 @@ void outputGTest (kdb::KeySet tocheck, std::string name) << "\") << \"string of element in keyset wrong\";" << std::endl; } } -} +} // namespace testing