all: less QScopedPointer

Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2
Reviewed-on: http://codereview.qt-project.org/5116
Reviewed-by: hjk <qthjk@ovi.com>

59 files changed, 123 insertions, 125 deletions

diff --git a/src/libs/qmljs/qmljstypedescriptionreader.h b/src/libs/qmljs/qmljstypedescriptionreader.h
index 647f333a72..2d33376d86 100644
--- a/src/libs/qmljs/qmljstypedescriptionreader.h
+++ b/src/libs/qmljs/qmljstypedescriptionreader.h
@@ -35,8 +35,6 @@
 
 #include <languageutils/fakemetaobject.h>
 
-#include <QtCore/QScopedPointer>
-
 // for Q_DECLARE_TR_FUNCTIONS
 #include <QtCore/QCoreApplication>
 
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp
index 0c7c8702c8..1da0c1f6a9 100644
--- a/src/libs/utils/consoleprocess.cpp
+++ b/src/libs/utils/consoleprocess.cpp
@@ -37,6 +37,7 @@ namespace Utils {
 ConsoleProcess::~ConsoleProcess()
 {
     stop();
+    delete d;
 }
 
 void ConsoleProcess::setMode(Mode m)
diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h
index 53c2fb508a..6b3d537fb6 100644
--- a/src/libs/utils/consoleprocess.h
+++ b/src/libs/utils/consoleprocess.h
@@ -41,7 +41,6 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QProcess>
-#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
@@ -130,7 +129,7 @@ private:
     void cleanupInferior();
 #endif
 
-    QScopedPointer<ConsoleProcessPrivate> d;
+    ConsoleProcessPrivate *d;
 };
 
 } //namespace Utils
diff --git a/src/libs/utils/crumblepath.cpp b/src/libs/utils/crumblepath.cpp
index e19c333e6c..d9be858ab1 100644
--- a/src/libs/utils/crumblepath.cpp
+++ b/src/libs/utils/crumblepath.cpp
@@ -261,6 +261,7 @@ CrumblePath::~CrumblePath()
 {
     qDeleteAll(d->m_buttons);
     d->m_buttons.clear();
+    delete d;
 }
 
 void CrumblePath::selectIndex(int index)
diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h
index 7624ae73de..a2d60a7af9 100644
--- a/src/libs/utils/crumblepath.h
+++ b/src/libs/utils/crumblepath.h
@@ -38,8 +38,6 @@
 #include <QtGui/QWidget>
 #include <QtCore/QVariant>
 
-QT_FORWARD_DECLARE_CLASS(QResizeEvent)
-
 namespace Utils {
 
 struct CrumblePathPrivate;
@@ -47,6 +45,7 @@ struct CrumblePathPrivate;
 class QTCREATOR_UTILS_EXPORT CrumblePath : public QWidget
 {
     Q_OBJECT
+
 public:
     explicit CrumblePath(QWidget *parent = 0);
     ~CrumblePath();
@@ -75,7 +74,7 @@ private:
     void setBackgroundStyle();
 
 private:
-    QScopedPointer<CrumblePathPrivate> d;
+    CrumblePathPrivate *d;
 };
 
 } // namespace Utils
diff --git a/src/libs/utils/filesystemwatcher.cpp b/src/libs/utils/filesystemwatcher.cpp
index 7f10cc60a3..707cf97f09 100644
--- a/src/libs/utils/filesystemwatcher.cpp
+++ b/src/libs/utils/filesystemwatcher.cpp
@@ -221,6 +221,7 @@ FileSystemWatcher::~FileSystemWatcher()
         if (debug)
               qDebug() << this << "Deleted watcher" << d->m_id;
     }
+    delete d;
 }
 
 bool FileSystemWatcher::watchesFile(const QString &file) const
diff --git a/src/libs/utils/filesystemwatcher.h b/src/libs/utils/filesystemwatcher.h
index 59ff528955..2487441270 100644
--- a/src/libs/utils/filesystemwatcher.h
+++ b/src/libs/utils/filesystemwatcher.h
@@ -86,7 +86,7 @@ signals:
 private:
     void init();
 
-    QScopedPointer<FileSystemWatcherPrivate> d;
+    FileSystemWatcherPrivate *d;
 };
 
 } // namespace Utils
diff --git a/src/plugins/classview/classviewnavigationwidget.h b/src/plugins/classview/classviewnavigationwidget.h
index 24d9af1594..2a4c17ad03 100644
--- a/src/plugins/classview/classviewnavigationwidget.h
+++ b/src/plugins/classview/classviewnavigationwidget.h
@@ -34,7 +34,6 @@
 #define CLASSVIEWNAVIGATIONWIDGET_H
 
 #include <QtCore/QList>
-#include <QtCore/QScopedPointer>
 #include <QtCore/QSharedPointer>
 
 #include <QtGui/QStandardItem>
diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
index d0060684f6..57e5bd33b9 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
@@ -39,7 +39,8 @@
 
 namespace Core {
 
-struct OpenEditorsModelPrivate {
+struct OpenEditorsModelPrivate
+{
     OpenEditorsModelPrivate();
 
     const QIcon m_lockedIcon;
@@ -67,6 +68,7 @@ OpenEditorsModel::OpenEditorsModel(QObject *parent) :
 
 OpenEditorsModel::~OpenEditorsModel()
 {
+    delete d;
 }
 
 QIcon OpenEditorsModel::lockedIcon() const
diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.h b/src/plugins/coreplugin/editormanager/openeditorsmodel.h
index 8c1de804b1..8c69825bc6 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsmodel.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.h
@@ -37,7 +37,6 @@
 #include "../id.h"
 
 #include <QtCore/QAbstractItemModel>
-#include <QtCore/QScopedPointer>
 
 QT_FORWARD_DECLARE_CLASS(QIcon)
 
@@ -50,6 +49,7 @@ class IFile;
 class CORE_EXPORT OpenEditorsModel : public QAbstractItemModel
 {
     Q_OBJECT
+
 public:
     explicit OpenEditorsModel(QObject *parent);
     virtual ~OpenEditorsModel();
@@ -107,7 +107,7 @@ private:
     int findFileName(const QString &filename) const;
     void removeEditor(int idx);
 
-    QScopedPointer<OpenEditorsModelPrivate> d;
+    OpenEditorsModelPrivate *d;
 };
 
 } // namespace Core
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 7aabe29bc8..9fb181e882 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -179,6 +179,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
 
 EditorToolBar::~EditorToolBar()
 {
+    delete d;
 }
 
 void EditorToolBar::removeToolbarForEditor(IEditor *editor)
diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h
index 280829aabc..53a0d60617 100644
--- a/src/plugins/coreplugin/editortoolbar.h
+++ b/src/plugins/coreplugin/editortoolbar.h
@@ -35,12 +35,10 @@
 
 #include "core_global.h"
 
-#include <QtCore/QScopedPointer>
-
 #include <utils/styledbar.h>
 
 namespace Core {
-    class IEditor;
+class IEditor;
 
 struct EditorToolBarPrivate;
 
@@ -104,7 +102,7 @@ private:
     void updateToolBar(QWidget *toolBar);
     IEditor *currentEditor() const;
 
-    QScopedPointer<EditorToolBarPrivate> d;
+    EditorToolBarPrivate *d;
 };
 
 } // namespace Core
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index fe7e5f7979..98fbfdce72 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -176,6 +176,7 @@ NavigationWidget::NavigationWidget(QAction *toggleSideBarAction) :
 NavigationWidget::~NavigationWidget()
 {
     NavigationWidgetPrivate::m_instance = 0;
+    delete d;
 }
 
 NavigationWidget *NavigationWidget::instance()
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index 4655d39573..a8ef2db99f 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -36,7 +36,6 @@
 #include <coreplugin/minisplitter.h>
 
 #include <QtCore/QHash>
-#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
@@ -57,8 +56,9 @@ class NavigationSubWidget;
 
 class CORE_EXPORT NavigationWidgetPlaceHolder : public QWidget
 {
-    friend class Core::NavigationWidget;
     Q_OBJECT
+    friend class Core::NavigationWidget;
+
 public:
     explicit NavigationWidgetPlaceHolder(Core::IMode *mode, QWidget *parent = 0);
     virtual ~NavigationWidgetPlaceHolder();
@@ -76,6 +76,7 @@ private:
 class CORE_EXPORT NavigationWidget : public MiniSplitter
 {
     Q_OBJECT
+
 public:
     enum FactoryModelRoles {
         FactoryObjectRole = Qt::UserRole,
@@ -123,7 +124,7 @@ private:
     Internal::NavigationSubWidget *insertSubItem(int position, int index);
     int factoryIndex(const QString &id);
 
-    QScopedPointer<NavigationWidgetPrivate> d;
+    NavigationWidgetPrivate *d;
 };
 
 } // namespace Core
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index aee055b9bc..a5e6eb18b0 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -83,6 +83,7 @@ OutputPanePlaceHolder::~OutputPanePlaceHolder()
             om->hide();
         }
     }
+    delete d;
 }
 
 void OutputPanePlaceHolder::currentModeChanged(Core::IMode *mode)
diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index 1de9343a5a..5e1fe39bd7 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -37,8 +37,6 @@
 
 #include <QtGui/QWidget>
 
-#include <QtCore/QScopedPointer>
-
 QT_BEGIN_NAMESPACE
 class QSplitter;
 QT_END_NAMESPACE
@@ -54,8 +52,9 @@ struct OutputPanePlaceHolderPrivate;
 
 class CORE_EXPORT OutputPanePlaceHolder : public QWidget
 {
-    friend class Core::Internal::OutputPaneManager; // needs to set m_visible and thus access m_current
     Q_OBJECT
+    friend class Core::Internal::OutputPaneManager; // needs to set m_visible and thus access m_current
+
 public:
     explicit OutputPanePlaceHolder(Core::IMode *mode, QSplitter *parent = 0);
     ~OutputPanePlaceHolder();
@@ -73,7 +72,7 @@ private:
     bool canMaximizeOrMinimize() const;
     void maximizeOrMinimize(bool maximize);
 
-    QScopedPointer<OutputPanePlaceHolderPrivate> d;
+    OutputPanePlaceHolderPrivate *d;
 };
 
 } // namespace Core
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index 5468bf23a8..5c1591d4ef 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -159,8 +159,8 @@ FutureProgress::FutureProgress(QWidget *parent) :
     connect(&d->m_watcher, SIGNAL(finished()), this, SLOT(setFinished()));
     connect(&d->m_watcher, SIGNAL(progressRangeChanged(int,int)), this, SLOT(setProgressRange(int,int)));
     connect(&d->m_watcher, SIGNAL(progressValueChanged(int)), this, SLOT(setProgressValue(int)));
