diff options
| author | hjk <[email protected]> | 2011-07-12 16:47:32 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2011-07-13 15:56:48 +0200 |
| commit | 3cce72dcf50126a8da1b8352de732bc15e73574b (patch) | |
| tree | 5d9a7c1c2bd8665dedafce97d5ec15216b1123d7 /src/plugins/valgrind/callgrindtool.cpp | |
| parent | 01cc659ffd7e635418171033af657dbc0f7edb67 (diff) | |
analyzer: merge valgrind related settings
This mainly reduces the number of tabs in the settings dialog.
Change-Id: I62ba5c74585648c8f495602cd4d676d0628de9b5
Reviewed-on: http://codereview.qt.nokia.com/1575
Reviewed-by: Qt Sanity Bot <[email protected]>
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/valgrind/callgrindtool.cpp')
| -rw-r--r-- | src/plugins/valgrind/callgrindtool.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index d89632d6c73..d823560246a 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -35,7 +35,6 @@ #include "callgrindcostdelegate.h" #include "callgrindcostview.h" #include "callgrindengine.h" -#include "callgrindsettings.h" #include "callgrindtextmark.h" #include "callgrindvisualisation.h" @@ -48,6 +47,7 @@ #include <valgrind/callgrind/callgrindproxymodel.h> #include <valgrind/callgrind/callgrindstackbrowser.h> #include <valgrind/valgrindplugin.h> +#include <valgrind/valgrindsettings.h> #include <analyzerbase/analyzermanager.h> #include <analyzerbase/analyzersettings.h> @@ -210,7 +210,7 @@ public: QAction *m_showCostsOfFunctionAction; QString m_toggleCollectFunction; - CallgrindGlobalSettings *m_settings; // Not owned + ValgrindGlobalSettings *m_settings; // Not owned }; @@ -249,7 +249,7 @@ CallgrindToolPrivate::CallgrindToolPrivate(CallgrindTool *parent) m_proxyModel->setFilterKeyColumn(DataModel::NameColumn); m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); - m_settings = AnalyzerGlobalSettings::instance()->subConfig<CallgrindGlobalSettings>(); + m_settings = AnalyzerGlobalSettings::instance()->subConfig<ValgrindGlobalSettings>(); connect(m_stackBrowser, SIGNAL(currentChanged()), SLOT(stackBrowserChanged())); connect(m_updateTimer, SIGNAL(timeout()), SLOT(updateFilterString())); @@ -520,7 +520,7 @@ QByteArray CallgrindTool::id() const QString CallgrindTool::displayName() const { - return tr("Valgrind Function Profile"); + return tr("Valgrind Function Profiler"); } QString CallgrindTool::description() const @@ -598,7 +598,7 @@ IAnalyzerEngine *CallgrindToolPrivate::createEngine(const AnalyzerStartParameter // apply project settings AnalyzerProjectSettings *analyzerSettings = runConfiguration->extraAspect<AnalyzerProjectSettings>(); - CallgrindProjectSettings *settings = analyzerSettings->subConfig<CallgrindProjectSettings>(); + ValgrindProjectSettings *settings = analyzerSettings->subConfig<ValgrindProjectSettings>(); QTC_ASSERT(settings, return engine) QTC_ASSERT(m_visualisation, return engine); |