connectAllSignals(m_proxiedObject, this);
}
-void DeclarativeMenu::addQObject(QObject *object, AbstractDeclarativeObject *declarativeObject)
-{
- QAction *action = qobject_cast<QAction*>(object);
- if (action) {
- m_proxiedObject->addAction(action);
- m_children.append(declarativeObject);
- } else {
- DeclarativeWidgetProxy<QMenu>::addQObject(object, declarativeObject);
- }
-}
-
void DeclarativeMenu::addWidget(QWidget *widget, AbstractDeclarativeObject *declarativeObject)
{
QMenu *menu = qobject_cast<QMenu*>(widget);
connectAllSignals(m_proxiedObject, this);
}
-void DeclarativeToolBar::addQObject(QObject *object, AbstractDeclarativeObject *declarativeObject)
-{
- QAction *action = qobject_cast<QAction*>(object);
- if (!action) {
- qmlInfo(declarativeObject) << "The QToolBar can only contain QWidget or QAction";
- return;
- }
-
- m_proxiedObject->addAction(action);
-
- m_children.append(declarativeObject);
-}
-
void DeclarativeToolBar::addWidget(QWidget *widget, AbstractDeclarativeObject *declarativeObject)
{
m_proxiedObject->addWidget(widget);
return;
}
+ QAction *action = qobject_cast<QAction*>(declarativeObject->object());
+ if (action) {
+ addAction(action, declarativeObject);
+ return;
+ }
+
addQObject(declarativeObject->object(), declarativeObject);
+ return;
}
DeclarativeObjectProxy<T>::dataAppend(object);
DeclarativeObjectProxy<T>::m_proxiedObject->setLayout(layout);
}
+ virtual void addAction(QAction *action, AbstractDeclarativeObject *declarativeObject)
+ {
+ DeclarativeObjectProxy<T>::m_children.append(declarativeObject);
+ DeclarativeObjectProxy<T>::m_proxiedObject->addAction(action);
+ }
+
virtual void addQObject(QObject *object, AbstractDeclarativeObject *declarativeObject)
{
object->setParent(DeclarativeObjectProxy<T>::m_proxiedObject);
DeclarativeMenu(QObject *parent = 0);
protected:
- virtual void addQObject(QObject *object, AbstractDeclarativeObject *declarativeObject);
virtual void addWidget(QWidget *widget, AbstractDeclarativeObject *declarativeObject);
virtual void setLayout(QLayout *layout, AbstractDeclarativeObject *declarativeObject);
};
DeclarativeToolBar(QObject *parent = 0);
protected:
- virtual void addQObject(QObject *object, AbstractDeclarativeObject *declarativeObject);
virtual void addWidget(QWidget *widget, AbstractDeclarativeObject *declarativeObject);
virtual void setLayout(QLayout *layout, AbstractDeclarativeObject *declarativeObject);
};