-    connect(&d->m_watcher, SIGNAL(progressTextChanged(const QString&)),
-            this, SLOT(setProgressText(const QString&)));
+    connect(&d->m_watcher, SIGNAL(progressTextChanged(QString)),
+            this, SLOT(setProgressText(QString)));
     connect(d->m_progress, SIGNAL(clicked()), this, SLOT(cancel()));    
 }
 
@@ -170,8 +170,8 @@ FutureProgress::FutureProgress(QWidget *parent) :
 */
 FutureProgress::~FutureProgress()
 {
-    if (d->m_widget)
-        delete d->m_widget;
+    delete d->m_widget;
+    delete d;
 }
 
 /*!
@@ -182,8 +182,7 @@ FutureProgress::~FutureProgress()
 */
 void FutureProgress::setWidget(QWidget *widget)
 {
-    if (d->m_widget)
-        delete d->m_widget;
+    delete d->m_widget;
     QSizePolicy sp = widget->sizePolicy();
     sp.setHorizontalPolicy(QSizePolicy::Ignored);
     widget->setSizePolicy(sp);
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h
index 9dff684840..5e81c8c237 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.h
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.h
@@ -36,8 +36,6 @@
 #include <coreplugin/core_global.h>
 
 #include <QtCore/QString>
-#include <QtCore/QScopedPointer>
-
 #include <QtCore/QFuture>
 #include <QtGui/QWidget>
 
@@ -96,7 +94,7 @@ private slots:
     void fadeAway();
 
 private:
-    QScopedPointer<FutureProgressPrivate> d;
+    FutureProgressPrivate *d;
 };
 
 } // namespace Core
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index 422b6cb446..6ab2d5c6d5 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -117,6 +117,7 @@ SideBar::~SideBar()
         if (!iter.value().isNull())
             delete iter.value().data();
     }
+    delete d;
 }
 
 QString SideBar::idForTitle(const QString &title) const
diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h
index ff83b561c8..46ffd02133 100644
--- a/src/plugins/coreplugin/sidebar.h
+++ b/src/plugins/coreplugin/sidebar.h
@@ -38,7 +38,6 @@
 
 #include <QtCore/QMap>
 #include <QtCore/QList>
-#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
@@ -83,21 +82,20 @@ public:
 
 private:
     const QString m_id;
-
-    QWidget *m_widget;    
+    QWidget *m_widget;
 };
 
 class CORE_EXPORT SideBar : public MiniSplitter
 {
     Q_OBJECT
+
 public:
     /*
      * The SideBar takes explicit ownership of the SideBarItems
      * if you have one SideBar, or shared ownership in case
      * of multiple SideBars.
      */
-    explicit SideBar(QList< SideBarItem*> widgetList,
-            QList< SideBarItem*> defaultVisible);
+    SideBar(QList<SideBarItem *> widgetList, QList<SideBarItem *> defaultVisible);
     virtual ~SideBar();
 
     QStringList availableItemIds() const;
@@ -117,8 +115,8 @@ public:
     void closeAllWidgets();
     void activateItem(SideBarItem *item);
 
-    void setShortcutMap(const QMap<QString, Core::Command*> &shortcutMap);
-    QMap<QString, Core::Command*> shortcutMap() const;
+    void setShortcutMap(const QMap<QString, Core::Command *> &shortcutMap);
+    QMap<QString, Core::Command *> shortcutMap() const;
 
 signals:
     void availableItemsChanged();
@@ -133,7 +131,7 @@ private:
                                                  const QString &title = QString());
     void removeSideBarWidget(Internal::SideBarWidget *widget);
 
-    QScopedPointer<SideBarPrivate> d;
+    SideBarPrivate *d;
 };
 
 } // namespace Core
diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h
index 3bbf119684..96672feddb 100644
--- a/src/plugins/coreplugin/variablemanager.h
+++ b/src/plugins/coreplugin/variablemanager.h
@@ -36,7 +36,6 @@
 #include "core_global.h"
 
 #include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
 #include <QtCore/QString>
 
 namespace Utils {
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index f6dc665ed0..fce11587d8 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -212,6 +212,7 @@ DebuggerRunControl::~DebuggerRunControl()
         engine->disconnect();
         delete engine;
     }
+    delete d;
 }
 
 const DebuggerStartParameters &DebuggerRunControl::startParameters() const
diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h
index c5f8af60a7..d35afc4929 100644
--- a/src/plugins/debugger/debuggerrunner.h
+++ b/src/plugins/debugger/debuggerrunner.h
@@ -39,7 +39,6 @@
 #include <projectexplorer/abi.h>
 #include <projectexplorer/runconfiguration.h>
 
-#include <QtCore/QScopedPointer>
 #include <QtCore/QPair>
 #include <QtCore/QStringList>
 
@@ -116,7 +115,7 @@ protected:
 
 private:
     friend class Internal::DebuggerRunControlFactory;
-    QScopedPointer<Internal::DebuggerRunControlPrivate> d;
+    Internal::DebuggerRunControlPrivate *d;
 };
 
 } // namespace Debugger
diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp
index 5765b518da..a8c928ac3d 100644
--- a/src/plugins/debugger/qml/qmladapter.cpp
+++ b/src/plugins/debugger/qml/qmladapter.cpp
@@ -93,9 +93,9 @@ QmlAdapter::~QmlAdapter()
     ExtensionSystem::PluginManager *pluginManager =
         ExtensionSystem::PluginManager::instance();
 
-    if (pluginManager->allObjects().contains(this)) {
+    if (pluginManager->allObjects().contains(this))
         pluginManager->removeObject(this);
-    }
+    delete d;
 }
 
 void QmlAdapter::beginConnection()
@@ -109,9 +109,8 @@ void QmlAdapter::closeConnection()
     if (d->m_connectionTimer.isActive()) {
         d->m_connectionTimer.stop();
     } else {
-        if (d->m_conn) {
+        if (d->m_conn)
             d->m_conn->close();
-        }
     }
 }
 
diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h
index 07b67ada7f..a9608b341d 100644
--- a/src/plugins/debugger/qml/qmladapter.h
+++ b/src/plugins/debugger/qml/qmladapter.h
@@ -37,7 +37,6 @@
 #include "qmldebuggerclient.h"
 
 #include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
 #include <QtNetwork/QAbstractSocket>
 
 namespace QmlJsDebugClient {
@@ -57,6 +56,7 @@ class QmlAdapterPrivate;
 class DEBUGGER_EXPORT QmlAdapter : public QObject
 {
     Q_OBJECT
+
 public:
     explicit QmlAdapter(DebuggerEngine *engine, QObject *parent = 0);
     virtual ~QmlAdapter();
@@ -97,7 +97,7 @@ private:
     void showConnectionErrorMessage(const QString &message);
 
 private:
-    QScopedPointer<Internal::QmlAdapterPrivate> d;
+    Internal::QmlAdapterPrivate *d;
 };
 
 } // namespace Debugger
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index b76091c6b8..ad86dc0209 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -37,12 +37,11 @@
 #include "stackhandler.h"
 #include "qmlengine.h"
 
+#include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 
-#include <coreplugin/icore.h>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMessageBox>
 #include <QtCore/QTimer>
+#include <QtGui/QMainWindow>
 
 namespace Debugger {
 namespace Internal {
@@ -94,15 +93,13 @@ private:
     DebuggerEngine *m_cppEngine;
     DebuggerEngine *m_activeEngine;
     int m_stackBoundary;
-
-    QMessageBox *m_msg;
 };
 
 
 QmlCppEnginePrivate::QmlCppEnginePrivate(QmlCppEngine *parent,
         const DebuggerStartParameters &sp)
     : q(parent), m_qmlEngine(createQmlEngine(sp, q)),
-      m_cppEngine(0), m_activeEngine(0), m_msg(0)
+      m_cppEngine(0), m_activeEngine(0)
 {
     setObjectName(QLatin1String("QmlCppEnginePrivate"));
 }
@@ -153,9 +150,9 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp,
     d->m_activeEngine = d->m_cppEngine;
 
     connect(d->m_cppEngine->stackHandler()->model(), SIGNAL(modelReset()),
-            d.data(), SLOT(cppStackChanged()), Qt::QueuedConnection);
+            d, SLOT(cppStackChanged()), Qt::QueuedConnection);
     connect(d->m_qmlEngine->stackHandler()->model(), SIGNAL(modelReset()),
-            d.data(), SLOT(qmlStackChanged()), Qt::QueuedConnection);
+            d, SLOT(qmlStackChanged()), Qt::QueuedConnection);
     connect(d->m_cppEngine, SIGNAL(stackFrameCompleted()), this, SIGNAL(stackFrameCompleted()));
     connect(d->m_cppEngine, SIGNAL(requestRemoteSetup()), this, SIGNAL(requestRemoteSetup()));
     connect(d->m_qmlEngine, SIGNAL(stackFrameCompleted()), this, SIGNAL(stackFrameCompleted()));
