updated application startup

application/main.cpp

@@ -43,9 +43,8 @@ int main(int argc, char *argv[])
         cout << "Unable to parse arguments. " << ex.what() << "\nSee --help for available commands." << endl;
     }
     // set meta info for application
-    SET_QT_APPLICATION_INFO;
     if(qtConfigArgs.areQtGuiArgsPresent()) {
-        return QtGui::runWidgetsGui(argc, argv);
+        return QtGui::runWidgetsGui(argc, argv, qtConfigArgs);
     }
     return 0;
 }

gui/initiate.cpp

@@ -2,6 +2,7 @@
 #include "settings.h"
 #include "mainwindow.h"
 
+#include <qtutilities/resources/qtconfigarguments.h>
 #include <qtutilities/resources/resources.h>
 
 #if defined(GUI_QTWIDGETS)
@@ -11,24 +12,28 @@
 #endif
 
 using namespace std;
+using namespace ApplicationUtilities;
 
 namespace QtGui {
 
-int runWidgetsGui(int argc, char *argv[])
+int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs)
 {
 #ifdef GUI_QTWIDGETS
-        QApplication a(argc, argv);
+    SET_QT_APPLICATION_INFO;
-        QtUtilitiesResources::init();
+    QApplication a(argc, argv);
-        Theme::setup();
+    // load resources needed by classes of qtutilities
-        QtGui::restoreSettings();
+    QtUtilitiesResources::init();
-        QtGui::MainWindow w;
+    // apply settings specified via command line args
-        w.show();
+    qtConfigArgs.applySettings();
-        int r = a.exec();
+    QtGui::restoreSettings();
-        QtGui::saveSettings();
+    QtGui::MainWindow w;
-        return r;
+    w.show();
+    int r = a.exec();
+    QtGui::saveSettings();
+    return r;
 #else
-        cout << "Application has not been build with Qt widgets GUI support." << endl;
+    cout << "Application has not been build with Qt widgets GUI support." << endl;
-        return 0;
+    return 0;
 #endif
 }
 

gui/initiate.h

@@ -1,9 +1,13 @@
 #ifndef QTGUI_INIT_H
 #define QTGUI_INIT_H
 
+namespace ApplicationUtilities {
+class QtConfigArguments;
+}
+
 namespace QtGui {
 
-int runWidgetsGui(int argc, char *argv[]);
+int runWidgetsGui(int argc, char *argv[], const ApplicationUtilities::QtConfigArguments &qtConfigArgs);
 
 }
 

network/optiondata.h

@@ -10,9 +10,7 @@
 #include <sstream>
 #include <limits>
 
-QT_BEGIN_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QIODevice)
-class QIODevice;
-QT_END_NAMESPACE
 
 namespace Network {
 
@@ -42,6 +40,8 @@ public:
     PermissionStatus ignoreSslErrorsPermission() const;
 
 private:
+    void chuckOutputDevice();
+
     QString m_name;
     QUrl m_url;
     size_t m_redirectsTo;
@@ -60,7 +60,6 @@ private:
     PermissionStatus m_appendPermission;
     PermissionStatus m_redirectPermission;
     PermissionStatus m_ignoreSslErrorsPermission;
-    void chuckOutputDevice();
 };
 
 /*!