summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/controls/plugin.cpp2
-rw-r--r--src/controls/qquickaction.cpp4
-rw-r--r--src/controls/qquickaction_p.h10
-rw-r--r--src/controls/qquickexclusivegroup.cpp22
-rw-r--r--src/controls/qquickexclusivegroup_p.h10
-rw-r--r--src/controls/qquickmenuitem.cpp4
-rw-r--r--src/controls/qquickmenuitem_p.h8
7 files changed, 30 insertions, 30 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index e1afeef2..b4a4963d 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -122,7 +122,7 @@ void QtQuickControlsPlugin::registerTypes(const char *uri)
{
initResources();
qmlRegisterType<QQuickAction>(uri, 1, 0, "Action");
- qmlRegisterType<QQuickExclusiveGroup>(uri, 1, 0, "ExclusiveGroup");
+ qmlRegisterType<QQuickExclusiveGroup1>(uri, 1, 0, "ExclusiveGroup");
qmlRegisterType<QQuickMenuItem>(uri, 1, 0, "MenuItem");
qmlRegisterUncreatableType<QQuickMenuItemType>(uri, 1, 0, "MenuItemType",
QLatin1String("Do not create objects of type MenuItemType"));
diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp
index 6add916d..47032aab 100644
--- a/src/controls/qquickaction.cpp
+++ b/src/controls/qquickaction.cpp
@@ -392,12 +392,12 @@ void QQuickAction::setChecked(bool c)
emit toggled(m_checked);
}
-QQuickExclusiveGroup *QQuickAction::exclusiveGroup() const
+QQuickExclusiveGroup1 *QQuickAction::exclusiveGroup() const
{
return m_exclusiveGroup.data();
}
-void QQuickAction::setExclusiveGroup(QQuickExclusiveGroup *eg)
+void QQuickAction::setExclusiveGroup(QQuickExclusiveGroup1 *eg)
{
if (m_exclusiveGroup == eg)
return;
diff --git a/src/controls/qquickaction_p.h b/src/controls/qquickaction_p.h
index e3b9c852..953cfcb0 100644
--- a/src/controls/qquickaction_p.h
+++ b/src/controls/qquickaction_p.h
@@ -46,7 +46,7 @@
QT_BEGIN_NAMESPACE
-class QQuickExclusiveGroup;
+class QQuickExclusiveGroup1;
class QQuickAction : public QObject
{
@@ -61,7 +61,7 @@ class QQuickAction : public QObject
Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged)
Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE isCheckable NOTIFY toggled)
- Q_PROPERTY(QQuickExclusiveGroup *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged)
+ Q_PROPERTY(QQuickExclusiveGroup1 *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged)
#ifndef QT_NO_SHORTCUT
Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged)
#endif
@@ -99,8 +99,8 @@ public:
bool isChecked() const { return m_checkable && m_checked; }
void setChecked(bool c);
- QQuickExclusiveGroup *exclusiveGroup() const;
- void setExclusiveGroup(QQuickExclusiveGroup *arg);
+ QQuickExclusiveGroup1 *exclusiveGroup() const;
+ void setExclusiveGroup(QQuickExclusiveGroup1 *arg);
QIcon icon() const { return m_icon; }
QVariant iconVariant() const { return QVariant(m_icon); }
@@ -135,7 +135,7 @@ private:
bool m_enabled;
bool m_checkable;
bool m_checked;
- QPointer<QQuickExclusiveGroup> m_exclusiveGroup;
+ QPointer<QQuickExclusiveGroup1> m_exclusiveGroup;
QKeySequence m_shortcut;
QKeySequence m_mnemonic;
QString m_tooltip;
diff --git a/src/controls/qquickexclusivegroup.cpp b/src/controls/qquickexclusivegroup.cpp
index 08fe6d58..9682b85d 100644
--- a/src/controls/qquickexclusivegroup.cpp
+++ b/src/controls/qquickexclusivegroup.cpp
@@ -60,7 +60,7 @@ static bool isChecked(const QObject *o)
/*!
\qmltype ExclusiveGroup
- \instantiates QQuickExclusiveGroup
+ \instantiates QQuickExclusiveGroup1
\ingroup controls
\inqmlmodule QtQuick.Controls
\brief ExclusiveGroup provides a way to declare several checkable controls as mutually exclusive.
@@ -172,25 +172,25 @@ static bool isChecked(const QObject *o)
\sa ExclusiveGroup::bindCheckable()
*/
-QQuickExclusiveGroup::QQuickExclusiveGroup(QObject *parent)
+QQuickExclusiveGroup1::QQuickExclusiveGroup1(QObject *parent)
: QObject(parent), m_current(0)
{
int index = metaObject()->indexOfMethod("updateCurrent()");
m_updateCurrentMethod = metaObject()->method(index);
}
-QQmlListProperty<QQuickAction> QQuickExclusiveGroup::actions()
+QQmlListProperty<QQuickAction> QQuickExclusiveGroup1::actions()
{
- return QQmlListProperty<QQuickAction>(this, 0, &QQuickExclusiveGroup::append_actions, 0, 0, 0);
+ return QQmlListProperty<QQuickAction>(this, 0, &QQuickExclusiveGroup1::append_actions, 0, 0, 0);
}
-void QQuickExclusiveGroup::append_actions(QQmlListProperty<QQuickAction> *list, QQuickAction *action)
+void QQuickExclusiveGroup1::append_actions(QQmlListProperty<QQuickAction> *list, QQuickAction *action)
{
- if (QQuickExclusiveGroup *eg = qobject_cast<QQuickExclusiveGroup *>(list->object))
+ if (QQuickExclusiveGroup1 *eg = qobject_cast<QQuickExclusiveGroup1 *>(list->object))
action->setExclusiveGroup(eg);
}
-void QQuickExclusiveGroup::setCurrent(QObject * o)
+void QQuickExclusiveGroup1::setCurrent(QObject * o)
{
if (m_current == o)
return;
@@ -203,14 +203,14 @@ void QQuickExclusiveGroup::setCurrent(QObject * o)
emit currentChanged();
}
-void QQuickExclusiveGroup::updateCurrent()
+void QQuickExclusiveGroup1::updateCurrent()
{
QObject *checkable = sender();
if (isChecked(checkable))
setCurrent(checkable);
}
-void QQuickExclusiveGroup::bindCheckable(QObject *o)
+void QQuickExclusiveGroup1::bindCheckable(QObject *o)
{
for (const char **signalName = checkableSignals; *signalName; signalName++) {
int signalIndex = o->metaObject()->indexOfSignal(*signalName);
@@ -224,10 +224,10 @@ void QQuickExclusiveGroup::bindCheckable(QObject *o)
}
}
- qWarning() << "QQuickExclusiveGroup::bindCheckable(): Cannot bind to" << o;
+ qWarning() << "QQuickExclusiveGroup1::bindCheckable(): Cannot bind to" << o;
}
-void QQuickExclusiveGroup::unbindCheckable(QObject *o)
+void QQuickExclusiveGroup1::unbindCheckable(QObject *o)
{
if (m_current == o)
setCurrent(0);
diff --git a/src/controls/qquickexclusivegroup_p.h b/src/controls/qquickexclusivegroup_p.h
index 05256dcf..835bdb5e 100644
--- a/src/controls/qquickexclusivegroup_p.h
+++ b/src/controls/qquickexclusivegroup_p.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QQUICKEXCLUSIVEGROUP_H
-#define QQUICKEXCLUSIVEGROUP_H
+#ifndef QQUICKEXCLUSIVEGROUP1_H
+#define QQUICKEXCLUSIVEGROUP1_H
#include <QtCore/qobject.h>
#include <QtCore/qmetaobject.h>
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
class QQuickAction;
-class QQuickExclusiveGroup : public QObject
+class QQuickExclusiveGroup1 : public QObject
{
Q_OBJECT
@@ -54,7 +54,7 @@ class QQuickExclusiveGroup : public QObject
Q_CLASSINFO("DefaultProperty", "__actions")
public:
- explicit QQuickExclusiveGroup(QObject *parent = 0);
+ explicit QQuickExclusiveGroup1(QObject *parent = 0);
QObject *current() const { return m_current; }
void setCurrent(QObject * o);
@@ -80,4 +80,4 @@ private:
QT_END_NAMESPACE
-#endif // QQUICKEXCLUSIVEGROUP_H
+#endif // QQUICKEXCLUSIVEGROUP1_H
diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp
index 0702d398..d2236bf5 100644
--- a/src/controls/qquickmenuitem.cpp
+++ b/src/controls/qquickmenuitem.cpp
@@ -657,12 +657,12 @@ void QQuickMenuItem::updateChecked()
emit toggled(checked);
}
-QQuickExclusiveGroup *QQuickMenuItem::exclusiveGroup() const
+QQuickExclusiveGroup1 *QQuickMenuItem::exclusiveGroup() const
{
return action()->exclusiveGroup();
}
-void QQuickMenuItem::setExclusiveGroup(QQuickExclusiveGroup *eg)
+void QQuickMenuItem::setExclusiveGroup(QQuickExclusiveGroup1 *eg)
{
if (!m_boundAction)
action()->setExclusiveGroup(eg);
diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h
index fe05c9c3..d8f3ca32 100644
--- a/src/controls/qquickmenuitem_p.h
+++ b/src/controls/qquickmenuitem_p.h
@@ -50,7 +50,7 @@ class QUrl;
class QPlatformMenuItem;
class QQuickItem;
class QQuickAction;
-class QQuickExclusiveGroup;
+class QQuickExclusiveGroup1;
class QQuickMenu;
class QQuickMenuItemContainer;
@@ -173,7 +173,7 @@ class QQuickMenuItem : public QQuickMenuText
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
Q_PROPERTY(bool checkable READ checkable WRITE setCheckable NOTIFY checkableChanged)
Q_PROPERTY(bool checked READ checked WRITE setChecked NOTIFY toggled)
- Q_PROPERTY(QQuickExclusiveGroup *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged)
+ Q_PROPERTY(QQuickExclusiveGroup1 *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged)
Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged)
Q_PROPERTY(QQuickAction *action READ boundAction WRITE setBoundAction NOTIFY actionChanged)
@@ -213,8 +213,8 @@ public:
bool checked() const;
void setChecked(bool checked);
- QQuickExclusiveGroup *exclusiveGroup() const;
- void setExclusiveGroup(QQuickExclusiveGroup *);
+ QQuickExclusiveGroup1 *exclusiveGroup() const;
+ void setExclusiveGroup(QQuickExclusiveGroup1 *);
void setParentMenu(QQuickMenu *parentMenu);
View Lorry Controller Status