summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@nokia.com>2010-12-07 13:29:28 (GMT)
committerRobert Griebl <robert.griebl@nokia.com>2010-12-15 17:44:56 (GMT)
commit32d200da9cc7a4dfb3f302f22ef5718a286845c9 (patch)
treed68a9b8e3d25e70b5e4cec408f79ff1cee3392fc /examples
parent567bcd38dd7a749ac0bc3cdd2432798ab1af74fe (diff)
downloadQt-32d200da9cc7a4dfb3f302f22ef5718a286845c9.zip
Qt-32d200da9cc7a4dfb3f302f22ef5718a286845c9.tar.gz
Qt-32d200da9cc7a4dfb3f302f22ef5718a286845c9.tar.bz2
Make QScroller examples Qt-namespace safe.
Diffstat (limited to 'examples')
-rw-r--r--examples/scroller/plot/plotwidget.h3
-rw-r--r--examples/scroller/plot/settingswidget.h2
-rw-r--r--examples/scroller/wheel/wheelwidget.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/examples/scroller/plot/plotwidget.h b/examples/scroller/plot/plotwidget.h
index 3b4d92d..4987ebc 100644
--- a/examples/scroller/plot/plotwidget.h
+++ b/examples/scroller/plot/plotwidget.h
@@ -45,10 +45,11 @@
#include <QWidget>
#include <QPointF>
+QT_BEGIN_NAMESPACE
class QPushButton;
class QLabel;
-
class QScroller;
+QT_END_NAMESPACE
class PlotWidget : public QWidget
{
diff --git a/examples/scroller/plot/settingswidget.h b/examples/scroller/plot/settingswidget.h
index 2fb268c..0ea201d 100644
--- a/examples/scroller/plot/settingswidget.h
+++ b/examples/scroller/plot/settingswidget.h
@@ -44,12 +44,14 @@
#include <QScrollArea>
+QT_BEGIN_NAMESPACE
class QScroller;
class QGridLayout;
class QSpinBox;
class QComboBox;
class QCheckBox;
class QPlainTextEdit;
+QT_END_NAMESPACE
class MetricItemUpdater;
class SnapOverlay;
diff --git a/examples/scroller/wheel/wheelwidget.h b/examples/scroller/wheel/wheelwidget.h
index 818b6ab..c50f951 100644
--- a/examples/scroller/wheel/wheelwidget.h
+++ b/examples/scroller/wheel/wheelwidget.h
@@ -45,8 +45,10 @@
#include <QWidget>
#include <QStringList>
+QT_BEGIN_NAMESPACE
class QPainter;
class QRect;
+QT_END_NAMESPACE
class AbstractWheelWidget : public QWidget {
Q_OBJECT