Fix includes

Using the <QtCore> and <QtGui> includes is bad, because it introduces unnecessary slowness during
compilation; also, Qt5 moved some stuff around (e.g. from QtGui to QtWidgets).

So remove these, and add the proper #includes where needed instead.

diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp
index 510a444..e04e094 100644 (file)
--- a/src/client/execwrapper.cpp
+++ b/src/client/execwrapper.cpp
@@ -19,6 +19,7 @@
 ***************************************************************************/
 
 #include <QFile>
+#include <QTextCodec>
 
 #include "execwrapper.h"
 

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index 2439d1e..4ffeeb4 100644 (file)
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -23,6 +23,7 @@
 
 #include <QAbstractItemModel>
 #include <QDateTime>
+#include <QTimer>
 
 #include "message.h"
 #include "types.h"

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index c25fda6..d713d33 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -21,6 +21,7 @@
 #include "networkmodel.h"
 
 #include <QAbstractItemView>
+#include <QMimeData>
 #include <QTextDocument>       // for Qt::escape()
 
 #include "buffermodel.h"

diff --git a/src/common/bufferinfo.h b/src/common/bufferinfo.h
index 0953a10..63ba6a5 100644 (file)
--- a/src/common/bufferinfo.h
+++ b/src/common/bufferinfo.h
@@ -20,7 +20,6 @@
 #ifndef BUFFERINFO_H
 #define BUFFERINFO_H
 
-#include <QtCore>
 #include "types.h"
 
 class QString;

diff --git a/src/common/ignorelistmanager.cpp b/src/common/ignorelistmanager.cpp
index b4831c0..a6a4718 100644 (file)
--- a/src/common/ignorelistmanager.cpp
+++ b/src/common/ignorelistmanager.cpp
@@ -20,6 +20,7 @@
 
 #include "ignorelistmanager.h"
 
+#include <QtCore>
 #include <QDebug>
 #include <QStringList>
 #include <QRegExp>

diff --git a/src/common/message.h b/src/common/message.h
index 96ac10e..612757d 100644 (file)
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -21,7 +21,7 @@
 #ifndef MESSAGE_H_
 #define MESSAGE_H_
 
-#include <QString>
+#include <QCoreApplication>
 #include <QDateTime>
 
 #include "bufferinfo.h"

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index 9bf268b..50616e8 100644 (file)
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include <QDateTime>
+#include <QGraphicsSceneMouseEvent>
 #include <QString>
 #include <QtGui>
 

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index caf47dd..797b008 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -24,6 +24,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
 #include <QMenuBar>
+#include <QMimeData>
 #include <QPersistentModelIndex>
 
 #ifdef HAVE_KDE

diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h
index 1bb00df..ea9df69 100644 (file)
--- a/src/qtui/chatscene.h
+++ b/src/qtui/chatscene.h
@@ -27,6 +27,7 @@
 #include <QGraphicsScene>
 #include <QSet>
 #include <QTimer>
+#include <QUrl>
 
 #include "chatlinemodel.h"
 #include "messagefilter.h"

diff --git a/src/qtui/chatviewsearchcontroller.h b/src/qtui/chatviewsearchcontroller.h
index 9e3adf5..757bd22 100644 (file)
--- a/src/qtui/chatviewsearchcontroller.h
+++ b/src/qtui/chatviewsearchcontroller.h
@@ -32,7 +32,6 @@
 
 class QGraphicsItem;
 class ChatLine;
-class ChatScene;
 class SearchHighlightItem;
 
 class ChatViewSearchController : public QObject {

diff --git a/src/qtui/knotificationbackend.h b/src/qtui/knotificationbackend.h
index 8a0be28..eead0fa 100644 (file)
--- a/src/qtui/knotificationbackend.h
+++ b/src/qtui/knotificationbackend.h
@@ -21,6 +21,8 @@
 #ifndef KNOTIFICATIONBACKEND_H_
 #define KNOTIFICATIONBACKEND_H_
 
+#include <QPointer>
+
 #include "abstractnotificationbackend.h"
 #include "settingspage.h"
 #include "systemtray.h"

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 99cf0dc..1432916 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -19,6 +19,11 @@
  ***************************************************************************/
 #include "mainwin.h"
 
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QStatusBar>
+#include <QToolBar>
+
 #ifdef HAVE_KDE
 #  include <KAction>
 #  include <KActionCollection>

diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp
index 50c6413..96ae5fa 100644 (file)
--- a/src/qtui/settingsdlg.cpp
+++ b/src/qtui/settingsdlg.cpp
@@ -18,6 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QMessageBox>
+#include <QPushButton>
+
 #include "settingsdlg.h"
 
 #include "client.h"

diff --git a/src/qtui/settingsdlg.h b/src/qtui/settingsdlg.h
index 1c3cc78..b45cbcb 100644 (file)
--- a/src/qtui/settingsdlg.h
+++ b/src/qtui/settingsdlg.h
@@ -21,7 +21,8 @@
 #ifndef SETTINGSDLG_H
 #define SETTINGSDLG_H
 
-#include <QtGui>
+#include <QDialog>
+
 #include "ui_settingsdlg.h"
 
 #include "settingspage.h"

diff --git a/src/qtui/settingspagedlg.cpp b/src/qtui/settingspagedlg.cpp
index ecf1f84..0c070a8 100644 (file)
--- a/src/qtui/settingspagedlg.cpp
+++ b/src/qtui/settingspagedlg.cpp
@@ -18,6 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QMessageBox>
+#include <QPushButton>
+
 #include "settingspagedlg.h"
 
 #include "iconloader.h"

diff --git a/src/qtui/settingspagedlg.h b/src/qtui/settingspagedlg.h
index c3f1a65..73cec98 100644 (file)
--- a/src/qtui/settingspagedlg.h
+++ b/src/qtui/settingspagedlg.h
@@ -21,7 +21,8 @@
 #ifndef SETTINGSPAGEDLG_H
 #define SETTINGSPAGEDLG_H
 
-#include <QtGui>
+#include <QDialog>
+
 #include "ui_settingspagedlg.h"
 
 #include "settingspage.h"

diff --git a/src/qtui/taskbarnotificationbackend.cpp b/src/qtui/taskbarnotificationbackend.cpp
index f99706b..46e562b 100644 (file)
--- a/src/qtui/taskbarnotificationbackend.cpp
+++ b/src/qtui/taskbarnotificationbackend.cpp
@@ -1,27 +1,30 @@
 /***************************************************************************
-*   Copyright (C) 2005-09 by the Quassel Project                          *
-*   devel@quassel-irc.org                                                 *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) version 3.                                           *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QApplication>
+#include <QCheckBox>
+#include <QHBoxLayout>
+#include <QSpinBox>
 
 #include "taskbarnotificationbackend.h"
 
-#include <QtGui>
-
 #include "clientsettings.h"
 #include "iconloader.h"
 #include "mainwin.h"

diff --git a/src/qtui/verticaldock.cpp b/src/qtui/verticaldock.cpp
index f8090db..69c2eaf 100644 (file)
--- a/src/qtui/verticaldock.cpp
+++ b/src/qtui/verticaldock.cpp
@@ -20,6 +20,7 @@
 
 #include "verticaldock.h"
 
+#include <qdrawutil.h>
 #include <QLayout>
 #include <QPainter>