diff options
author | Roland Wolf <ext-roland.wolf@nokia.com> | 2010-09-06 16:23:27 +0200 |
---|---|---|
committer | Roland Wolf <ext-roland.wolf@nokia.com> | 2010-09-08 12:26:32 +0200 |
commit | 461c27265a812ccadb707151afbf22a1874cce04 (patch) | |
tree | dacbd9e0558e3ede94698b072b00dd795a47d3de /examples/tutorials | |
parent | 3d247e0ae09bcd1b75f92a587ab5b28569a3f0f6 (diff) | |
download | qt4-tools-461c27265a812ccadb707151afbf22a1874cce04.tar.gz |
fix for compilation with namespace
Diffstat (limited to 'examples/tutorials')
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 87c3dba5f8..91e3cb99ba 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 ac5b77b10d..41b15d127f 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 4c4ddb0bf3..dcc9284514 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 a8f8488175..5dc973c33b 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 |