summaryrefslogtreecommitdiff
path: root/src/controls/qquickmenuitem_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/qquickmenuitem_p.h')
-rw-r--r--src/controls/qquickmenuitem_p.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h
index d8f3ca32..4c60a9b8 100644
--- a/src/controls/qquickmenuitem_p.h
+++ b/src/controls/qquickmenuitem_p.h
@@ -51,7 +51,7 @@ class QPlatformMenuItem;
class QQuickItem;
class QQuickAction;
class QQuickExclusiveGroup1;
-class QQuickMenu;
+class QQuickMenu1;
class QQuickMenuItemContainer;
class QQuickMenuItemType
@@ -88,9 +88,9 @@ public:
bool visible() const { return m_visible; }
virtual void setVisible(bool);
- QQuickMenu *parentMenu() const;
+ QQuickMenu1 *parentMenu() const;
QObject *parentMenuOrMenuBar() const;
- virtual void setParentMenu(QQuickMenu *parentMenu);
+ virtual void setParentMenu(QQuickMenu1 *parentMenu);
QQuickMenuItemContainer *container() const;
void setContainer(QQuickMenuItemContainer *);
@@ -107,7 +107,7 @@ public:
private:
bool m_visible;
QQuickMenuItemType::MenuItemType m_type;
- QQuickMenu *m_parentMenu;
+ QQuickMenu1 *m_parentMenu;
QQuickMenuItemContainer *m_container;
QPlatformMenuItem *m_platformItem;
QPointer<QQuickItem> m_visualItem;
@@ -167,7 +167,7 @@ private:
QQuickAction *m_action;
};
-class QQuickMenuItem : public QQuickMenuText
+class QQuickMenuItem1 : public QQuickMenuText
{
Q_OBJECT
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
@@ -191,8 +191,8 @@ Q_SIGNALS:
void actionChanged();
public:
- QQuickMenuItem(QObject *parent = 0);
- ~QQuickMenuItem();
+ QQuickMenuItem1(QObject *parent = 0);
+ ~QQuickMenuItem1();
void setEnabled(bool enabled);
@@ -216,7 +216,7 @@ public:
QQuickExclusiveGroup1 *exclusiveGroup() const;
void setExclusiveGroup(QQuickExclusiveGroup1 *);
- void setParentMenu(QQuickMenu *parentMenu);
+ void setParentMenu(QQuickMenu1 *parentMenu);
protected Q_SLOTS:
void updateShortcut();