Commit a3cff85e authored by David Edmundson's avatar David Edmundson

Remove Qt module declarations in includes

Summary:
Test Plan: Compiles

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D13359
parent 60c34b14
......@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../main.h"
// Qt
#include <QtTest/QtTest>
#include <QtTest>
namespace KWayland
{
......
......@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "mock_udev.h"
#include "../../libinput/context.h"
#include "../../udev.h"
#include <QtTest/QtTest>
#include <QtTest>
Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg)
using namespace KWin;
......
......@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KSharedConfig>
#include <QtTest/QtTest>
#include <QtTest>
#include <linux/input.h>
......
......@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../libinput/device.h"
#include "../../libinput/events.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <linux/input.h>
......
......@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../libinput/device.h"
#include "../input_event.h"
#include <QtTest/QtTest>
#include <QtTest>
Q_DECLARE_METATYPE(KWin::SwitchEvent::State);
......
......@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../libinput/device.h"
#include "../../libinput/events.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <linux/input.h>
......
......@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../libinput/device.h"
#include "../../libinput/events.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <linux/input.h>
......
......@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../libinput/device.h"
#include "../../libinput/events.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <memory>
......
......@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../libinput/device.h"
#include "../../libinput/events.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <linux/input.h>
......
......@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "mock_gl.h"
#include <QtTest/QTest>
#include <QTest>
#include <kwinglplatform.h>
#include <KConfig>
......
......@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include <kwineffects.h>
#include <QtTest/QTest>
#include <QTest>
Q_DECLARE_METATYPE(KWin::WindowQuadList)
......
......@@ -17,7 +17,7 @@ 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, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include <QtTest/QtTest>
#include <QtTest>
#include <QLoggingCategory>
#include <QX11Info>
......
......@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "../abstract_opengl_context_attribute_builder.h"
#include "../egl_context_attribute_builder.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <epoxy/egl.h>
#include <kwinconfig.h>
......
......@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "clientmodel.h"
#include "../testutils.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <QX11Info>
using namespace KWin;
......
......@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "../../tabbox/tabboxconfig.h"
#include <QtTest/QtTest>
#include <QtTest>
using namespace KWin;
using namespace KWin::TabBox;
......
......@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "mock_tabboxhandler.h"
#include "clientmodel.h"
#include "../testutils.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <QX11Info>
using namespace KWin;
......
......@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KConfig>
#include <KConfigGroup>
// Qt
#include <QtTest/QtTest>
#include <QtTest>
#include <QStringList>
Q_DECLARE_METATYPE(KWin::CompositingType)
Q_DECLARE_METATYPE(KWin::LoadEffectFlag)
......
......@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../xcbutils.h"
// Qt
#include <QApplication>
#include <QtTest/QtTest>
#include <QtTest>
#include <QX11Info>
// xcb
#include <xcb/xcb.h>
......
......@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "../plugins/platforms/drm/gbm_surface.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <gbm.h>
......
......@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "../gestures.h"
#include <QtTest/QTest>
#include <QTest>
#include <QSignalSpy>
using namespace KWin;
......
......@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KConfigGroup>
#include <KPluginLoader>
// Qt
#include <QtTest/QtTest>
#include <QtTest>
#include <QStringList>
Q_DECLARE_METATYPE(KWin::CompositingType)
Q_DECLARE_METATYPE(KWin::LoadEffectFlag)
......
......@@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Frameworks
#include <KConfigGroup>
// Qt
#include <QtTest/QtTest>
#include <QtTest>
#include <QX11Info>
// xcb
#include <xcb/xcb.h>
......
......@@ -21,10 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <QMatrix4x4>
#include <QtGui/QVector2D>
#include <QVector2D>
#include <QVector3D>
#include <QtTest/QtTest>
#include <QtTest>
using namespace KWin;
......
......@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// frameworks
#include <KConfigGroup>
// Qt
#include <QtTest/QtTest>
#include <QtTest>
Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core")
......
......@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KConfigGroup>
#include <KPackage/PackageLoader>
// Qt
#include <QtTest/QtTest>
#include <QtTest>
#include <QStringList>
Q_DECLARE_METATYPE(KWin::LoadEffectFlag)
Q_DECLARE_METATYPE(KWin::LoadEffectFlags)
......
......@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KConfigGroup>
#include <QAction>
#include <QtTest/QtTest>
#include <QtTest>
namespace KWin {
......
......@@ -17,7 +17,7 @@ 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, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include <QtTest/QTest>
#include <QTest>
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusPendingReply>
......
......@@ -20,11 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <QtGui/QVector2D>
#include <QVector2D>
#include <QGraphicsRotation>
#include <QGraphicsScale>
#include <QtTest/QtTest>
#include <QtTest>
using namespace KWin;
......
......@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../xcbutils.h"
// Qt
#include <QApplication>
#include <QtTest/QtTest>
#include <QtTest>
#include <QX11Info>
#include <netwm.h>
// xcb
......
......@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../xcbutils.h"
// Qt
#include <QApplication>
#include <QtTest/QtTest>
#include <QtTest>
#include <QX11Info>
// xcb
#include <xcb/xcb.h>
......
......@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../xcbutils.h"
// Qt
#include <QApplication>
#include <QtTest/QtTest>
#include <QtTest>
#include <QX11Info>
#include <netwm.h>
// xcb
......
......@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "../xkb.h"
#include <QtTest/QtTest>
#include <QtTest>
#include <xkbcommon/xkbcommon-keysyms.h>
using namespace KWin;
......
......@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../xcbutils.h"
#include "mock_workspace.h"
// Qt
#include <QtTest/QtTest>
#include <QtTest>
// system
#include <unistd.h>
......
......@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KWIN_NIGHTCOLOR_DBUS_INTERFACE_H
#include <QObject>
#include <QtDBus/QtDBus>
#include <QtDBus>
namespace KWin
{
......
......@@ -22,8 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kconfig.h>
#include <kconfiggroup.h>
#include <QtDBus/QtDBus>
#include <QtCore/QStandardPaths>
#include <QtDBus>
#include <QStandardPaths>
#include <QDebug>
int main( int argc, char* argv[] )
......
......@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KWIN_DBUS_INTERFACE_H
#include <QObject>
#include <QtDBus/QtDBus>
#include <QtDBus>
namespace KWin
{
......
......@@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QEvent>
#include <QMouseEvent>
#include <QTimer>
#include <QtGui/QVector2D>
#include <QVector2D>
#include <QQmlContext>
#include <QQmlEngine>
#include <QQuickItem>
......
......@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "minimizeanimation.h"
#include <QTimeLine>
#include <QtGui/QVector2D>
#include <QVector2D>
namespace KWin
{
......
......@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KColorScheme>
#include <QtGui/QVector2D>
#include <QVector2D>
#include <QPainter>
namespace KWin
......
......@@ -24,11 +24,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwinxrenderutils.h>
#include <QtConcurrentRun>
#include <QDataStream>
#include <QtCore/QTemporaryFile>
#include <QtCore/QDir>
#include <QtDBus/QDBusConnection>
#include <QTemporaryFile>
#include <QDir>
#include <QDBusConnection>
#include <QVarLengthArray>
#include <QtGui/QPainter>
#include <QPainter>
#include <QMatrix4x4>
#include <xcb/xcb_image.h>
......
......@@ -23,8 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QFile>
#include <QSize>
#include <QStyle>
#include <QtCore/QStandardPaths>
#include <QtGui/QPainter>
#include <QStandardPaths>
#include <QPainter>
// KDE
#include <KConfigGroup>
#include <KSharedConfig>
......
......@@ -26,8 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QAction>
#include <QApplication>
#include <QStyle>
#include <QtGui/QVector2D>
#include <QtDBus/QDBusConnection>
#include <QVector2D>
#include <QDBusConnection>
#include <kstandardaction.h>
#include <KConfigGroup>
#include <KGlobalAccel>
......
......@@ -40,11 +40,11 @@
****************************************************************************/
#include <QtGui/QtGui>
#include <QtGui>
#include "modeltest.h"
#include <QtTest/QtTest>
#include <QtTest>
/*!
Connect to all of the models signals. Whenever anything happens recheck everything.
......
......@@ -43,9 +43,9 @@
#ifndef MODELTEST_H
#define MODELTEST_H
#include <QtCore/QObject>
#include <QtCore/QAbstractItemModel>
#include <QtCore/QStack>
#include <QObject>
#include <QAbstractItemModel>
#include <QStack>
class ModelTest : public QObject
{
......
......@@ -23,7 +23,7 @@
//Added by qt3to4:
#include <QVBoxLayout>
#include <QtDBus/QtDBus>
#include <QtDBus>
#include <KLocalizedString>
#include <kconfig.h>
......
......@@ -37,7 +37,7 @@
#include <QDebug>
#include <kcolorscheme.h>
#include <kseparator.h>
#include <QtDBus/QtDBus>
#include <QtDBus>
#include <X11/X.h>
#include <X11/Xlib.h>
......
......@@ -29,7 +29,7 @@
#include <QHBoxLayout>
#include <QFormLayout>
#include <QDesktopWidget>
#include <QtDBus/QtDBus>
#include <QtDBus>
#include <QGroupBox>
#include <KConfig>
......
......@@ -23,7 +23,7 @@
#include <QVBoxLayout>
#include <KLocalizedString>
#include <kaboutdata.h>
#include <QtDBus/QtDBus>
#include <QtDBus>
#include <QX11Info>
#include "ruleslist.h"
......
......@@ -21,7 +21,7 @@
#include <kconfig.h>
#include <KLocalizedString>
#include <kwindowsystem.h>
#include <QtDBus/QtDBus>
#include <QtDBus>
#include <QX11Info>
#include <X11/Xlib.h>
#include <fixx11h.h>
......
......@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KPackage/Package>
#include <KPackage/PackageLoader>
#include <KPluginInfo>
#include <QtDBus/QtDBus>
#include <QtDBus>
K_PLUGIN_FACTORY(KWinScreenEdgesConfigFactory, registerPlugin<KWin::KWinScreenEdgesConfig>();)
......
......@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KPackage/Package>
#include <KPackage/PackageLoader>
#include <KPluginInfo>
#include <QtDBus/QtDBus>
#include <QtDBus>
K_PLUGIN_FACTORY(KWinScreenEdgesConfigFactory, registerPlugin<KWin::KWinScreenEdgesConfig>();)
......
......@@ -23,9 +23,9 @@
#include <QFileDialog>
#include <QStringList>
#include <QStandardPaths>
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage>
#include <QtDBus/QDBusPendingCall>
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusPendingCall>
#include <KAboutData>
#include <KLocalizedString>
......
......@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QDesktopWidget>
#include <QQmlEngine>
#include <QQmlContext>
#include <QtCore/QStandardPaths>
#include <QStandardPaths>
#include <KConfigGroup>
#include <KDesktopFile>
#include <KLocalizedString>
......
......@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwin_effects_interface.h>
// Qt
#include <QtDBus/QtDBus>
#include <QtDBus>
#include <QDesktopWidget>
#include <QVBoxLayout>
#include <QDialogButtonBox>
......
......@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "thumbnailitem.h"
// Qt
#include <QtCore/QStandardPaths>
#include <QStandardPaths>
#include <QQuickWindow>
#include <QSGSimpleTextureNode>
......
......@@ -30,10 +30,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QVariant>
#include <QList>
#include <QTimeLine>
#include <QtGui/QFontMetrics>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#include <QtGui/QVector2D>
#include <QFontMetrics>
#include <QPainter>
#include <QPixmap>
#include <QVector2D>
#include <QGraphicsRotation>
#include <QGraphicsScale>
......
......@@ -31,9 +31,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QPair>
#include <QSet>
#include <QRect>
#include <QtGui/QRegion>
#include <QtGui/QVector2D>
#include <QtGui/QVector3D>
#include <QRegion>
#include <QVector2D>
#include <QVector3D>
#include <QVector>
#include <QLoggingCategory>
......
......@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QRegion>
#include <QSharedPointer>
#include <QExplicitlySharedDataPointer>
#include <QtGui/QMatrix4x4>
#include <QMatrix4x4>
#include <epoxy/gl.h>
......
......@@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <qcommandlineparser.h>
#include <QQuickWindow>
#include <QStandardPaths>
#include <QtDBus/QtDBus>
#include <QtDBus>
// system
#ifdef HAVE_UNISTD_H
......
......@@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <qpa/qplatforminputcontext.h>
#include <qpa/qplatforminputcontextfactory_p.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtCore/private/qeventdispatcher_unix_p.h>
#include <private/qeventdispatcher_unix_p.h>
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtThemeSupport/private/qgenericunixthemes_p.h>
......
......@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <xcb/xfixes.h>
#include <QDebug>
#include <QtGui/QPainter>
#include <QPainter>
#include <qmath.h>
namespace KWin
......
......@@ -53,8 +53,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QTimer>
#include <QVector>
#include <QTextStream>
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusPendingCall>
#include <QDBusInterface>
#include <QDBusPendingCall>
#include <QWidget>
namespace KWin {
......
......@@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QFile>
#include <QtScript/QScriptEngine>
#include <QtScript/QScriptValueIterator>
#include <QtCore/QStandardPaths>
#include <QStandardPaths>
typedef KWin::EffectWindow* KEffectWindowRef;
......
......@@ -36,9 +36,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KConfigGroup>
#include <KPackage/PackageLoader>
// Qt
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage>
#include <QtDBus/QDBusPendingCallWatcher>
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusPendingCallWatcher>
#include <QDebug>
#include <QFutureWatcher>
#include <QSettings>
......@@ -49,7 +49,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QQmlExpression>
#include <QtScript/QScriptEngine>
#include <QtScript/QScriptValue>
#include <QtCore/QStandardPaths>
#include <QStandardPaths>
#include <QQuickWindow>
QScriptValue kwinScriptPrint(QScriptContext *context, QScriptEngine *engine)
......
......@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QHash>
#include <QStringList>
#include <QtScript/QScriptEngineAgent>
#include <QtQml/QJSValue>
#include <QJSValue>
class QQmlComponent;