feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Added QQuickItem to new class wizard

Browse Source 
When creating a new class, you can select the "Base class" or "Type information"
QObject, QWidget, QDeclarativeItem... are available, but QQuickItem isn't..

Change-Id: I9fce6b6a43c915364fc405b99edd0b0d7ebab4fe
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Steven Ceuppens
2013-01-17 16:18:29 +01:00
committed by Tobias Hunger
parent 9417bea9ac
commit d94e7f259b
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/newclasswidget.cpp
View File

@@ -419,6 +419,8 @@ static inline NewClassWidget::ClassType classTypeForBaseClass(const QString &bas
// Declarative Items // Declarative Items
if (baseClass == QLatin1String("QDeclarativeItem")) if (baseClass == QLatin1String("QDeclarativeItem"))
return NewClassWidget::ClassInheritsQDeclarativeItem; return NewClassWidget::ClassInheritsQDeclarativeItem;
if (baseClass == QLatin1String("QQuickItem"))
return NewClassWidget::ClassInheritsQQuickItem;
return NewClassWidget::NoClassType; return NewClassWidget::NoClassType;
} }

8
src/libs/utils/newclasswidget.h
View File

@@ -71,9 +71,13 @@ class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget
Q_ENUMS(ClassType) Q_ENUMS(ClassType)
public: public:
enum ClassType { NoClassType, ClassInheritsQObject, ClassInheritsQWidget, enum ClassType { NoClassType,
ClassInheritsQObject,
ClassInheritsQWidget,
ClassInheritsQDeclarativeItem, ClassInheritsQDeclarativeItem,
SharedDataClass }; ClassInheritsQQuickItem,
SharedDataClass
};
explicit NewClassWidget(QWidget *parent = 0); explicit NewClassWidget(QWidget *parent = 0);
~NewClassWidget(); ~NewClassWidget();

7
src/libs/utils/newclasswidget.ui
View File

@@ -71,7 +71,12 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Inherits QDeclarativeItem</string> <string>Inherits QDeclarativeItem - Qt Quick 1</string>
</property>
</item>
<item>
<property name="text">
<string>Inherits QQuickItem - Qt Quick 2</string>
</property> </property>
</item> </item>
<item> <item>

7
src/plugins/cppeditor/cppclasswizard.cpp
View File

@@ -70,7 +70,8 @@ ClassNamePage::ClassNamePage(QWidget *parent) :
<< QLatin1String("QObject") << QLatin1String("QObject")
<< QLatin1String("QWidget") << QLatin1String("QWidget")
<< QLatin1String("QMainWindow") << QLatin1String("QMainWindow")
<< QLatin1String("QDeclarativeItem")); << QLatin1String("QDeclarativeItem")
<< QLatin1String("QQuickItem"));
m_newClassWidget->setBaseClassEditable(true); m_newClassWidget->setBaseClassEditable(true);
m_newClassWidget->setFormInputVisible(false); m_newClassWidget->setFormInputVisible(false);
m_newClassWidget->setNamespacesEnabled(true); m_newClassWidget->setNamespacesEnabled(true);
@@ -250,6 +251,10 @@ bool CppClassWizard::generateHeaderAndSource(const CppClassWizardParameters &par
parentQObjectClass = QLatin1String("QDeclarativeItem"); parentQObjectClass = QLatin1String("QDeclarativeItem");
defineQObjectMacro = true; defineQObjectMacro = true;
break; break;
case Utils::NewClassWidget::ClassInheritsQQuickItem:
parentQObjectClass = QLatin1String("QQuickItem");
defineQObjectMacro = true;
break;
case Utils::NewClassWidget::NoClassType: case Utils::NewClassWidget::NoClassType:
case Utils::NewClassWidget::SharedDataClass: case Utils::NewClassWidget::SharedDataClass:
break; break;