diff --git a/src/plugins/designer/cpp/newclasswidget.cpp b/src/plugins/designer/cpp/newclasswidget.cpp
index addcfdbcb61..dd6fcb49d66 100644
--- a/src/plugins/designer/cpp/newclasswidget.cpp
+++ b/src/plugins/designer/cpp/newclasswidget.cpp
@@ -48,11 +48,6 @@ NewClassWidget::NewClassWidget(QWidget *parent) :
{
d->m_ui.setupUi(this);
- d->m_ui.baseClassLabel->setVisible(false);
- d->m_ui.baseClassComboBox->setVisible(false);
- d->m_ui.classTypeLabel->setVisible(false);
- d->m_ui.classTypeComboBox->setVisible(false);
-
d->m_ui.classLineEdit->setNamespacesEnabled(true);
setNamesDelimiter(QLatin1String("::"));
@@ -60,10 +55,6 @@ NewClassWidget::NewClassWidget(QWidget *parent) :
this, &NewClassWidget::slotUpdateFileNames);
connect(d->m_ui.classLineEdit, &QLineEdit::textEdited,
this, &NewClassWidget::classNameEdited);
- connect(d->m_ui.baseClassComboBox, &QComboBox::currentIndexChanged,
- this, &NewClassWidget::suggestClassNameFromBase);
- connect(d->m_ui.baseClassComboBox, &QComboBox::editTextChanged,
- this, &NewClassWidget::slotValidChanged);
connect(d->m_ui.classLineEdit, &Utils::FancyLineEdit::validChanged,
this, &NewClassWidget::slotValidChanged);
connect(d->m_ui.headerFileLineEdit, &Utils::FancyLineEdit::validChanged,
@@ -87,8 +78,6 @@ NewClassWidget::NewClassWidget(QWidget *parent) :
this, &NewClassWidget::slotActivated);
connect(d->m_ui.pathChooser, &Utils::PathChooser::returnPressed,
this, &NewClassWidget::slotActivated);
-
- setClassType(NoClassType);
}
NewClassWidget::~NewClassWidget()
@@ -103,20 +92,6 @@ void NewClassWidget::classNameEdited()
d->m_classEdited = true;
}
-void NewClassWidget::suggestClassNameFromBase()
-{
- if (debugNewClassWidget)
- qDebug() << Q_FUNC_INFO << d->m_headerExtension << d->m_sourceExtension;
- if (d->m_classEdited)
- return;
- // Suggest a class unless edited ("QMainWindow"->"MainWindow")
- QString base = baseClassName();
- if (base.startsWith(QLatin1Char('Q'))) {
- base.remove(0, 1);
- setClassName(base);
- }
-}
-
void NewClassWidget::setClassName(const QString &suggestedName)
{
if (debugNewClassWidget)
@@ -130,11 +105,6 @@ QString NewClassWidget::className() const
return d->m_ui.classLineEdit->text();
}
-QString NewClassWidget::baseClassName() const
-{
- return d->m_ui.baseClassComboBox->currentText();
-}
-
QString NewClassWidget::sourceFileName() const
{
return d->m_ui.sourceFileLineEdit->text();
@@ -195,11 +165,6 @@ void NewClassWidget::setLowerCaseFiles(bool v)
d->m_ui.classLineEdit->setLowerCaseFileName(v);
}
-void NewClassWidget::setClassType(ClassType ct)
-{
- d->m_ui.classTypeComboBox->setCurrentIndex(ct);
-}
-
void NewClassWidget::setNamesDelimiter(const QString &delimiter)
{
d->m_ui.classLineEdit->setNamespaceDelimiter(delimiter);
diff --git a/src/plugins/designer/cpp/newclasswidget.h b/src/plugins/designer/cpp/newclasswidget.h
index 5de5f46236b..64085e68540 100644
--- a/src/plugins/designer/cpp/newclasswidget.h
+++ b/src/plugins/designer/cpp/newclasswidget.h
@@ -16,19 +16,10 @@ class NewClassWidget : public QWidget
{
Q_OBJECT
public:
- enum ClassType { NoClassType,
- ClassInheritsQObject,
- ClassInheritsQWidget,
- ClassInheritsQDeclarativeItem,
- ClassInheritsQQuickItem,
- SharedDataClass
- };
- Q_ENUM(ClassType)
explicit NewClassWidget(QWidget *parent = nullptr);
~NewClassWidget() override;
QString className() const;
- QString baseClassName() const;
QString sourceFileName() const;
QString headerFileName() const;
QString formFileName() const;
@@ -56,16 +47,8 @@ public slots:
void setSourceExtension(const QString &e);
void setHeaderExtension(const QString &e);
void setLowerCaseFiles(bool v);
- void setClassType(ClassType ct);
void setNamesDelimiter(const QString &delimiter);
- /**
- * Suggest a class name from the base class by stripping the leading 'Q'
- * character. This will happen automagically if the base class combo
- * changes until the class line edited is manually edited.
- */
- void suggestClassNameFromBase();
-
private:
void slotUpdateFileNames(const QString &t);
void slotValidChanged();
diff --git a/src/plugins/designer/cpp/newclasswidget.ui b/src/plugins/designer/cpp/newclasswidget.ui
index 50a01383029..94a3a61ea4d 100644
--- a/src/plugins/designer/cpp/newclasswidget.ui
+++ b/src/plugins/designer/cpp/newclasswidget.ui
@@ -40,102 +40,6 @@
-
-
-
- &Base class:
-
-
- baseClassComboBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- &Type information:
-
-
- classTypeComboBox
-
-
-
- -
-
-
-
-
- None
-
-
- -
-
- Inherits QObject
-
-
- -
-
- Inherits QWidget
-
-
- -
-
- Inherits QDeclarativeItem - Qt Quick 1
-
-
- -
-
- Inherits QQuickItem - Qt Quick 2
-
-
- -
-
- Based on QSharedData
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 0
- 0
-
-
-
-
- -
&Header file:
@@ -145,10 +49,10 @@
- -
+
-
- -
+
-
&Source file:
@@ -158,10 +62,10 @@
- -
+
-
- -
+
-
&Form file:
@@ -171,10 +75,10 @@
- -
+
-
- -
+
-
&Path:
@@ -184,7 +88,7 @@
- -
+
-