cleanup code and follow coding style

Merge-request: 265
Reviewed-by: hjk <qtc-committer@nokia.com>

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()));

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);
 

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();

src/plugins/analyzerbase/analyzerrunconfigwidget.cpp

@@ -71,7 +71,7 @@ void AnalyzerRunConfigWidget::setRunConfiguration(ProjectExplorer::RunConfigurat
     AnalyzerProjectSettings *settings = rc->extraAspect<AnalyzerProjectSettings>();
     QTC_ASSERT(settings, return);
 
-    foreach(AbstractAnalyzerSubConfig* config, settings->subConfigs()) {
+    foreach(AbstractAnalyzerSubConfig *config, settings->subConfigs()) {
         m_tabWidget->addTab(config->createConfigWidget(this), config->displayName());
     }
 }

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);
 }

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<class T>
     T* subConfig() const
     {
-        return findChild<T*>();
+        return findChild<T *>();
     }
 
-    QList<AbstractAnalyzerSubConfig*> subConfigs() const
+    QList<AbstractAnalyzerSubConfig *> subConfigs() const
     {
-        return findChildren<AbstractAnalyzerSubConfig*>();
+        return findChildren<AbstractAnalyzerSubConfig *>();
     }
 
     QVariantMap defaults() const;
     virtual QVariantMap toMap() const;
 
 protected:
-    void addSubConfig(AbstractAnalyzerSubConfig* config)
+    void addSubConfig(AbstractAnalyzerSubConfig *config)
     {
         config->setParent(this);
     }

src/plugins/memcheck/memcheckengine.cpp

@@ -110,7 +110,7 @@ QStringList MemcheckEngine::suppressionFiles() const
     return m_settings->subConfig<AbstractMemcheckSettings>()->suppressionFiles();
 }
 
-void MemcheckEngine::status(const Valgrind::XmlProtocol::Status &status)
+void MemcheckEngine::status(const Status &status)
 {
     m_progress->setProgressValue(status.state() + 1);
 }

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;

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);

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>();
+    MemcheckGlobalSettings *ret = AnalyzerGlobalSettings::instance()->subConfig<MemcheckGlobalSettings>();
     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);

src/plugins/memcheck/memchecksettings.h

@@ -36,7 +36,7 @@
 #ifndef ANALYZER_INTERNAL_MEMCHECKSETTINGS_H
 #define ANALYZER_INTERNAL_MEMCHECKSETTINGS_H
 
-#include "analyzersettings.h"
+#include <analyzerbase/analyzersettings.h>
 
 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);

src/plugins/memcheck/memchecktool.cpp

@@ -542,7 +542,7 @@ void MemcheckTool::updateErrorFilter()
 {
     QTC_ASSERT(m_settings, return);
 
-    AbstractMemcheckSettings* memcheckSettings = m_settings->subConfig<AbstractMemcheckSettings>();
+    AbstractMemcheckSettings *memcheckSettings = m_settings->subConfig<AbstractMemcheckSettings>();
     QTC_ASSERT(memcheckSettings, return);
     memcheckSettings->setFilterExternalIssues(!m_filterProjectAction->isChecked());
 

src/plugins/memcheck/memchecktool.h

@@ -36,7 +36,7 @@
 #ifndef MEMCHECKTOOL_H
 #define MEMCHECKTOOL_H
 
-#include "ianalyzertool.h"
+#include <analyzerbase/ianalyzertool.h>
 
 #include <QSortFilterProxyModel>
 #include <QSharedPointer>

src/plugins/valgrindtoolbase/valgrindengine.h

@@ -37,7 +37,8 @@
 #define VALGRINDENGINE_H
 
 #include "valgrindtoolbase_global.h"
-#include "ianalyzerengine.h"
+
+#include <analyzerbase/ianalyzerengine.h>
 
 #include <utils/environment.h>
 
@@ -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<void> *m_progress;