Modernize code

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp

@@ -31,15 +31,17 @@
 
 #include <ArmarXCore/util/CPPUtility/trace.h>
 #include <ArmarXCore/core/util/StringHelpers.h>
+
 #include <IceUtil/UUID.h>
 
+
 namespace armarx
 {
     int ArmarXGuiApp::globalargc = 0;
 
 
     ArmarXGuiApp::ArmarXGuiApp(int& argc, char** argv) :
-        qApplication(NULL)
+        qApplication(nullptr)
     {
         this->argc = 0;
         this->argv = 0;
@@ -63,7 +65,7 @@ namespace armarx
     {
         if (!ArmarXManager::CheckIceConnection(communicator(), false))
         {
-            if (QMessageBox::question(NULL, "ArmarX is not running", "ArmarX is not running - do you want me to start it now?", QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes)
+            if (QMessageBox::question(nullptr, "ArmarX is not running", "ArmarX is not running - do you want me to start it now?", QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes)
             {
                 int result = startArmarX();
                 if (result != 0)
@@ -90,58 +92,60 @@ namespace armarx
         // enable Coin3D extension: transparent settings without color
         (void)coin_setenv("COIN_SEPARATE_DIFFUSE_TRANSPARENCY_OVERRIDE", "1", TRUE);
 
-        std::vector<std::string> packageNames = getDefaultPackageNames();
-        QString configToLoad;
-        if (getProperty<std::string>("GuiConfigFile").isSet())
         {
-            configToLoad = QString::fromStdString(getProperty<std::string>("GuiConfigFile").getValue());
-        }
-
-        // create top-level widget
-        mainWindow = new ArmarXMainWindow(registry, packageNames, configToLoad, getProperty<bool>("DisablePreloading").getValue());
-        connect(mainWindow, SIGNAL(closeRequest()), this, SLOT(closeRequest_sent()));
-        // parse properties
-        std::string plugins = getProperty<std::string>("LoadPlugins").getValue();
-        std::vector<std::string> pluginList = Split(plugins, ",");
-
-        std::vector<std::string>::iterator iter = pluginList.begin();
+            std::vector<std::string> packageNames = getDefaultPackageNames();
+            QString configToLoad;
+            if (getProperty<std::string>("GuiConfigFile").isSet())
+            {
+                configToLoad = QString::fromStdString(getProperty<std::string>("GuiConfigFile").getValue());
+            }
 
-        while (iter != pluginList.end())
+            // create top-level widget
+            mainWindow = new ArmarXMainWindow(registry, packageNames, configToLoad, getProperty<bool>("DisablePreloading").getValue());
+            connect(mainWindow, SIGNAL(closeRequest()), this, SLOT(closeRequest_sent()));
+        }
         {
-            if (!iter->empty())
+            // parse properties
+            std::string plugins = getProperty<std::string>("LoadPlugins").getValue();
+            std::vector<std::string> pluginList = Split(plugins, ",");
+            for (auto iter = pluginList.begin(); iter != pluginList.end(); ++iter)
             {
-                std::cout << "Loading plugin: " << iter->c_str() << std::endl;
-                mainWindow->loadPlugin(iter->c_str());
+                if (!iter->empty())
+                {
+                    std::cout << "Loading plugin: " << iter->c_str() << std::endl;
+                    mainWindow->loadPlugin(iter->c_str());
+                }
             }
-
-            iter++;
         }
-
-
         std::cout <<  "Started ArmarXGui App" << std::endl;
+
         armarxManagerTask = new RunningTask<ArmarXGuiApp>(this, &ArmarXGuiApp::runArmarXManager, "ArmarXManagerWaitThread");
         armarxManagerTask->start();
+
         mainWindow->show();
         mainWindow->appendFileToWindowTitle();
+
         ARMARX_INFO << "Now showing main window";
         int result = qApplication->exec();
 
         // exit SoQt and Qt
-        interruptCallback(0);// signal to the application it should terminate the ice connection
+        interruptCallback(0);  // signal to the application it should terminate the ice connection
 
         armarXManager->waitForShutdown();
+
+        // Shutdown.
         qApplication->quit();
         delete mainWindow;
 
         SoQt::done();
         delete qApplication;
         qApplication = 0;
+
         return result;
     }
 
     void ArmarXGuiApp::closeRequest_sent()
     {
-
     }
 
     void ArmarXGuiApp::runArmarXManager()
@@ -182,13 +186,13 @@ namespace armarx
             res = WEXITSTATUS(res);
             if (res == EXIT_FAILURE)
             {
-                QMessageBox::warning(NULL, "ArmarX Error", "Could not start MongoDB! See terminal output for more information. The GUI will now started anyway.");
+                QMessageBox::warning(nullptr, "ArmarX Error", "Could not start MongoDB! See terminal output for more information. The GUI will now started anyway.");
                 return 0;
             }
         }
         else
         {
-            QMessageBox::critical(NULL, "ArmarX Error", "Could not start ArmarX! See terminal output for more information.");
+            QMessageBox::critical(nullptr, "ArmarX Error", "Could not start ArmarX! See terminal output for more information.");
             return 1;
         }
         return 0;