Merge pull request #4173 from Holzhaus/mixxxmainwindow-remove-app-dep…

…endency MixxxMainWindow: Remove QApplication dependency
mixxxdj · Aug 4, 2021 · 21f8839 · 21f8839
2 parents fa1b0fd + 12c9c87
commit 21f8839
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -27,7 +27,8 @@ int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
 
     CmdlineArgs::Instance().parseForUserFeedback();
 
-    MixxxMainWindow mainWindow(pApp, pCoreServices);
+    MixxxMainWindow mainWindow(pCoreServices);
+    pApp->processEvents();
     pApp->installEventFilter(&mainWindow);
 
     QObject::connect(pCoreServices.get(),

diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
@@ -90,8 +90,7 @@
 #undef min
 #endif
 
-MixxxMainWindow::MixxxMainWindow(
-        QApplication* pApp, std::shared_ptr<mixxx::CoreServices> pCoreServices)
+MixxxMainWindow::MixxxMainWindow(std::shared_ptr<mixxx::CoreServices> pCoreServices)
         : m_pCoreServices(pCoreServices),
           m_pCentralWidget(nullptr),
           m_pLaunchImage(nullptr),
@@ -103,7 +102,6 @@ MixxxMainWindow::MixxxMainWindow(
           m_pLibraryExporter(nullptr),
 #endif
           m_toolTipsCfg(mixxx::TooltipsPreference::TOOLTIPS_ON) {
-    DEBUG_ASSERT(pApp);
     DEBUG_ASSERT(pCoreServices);
     // These depend on the settings
     createMenuBar();
@@ -118,7 +116,6 @@ MixxxMainWindow::MixxxMainWindow(
     setCentralWidget(m_pCentralWidget);
 
     show();
-    pApp->processEvents();
 
     m_pGuiTick = new GuiTick();
     m_pVisualsManager = new VisualsManager();

diff --git a/src/mixxxmainwindow.h b/src/mixxxmainwindow.h
@@ -47,7 +47,7 @@ class LibraryExporter;
 class MixxxMainWindow : public QMainWindow {
     Q_OBJECT
   public:
-    MixxxMainWindow(QApplication* app, std::shared_ptr<mixxx::CoreServices> pCoreServices);
+    MixxxMainWindow(std::shared_ptr<mixxx::CoreServices> pCoreServices);
     ~MixxxMainWindow() override;
 
     /// Initialize main window after creation. Should only be called once.