Commit 02025cd8 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Change <QtGui/QDialog> style includes to <QDialog>

This is already a tiny part of preparation for Qt5, where QtGui is split
into QtGui and QtWidgets. If we use explicit module names in our includes,
we are liable to churn like this.

Since KDE applications always have all Qt modules in the include path
anyway, direct includes always work (both in Qt4 and Qt5), and since we
already used direct includes in thousands of places, this change makes
our code more consistent, too.
parent 9f35bd28
......@@ -21,9 +21,9 @@
#define KO_CHART_MODEL
#include <QtCore/QHash>
#include <QtCore/QVector>
#include <QtCore/QtPlugin>
#include <QHash>
#include <QVector>
#include <QtPlugin>
class QAbstractItemModel;
......
......@@ -23,9 +23,9 @@
#include <kdemacros.h>
#include <kdebug.h>
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtCore/QHash>
#include <QList>
#include <QString>
#include <QHash>
/**
* Base class for registry objects.
......
......@@ -22,9 +22,9 @@
#ifndef _KO_ID_H_
#define _KO_ID_H_
#include <QtCore/QString>
#include <QtCore/QMetaType>
#include <QtCore/QDebug>
#include <QString>
#include <QMetaType>
#include <QDebug>
#include <klocalizedstring.h>
......
......@@ -19,10 +19,10 @@
#ifndef __koChart_h__
#define __koChart_h__
#include <QtCore/QVariant>
#include <QtCore/QVector>
#include <QtCore/QRect>
#include <QtCore/QtPlugin>
#include <QVariant>
#include <QVector>
#include <QRect>
#include <QtPlugin>
#include <KoDocument.h>
#include "kochart_export.h"
......
......@@ -22,7 +22,7 @@
#include <KoColor.h>
#include <kis_types.h>
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_BLUR_BENCHMARK_H
#define KIS_BLUR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
#include <kis_types.h>
#include <KoColor.h>
......
......@@ -19,7 +19,7 @@
#ifndef KIS_DATAMANAGER_BENCHMARK_H
#define KIS_DATAMANAGER_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisDatamanagerBenchmark : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef _KIS_FAST_MATH_BENCHMARK_H_
#define _KIS_FAST_MATH_BENCHMARK_H_
#include <QtTest/QtTest>
#include <QtTest>
class KisFastMathBenchmark : public QObject {
Q_OBJECT
......
......@@ -22,7 +22,7 @@
#include <KoColor.h>
#include <kis_types.h>
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -22,7 +22,7 @@
#include <KoColor.h>
#include <kis_types.h>
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_HLINEITERATOR_BENCHMARK_H
#define KIS_HLINEITERATOR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_MASK_GENERATOR_BENCHMARK_H
#define KIS_MASK_GENERATOR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisMaskGeneratorBenchmark : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_PAINTER_BENCHMARK_H
#define KIS_PAINTER_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
#include <KoColor.h>
......
......@@ -19,7 +19,7 @@
#ifndef KIS_PROJECTION_BENCHMARK_H
#define KIS_PROJECTION_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
/// loads the image, computes the projection and saves it to another file
class KisProjectionBenchmark : public QObject
......
......@@ -19,7 +19,7 @@
#ifndef KIS_HLINEITERATOR_BENCHMARK_H
#define KIS_HLINEITERATOR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_HLINEITERATOR_BENCHMARK_H
#define KIS_HLINEITERATOR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_STROKE_BENCHMARK_H
#define KIS_STROKE_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
#include <kis_types.h>
#include <KoColor.h>
#include <kis_painter.h>
......
......@@ -19,7 +19,7 @@
#ifndef KIS_HLINEITERATOR_BENCHMARK_H
#define KIS_HLINEITERATOR_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
......
......@@ -16,9 +16,9 @@
*/
#include "kimageframe.h"
#include <QtGui/QStyle>
#include <QtGui/QStyleOption>
#include <QtGui/QPainter>
#include <QStyle>
#include <QStyleOption>
#include <QPainter>
KImageFrame::KImageFrame(QWidget *parent) : QFrame(parent), _w(0), _h(0)
{
......
......@@ -18,7 +18,7 @@
#ifndef KIMAGEFRAME_H
#define KIMAGEFRAME_H
#include <QtGui/QFrame>
#include <QFrame>
class KImageFrame : public QFrame
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_ACTION_RECORDER_TEST_H
#define KIS_ACTION_RECORDER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisActionRecorderTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_ADJUSTMENT_LAYER_TEST_H
#define KIS_ADJUSTMENT_LAYER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisAdjustmentLayerTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_ANNOTATION_TEST_H
#define KIS_ANNOTATION_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisAnnotationTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_ASYNC_MERGER_TEST_H
#define KIS_ASYNC_MERGER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisAsyncMergerTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_BASE_NODE_TESTER_H
#define KIS_BASE_NODE_TESTER_H
#include <QtTest/QtTest>
#include <QtTest>
class KisBaseNodeTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_BASIC_MATH_TOOLBOX_TEST_H
#define KIS_BASIC_MATH_TOOLBOX_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisBasicMathToolboxTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_BOOKMARKED_CONFIGURATION_MANAGER_TEST_H
#define KIS_BOOKMARKED_CONFIGURATION_MANAGER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisBookmarkedConfigurationManagerTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_CHANGE_PROFILE_VISITOR_TEST_H
#define KIS_CHANGE_PROFILE_VISITOR_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisChangeProfileVisitorTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_CLONE_LAYER_TEST_H
#define KIS_CLONE_LAYER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisCloneLayerTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_COLORSPACE_CONVERT_VISITOR_TEST_H
#define KIS_COLORSPACE_CONVERT_VISITOR_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisColorSpaceConvertVisitorTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_CONVOLUTION_PAINTER_TEST_H
#define KIS_CONVOLUTION_PAINTER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class QBitArray;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_COUNT_VISITOR_TESTER_H
#define KIS_COUNT_VISITOR_TESTER_H
#include <QtTest/QtTest>
#include <QtTest>
#include "kis_node.h"
......
......@@ -19,7 +19,7 @@
#ifndef __KIS_CROP_PROCESSING_VISITOR_TEST_H
#define __KIS_CROP_PROCESSING_VISITOR_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisCropProcessingVisitorTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_CS_CONVERSION_TESTER_H
#define KIS_CS_CONVERSION_TESTER_H
#include <QtTest/QtTest>
#include <QtTest>
class KisCsConversionTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef _KIS_CUBIC_CURVE_TEST_H_
#define _KIS_CUBIC_CURVE_TEST_H_
#include <QtTest/QtTest>
#include <QtTest>
#include <QPointF>
......
......@@ -19,7 +19,7 @@
#ifndef KIS_DATAMANAGER_TEST_H
#define KIS_DATAMANAGER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisDataManagerTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_LAYER_TESTER_H
#define KIS_LAYER_TESTER_H
#include <QtTest/QtTest>
#include <QtTest>
class KisEffectMaskTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FAST_MATH_TEST_H
#define KIS_FAST_MATH_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisFastMathTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILL_PAINTER_TEST_H
#define KIS_FILL_PAINTER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisFillPainterTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILTER_CONFIG_WIDGET_TEST_H
#define KIS_FILTER_CONFIG_WIDGET_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisConfigWidgetTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILTER_CONFIGURATION_TESTER_H
#define KIS_FILTER_CONFIGURATION_TESTER_H
#include <QtTest/QtTest>
#include <QtTest>
class KisFilterConfigurationTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILTER_JOB_TEST_H
#define KIS_FILTER_JOB_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisFilterJobTest : public QObject
{
......
......@@ -20,7 +20,7 @@
#ifndef KIS_FILTER_MASK_TEST_H
#define KIS_FILTER_MASK_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisFilterMaskTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILTER_PROCESSING_INFORMATION_TEST_H
#define KIS_FILTER_PROCESSING_INFORMATION_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisProcessingInformationTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILTER_REGISTRY_TEST_H
#define KIS_FILTER_REGISTRY_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisFilterRegistryTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILTER_SELECTIONS_BENCHMARK_H
#define KIS_FILTER_SELECTIONS_BENCHMARK_H
#include <QtTest/QtTest>
#include <QtTest>
#include "kis_selection.h"
#include "filter/kis_filter.h"
#include "filter/kis_filter_configuration.h"
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILTER_STRATEGY_TEST_H
#define KIS_FILTER_STRATEGY_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisFilterStrategyTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_FILTER_TEST_H
#define KIS_FILTER_TEST_H
#include <QtTest/QtTest>
#include <QtTest>
class KisFilterTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef KIS_PAINT_DEVICE_TESTER_H