summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-07-28 10:47:53 +0200
committerKai Koehne <kai.koehne@nokia.com>2011-07-28 11:03:44 +0200
commitfe3f0811de6f672327197570827d5e6b000f735c (patch)
treedc55e25f7a6c30342d5cecd8696053d6fc74c09a /src/plugins
parent37c7ff37834118776091c684bf520c5ff922be07 (diff)
downloadqt-creator-fe3f0811de6f672327197570827d5e6b000f735c.tar.gz
QmlProfiler: Fix warnings about hiding overloaded virtual functions
toolSelected() & toolDeselected are const methods in the base class. But anyway the attach Action isn't used any more, so let's remove it completely ... Change-Id: Ia40cb6d927fb8422700816a8c6de81aa3734959d Reviewed-on: http://codereview.qt.nokia.com/2324 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertool.cpp31
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertool.h3
2 files changed, 0 insertions, 34 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 250d647265..228b3a9689 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -103,7 +103,6 @@ public:
Utils::FileInProjectFinder m_projectFinder;
ProjectExplorer::RunConfiguration *m_runConfiguration;
bool m_isAttached;
- QAction *m_attachAction;
QToolButton *m_recordButton;
QToolButton *m_clearButton;
bool m_recordingEnabled;
@@ -128,7 +127,6 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
d->m_project = 0;
d->m_runConfiguration = 0;
d->m_isAttached = false;
- d->m_attachAction = 0;
d->m_recordingEnabled = true;
d->m_connectionTimer.setInterval(200);
@@ -228,16 +226,6 @@ IAnalyzerEngine *QmlProfilerTool::createEngine(const AnalyzerStartParameters &sp
return engine;
}
-void QmlProfilerTool::toolSelected()
-{
- updateAttachAction(true);
-}
-
-void QmlProfilerTool::toolDeselected()
-{
- updateAttachAction(false);
-}
-
QWidget *QmlProfilerTool::createWidgets()
{
QTC_ASSERT(!d->m_traceWindow, return 0);
@@ -280,15 +268,6 @@ QWidget *QmlProfilerTool::createWidgets()
Core::ActionContainer *manalyzer = am->actionContainer(Analyzer::Constants::M_DEBUG_ANALYZER);
const Core::Context globalcontext(Core::Constants::C_GLOBAL);
- d->m_attachAction = new QAction(tr("Attach..."), manalyzer);
- Core::Command *command = am->registerAction(d->m_attachAction,
- Constants::ATTACH, globalcontext);
- command->setAttribute(Core::Command::CA_UpdateText);
- //manalyzer->addAction(command, Analyzer::Constants::G_ANALYZER_STARTSTOP);
- connect(d->m_attachAction, SIGNAL(triggered()), this, SLOT(attach()));
-
- updateAttachAction(false);
-
QDockWidget *eventsDock = AnalyzerManager::createDockWidget
(this, tr("Events"), d->m_eventsView, Qt::BottomDockWidgetArea);
QDockWidget *timelineDock = AnalyzerManager::createDockWidget
@@ -476,16 +455,6 @@ void QmlProfilerTool::attach()
}
d->m_isAttached = !d->m_isAttached;
- updateAttachAction(true);
-}
-
-void QmlProfilerTool::updateAttachAction(bool isCurrentTool)
-{
- if (d->m_isAttached)
- d->m_attachAction->setText(tr("Detach"));
- else
- d->m_attachAction->setText(tr("Attach..."));
- d->m_attachAction->setEnabled(isCurrentTool);
}
void QmlProfilerTool::tryToConnect()
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h
index 2563dafa18..2c627e9c87 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.h
+++ b/src/plugins/qmlprofiler/qmlprofilertool.h
@@ -53,8 +53,6 @@ public:
ToolMode toolMode() const;
void extensionsInitialized() {}
- void toolSelected();
- void toolDeselected();
Analyzer::IAnalyzerEngine *createEngine(const Analyzer::AnalyzerStartParameters &sp,
ProjectExplorer::RunConfiguration *runConfiguration = 0);
@@ -88,7 +86,6 @@ private slots:
void connectionStateChanged();
private:
- void updateAttachAction(bool isCurrentTool);
void connectToClient();
void updateRecordingState();
void ensureWidgets();