diff options
author | hjk <qtc-committer@nokia.com> | 2010-02-24 09:54:34 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2010-02-24 09:54:34 +0100 |
commit | 7c790c1e1b2221b7cb5abb25cf9c2e2f1a53c547 (patch) | |
tree | 607d4d035737b5852edda1c1dc7910e7fbd8151f /src | |
parent | fab70e72eb362cac57d8dfd35a5116228c2df731 (diff) | |
download | qt-creator-7c790c1e1b2221b7cb5abb25cf9c2e2f1a53c547.tar.gz |
compile fix with namespaces
Diffstat (limited to 'src')
11 files changed, 5 insertions, 28 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h index 1a17812dcd..5ed56d0357 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h +++ b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h @@ -166,13 +166,12 @@ public: QVBoxLayoutObject(QObject *parent=0); }; +QT_END_NAMESPACE QML_DECLARE_TYPE(QBoxLayoutObject); QML_DECLARE_TYPE(QHBoxLayoutObject); QML_DECLARE_TYPE(QVBoxLayoutObject); -QT_END_NAMESPACE - QT_END_HEADER #endif // BASICLAYOUTS_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index 371317d475..4024e0b09b 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -46,9 +46,6 @@ #include <QGraphicsOpacityEffect> -QT_BEGIN_NAMESPACE - - class QWidgetDeclarativeUI; class ResizeEventFilter : public QObject @@ -1205,6 +1202,4 @@ QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QMenu,QMenu, QMenuDeclarativeUI) QML_DECLARE_TYPE(QTabObject); QML_DEFINE_TYPE(Qt,4,6,QTabObject,QTabObject); //### with namespacing, this should just be 'Tab' -QT_END_NAMESPACE - #include "basicwidgets.moc" diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h index a59b8fa8ee..df14c27721 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h @@ -57,8 +57,6 @@ #include "filewidget.h" #include "layoutwidget.h" -QT_BEGIN_NAMESPACE - QML_DECLARE_TYPE(QWidget); //display @@ -114,6 +112,4 @@ QML_DECLARE_TYPE(Action); //top-level windows? -QT_END_NAMESPACE - #endif // BASICWIDGETS_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h index 45b71d6eb6..dfc763b4e3 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h @@ -93,8 +93,6 @@ private: }; -QT_BEGIN_NAMESPACE QML_DECLARE_TYPE(QmlDesigner::BehaviorWidget); -QT_END_NAMESPACE #endif// BEHAVIORDIALOG_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h index 272e9ace65..0a0ab8adb8 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h @@ -284,10 +284,8 @@ private: } //QmlDesigner -QT_BEGIN_NAMESPACE QML_DECLARE_TYPE(QmlDesigner::ColorButton); QML_DECLARE_TYPE(QmlDesigner::HueControl); QML_DECLARE_TYPE(QmlDesigner::ColorBox); -QT_END_NAMESPACE #endif //COLORWIDGET_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.h b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.h index bb30aa630d..d04e5e4e33 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.h @@ -96,8 +96,6 @@ private: //variables } // namespace QmlDesigner -QT_BEGIN_NAMESPACE QML_DECLARE_TYPE(QmlDesigner::FontWidget); -QT_END_NAMESPACE #endif // FONTWIDGET_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h index 3b5b7fbd09..ffce1be50e 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h @@ -146,11 +146,8 @@ private: //variables QmlDesigner::RewriterTransaction m_rewriterTransaction; }; -QT_BEGIN_NAMESPACE QML_DECLARE_TYPE(PropertyEditorValue); QML_DECLARE_TYPE(PropertyEditorNodeWrapper); QML_DECLARE_TYPE(QmlPropertyMap); -QT_END_NAMESPACE - #endif // PROPERTYEDITORVALUE_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h index be4ea3dd91..13b79862b4 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h +++ b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h @@ -49,10 +49,10 @@ public: virtual QLayout *layout() const; }; -QML_DECLARE_TYPE(QLayoutObject); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QLayoutObject); + QT_END_HEADER #endif // QLAYOUTOBJECT_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h b/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h index 1e296e5658..704c29320c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h +++ b/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h @@ -87,11 +87,11 @@ private: QGraphicsLayoutItem *other; }; +QT_END_NAMESPACE + QML_DECLARE_TYPE(QProxyLayout); QML_DECLARE_TYPE(QProxyLayoutItem); -QT_END_NAMESPACE - QT_END_HEADER #endif // QPROXYLAYOUTITEM_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp index c1fdccdab1..1216953e48 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp @@ -40,10 +40,8 @@ #include <QDebug> #include <QApplication> -QT_BEGIN_NAMESPACE QML_DECLARE_TYPE(QmlDesigner::ResetWidget); QML_DEFINE_TYPE(Bauhaus, 1, 0, ResetWidget, QmlDesigner::ResetWidget); -QT_END_NAMESPACE namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.h b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.h index ec70d21c7a..a928621ce6 100644 --- a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.h +++ b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.h @@ -98,8 +98,6 @@ protected: } // namespace Internal } // namespace QmlDesigner -QT_BEGIN_NAMESPACE QML_DECLARE_TYPE(QmlDesigner::Internal::QmlPropertyChangesObject) -QT_END_NAMESPACE #endif // QMLPROPERTYCHANGESNODEINSTANCE_H |