Merge pull request #4178 from uklotzde/mixxxmainwindow

Houskeeping for MixxxMainWindow

src/mixxxmainwindow.cpp

@@ -3,24 +3,16 @@
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QGLFormat>
-#include <QGuiApplication>
-#include <QInputMethod>
-#include <QLocale>
-#include <QScreen>
-#include <QStandardPaths>
 #include <QUrl>
 #include <QtDebug>
 
 #include "defs_urls.h"
 #include "dialog/dlgabout.h"
 #include "dialog/dlgdevelopertools.h"
 #include "dialog/dlgkeywheel.h"
-#include "effects/builtin/builtinbackend.h"
 #include "effects/effectsmanager.h"
-#include "engine/enginemaster.h"
 #include "moc_mixxxmainwindow.cpp"
 #include "preferences/constants.h"
-#include "preferences/dialog/dlgprefeq.h"
 #include "preferences/dialog/dlgpreferences.h"
 #ifdef __LILV__
 #include "effects/lv2/lv2backend.h"
@@ -29,11 +21,9 @@
 #include "broadcast/broadcastmanager.h"
 #endif
 #include "control/controlindicatortimer.h"
-#include "control/controlpushbutton.h"
 #include "controllers/controllermanager.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "database/mixxxdb.h"
-#include "library/coverartcache.h"
 #include "library/library.h"
 #include "library/library_preferences.h"
 #ifdef __ENGINEPRIME__
@@ -46,20 +36,17 @@
 #include "preferences/settingsmanager.h"
 #include "recording/recordingmanager.h"
 #include "skin/legacy/launchimage.h"
-#include "skin/legacy/legacyskinparser.h"
 #include "skin/skinloader.h"
 #include "soundio/soundmanager.h"
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
-#include "util/db/dbconnectionpooled.h"
 #include "util/debug.h"
 #include "util/experiment.h"
 #include "util/font.h"
 #include "util/logger.h"
 #include "util/math.h"
 #include "util/sandbox.h"
 #include "util/screensaver.h"
-#include "util/statsmanager.h"
 #include "util/time.h"
 #include "util/timer.h"
 #include "util/translations.h"
@@ -75,19 +62,15 @@
 #include "vinylcontrol/vinylcontrolmanager.h"
 #endif
 
-#ifdef __MODPLUG__
-#include "preferences/dialog/dlgprefmodplug.h"
-#endif
-
 #if defined(Q_OS_LINUX)
 #include <X11/Xlib.h>
 #include <X11/Xlibint.h>
-
-#include <QtX11Extras/QX11Info>
 // Xlibint.h predates C++ and defines macros which conflict
 // with references to std::max and std::min
 #undef max
 #undef min
+
+#include <QtX11Extras/QX11Info>
 #endif
 
 MixxxMainWindow::MixxxMainWindow(std::shared_ptr<mixxx::CoreServices> pCoreServices)
@@ -97,10 +80,6 @@ MixxxMainWindow::MixxxMainWindow(std::shared_ptr<mixxx::CoreServices> pCoreServi
           m_pGuiTick(nullptr),
           m_pDeveloperToolsDlg(nullptr),
           m_pPrefDlg(nullptr),
-          m_pKeywheel(nullptr),
-#ifdef __ENGINEPRIME__
-          m_pLibraryExporter(nullptr),
-#endif
           m_toolTipsCfg(mixxx::TooltipsPreference::TOOLTIPS_ON) {
     DEBUG_ASSERT(pCoreServices);
     // These depend on the settings

src/mixxxmainwindow.h

@@ -1,45 +1,36 @@
 #pragma once
 
 #include <QMainWindow>
-#include <QSharedPointer>
 #include <QString>
 #include <memory>
 
 #include "coreservices.h"
 #include "preferences/configobject.h"
 #include "preferences/constants.h"
-#include "preferences/usersettings.h"
 #include "soundio/sounddeviceerror.h"
 #include "track/track_decl.h"
-#include "util/cmdlineargs.h"
-#include "util/db/dbconnectionpool.h"
 #include "util/parented_ptr.h"
-#include "util/timer.h"
 
-class ChannelHandleFactory;
-class ControlPushButton;
 class DlgDeveloperTools;
 class DlgPreferences;
 class DlgKeywheel;
-class EngineMaster;
 class GuiTick;
 class LaunchImage;
-class Library;
 class VisualsManager;
 class WMainMenuBar;
 
 namespace mixxx {
+
 namespace skin {
 class SkinLoader;
 }
-} // namespace mixxx
 
 #ifdef __ENGINEPRIME__
-namespace mixxx {
 class LibraryExporter;
-} // namespace mixxx
 #endif
 
+} // namespace mixxx
+
 /// This Class is the base class for Mixxx.
 /// It sets up the main window providing a menubar.
 /// For the main view, an instance of class MixxxView is