Fix warnings about unused variables in Qt Designer.

Apparently, the function declarations are a copy&paste error.

Change-Id: If42728b3c545fb93638e73566af5d8937fb5ced5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index 9535559..1858b85 100644 (file)
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -717,7 +717,6 @@ void ObjectInspector::ObjectInspectorPrivate::slotPopupContextMenu(QWidget * /*p
     if (m_formWindow == 0 || m_formWindow->currentTool() != 0)
         return;
 
-    const QModelIndex index =  m_treeView->indexAt (pos);
     if (QObject *object = m_model->objectAt(m_treeView->indexAt(pos)))
         if (QMenu *menu = createTaskMenu(object, m_formWindow)) {
             menu->exec(m_treeView->viewport()->mapToGlobal(pos));

diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index f41f27b..7bcd261 100644 (file)
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -832,8 +832,6 @@ bool WidgetFactory::isPassiveInteractor(QWidget *widget)
         if (const QWidget *parent = widget->parentWidget()) {
             const QString objectName = parent->objectName();
             static const QString scrollAreaVContainer = QStringLiteral("qt_scrollarea_vcontainer");
-    void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow);
-    void formWindowAdded(QDesignerFormWindowInterface *formWindow);
             static const QString scrollAreaHContainer = QStringLiteral("qt_scrollarea_hcontainer");
             if (objectName == scrollAreaVContainer || objectName == scrollAreaHContainer) {
                 m_lastWasAPassiveInteractor = true;