summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRoland Wolf <ext-roland.wolf@nokia.com>2010-09-06 14:23:27 (GMT)
committerRoland Wolf <ext-roland.wolf@nokia.com>2010-09-08 10:26:32 (GMT)
commit461c27265a812ccadb707151afbf22a1874cce04 (patch)
treedacbd9e0558e3ede94698b072b00dd795a47d3de /examples
parent3d247e0ae09bcd1b75f92a587ab5b28569a3f0f6 (diff)
downloadQt-461c27265a812ccadb707151afbf22a1874cce04.zip
Qt-461c27265a812ccadb707151afbf22a1874cce04.tar.gz
Qt-461c27265a812ccadb707151afbf22a1874cce04.tar.bz2
fix for compilation with namespace
Diffstat (limited to 'examples')
-rwxr-xr-xexamples/tutorials/modelview/3_changingmodel/mymodel.h6
-rwxr-xr-xexamples/tutorials/modelview/5_edit/mainwindow.h6
-rwxr-xr-xexamples/tutorials/modelview/6_treeview/mainwindow.h8
-rwxr-xr-xexamples/tutorials/modelview/7_selections/mainwindow.h8
4 files changed, 22 insertions, 6 deletions
diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h
index 87c3dba..91e3cb9 100755
--- a/examples/tutorials/modelview/3_changingmodel/mymodel.h
+++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h
@@ -42,7 +42,11 @@
#define MYMODEL_H
#include <QAbstractTableModel>
-#include <QTimer>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTimer; // forward declaration
+QT_END_NAMESPACE
+
class MyModel : public QAbstractTableModel
{
diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h
index ac5b77b..41b15d1 100755
--- a/examples/tutorials/modelview/5_edit/mainwindow.h
+++ b/examples/tutorials/modelview/5_edit/mainwindow.h
@@ -42,7 +42,11 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-#include <QtGui/QTableView>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTableView; //forward declaration
+QT_END_NAMESPACE
+
class MainWindow : public QMainWindow
{
diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h
index 4c4ddb0..dcc9284 100755
--- a/examples/tutorials/modelview/6_treeview/mainwindow.h
+++ b/examples/tutorials/modelview/6_treeview/mainwindow.h
@@ -42,8 +42,12 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-#include <QtGui/QTreeView>
-#include <QtGui/QStandardItemModel>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTreeView; //forward declarations
+class QStandardItemModel;
+class QStandardItem;
+QT_END_NAMESPACE
class MainWindow : public QMainWindow
diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h
index a8f8488..5dc973c 100755
--- a/examples/tutorials/modelview/7_selections/mainwindow.h
+++ b/examples/tutorials/modelview/7_selections/mainwindow.h
@@ -42,8 +42,12 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-#include <QtGui/QTreeView>
-#include <QtGui/QStandardItemModel>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTreeView; //forward declarations
+class QStandardItemModel;
+class QItemSelection;
+QT_END_NAMESPACE
class MainWindow : public QMainWindow