From: Manuel Nickschas Date: Sun, 1 Apr 2012 21:03:41 +0000 (+0200) Subject: Fix includes X-Git-Tag: 0.9-beta1~81 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=4ae8f86c1ce452582d6fe576956c7c1bc1460adf;hp=565743a41c93de874cb79fd145b22e2422bb754e Fix includes Using the and 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 510a4444..e04e0946 100644 --- a/src/client/execwrapper.cpp +++ b/src/client/execwrapper.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include +#include #include "execwrapper.h" diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h index 2439d1e0..4ffeeb42 100644 --- a/src/client/messagemodel.h +++ b/src/client/messagemodel.h @@ -23,6 +23,7 @@ #include #include +#include #include "message.h" #include "types.h" diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index c25fda61..d713d330 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -21,6 +21,7 @@ #include "networkmodel.h" #include +#include #include // for Qt::escape() #include "buffermodel.h" diff --git a/src/common/bufferinfo.h b/src/common/bufferinfo.h index 0953a10f..63ba6a52 100644 --- a/src/common/bufferinfo.h +++ b/src/common/bufferinfo.h @@ -20,7 +20,6 @@ #ifndef BUFFERINFO_H #define BUFFERINFO_H -#include #include "types.h" class QString; diff --git a/src/common/ignorelistmanager.cpp b/src/common/ignorelistmanager.cpp index b4831c07..a6a47186 100644 --- a/src/common/ignorelistmanager.cpp +++ b/src/common/ignorelistmanager.cpp @@ -20,6 +20,7 @@ #include "ignorelistmanager.h" +#include #include #include #include diff --git a/src/common/message.h b/src/common/message.h index 96ac10ea..612757d5 100644 --- a/src/common/message.h +++ b/src/common/message.h @@ -21,7 +21,7 @@ #ifndef MESSAGE_H_ #define MESSAGE_H_ -#include +#include #include #include "bufferinfo.h" diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index 9bf268b9..50616e8c 100644 --- a/src/qtui/chatline.cpp +++ b/src/qtui/chatline.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include +#include #include #include diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index caf47ddc..797b0083 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #ifdef HAVE_KDE diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h index 1bb00df6..ea9df69b 100644 --- a/src/qtui/chatscene.h +++ b/src/qtui/chatscene.h @@ -27,6 +27,7 @@ #include #include #include +#include #include "chatlinemodel.h" #include "messagefilter.h" diff --git a/src/qtui/chatviewsearchcontroller.h b/src/qtui/chatviewsearchcontroller.h index 9e3adf5b..757bd22f 100644 --- 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 8a0be288..eead0fa9 100644 --- a/src/qtui/knotificationbackend.h +++ b/src/qtui/knotificationbackend.h @@ -21,6 +21,8 @@ #ifndef KNOTIFICATIONBACKEND_H_ #define KNOTIFICATIONBACKEND_H_ +#include + #include "abstractnotificationbackend.h" #include "settingspage.h" #include "systemtray.h" diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 99cf0dce..14329168 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -19,6 +19,11 @@ ***************************************************************************/ #include "mainwin.h" +#include +#include +#include +#include + #ifdef HAVE_KDE # include # include diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp index 50c64137..96ae5fa9 100644 --- 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 +#include + #include "settingsdlg.h" #include "client.h" diff --git a/src/qtui/settingsdlg.h b/src/qtui/settingsdlg.h index 1c3cc786..b45cbcb9 100644 --- a/src/qtui/settingsdlg.h +++ b/src/qtui/settingsdlg.h @@ -21,7 +21,8 @@ #ifndef SETTINGSDLG_H #define SETTINGSDLG_H -#include +#include + #include "ui_settingsdlg.h" #include "settingspage.h" diff --git a/src/qtui/settingspagedlg.cpp b/src/qtui/settingspagedlg.cpp index ecf1f84c..0c070a81 100644 --- 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 +#include + #include "settingspagedlg.h" #include "iconloader.h" diff --git a/src/qtui/settingspagedlg.h b/src/qtui/settingspagedlg.h index c3f1a651..73cec989 100644 --- a/src/qtui/settingspagedlg.h +++ b/src/qtui/settingspagedlg.h @@ -21,7 +21,8 @@ #ifndef SETTINGSPAGEDLG_H #define SETTINGSPAGEDLG_H -#include +#include + #include "ui_settingspagedlg.h" #include "settingspage.h" diff --git a/src/qtui/taskbarnotificationbackend.cpp b/src/qtui/taskbarnotificationbackend.cpp index f99706b1..46e562b3 100644 --- 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 +#include +#include +#include #include "taskbarnotificationbackend.h" -#include - #include "clientsettings.h" #include "iconloader.h" #include "mainwin.h" diff --git a/src/qtui/verticaldock.cpp b/src/qtui/verticaldock.cpp index f8090db9..69c2eaf1 100644 --- a/src/qtui/verticaldock.cpp +++ b/src/qtui/verticaldock.cpp @@ -20,6 +20,7 @@ #include "verticaldock.h" +#include #include #include