diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-12-28 20:42:13 +1100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-12-29 20:20:47 +0100 |
| commit | 534707f5288181af50a5f560a0a26601fdd01531 (patch) | |
| tree | a51f2be5403280469424e8d8556ff0812a6e7d05 | |
| parent | 59cd338c351d444cf727ae59372121abebbbec4e (diff) | |
Remove module prefix from includes
The module prefix is not needed and removing it adds compatibility
with Qt 5 which has classes moved into different modules.
Change-Id: I20823be670d78ba6cc8eb0e5de1f4f3b6fa2edb6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
157 files changed, 473 insertions, 473 deletions
diff --git a/qtbrowserplugin/src/qtbrowserplugin.h b/qtbrowserplugin/src/qtbrowserplugin.h index 99e1a79..1e0d26e 100644 --- a/qtbrowserplugin/src/qtbrowserplugin.h +++ b/qtbrowserplugin/src/qtbrowserplugin.h @@ -41,10 +41,10 @@ #ifndef QTBROWSERPLUGIN_H #define QTBROWSERPLUGIN_H -#include <QtCore/QMetaObject> -#include <QtCore/QFile> -#include <QtCore/QDateTime> -#include <QtGui/QPainter> +#include <QMetaObject> +#include <QFile> +#include <QDateTime> +#include <QPainter> struct QtNPInstance; diff --git a/qtbrowserplugin/src/qtbrowserplugin_mac.cpp b/qtbrowserplugin/src/qtbrowserplugin_mac.cpp index 1306ffb..ccf6c9d 100644 --- a/qtbrowserplugin/src/qtbrowserplugin_mac.cpp +++ b/qtbrowserplugin/src/qtbrowserplugin_mac.cpp @@ -38,16 +38,16 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtCore/QStringList> -#include <QtCore/QPointer> -#include <QtGui/QWidget> -#include <QtCore/QEvent> -#include <QtCore/QDebug> -#include <QtCore/QRect> -#include <QtGui/QMouseEvent> -#include <QtGui/QHoverEvent> -#include <QtGui/QKeyEvent> +#include <QApplication> +#include <QStringList> +#include <QPointer> +#include <QWidget> +#include <QEvent> +#include <QDebug> +#include <QRect> +#include <QMouseEvent> +#include <QHoverEvent> +#include <QKeyEvent> #include <Carbon/Carbon.h> diff --git a/qtbrowserplugin/src/qtbrowserplugin_p.h b/qtbrowserplugin/src/qtbrowserplugin_p.h index 702fbd1..96f5d60 100644 --- a/qtbrowserplugin/src/qtbrowserplugin_p.h +++ b/qtbrowserplugin/src/qtbrowserplugin_p.h @@ -41,9 +41,9 @@ #ifndef QTBROWSERPLUGIN_P_H #define QTBROWSERPLUGIN_P_H -#include <QtCore/QVariant> -#include <QtCore/QMutexLocker> -#include <QtGui/QWidget> +#include <QVariant> +#include <QMutexLocker> +#include <QWidget> #ifdef Q_WS_X11 # include <X11/Xlib.h> diff --git a/qtbrowserplugin/src/qtbrowserplugin_x11.cpp b/qtbrowserplugin/src/qtbrowserplugin_x11.cpp index 707f8a5..e9ddb59 100644 --- a/qtbrowserplugin/src/qtbrowserplugin_x11.cpp +++ b/qtbrowserplugin/src/qtbrowserplugin_x11.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <QtGui> -#include <QtGui/QX11EmbedWidget> +#include <QX11EmbedWidget> #include "qtbrowserplugin.h" #include "qtbrowserplugin_p.h" diff --git a/qtjp2imageformat/examples/simple/simple.cpp b/qtjp2imageformat/examples/simple/simple.cpp index c6e1709..4e0c6b8 100644 --- a/qtjp2imageformat/examples/simple/simple.cpp +++ b/qtjp2imageformat/examples/simple/simple.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtGui/QImage> -#include <QtGui/QLabel> -#include <QtGui/QPixmap> +#include <QApplication> +#include <QImage> +#include <QLabel> +#include <QPixmap> // If the plugin is built statically, uncomment the following two lines -//#include <QtCore/QtPlugin> +//#include <QtPlugin> //Q_IMPORT_PLUGIN(qtjp2) int main(int argc, char *argv[]) diff --git a/qtjp2imageformat/plugin/qtjp2imageformatplugin.cpp b/qtjp2imageformat/plugin/qtjp2imageformatplugin.cpp index df32bde..67e20ea 100644 --- a/qtjp2imageformat/plugin/qtjp2imageformatplugin.cpp +++ b/qtjp2imageformat/plugin/qtjp2imageformatplugin.cpp @@ -39,8 +39,8 @@ ****************************************************************************/ #ifndef QT_NO_IMAGEFORMATPLUGIN -#include <QtGui/QImageIOHandler> -#include <QtCore/QStringList> +#include <QImageIOHandler> +#include <QStringList> #include "qtjp2imageformatplugin.h" #include "qtjp2imagehandler.h" diff --git a/qtjp2imageformat/plugin/qtjp2imageformatplugin.h b/qtjp2imageformat/plugin/qtjp2imageformatplugin.h index a3ad9f9..971d149 100644 --- a/qtjp2imageformat/plugin/qtjp2imageformatplugin.h +++ b/qtjp2imageformat/plugin/qtjp2imageformatplugin.h @@ -40,7 +40,7 @@ #ifndef QTJP2IMAGEFORMATPLUGIN_H #define QTJP2IMAGEFORMATPLUGIN_H -#include <QtGui/QImageIOPlugin> +#include <QImageIOPlugin> class QJPeg2Plugin : public QImageIOPlugin { diff --git a/qtjp2imageformat/src/qtjp2imagehandler.cpp b/qtjp2imageformat/src/qtjp2imagehandler.cpp index 8611399..048cb73 100644 --- a/qtjp2imageformat/src/qtjp2imagehandler.cpp +++ b/qtjp2imageformat/src/qtjp2imagehandler.cpp @@ -39,14 +39,14 @@ ****************************************************************************/ #include "qtjp2imagehandler.h" -#include <QtGui/QImage> -#include <QtCore/QStringList> -#include <QtCore/QString> -#include <QtGui/QColor> -#include <QtCore/QFile> -#include <QtCore/QIODevice> -#include <QtGui/QImageIOHandler> -#include <QtCore/QVariant> +#include <QImage> +#include <QStringList> +#include <QString> +#include <QColor> +#include <QFile> +#include <QIODevice> +#include <QImageIOHandler> +#include <QVariant> #ifdef Q_CC_MSVC #define JAS_WIN_MSVC_BUILD diff --git a/qtjp2imageformat/src/qtjp2imagehandler.h b/qtjp2imageformat/src/qtjp2imagehandler.h index 13cbe93..7c12753 100644 --- a/qtjp2imageformat/src/qtjp2imagehandler.h +++ b/qtjp2imageformat/src/qtjp2imagehandler.h @@ -41,8 +41,8 @@ #ifndef QTJPEG2000IMAGEHANDLER_H #define QTJPEG2000IMAGEHANDLER_H -#include <QtGui/QImageIOHandler> -#include <QtCore/QIODevice> +#include <QImageIOHandler> +#include <QIODevice> class QtJP2ImageHandler : public QImageIOHandler { public: diff --git a/qtlockedfile/example/example.cpp b/qtlockedfile/example/example.cpp index 93e44d8..9b30b52 100644 --- a/qtlockedfile/example/example.cpp +++ b/qtlockedfile/example/example.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <stdio.h> -#include <QtCore/QTextStream> +#include <QTextStream> #include <qtlockedfile.h> diff --git a/qtlockedfile/src/qtlockedfile.h b/qtlockedfile/src/qtlockedfile.h index 3c1e3e2..706ce07 100644 --- a/qtlockedfile/src/qtlockedfile.h +++ b/qtlockedfile/src/qtlockedfile.h @@ -41,9 +41,9 @@ #ifndef QTLOCKEDFILE_H #define QTLOCKEDFILE_H -#include <QtCore/QFile> +#include <QFile> #ifdef Q_OS_WIN -#include <QtCore/QVector> +#include <QVector> #endif #if defined(Q_WS_WIN) diff --git a/qtlockedfile/src/qtlockedfile_win.cpp b/qtlockedfile/src/qtlockedfile_win.cpp index b527eef..d9bcd44 100644 --- a/qtlockedfile/src/qtlockedfile_win.cpp +++ b/qtlockedfile/src/qtlockedfile_win.cpp @@ -40,7 +40,7 @@ #include "qtlockedfile.h" #include <qt_windows.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> #define MUTEX_PREFIX "QtLockedFile mutex " // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS diff --git a/qtpropertybrowser/examples/canvas_typed/main.cpp b/qtpropertybrowser/examples/canvas_typed/main.cpp index 8292e5d..f0110f4 100644 --- a/qtpropertybrowser/examples/canvas_typed/main.cpp +++ b/qtpropertybrowser/examples/canvas_typed/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> #include "mainwindow.h" int main(int argc, char **argv) diff --git a/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp b/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp index aa8be03..bb101e4 100644 --- a/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp +++ b/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp @@ -42,12 +42,12 @@ #include "qtpropertymanager.h" #include "qteditorfactory.h" #include "qttreepropertybrowser.h" -#include <QtGui/QMatrix> -#include <QtGui/QMouseEvent> -#include <QtGui/QMenuBar> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QDockWidget> +#include <QMatrix> +#include <QMouseEvent> +#include <QMenuBar> +#include <QMenu> +#include <QAction> +#include <QDockWidget> void CanvasView::contentsMousePressEvent(QMouseEvent* event) { diff --git a/qtpropertybrowser/examples/canvas_typed/mainwindow.h b/qtpropertybrowser/examples/canvas_typed/mainwindow.h index 346bfeb..70716d2 100644 --- a/qtpropertybrowser/examples/canvas_typed/mainwindow.h +++ b/qtpropertybrowser/examples/canvas_typed/mainwindow.h @@ -41,8 +41,8 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QtGui/QMainWindow> -#include <QtCore/QMap> +#include <QMainWindow> +#include <QMap> #include "qtcanvas.h" class QtProperty; diff --git a/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp b/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp index 4709ed5..05a5c20 100644 --- a/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp +++ b/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp @@ -39,17 +39,17 @@ ****************************************************************************/ #include "qtcanvas.h" -#include <QtGui/QApplication> -#include <QtGui/QBitmap> -#include <QtGui/QDesktopWidget> -#include <QtGui/QImage> -#include <QtGui/QPainter> -#include <QtCore/QTimer> -#include <QtCore/qhash.h> -#include <QtCore/qset.h> -#include <QtCore/qalgorithms.h> -#include <QtGui/qevent.h> -#include <QtGui/qpainterpath.h> +#include <QApplication> +#include <QBitmap> +#include <QDesktopWidget> +#include <QImage> +#include <QPainter> +#include <QTimer> +#include <qhash.h> +#include <qset.h> +#include <qalgorithms.h> +#include <qevent.h> +#include <qpainterpath.h> #include <stdlib.h> using namespace Qt; @@ -1108,7 +1108,7 @@ void QtCanvas::drawArea(const QRect& clip, QPainter* painter, bool dbuf) drawCanvasArea(clip, painter, dbuf); } -#include <QtCore/QDebug> +#include <QDebug> /* \internal */ diff --git a/qtpropertybrowser/examples/canvas_typed/qtcanvas.h b/qtpropertybrowser/examples/canvas_typed/qtcanvas.h index c077b4d..a0f8444 100644 --- a/qtpropertybrowser/examples/canvas_typed/qtcanvas.h +++ b/qtpropertybrowser/examples/canvas_typed/qtcanvas.h @@ -41,11 +41,11 @@ #ifndef QTCANVAS_H #define QTCANVAS_H -#include <QtGui/qpixmap.h> -#include <QtGui/qbrush.h> -#include <QtGui/qpen.h> -#include <QtGui/qpolygon.h> -#include <QtGui/qscrollarea.h> +#include <qpixmap.h> +#include <qbrush.h> +#include <qpen.h> +#include <qpolygon.h> +#include <qscrollarea.h> class QtCanvasSprite; class QtCanvasPolygonalItem; diff --git a/qtpropertybrowser/examples/canvas_variant/main.cpp b/qtpropertybrowser/examples/canvas_variant/main.cpp index 8292e5d..f0110f4 100644 --- a/qtpropertybrowser/examples/canvas_variant/main.cpp +++ b/qtpropertybrowser/examples/canvas_variant/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> #include "mainwindow.h" int main(int argc, char **argv) diff --git a/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp b/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp index 11b15f1..7b1f86a 100644 --- a/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp +++ b/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp @@ -41,12 +41,12 @@ #include "mainwindow.h" #include "qtvariantproperty.h" #include "qttreepropertybrowser.h" -#include <QtGui/QMatrix> -#include <QtGui/QMouseEvent> -#include <QtGui/QMenuBar> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QDockWidget> +#include <QMatrix> +#include <QMouseEvent> +#include <QMenuBar> +#include <QMenu> +#include <QAction> +#include <QDockWidget> void CanvasView::contentsMousePressEvent(QMouseEvent* event) { diff --git a/qtpropertybrowser/examples/canvas_variant/mainwindow.h b/qtpropertybrowser/examples/canvas_variant/mainwindow.h index 4acb901..ce359de 100644 --- a/qtpropertybrowser/examples/canvas_variant/mainwindow.h +++ b/qtpropertybrowser/examples/canvas_variant/mainwindow.h @@ -41,8 +41,8 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QtGui/QMainWindow> -#include <QtCore/QMap> +#include <QMainWindow> +#include <QMap> #include "qtcanvas.h" class QtVariantProperty; diff --git a/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp b/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp index 4709ed5..05a5c20 100644 --- a/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp +++ b/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp @@ -39,17 +39,17 @@ ****************************************************************************/ #include "qtcanvas.h" -#include <QtGui/QApplication> -#include <QtGui/QBitmap> -#include <QtGui/QDesktopWidget> -#include <QtGui/QImage> -#include <QtGui/QPainter> -#include <QtCore/QTimer> -#include <QtCore/qhash.h> -#include <QtCore/qset.h> -#include <QtCore/qalgorithms.h> -#include <QtGui/qevent.h> -#include <QtGui/qpainterpath.h> +#include <QApplication> +#include <QBitmap> +#include <QDesktopWidget> +#include <QImage> +#include <QPainter> +#include <QTimer> +#include <qhash.h> +#include <qset.h> +#include <qalgorithms.h> +#include <qevent.h> +#include <qpainterpath.h> #include <stdlib.h> using namespace Qt; @@ -1108,7 +1108,7 @@ void QtCanvas::drawArea(const QRect& clip, QPainter* painter, bool dbuf) drawCanvasArea(clip, painter, dbuf); } -#include <QtCore/QDebug> +#include <QDebug> /* \internal */ diff --git a/qtpropertybrowser/examples/canvas_variant/qtcanvas.h b/qtpropertybrowser/examples/canvas_variant/qtcanvas.h index c077b4d..a0f8444 100644 --- a/qtpropertybrowser/examples/canvas_variant/qtcanvas.h +++ b/qtpropertybrowser/examples/canvas_variant/qtcanvas.h @@ -41,11 +41,11 @@ #ifndef QTCANVAS_H #define QTCANVAS_H -#include <QtGui/qpixmap.h> -#include <QtGui/qbrush.h> -#include <QtGui/qpen.h> -#include <QtGui/qpolygon.h> -#include <QtGui/qscrollarea.h> +#include <qpixmap.h> +#include <qbrush.h> +#include <qpen.h> +#include <qpolygon.h> +#include <qscrollarea.h> class QtCanvasSprite; class QtCanvasPolygonalItem; diff --git a/qtpropertybrowser/examples/decoration/main.cpp b/qtpropertybrowser/examples/decoration/main.cpp index 1f206fb..e94255d 100644 --- a/qtpropertybrowser/examples/decoration/main.cpp +++ b/qtpropertybrowser/examples/decoration/main.cpp @@ -38,9 +38,9 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtCore/QMap> -#include <QtGui/QDoubleSpinBox> +#include <QApplication> +#include <QMap> +#include <QDoubleSpinBox> #include "qtpropertybrowser.h" #include "qteditorfactory.h" #include "qttreepropertybrowser.h" diff --git a/qtpropertybrowser/examples/demo/main.cpp b/qtpropertybrowser/examples/demo/main.cpp index a3ac91a..21621eb 100644 --- a/qtpropertybrowser/examples/demo/main.cpp +++ b/qtpropertybrowser/examples/demo/main.cpp @@ -38,12 +38,12 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtGui/QScrollArea> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QIcon> -#include <QtCore/QMap> +#include <QApplication> +#include <QScrollArea> +#include <QGridLayout> +#include <QLabel> +#include <QIcon> +#include <QMap> #include "qtpropertymanager.h" #include "qteditorfactory.h" #include "qttreepropertybrowser.h" diff --git a/qtpropertybrowser/examples/extension/main.cpp b/qtpropertybrowser/examples/extension/main.cpp index 129836d..7ccf8c5 100644 --- a/qtpropertybrowser/examples/extension/main.cpp +++ b/qtpropertybrowser/examples/extension/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> #include "qtvariantproperty.h" #include "qteditorfactory.h" #include "qttreepropertybrowser.h" diff --git a/qtpropertybrowser/examples/object_controller/main.cpp b/qtpropertybrowser/examples/object_controller/main.cpp index 023ed4d..faa56e8 100644 --- a/qtpropertybrowser/examples/object_controller/main.cpp +++ b/qtpropertybrowser/examples/object_controller/main.cpp @@ -38,21 +38,21 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtGui/QSpinBox> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLineEdit> -#include <QtGui/QDialog> -#include <QtGui/QComboBox> -#include <QtGui/QToolButton> -#include <QtGui/QPushButton> -#include <QtGui/QBoxLayout> -#include <QtGui/QTreeWidget> -#include <QtGui/QAction> -#include <QtGui/QDesktopWidget> -#include <QtGui/QTextDocument> -#include <QtGui/QCalendarWidget> -#include <QtCore/QTimeLine> +#include <QApplication> +#include <QSpinBox> +#include <QDialogButtonBox> +#include <QLineEdit> +#include <QDialog> +#include <QComboBox> +#include <QToolButton> +#include <QPushButton> +#include <QBoxLayout> +#include <QTreeWidget> +#include <QAction> +#include <QDesktopWidget> +#include <QTextDocument> +#include <QCalendarWidget> +#include <QTimeLine> #include "objectcontroller.h" class MyController : public QDialog diff --git a/qtpropertybrowser/examples/object_controller/objectcontroller.cpp b/qtpropertybrowser/examples/object_controller/objectcontroller.cpp index c5184f9..92be023 100644 --- a/qtpropertybrowser/examples/object_controller/objectcontroller.cpp +++ b/qtpropertybrowser/examples/object_controller/objectcontroller.cpp @@ -38,10 +38,10 @@ ** ****************************************************************************/ -#include <QtCore/QMetaObject> -#include <QtCore/QMetaProperty> -#include <QtGui/QVBoxLayout> -#include <QtGui/QScrollArea> +#include <QMetaObject> +#include <QMetaProperty> +#include <QVBoxLayout> +#include <QScrollArea> #include "objectcontroller.h" #include "qtvariantproperty.h" #include "qtgroupboxpropertybrowser.h" diff --git a/qtpropertybrowser/examples/object_controller/objectcontroller.h b/qtpropertybrowser/examples/object_controller/objectcontroller.h index 4b301ae..b0151f7 100644 --- a/qtpropertybrowser/examples/object_controller/objectcontroller.h +++ b/qtpropertybrowser/examples/object_controller/objectcontroller.h @@ -41,7 +41,7 @@ #ifndef OBJECTCONTROLLER_H #define OBJECTCONTROLLER_H -#include <QtGui/QWidget> +#include <QWidget> class ObjectControllerPrivate; diff --git a/qtpropertybrowser/examples/simple/main.cpp b/qtpropertybrowser/examples/simple/main.cpp index 99df13b..8a7bf35 100644 --- a/qtpropertybrowser/examples/simple/main.cpp +++ b/qtpropertybrowser/examples/simple/main.cpp @@ -38,9 +38,9 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtCore/QDate> -#include <QtCore/QLocale> +#include <QApplication> +#include <QDate> +#include <QLocale> #include "qtpropertymanager.h" #include "qtvariantproperty.h" #include "qttreepropertybrowser.h" diff --git a/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp b/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp index e5669e4..fe66559 100644 --- a/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp +++ b/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp @@ -40,13 +40,13 @@ #include "qtbuttonpropertybrowser.h" -#include <QtCore/QSet> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtCore/QTimer> -#include <QtCore/QMap> -#include <QtGui/QToolButton> -#include <QtGui/QStyle> +#include <QSet> +#include <QGridLayout> +#include <QLabel> +#include <QTimer> +#include <QMap> +#include <QToolButton> +#include <QStyle> #if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE diff --git a/qtpropertybrowser/src/qteditorfactory.cpp b/qtpropertybrowser/src/qteditorfactory.cpp index 9470d47..b664d45 100644 --- a/qtpropertybrowser/src/qteditorfactory.cpp +++ b/qtpropertybrowser/src/qteditorfactory.cpp @@ -41,24 +41,24 @@ #include "qteditorfactory.h" #include "qtpropertybrowserutils_p.h" -#include <QtGui/QSpinBox> -#include <QtGui/QScrollBar> -#include <QtGui/QComboBox> -#include <QtGui/QAbstractItemView> -#include <QtGui/QLineEdit> -#include <QtGui/QDateTimeEdit> -#include <QtGui/QHBoxLayout> -#include <QtGui/QMenu> -#include <QtGui/QKeyEvent> -#include <QtGui/QApplication> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> -#include <QtGui/QColorDialog> -#include <QtGui/QFontDialog> -#include <QtGui/QSpacerItem> -#include <QtGui/QStyleOption> -#include <QtGui/QPainter> -#include <QtCore/QMap> +#include <QSpinBox> +#include <QScrollBar> +#include <QComboBox> +#include <QAbstractItemView> +#include <QLineEdit> +#include <QDateTimeEdit> +#include <QHBoxLayout> +#include <QMenu> +#include <QKeyEvent> +#include <QApplication> +#include <QLabel> +#include <QToolButton> +#include <QColorDialog> +#include <QFontDialog> +#include <QSpacerItem> +#include <QStyleOption> +#include <QPainter> +#include <QMap> #if defined(Q_CC_MSVC) # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ diff --git a/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp b/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp index e9865cb..d8db40e 100644 --- a/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp +++ b/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp @@ -40,12 +40,12 @@ #include "qtgroupboxpropertybrowser.h" -#include <QtCore/QSet> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QGroupBox> -#include <QtCore/QTimer> -#include <QtCore/QMap> +#include <QSet> +#include <QGridLayout> +#include <QLabel> +#include <QGroupBox> +#include <QTimer> +#include <QMap> #if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE diff --git a/qtpropertybrowser/src/qtpropertybrowser.cpp b/qtpropertybrowser/src/qtpropertybrowser.cpp index f22ca63..12a5734 100644 --- a/qtpropertybrowser/src/qtpropertybrowser.cpp +++ b/qtpropertybrowser/src/qtpropertybrowser.cpp @@ -40,10 +40,10 @@ #include "qtpropertybrowser.h" -#include <QtCore/QSet> -#include <QtCore/QMap> -#include <QtGui/QIcon> -#include <QtGui/QLineEdit> +#include <QSet> +#include <QMap> +#include <QIcon> +#include <QLineEdit> #if defined(Q_CC_MSVC) # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ diff --git a/qtpropertybrowser/src/qtpropertybrowser.h b/qtpropertybrowser/src/qtpropertybrowser.h index 446e7fd..5998a12 100644 --- a/qtpropertybrowser/src/qtpropertybrowser.h +++ b/qtpropertybrowser/src/qtpropertybrowser.h @@ -42,9 +42,9 @@ #ifndef QTPROPERTYBROWSER_H #define QTPROPERTYBROWSER_H -#include <QtGui/QWidget> -#include <QtCore/QSet> -#include <QtGui/QLineEdit> +#include <QWidget> +#include <QSet> +#include <QLineEdit> #if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE diff --git a/qtpropertybrowser/src/qtpropertybrowserutils.cpp b/qtpropertybrowser/src/qtpropertybrowserutils.cpp index d6a06bc..4241dcd 100644 --- a/qtpropertybrowser/src/qtpropertybrowserutils.cpp +++ b/qtpropertybrowser/src/qtpropertybrowserutils.cpp @@ -40,14 +40,14 @@ #include "qtpropertybrowserutils_p.h" -#include <QtGui/QApplication> -#include <QtGui/QPainter> -#include <QtGui/QHBoxLayout> -#include <QtGui/QMouseEvent> -#include <QtGui/QCheckBox> -#include <QtGui/QLineEdit> -#include <QtGui/QMenu> -#include <QtGui/QStyleOption> +#include <QApplication> +#include <QPainter> +#include <QHBoxLayout> +#include <QMouseEvent> +#include <QCheckBox> +#include <QLineEdit> +#include <QMenu> +#include <QStyleOption> #if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE diff --git a/qtpropertybrowser/src/qtpropertybrowserutils_p.h b/qtpropertybrowser/src/qtpropertybrowserutils_p.h index fd596bb..a0d2e11 100644 --- a/qtpropertybrowser/src/qtpropertybrowserutils_p.h +++ b/qtpropertybrowser/src/qtpropertybrowserutils_p.h @@ -53,10 +53,10 @@ #ifndef QTPROPERTYBROWSERUTILS_H #define QTPROPERTYBROWSERUTILS_H -#include <QtCore/QMap> -#include <QtGui/QIcon> -#include <QtGui/QWidget> -#include <QtCore/QStringList> +#include <QMap> +#include <QIcon> +#include <QWidget> +#include <QStringList> #if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE diff --git a/qtpropertybrowser/src/qtpropertymanager.cpp b/qtpropertybrowser/src/qtpropertymanager.cpp index c42815e..c749c7a 100644 --- a/qtpropertybrowser/src/qtpropertymanager.cpp +++ b/qtpropertybrowser/src/qtpropertymanager.cpp @@ -41,20 +41,20 @@ #include "qtpropertymanager.h" #include "qtpropertybrowserutils_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QLocale> -#include <QtCore/QMap> -#include <QtCore/QTimer> -#include <QtGui/QIcon> -#include <QtCore/QMetaEnum> -#include <QtGui/QFontDatabase> -#include <QtGui/QStyleOption> -#include <QtGui/QStyle> -#include <QtGui/QApplication> -#include <QtGui/QPainter> -#include <QtGui/QLabel> -#include <QtGui/QCheckBox> -#include <QtGui/QLineEdit> +#include <QDateTime> +#include <QLocale> +#include <QMap> +#include <QTimer> +#include <QIcon> +#include <QMetaEnum> +#include <QFontDatabase> +#include <QStyleOption> +#include <QStyle> +#include <QApplication> +#include <QPainter> +#include <QLabel> +#include <QCheckBox> +#include <QLineEdit> #include <limits.h> #include <float.h> diff --git a/qtpropertybrowser/src/qttreepropertybrowser.cpp b/qtpropertybrowser/src/qttreepropertybrowser.cpp index e944568..17b718e 100644 --- a/qtpropertybrowser/src/qttreepropertybrowser.cpp +++ b/qtpropertybrowser/src/qttreepropertybrowser.cpp @@ -40,17 +40,17 @@ #include "qttreepropertybrowser.h" -#include <QtCore/QSet> -#include <QtGui/QIcon> -#include <QtGui/QTreeWidget> -#include <QtGui/QItemDelegate> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> -#include <QtGui/QPainter> -#include <QtGui/QApplication> -#include <QtGui/QFocusEvent> -#include <QtGui/QStyle> -#include <QtGui/QPalette> +#include <QSet> +#include <QIcon> +#include <QTreeWidget> +#include <QItemDelegate> +#include <QHBoxLayout> +#include <QHeaderView> +#include <QPainter> +#include <QApplication> +#include <QFocusEvent> +#include <QStyle> +#include <QPalette> #if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE diff --git a/qtpropertybrowser/src/qtvariantproperty.cpp b/qtpropertybrowser/src/qtvariantproperty.cpp index d84e422..a4376f1 100644 --- a/qtpropertybrowser/src/qtvariantproperty.cpp +++ b/qtpropertybrowser/src/qtvariantproperty.cpp @@ -42,10 +42,10 @@ #include "qtvariantproperty.h" #include "qtpropertymanager.h" #include "qteditorfactory.h" -#include <QtCore/QVariant> -#include <QtGui/QIcon> -#include <QtCore/QDate> -#include <QtCore/QLocale> +#include <QVariant> +#include <QIcon> +#include <QDate> +#include <QLocale> #if defined(Q_CC_MSVC) # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ diff --git a/qtpropertybrowser/src/qtvariantproperty.h b/qtpropertybrowser/src/qtvariantproperty.h index cdc7b65..dda8675 100644 --- a/qtpropertybrowser/src/qtvariantproperty.h +++ b/qtpropertybrowser/src/qtvariantproperty.h @@ -43,8 +43,8 @@ #define QTVARIANTPROPERTY_H #include "qtpropertybrowser.h" -#include <QtCore/QVariant> -#include <QtGui/QIcon> +#include <QVariant> +#include <QIcon> #if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/include/QtScript/QtScript b/qtscriptclassic/include/QtScript/QtScript index fbd3b13..a8c5a65 100644 --- a/qtscriptclassic/include/QtScript/QtScript +++ b/qtscriptclassic/include/QtScript/QtScript @@ -1,6 +1,6 @@ #ifndef QT_QTSCRIPT_MODULE_H #define QT_QTSCRIPT_MODULE_H -#include <QtCore/QtCore> +#include <QtCore> #include "qscriptextensionplugin.h" #include "qscriptvalue.h" #include "qscriptstring.h" diff --git a/qtscriptclassic/src/QtScript b/qtscriptclassic/src/QtScript index fbd3b13..a8c5a65 100644 --- a/qtscriptclassic/src/QtScript +++ b/qtscriptclassic/src/QtScript @@ -1,6 +1,6 @@ #ifndef QT_QTSCRIPT_MODULE_H #define QT_QTSCRIPT_MODULE_H -#include <QtCore/QtCore> +#include <QtCore> #include "qscriptextensionplugin.h" #include "qscriptvalue.h" #include "qscriptstring.h" diff --git a/qtscriptclassic/src/qscriptable.h b/qtscriptclassic/src/qscriptable.h index f57e6f4..c821c50 100644 --- a/qtscriptclassic/src/qscriptable.h +++ b/qtscriptclassic/src/qscriptable.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTABLE_H #define QSCRIPTABLE_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptable_p.h b/qtscriptclassic/src/qscriptable_p.h index 60a0827..8b22a1c 100644 --- a/qtscriptclassic/src/qscriptable_p.h +++ b/qtscriptclassic/src/qscriptable_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTABLE_P_H #define QSCRIPTABLE_P_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> // // W A R N I N G diff --git a/qtscriptclassic/src/qscriptarray_p.h b/qtscriptclassic/src/qscriptarray_p.h index 4454b58..651e1e0 100644 --- a/qtscriptclassic/src/qscriptarray_p.h +++ b/qtscriptclassic/src/qscriptarray_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include <QtCore/QMap> +#include <QMap> -#include <QtCore/QVector> +#include <QVector> #include "qscriptvalueimplfwd_p.h" #include "qscriptenginefwd_p.h" diff --git a/qtscriptclassic/src/qscriptasm.cpp b/qtscriptclassic/src/qscriptasm.cpp index dcb6951..4a822f2 100644 --- a/qtscriptclassic/src/qscriptasm.cpp +++ b/qtscriptclassic/src/qscriptasm.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ -#include <QtCore/QTextStream> +#include <QTextStream> #include "qscriptasm_p.h" diff --git a/qtscriptclassic/src/qscriptasm_p.h b/qtscriptclassic/src/qscriptasm_p.h index d7c04b7..8013673 100644 --- a/qtscriptclassic/src/qscriptasm_p.h +++ b/qtscriptclassic/src/qscriptasm_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> -#include <QtCore/qvector.h> +#include <qvector.h> #include "qscriptvalueimplfwd_p.h" diff --git a/qtscriptclassic/src/qscriptast_p.h b/qtscriptclassic/src/qscriptast_p.h index fc2e4e6..cc09fde 100644 --- a/qtscriptclassic/src/qscriptast_p.h +++ b/qtscriptclassic/src/qscriptast_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/QString> +#include <QString> #include "qscriptastvisitor_p.h" diff --git a/qtscriptclassic/src/qscriptastfwd_p.h b/qtscriptclassic/src/qscriptastfwd_p.h index a764def..1fd4901 100644 --- a/qtscriptclassic/src/qscriptastfwd_p.h +++ b/qtscriptclassic/src/qscriptastfwd_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTAST_FWD_P_H #define QSCRIPTAST_FWD_P_H -#include <QtCore/qglobal.h> +#include <qglobal.h> // // W A R N I N G diff --git a/qtscriptclassic/src/qscriptbuffer_p.h b/qtscriptclassic/src/qscriptbuffer_p.h index 61c7707..022a501 100644 --- a/qtscriptclassic/src/qscriptbuffer_p.h +++ b/qtscriptclassic/src/qscriptbuffer_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTBUFFER_P_H #define QSCRIPTBUFFER_P_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(Q_OS_VXWORKS) && defined(m_data) # undef m_data diff --git a/qtscriptclassic/src/qscriptclass.cpp b/qtscriptclassic/src/qscriptclass.cpp index b68da71..0b76fc3 100644 --- a/qtscriptclassic/src/qscriptclass.cpp +++ b/qtscriptclassic/src/qscriptclass.cpp @@ -42,7 +42,7 @@ #include "qscriptclass.h" -#include <QtCore/qstringlist.h> +#include <qstringlist.h> #include "qscriptclasspropertyiterator.h" #include "qscriptstring.h" diff --git a/qtscriptclassic/src/qscriptclass.h b/qtscriptclassic/src/qscriptclass.h index 179fb19..0c15641 100644 --- a/qtscriptclassic/src/qscriptclass.h +++ b/qtscriptclassic/src/qscriptclass.h @@ -42,10 +42,10 @@ #ifndef QSCRIPTCLASS_H #define QSCRIPTCLASS_H -#include <QtCore/qstring.h> +#include <qstring.h> -#include <QtCore/qvariant.h> +#include <qvariant.h> #include "qscriptvalue.h" QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptclass_p.h b/qtscriptclassic/src/qscriptclass_p.h index 118ebe4..6f1e616 100644 --- a/qtscriptclassic/src/qscriptclass_p.h +++ b/qtscriptclassic/src/qscriptclass_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTCLASS_P_H #define QSCRIPTCLASS_P_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptclassinfo_p.h b/qtscriptclassic/src/qscriptclassinfo_p.h index ec1d1ea..f291b1f 100644 --- a/qtscriptclassic/src/qscriptclassinfo_p.h +++ b/qtscriptclassic/src/qscriptclassinfo_p.h @@ -60,7 +60,7 @@ #include "qscriptclassdata_p.h" -#include <QtCore/qstring.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptclasspropertyiterator.h b/qtscriptclassic/src/qscriptclasspropertyiterator.h index 8aff475..45c3289 100644 --- a/qtscriptclassic/src/qscriptclasspropertyiterator.h +++ b/qtscriptclassic/src/qscriptclasspropertyiterator.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTCLASSPROPERTYITERATOR_H #define QSCRIPTCLASSPROPERTYITERATOR_H -#include <QtCore/qstring.h> +#include <qstring.h> #include "qscriptvalue.h" diff --git a/qtscriptclassic/src/qscriptclasspropertyiterator_p.h b/qtscriptclassic/src/qscriptclasspropertyiterator_p.h index 5759623..46b4bdc 100644 --- a/qtscriptclassic/src/qscriptclasspropertyiterator_p.h +++ b/qtscriptclassic/src/qscriptclasspropertyiterator_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTCLASSPROPERTYITERATOR_P_H #define QSCRIPTCLASSPROPERTYITERATOR_P_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #include "qscriptvalue.h" diff --git a/qtscriptclassic/src/qscriptcompiler.cpp b/qtscriptclassic/src/qscriptcompiler.cpp index 3c55ade..db2a809 100644 --- a/qtscriptclassic/src/qscriptcompiler.cpp +++ b/qtscriptclassic/src/qscriptcompiler.cpp @@ -49,7 +49,7 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptcompiler_p.h b/qtscriptclassic/src/qscriptcompiler_p.h index ad2e595..af540fe 100644 --- a/qtscriptclassic/src/qscriptcompiler_p.h +++ b/qtscriptclassic/src/qscriptcompiler_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include <QtCore/QMap> +#include <QMap> -#include <QtCore/QVector> +#include <QVector> #include "qscriptastvisitor_p.h" #include "qscriptasm_p.h" diff --git a/qtscriptclassic/src/qscriptcontext.h b/qtscriptclassic/src/qscriptcontext.h index f5abdcb..d135105 100644 --- a/qtscriptclassic/src/qscriptcontext.h +++ b/qtscriptclassic/src/qscriptcontext.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTCONTEXT_H #define QSCRIPTCONTEXT_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #include "qscriptvalue.h" diff --git a/qtscriptclassic/src/qscriptcontext_p.cpp b/qtscriptclassic/src/qscriptcontext_p.cpp index a7eab00..8359f88 100644 --- a/qtscriptclassic/src/qscriptcontext_p.cpp +++ b/qtscriptclassic/src/qscriptcontext_p.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ -#include <QtCore/QtDebug> +#include <QtDebug> #include "qscriptcontext_p.h" diff --git a/qtscriptclassic/src/qscriptcontext_p.h b/qtscriptclassic/src/qscriptcontext_p.h index 28d5dce..808c2a5 100644 --- a/qtscriptclassic/src/qscriptcontext_p.h +++ b/qtscriptclassic/src/qscriptcontext_p.h @@ -48,7 +48,7 @@ #include "qscriptenginefwd_p.h" #include "qscriptnameid_p.h" -#include <QtCore/qnumeric.h> +#include <qnumeric.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptcontextfwd_p.h b/qtscriptclassic/src/qscriptcontextfwd_p.h index ac131cd..52cf9e6 100644 --- a/qtscriptclassic/src/qscriptcontextfwd_p.h +++ b/qtscriptclassic/src/qscriptcontextfwd_p.h @@ -58,10 +58,10 @@ #include "qscriptcontext.h" -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #if defined Q_CC_MSVC && !defined Q_CC_MSVC_NET -#include <QtCore/qnumeric.h> +#include <qnumeric.h> #endif QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptcontextinfo.cpp b/qtscriptclassic/src/qscriptcontextinfo.cpp index 4b89f3d..b551f46 100644 --- a/qtscriptclassic/src/qscriptcontextinfo.cpp +++ b/qtscriptclassic/src/qscriptcontextinfo.cpp @@ -48,7 +48,7 @@ #include "qscriptvalueimpl_p.h" #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/qdatastream.h> +#include <qdatastream.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptcontextinfo.h b/qtscriptclassic/src/qscriptcontextinfo.h index 2285412..45eb755 100644 --- a/qtscriptclassic/src/qscriptcontextinfo.h +++ b/qtscriptclassic/src/qscriptcontextinfo.h @@ -42,11 +42,11 @@ #ifndef QSCRIPTCONTEXTINFO_H #define QSCRIPTCONTEXTINFO_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> -#include <QtCore/qlist.h> -#include <QtCore/qstringlist.h> +#include <qlist.h> +#include <qstringlist.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptcontextinfo_p.h b/qtscriptclassic/src/qscriptcontextinfo_p.h index 6b7f46d..b354021 100644 --- a/qtscriptclassic/src/qscriptcontextinfo_p.h +++ b/qtscriptclassic/src/qscriptcontextinfo_p.h @@ -56,8 +56,8 @@ #include "qscriptcontextinfo.h" -#include <QtCore/qatomic.h> -#include <QtCore/qstring.h> +#include <qatomic.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaarray.cpp b/qtscriptclassic/src/qscriptecmaarray.cpp index edde66f..0c85a02 100644 --- a/qtscriptclassic/src/qscriptecmaarray.cpp +++ b/qtscriptclassic/src/qscriptecmaarray.cpp @@ -49,7 +49,7 @@ #include "qscriptobject_p.h" #include "qscriptclassdata_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaboolean.cpp b/qtscriptclassic/src/qscriptecmaboolean.cpp index c38f2af..9adb87c 100644 --- a/qtscriptclassic/src/qscriptecmaboolean.cpp +++ b/qtscriptclassic/src/qscriptecmaboolean.cpp @@ -48,7 +48,7 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmadate.cpp b/qtscriptclassic/src/qscriptecmadate.cpp index 9089900..c449954 100644 --- a/qtscriptclassic/src/qscriptecmadate.cpp +++ b/qtscriptclassic/src/qscriptecmadate.cpp @@ -48,11 +48,11 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QRegExp> -#include <QtCore/QtDebug> -#include <QtCore/QLocale> -#include <QtCore/qnumeric.h> +#include <QDateTime> +#include <QRegExp> +#include <QtDebug> +#include <QLocale> +#include <qnumeric.h> #include <math.h> diff --git a/qtscriptclassic/src/qscriptecmaerror.cpp b/qtscriptclassic/src/qscriptecmaerror.cpp index 9464bfd..febcdff 100644 --- a/qtscriptclassic/src/qscriptecmaerror.cpp +++ b/qtscriptclassic/src/qscriptecmaerror.cpp @@ -48,7 +48,7 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmafunction.cpp b/qtscriptclassic/src/qscriptecmafunction.cpp index 015332f..15ef1a7 100644 --- a/qtscriptclassic/src/qscriptecmafunction.cpp +++ b/qtscriptclassic/src/qscriptecmafunction.cpp @@ -48,11 +48,11 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> #ifndef QT_NO_QOBJECT # include "qscriptextqobject_p.h" -# include <QtCore/QMetaMethod> +# include <QMetaMethod> #endif QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaglobal.cpp b/qtscriptclassic/src/qscriptecmaglobal.cpp index 9d05b00..7f92400 100644 --- a/qtscriptclassic/src/qscriptecmaglobal.cpp +++ b/qtscriptclassic/src/qscriptecmaglobal.cpp @@ -50,8 +50,8 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QVarLengthArray> -#include <QtCore/qnumeric.h> +#include <QVarLengthArray> +#include <qnumeric.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmamath.cpp b/qtscriptclassic/src/qscriptecmamath.cpp index 259b75c..37e6de3 100644 --- a/qtscriptclassic/src/qscriptecmamath.cpp +++ b/qtscriptclassic/src/qscriptecmamath.cpp @@ -48,9 +48,9 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> -#include <QtCore/qnumeric.h> -#include <QtCore/QSysInfo> +#include <QtDebug> +#include <qnumeric.h> +#include <QSysInfo> #include <math.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmanumber.cpp b/qtscriptclassic/src/qscriptecmanumber.cpp index b0d5c93..ce16aaa 100644 --- a/qtscriptclassic/src/qscriptecmanumber.cpp +++ b/qtscriptclassic/src/qscriptecmanumber.cpp @@ -48,8 +48,8 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> -#include <QtCore/qnumeric.h> +#include <QtDebug> +#include <qnumeric.h> #include <math.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaobject.cpp b/qtscriptclassic/src/qscriptecmaobject.cpp index 8801504..23dd323 100644 --- a/qtscriptclassic/src/qscriptecmaobject.cpp +++ b/qtscriptclassic/src/qscriptecmaobject.cpp @@ -48,7 +48,7 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaregexp.cpp b/qtscriptclassic/src/qscriptecmaregexp.cpp index 8c457a8..fb665eb 100644 --- a/qtscriptclassic/src/qscriptecmaregexp.cpp +++ b/qtscriptclassic/src/qscriptecmaregexp.cpp @@ -48,9 +48,9 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QStringList> -#include <QtCore/QRegExp> -#include <QtCore/QtDebug> +#include <QStringList> +#include <QRegExp> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaregexp_p.h b/qtscriptclassic/src/qscriptecmaregexp_p.h index 1e38e40..5f241c5 100644 --- a/qtscriptclassic/src/qscriptecmaregexp_p.h +++ b/qtscriptclassic/src/qscriptecmaregexp_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/QRegExp> +#include <QRegExp> #include "qscriptecmacore_p.h" diff --git a/qtscriptclassic/src/qscriptecmastring.cpp b/qtscriptclassic/src/qscriptecmastring.cpp index 5a3a0cc..ce4b18d 100644 --- a/qtscriptclassic/src/qscriptecmastring.cpp +++ b/qtscriptclassic/src/qscriptecmastring.cpp @@ -49,9 +49,9 @@ #include "qscriptobject_p.h" #include "qscriptclassdata_p.h" -#include <QtCore/QStringList> -#include <QtCore/QtDebug> -#include <QtCore/qnumeric.h> +#include <QStringList> +#include <QtDebug> +#include <qnumeric.h> #include <limits.h> diff --git a/qtscriptclassic/src/qscriptengine.h b/qtscriptclassic/src/qscriptengine.h index 922b7e5..5dde343 100644 --- a/qtscriptclassic/src/qscriptengine.h +++ b/qtscriptclassic/src/qscriptengine.h @@ -42,15 +42,15 @@ #ifndef QSCRIPTENGINE_H #define QSCRIPTENGINE_H -#include <QtCore/qmetatype.h> +#include <qmetatype.h> -#include <QtCore/qvariant.h> +#include <qvariant.h> #ifndef QT_NO_QOBJECT -#include <QtCore/qobject.h> +#include <qobject.h> #else -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #endif #include "qscriptvalue.h" diff --git a/qtscriptclassic/src/qscriptengine_p.cpp b/qtscriptclassic/src/qscriptengine_p.cpp index 420a4de..787167d 100644 --- a/qtscriptclassic/src/qscriptengine_p.cpp +++ b/qtscriptclassic/src/qscriptengine_p.cpp @@ -61,20 +61,20 @@ #include "qscriptclass_p.h" #include "qscriptengineagent.h" -#include <QtCore/QDate> -#include <QtCore/QDateTime> -#include <QtCore/QRegExp> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QDate> +#include <QDateTime> +#include <QRegExp> +#include <QStringList> +#include <QVariant> #ifndef QT_NO_QOBJECT #include "qscriptextensioninterface.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> -#include <QtCore/QPluginLoader> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QTextStream> +#include <QCoreApplication> +#include <QPluginLoader> #endif Q_DECLARE_METATYPE(QScriptValue) diff --git a/qtscriptclassic/src/qscriptengine_p.h b/qtscriptclassic/src/qscriptengine_p.h index 4bb85b4..b719f51 100644 --- a/qtscriptclassic/src/qscriptengine_p.h +++ b/qtscriptclassic/src/qscriptengine_p.h @@ -45,13 +45,13 @@ #include "qscriptenginefwd_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QMutex> -#include <QtCore/QLinkedList> -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtCore/QHash> -#include <QtCore/qnumeric.h> +#include <QDateTime> +#include <QMutex> +#include <QLinkedList> +#include <QString> +#include <QVector> +#include <QHash> +#include <qnumeric.h> #include "qscriptengine.h" #include "qscriptnameid_p.h" diff --git a/qtscriptclassic/src/qscriptengineagent.h b/qtscriptclassic/src/qscriptengineagent.h index ab1b16a..31a38cb 100644 --- a/qtscriptclassic/src/qscriptengineagent.h +++ b/qtscriptclassic/src/qscriptengineagent.h @@ -42,10 +42,10 @@ #ifndef QSCRIPTENGINEAGENT_H #define QSCRIPTENGINEAGENT_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> -#include <QtCore/qvariant.h> +#include <qvariant.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptengineagent_p.h b/qtscriptclassic/src/qscriptengineagent_p.h index 29019df..cc44263 100644 --- a/qtscriptclassic/src/qscriptengineagent_p.h +++ b/qtscriptclassic/src/qscriptengineagent_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTENGINEAGENT_P_H #define QSCRIPTENGINEAGENT_P_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> // diff --git a/qtscriptclassic/src/qscriptenginefwd_p.h b/qtscriptclassic/src/qscriptenginefwd_p.h index 34fabfe..0d926fa 100644 --- a/qtscriptclassic/src/qscriptenginefwd_p.h +++ b/qtscriptclassic/src/qscriptenginefwd_p.h @@ -47,15 +47,15 @@ #endif -#include <QtCore/qobjectdefs.h> - -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QStringList> -#include <QtCore/QTime> -#include <QtCore/QVector> +#include <qobjectdefs.h> + +#include <QHash> +#include <QList> +#include <QRegExp> +#include <QSet> +#include <QStringList> +#include <QTime> +#include <QVector> #include "qscriptengine.h" #include "qscriptrepository_p.h" diff --git a/qtscriptclassic/src/qscriptextensioninterface.h b/qtscriptclassic/src/qscriptextensioninterface.h index cd2bc28..b0bfa41 100644 --- a/qtscriptclassic/src/qscriptextensioninterface.h +++ b/qtscriptclassic/src/qscriptextensioninterface.h @@ -42,10 +42,10 @@ #ifndef QSCRIPTEXTENSIONINTERFACE_H #define QSCRIPTEXTENSIONINTERFACE_H -#include <QtCore/qfactoryinterface.h> +#include <qfactoryinterface.h> -#include <QtCore/qobject.h> +#include <qobject.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptextensionplugin.h b/qtscriptclassic/src/qscriptextensionplugin.h index 162c7d4..8718331 100644 --- a/qtscriptclassic/src/qscriptextensionplugin.h +++ b/qtscriptclassic/src/qscriptextensionplugin.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTEXTENSIONPLUGIN_H #define QSCRIPTEXTENSIONPLUGIN_H -#include <QtCore/qplugin.h> +#include <qplugin.h> #include "qscriptextensioninterface.h" diff --git a/qtscriptclassic/src/qscriptextenumeration.cpp b/qtscriptclassic/src/qscriptextenumeration.cpp index 04e2038..957ec68 100644 --- a/qtscriptclassic/src/qscriptextenumeration.cpp +++ b/qtscriptclassic/src/qscriptextenumeration.cpp @@ -49,7 +49,7 @@ #include "qscriptobject_p.h" #include "qscriptvalueiteratorimpl_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptextqobject.cpp b/qtscriptclassic/src/qscriptextqobject.cpp index 665776c..b664698 100644 --- a/qtscriptclassic/src/qscriptextqobject.cpp +++ b/qtscriptclassic/src/qscriptextqobject.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ -#include <QtCore/qglobal.h> +#include <qglobal.h> #include "qscriptengine_p.h" @@ -51,11 +51,11 @@ #include "qscriptable_p.h" #include "qscriptextqobject_p.h" -#include <QtCore/QtDebug> -#include <QtCore/QMetaMethod> -#include <QtCore/QRegExp> -#include <QtCore/QVarLengthArray> -#include <QtCore/QPointer> +#include <QtDebug> +#include <QMetaMethod> +#include <QRegExp> +#include <QVarLengthArray> +#include <QPointer> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptextqobject_p.h b/qtscriptclassic/src/qscriptextqobject_p.h index 4bf6a4a..024aec4 100644 --- a/qtscriptclassic/src/qscriptextqobject_p.h +++ b/qtscriptclassic/src/qscriptextqobject_p.h @@ -63,12 +63,12 @@ #include "qscriptengine.h" #include "qscriptmemberfwd_p.h" -#include <QtCore/QHash> -#include <QtCore/QPointer> -#include <QtCore/QObject> -#include <QtCore/QVariant> -#include <QtCore/QVarLengthArray> -#include <QtCore/QVector> +#include <QHash> +#include <QPointer> +#include <QObject> +#include <QVariant> +#include <QVarLengthArray> +#include <QVector> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptextvariant.cpp b/qtscriptclassic/src/qscriptextvariant.cpp index 99fbbcc..5cc056b 100644 --- a/qtscriptclassic/src/qscriptextvariant.cpp +++ b/qtscriptclassic/src/qscriptextvariant.cpp @@ -48,9 +48,9 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> -#include <QtCore/QStringList> +#include <QStringList> #include <limits.h> diff --git a/qtscriptclassic/src/qscriptextvariant_p.h b/qtscriptclassic/src/qscriptextvariant_p.h index db449f6..03eff96 100644 --- a/qtscriptclassic/src/qscriptextvariant_p.h +++ b/qtscriptclassic/src/qscriptextvariant_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/QVariant> +#include <QVariant> #include "qscriptecmacore_p.h" diff --git a/qtscriptclassic/src/qscriptfunction_p.h b/qtscriptclassic/src/qscriptfunction_p.h index 2bd43f0..e3f57e7 100644 --- a/qtscriptclassic/src/qscriptfunction_p.h +++ b/qtscriptclassic/src/qscriptfunction_p.h @@ -59,11 +59,11 @@ #include "qscriptglobals_p.h" #include "qscriptnodepool_p.h" -#include <QtCore/QList> +#include <QList> #ifndef QT_NO_QOBJECT -# include <QtCore/QPointer> -# include <QtCore/QMetaMethod> +# include <QPointer> +# include <QMetaMethod> #endif QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptgc_p.h b/qtscriptclassic/src/qscriptgc_p.h index ab21691..8b1fd28 100644 --- a/qtscriptclassic/src/qscriptgc_p.h +++ b/qtscriptclassic/src/qscriptgc_p.h @@ -57,10 +57,10 @@ # undef m_free #endif -#include <QtCore/qglobal.h> +#include <qglobal.h> -#include <QtCore/QtDebug> +#include <QtDebug> #include <new> #include "qscriptmemorypool_p.h" diff --git a/qtscriptclassic/src/qscriptglobals_p.h b/qtscriptclassic/src/qscriptglobals_p.h index 3c55557..4966072 100644 --- a/qtscriptclassic/src/qscriptglobals_p.h +++ b/qtscriptclassic/src/qscriptglobals_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptgrammar_p.h b/qtscriptclassic/src/qscriptgrammar_p.h index 11262c2..e715321 100644 --- a/qtscriptclassic/src/qscriptgrammar_p.h +++ b/qtscriptclassic/src/qscriptgrammar_p.h @@ -55,7 +55,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptlexer_p.h b/qtscriptclassic/src/qscriptlexer_p.h index a5b747a..29307d0 100644 --- a/qtscriptclassic/src/qscriptlexer_p.h +++ b/qtscriptclassic/src/qscriptlexer_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptmemberfwd_p.h b/qtscriptclassic/src/qscriptmemberfwd_p.h index 9947125..fa04591 100644 --- a/qtscriptclassic/src/qscriptmemberfwd_p.h +++ b/qtscriptclassic/src/qscriptmemberfwd_p.h @@ -57,7 +57,7 @@ # undef m_flags #endif -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptmemorypool_p.h b/qtscriptclassic/src/qscriptmemorypool_p.h index 6d7f9a7..a619de2 100644 --- a/qtscriptclassic/src/qscriptmemorypool_p.h +++ b/qtscriptclassic/src/qscriptmemorypool_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include <QtCore/qglobal.h> -#include <QtCore/qshareddata.h> +#include <qglobal.h> +#include <qshareddata.h> #include <string.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptnameid_p.h b/qtscriptclassic/src/qscriptnameid_p.h index 7fbd7af..c17329f 100644 --- a/qtscriptclassic/src/qscriptnameid_p.h +++ b/qtscriptclassic/src/qscriptnameid_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptnodepool_p.h b/qtscriptclassic/src/qscriptnodepool_p.h index d98c78a..7115391 100644 --- a/qtscriptclassic/src/qscriptnodepool_p.h +++ b/qtscriptclassic/src/qscriptnodepool_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include <QtCore/QHash> -#include <QtCore/QString> +#include <QHash> +#include <QString> #include "qscriptmemorypool_p.h" diff --git a/qtscriptclassic/src/qscriptobjectdata_p.h b/qtscriptclassic/src/qscriptobjectdata_p.h index c12b7a7..0a1337a 100644 --- a/qtscriptclassic/src/qscriptobjectdata_p.h +++ b/qtscriptclassic/src/qscriptobjectdata_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTOBJECTDATA_P_H #define QSCRIPTOBJECTDATA_P_H -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptobjectfwd_p.h b/qtscriptclassic/src/qscriptobjectfwd_p.h index 95a2c16..4e6d226 100644 --- a/qtscriptclassic/src/qscriptobjectfwd_p.h +++ b/qtscriptclassic/src/qscriptobjectfwd_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> #include "qscriptbuffer_p.h" diff --git a/qtscriptclassic/src/qscriptparser.cpp b/qtscriptclassic/src/qscriptparser.cpp index 8d7e0c0..59c2314 100644 --- a/qtscriptclassic/src/qscriptparser.cpp +++ b/qtscriptclassic/src/qscriptparser.cpp @@ -81,7 +81,7 @@ ** ****************************************************************************/ -#include <QtCore/QtDebug> +#include <QtDebug> #include <string.h> diff --git a/qtscriptclassic/src/qscriptprettypretty.cpp b/qtscriptclassic/src/qscriptprettypretty.cpp index 744c4f5..60eee68 100644 --- a/qtscriptclassic/src/qscriptprettypretty.cpp +++ b/qtscriptclassic/src/qscriptprettypretty.cpp @@ -49,9 +49,9 @@ #include "qscriptobject_p.h" #include "qscriptast_p.h" -#include <QtCore/QString> -#include <QtCore/QTextStream> -#include <QtCore/QtDebug> +#include <QString> +#include <QTextStream> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptprettypretty_p.h b/qtscriptclassic/src/qscriptprettypretty_p.h index 987d00a..e291a95 100644 --- a/qtscriptclassic/src/qscriptprettypretty_p.h +++ b/qtscriptclassic/src/qscriptprettypretty_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> #include "qscriptastvisitor_p.h" diff --git a/qtscriptclassic/src/qscriptstring.h b/qtscriptclassic/src/qscriptstring.h index 72623fc..12938a5 100644 --- a/qtscriptclassic/src/qscriptstring.h +++ b/qtscriptclassic/src/qscriptstring.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTSTRING_H #define QSCRIPTSTRING_H -#include <QtCore/qstring.h> +#include <qstring.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptstring_p.h b/qtscriptclassic/src/qscriptstring_p.h index 4c9369b..e56a8ad 100644 --- a/qtscriptclassic/src/qscriptstring_p.h +++ b/qtscriptclassic/src/qscriptstring_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTSTRING_P_H #define QSCRIPTSTRING_P_H -#include <QtCore/qatomic.h> +#include <qatomic.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptsyntaxchecker_p.h b/qtscriptclassic/src/qscriptsyntaxchecker_p.h index 2783633..e0d4c95 100644 --- a/qtscriptclassic/src/qscriptsyntaxchecker_p.h +++ b/qtscriptclassic/src/qscriptsyntaxchecker_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qstring.h> +#include <qstring.h> #include "qscriptgrammar_p.h" diff --git a/qtscriptclassic/src/qscriptsyntaxcheckresult_p.h b/qtscriptclassic/src/qscriptsyntaxcheckresult_p.h index 054fd37..292f27a 100644 --- a/qtscriptclassic/src/qscriptsyntaxcheckresult_p.h +++ b/qtscriptclassic/src/qscriptsyntaxcheckresult_p.h @@ -58,8 +58,8 @@ #endif -#include <QtCore/qatomic.h> -#include <QtCore/qstring.h> +#include <qatomic.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptvalue.cpp b/qtscriptclassic/src/qscriptvalue.cpp index 9c1a461..7ab9c5a 100644 --- a/qtscriptclassic/src/qscriptvalue.cpp +++ b/qtscriptclassic/src/qscriptvalue.cpp @@ -51,8 +51,8 @@ #include "qscriptclass.h" #include "qscriptclass_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QRegExp> +#include <QDateTime> +#include <QRegExp> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptvalue.h b/qtscriptclassic/src/qscriptvalue.h index 37a3699..da21f84 100644 --- a/qtscriptclassic/src/qscriptvalue.h +++ b/qtscriptclassic/src/qscriptvalue.h @@ -42,10 +42,10 @@ #ifndef QSCRIPTVALUE_H #define QSCRIPTVALUE_H -#include <QtCore/qstring.h> +#include <qstring.h> -#include <QtCore/qlist.h> +#include <qlist.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptvaluefwd_p.h b/qtscriptclassic/src/qscriptvaluefwd_p.h index 1596c19..268162a 100644 --- a/qtscriptclassic/src/qscriptvaluefwd_p.h +++ b/qtscriptclassic/src/qscriptvaluefwd_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTVALUEFWD_P_H #define QSCRIPTVALUEFWD_P_H -#include <QtCore/qatomic.h> +#include <qatomic.h> #include "qscriptvalueimplfwd_p.h" diff --git a/qtscriptclassic/src/qscriptvalueimpl_p.h b/qtscriptclassic/src/qscriptvalueimpl_p.h index 90025f9..29bfbf3 100644 --- a/qtscriptclassic/src/qscriptvalueimpl_p.h +++ b/qtscriptclassic/src/qscriptvalueimpl_p.h @@ -57,7 +57,7 @@ #include "qscriptenginefwd_p.h" #include "qscriptcontextfwd_p.h" -#include <QtCore/QDateTime> +#include <QDateTime> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptvalueimplfwd_p.h b/qtscriptclassic/src/qscriptvalueimplfwd_p.h index 305fcc5..ff158c2 100644 --- a/qtscriptclassic/src/qscriptvalueimplfwd_p.h +++ b/qtscriptclassic/src/qscriptvalueimplfwd_p.h @@ -47,8 +47,8 @@ #include "qscriptvalue.h" -#include <QtCore/qstring.h> -#include <QtCore/qlist.h> +#include <qstring.h> +#include <qlist.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptxmlgenerator.cpp b/qtscriptclassic/src/qscriptxmlgenerator.cpp index fac0716..bfe2ee7 100644 --- a/qtscriptclassic/src/qscriptxmlgenerator.cpp +++ b/qtscriptclassic/src/qscriptxmlgenerator.cpp @@ -51,8 +51,8 @@ #include "qscriptlexer_p.h" #include "qscriptparser_p.h" -#include <QtCore/qstring.h> -#include <QtCore/qtextstream.h> +#include <qstring.h> +#include <qtextstream.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptxmlgenerator_p.h b/qtscriptclassic/src/qscriptxmlgenerator_p.h index de2f090..e425671 100644 --- a/qtscriptclassic/src/qscriptxmlgenerator_p.h +++ b/qtscriptclassic/src/qscriptxmlgenerator_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #include "qscriptastvisitor_p.h" diff --git a/qtservice/examples/controller/main.cpp b/qtservice/examples/controller/main.cpp index 0a5fd8e..6e969fc 100644 --- a/qtservice/examples/controller/main.cpp +++ b/qtservice/examples/controller/main.cpp @@ -38,9 +38,9 @@ ** ****************************************************************************/ -#include <QtCore/QStringList> -#include <QtCore/QDir> -#include <QtCore/QSettings> +#include <QStringList> +#include <QDir> +#include <QSettings> #include "qtservice.h" int processArgs(int argc, char **argv) diff --git a/qtservice/examples/interactive/main.cpp b/qtservice/examples/interactive/main.cpp index 3e871e7..5bd515c 100644 --- a/qtservice/examples/interactive/main.cpp +++ b/qtservice/examples/interactive/main.cpp @@ -38,11 +38,11 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> -#include <QtGui/QLabel> -#include <QtCore/QDir> -#include <QtCore/QSettings> +#include <QApplication> +#include <QDesktopWidget> +#include <QLabel> +#include <QDir> +#include <QSettings> #include "qtservice.h" class InteractiveService : public QtService<QApplication> diff --git a/qtservice/examples/server/main.cpp b/qtservice/examples/server/main.cpp index 7ec883b..0fce186 100644 --- a/qtservice/examples/server/main.cpp +++ b/qtservice/examples/server/main.cpp @@ -38,14 +38,14 @@ ** ****************************************************************************/ -#include <QtCore/QCoreApplication> -#include <QtNetwork/QTcpServer> -#include <QtNetwork/QTcpSocket> -#include <QtCore/QTextStream> -#include <QtCore/QDateTime> -#include <QtCore/QStringList> -#include <QtCore/QDir> -#include <QtCore/QSettings> +#include <QCoreApplication> +#include <QTcpServer> +#include <QTcpSocket> +#include <QTextStream> +#include <QDateTime> +#include <QStringList> +#include <QDir> +#include <QSettings> #include "qtservice.h" diff --git a/qtservice/src/qtservice.cpp b/qtservice/src/qtservice.cpp index 5613e45..02471cd 100644 --- a/qtservice/src/qtservice.cpp +++ b/qtservice/src/qtservice.cpp @@ -40,17 +40,17 @@ #include "qtservice.h" #include "qtservice_p.h" -#include <QtCore/QCoreApplication> +#include <QCoreApplication> #include <stdio.h> -#include <QtCore/QTimer> -#include <QtCore/QVector> -#include <QtCore/QProcess> +#include <QTimer> +#include <QVector> +#include <QProcess> #if defined(QTSERVICE_DEBUG) #include <QDebug> -#include <QtCore/QFile> -#include <QtCore/QTime> -#include <QtCore/QMutex> +#include <QFile> +#include <QTime> +#include <QMutex> #if defined(Q_OS_WIN32) #include <qt_windows.h> #else diff --git a/qtservice/src/qtservice.h b/qtservice/src/qtservice.h index 8b6188d..7aef0e4 100644 --- a/qtservice/src/qtservice.h +++ b/qtservice/src/qtservice.h @@ -41,7 +41,7 @@ #ifndef QTSERVICE_H #define QTSERVICE_H -#include <QtCore/QCoreApplication> +#include <QCoreApplication> #if defined(Q_WS_WIN) # if !defined(QT_QTSERVICE_EXPORT) && !defined(QT_QTSERVICE_IMPORT) diff --git a/qtservice/src/qtservice_p.h b/qtservice/src/qtservice_p.h index 621352c..d7c1537 100644 --- a/qtservice/src/qtservice_p.h +++ b/qtservice/src/qtservice_p.h @@ -41,7 +41,7 @@ #ifndef QTSERVICE_P_H #define QTSERVICE_P_H -#include <QtCore/QStringList> +#include <QStringList> #include "qtservice.h" class QtServiceControllerPrivate diff --git a/qtservice/src/qtservice_unix.cpp b/qtservice/src/qtservice_unix.cpp index 6207a20..d1d4ed0 100644 --- a/qtservice/src/qtservice_unix.cpp +++ b/qtservice/src/qtservice_unix.cpp @@ -42,11 +42,11 @@ #include "qtservice_p.h" #include "qtunixsocket.h" #include "qtunixserversocket.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QStringList> -#include <QtCore/QFile> -#include <QtCore/QTimer> -#include <QtCore/QDir> +#include <QCoreApplication> +#include <QStringList> +#include <QFile> +#include <QTimer> +#include <QDir> #include <pwd.h> #include <fcntl.h> #include <unistd.h> @@ -55,9 +55,9 @@ #include <syslog.h> #include <signal.h> #include <sys/stat.h> -#include <QtCore/QMap> -#include <QtCore/QSettings> -#include <QtCore/QProcess> +#include <QMap> +#include <QSettings> +#include <QProcess> static QString encodeName(const QString &name, bool allowUpper = false) { diff --git a/qtservice/src/qtservice_win.cpp b/qtservice/src/qtservice_win.cpp index a8913ba..05f2107 100644 --- a/qtservice/src/qtservice_win.cpp +++ b/qtservice/src/qtservice_win.cpp @@ -40,23 +40,23 @@ #include "qtservice.h" #include "qtservice_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDateTime> -#include <QtCore/QFile> -#include <QtCore/QLibrary> -#include <QtCore/QMutex> -#include <QtCore/QSemaphore> -#include <QtCore/QProcess> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> +#include <QCoreApplication> +#include <QDateTime> +#include <QFile> +#include <QLibrary> +#include <QMutex> +#include <QSemaphore> +#include <QProcess> +#include <QSettings> +#include <QTextStream> #include <qt_windows.h> -#include <QtCore/QWaitCondition> -#include <QtCore/QAbstractEventDispatcher> -#include <QtCore/QVector> -#include <QtCore/QThread> +#include <QWaitCondition> +#include <QAbstractEventDispatcher> +#include <QVector> +#include <QThread> #include <stdio.h> #if defined(QTSERVICE_DEBUG) -#include <QtCore/QDebug> +#include <QDebug> #endif typedef SERVICE_STATUS_HANDLE(WINAPI*PRegisterServiceCtrlHandler)(const wchar_t*,LPHANDLER_FUNCTION); diff --git a/qtservice/src/qtunixserversocket.h b/qtservice/src/qtunixserversocket.h index 8b15295..d7474f4 100644 --- a/qtservice/src/qtunixserversocket.h +++ b/qtservice/src/qtunixserversocket.h @@ -41,7 +41,7 @@ #ifndef QTUNIXSERVERSOCKET_H #define QTUNIXSERVERSOCKET_H -#include <QtNetwork/QTcpServer> +#include <QTcpServer> class QtUnixServerSocket : public QTcpServer { diff --git a/qtservice/src/qtunixsocket.h b/qtservice/src/qtunixsocket.h index 17cd602..9b43647 100644 --- a/qtservice/src/qtunixsocket.h +++ b/qtservice/src/qtunixsocket.h @@ -41,7 +41,7 @@ #ifndef QTUNIXSOCKET_H #define QTUNIXSOCKET_H -#include <QtNetwork/QTcpSocket> +#include <QTcpSocket> class QtUnixSocket : public QTcpSocket { diff --git a/qtsingleapplication/examples/console/main.cpp b/qtsingleapplication/examples/console/main.cpp index 36a8494..cdeaa8f 100644 --- a/qtsingleapplication/examples/console/main.cpp +++ b/qtsingleapplication/examples/console/main.cpp @@ -40,7 +40,7 @@ #include "qtsinglecoreapplication.h" -#include <QtCore/QDebug> +#include <QDebug> void report(const QString& msg) diff --git a/qtsingleapplication/examples/loader/main.cpp b/qtsingleapplication/examples/loader/main.cpp index 9686f21..6103abf 100644 --- a/qtsingleapplication/examples/loader/main.cpp +++ b/qtsingleapplication/examples/loader/main.cpp @@ -39,13 +39,13 @@ ****************************************************************************/ #include <qtsingleapplication.h> -#include <QtCore/QFile> -#include <QtGui/QMainWindow> -#include <QtGui/QPrinter> -#include <QtGui/QPainter> -#include <QtGui/QTextEdit> -#include <QtGui/QMdiArea> -#include <QtCore/QTextStream> +#include <QFile> +#include <QMainWindow> +#include <QPrinter> +#include <QPainter> +#include <QTextEdit> +#include <QMdiArea> +#include <QTextStream> class MainWindow : public QMainWindow { diff --git a/qtsingleapplication/examples/trivial/main.cpp b/qtsingleapplication/examples/trivial/main.cpp index 4b6b00f..47a9c09 100644 --- a/qtsingleapplication/examples/trivial/main.cpp +++ b/qtsingleapplication/examples/trivial/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <qtsingleapplication.h> -#include <QtGui/QTextEdit> +#include <QTextEdit> class TextEdit : public QTextEdit { diff --git a/qtsingleapplication/src/qtlocalpeer.cpp b/qtsingleapplication/src/qtlocalpeer.cpp index a2e8383..7fbe804 100644 --- a/qtsingleapplication/src/qtlocalpeer.cpp +++ b/qtsingleapplication/src/qtlocalpeer.cpp @@ -40,12 +40,12 @@ #include "qtlocalpeer.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QTime> +#include <QCoreApplication> +#include <QTime> #if defined(Q_OS_WIN) -#include <QtCore/QLibrary> -#include <QtCore/qt_windows.h> +#include <QLibrary> +#include <qt_windows.h> typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); static PProcessIdToSessionId pProcessIdToSessionId = 0; #endif diff --git a/qtsingleapplication/src/qtlocalpeer.h b/qtsingleapplication/src/qtlocalpeer.h index 2d95a95..e601f82 100644 --- a/qtsingleapplication/src/qtlocalpeer.h +++ b/qtsingleapplication/src/qtlocalpeer.h @@ -41,9 +41,9 @@ #ifndef QTLOCALPEER_H #define QTLOCALPEER_H -#include <QtNetwork/QLocalServer> -#include <QtNetwork/QLocalSocket> -#include <QtCore/QDir> +#include <QLocalServer> +#include <QLocalSocket> +#include <QDir> #include "qtlockedfile.h" diff --git a/qtsingleapplication/src/qtlockedfile.h b/qtsingleapplication/src/qtlockedfile.h index 3fe9f43..9c4b9e2 100644 --- a/qtsingleapplication/src/qtlockedfile.h +++ b/qtsingleapplication/src/qtlockedfile.h @@ -41,9 +41,9 @@ #ifndef QTLOCKEDFILE_H #define QTLOCKEDFILE_H -#include <QtCore/QFile> +#include <QFile> #ifdef Q_OS_WIN -#include <QtCore/QVector> +#include <QVector> #endif #if defined(Q_WS_WIN) diff --git a/qtsingleapplication/src/qtlockedfile_win.cpp b/qtsingleapplication/src/qtlockedfile_win.cpp index b527eef..d9bcd44 100644 --- a/qtsingleapplication/src/qtlockedfile_win.cpp +++ b/qtsingleapplication/src/qtlockedfile_win.cpp @@ -40,7 +40,7 @@ #include "qtlockedfile.h" #include <qt_windows.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> #define MUTEX_PREFIX "QtLockedFile mutex " // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS diff --git a/qtsingleapplication/src/qtsingleapplication.cpp b/qtsingleapplication/src/qtsingleapplication.cpp index 4a9a1e6..b5cfc2a 100644 --- a/qtsingleapplication/src/qtsingleapplication.cpp +++ b/qtsingleapplication/src/qtsingleapplication.cpp @@ -41,7 +41,7 @@ #include "qtsingleapplication.h" #include "qtlocalpeer.h" -#include <QtGui/QWidget> +#include <QWidget> /*! diff --git a/qtsingleapplication/src/qtsingleapplication.h b/qtsingleapplication/src/qtsingleapplication.h index 8980076..9ae0543 100644 --- a/qtsingleapplication/src/qtsingleapplication.h +++ b/qtsingleapplication/src/qtsingleapplication.h @@ -41,7 +41,7 @@ #ifndef QTSINGLEAPPLICATION_H #define QTSINGLEAPPLICATION_H -#include <QtGui/QApplication> +#include <QApplication> class QtLocalPeer; diff --git a/qtsingleapplication/src/qtsinglecoreapplication.h b/qtsingleapplication/src/qtsinglecoreapplication.h index c305c47..a9dc5b2 100644 --- a/qtsingleapplication/src/qtsinglecoreapplication.h +++ b/qtsingleapplication/src/qtsinglecoreapplication.h @@ -41,7 +41,7 @@ #ifndef QTSINGLECOREAPPLICATION_H #define QTSINGLECOREAPPLICATION_H -#include <QtCore/QCoreApplication> +#include <QCoreApplication> class QtLocalPeer; diff --git a/qtsoap/examples/easter/easter.cpp b/qtsoap/examples/easter/easter.cpp index 9f02f75..486bd5f 100644 --- a/qtsoap/examples/easter/easter.cpp +++ b/qtsoap/examples/easter/easter.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include <QtCore/QCoreApplication> -#include <QtCore/QLocale> +#include <QCoreApplication> +#include <QLocale> #include "easter.h" Easter::Easter(short year, QObject *parent) diff --git a/qtsoap/examples/easter/main.cpp b/qtsoap/examples/easter/main.cpp index 446e14c..1061ed9 100644 --- a/qtsoap/examples/easter/main.cpp +++ b/qtsoap/examples/easter/main.cpp @@ -43,8 +43,8 @@ Returns the date of easter in a given year. */ -#include <QtCore/QCoreApplication> -#include <QtCore/QFile> +#include <QCoreApplication> +#include <QFile> #include <stdlib.h> #include "easter.h" diff --git a/qtsoap/examples/google/google.cpp b/qtsoap/examples/google/google.cpp index 837830e..17f8839 100644 --- a/qtsoap/examples/google/google.cpp +++ b/qtsoap/examples/google/google.cpp @@ -38,15 +38,15 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtGui/QCursor> -#include <QtCore/QFile> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QTextBrowser> -#include <QtGui/QLayout> -#include <QtGui/QPushButton> +#include <QApplication> +#include <QMessageBox> +#include <QCursor> +#include <QFile> +#include <QLabel> +#include <QLineEdit> +#include <QTextBrowser> +#include <QLayout> +#include <QPushButton> #include "google.h" Google::Google(QWidget *parent) diff --git a/qtsoap/examples/google/google.h b/qtsoap/examples/google/google.h index 44301ed..8390ca9 100644 --- a/qtsoap/examples/google/google.h +++ b/qtsoap/examples/google/google.h @@ -40,7 +40,7 @@ #ifndef GOOGLE_H_INCLUDED #define GOOGLE_H_INCLUDED -#include <QtGui/QWidget> +#include <QWidget> #include <qtsoap.h> class QLineEdit; diff --git a/qtsoap/examples/google/main.cpp b/qtsoap/examples/google/main.cpp index e665e43..a301982 100644 --- a/qtsoap/examples/google/main.cpp +++ b/qtsoap/examples/google/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> #include "google.h" int main(int argc, char **argv) diff --git a/qtsoap/examples/population/main.cpp b/qtsoap/examples/population/main.cpp index 2a5f4ac..79e2b7c 100644 --- a/qtsoap/examples/population/main.cpp +++ b/qtsoap/examples/population/main.cpp @@ -45,7 +45,7 @@ the daily world population estimate, and the list of available countries. */ -#include <QtGui/QApplication> +#include <QApplication> #include "population.h" #define USAGE1 QT_TRANSLATE_NOOP("Population::main", "XMethods' interface to a World Population .NET service.") diff --git a/qtsoap/examples/population/population.cpp b/qtsoap/examples/population/population.cpp index 9c936b1..6c34e30 100644 --- a/qtsoap/examples/population/population.cpp +++ b/qtsoap/examples/population/population.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> #include "population.h" Population::Population(const QString &country, QObject *parent) diff --git a/qtsoap/src/qtsoap.cpp b/qtsoap/src/qtsoap.cpp index 5dc2a34..97c1ccc 100644 --- a/qtsoap/src/qtsoap.cpp +++ b/qtsoap/src/qtsoap.cpp @@ -39,9 +39,9 @@ ****************************************************************************/ #include "qtsoap.h" -#include <QtCore/QSet> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QNetworkReply> +#include <QSet> +#include <QNetworkRequest> +#include <QNetworkReply> /*! \page qtsoap-overview.html diff --git a/qtsoap/src/qtsoap.h b/qtsoap/src/qtsoap.h index 53a0e94..51c0347 100644 --- a/qtsoap/src/qtsoap.h +++ b/qtsoap/src/qtsoap.h @@ -40,14 +40,14 @@ #ifndef QTSOAP_H #define QTSOAP_H -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtXml/QtXml> -#include <QtNetwork/QNetworkAccessManager> -#include <QtCore/QUrl> -#include <QtCore/QHash> -#include <QtCore/QLinkedList> -#include <QtCore/QPointer> +#include <QString> +#include <QVariant> +#include <QtXml> +#include <QNetworkAccessManager> +#include <QUrl> +#include <QHash> +#include <QLinkedList> +#include <QPointer> #if defined(Q_WS_WIN) # if !defined(QT_QTSOAP_EXPORT) && !defined(QT_QTSOAP_IMPORT) diff --git a/qtwinmigrate/examples/mfc/step3/qtmfc.cpp b/qtwinmigrate/examples/mfc/step3/qtmfc.cpp index 36f11e4..d0a4fab 100644 --- a/qtwinmigrate/examples/mfc/step3/qtmfc.cpp +++ b/qtwinmigrate/examples/mfc/step3/qtmfc.cpp @@ -48,7 +48,7 @@ #include <qmfcapp.h> #include <qwinwidget.h> -#include <QtGui/QMessageBox> +#include <QMessageBox> #ifdef _DEBUG #define new DEBUG_NEW diff --git a/qtwinmigrate/examples/mfc/step4/childview.cpp b/qtwinmigrate/examples/mfc/step4/childview.cpp index 71b120f..a8ca694 100644 --- a/qtwinmigrate/examples/mfc/step4/childview.cpp +++ b/qtwinmigrate/examples/mfc/step4/childview.cpp @@ -46,9 +46,9 @@ #include "childview.h" #include <qwinwidget.h> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QLayout> +#include <QLabel> +#include <QLineEdit> +#include <QLayout> #ifdef _DEBUG #define new DEBUG_NEW diff --git a/qtwinmigrate/examples/mfc/step4/qtmfc.cpp b/qtwinmigrate/examples/mfc/step4/qtmfc.cpp index 97bc31d..a0f38c6 100644 --- a/qtwinmigrate/examples/mfc/step4/qtmfc.cpp +++ b/qtwinmigrate/examples/mfc/step4/qtmfc.cpp @@ -48,7 +48,7 @@ #include <qmfcapp.h> #include <qwinwidget.h> -#include <QtGui/QMessageBox> +#include <QMessageBox> #include "ui_optionsdialog.h" #ifdef _DEBUG diff --git a/qtwinmigrate/examples/mfc/step5/childview.cpp b/qtwinmigrate/examples/mfc/step5/childview.cpp index 33ee139..3a89e2a 100644 --- a/qtwinmigrate/examples/mfc/step5/childview.cpp +++ b/qtwinmigrate/examples/mfc/step5/childview.cpp @@ -43,10 +43,10 @@ #include "childview.h" -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QLayout> -#include <QtGui/QPainter> +#include <QLabel> +#include <QLineEdit> +#include <QLayout> +#include <QPainter> ///////////////////////////////////////////////////////////////////////////// // ChildView diff --git a/qtwinmigrate/examples/mfc/step5/childview.h b/qtwinmigrate/examples/mfc/step5/childview.h index 86fe54b..717d7ee 100644 --- a/qtwinmigrate/examples/mfc/step5/childview.h +++ b/qtwinmigrate/examples/mfc/step5/childview.h @@ -45,7 +45,7 @@ #ifndef CHILDVIEW_H #define CHILDVIEW_H -#include <QtGui/QWidget> +#include <QWidget> class ChildView : public QWidget { diff --git a/qtwinmigrate/examples/mfc/step5/mainframe.h b/qtwinmigrate/examples/mfc/step5/mainframe.h index 41de873..d69eafd 100644 --- a/qtwinmigrate/examples/mfc/step5/mainframe.h +++ b/qtwinmigrate/examples/mfc/step5/mainframe.h @@ -45,7 +45,7 @@ #ifndef MAINFRAME_H #define MAINFRAME_H -#include <QtGui/QMainWindow> +#include <QMainWindow> class ChildView; diff --git a/qtwinmigrate/examples/mfc/step5/qtmfc.cpp b/qtwinmigrate/examples/mfc/step5/qtmfc.cpp index bd9503c..e44a0d7 100644 --- a/qtwinmigrate/examples/mfc/step5/qtmfc.cpp +++ b/qtwinmigrate/examples/mfc/step5/qtmfc.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> #include "mainframe.h" int main(int argc, char **argv) diff --git a/qtwinmigrate/examples/qtdll/main.cpp b/qtwinmigrate/examples/qtdll/main.cpp index 6169de3..b7df487 100644 --- a/qtwinmigrate/examples/qtdll/main.cpp +++ b/qtwinmigrate/examples/qtdll/main.cpp @@ -41,7 +41,7 @@ #include <qmfcapp.h> #include <qwinwidget.h> -#include <QtGui/QMessageBox> +#include <QMessageBox> #include <windows.h> BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpvReserved*/ ) diff --git a/qtwinmigrate/src/qmfcapp.cpp b/qtwinmigrate/src/qmfcapp.cpp index a8b5b85..8bdd263 100644 --- a/qtwinmigrate/src/qmfcapp.cpp +++ b/qtwinmigrate/src/qmfcapp.cpp @@ -50,9 +50,9 @@ #include "qmfcapp.h" -#include <QtCore/QEventLoop> -#include <QtCore/QAbstractEventDispatcher> -#include <QtGui/QWidget> +#include <QEventLoop> +#include <QAbstractEventDispatcher> +#include <QWidget> #ifdef QTWINMIGRATE_WITHMFC #include <afxwin.h> diff --git a/qtwinmigrate/src/qmfcapp.h b/qtwinmigrate/src/qmfcapp.h index 8d91d69..cb2b022 100644 --- a/qtwinmigrate/src/qmfcapp.h +++ b/qtwinmigrate/src/qmfcapp.h @@ -44,7 +44,7 @@ #ifndef QMFCAPP_H #define QMFCAPP_H -#include <QtGui/QApplication> +#include <QApplication> #if defined(_AFXDLL) && defined(_MSC_VER) #define QTWINMIGRATE_WITHMFC diff --git a/qtwinmigrate/src/qwinhost.cpp b/qtwinmigrate/src/qwinhost.cpp index bea1b96..f521dcf 100644 --- a/qtwinmigrate/src/qwinhost.cpp +++ b/qtwinmigrate/src/qwinhost.cpp @@ -46,7 +46,7 @@ #include "qwinhost.h" -#include <QtCore/QEvent> +#include <QEvent> #include <qt_windows.h> /*! diff --git a/qtwinmigrate/src/qwinhost.h b/qtwinmigrate/src/qwinhost.h index 346fcf9..1c55984 100644 --- a/qtwinmigrate/src/qwinhost.h +++ b/qtwinmigrate/src/qwinhost.h @@ -44,7 +44,7 @@ #ifndef QWINHOST_H #define QWINHOST_H -#include <QtGui/QWidget> +#include <QWidget> #if defined(Q_WS_WIN) # if !defined(QT_QTWINMIGRATE_EXPORT) && !defined(QT_QTWINMIGRATE_IMPORT) diff --git a/qtwinmigrate/src/qwinwidget.h b/qtwinmigrate/src/qwinwidget.h index 5d068ec..1ece708 100644 --- a/qtwinmigrate/src/qwinwidget.h +++ b/qtwinmigrate/src/qwinwidget.h @@ -44,7 +44,7 @@ #ifndef QWINWIDGET_H #define QWINWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> #include "qmfcapp.h" class CWnd; |