Commit 7c790c1e authored by hjk's avatar hjk
Browse files

compile fix with namespaces

parent fab70e72
......@@ -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
......@@ -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"
......@@ -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
......@@ -93,8 +93,6 @@ private:
};
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlDesigner::BehaviorWidget);
QT_END_NAMESPACE
#endif// BEHAVIORDIALOG_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
......@@ -96,8 +96,6 @@ private: //variables
} // namespace QmlDesigner
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlDesigner::FontWidget);
QT_END_NAMESPACE
#endif // FONTWIDGET_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
......@@ -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
......@@ -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
......
......@@ -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 {
......
......@@ -98,8 +98,6 @@ protected:
} // namespace Internal
} // namespace QmlDesigner
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlDesigner::Internal::QmlPropertyChangesObject)
QT_END_NAMESPACE
#endif // QMLPROPERTYCHANGESNODEINSTANCE_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment