Valgrind: Fix coding style issues.

Header specification, remove internal classes from exported
headers, fully qualify signals,slots.

47 files changed, 197 insertions, 201 deletions

diff --git a/src/libs/valgrind/memcheck/memcheckrunner.cpp b/src/libs/valgrind/memcheck/memcheckrunner.cpp
index 00fefe94136..a4829d60c3d 100644
--- a/src/libs/valgrind/memcheck/memcheckrunner.cpp
+++ b/src/libs/valgrind/memcheck/memcheckrunner.cpp
@@ -41,10 +41,10 @@
 
 #include <utils/qtcassert.h>
 
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QEventLoop>
-#include <QNetworkInterface>
+#include <QtNetwork/QTcpServer>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QNetworkInterface>
+#include <QtCore/QEventLoop>
 
 using namespace Valgrind::Memcheck;
 
diff --git a/src/libs/valgrind/valgrindprocess.cpp b/src/libs/valgrind/valgrindprocess.cpp
index 1731c80d303..cf7775d8536 100644
--- a/src/libs/valgrind/valgrindprocess.cpp
+++ b/src/libs/valgrind/valgrindprocess.cpp
@@ -35,9 +35,9 @@
 
 #include "valgrindprocess.h"
 
-#include <QDebug>
-#include <QEventLoop>
-#include <QFileInfo>
+#include <QtCore/QDebug>
+#include <QtCore/QEventLoop>
+#include <QtCore/QFileInfo>
 
 namespace Valgrind {
 namespace Internal {
diff --git a/src/libs/valgrind/valgrindrunner.cpp b/src/libs/valgrind/valgrindrunner.cpp
index 009cd2654ea..becf82a917a 100644
--- a/src/libs/valgrind/valgrindrunner.cpp
+++ b/src/libs/valgrind/valgrindrunner.cpp
@@ -40,7 +40,7 @@
 
 #include <utils/environment.h>
 
-#include <QEventLoop>
+#include <QtCore/QEventLoop>
 
 using namespace Valgrind;
 
@@ -250,4 +250,4 @@ void ValgrindRunner::stop()
 {
     if (d->process)
         d->process->close();
-}
\ No newline at end of file
+}
diff --git a/src/libs/valgrind/valgrindrunner.h b/src/libs/valgrind/valgrindrunner.h
index 67a69f93c08..05c9b5c4e05 100644
--- a/src/libs/valgrind/valgrindrunner.h
+++ b/src/libs/valgrind/valgrindrunner.h
@@ -36,7 +36,7 @@
 #ifndef VALGRIND_RUNNER_H
 #define VALGRIND_RUNNER_H
 
-#include <QProcess>
+#include <QtCore/QProcess>
 
 #include "valgrind_global.h"
 
diff --git a/src/libs/valgrind/xmlprotocol/announcethread.cpp b/src/libs/valgrind/xmlprotocol/announcethread.cpp
index 2b96f348b7d..38fbbb9dcc9 100644
--- a/src/libs/valgrind/xmlprotocol/announcethread.cpp
+++ b/src/libs/valgrind/xmlprotocol/announcethread.cpp
@@ -36,8 +36,8 @@
 #include "announcethread.h"
 #include "frame.h"
 
-#include <QSharedData>
-#include <QVector>
+#include <QtCore/QSharedData>
+#include <QtCore/QVector>
 
 #include <algorithm>
 
diff --git a/src/libs/valgrind/xmlprotocol/announcethread.h b/src/libs/valgrind/xmlprotocol/announcethread.h
index 8c170efc455..2b0f910e96f 100644
--- a/src/libs/valgrind/xmlprotocol/announcethread.h
+++ b/src/libs/valgrind/xmlprotocol/announcethread.h
@@ -38,7 +38,7 @@
 
 #include "../valgrind_global.h"
 
-#include <QSharedDataPointer>
+#include <QtCore/QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 template <typename T> class QVector;
diff --git a/src/libs/valgrind/xmlprotocol/error.cpp b/src/libs/valgrind/xmlprotocol/error.cpp
index c05869c9325..6b43f4bf798 100644
--- a/src/libs/valgrind/xmlprotocol/error.cpp
+++ b/src/libs/valgrind/xmlprotocol/error.cpp
@@ -38,12 +38,12 @@
 #include "stack.h"
 #include "suppression.h"
 
-#include <QSharedData>
-#include <QString>
-#include <QTextStream>
-#include <QVector>
+#include <QtCore/QSharedData>
+#include <QtCore/QString>
+#include <QtCore/QTextStream>
+#include <QtCore/QVector>
 
-#include <QtAlgorithms>
+#include <QtCore/QtAlgorithms>
 
 using namespace Valgrind;
 using namespace Valgrind::XmlProtocol;
diff --git a/src/libs/valgrind/xmlprotocol/error.h b/src/libs/valgrind/xmlprotocol/error.h
index eabe1c75fa9..ae2e20ac701 100644
--- a/src/libs/valgrind/xmlprotocol/error.h
+++ b/src/libs/valgrind/xmlprotocol/error.h
@@ -38,8 +38,8 @@
 
 #include "../valgrind_global.h"
 
-#include <QMetaType>
-#include <QSharedDataPointer>
+#include <QtCore/QMetaType>
+#include <QtCore/QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/libs/valgrind/xmlprotocol/errorlistmodel.cpp b/src/libs/valgrind/xmlprotocol/errorlistmodel.cpp
index 599d52f0832..2c617c7129f 100644
--- a/src/libs/valgrind/xmlprotocol/errorlistmodel.cpp
+++ b/src/libs/valgrind/xmlprotocol/errorlistmodel.cpp
@@ -40,8 +40,8 @@
 #include "modelhelpers.h"
 #include <utils/qtcassert.h>
 
-#include <QDir>
-#include <QVector>
+#include <QtCore/QDir>
+#include <QtCore/QVector>
 
 using namespace Valgrind;
 using namespace Valgrind::XmlProtocol;
diff --git a/src/libs/valgrind/xmlprotocol/errorlistmodel.h b/src/libs/valgrind/xmlprotocol/errorlistmodel.h
index ddf5296c766..51a953011ff 100644
--- a/src/libs/valgrind/xmlprotocol/errorlistmodel.h
+++ b/src/libs/valgrind/xmlprotocol/errorlistmodel.h
@@ -38,8 +38,8 @@
 
 #include "../valgrind_global.h"
 
-#include <QAbstractItemModel>
-#include <QSharedPointer>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QSharedPointer>
 
 namespace Valgrind {
 namespace XmlProtocol {
diff --git a/src/libs/valgrind/xmlprotocol/frame.cpp b/src/libs/valgrind/xmlprotocol/frame.cpp
index da2e5c40df3..c2a3f14b21e 100644
--- a/src/libs/valgrind/xmlprotocol/frame.cpp
+++ b/src/libs/valgrind/xmlprotocol/frame.cpp
@@ -35,9 +35,8 @@
 
 #include "frame.h"
 
-#include <QString>
-
-#include <QtAlgorithms>
+#include <QtCore/QString>
+#include <QtCore/QtAlgorithms>
 
 using namespace Valgrind;
 using namespace Valgrind::XmlProtocol;
diff --git a/src/libs/valgrind/xmlprotocol/frame.h b/src/libs/valgrind/xmlprotocol/frame.h
index 2dd36cc3360..ab149c1dfc5 100644
--- a/src/libs/valgrind/xmlprotocol/frame.h
+++ b/src/libs/valgrind/xmlprotocol/frame.h
@@ -38,7 +38,7 @@
 
 #include "../valgrind_global.h"
 
-#include <QSharedDataPointer>
+#include <QtCore/QSharedDataPointer>
 
 namespace Valgrind {
 namespace XmlProtocol {
diff --git a/src/libs/valgrind/xmlprotocol/stack.cpp b/src/libs/valgrind/xmlprotocol/stack.cpp
index 55141b92086..406bc1cd637 100644
--- a/src/libs/valgrind/xmlprotocol/stack.cpp
+++ b/src/libs/valgrind/xmlprotocol/stack.cpp
@@ -36,9 +36,9 @@
 #include "stack.h"
 #include "frame.h"
 
-#include <QSharedData>
-#include <QString>
-#include <QVector>
+#include <QtCore/QSharedData>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 #include <algorithm>
 
diff --git a/src/libs/valgrind/xmlprotocol/stack.h b/src/libs/valgrind/xmlprotocol/stack.h
index f4281919163..630b493b184 100644
--- a/src/libs/valgrind/xmlprotocol/stack.h
+++ b/src/libs/valgrind/xmlprotocol/stack.h
@@ -38,7 +38,7 @@
 
 #include "../valgrind_global.h"
 
-#include <QSharedDataPointer>
+#include <QtCore/QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 template <typename T> class QVector;
diff --git a/src/libs/valgrind/xmlprotocol/stackmodel.cpp b/src/libs/valgrind/xmlprotocol/stackmodel.cpp
index 0404b513c48..795a0ce5bde 100644
--- a/src/libs/valgrind/xmlprotocol/stackmodel.cpp
+++ b/src/libs/valgrind/xmlprotocol/stackmodel.cpp
@@ -37,11 +37,12 @@
 #include "error.h"
 #include "frame.h"
 #include "stack.h"
+#include "modelhelpers.h"
+
 #include <utils/qtcassert.h>
 
-#include <QDir>
-#include <QVector>
-#include "modelhelpers.h"
+#include <QtCore/QDir>
+#include <QtCore/QVector>
 
 using namespace Valgrind;
 using namespace Valgrind::XmlProtocol;
diff --git a/src/libs/valgrind/xmlprotocol/stackmodel.h b/src/libs/valgrind/xmlprotocol/stackmodel.h
index b04ad972ba9..f813ab2dc83 100644
--- a/src/libs/valgrind/xmlprotocol/stackmodel.h
+++ b/src/libs/valgrind/xmlprotocol/stackmodel.h
@@ -38,7 +38,7 @@
 
 #include "../valgrind_global.h"
 
-#include <QAbstractItemModel>
+#include <QtCore/QAbstractItemModel>
 
 namespace Valgrind {
 namespace XmlProtocol {
diff --git a/src/libs/valgrind/xmlprotocol/status.cpp b/src/libs/valgrind/xmlprotocol/status.cpp
index 8dfe205e6b0..a5b9cbff2c0 100644
--- a/src/libs/valgrind/xmlprotocol/status.cpp
+++ b/src/libs/valgrind/xmlprotocol/status.cpp
@@ -35,8 +35,8 @@
 
 #include "status.h"
 
-#include <QSharedData>
-#include <QString>
+#include <QtCore/QSharedData>
+#include <QtCore/QString>
 
 using namespace Valgrind;
 using namespace Valgrind::XmlProtocol;
diff --git a/src/libs/valgrind/xmlprotocol/status.h b/src/libs/valgrind/xmlprotocol/status.h
index fb88aa53e62..9b72fd4e390 100644
--- a/src/libs/valgrind/xmlprotocol/status.h
+++ b/src/libs/valgrind/xmlprotocol/status.h
@@ -38,8 +38,8 @@
 
 #include "../valgrind_global.h"
 
-#include <QMetaType>
-#include <QSharedDataPointer>
+#include <QtCore/QMetaType>
+#include <QtCore/QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/libs/valgrind/xmlprotocol/suppression.cpp b/src/libs/valgrind/xmlprotocol/suppression.cpp
index 17306a97e8a..00439069dc7 100644
--- a/src/libs/valgrind/xmlprotocol/suppression.cpp
+++ b/src/libs/valgrind/xmlprotocol/suppression.cpp
@@ -35,10 +35,10 @@
 
 #include "suppression.h"
 
-#include <QSharedData>
-#include <QString>
-#include <QVector>
-#include <QTextStream>
+#include <QtCore/QSharedData>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+#include <QtCore/QTextStream>
 
 #include <algorithm>
 
diff --git a/src/libs/valgrind/xmlprotocol/suppression.h b/src/libs/valgrind/xmlprotocol/suppression.h
index ab896a4ab49..83d7998d890 100644
--- a/src/libs/valgrind/xmlprotocol/suppression.h
+++ b/src/libs/valgrind/xmlprotocol/suppression.h
@@ -38,7 +38,7 @@
 
 #include "../valgrind_global.h"
 
-#include <QSharedDataPointer>
+#include <QtCore/QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/libs/valgrind/xmlprotocol/threadedparser.cpp b/src/libs/valgrind/xmlprotocol/threadedparser.cpp
index 79e089207db..4062445e17d 100644
--- a/src/libs/valgrind/xmlprotocol/threadedparser.cpp
+++ b/src/libs/valgrind/xmlprotocol/threadedparser.cpp
@@ -41,9 +41,9 @@
 #include "suppression.h"
 #include <utils/qtcassert.h>
 
-#include <QMetaType>
-#include <QThread>
-#include <QSharedPointer>
+#include <QtCore/QMetaType>
+#include <QtCore/QThread>
+#include <QtCore/QSharedPointer>
 
 using namespace Valgrind;
 using namespace Valgrind::XmlProtocol;
diff --git a/src/libs/valgrind/xmlprotocol/threadedparser.h b/src/libs/valgrind/xmlprotocol/threadedparser.h
index ea06c729e84..0cbc59cb3f0 100644
--- a/src/libs/valgrind/xmlprotocol/threadedparser.h
+++ b/src/libs/valgrind/xmlprotocol/threadedparser.h
@@ -38,7 +38,7 @@
 
 #include "../valgrind_global.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 class QIODevice;
diff --git a/src/plugins/analyzerbase/analyzerconstants.h b/src/plugins/analyzerbase/analyzerconstants.h
index 6c89899b65d..ee40095ef97 100644
--- a/src/plugins/analyzerbase/analyzerconstants.h
+++ b/src/plugins/analyzerbase/analyzerconstants.h
@@ -36,14 +36,14 @@
 #ifndef ANALYZERCONSTANTS_H
 #define ANALYZERCONSTANTS_H
 
-#include <QtGlobal>
+#include <QtCore/QtGlobal>
 
 namespace Analyzer {
 namespace Constants {
 
 // modes and their priorities
 const char * const MODE_ANALYZE   = "Analyzer.Mode.Analyze";
-const int          P_MODE_ANALYZE = 60;
+const int          P_MODE_ANALYZE = 76;
 
 // context
 const char * const C_ANALYZEMODE = "Analyzer.AnalyzeMode";
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 165849576af..13c807cd2e4 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -34,6 +34,7 @@
 **************************************************************************/
 
 #include "analyzermanager.h"
+#include "analyzerconstants.h"
 
 #include "ianalyzertool.h"
 #include "analyzerplugin.h"
@@ -51,6 +52,9 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/imode.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorer.h>
@@ -69,23 +73,22 @@
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 #include <qt4projectmanager/qt4projectmanagerconstants.h>
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QDockWidget>
-#include <QVariant>
-#include <QAction>
-#include <QMenu>
-#include <QMenuBar>
-#include <QToolButton>
-#include <QComboBox>
-#include <QStackedWidget>
-#include <QDebug>
-#include <QDialog>
-#include <QApplication>
-#include <QLabel>
-#include <QCheckBox>
-#include <QDialogButtonBox>
-
+#include <QtCore/QVariant>
+#include <QtCore/QDebug>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QDockWidget>
+#include <QtGui/QAction>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QToolButton>
+#include <QtGui/QComboBox>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QDialog>
+#include <QtGui/QApplication>
+#include <QtGui/QLabel>
+#include <QtGui/QCheckBox>
+#include <QtGui/QDialogButtonBox>
 
 using namespace Core;
 using namespace Analyzer;
@@ -94,6 +97,20 @@ using namespace Analyzer::Internal;
 namespace Analyzer {
 namespace Internal {
 
+class DockWidgetEventFilter : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit DockWidgetEventFilter(QObject *parent = 0) : QObject(parent) {}
+
+signals:
+    void widgetResized();
+
+protected:
+    virtual bool eventFilter(QObject *obj, QEvent *event);
+};
+
 bool DockWidgetEventFilter::eventFilter(QObject *obj, QEvent *event)
 {
     switch (event->type()) {
@@ -109,6 +126,44 @@ bool DockWidgetEventFilter::eventFilter(QObject *obj, QEvent *event)
 
 // AnalyzerMode ////////////////////////////////////////////////////
 
+class AnalyzerMode : public Core::IMode
+{
+    Q_OBJECT
+
+public:
+    AnalyzerMode(QObject *parent = 0)
+        : Core::IMode(parent)
+        , m_widget(0)
+    {}
+
+    ~AnalyzerMode()
+    {
+        // Make sure the editor manager does not get deleted.
+        if (m_widget) {
+            delete m_widget;
+            m_widget = 0;
+        }
+        Core::EditorManager::instance()->setParent(0);
+    }
+
+    QString displayName() const { return tr("Analyze"); }
+    QIcon icon() const { return QIcon(":/images/analyzer_mode.png"); }
+    int priority() const { return Constants::P_MODE_ANALYZE; }
+    QWidget *widget() { return m_widget; }
+    QString id() const { return QLatin1String(Constants::MODE_ANALYZE); }
+    QString type() const { return Core::Constants::MODE_EDIT_TYPE; }
+    Core::Context context() const
+    {
+        return Core::Context(Core::Constants::C_EDITORMANAGER, Constants::C_ANALYZEMODE,
+                             Core::Constants::C_NAVIGATION_PANE);
+    }
+    QString contextHelpId() const { return QString(); }
+    void setWidget(QWidget *widget) { m_widget = widget; }
+
+private:
+    QWidget *m_widget;
+};
+
 } // namespace Internal
 } // namespace Analyzer
 
@@ -181,8 +236,8 @@ AnalyzerManager::AnalyzerManagerPrivate::AnalyzerManagerPrivate(AnalyzerManager
 {
     m_runControlFactory = new AnalyzerRunControlFactory();
     AnalyzerPlugin::instance()->addAutoReleasedObject(m_runControlFactory);
-    connect(m_runControlFactory, SIGNAL(runControlCreated(AnalyzerRunControl *)),
-            q, SLOT(runControlCreated(AnalyzerRunControl *)));
+    connect(m_runControlFactory, SIGNAL(runControlCreated(Analyzer::Internal::AnalyzerRunControl *)),
+            q, SLOT(runControlCreated(Analyzer::Internal::AnalyzerRunControl *)));
 
     setupActions();
 }
@@ -699,3 +754,5 @@ void AnalyzerManager::updateRunActions()
     bool startEnabled = !d->m_currentRunControl && pe->canRun(project, Constants::MODE_ANALYZE);
     d->m_startAction->setEnabled(startEnabled);
 }
+
+#include "analyzermanager.moc"
diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h
index 2e7c3b88ce5..b89359c46eb 100644
--- a/src/plugins/analyzerbase/analyzermanager.h
+++ b/src/plugins/analyzerbase/analyzermanager.h
@@ -37,14 +37,8 @@
 #define ANALYZERMANAGER_H
 
 #include "analyzerbase_global.h"
-#include "analyzerconstants.h"
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/imode.h>
-
-#include <QObject>
-#include <QIcon>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 class QAction;
@@ -60,68 +54,10 @@ class FancyMainWindow;
 }
 
 namespace Analyzer {
-
 class IAnalyzerTool;
-
 namespace Internal {
-
 class AnalyzerRunControl;
-
-class DockWidgetEventFilter : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit DockWidgetEventFilter(QObject *parent = 0) : QObject(parent) {}
-
-signals:
-    void widgetResized();
-
-protected:
-    virtual bool eventFilter(QObject *obj, QEvent *event);
-};
-
-class AnalyzerMode : public Core::IMode
-{
-    Q_OBJECT
-
-public:
-    AnalyzerMode(QObject *parent = 0)
-        : Core::IMode(parent)
-        , m_widget(0)
-    {}
-
-    ~AnalyzerMode()
-    {
-        // Make sure the editor manager does not get deleted.
-        if (m_widget) {
-            delete m_widget;
-            m_widget = 0;
-        }
-        Core::EditorManager::instance()->setParent(0);
-    }
-
-    QString displayName() const { return tr("Analyze"); }
-    QIcon icon() const { return QIcon(":/images/analyzer_mode.png"); }
-    int priority() const { return Constants::P_MODE_ANALYZE; }
-    QWidget *widget() { return m_widget; }
-    QString id() const { return QLatin1String(Constants::MODE_ANALYZE); }
-    QString type() const { return Core::Constants::MODE_EDIT_TYPE; }
-    Core::Context context() const
-    {
-        return Core::Context(Core::Constants::C_EDITORMANAGER, Constants::C_ANALYZEMODE,
-                             Core::Constants::C_NAVIGATION_PANE);
-    }
-    QString contextHelpId() const { return QString(); }
-    void setWidget(QWidget *widget) { m_widget = widget; }
-
-private:
-    QWidget *m_widget;
-};
-
-}
-
-using Analyzer::Internal::AnalyzerRunControl;
+} // namespace Internal
 
 class ANALYZER_EXPORT AnalyzerManager : public QObject
 {
@@ -167,10 +103,10 @@ private slots:
     void toolSelected(int);
     void toolSelected(QAction *);
     void modeChanged(Core::IMode *mode);
-    void runControlCreated(AnalyzerRunControl *);
+    void runControlCreated(Analyzer::Internal::AnalyzerRunControl *);
     void resetLayout();
-    void saveToolSettings(IAnalyzerTool *tool);
-    void loadToolSettings(IAnalyzerTool *tool);
+    void saveToolSettings(Analyzer::IAnalyzerTool *tool);
+    void loadToolSettings(Analyzer::IAnalyzerTool *tool);
     void updateRunActions();
 
 private:
diff --git a/src/plugins/analyzerbase/analyzeroptionspage.cpp b/src/plugins/analyzerbase/analyzeroptionspage.cpp
index 1c2631e6f47..81f72351133 100644
--- a/src/plugins/analyzerbase/analyzeroptionspage.cpp
+++ b/src/plugins/analyzerbase/analyzeroptionspage.cpp
@@ -38,14 +38,15 @@
 #include "analyzeroptionspage.h"
 #include "analyzersettings.h"
 
-#include <QCoreApplication>
-#include <QLatin1String>
-#include <QWidget>
-#include <QDebug>
-#include <QIcon>
-
 #include <coreplugin/icore.h>
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QLatin1String>
+#include <QtCore/QDebug>
+
+#include <QtGui/QIcon>
+#include <QtGui/QWidget>
+
 using namespace Analyzer;
 using namespace Analyzer::Internal;
 
diff --git a/src/plugins/analyzerbase/analyzerplugin.cpp b/src/plugins/analyzerbase/analyzerplugin.cpp
index d943aa6c14f..b202dc57c13 100644
--- a/src/plugins/analyzerbase/analyzerplugin.cpp
+++ b/src/plugins/analyzerbase/analyzerplugin.cpp
@@ -45,10 +45,10 @@
 #include <projectexplorer/task.h>
 #include <projectexplorer/taskhub.h>
 
-#include <QtPlugin>
-#include <QMessageBox>
-#include <QMainWindow>
-#include <QApplication>
+#include <QtCore/QtPlugin>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMainWindow>
+#include <QtGui/QApplication>
 
 using namespace Analyzer;
 using namespace Analyzer::Internal;
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
index fbe50a0bf90..794b6107da1 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
+++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
@@ -40,9 +40,9 @@
 #include <utils/detailswidget.h>
 #include <utils/qtcassert.h>
 
-#include <QDebug>
-#include <QGroupBox>
-#include <QVBoxLayout>
+#include <QtCore/QDebug>
+#include <QtGui/QGroupBox>
+#include <QtGui/QVBoxLayout>
 
 using namespace Analyzer;
 using namespace Analyzer::Internal;
@@ -82,6 +82,7 @@ void AnalyzerRunConfigWidget::setRunConfiguration(ProjectExplorer::RunConfigurat
     QLayout* layout = m_detailsWidget->widget()->layout();
     foreach(AbstractAnalyzerSubConfig *config, settings->subConfigs()) {
         QGroupBox* box = new QGroupBox(config->displayName());
+        Q_UNUSED(box)
         QWidget* widget = config->createConfigWidget(this);
         layout->addWidget(widget);
     }
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp
index eb63041c804..e853b67570c 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.cpp
+++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp
@@ -49,10 +49,10 @@
 #include <projectexplorer/taskhub.h>
 #include <coreplugin/ioutputpane.h>
 
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QMessageBox>
+#include <QtCore/QDebug>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QMessageBox>
 
 using namespace Analyzer;
 using namespace Analyzer::Internal;
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/analyzerbase/analyzerruncontrol.h
index b3948f6103b..dbb498025f7 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.h
+++ b/src/plugins/analyzerbase/analyzerruncontrol.h
@@ -72,7 +72,7 @@ public:
     ProjectExplorer::RunConfigWidget *createConfigurationWidget(RunConfiguration *runConfiguration);
 
 signals:
-    void runControlCreated(AnalyzerRunControl *);
+    void runControlCreated(Analyzer::Internal::AnalyzerRunControl *);
 };
 
 
diff --git a/src/plugins/analyzerbase/analyzersettings.cpp b/src/plugins/analyzerbase/analyzersettings.cpp
index aec7128e5a6..b456ac5b2df 100644
--- a/src/plugins/analyzerbase/analyzersettings.cpp
+++ b/src/plugins/analyzerbase/analyzersettings.cpp
@@ -44,7 +44,7 @@
 #include <valgrind/xmlprotocol/error.h>
 #include <utils/qtcassert.h>
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 using namespace Analyzer;
 using namespace Analyzer::Internal;
diff --git a/src/plugins/analyzerbase/analyzersettings.h b/src/plugins/analyzerbase/analyzersettings.h
index 12e0d20d93a..7a4641550d2 100644
--- a/src/plugins/analyzerbase/analyzersettings.h
+++ b/src/plugins/analyzerbase/analyzersettings.h
@@ -36,8 +36,8 @@
 #ifndef ANALYZER_INTERNAL_ANALYZERSETTINGS_H
 #define ANALYZER_INTERNAL_ANALYZERSETTINGS_H
 
-#include <QObject>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 #include "analyzerbase_global.h"
 
diff --git a/src/plugins/analyzerbase/ianalyzerengine.h b/src/plugins/analyzerbase/ianalyzerengine.h
index 3441075151a..75b06dff179 100644
--- a/src/plugins/analyzerbase/ianalyzerengine.h
+++ b/src/plugins/analyzerbase/ianalyzerengine.h
@@ -40,8 +40,8 @@
 
 #include <projectexplorer/task.h>
 
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 namespace ProjectExplorer {
 class RunConfiguration;
diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/analyzerbase/ianalyzertool.h
index e069ab95072..f86b0e964a0 100644
--- a/src/plugins/analyzerbase/ianalyzertool.h
+++ b/src/plugins/analyzerbase/ianalyzertool.h
@@ -38,7 +38,7 @@
 
 #include "analyzerbase_global.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace ProjectExplorer {
 class RunConfiguration;
diff --git a/src/plugins/memcheck/memcheckconfigwidget.cpp b/src/plugins/memcheck/memcheckconfigwidget.cpp
index 27aed4887d0..a60f452a3de 100644
--- a/src/plugins/memcheck/memcheckconfigwidget.cpp
+++ b/src/plugins/memcheck/memcheckconfigwidget.cpp
@@ -41,9 +41,9 @@
 
 #include <utils/qtcassert.h>
 
-#include <QStandardItemModel>
-#include <QFileDialog>
-#include <QDebug>
+#include <QtGui/QStandardItemModel>
+#include <QtGui/QFileDialog>
+#include <QtCore/QDebug>
 
 using namespace Analyzer::Internal;
 
diff --git a/src/plugins/memcheck/memcheckconfigwidget.h b/src/plugins/memcheck/memcheckconfigwidget.h
index e1c1f979414..a62ffc5dd48 100644
--- a/src/plugins/memcheck/memcheckconfigwidget.h
+++ b/src/plugins/memcheck/memcheckconfigwidget.h
@@ -37,7 +37,7 @@
 #ifndef ANALYZER_INTERNAL_MEMCHECKCONFIGWIDGET_H
 #define ANALYZER_INTERNAL_MEMCHECKCONFIGWIDGET_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QStandardItemModel;
diff --git a/src/plugins/memcheck/memcheckplugin.cpp b/src/plugins/memcheck/memcheckplugin.cpp
index d39f68d0d90..da888fc1495 100644
--- a/src/plugins/memcheck/memcheckplugin.cpp
+++ b/src/plugins/memcheck/memcheckplugin.cpp
@@ -41,8 +41,8 @@
 #include "memchecktool.h"
 #include "memchecksettings.h"
 
-#include <QStringList>
-#include <QtPlugin>
+#include <QtCore/QStringList>
+#include <QtCore/QtPlugin>
 
 using namespace Analyzer;
 using namespace Analyzer::Internal;
@@ -73,4 +73,4 @@ void MemcheckPlugin::extensionsInitialized()
 
 }
 
-Q_EXPORT_PLUGIN(MemcheckPlugin)
\ No newline at end of file
+Q_EXPORT_PLUGIN(MemcheckPlugin)
diff --git a/src/plugins/memcheck/memchecktool.cpp b/src/plugins/memcheck/memchecktool.cpp
index 4b79e7a13ca..3240c8a1ff2 100644
--- a/src/plugins/memcheck/memchecktool.cpp
+++ b/src/plugins/memcheck/memchecktool.cpp
@@ -73,21 +73,22 @@
 #include <utils/styledbar.h>
 #include <utils/qtcassert.h>
 
-#include <QString>
-#include <QLatin1String>
-#include <QFileInfo>
-#include <QDockWidget>
-#include <QFile>
-#include <QDir>
-#include <QHBoxLayout>
-#include <QComboBox>
-#include <QLabel>
-#include <QSpinBox>
-#include <QAction>
-#include <QMenu>
-#include <QMessageBox>
-#include <QToolButton>
-#include <QCheckBox>
+#include <QtCore/QString>
+#include <QtCore/QLatin1String>
+#include <QtCore/QFileInfo>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+
+#include <QtGui/QDockWidget>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QComboBox>
+#include <QtGui/QLabel>
+#include <QtGui/QSpinBox>
+#include <QtGui/QAction>
+#include <QtGui/QMenu>
+#include <QtGui/QMessageBox>
+#include <QtGui/QToolButton>
+#include <QtGui/QCheckBox>
 #include <utils/stylehelper.h>
 
 using namespace Analyzer;
diff --git a/src/plugins/memcheck/memchecktool.h b/src/plugins/memcheck/memchecktool.h
index 547fb14cfae..1aa26068fe1 100644
--- a/src/plugins/memcheck/memchecktool.h
+++ b/src/plugins/memcheck/memchecktool.h
@@ -38,8 +38,8 @@
 
 #include <analyzerbase/ianalyzertool.h>
 
-#include <QSortFilterProxyModel>
-#include <QSharedPointer>
+#include <QtGui/QSortFilterProxyModel>
+#include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 class QItemSelection;
diff --git a/src/plugins/memcheck/suppressiondialog.cpp b/src/plugins/memcheck/suppressiondialog.cpp
index 2ffb57b30b0..dcdae5b2f23 100644
--- a/src/plugins/memcheck/suppressiondialog.cpp
+++ b/src/plugins/memcheck/suppressiondialog.cpp
@@ -48,8 +48,8 @@
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 
-#include <QFile>
-#include <QPushButton>
+#include <QtCore/QFile>
+#include <QtGui/QPushButton>
 
 #include <valgrind/xmlprotocol/suppression.h>
 #include <valgrind/xmlprotocol/errorlistmodel.h>
diff --git a/src/plugins/memcheck/suppressiondialog.h b/src/plugins/memcheck/suppressiondialog.h
index 7223ef2b3fb..72ed3aaa96d 100644
--- a/src/plugins/memcheck/suppressiondialog.h
+++ b/src/plugins/memcheck/suppressiondialog.h
@@ -37,7 +37,7 @@
 #ifndef ANALYZER_VALGRIND_INTERNAL_SUPPRESSIONDIALOG_H
 #define ANALYZER_VALGRIND_INTERNAL_SUPPRESSIONDIALOG_H
 
-#include <QDialog>
+#include <QtGui/QDialog>
 
 #include <valgrind/xmlprotocol/error.h>
 
diff --git a/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp b/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp
index 3c13f79fa7e..08f4e051ba5 100644
--- a/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp
+++ b/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp
@@ -39,7 +39,7 @@
 
 #include "valgrindsettings.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 using namespace Analyzer::Internal;
 
diff --git a/src/plugins/valgrindtoolbase/valgrindconfigwidget.h b/src/plugins/valgrindtoolbase/valgrindconfigwidget.h
index 891f7f8fbab..0d95c5eb588 100644
--- a/src/plugins/valgrindtoolbase/valgrindconfigwidget.h
+++ b/src/plugins/valgrindtoolbase/valgrindconfigwidget.h
@@ -37,7 +37,7 @@
 #ifndef ANALYZER_INTERNAL_VALGRINDCONFIGWIDGET_H
 #define ANALYZER_INTERNAL_VALGRINDCONFIGWIDGET_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/src/plugins/valgrindtoolbase/valgrindengine.h b/src/plugins/valgrindtoolbase/valgrindengine.h
index d56044d2e3f..ff9cdac264f 100644
--- a/src/plugins/valgrindtoolbase/valgrindengine.h
+++ b/src/plugins/valgrindtoolbase/valgrindengine.h
@@ -44,9 +44,9 @@
 
 #include <valgrind/valgrindrunner.h>
 
-#include <QString>
-#include <QByteArray>
-#include <QFutureInterface>
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QFutureInterface>
 
 namespace Analyzer {
 
diff --git a/src/plugins/valgrindtoolbase/valgrindsettings.cpp b/src/plugins/valgrindtoolbase/valgrindsettings.cpp
index 93f50889758..090e1a48bb4 100644
--- a/src/plugins/valgrindtoolbase/valgrindsettings.cpp
+++ b/src/plugins/valgrindtoolbase/valgrindsettings.cpp
@@ -40,7 +40,7 @@
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 using namespace Analyzer::Internal;
 using namespace Analyzer;
diff --git a/src/plugins/valgrindtoolbase/valgrindsettings.h b/src/plugins/valgrindtoolbase/valgrindsettings.h
index f857605f41d..3eb1363981f 100644
--- a/src/plugins/valgrindtoolbase/valgrindsettings.h
+++ b/src/plugins/valgrindtoolbase/valgrindsettings.h
@@ -40,8 +40,8 @@
 
 #include "valgrindtoolbase_global.h"
 
-#include <QObject>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 namespace Analyzer {
 namespace Internal {
diff --git a/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.cpp b/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.cpp
index bdf546b9620..d09100d4397 100644
--- a/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.cpp
+++ b/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.cpp
@@ -39,8 +39,8 @@
 
 #include <analyzerbase/analyzersettings.h>
 
-#include <QStringList>
-#include <QtPlugin>
+#include <QtCore/QStringList>
+#include <QtCore/QtPlugin>
 
 using namespace Analyzer;
 using namespace Analyzer::Internal;
@@ -68,4 +68,4 @@ void ValgrindToolbasePlugin::extensionsInitialized()
 
 }
 
-Q_EXPORT_PLUGIN(ValgrindToolbasePlugin)
\ No newline at end of file
+Q_EXPORT_PLUGIN(ValgrindToolbasePlugin)