summaryrefslogtreecommitdiffstats
path: root/qtwinmigrate
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-12-28 20:42:13 +1100
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2012-12-29 20:20:47 +0100
commit534707f5288181af50a5f560a0a26601fdd01531 (patch)
treea51f2be5403280469424e8d8556ff0812a6e7d05 /qtwinmigrate
parent59cd338c351d444cf727ae59372121abebbbec4e (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>
Diffstat (limited to 'qtwinmigrate')
-rw-r--r--qtwinmigrate/examples/mfc/step3/qtmfc.cpp2
-rw-r--r--qtwinmigrate/examples/mfc/step4/childview.cpp6
-rw-r--r--qtwinmigrate/examples/mfc/step4/qtmfc.cpp2
-rw-r--r--qtwinmigrate/examples/mfc/step5/childview.cpp8
-rw-r--r--qtwinmigrate/examples/mfc/step5/childview.h2
-rw-r--r--qtwinmigrate/examples/mfc/step5/mainframe.h2
-rw-r--r--qtwinmigrate/examples/mfc/step5/qtmfc.cpp2
-rw-r--r--qtwinmigrate/examples/qtdll/main.cpp2
-rw-r--r--qtwinmigrate/src/qmfcapp.cpp6
-rw-r--r--qtwinmigrate/src/qmfcapp.h2
-rw-r--r--qtwinmigrate/src/qwinhost.cpp2
-rw-r--r--qtwinmigrate/src/qwinhost.h2
-rw-r--r--qtwinmigrate/src/qwinwidget.h2
13 files changed, 20 insertions, 20 deletions
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;