Add default theme parameter to Application and use it in the tests to suppress the theme popup

Author: hackhaslam

src/app/Application.cpp

@@ -108,7 +108,11 @@ QString userAgentSystem()
 
 } // anon. namespace
 
-Application::Application(int &argc, char **argv, bool haltOnParseError)
+Application::Application(
+  int &argc,
+  char **argv,
+  bool haltOnParseError,
+  const QString &defaultTheme)
   : QApplication(argc, argv)
 {
   Q_INIT_RESOURCE(resources);
@@ -153,7 +157,8 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
   mPathspec = parser.value("filter");
 
   // Initialize theme.
-  mTheme.reset(Theme::create(parser.value("theme")));
+  QString theme = parser.value("theme");
+  mTheme.reset(Theme::create(!theme.isEmpty() ? theme : defaultTheme));
   setStyle(mTheme->style());
   setStyleSheet(mTheme->styleSheet());
 

src/app/Application.h

@@ -23,7 +23,11 @@ class Application : public QApplication
   Q_OBJECT
 
 public:
-  Application(int &argc, char **argv, bool haltOnParseError = false);
+  Application(
+    int &argc,
+    char **argv,
+    bool haltOnParseError = false,
+    const QString &defaultTheme = QString());
 
   void autoUpdate();
   bool restoreWindows();

test/Test.h

@@ -18,14 +18,10 @@
 #define TEST_MAIN(TestClass) \
 int main(int argc, char *argv[]) \
 { \
-  std::vector<const char*> new_argv(argv, argv + argc); \
-  new_argv.push_back("--theme Default"); \
-  argc += 2; \
-  argv = const_cast<char**>(new_argv.data()); \
-  Application app(argc, argv); \
+  Application app(argc, argv, false, "Default"); \
   TestClass test; \
   QTEST_SET_MAIN_SOURCE_PATH \
-  return QTest::qExec(&test, {}); \
+  return QTest::qExec(&test, app.arguments()); \
 }
 
 class RepoView;