Class wizard: Replace "inherits QObject" by type information combo.

Remove the setting from where it does not make sense (library/form class
wizard, etc).
Reviewed-by: con <qtc-committer@nokia.com>

1 files changed, 20 insertions, 19 deletions

diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp
index b3378281a9..0d1168fd9c 100644
--- a/src/libs/utils/newclasswidget.cpp
+++ b/src/libs/utils/newclasswidget.cpp
@@ -122,6 +122,7 @@ NewClassWidget::NewClassWidget(QWidget *parent) :
 
     m_d->m_ui.generateFormCheckBox->setChecked(true);
     setFormInputCheckable(false, true);
+    setClassType(NoClassType);
 }
 
 NewClassWidget::~NewClassWidget()
@@ -172,17 +173,6 @@ void NewClassWidget::setBaseClassInputVisible(bool visible)
     m_d->m_ui.baseClassComboBox->setVisible(visible);
 }
 
-void NewClassWidget::setQObjectCheckBoxVisible(bool visible)
-{
-    m_d->m_qobjectCheckBoxVisible = visible;
-    m_d->m_ui.qobjectCheckBox->setVisible(visible);
-}
-
-bool NewClassWidget::isQObjectCheckBoxVisible() const
-{
-    return m_d->m_qobjectCheckBoxVisible;
-}
-
 void NewClassWidget::setBaseClassEditable(bool editable)
 {
     m_d->m_ui.baseClassComboBox->setEditable(editable);
@@ -370,24 +360,35 @@ void NewClassWidget::setAllowDirectories(bool v)
     }
 }
 
-bool NewClassWidget::inheritsQObject() const
+bool NewClassWidget::lowerCaseFiles() const
+{
+    return m_d->m_ui.classLineEdit->lowerCaseFileName();
+}
+
+void NewClassWidget::setLowerCaseFiles(bool v)
 {
-    return m_d->m_ui.qobjectCheckBox->isChecked();
+    m_d->m_ui.classLineEdit->setLowerCaseFileName(v);
 }
 
-void NewClassWidget::setInheritsQObject(bool v)
+NewClassWidget::ClassType NewClassWidget::classType() const
 {
-    m_d->m_ui.qobjectCheckBox->setChecked(v);
+    return static_cast<ClassType>(m_d->m_ui.classTypeComboBox->currentIndex());
 }
 
-bool NewClassWidget::lowerCaseFiles() const
+void NewClassWidget::setClassType(ClassType ct)
 {
-    return m_d->m_ui.classLineEdit->lowerCaseFileName();
+    m_d->m_ui.classTypeComboBox->setCurrentIndex(ct);
 }
 
-void NewClassWidget::setLowerCaseFiles(bool v)
+bool NewClassWidget::isClassTypeComboVisible() const
 {
-    m_d->m_ui.classLineEdit->setLowerCaseFileName(v);
+    return m_d->m_ui.classTypeLabel->isVisible();
+}
+
+void NewClassWidget::setClassTypeComboVisible(bool v)
+{
+    m_d->m_ui.classTypeLabel->setVisible(v);
+    m_d->m_ui.classTypeComboBox->setVisible(v);
 }
 
 void NewClassWidget::slotValidChanged()