summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-09-07 16:36:49 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-09-07 16:36:49 (GMT)
commit415ad7b69d364c41156d35b98790b02667a6671b (patch)
tree759b02134da808773a1d68eecf2eb5c0ff12167c /examples
parent3c18c2a43260a271f8a13e89053eede15d399005 (diff)
parent703d85e8991e2061062f6d7c695cdeb45d9661fd (diff)
downloadQt-415ad7b69d364c41156d35b98790b02667a6671b.zip
Qt-415ad7b69d364c41156d35b98790b02667a6671b.tar.gz
Qt-415ad7b69d364c41156d35b98790b02667a6671b.tar.bz2
Merge branch '4.7' into qmldocs
Diffstat (limited to 'examples')
-rwxr-xr-xexamples/tutorials/modelview/3_changingmodel/mymodel.h3
-rwxr-xr-xexamples/tutorials/modelview/5_edit/mainwindow.h3
-rwxr-xr-xexamples/tutorials/modelview/6_treeview/mainwindow.h6
-rwxr-xr-xexamples/tutorials/modelview/7_selections/mainwindow.h6
4 files changed, 6 insertions, 12 deletions
diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h
index 47b026e..87c3dba 100755
--- a/examples/tutorials/modelview/3_changingmodel/mymodel.h
+++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h
@@ -42,8 +42,7 @@
#define MYMODEL_H
#include <QAbstractTableModel>
-
-class QTimer; // forward declaration
+#include <QTimer>
class MyModel : public QAbstractTableModel
{
diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h
index 1d49f47..ac5b77b 100755
--- a/examples/tutorials/modelview/5_edit/mainwindow.h
+++ b/examples/tutorials/modelview/5_edit/mainwindow.h
@@ -42,8 +42,7 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-
-class QTableView; //forward declaration
+#include <QtGui/QTableView>
class MainWindow : public QMainWindow
{
diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h
index fb8de79..4c4ddb0 100755
--- a/examples/tutorials/modelview/6_treeview/mainwindow.h
+++ b/examples/tutorials/modelview/6_treeview/mainwindow.h
@@ -42,10 +42,8 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-
-class QTreeView; //forward declaration
-class QStandardItemModel;
-class QStandardItem;
+#include <QtGui/QTreeView>
+#include <QtGui/QStandardItemModel>
class MainWindow : public QMainWindow
diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h
index f2defb5..a8f8488 100755
--- a/examples/tutorials/modelview/7_selections/mainwindow.h
+++ b/examples/tutorials/modelview/7_selections/mainwindow.h
@@ -42,10 +42,8 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-
-class QTreeView; //forward declaration
-class QStandardItemModel;
-class QItemSelection;
+#include <QtGui/QTreeView>
+#include <QtGui/QStandardItemModel>
class MainWindow : public QMainWindow