Adapt attached properties to common naming scheme

diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp
index d2654f9..c1d8f99 100644 (file)
--- a/declarativeobjects.cpp
+++ b/declarativeobjects.cpp
@@ -406,24 +406,24 @@ DeclarativeStatusBarAttached *DeclarativeStatusBar::qmlAttachedProperties(QObjec
 CUSTOM_METAOBJECT(DeclarativeStatusBar, QStatusBar)
 
 // DeclarativeTabWidget
-class TabWidgetTabHeader::Private
+class DeclarativeTabWidgetAttached::Private
 {
   public:
     QString label;
     QIcon icon;
 };
 
-TabWidgetTabHeader::TabWidgetTabHeader(QObject *parent)
-  : QObject(parent), d(new TabWidgetTabHeader::Private)
+DeclarativeTabWidgetAttached::DeclarativeTabWidgetAttached(QObject *parent)
+  : QObject(parent), d(new DeclarativeTabWidgetAttached::Private)
 {
 }
 
-TabWidgetTabHeader::~TabWidgetTabHeader()
+DeclarativeTabWidgetAttached::~DeclarativeTabWidgetAttached()
 {
   delete d;
 }
 
-void TabWidgetTabHeader::setLabel(const QString &label)
+void DeclarativeTabWidgetAttached::setLabel(const QString &label)
 {
   if (label == d->label)
     return;
@@ -432,18 +432,18 @@ void TabWidgetTabHeader::setLabel(const QString &label)
   emit labelChanged(label);
 }
 
-QString TabWidgetTabHeader::label() const
+QString DeclarativeTabWidgetAttached::label() const
 {
   return d->label;
 }
 
-void TabWidgetTabHeader::setIcon(const QIcon &icon)
+void DeclarativeTabWidgetAttached::setIcon(const QIcon &icon)
 {
   d->icon = icon;
   emit iconChanged(icon);
 }
 
-QIcon TabWidgetTabHeader::icon() const
+QIcon DeclarativeTabWidgetAttached::icon() const
 {
   return d->icon;
 }
@@ -463,7 +463,7 @@ void DeclarativeTabWidget::addWidget(QWidget *widget, AbstractDeclarativeObject
   QIcon icon;
 
   QObject *attachedProperties = qmlAttachedPropertiesObject<DeclarativeTabWidget>(declarativeObject, false);
-  TabWidgetTabHeader *tabHeader = qobject_cast<TabWidgetTabHeader*>(attachedProperties);
+  DeclarativeTabWidgetAttached *tabHeader = qobject_cast<DeclarativeTabWidgetAttached*>(attachedProperties);
   if (tabHeader) {
     label = tabHeader->label();
     icon = tabHeader->icon();
@@ -479,9 +479,9 @@ void DeclarativeTabWidget::setLayout(QLayout *layout, AbstractDeclarativeObject
   qmlInfo(this) << "Can not add QLayout to QTabWidget";
 }
 
-TabWidgetTabHeader *DeclarativeTabWidget::qmlAttachedProperties(QObject *object)
+DeclarativeTabWidgetAttached *DeclarativeTabWidget::qmlAttachedProperties(QObject *object)
 {
-  return new TabWidgetTabHeader(object);
+  return new DeclarativeTabWidgetAttached(object);
 }
 
 CUSTOM_METAOBJECT(DeclarativeTabWidget, QTabWidget)

diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h
index 35d126a..183536a 100644 (file)
--- a/declarativeobjects_p.h
+++ b/declarativeobjects_p.h
@@ -343,7 +343,7 @@ class DeclarativeStatusBar : public DeclarativeWidgetProxy<QStatusBar>
 QML_DECLARE_TYPEINFO(DeclarativeStatusBar, QML_HAS_ATTACHED_PROPERTIES)
 
 // attached property for DeclarativeTabWidget
-class TabWidgetTabHeader : public QObject
+class DeclarativeTabWidgetAttached : public QObject
 {
   Q_OBJECT
 
@@ -351,8 +351,8 @@ class TabWidgetTabHeader : public QObject
   Q_PROPERTY(QIcon icon READ icon WRITE setIcon NOTIFY iconChanged)
 
   public:
-    TabWidgetTabHeader(QObject *parent = 0);
-    ~TabWidgetTabHeader();
+    DeclarativeTabWidgetAttached(QObject *parent = 0);
+    ~DeclarativeTabWidgetAttached();
 
     void setLabel(const QString &label);
     QString label() const;
@@ -376,7 +376,7 @@ class DeclarativeTabWidget : public DeclarativeWidgetProxy<QTabWidget>
   public:
     DeclarativeTabWidget(QObject *parent = 0);
 
-    static TabWidgetTabHeader *qmlAttachedProperties(QObject *object);
+    static DeclarativeTabWidgetAttached *qmlAttachedProperties(QObject *object);
 
   protected:
     virtual void addWidget(QWidget *widget, AbstractDeclarativeObject *declarativeObject);

diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp
index eca058d..db642db 100644 (file)
--- a/declarativewidgetdocument.cpp
+++ b/declarativewidgetdocument.cpp
@@ -49,7 +49,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p
   qmlRegisterType<DeclarativeSlider>("QtGui", 1, 0, "Slider");
   qmlRegisterType<DeclarativeStatusBarAttached>();
   qmlRegisterType<DeclarativeStatusBar>("QtGui", 1, 0, "StatusBar");
-  qmlRegisterType<TabWidgetTabHeader>();
+  qmlRegisterType<DeclarativeTabWidgetAttached>();
   qmlRegisterType<DeclarativeTabWidget>("QtGui", 1, 0, "TabWidget");
   qmlRegisterType<DeclarativeTextEdit>("QtGui", 1, 0, "TextEdit");
   qmlRegisterType<DeclarativeToolBar>("QtGui", 1, 0, "ToolBar");