@@ -165,6 +162,7 @@ QmlCppEngine::~QmlCppEngine()
 {
     delete d->m_qmlEngine;
     delete d->m_cppEngine;
+    delete d;
 }
 
 bool QmlCppEngine::setToolTipExpression(const QPoint & mousePos,
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index efd13590c6..b63d837646 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -35,8 +35,6 @@
 
 #include "debuggerengine.h"
 
-#include <QtCore/QScopedPointer>
-
 namespace Debugger {
 namespace Internal {
 
@@ -131,7 +129,7 @@ private:
     void readyToExecuteQmlStep();
 
 private:
-    QScopedPointer<QmlCppEnginePrivate> d;
+    QmlCppEnginePrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp
index f862418b90..b5373c7929 100644
--- a/src/plugins/imageviewer/imageview.cpp
+++ b/src/plugins/imageviewer/imageview.cpp
@@ -94,7 +94,7 @@ ImageView::ImageView(QWidget *parent)
 
 ImageView::~ImageView()
 {
-
+    delete d;
 }
 
 void ImageView::drawBackground(QPainter *p, const QRectF &)
diff --git a/src/plugins/imageviewer/imageview.h b/src/plugins/imageviewer/imageview.h
index 9ed76c497c..3d3c616baa 100644
--- a/src/plugins/imageviewer/imageview.h
+++ b/src/plugins/imageviewer/imageview.h
@@ -46,10 +46,6 @@
 #include <QtGui/QGraphicsView>
 #include <QtCore/QScopedPointer>
 
-QT_BEGIN_NAMESPACE
-class QWheelEvent;
-QT_END_NAMESPACE
-
 namespace ImageViewer {
 namespace Internal {
 
@@ -83,7 +79,7 @@ protected:
     void wheelEvent(QWheelEvent *event);
 
 private:
-    QScopedPointer<struct ImageViewPrivate> d;
+    struct ImageViewPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index b15ae4345e..24846e7300 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -109,6 +109,7 @@ ImageViewer::~ImageViewer()
 {
     delete d->imageView;
     delete d->toolbar;
+    delete d;
 }
 
 bool ImageViewer::createNew(const QString &contents)
diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h
index ee84c53a1d..dd9d80c688 100644
--- a/src/plugins/imageviewer/imageviewer.h
+++ b/src/plugins/imageviewer/imageviewer.h
@@ -97,7 +97,7 @@ private:
     bool updateButtonIconByTheme(QAbstractButton *button, const QString &name);
 
 private:
-    QScopedPointer<struct ImageViewerPrivate> d;
+    struct ImageViewerPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/imageviewer/imagevieweractionhandler.h b/src/plugins/imageviewer/imagevieweractionhandler.h
index 177703f67b..f29a2fea99 100644
--- a/src/plugins/imageviewer/imagevieweractionhandler.h
+++ b/src/plugins/imageviewer/imagevieweractionhandler.h
@@ -37,7 +37,6 @@
 #include "coreplugin/id.h"
 
 #include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 class QKeySequence;
diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp
index ad4f7c5f2a..414b769559 100644
--- a/src/plugins/imageviewer/imageviewerfile.cpp
+++ b/src/plugins/imageviewer/imageviewerfile.cpp
@@ -55,13 +55,14 @@ struct ImageViewerFilePrivate
 
 ImageViewerFile::ImageViewerFile(ImageViewer *parent)
     : Core::IFile(parent),
-    d_ptr(new ImageViewerFilePrivate)
+    d(new ImageViewerFilePrivate)
 {
-    d_ptr->editor = parent;
+    d->editor = parent;
 }
 
 ImageViewerFile::~ImageViewerFile()
 {
+    delete d;
 }
 
 bool ImageViewerFile::reload(QString *errorString,
@@ -73,9 +74,8 @@ bool ImageViewerFile::reload(QString *errorString,
     if (type == TypePermissions) {
         emit changed();
         return true;
-    } else {
-        return d_ptr->editor->open(errorString, d_ptr->fileName, d_ptr->fileName);
     }
+    return d->editor->open(errorString, d->fileName, d->fileName);
 }
 
 bool ImageViewerFile::save(QString *errorString, const QString &fileName, bool autoSave)
@@ -88,12 +88,12 @@ bool ImageViewerFile::save(QString *errorString, const QString &fileName, bool a
 
 void ImageViewerFile::rename(const QString &newName)
 {
-    d_ptr->fileName = newName;
+    d->fileName = newName;
 }
 
 QString ImageViewerFile::fileName() const
 {
-    return d_ptr->fileName;
+    return d->fileName;
 }
 
 QString ImageViewerFile::defaultPath() const
@@ -108,7 +108,7 @@ QString ImageViewerFile::suggestedFileName() const
 
 QString ImageViewerFile::mimeType() const
 {
-    return d_ptr->mimeType;
+    return d->mimeType;
 }
 
 bool ImageViewerFile::isModified() const
@@ -128,13 +128,13 @@ bool ImageViewerFile::isSaveAsAllowed() const
 
 void ImageViewerFile::setMimetype(const QString &mimetype)
 {
-    d_ptr->mimeType = mimetype;
+    d->mimeType = mimetype;
     emit changed();
 }
 
 void ImageViewerFile::setFileName(const QString &filename)
 {
-    d_ptr->fileName = filename;
+    d->fileName = filename;
     emit changed();
 }
 
diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h
index c223490d75..465549c064 100644
--- a/src/plugins/imageviewer/imageviewerfile.h
+++ b/src/plugins/imageviewer/imageviewerfile.h
@@ -40,6 +40,7 @@
 
 namespace ImageViewer {
 namespace Internal {
+
 class ImageViewer;
 
 class ImageViewerFile : public Core::IFile
@@ -67,10 +68,10 @@ public:
     void setFileName(const QString &filename);
 
 private:
-    QScopedPointer<struct ImageViewerFilePrivate> d_ptr;
+    struct ImageViewerFilePrivate *d;
 };
 
-}
-}
+} // namespace Internal
+} // namespace ImageViewer
 
 #endif // IMAGEVIEWERFILE_H
diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp
index 644830bd21..4766c4f72b 100644
--- a/src/plugins/imageviewer/imageviewerplugin.cpp
+++ b/src/plugins/imageviewer/imageviewerplugin.cpp
@@ -54,12 +54,13 @@ struct ImageViewerPluginPrivate
 ///////////////////////////////// ImageViewerPlugin //////////////////////////////////
 
 ImageViewerPlugin::ImageViewerPlugin()
-    : d_ptr(new ImageViewerPluginPrivate)
+    : d(new ImageViewerPluginPrivate)
 {
 }
 
 ImageViewerPlugin::~ImageViewerPlugin()
 {
+    delete d;
 }
 
 bool ImageViewerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -70,17 +71,17 @@ bool ImageViewerPlugin::initialize(const QStringList &arguments, QString *errorM
     if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/imageviewer/ImageViewer.mimetypes.xml"), errorMessage))
         return false;
 
-    d_ptr->factory = new ImageViewerFactory(this);
+    d->factory = new ImageViewerFactory(this);
     Aggregation::Aggregate *aggregate = new Aggregation::Aggregate;
-    aggregate->add(d_ptr->factory);
+    aggregate->add(d->factory);
 
-    addAutoReleasedObject(d_ptr->factory);
+    addAutoReleasedObject(d->factory);
     return true;
 }
 
 void ImageViewerPlugin::extensionsInitialized()
 {
-    d_ptr->factory->extensionsInitialized();
+    d->factory->extensionsInitialized();
 }
 
 } // namespace Internal
diff --git a/src/plugins/imageviewer/imageviewerplugin.h b/src/plugins/imageviewer/imageviewerplugin.h
index e5f241df1f..fd937062ae 100644
--- a/src/plugins/imageviewer/imageviewerplugin.h
+++ b/src/plugins/imageviewer/imageviewerplugin.h
@@ -37,7 +37,6 @@
 #include <extensionsystem/iplugin.h>
 
 #include <QtCore/QtPlugin>
-#include <QtCore/QScopedPointer>
 
 namespace ImageViewer {
 
@@ -56,7 +55,7 @@ public:
     void extensionsInitialized();
 
 private:
-    QScopedPointer<struct ImageViewerPluginPrivate> d_ptr;
+    struct ImageViewerPluginPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp
index 4fc271cb7f..df5d45392d 100644
--- a/src/plugins/projectexplorer/applicationlauncher.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher.cpp
@@ -130,6 +130,7 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent)
 
 ApplicationLauncher::~ApplicationLauncher()
 {
+    delete d;
 }
 
 void ApplicationLauncher::setWorkingDirectory(const QString &dir)
diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h
index cc36962b00..d4ece3f576 100644
--- a/src/plugins/projectexplorer/applicationlauncher.h
+++ b/src/plugins/projectexplorer/applicationlauncher.h
@@ -91,7 +91,7 @@ private slots:
     void bringToForeground();
 
 private:
-    QScopedPointer<ApplicationLauncherPrivate> d;
+    ApplicationLauncherPrivate *d;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index ba258e13bb..0a5e2db5c3 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -156,8 +156,10 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent)
 
 void BuildManager::extensionsInitialized()
 {
-    d->m_taskHub->addCategory(Constants::TASK_CATEGORY_COMPILE, tr("Compile", "Category for compiler isses listened under 'Build Issues'"));
-    d->m_taskHub->addCategory(Constants::TASK_CATEGORY_BUILDSYSTEM, tr("Build System", "Category for build system isses listened under 'Build Issues'"));
+    d->m_taskHub->addCategory(Constants::TASK_CATEGORY_COMPILE,
+        tr("Compile", "Category for compiler isses listened under 'Build Issues'"));
+    d->m_taskHub->addCategory(Constants::TASK_CATEGORY_BUILDSYSTEM,
+        tr("Build System", "Category for build system isses listened under 'Build Issues'"));
 }
 
 BuildManager::~BuildManager()
@@ -170,6 +172,8 @@ BuildManager::~BuildManager()
 
     pm->removeObject(d->m_outputWindow);
     delete d->m_outputWindow;
+
+    delete d;
 }
 
 void BuildManager::aboutToRemoveProject(ProjectExplorer::Project *p)
diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h
index 1933cacdc4..03b01f72be 100644
--- a/src/plugins/projectexplorer/buildmanager.h
+++ b/src/plugins/projectexplorer/buildmanager.h
@@ -49,6 +49,7 @@ struct BuildManagerPrivate;
 class PROJECTEXPLORER_EXPORT BuildManager : public QObject
 {
     Q_OBJECT
+
 public:
     explicit BuildManager(ProjectExplorerPlugin *parent);
     virtual ~BuildManager();
@@ -105,7 +106,7 @@ private:
     void decrementActiveBuildSteps(Project *pro);
     void disconnectOutput(BuildStep *bs);
 
-    QScopedPointer<BuildManagerPrivate> d;
+    BuildManagerPrivate *d;
 };
 } // namespace ProjectExplorer
 
diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp
index 530743809d..1f7510cfbb 100644
--- a/src/plugins/projectexplorer/environmentwidget.cpp
+++ b/src/plugins/projectexplorer/environmentwidget.cpp
@@ -156,6 +156,7 @@ EnvironmentWidget::~EnvironmentWidget()
 {
     delete d->m_model;
     d->m_model = 0;
+    delete d;
 }
 
 void EnvironmentWidget::focusIndex(const QModelIndex &index)
diff --git a/src/plugins/projectexplorer/environmentwidget.h b/src/plugins/projectexplorer/environmentwidget.h
index d2f23d18e7..f9320aa474 100644
--- a/src/plugins/projectexplorer/environmentwidget.h
+++ b/src/plugins/projectexplorer/environmentwidget.h
@@ -50,6 +50,7 @@ class EnvironmentWidgetPrivate;
 class PROJECTEXPLORER_EXPORT EnvironmentWidget : public QWidget
 {
     Q_OBJECT
+
 public:
     explicit EnvironmentWidget(QWidget *parent, QWidget *additionalDetailsWidget = 0);
     virtual ~EnvironmentWidget();
@@ -77,7 +78,7 @@ private slots:
     void linkActivated(const QString &link);
 
 private:
-    QScopedPointer<EnvironmentWidgetPrivate> d;
+    EnvironmentWidgetPrivate *d;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 49275df75e..0e6dcfce46 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -106,12 +106,12 @@ Project::~Project()
 {
     qDeleteAll(d->m_targets);
     delete d->m_editorConfiguration;
+    delete d;
 }
 
 bool Project::hasActiveBuildSettings() const
 {
-    return activeTarget() &&
-           activeTarget()->buildConfigurationFactory();
+    return activeTarget() && activeTarget()->buildConfigurationFactory();
 }
 
 QString Project::makeUnique(const QString &preferredName, const QStringList &usedNames)
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 15d11a369f..a0330789c9 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -147,7 +147,7 @@ private slots:
     void changeBuildConfigurationEnabled();
 
 private:
-    QScopedPointer<ProjectPrivate> d;
+    ProjectPrivate *d;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index 31ae861397..ec5c57b39d 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -110,6 +110,7 @@ Target::~Target()
 {
     qDeleteAll(d->m_buildConfigurations);
     qDeleteAll(d->m_runConfigurations);
+    delete d;
 }
 
 void Target::changeEnvironment()
diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h
index 132c0a267c..cb224985b8 100644
--- a/src/plugins/projectexplorer/target.h
+++ b/src/plugins/projectexplorer/target.h
@@ -63,7 +63,6 @@ public:
     virtual ~Target();
 
     virtual BuildConfigWidget *createConfigWidget() = 0;
-
     virtual Project *project() const;
 
     // Build configuration
@@ -158,7 +157,7 @@ private slots:
     void changeBuildConfigurationEnabled();
 
 private:
-    QScopedPointer<TargetPrivate> d;
+    TargetPrivate *d;
 };
 
 class PROJECTEXPLORER_EXPORT ITargetFactory :
diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
index 82b5a13987..d29b26179d 100644
--- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
@@ -58,6 +58,7 @@ class CORESHARED_EXPORT ItemLibraryEntry
     //friend class QmlDesigner::Internal::MetaInfoParser;
     friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
     friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
+
 public:
     ItemLibraryEntry();
     ~ItemLibraryEntry();
@@ -118,7 +119,7 @@ signals:
 private:
     ItemLibraryInfo(QObject *parent = 0);
     void setBaseInfo(ItemLibraryInfo *baseInfo);
-    QScopedPointer<Internal::ItemLibraryInfoPrivate> d;
+    Internal::ItemLibraryInfoPrivate *d;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
index 6c063bf861..468ca04aa1 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
@@ -263,6 +263,7 @@ ItemLibraryInfo::ItemLibraryInfo(QObject *parent) :
 
 ItemLibraryInfo::~ItemLibraryInfo()
 {
+    delete d;
 }
 
 QList<ItemLibraryEntry> ItemLibraryInfo::entriesForType(const QString &typeName, int majorVersion, int minorVersion) const
diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
index 11ac93ecde..455c4b7b5f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@ -51,7 +51,6 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include <QtCore/QScopedPointer>
 #include <QtCore/QTimer>
 
 #include <QtGui/QMessageBox>
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index c69031b77d..8f62fbb36e 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -37,7 +37,6 @@
 #include <qt4projectmanager/qt4projectmanager_global.h>
 
 #include <QtCore/QFutureInterface>
-#include <QtCore/QScopedPointer>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
@@ -55,7 +54,8 @@ class Qt4SymbianTarget;
 
 class S60DeviceRunConfigurationFactory;
 
-class QT4PROJECTMANAGER_EXPORT S60DeviceRunConfiguration : public ProjectExplorer::RunConfiguration {
+class QT4PROJECTMANAGER_EXPORT S60DeviceRunConfiguration : public ProjectExplorer::RunConfiguration
+{
     Q_OBJECT
     friend class S60DeviceRunConfigurationFactory;
 
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
index ed4eb7d75e..73870f2f3d 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
+++ b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
@@ -94,6 +94,7 @@ enum PageId {
 class MaemoDeviceConfigWizardStartPage : public QWizardPage
 {
     Q_OBJECT
+
 public:
     MaemoDeviceConfigWizardStartPage(QWidget *parent = 0)
         : QWizardPage(parent), m_ui(new Ui::MaemoDeviceConfigWizardStartPage)
@@ -549,7 +550,10 @@ MaemoDeviceConfigWizard::MaemoDeviceConfigWizard(QWidget *parent)
     d->finalPage.setCommitPage(true);
 }
 
-MaemoDeviceConfigWizard::~MaemoDeviceConfigWizard() {}
+MaemoDeviceConfigWizard::~MaemoDeviceConfigWizard()
+{
+    delete d;
+}
 
 LinuxDeviceConfiguration::Ptr MaemoDeviceConfigWizard::deviceConfiguration()
 {
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizard.h b/src/plugins/remotelinux/maemodeviceconfigwizard.h
index a248866017..c3b93a48c0 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizard.h
+++ b/src/plugins/remotelinux/maemodeviceconfigwizard.h
@@ -34,15 +34,15 @@
 
 #include <remotelinux/linuxdeviceconfiguration.h>
 
-#include <QtCore/QScopedPointer>
-
 namespace RemoteLinux {
 namespace Internal {
+
 struct MaemoDeviceConfigWizardPrivate;
 
 class MaemoDeviceConfigWizard : public RemoteLinux::ILinuxDeviceConfigurationWizard
 {
     Q_OBJECT
+
 public:
     explicit MaemoDeviceConfigWizard(QWidget *parent = 0);
     ~MaemoDeviceConfigWizard();
@@ -52,7 +52,7 @@ public:
     virtual int nextId() const;
 
 private:
-    const QScopedPointer<MaemoDeviceConfigWizardPrivate> d;
+    MaemoDeviceConfigWizardPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/texteditor/snippets/snippeteditor.h b/src/plugins/texteditor/snippets/snippeteditor.h
index a51ae2c9f9..23afb5b665 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.h
+++ b/src/plugins/texteditor/snippets/snippeteditor.h
@@ -36,10 +36,6 @@
 #include <texteditor/texteditor_global.h>
 #include <texteditor/basetexteditor.h>
 
-#include <QtCore/QScopedPointer>
-
-QT_FORWARD_DECLARE_CLASS(QFocusEvent)
-
 namespace TextEditor {
 
 class SnippetEditorWidget;
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 803a87ddbc..d936d3ceed 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -158,10 +158,9 @@ VCSBaseClient::VCSBaseClient(VCSBaseClientSettings *settings) :
 
 VCSBaseClient::~VCSBaseClient()
 {
-    if (d->m_jobManager) {
-        delete d->m_jobManager;
-        d->m_jobManager = 0;
-    }
+    delete d->m_jobManager;
+    d->m_jobManager = 0;
+    delete d;
 }
 
 bool VCSBaseClient::synchronousCreateRepository(const QString &workingDirectory,
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index 2cf00b1de7..c6cffb7964 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -38,7 +38,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 class QFileInfo;
@@ -59,6 +58,7 @@ class VCSBaseEditorParameterWidget;
 class VCSBASE_EXPORT VCSBaseClient : public QObject
 {
     Q_OBJECT
+
 public:
     struct VCSBASE_EXPORT StatusItem
     {
@@ -180,7 +180,7 @@ protected:
 
 private:
     friend class VCSBaseClientPrivate;
-    QScopedPointer<VCSBaseClientPrivate> d;
+    VCSBaseClientPrivate *d;
 
     Q_PRIVATE_SLOT(d, void statusParser(QByteArray))
     Q_PRIVATE_SLOT(d, void annotateRevision(QString, QString, int))
diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
index abc8222afd..1bc37b981c 100644
--- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
@@ -122,6 +122,7 @@ VCSBaseEditorParameterWidget::VCSBaseEditorParameterWidget(QWidget *parent) :
 
 VCSBaseEditorParameterWidget::~VCSBaseEditorParameterWidget()
 {
+    delete d;
 }
 
 QStringList VCSBaseEditorParameterWidget::baseArguments() const
diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h
index cb93eb6a3b..cbb6c3d125 100644
--- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h
+++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h
@@ -51,7 +51,11 @@ class VCSBaseEditorParameterWidgetPrivate;
 class VCSBASE_EXPORT VCSBaseEditorParameterWidget : public QWidget
 {
     Q_OBJECT
+
 public:
+    explicit VCSBaseEditorParameterWidget(QWidget *parent = 0);
+    ~VCSBaseEditorParameterWidget();
+
     struct VCSBASE_EXPORT ComboBoxItem
     {
         ComboBoxItem();
@@ -60,9 +64,6 @@ public:
         QVariant value;
     };
 
-    explicit VCSBaseEditorParameterWidget(QWidget *parent = 0);
-    ~VCSBaseEditorParameterWidget();
-
     QStringList baseArguments() const;
     void setBaseArguments(const QStringList &);
 
@@ -102,7 +103,7 @@ protected:
 
 private:
     friend class VCSBaseEditorParameterWidgetPrivate;
-    QScopedPointer<VCSBaseEditorParameterWidgetPrivate> d;
+    VCSBaseEditorParameterWidgetPrivate *d;
 };
 
 } // namespace VCSBase
diff --git a/src/plugins/vcsbase/vcsjobrunner.cpp b/src/plugins/vcsbase/vcsjobrunner.cpp
index 38cfd01287..c09dd8fceb 100644
--- a/src/plugins/vcsbase/vcsjobrunner.cpp
+++ b/src/plugins/vcsbase/vcsjobrunner.cpp
@@ -202,6 +202,7 @@ VCSJobRunner::VCSJobRunner() : d(new VCSJobRunnerPrivate)
 VCSJobRunner::~VCSJobRunner()
 {
     stop();
+    delete d;
 }
 
 void VCSJobRunner::stop()
diff --git a/src/plugins/vcsbase/vcsjobrunner.h b/src/plugins/vcsbase/vcsjobrunner.h
index 8186a0fbad..ece94fa7dd 100644
--- a/src/plugins/vcsbase/vcsjobrunner.h
+++ b/src/plugins/vcsbase/vcsjobrunner.h
@@ -40,7 +40,6 @@
 #include <QtCore/QString>
 #include <QtCore/QPointer>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QScopedPointer>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -54,6 +53,7 @@ class VCSJobRunnerPrivate;
 class VCSBASE_EXPORT VCSJob : public QObject
 {
     Q_OBJECT
+
 public:
     enum DataEmitMode {
         NoDataEmitMode,
@@ -61,11 +61,9 @@ public:
         EditorDataEmitMode
     };
 
-    VCSJob(const QString &workingDir,
-           const QStringList &args,
+    VCSJob(const QString &workingDir, const QStringList &args,
            DataEmitMode emitMode = NoDataEmitMode);
-    VCSJob(const QString &workingDir,
-           const QStringList &args,
+    VCSJob(const QString &workingDir, const QStringList &args,
            VCSBase::VCSBaseEditorWidget *editor);
 
     DataEmitMode dataEmitMode() const;
@@ -97,6 +95,7 @@ private:
 class VCSBASE_EXPORT VCSJobRunner : public QThread
 {
     Q_OBJECT
+
 public:
     VCSJobRunner();
     ~VCSJobRunner();
@@ -127,7 +126,7 @@ private:
     void task(const QSharedPointer<VCSJob> &job);
     void stop();
 
-    QScopedPointer<VCSJobRunnerPrivate> d;
+    VCSJobRunnerPrivate *d;
 };
 
 } //namespace VCSBase