Qt Designer: Remove unused code

Remove QDesignerMenu(Bar)::m_interactive and setters, which did not
have any effect and other unused members.

In helper function enumKeyOfObjectToValue(), remove the unused object
pointers which are apparently some left-over from some old MSVC
version requiring actual variables in template functions.

Change-Id: If583ff4583be09601877acca80166384f0730fef
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 

9 files changed, 17 insertions, 38 deletions

diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index c840bf35f..c2344dd76 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -808,12 +808,8 @@ QWidget *QDesignerResource::create(DomWidget *ui_widget, QWidget *parentWidget)
     QDesignerMenu *menu = qobject_cast<QDesignerMenu*>(w);
     QDesignerMenuBar *menuBar = qobject_cast<QDesignerMenuBar*>(w);
 
-    if (menu) {
-        menu->interactive(false);
+    if (menu)
         menu->hide();
-    } else if (menuBar) {
-        menuBar->interactive(false);
-    }
 
     for (DomActionRef *ui_action_ref : actionRefs) {
         const QString name = ui_action_ref->attributeName();
@@ -832,13 +828,10 @@ QWidget *QDesignerResource::create(DomWidget *ui_widget, QWidget *parentWidget)
         }
     }
 
-    if (menu) {
-        menu->interactive(true);
+    if (menu)
         menu->adjustSpecialActions();
-    } else if (menuBar) {
-        menuBar->interactive(true);
+    else if (menuBar)
         menuBar->adjustSpecialActions();
-    }
 
     ui_widget->setAttributeClass(className); // fix the class name
     applyExtensionDataFromDOM(this, core(), ui_widget, w);
diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp
index e47a60913..99380ba7c 100644
--- a/src/designer/src/lib/shared/qdesigner_menu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menu.cpp
@@ -1129,13 +1129,6 @@ void QDesignerMenu::adjustSpecialActions()
     addAction(m_addSeparator);
 }
 
