Removing usage of the "cc" namespace alias.

commschamp · Nov 12, 2024 · a1fe143 · a1fe143
1 parent 28c0b17
commit a1fe143
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 41 deletions.
diff --git a/app/cc_view/src/main.cpp b/app/cc_view/src/main.cpp
@@ -30,8 +30,6 @@
 #include "icon.h"
 #include "dir.h"
 
-namespace cc = cc_tools_qt;
-
 namespace
 {
 
@@ -42,14 +40,14 @@ const QString DebugOptStr("debug");
 
 void metaTypesRegisterAll()
 {
-    qRegisterMetaType<cc::GuiAppMgr::ActionPtr>();
+    qRegisterMetaType<cc_tools_qt::GuiAppMgr::ActionPtr>();
 }
 
 void initSingletons()
 {
-    static_cast<void>(cc::PluginMgrG::instanceRef());
-    static_cast<void>(cc::MsgMgrG::instanceRef());
-    static_cast<void>(cc::GuiAppMgr::instance());
+    static_cast<void>(cc_tools_qt::PluginMgrG::instanceRef());
+    static_cast<void>(cc_tools_qt::MsgMgrG::instanceRef());
+    static_cast<void>(cc_tools_qt::GuiAppMgr::instance());
 }
 
 void prepareCommandLineOptions(QCommandLineParser& parser)
@@ -99,21 +97,21 @@ int main(int argc, char *argv[])
     prepareCommandLineOptions(parser);
     parser.process(app);
 
-    cc::MainWindowWidget window;
-    window.setWindowIcon(cc::icon::appIcon());
+    cc_tools_qt::MainWindowWidget window;
+    window.setWindowIcon(cc_tools_qt::icon::appIcon());
     window.showMaximized();
 
-    auto pluginsDir = cc::getPluginsDir();
+    auto pluginsDir = cc_tools_qt::getPluginsDir();
     if (pluginsDir.isEmpty()) {
         std::cerr << "ERROR: Failed to find plugins directory!" << std::endl;
         return -1;
     }
     app.addLibraryPath(pluginsDir);
 
-    auto& pluginMgr = cc::PluginMgrG::instanceRef();
+    auto& pluginMgr = cc_tools_qt::PluginMgrG::instanceRef();
     pluginMgr.setPluginsDir(pluginsDir);
 
-    auto& guiAppMgr = cc::GuiAppMgr::instanceRef();
+    auto& guiAppMgr = cc_tools_qt::GuiAppMgr::instanceRef();
     guiAppMgr.setDebugOutputLevel(parser.value(DebugOptStr).toUInt());
     do {
         if (parser.isSet(CleanOptStr) && guiAppMgr.startClean()) {
@@ -135,7 +133,7 @@ int main(int argc, char *argv[])
         &app, &QCoreApplication::aboutToQuit,
         []()
         {
-            cc::MsgMgrG::instanceRef().deleteAllMsgs();
+            cc_tools_qt::MsgMgrG::instanceRef().deleteAllMsgs();
         });
 
     auto retval = app.exec();

diff --git a/demo/cc_plugin/DemoMessage.cpp b/demo/cc_plugin/DemoMessage.cpp
@@ -21,8 +21,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/DemoProtocol.cpp b/demo/cc_plugin/DemoProtocol.cpp
@@ -19,8 +19,6 @@
 
 #include "comms/comms.h"
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/DemoTransportMessage.cpp b/demo/cc_plugin/DemoTransportMessage.cpp
@@ -21,8 +21,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/Bitfields.cpp b/demo/cc_plugin/message/Bitfields.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/BitmaskValues.cpp b/demo/cc_plugin/message/BitmaskValues.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/Bundles.cpp b/demo/cc_plugin/message/Bundles.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/EnumValues.cpp b/demo/cc_plugin/message/EnumValues.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/FloatValues.cpp b/demo/cc_plugin/message/FloatValues.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/IntValues.cpp b/demo/cc_plugin/message/IntValues.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/Lists.cpp b/demo/cc_plugin/message/Lists.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/Optionals.cpp b/demo/cc_plugin/message/Optionals.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/Strings.cpp b/demo/cc_plugin/message/Strings.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/demo/cc_plugin/message/Variants.cpp b/demo/cc_plugin/message/Variants.cpp
@@ -19,8 +19,6 @@
 
 #include <cassert>
 
-namespace cc = cc_tools_qt;
-
 namespace demo
 {
 

diff --git a/plugin/raw_data_protocol/cc_plugin/RawDataProtocolPlugin.cpp b/plugin/raw_data_protocol/cc_plugin/RawDataProtocolPlugin.cpp
@@ -19,8 +19,6 @@
 #include "RawDataProtocolPlugin.h"
 #include "RawDataProtocol.h"
 
-namespace cc = cc_tools_qt;
-
 namespace cc_tools_qt
 {
 
@@ -42,7 +40,7 @@ RawDataProtocolPlugin::~RawDataProtocolPlugin() noexcept = default;
 
 ToolsProtocolPtr RawDataProtocolPlugin::createProtocolImpl()
 {
-    return cc::ToolsProtocolPtr(new RawDataProtocol());
+    return cc_tools_qt::ToolsProtocolPtr(new RawDataProtocol());
 }
 
 }  // namespace cc_plugin
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,6 @@ @@
     #include <cassert>
-    namespace cc = cc_tools_qt;
     namespace demo
     {
@@ Expand Down @@