[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-runtime/KDE/4.8] plasma/declarativeimports/plasmacomponents:
From:       Marco Martin <notmart () gmail ! com>
Date:       2011-12-29 14:14:00
Message-ID: 20111229141400.E2145A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 0dc956ef89d721e20219b6c3981af8fbbdadc9a5 by Marco Martin.
Committed on 29/12/2011 at 15:13.
Pushed by mart into branch 'KDE/4.8'.

fix the api to the standard one, items->content

M  +1    -1    plasma/declarativeimports/plasmacomponents/qmenu.cpp
M  +3    -3    plasma/declarativeimports/plasmacomponents/qmenu.h

http://commits.kde.org/kde-runtime/0dc956ef89d721e20219b6c3981af8fbbdadc9a5

diff --git a/plasma/declarativeimports/plasmacomponents/qmenu.cpp \
b/plasma/declarativeimports/plasmacomponents/qmenu.cpp index b4e690d..4db6507 100644
--- a/plasma/declarativeimports/plasmacomponents/qmenu.cpp
+++ b/plasma/declarativeimports/plasmacomponents/qmenu.cpp
@@ -38,7 +38,7 @@ QMenuProxy::~QMenuProxy()
     delete m_menu;
 }
 
-QDeclarativeListProperty<QMenuItem> QMenuProxy::items()
+QDeclarativeListProperty<QMenuItem> QMenuProxy::content()
 {
     return QDeclarativeListProperty<QMenuItem>(this, m_items);
 }
diff --git a/plasma/declarativeimports/plasmacomponents/qmenu.h \
b/plasma/declarativeimports/plasmacomponents/qmenu.h index 0f503ef..6c6409a 100644
--- a/plasma/declarativeimports/plasmacomponents/qmenu.h
+++ b/plasma/declarativeimports/plasmacomponents/qmenu.h
@@ -32,8 +32,8 @@ class QMenuProxy : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QDeclarativeListProperty<QMenuItem> items READ items CONSTANT)
-    Q_CLASSINFO("DefaultProperty", "items")
+    Q_PROPERTY(QDeclarativeListProperty<QMenuItem> content READ content CONSTANT)
+    Q_CLASSINFO("DefaultProperty", "content")
     Q_PROPERTY(QDeclarativeItem *visualParent READ visualParent WRITE \
                setVisualParent NOTIFY visualParentChanged())
     Q_PROPERTY(DialogStatus::Status status READ status NOTIFY statusChanged)
 
@@ -41,7 +41,7 @@ public:
     QMenuProxy(QObject *parent = 0);
     ~QMenuProxy();
 
-    QDeclarativeListProperty<QMenuItem> items();
+    QDeclarativeListProperty<QMenuItem> content();
     int actionCount() const;
     QMenuItem *action(int) const;
     DialogStatus::Status status() const;


[prev in list] [next in list] [prev in thread] [next in thread]