From 7592fb13f2c7353e33184fcafcb41175a6a2653e Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Fri, 4 Mar 2011 16:00:01 +0100 Subject: [PATCH] cleanup code and follow coding style Merge-request: 265 Reviewed-by: hjk --- .../valgrind/xmlprotocol/threadedparser.cpp | 2 +- src/plugins/analyzerbase/analyzermanager.cpp | 12 ++++++------ src/plugins/analyzerbase/analyzermanager.h | 2 +- .../analyzerbase/analyzerrunconfigwidget.cpp | 2 +- src/plugins/analyzerbase/analyzersettings.cpp | 8 ++++---- src/plugins/analyzerbase/analyzersettings.h | 18 +++++++++--------- src/plugins/memcheck/memcheckengine.cpp | 2 +- src/plugins/memcheck/memcheckengine.h | 2 +- src/plugins/memcheck/memcheckerrorview.h | 2 +- src/plugins/memcheck/memchecksettings.cpp | 8 +++----- src/plugins/memcheck/memchecksettings.h | 4 ++-- src/plugins/memcheck/memchecktool.cpp | 2 +- src/plugins/memcheck/memchecktool.h | 2 +- src/plugins/valgrindtoolbase/valgrindengine.h | 5 +++-- 14 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/libs/valgrind/xmlprotocol/threadedparser.cpp b/src/libs/valgrind/xmlprotocol/threadedparser.cpp index a303d54cb88..79e089207db 100644 --- a/src/libs/valgrind/xmlprotocol/threadedparser.cpp +++ b/src/libs/valgrind/xmlprotocol/threadedparser.cpp @@ -130,7 +130,7 @@ void ThreadedParser::parse(QIODevice *device) Qt::QueuedConnection); - Thread* thread = new Thread; + Thread *thread = new Thread; d->parserThread = thread; connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 0564f11daca..c3baff077aa 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -124,7 +124,7 @@ public: QWidget *createContents(); QWidget *createMainWindow(); - void addDock(IAnalyzerTool* tool, Qt::DockWidgetArea area, QDockWidget* dockWidget); + void addDock(IAnalyzerTool *tool, Qt::DockWidgetArea area, QDockWidget *dockWidget); void startTool(); AnalyzerManager *q; @@ -276,7 +276,7 @@ QWidget *AnalyzerManager::AnalyzerManagerPrivate::createMainWindow() QHBoxLayout *analyzeToolBarLayout = new QHBoxLayout(analyzeToolBar); analyzeToolBarLayout->setMargin(0); analyzeToolBarLayout->setSpacing(0); - QToolButton* startButton = toolButton(m_startAction); + QToolButton *startButton = toolButton(m_startAction); analyzeToolBarLayout->addWidget(startButton); analyzeToolBarLayout->addWidget(toolButton(m_stopAction)); analyzeToolBarLayout->addWidget(new Utils::StyledSeparator); @@ -475,7 +475,7 @@ void AnalyzerManager::modeChanged(IMode *mode) d->m_mainWindow->setDockActionsVisible(mode->id() == Constants::MODE_ANALYZE); } -void AnalyzerManager::selectTool(IAnalyzerTool* tool) +void AnalyzerManager::selectTool(IAnalyzerTool *tool) { QTC_ASSERT(d->m_tools.contains(tool), return); toolSelected(d->m_tools.indexOf(tool)); @@ -488,7 +488,7 @@ void AnalyzerManager::toolSelected(int idx) return; selectingTool = true; - IAnalyzerTool* oldTool = currentTool(); + IAnalyzerTool *oldTool = currentTool(); if (oldTool) { saveToolSettings(oldTool); @@ -510,7 +510,7 @@ void AnalyzerManager::toolSelected(int idx) d->m_toolGroup->actions().at(idx)->setChecked(true); d->m_toolBox->setCurrentIndex(idx); - IAnalyzerTool* newTool = currentTool(); + IAnalyzerTool *newTool = currentTool(); if (QWidget *toolbarWidget = d->m_toolToolbarWidgets.value(newTool)) d->m_toolbarStackedWidget->setCurrentWidget(toolbarWidget); @@ -546,7 +546,7 @@ void AnalyzerManager::addTool(IAnalyzerTool *tool) selectTool(tool); // the first tool gets selected automatically due to signal emission from toolbox tool->initialize(plugin); - QSettings* defaultSettings = new QSettings(this); + QSettings *defaultSettings = new QSettings(this); d->m_defaultSettings[tool] = defaultSettings; d->m_mainWindow->saveSettings(defaultSettings); diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h index 033ca16753e..866a7475196 100644 --- a/src/plugins/analyzerbase/analyzermanager.h +++ b/src/plugins/analyzerbase/analyzermanager.h @@ -157,7 +157,7 @@ public: Utils::FancyMainWindow *mainWindow() const; - void selectTool(IAnalyzerTool* tool); + void selectTool(IAnalyzerTool *tool); private slots: void startTool(); diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp index 592dc8e5846..fa296b795aa 100644 --- a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp +++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp @@ -71,7 +71,7 @@ void AnalyzerRunConfigWidget::setRunConfiguration(ProjectExplorer::RunConfigurat AnalyzerProjectSettings *settings = rc->extraAspect(); QTC_ASSERT(settings, return); - foreach(AbstractAnalyzerSubConfig* config, settings->subConfigs()) { + foreach(AbstractAnalyzerSubConfig *config, settings->subConfigs()) { m_tabWidget->addTab(config->createConfigWidget(this), config->displayName()); } } diff --git a/src/plugins/analyzerbase/analyzersettings.cpp b/src/plugins/analyzerbase/analyzersettings.cpp index b6ee5271fa3..6ca463753ef 100644 --- a/src/plugins/analyzerbase/analyzersettings.cpp +++ b/src/plugins/analyzerbase/analyzersettings.cpp @@ -73,7 +73,7 @@ AnalyzerSettings::~AnalyzerSettings() bool AnalyzerSettings::fromMap(const QVariantMap &map) { bool ret = true; - foreach(AbstractAnalyzerSubConfig* config, subConfigs()) { + foreach(AbstractAnalyzerSubConfig *config, subConfigs()) { ret = ret && config->fromMap(map); } return ret; @@ -82,7 +82,7 @@ bool AnalyzerSettings::fromMap(const QVariantMap &map) QVariantMap AnalyzerSettings::defaults() const { QVariantMap map; - foreach(AbstractAnalyzerSubConfig* config, subConfigs()) { + foreach(AbstractAnalyzerSubConfig *config, subConfigs()) { map.unite(config->defaults()); } return map; @@ -91,7 +91,7 @@ QVariantMap AnalyzerSettings::defaults() const QVariantMap AnalyzerSettings::toMap() const { QVariantMap map; - foreach(AbstractAnalyzerSubConfig* config, subConfigs()) { + foreach(AbstractAnalyzerSubConfig *config, subConfigs()) { map.unite(config->toMap()); } return map; @@ -176,7 +176,7 @@ QString AnalyzerProjectSettings::displayName() const return tr("Analyzer Settings"); } -bool AnalyzerProjectSettings::fromMap(const QVariantMap& map) +bool AnalyzerProjectSettings::fromMap(const QVariantMap &map) { return AnalyzerSettings::fromMap(map); } diff --git a/src/plugins/analyzerbase/analyzersettings.h b/src/plugins/analyzerbase/analyzersettings.h index f5e7cf790b5..a0500ccadbb 100644 --- a/src/plugins/analyzerbase/analyzersettings.h +++ b/src/plugins/analyzerbase/analyzersettings.h @@ -73,7 +73,7 @@ public: virtual QString id() const = 0; virtual QString displayName() const = 0; - virtual QWidget* createConfigWidget(QWidget *parent) = 0; + virtual QWidget *createConfigWidget(QWidget *parent) = 0; }; /** @@ -86,8 +86,8 @@ public: AbstractAnalyzerSubConfigFactory(){} ~AbstractAnalyzerSubConfigFactory(){} - virtual AbstractAnalyzerSubConfig* createGlobalSubConfig() = 0; - virtual AbstractAnalyzerSubConfig* createProjectSubConfig() = 0; + virtual AbstractAnalyzerSubConfig *createGlobalSubConfig() = 0; + virtual AbstractAnalyzerSubConfig *createProjectSubConfig() = 0; }; /** @@ -103,12 +103,12 @@ class ANALYZER_EXPORT AnalyzerSubConfigFactory : public AbstractAnalyzerSubConfi public: AnalyzerSubConfigFactory(){} - AbstractAnalyzerSubConfig* createGlobalSubConfig() + AbstractAnalyzerSubConfig *createGlobalSubConfig() { return new GlobalConfigT; } - AbstractAnalyzerSubConfig* createProjectSubConfig() + AbstractAnalyzerSubConfig *createProjectSubConfig() { return new ProjectConfigT; } @@ -128,19 +128,19 @@ public: template T* subConfig() const { - return findChild(); + return findChild(); } - QList subConfigs() const + QList subConfigs() const { - return findChildren(); + return findChildren(); } QVariantMap defaults() const; virtual QVariantMap toMap() const; protected: - void addSubConfig(AbstractAnalyzerSubConfig* config) + void addSubConfig(AbstractAnalyzerSubConfig *config) { config->setParent(this); } diff --git a/src/plugins/memcheck/memcheckengine.cpp b/src/plugins/memcheck/memcheckengine.cpp index ab37a0a21d6..6e87b5105d3 100644 --- a/src/plugins/memcheck/memcheckengine.cpp +++ b/src/plugins/memcheck/memcheckengine.cpp @@ -110,7 +110,7 @@ QStringList MemcheckEngine::suppressionFiles() const return m_settings->subConfig()->suppressionFiles(); } -void MemcheckEngine::status(const Valgrind::XmlProtocol::Status &status) +void MemcheckEngine::status(const Status &status) { m_progress->setProgressValue(status.state() + 1); } diff --git a/src/plugins/memcheck/memcheckengine.h b/src/plugins/memcheck/memcheckengine.h index 7738937cd46..2a89ed7f99c 100644 --- a/src/plugins/memcheck/memcheckengine.h +++ b/src/plugins/memcheck/memcheckengine.h @@ -67,7 +67,7 @@ private slots: private: QString progressTitle() const; QStringList toolArguments() const; - Valgrind::ValgrindRunner* runner(); + Valgrind::ValgrindRunner *runner(); Valgrind::XmlProtocol::ThreadedParser m_parser; Valgrind::Memcheck::MemcheckRunner m_runner; diff --git a/src/plugins/memcheck/memcheckerrorview.h b/src/plugins/memcheck/memcheckerrorview.h index ba5c8c110dd..cf04447de7f 100644 --- a/src/plugins/memcheck/memcheckerrorview.h +++ b/src/plugins/memcheck/memcheckerrorview.h @@ -109,7 +109,7 @@ signals: void resized(); public slots: - void settingsChanged(AnalyzerSettings* settings); + void settingsChanged(AnalyzerSettings *settings); protected: void resizeEvent(QResizeEvent *e); diff --git a/src/plugins/memcheck/memchecksettings.cpp b/src/plugins/memcheck/memchecksettings.cpp index 9eac3c95305..e669f2718f0 100644 --- a/src/plugins/memcheck/memchecksettings.cpp +++ b/src/plugins/memcheck/memchecksettings.cpp @@ -194,20 +194,18 @@ QVariantMap MemcheckGlobalSettings::toMap() const return map; } -MemcheckGlobalSettings* globalMemcheckSettings() +MemcheckGlobalSettings *globalMemcheckSettings() { - MemcheckGlobalSettings* ret = AnalyzerGlobalSettings::instance()->subConfig(); + MemcheckGlobalSettings *ret = AnalyzerGlobalSettings::instance()->subConfig(); QTC_ASSERT(ret, return 0); return ret; } MemcheckProjectSettings::MemcheckProjectSettings() { - // take defaults from global settings - fromMap(globalMemcheckSettings()->toMap()); } -bool MemcheckProjectSettings::fromMap(const QVariantMap& map) +bool MemcheckProjectSettings::fromMap(const QVariantMap &map) { AbstractMemcheckSettings::fromMap(map); setIfPresent(map, addedSuppressionFilesC, &m_addedSuppressionFiles); diff --git a/src/plugins/memcheck/memchecksettings.h b/src/plugins/memcheck/memchecksettings.h index 143ed21dfb2..171d5f54369 100644 --- a/src/plugins/memcheck/memchecksettings.h +++ b/src/plugins/memcheck/memchecksettings.h @@ -36,7 +36,7 @@ #ifndef ANALYZER_INTERNAL_MEMCHECKSETTINGS_H #define ANALYZER_INTERNAL_MEMCHECKSETTINGS_H -#include "analyzersettings.h" +#include namespace Analyzer { namespace Internal { @@ -66,7 +66,7 @@ public: virtual QString id() const; virtual QString displayName() const; - virtual QWidget* createConfigWidget(QWidget *parent); + virtual QWidget *createConfigWidget(QWidget *parent); public slots: void setNumCallers(int); diff --git a/src/plugins/memcheck/memchecktool.cpp b/src/plugins/memcheck/memchecktool.cpp index 72a17374386..4b79e7a13ca 100644 --- a/src/plugins/memcheck/memchecktool.cpp +++ b/src/plugins/memcheck/memchecktool.cpp @@ -542,7 +542,7 @@ void MemcheckTool::updateErrorFilter() { QTC_ASSERT(m_settings, return); - AbstractMemcheckSettings* memcheckSettings = m_settings->subConfig(); + AbstractMemcheckSettings *memcheckSettings = m_settings->subConfig(); QTC_ASSERT(memcheckSettings, return); memcheckSettings->setFilterExternalIssues(!m_filterProjectAction->isChecked()); diff --git a/src/plugins/memcheck/memchecktool.h b/src/plugins/memcheck/memchecktool.h index 29d211e6e55..547fb14cfae 100644 --- a/src/plugins/memcheck/memchecktool.h +++ b/src/plugins/memcheck/memchecktool.h @@ -36,7 +36,7 @@ #ifndef MEMCHECKTOOL_H #define MEMCHECKTOOL_H -#include "ianalyzertool.h" +#include #include #include diff --git a/src/plugins/valgrindtoolbase/valgrindengine.h b/src/plugins/valgrindtoolbase/valgrindengine.h index 0c5deaf5ff1..d56044d2e3f 100644 --- a/src/plugins/valgrindtoolbase/valgrindengine.h +++ b/src/plugins/valgrindtoolbase/valgrindengine.h @@ -37,7 +37,8 @@ #define VALGRINDENGINE_H #include "valgrindtoolbase_global.h" -#include "ianalyzerengine.h" + +#include #include @@ -68,7 +69,7 @@ public: protected: virtual QString progressTitle() const = 0; virtual QStringList toolArguments() const = 0; - virtual Valgrind::ValgrindRunner* runner() = 0; + virtual Valgrind::ValgrindRunner *runner() = 0; AnalyzerSettings *m_settings; QFutureInterface *m_progress;