Reorder widgets alphabetiaclly

diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp
index a0a622b..7c04415 100644 (file)
--- a/declarativeobjects.cpp
+++ b/declarativeobjects.cpp
@@ -138,6 +138,8 @@ void AbstractDeclarativeObject::data_clear(QDeclarativeListProperty<QObject> *pr
     qWarning("cast went wrong in data_clear");
 }
 
+//// Layouts ////
+
 // DeclarativeHBoxLayout
 DeclarativeHBoxLayout::DeclarativeHBoxLayout(QObject *parent) : DeclarativeBoxLayout<QHBoxLayout>(parent)
 {
@@ -154,13 +156,15 @@ DeclarativeVBoxLayout::DeclarativeVBoxLayout(QObject *parent) : DeclarativeBoxLa
 
 CUSTOM_METAOBJECT(DeclarativeVBoxLayout, QVBoxLayout)
 
-// DeclarativeWidget
-DeclarativeWidget::DeclarativeWidget(QObject *parent) : DeclarativeWidgetProxy<QWidget>(parent)
+//// Widgets ////
+
+// DeclarativeCheckBox
+DeclarativeCheckBox::DeclarativeCheckBox(QObject *parent) : DeclarativeWidgetProxy<QCheckBox>(parent)
 {
   connectAllSignals(m_proxiedObject, this);
 }
 
-CUSTOM_METAOBJECT(DeclarativeWidget, QWidget)
+CUSTOM_METAOBJECT(DeclarativeCheckBox, QCheckBox)
 
 // DeclarativeLabel
 DeclarativeLabel::DeclarativeLabel(QObject *parent) : DeclarativeWidgetProxy<QLabel>(parent)
@@ -170,6 +174,22 @@ DeclarativeLabel::DeclarativeLabel(QObject *parent) : DeclarativeWidgetProxy<QLa
 
 CUSTOM_METAOBJECT(DeclarativeLabel, QLabel)
 
+// DeclarativePushButton
+DeclarativePushButton::DeclarativePushButton(QObject *parent) : DeclarativeWidgetProxy<QPushButton>(parent)
+{
+  connectAllSignals(m_proxiedObject, this);
+}
+
+CUSTOM_METAOBJECT(DeclarativePushButton, QPushButton)
+
+// DeclarativeSlider
+DeclarativeSlider::DeclarativeSlider(QObject *parent) : DeclarativeWidgetProxy<QSlider>(parent)
+{
+  connectAllSignals(m_proxiedObject, this);
+}
+
+CUSTOM_METAOBJECT(DeclarativeSlider, QSlider)
+
 // DeclarativeTabWidget
 class TabWidgetTabHeader::Private
 {
@@ -250,26 +270,11 @@ TabWidgetTabHeader *DeclarativeTabWidget::qmlAttachedProperties(QObject *object)
 
 CUSTOM_METAOBJECT(DeclarativeTabWidget, QTabWidget)
 
-// DeclarativePushButton
-DeclarativePushButton::DeclarativePushButton(QObject *parent) : DeclarativeWidgetProxy<QPushButton>(parent)
-{
-  connectAllSignals(m_proxiedObject, this);
-}
-
-CUSTOM_METAOBJECT(DeclarativePushButton, QPushButton)
-
-// DeclarativeCheckBox
-DeclarativeCheckBox::DeclarativeCheckBox(QObject *parent) : DeclarativeWidgetProxy<QCheckBox>(parent)
+// DeclarativeWidget
+DeclarativeWidget::DeclarativeWidget(QObject *parent) : DeclarativeWidgetProxy<QWidget>(parent)
 {
   connectAllSignals(m_proxiedObject, this);
 }
 
-CUSTOM_METAOBJECT(DeclarativeCheckBox, QCheckBox)
-
-// DeclarativeSlider
-DeclarativeSlider::DeclarativeSlider(QObject *parent) : DeclarativeWidgetProxy<QSlider>(parent)
-{
-  connectAllSignals(m_proxiedObject, this);
-}
+CUSTOM_METAOBJECT(DeclarativeWidget, QWidget)
 
-CUSTOM_METAOBJECT(DeclarativeSlider, QSlider)

diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h
index e8144b7..f8bcf44 100644 (file)
--- a/declarativeobjects_p.h
+++ b/declarativeobjects_p.h
@@ -137,6 +137,7 @@ class DeclarativeWidgetProxy : public DeclarativeObjectProxy<T>
     }
 };
 
