summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2013-10-30 17:35:34 -0400
committerRJ Ryan <rryan@mixxx.org>2013-10-30 17:35:34 -0400
commit898e85118b68a98e9c3b759cd413d7d6aae74445 (patch)
tree53f338c38f153137825c4237f86705d86d961f2b
parentce244c1a74acc3e66c2f959adebef059b324bf66 (diff)
Add missing includes of Qt headers to start the migration from qt4 to qt5.
-rw-r--r--src/dlgprefcontrols.cpp1
-rwxr-xr-xsrc/dlgpreferences.cpp1
-rw-r--r--src/dlgprefrecord.cpp5
-rw-r--r--src/library/autodjfeature.cpp1
-rw-r--r--src/library/baseexternallibraryfeature.cpp2
-rw-r--r--src/library/baseplaylistfeature.cpp3
-rw-r--r--src/library/cratefeature.cpp3
-rw-r--r--src/library/librarycontrol.cpp10
-rw-r--r--src/library/libraryscannerdlg.cpp8
-rw-r--r--src/library/libraryscannerdlg.h5
-rw-r--r--src/library/songdownloader.cpp8
-rw-r--r--src/library/songdownloader.h7
-rw-r--r--src/mixxx.cpp4
-rw-r--r--src/mixxxkeyboard.cpp1
-rw-r--r--src/skin/legacyskinparser.cpp13
-rw-r--r--src/skin/skinloader.cpp7
-rw-r--r--src/vinylcontrol/vinylcontrolsignalwidget.h4
-rw-r--r--src/waveform/waveform.h1
-rw-r--r--src/widget/wknob.cpp1
-rw-r--r--src/widget/wlabel.cpp2
-rw-r--r--src/widget/wlibrarysidebar.cpp1
-rw-r--r--src/widget/wnumber.cpp2
-rw-r--r--src/widget/wsearchlineedit.cpp1
-rw-r--r--src/widget/wspinny.cpp1
24 files changed, 66 insertions, 26 deletions
diff --git a/src/dlgprefcontrols.cpp b/src/dlgprefcontrols.cpp
index dca901ed33..117135bb6a 100644
--- a/src/dlgprefcontrols.cpp
+++ b/src/dlgprefcontrols.cpp
@@ -21,6 +21,7 @@
#include <QDoubleSpinBox>
#include <QWidget>
#include <QLocale>
+#include <QDesktopWidget>
#include "dlgprefcontrols.h"
#include "qcombobox.h"
diff --git a/src/dlgpreferences.cpp b/src/dlgpreferences.cpp
index 27c1a4d525..21a47c5c2f 100755
--- a/src/dlgpreferences.cpp
+++ b/src/dlgpreferences.cpp
@@ -21,6 +21,7 @@
#include <QtGui>
#include <QEvent>
#include <QScrollArea>
+#include <QDesktopWidget>
#ifdef __VINYLCONTROL__
#include "dlgprefvinyl.h"
diff --git a/src/dlgprefrecord.cpp b/src/dlgprefrecord.cpp
index 17eaecd631..bf03569326 100644
--- a/src/dlgprefrecord.cpp
+++ b/src/dlgprefrecord.cpp
@@ -17,6 +17,7 @@
#include <QtCore>
#include <QtGui>
+#include <QFileDialog>
#include "dlgprefrecord.h"
#include "recording/defs_recording.h"
@@ -216,7 +217,7 @@ void DlgPrefRecord::slotRecordPathChange() {
// This function updates/refreshes the contents of this dialog.
void DlgPrefRecord::slotUpdate() {
-
+
QString recordingsPath = m_pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "Directory"));
LineEditRecordings->setText(recordingsPath);
@@ -268,4 +269,4 @@ void DlgPrefRecord::slotChangeSplitSize() {
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "FileSize"),
ConfigValue(comboBoxSplitting->currentText()));
-} \ No newline at end of file
+}
diff --git a/src/library/autodjfeature.cpp b/src/library/autodjfeature.cpp
index 9c2aee4e78..4a872a614f 100644
--- a/src/library/autodjfeature.cpp
+++ b/src/library/autodjfeature.cpp
@@ -3,6 +3,7 @@
// Created 8/23/2009 by RJ Ryan (rryan@mit.edu)
#include <QtDebug>
+#include <QMenu>
#include "library/autodjfeature.h"
#include "library/playlisttablemodel.h"
diff --git a/src/library/baseexternallibraryfeature.cpp b/src/library/baseexternallibraryfeature.cpp
index ceb8aeccf8..db0431cf89 100644
--- a/src/library/baseexternallibraryfeature.cpp
+++ b/src/library/baseexternallibraryfeature.cpp
@@ -1,5 +1,7 @@
#include "library/baseexternallibraryfeature.h"
+#include <QMenu>
+
#include "library/basesqltablemodel.h"
BaseExternalLibraryFeature::BaseExternalLibraryFeature(QObject* pParent,
diff --git a/src/library/baseplaylistfeature.cpp b/src/library/baseplaylistfeature.cpp
index dc46fa5d9c..5c4835f552 100644
--- a/src/library/baseplaylistfeature.cpp
+++ b/src/library/baseplaylistfeature.cpp
@@ -1,5 +1,8 @@
#include "library/baseplaylistfeature.h"
+#include <QInputDialog>
+#include <QFileDialog>
+
#include "library/parser.h"
#include "library/parserm3u.h"
#include "library/parserpls.h"
diff --git a/src/library/cratefeature.cpp b/src/library/cratefeature.cpp
index 3deb37d4cf..01ad8821e3 100644
--- a/src/library/cratefeature.cpp
+++ b/src/library/cratefeature.cpp
@@ -1,9 +1,10 @@
// cratefeature.cpp
// Created 10/22/2009 by RJ Ryan (rryan@mit.edu)
+#include <QFileDialog>
#include <QInputDialog>
-#include <QMenu>
#include <QLineEdit>
+#include <QMenu>
#include "library/cratefeature.h"
#include "library/parser.h"
diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp
index de2302d2ff..7a4c6593a0 100644
--- a/src/library/librarycontrol.cpp
+++ b/src/library/librarycontrol.cpp
@@ -1,14 +1,16 @@
-#include <QDebug>
-#include <QModelIndexList>
-#include <QModelIndex>
+#include "library/librarycontrol.h"
+
+#include <QApplication>
#include <QItemSelectionModel>
+#include <QModelIndex>
+#include <QModelIndexList>
+#include <QtDebug>
#include "controlobject.h"
#include "controlpushbutton.h"
#include "playermanager.h"
#include "widget/wlibrary.h"
#include "widget/wlibrarysidebar.h"
-#include "library/librarycontrol.h"
#include "library/libraryview.h"
#include "util/container.h"
diff --git a/src/library/libraryscannerdlg.cpp b/src/library/libraryscannerdlg.cpp
index 6ee91baec7..0336be9dfd 100644
--- a/src/library/libraryscannerdlg.cpp
+++ b/src/library/libraryscannerdlg.cpp
@@ -16,10 +16,12 @@
* *
***************************************************************************/
-#include <QtCore>
+#include <QLabel>
+#include <QPushButton>
+#include <QVBoxLayout>
#include <QtDebug>
-#include <QtGui>
-#include "libraryscannerdlg.h"
+
+#include "library/libraryscannerdlg.h"
LibraryScannerDlg::LibraryScannerDlg(QWidget * parent, Qt::WindowFlags f) :
QWidget(parent, f)
diff --git a/src/library/libraryscannerdlg.h b/src/library/libraryscannerdlg.h
index cbc7df2459..730a26ca7e 100644
--- a/src/library/libraryscannerdlg.h
+++ b/src/library/libraryscannerdlg.h
@@ -21,8 +21,9 @@
#define LIBRARYSCANNERDLG_H
#include <QThread>
-#include <QtCore>
-#include <QtGui>
+#include <QWidget>
+#include <QString>
+#include <QTime>
class LibraryScannerDlg : public QWidget {
Q_OBJECT
diff --git a/src/library/songdownloader.cpp b/src/library/songdownloader.cpp
index fa472d6c33..a4e3c8db94 100644
--- a/src/library/songdownloader.cpp
+++ b/src/library/songdownloader.cpp
@@ -1,8 +1,10 @@
-#include <QtCore>
-#include <QtGui>
-
#include "library/songdownloader.h"
+#include <QApplication>
+#include <QFileInfo>
+#include <QString>
+#include <QtDebug>
+
#include "util/version.h"
#define TEMP_EXTENSION ".tmp"
diff --git a/src/library/songdownloader.h b/src/library/songdownloader.h
index cace025ddd..dbd0d6b13c 100644
--- a/src/library/songdownloader.h
+++ b/src/library/songdownloader.h
@@ -1,10 +1,13 @@
#ifndef SONGDOWNLOADER_H
#define SONGDOWNLOADER_H
-#include <QtCore>
-#include <QtNetwork>
+#include <QFile>
#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QObject>
#include <QQueue>
+#include <QUrl>
class SongDownloader : public QObject
{
diff --git a/src/mixxx.cpp b/src/mixxx.cpp
index 2f5d4d1908..832d21a79e 100644
--- a/src/mixxx.cpp
+++ b/src/mixxx.cpp
@@ -19,6 +19,10 @@
#include <QtCore>
#include <QtGui>
#include <QTranslator>
+#include <QMenu>
+#include <QMenuBar>
+#include <QFileDialog>
+#include <QDesktopWidget>
#include "mixxx.h"
diff --git a/src/mixxxkeyboard.cpp b/src/mixxxkeyboard.cpp
index 379d83cc1b..424038576f 100644
--- a/src/mixxxkeyboard.cpp
+++ b/src/mixxxkeyboard.cpp
@@ -15,6 +15,7 @@
* *
***************************************************************************/
+#include <qglobal.h>
#include <QList>
#include <QtDebug>
#include <QKeyEvent>
diff --git a/src/skin/legacyskinparser.cpp b/src/skin/legacyskinparser.cpp
index 409eaabb8e..7af604b979 100644
--- a/src/skin/legacyskinparser.cpp
+++ b/src/skin/legacyskinparser.cpp
@@ -1,14 +1,17 @@
// legacyskinparser.cpp
// Created 9/19/2010 by RJ Ryan (rryan@mit.edu)
-#include <QtGlobal>
-#include <QtDebug>
+#include "skin/legacyskinparser.h"
+
#include <QDir>
-#include <QStackedWidget>
-#include <QVBoxLayout>
-#include <QLabel>
#include <QGridLayout>
+#include <QLabel>
#include <QMutexLocker>
+#include <QSplitter>
+#include <QStackedWidget>
+#include <QVBoxLayout>
+#include <QtDebug>
+#include <QtGlobal>
#include "controlobject.h"
#include "controlobjectthreadmain.h"
diff --git a/src/skin/skinloader.cpp b/src/skin/skinloader.cpp
index bb2b8ec436..53a0e3d288 100644
--- a/src/skin/skinloader.cpp
+++ b/src/skin/skinloader.cpp
@@ -1,12 +1,15 @@
// skinloader.cpp
// Created 6/21/2010 by RJ Ryan (rryan@mit.edu)
-#include <QString>
+#include "skin/skinloader.h"
+
+#include <QApplication>
+#include <QDesktopWidget>
#include <QDir>
+#include <QString>
#include <QtDebug>
#include "vinylcontrol/vinylcontrolmanager.h"
-#include "skin/skinloader.h"
#include "skin/legacyskinparser.h"
#include "controllers/controllermanager.h"
#include "library/library.h"
diff --git a/src/vinylcontrol/vinylcontrolsignalwidget.h b/src/vinylcontrol/vinylcontrolsignalwidget.h
index b03594dbf4..702e65d43f 100644
--- a/src/vinylcontrol/vinylcontrolsignalwidget.h
+++ b/src/vinylcontrol/vinylcontrolsignalwidget.h
@@ -8,9 +8,11 @@
#ifndef VINYLCONTROLSIGNALWIDGET_H
#define VINYLCONTROLSIGNALWIDGET_H
-#include <QtGui>
+#include <QImage>
+#include <QPaintEvent>
#include <QPainter>
#include <QTimerEvent>
+#include <QWidget>
#include "vinylcontrol/vinylsignalquality.h"
diff --git a/src/waveform/waveform.h b/src/waveform/waveform.h
index 6c66a95a41..ae9cd3e1aa 100644
--- a/src/waveform/waveform.h
+++ b/src/waveform/waveform.h
@@ -1,6 +1,7 @@
#ifndef WAVEFORM_H
#define WAVEFORM_H
+#include <qglobal.h>
#include <QMutex>
#include <QByteArray>
#include <QString>
diff --git a/src/widget/wknob.cpp b/src/widget/wknob.cpp
index eb0ff3dbe5..0d6b1f9bd5 100644
--- a/src/widget/wknob.cpp
+++ b/src/widget/wknob.cpp
@@ -20,6 +20,7 @@
#include <QMouseEvent>
#include <QPainter>
#include <QPaintEvent>
+#include <QApplication>
#include "widget/wknob.h"
diff --git a/src/widget/wlabel.cpp b/src/widget/wlabel.cpp
index 0d478bec9d..147b77e3cb 100644
--- a/src/widget/wlabel.cpp
+++ b/src/widget/wlabel.cpp
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include <QVBoxLayout>
+
#include "widget/wlabel.h"
#include "widget/wskincolor.h"
diff --git a/src/widget/wlibrarysidebar.cpp b/src/widget/wlibrarysidebar.cpp
index 940a63f329..68490fb587 100644
--- a/src/widget/wlibrarysidebar.cpp
+++ b/src/widget/wlibrarysidebar.cpp
@@ -1,5 +1,6 @@
#include <QtCore>
#include <QtGui>
+#include <QHeaderView>
#include "library/sidebarmodel.h"
#include "widget/wlibrarysidebar.h"
diff --git a/src/widget/wnumber.cpp b/src/widget/wnumber.cpp
index 80e9b5fe69..f6fc182fc7 100644
--- a/src/widget/wnumber.cpp
+++ b/src/widget/wnumber.cpp
@@ -19,8 +19,8 @@
#include "wskincolor.h"
#include <math.h>
#include <qfont.h>
-//Added by qt3to4:
#include <QLabel>
+#include <QVBoxLayout>
WNumber::WNumber(QWidget * parent) : WWidget(parent)
{
diff --git a/src/widget/wsearchlineedit.cpp b/src/widget/wsearchlineedit.cpp
index 5e9f29dda8..9454fa2d47 100644
--- a/src/widget/wsearchlineedit.cpp
+++ b/src/widget/wsearchlineedit.cpp
@@ -5,6 +5,7 @@
#include <QtDebug>
#include <QStyle>
#include <QFont>
+#include <QShortcut>
WSearchLineEdit::WSearchLineEdit(ConfigObject<ConfigValue>* pConfig,
QWidget* pParent) : QLineEdit(pParent) {
diff --git a/src/widget/wspinny.cpp b/src/widget/wspinny.cpp
index 2fbaf64660..746cb69385 100644
--- a/src/widget/wspinny.cpp
+++ b/src/widget/wspinny.cpp
@@ -1,6 +1,7 @@
#include <math.h>
#include <QtDebug>
+#include <QApplication>
#include "mathstuff.h"
#include "wimagestore.h"