diff options
Diffstat (limited to 'src/declarative/util/qfxview.h')
| -rw-r--r-- | src/declarative/util/qfxview.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/util/qfxview.h b/src/declarative/util/qfxview.h index c658f07..d2cacf4 100644 --- a/src/declarative/util/qfxview.h +++ b/src/declarative/util/qfxview.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef _QFXVIEW_H_ -#define _QFXVIEW_H_ +#ifndef QFXVIEW_H +#define QFXVIEW_H #include <qfxglobal.h> #include <QtCore/qdatetime.h> @@ -48,12 +48,12 @@ #include <QtGui/qwidget.h> #include <qsimplecanvas.h> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) + class QFxItem; class QmlEngine; class QmlContext; @@ -70,14 +70,14 @@ public: virtual ~QFxView(); void setUrl(const QUrl&); - void setXml(const QString &xml, const QString &filename=QString()); - QString xml() const; + void setQml(const QString &qml, const QString &filename=QString()); + QString qml() const; QmlEngine* engine(); QmlContext* rootContext(); virtual void execute(); virtual void reset(); - virtual QFxItem* addItem(const QString &xml, QFxItem* parent=0); + virtual QFxItem* addItem(const QString &qml, QFxItem* parent=0); virtual void clearItems(); virtual QFxItem *root() const; @@ -102,8 +102,8 @@ private: QFxViewPrivate *d; }; - QT_END_NAMESPACE QT_END_HEADER -#endif // _QFXVIEW_H_ + +#endif // QFXVIEW_H |