+//// Layouts ////
 template <class T>
 class DeclarativeBoxLayout : public DeclarativeObjectProxy<T>
 {
@@ -183,12 +184,13 @@ class DeclarativeVBoxLayout : public DeclarativeBoxLayout<QVBoxLayout>
     DeclarativeVBoxLayout(QObject *parent = 0);
 };
 
-class DeclarativeWidget : public DeclarativeWidgetProxy<QWidget>
+//// Widgets ////
+class DeclarativeCheckBox : public DeclarativeWidgetProxy<QCheckBox>
 {
   DECLARATIVE_OBJECT
 
   public:
-    DeclarativeWidget(QObject *parent = 0);
+    DeclarativeCheckBox(QObject *parent = 0);
 };
 
 class DeclarativeLabel : public DeclarativeWidgetProxy<QLabel>
@@ -199,6 +201,21 @@ class DeclarativeLabel : public DeclarativeWidgetProxy<QLabel>
     DeclarativeLabel(QObject *parent = 0);
 };
 
+class DeclarativePushButton : public DeclarativeWidgetProxy<QPushButton>
+{
+  DECLARATIVE_OBJECT
+
+  public:
+    DeclarativePushButton(QObject *parent = 0);
+};
+
+class DeclarativeSlider : public DeclarativeWidgetProxy<QSlider>
+{
+  DECLARATIVE_OBJECT
+
+  public:
+    DeclarativeSlider(QObject *parent = 0);
+};
 
 // attached property for DeclarativeTabWidget
 class TabWidgetTabHeader : public QObject
@@ -243,48 +260,12 @@ class DeclarativeTabWidget : public DeclarativeWidgetProxy<QTabWidget>
 
 QML_DECLARE_TYPEINFO(DeclarativeTabWidget, QML_HAS_ATTACHED_PROPERTIES)
 
-/*
-class DeclarativeTab : public DeclarativeWidget
-{
-  DECLARATIVE_OBJECT
-
-  public:
-    DeclarativeTab(QObject *parent = 0);
-    ~DeclarativeTab();
-
-    virtual QObject* object();
-
-  private:
-    virtual void dataAppend(QObject *);
-    virtual int dataCount();
-    virtual QObject *dataAt(int);
-    virtual void dataClear();
-
-    QObject* m_child;
-};
-*/
-class DeclarativePushButton : public DeclarativeWidgetProxy<QPushButton>
-{
-  DECLARATIVE_OBJECT
-
-  public:
-    DeclarativePushButton(QObject *parent = 0);
-};
-
-class DeclarativeCheckBox : public DeclarativeWidgetProxy<QCheckBox>
-{
-  DECLARATIVE_OBJECT
-
-  public:
-    DeclarativeCheckBox(QObject *parent = 0);
-};
-
-class DeclarativeSlider : public DeclarativeWidgetProxy<QSlider>
+class DeclarativeWidget : public DeclarativeWidgetProxy<QWidget>
 {
   DECLARATIVE_OBJECT
 
   public:
-    DeclarativeSlider(QObject *parent = 0);
+    DeclarativeWidget(QObject *parent = 0);
 };
 
 #endif

diff --git a/qwidgets.list b/qwidgets.list
index b2cc9c2..6285e3f 100644 (file)
--- a/qwidgets.list
+++ b/qwidgets.list
@@ -1,7 +1,5 @@
-qboxlayout.h
 qbuttongroup.h
 qcalendarwidget.h
-qcheckbox.h
 qcolordialog.h
 qcolumnview.h
 qcombobox.h
@@ -23,7 +21,6 @@ qgridlayout.h
 qgroupbox.h
 qheaderview.h
 qinputdialog.h
-qlabel.h
 qlayout.h
 qlayoutitem.h
 qlcdnumber.h
@@ -44,11 +41,9 @@ qprintpreviewdialog.h
 qprintpreviewwidget.h
 qprogressbar.h
 qprogressdialog.h
-qpushbutton.h
 qradiobutton.h
 qscrollarea.h
 qscrollbar.h
-qslider.h
 qspinbox.h
 qsplashscreen.h
 qsplitter.h
@@ -67,5 +62,4 @@ qtoolbutton.h
 qtreeview.h
 qtreewidget.h
 qundoview.h
-qwidget.h
 qwizard.h