analyzer: remove dummy control widgets

Change-Id: I9c15e557699f2f321619fb07feea8d4489006c83
Reviewed-on: http://codereview.qt.nokia.com/1053
Reviewed-by: hjk <qthjk@ovi.com>

src/plugins/analyzerbase/analyzerconstants.h

@@ -86,9 +86,6 @@ const char * const ANALYZER_CONTROL_STOP_ICON =
 
 const char * const ANALYZERTASK_ID = "Analyzer.TaskId";
 
-// private
-const char * const ANALYZER_DUMMYWIDGET_ID = "Analyzer.DummyWidget";
-
 } // namespace Constants
 } // namespace Analyzer
 

src/plugins/analyzerbase/analyzermanager.cpp

@@ -711,14 +711,12 @@ void AnalyzerManagerPrivate::selectAction(QAction *action)
 
 void AnalyzerManagerPrivate::addTool(IAnalyzerTool *tool, const StartModes &modes)
 {
-    delayedInit(); // be sure that there is a valid IMode instance
+    delayedInit(); // Make sure that there is a valid IMode instance.
-
-    ActionManager *am = Core::ICore::instance()->actionManager();
-    QWidget *controlWidget = tool->createControlWidget(); // might be 0
-    m_controlsWidget->addWidget(controlWidget
-        ? controlWidget : AnalyzerUtils::createDummyWidget());
 
     const bool blocked = m_toolBox->blockSignals(true); // Do not make current.
+
+    m_controlsWidget->addWidget(tool->createControlWidget());
+    ActionManager *am = Core::ICore::instance()->actionManager();
     foreach (StartMode mode, modes) {
         QString actionName = tool->actionName(mode);
         QString menuGroup = tool->menuGroup(mode);

src/plugins/analyzerbase/analyzerutils.cpp

@@ -116,10 +116,3 @@ CPlusPlus::Symbol *AnalyzerUtils::findSymbolUnderCursor()
     const CPlusPlus::LookupItem &lookupItem = lookupItems.first(); // ### TODO: select best candidate.
     return lookupItem.declaration();
 }
-
-QWidget *AnalyzerUtils::createDummyWidget()
-{
-    QWidget *widget = new QWidget;
-    widget->setProperty(Constants::ANALYZER_DUMMYWIDGET_ID, QVariant(true));
-    return widget;
-}

src/plugins/analyzerbase/analyzerutils.h

@@ -46,8 +46,6 @@ class Symbol;
 namespace AnalyzerUtils
 {
     ANALYZER_EXPORT CPlusPlus::Symbol *findSymbolUnderCursor();
-
-    ANALYZER_EXPORT QWidget *createDummyWidget();
 }
 
 #endif // ANALYZERUTILS_H

src/plugins/analyzerbase/ianalyzertool.cpp

@@ -87,9 +87,4 @@ void IAnalyzerTool::initializeDockWidgets()
 {
 }
 
-QWidget *IAnalyzerTool::createControlWidget()
-{
-    return 0;
-}
-
 } // namespace Analyzer

src/plugins/analyzerbase/ianalyzertool.h

@@ -116,9 +116,9 @@ public:
       */
     virtual void initializeDockWidgets();
 
-    /// Returns a control widget which will be shown
+    /// Returns a control widget which will be shown in the status bar when
-    /// in the output pane when this tool is selected.
+    /// this tool is selected. Must be non-zero.
-    virtual QWidget *createControlWidget();
+    virtual QWidget *createControlWidget() = 0;
 
     /// Returns a new engine for the given start parameters.
     /// Called each time the tool is launched.