Skip to content

Commit

Permalink
fix Ubuntu 18.04 build
Browse files Browse the repository at this point in the history
  • Loading branch information
Be-ing committed Dec 14, 2020
1 parent 60c7a53 commit af3c656
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/controllers/dlgprefcontroller.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

#include <QHash>
#include <QSortFilterProxyModel>
#include <memory>

#include "controllers/controllerinputmappingtablemodel.h"
#include "controllers/controlleroutputmappingtablemodel.h"
#include "controllers/controllerpreset.h"
#include "controllers/controllerpresetinfo.h"
#include "controllers/dlgcontrollerlearning.h"
#include "controllers/ui_dlgprefcontrollerdlg.h"
#include "preferences/usersettings.h"
#include "preferences/dlgpreferencepage.h"
#include "preferences/usersettings.h"

// Forward declarations
class Controller;
Expand Down
3 changes: 2 additions & 1 deletion src/controllers/dlgprefcontrollers.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#pragma once

#include <QTreeWidgetItem>
#include <memory>

#include "preferences/usersettings.h"
#include "controllers/ui_dlgprefcontrollersdlg.h"
#include "preferences/dlgpreferencepage.h"
#include "preferences/usersettings.h"

class DlgPreferences;
class DlgPrefController;
Expand Down
5 changes: 3 additions & 2 deletions src/preferences/dialog/dlgpreferences.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
#include <QEvent>
#include <QRect>
#include <QStringList>
#include <memory>

#include "preferences/dialog/ui_dlgpreferencesdlg.h"
#include "preferences/usersettings.h"
#include "control/controlpushbutton.h"
#include "preferences/dialog/ui_dlgpreferencesdlg.h"
#include "preferences/dlgpreferencepage.h"
#include "preferences/settingsmanager.h"
#include "preferences/usersettings.h"

class MixxxMainWindow;
class SoundManager;
Expand Down
3 changes: 2 additions & 1 deletion src/preferences/dialog/dlgprefinterface.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#pragma once

#include <QWidget>
#include <memory>

#include "preferences/constants.h"
#include "preferences/dialog/ui_dlgprefinterfacedlg.h"
#include "preferences/usersettings.h"
#include "preferences/dlgpreferencepage.h"
#include "preferences/usersettings.h"

class ControlProxy;
class ControlPotmeter;
Expand Down
2 changes: 2 additions & 0 deletions src/preferences/dialog/dlgprefsound.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include <memory>

#include "defs_urls.h"
#include "preferences/dialog/ui_dlgprefsounddlg.h"
#include "preferences/dlgpreferencepage.h"
Expand Down
1 change: 1 addition & 0 deletions src/preferences/dialog/dlgprefvinyl.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <QSpinBox>
#include <QWidget>
#include <memory>

#include "preferences/dialog/ui_dlgprefvinyldlg.h"
#include "preferences/dlgpreferencepage.h"
Expand Down
3 changes: 2 additions & 1 deletion src/preferences/dialog/dlgprefwaveform.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#pragma once

#include <QWidget>
#include <memory>

#include "preferences/dialog/ui_dlgprefwaveformdlg.h"
#include "preferences/usersettings.h"
#include "preferences/dlgpreferencepage.h"
#include "preferences/usersettings.h"

class MixxxMainWindow;
class Library;
Expand Down

0 comments on commit af3c656

Please sign in to comment.