-bool QDesignerMenu::interactive(bool i)
-{
-    const bool old = m_interactive;
-    m_interactive = i;
-    return old;
-}
-
 void QDesignerMenu::enterEditMode()
 {
     if (m_currentIndex >= 0 && m_currentIndex <= realActionCount()) {
diff --git a/src/designer/src/lib/shared/qdesigner_menu_p.h b/src/designer/src/lib/shared/qdesigner_menu_p.h
index e0a4a6267..046336530 100644
--- a/src/designer/src/lib/shared/qdesigner_menu_p.h
+++ b/src/designer/src/lib/shared/qdesigner_menu_p.h
@@ -83,7 +83,6 @@ public:
 
     void adjustSpecialActions();
 
-    bool interactive(bool i);
     void createRealMenuAction(QAction *action);
     void removeRealMenu(QAction *action);
 
@@ -181,7 +180,6 @@ private:
     QTimer *m_showSubMenuTimer;
     QTimer *m_deactivateWindowTimer;
     QTimer *m_adjustSizeTimer;
-    bool m_interactive;
     QLineEdit *m_editor;
     bool m_dragging;
     int m_lastSubMenuIndex;
diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp
index aab029e91..febc21499 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp
@@ -79,7 +79,6 @@ QDesignerMenuBar::QDesignerMenuBar(QWidget *parent)  :
     QMenuBar(parent),
     m_addMenu(new SpecialMenuAction(this)),
     m_currentIndex(0),
-    m_interactive(true),
     m_editor(new QLineEdit(this)),
     m_dragging(false),
     m_lastMenuActionIndex( -1),
@@ -780,13 +779,6 @@ void QDesignerMenuBar::adjustSpecialActions()
     addAction(m_addMenu);
 }
 
-bool QDesignerMenuBar::interactive(bool i)
-{
-    const bool old = m_interactive;
-    m_interactive = i;
-    return old;
-}
-
 void QDesignerMenuBar::hideMenu(int index)
 {
     if (index < 0 && m_currentIndex >= 0)
diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h
index e171a94e0..0c9c0253b 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar_p.h
+++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h
@@ -82,7 +82,6 @@ public:
     QDesignerActionProviderExtension *actionProvider();
 
     void adjustSpecialActions();
-    bool interactive(bool i);
     bool dragging() const;
 
     void moveLeft(bool ctrl = false);
@@ -153,7 +152,6 @@ private:
     QPointer<QMenu> m_activeMenu;
     QPoint m_startPosition;
     int m_currentIndex;
-    bool m_interactive;
     QLineEdit *m_editor;
     bool m_dragging;
     int m_lastMenuActionIndex;
diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h
index abc3dae0a..c9eb28707 100644
--- a/src/designer/src/lib/shared/zoomwidget_p.h
+++ b/src/designer/src/lib/shared/zoomwidget_p.h
@@ -131,7 +131,6 @@ private:
     qreal m_zoomFactor;
 
     bool m_zoomContextMenuEnabled;
-    bool m_resizeBlocked;
     ZoomMenu *m_zoomMenu;
 };
 
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 683335432..e86ddab1e 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -391,7 +391,8 @@ Qt::ToolBarArea QAbstractFormBuilder::toolbarAreaFromDOMAttributes(const DomProp
     case DomProperty::Number:
         return static_cast<Qt::ToolBarArea>(attr->elementNumber());
     case DomProperty::Enum:
-        return enumKeyOfObjectToValue<QAbstractFormBuilderGadget, Qt::ToolBarArea>("toolBarArea",  attr->elementEnum().toLatin1());
+        return enumKeyOfObjectToValue<QAbstractFormBuilderGadget, Qt::ToolBarArea>("toolBarArea",
+                                                                                   attr->elementEnum().toLatin1().constData());
     default:
         break;
     }
@@ -1017,7 +1018,8 @@ QBrush QAbstractFormBuilder::setupBrush(DomBrush *brush)
     if (!brush->hasAttributeBrushStyle())
         return br;
 
-    const Qt::BrushStyle style = enumKeyOfObjectToValue<QAbstractFormBuilderGadget, Qt::BrushStyle>("brushStyle", brush->attributeBrushStyle().toLatin1());
+    const Qt::BrushStyle style = enumKeyOfObjectToValue<QAbstractFormBuilderGadget, Qt::BrushStyle>("brushStyle",
+                                                                                                    brush->attributeBrushStyle().toLatin1().constData());
 
     if (style == Qt::LinearGradientPattern ||
             style == Qt::RadialGradientPattern ||
diff --git a/src/designer/src/lib/uilib/properties.cpp b/src/designer/src/lib/uilib/properties.cpp
index dafd1ee14..578506b5a 100644
--- a/src/designer/src/lib/uilib/properties.cpp
+++ b/src/designer/src/lib/uilib/properties.cpp
@@ -254,7 +254,8 @@ QVariant domPropertyToVariant(const DomProperty *p)
         if (font->hasElementAntialiasing())
             f.setStyleStrategy(font->elementAntialiasing() ? QFont::PreferDefault : QFont::NoAntialias);
         if (font->hasElementStyleStrategy()) {
-            f.setStyleStrategy(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QFont::StyleStrategy>("styleStrategy", font->elementStyleStrategy().toLatin1()));
+            f.setStyleStrategy(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QFont::StyleStrategy>("styleStrategy",
+                                                                                                        font->elementStyleStrategy().toLatin1().constData()));
         }
         return QVariant::fromValue(f);
     }
@@ -286,13 +287,16 @@ QVariant domPropertyToVariant(const DomProperty *p)
         return QVariant::fromValue(QCursor(static_cast<Qt::CursorShape>(p->elementCursor())));
 
     case DomProperty::CursorShape:
-        return QVariant::fromValue(QCursor(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, Qt::CursorShape>("cursorShape", p->elementCursorShape().toLatin1())));
+        return QVariant::fromValue(QCursor(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, Qt::CursorShape>("cursorShape",
+                                                                                                               p->elementCursorShape().toLatin1().constData())));
 #endif
 
     case DomProperty::Locale: {
         const DomLocale *locale = p->elementLocale();
-        return QVariant::fromValue(QLocale(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QLocale::Language>("language", locale->attributeLanguage().toLatin1()),
-                    enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QLocale::Country>("country", locale->attributeCountry().toLatin1())));
+        return QVariant::fromValue(QLocale(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QLocale::Language>("language",
+                                                                                                                 locale->attributeLanguage().toLatin1().constData()),
+                    enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QLocale::Country>("country",
+                                                                                         locale->attributeCountry().toLatin1().constData())));
     }
     case DomProperty::SizePolicy: {
         const DomSizePolicy *sizep = p->elementSizePolicy();
diff --git a/src/designer/src/lib/uilib/properties_p.h b/src/designer/src/lib/uilib/properties_p.h
index f2ac5222a..05bd3cd7b 100644
--- a/src/designer/src/lib/uilib/properties_p.h
+++ b/src/designer/src/lib/uilib/properties_p.h
@@ -161,7 +161,7 @@ inline EnumType enumKeysToValue(const QMetaEnum &metaEnum,const char *keys, cons
 
 // Access meta enumeration object of a qobject
 template <class QObjectType>
-inline QMetaEnum metaEnum(const char *name, const QObjectType* = 0)
+inline QMetaEnum metaEnum(const char *name)
 {
     const int e_index = QObjectType::staticMetaObject.indexOfProperty(name);
     Q_ASSERT(e_index != -1);
@@ -170,7 +170,7 @@ inline QMetaEnum metaEnum(const char *name, const QObjectType* = 0)
 
 // Convert key to value for enumeration by name
 template <class QObjectType, class EnumType>
-inline EnumType enumKeyOfObjectToValue(const char *enumName, const char *key, const QObjectType* = 0, const EnumType* = 0)
+inline EnumType enumKeyOfObjectToValue(const char *enumName, const char *key)
 {
     const QMetaEnum me = metaEnum<QObjectType>(enumName);
     return enumKeyToValue<EnumType>(me, key);