14 files changed, 227 insertions, 120 deletions

diff --git a/src/plugins/coreplugin/editormanager/editorgroup.cpp b/src/plugins/coreplugin/editormanager/editorgroup.cpp
index 58c867b02c..c146a09f25 100644
--- a/src/plugins/coreplugin/editormanager/editorgroup.cpp
+++ b/src/plugins/coreplugin/editormanager/editorgroup.cpp
@@ -32,15 +32,18 @@
 ***************************************************************************/
 
 #include "editorgroup.h"
+
 #include "editormanager.h"
 
 #include <coreplugin/coreconstants.h>
+#include <utils/qtcassert.h>
 
 #include <QtCore/QDir>
+#include <QtCore/QDebug>
+
 #include <QtGui/QPainter>
 #include <QtGui/QStyle>
 #include <QtGui/QStyleOption>
-#include <QtCore/QtDebug>
 #ifdef Q_WS_MAC
 #include <QtGui/QMacStyle>
 #endif
@@ -107,20 +110,20 @@ QVariant EditorModel::data(const QModelIndex &index, int role) const
     if (!index.isValid())
         return QVariant();
     IEditor *editor = m_editors.at(index.row());
-    Q_ASSERT(editor);
+    QTC_ASSERT(editor, return QVariant());
     switch (role) {
     case Qt::DisplayRole:
         return editor->file()->isModified()
-                ?editor->displayName()+QLatin1String("*")
-                :editor->displayName();
+                ? editor->displayName() + QLatin1String("*")
+                : editor->displayName();
     case Qt::DecorationRole:
         return editor->file()->isReadOnly()
-                ?QIcon(QLatin1String(":/qworkbench/images/locked.png"))
-                :QIcon();
+                ? QIcon(QLatin1String(":/qworkbench/images/locked.png"))
+                : QIcon();
     case Qt::ToolTipRole:
         return editor->file()->fileName().isEmpty()
-                ?editor->displayName()
-                :QDir::toNativeSeparators(editor->file()->fileName());
+                ? editor->displayName()
+                : QDir::toNativeSeparators(editor->file()->fileName());
     case Qt::UserRole:
         return qVariantFromValue(editor);
     default:
@@ -145,6 +148,7 @@ EditorGroupContext::EditorGroupContext(EditorGroup *editorGroup)
      m_editorGroup(editorGroup)
 {
 }
+
 QList<int> EditorGroupContext::context() const
 {
     return m_context;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 3f3b93af70..1b4f04093f 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -53,21 +53,23 @@
 #include <coreplugin/baseview.h>
 #include <coreplugin/imode.h>
 
+#include <utils/qtcassert.h>
+
+#include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
 #include <QtCore/QMap>
-#include <QtCore/QSet>
 #include <QtCore/QProcess>
-#include <QtCore/QDebug>
+#include <QtCore/QSet>
+#include <QtCore/QSettings>
 
 #include <QtGui/QAction>
-#include <QtGui/QLayout>
 #include <QtGui/QApplication>
-#include <QtGui/QSplitter>
 #include <QtGui/QFileDialog>
+#include <QtGui/QLayout>
 #include <QtGui/QMenu>
 #include <QtGui/QMessageBox>
 #include <QtGui/QPushButton>
+#include <QtGui/QSplitter>
 
 using namespace Core;
 using namespace Core::Internal;
@@ -961,11 +963,10 @@ bool EditorManager::hasEditor(const QString &fileName) const
 
 void EditorManager::restoreEditorState(IEditor *editor)
 {
-    Q_ASSERT(editor);
+    QTC_ASSERT(editor, return);
     QString fileName = editor->file()->fileName();
-    if (m_d->m_editorStates.contains(fileName)) {
+    if (m_d->m_editorStates.contains(fileName))
         editor->restoreState(m_d->m_editorStates.value(fileName).toByteArray());
-    }
 }
 
 bool EditorManager::saveEditor(IEditor *editor)
diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
index f0e7f82bf9..48ec7e0e45 100644
--- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp
+++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
@@ -32,16 +32,19 @@
 ***************************************************************************/
 
 #include "editorsplitter.h"
+
 #include "editormanager.h"
+#include "minisplitter.h"
 #include "openeditorswindow.h"
 #include "stackededitorgroup.h"
-#include "minisplitter.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanagerinterface.h>
 
+#include <utils/qtcassert.h>
+
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QMenu>
 #include <QtGui/QApplication>
@@ -160,7 +163,7 @@ void EditorSplitter::registerActions()
 void EditorSplitter::updateActions()
 {
     const bool hasMultipleGroups = (qobject_cast<QSplitter*>(m_root) != 0);
-    Q_ASSERT(currentGroup());
+    QTC_ASSERT(currentGroup(), return);
     const bool hasEditors = (currentGroup()->editorCount() != 0);
     m_unsplitAction->setEnabled(hasMultipleGroups);
 #if 0
@@ -245,7 +248,7 @@ void EditorSplitter::collectGroups(QWidget *widget, QList<EditorGroup*> &groups)
         return;
     }
     QSplitter *splitter = qobject_cast<QSplitter*>(widget);
-    Q_ASSERT(splitter);
+    QTC_ASSERT(splitter, return);
     collectGroups(splitter->widget(LEFT), groups);
     collectGroups(splitter->widget(RIGHT), groups);
 }
@@ -330,7 +333,7 @@ void EditorSplitter::unsplit()
     if (!curGroup)
         return;
     QWidget *curGroupWidget = curGroup->widget();
-    Q_ASSERT(curGroupWidget);
+    QTC_ASSERT(curGroupWidget, return);
     IEditor *selectedEditor = curGroup->currentEditor();
 
     QSplitter *parentSplitter = qobject_cast<QSplitter*>(curGroupWidget->parentWidget());
@@ -454,25 +457,25 @@ EditorGroup *EditorSplitter::groupFarthestOnSide(QWidget *node, Side side) const
 void EditorSplitter::selectNextGroup()
 {
     EditorGroup *curGroup = currentGroup();
-    Q_ASSERT(curGroup);
+    QTC_ASSERT(curGroup, return);
     setCurrentGroup(nextGroup(curGroup, RIGHT));
 }
 
 void EditorSplitter::selectPreviousGroup()
 {
     EditorGroup *curGroup = currentGroup();
-    Q_ASSERT(curGroup);
+    QTC_ASSERT(curGroup, return);
     setCurrentGroup(nextGroup(curGroup, LEFT));
 }
 
 EditorGroup *EditorSplitter::nextGroup(EditorGroup *curGroup, Side side) const
 {
-    Q_ASSERT(curGroup);
+    QTC_ASSERT(curGroup, return 0);
     QWidget *curWidget = curGroup->widget();
     QWidget *parent = curWidget->parentWidget();
     while (curWidget != m_root) {
         QSplitter *splitter = qobject_cast<QSplitter *>(parent);
-        Q_ASSERT(splitter);
+        QTC_ASSERT(splitter, return 0);
         if (splitter->widget(side) != curWidget) {
             curWidget = splitter->widget(side);
             break;
@@ -486,7 +489,7 @@ EditorGroup *EditorSplitter::nextGroup(EditorGroup *curGroup, Side side) const
 void EditorSplitter::moveDocToAdjacentGroup(Side side)
 {
     EditorGroup *curGroup = currentGroup();
-    Q_ASSERT(curGroup);
+    QTC_ASSERT(curGroup, return);
     IEditor *editor = curGroup->currentEditor();
     if (!editor)
         return;
@@ -510,7 +513,7 @@ QWidget *EditorSplitter::recreateGroupTree(QWidget *node)
     QSplitter *splitter = qobject_cast<QSplitter *>(node);
     if (!splitter) {
         EditorGroup *group = qobject_cast<EditorGroup *>(node);
-        Q_ASSERT(group);
+        QTC_ASSERT(group, return 0);
         IEditor *currentEditor = group->currentEditor();
         EditorGroup *newGroup = createGroup();
         bool block = newGroup->widget()->blockSignals(true);
@@ -588,7 +591,7 @@ void EditorSplitter::saveState(QWidget *current, QDataStream &stream) const
         saveState(splitter->widget(1), stream);
     } else {
         EditorGroup *group = qobject_cast<EditorGroup *>(current);
-        Q_ASSERT(group);
+        QTC_ASSERT(group, /**/);
         if (group != currentGroup())
             type = 1;
         else
@@ -639,7 +642,7 @@ void EditorSplitter::fillPathGroupMap(QWidget *current, QString currentPath,
         map.insert(currentPath, group);
     } else {
         QSplitter *splitter = qobject_cast<QSplitter *>(current);
-        Q_ASSERT(splitter);
+        QTC_ASSERT(splitter, return);
         fillPathGroupMap(splitter->widget(0), currentPath+"0", map);
         fillPathGroupMap(splitter->widget(1), currentPath+"1", map);
     }
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index d321491e2f..8fadf75306 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -39,6 +39,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/filemanager.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <utils/qtcassert.h>
 
 #include <QtCore/QTimer>
 #include <QtGui/QMenu>
@@ -197,7 +198,7 @@ void OpenEditorsWidget::selectEditor(QTreeWidgetItem *item)
 void OpenEditorsWidget::updateEditor()
 {
     IEditor *editor = qobject_cast<IEditor *>(sender());
-    Q_ASSERT(editor);
+    QTC_ASSERT(editor, return);
     int num = m_ui.editorList->topLevelItemCount();
     for (int i = 0; i < num; ++i) {
         QTreeWidgetItem *item = m_ui.editorList->topLevelItem(i);
diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
index 35c4abca29..c4dcffe91d 100644
--- a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
+++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
@@ -35,21 +35,24 @@
 #include "editormanager.h"
 #include "coreimpl.h"
 
-#include <QtCore/QFileInfo>
+#include <utils/qtcassert.h>
+
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 #include <QtCore/QMimeData>
+
+#include <QtGui/QApplication>
 #include <QtGui/QComboBox>
 #include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QMouseEvent>
 #include <QtGui/QPainter>
+#include <QtGui/QStackedWidget>
 #include <QtGui/QStyle>
 #include <QtGui/QStyleOption>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QApplication>
 #include <QtGui/QToolBar>
 #include <QtGui/QToolButton>
-#include <QtGui/QLabel>
-#include <QtGui/QStackedWidget>
-#include <QtDebug>
 #ifdef Q_WS_MAC
 #include <qmacstyle_mac.h>
 #endif
@@ -240,7 +243,7 @@ void StackedEditorGroup::sendCloseRequest()
 
 void StackedEditorGroup::removeEditor(IEditor *editor)
 {
-    Q_ASSERT(editor);
+    QTC_ASSERT(editor, return);
     EditorGroup::removeEditor(editor);
     const int index = m_container->indexOf(editor->widget());
     if (index != -1) {
@@ -280,7 +283,7 @@ void StackedEditorGroup::setCurrentEditor(IEditor *editor)
         return;
     m_toplevel->setVisible(true);
     const int idx = m_container->indexOf(editor->widget());
-    Q_ASSERT(idx >= 0);
+    QTC_ASSERT(idx >= 0, return);
     if (m_container->currentIndex() != idx) {
         m_container->setCurrentIndex(idx);
 
@@ -298,10 +301,11 @@ void StackedEditorGroup::setCurrentEditor(IEditor *editor)
     }
 }
 
-void StackedEditorGroup::updateEditorStatus(IEditor *editor) {
+void StackedEditorGroup::updateEditorStatus(IEditor *editor)
+{
     if (!editor)
         editor = qobject_cast<IEditor *>(sender());
-    Q_ASSERT(editor);
+    QTC_ASSERT(editor, return);
 
     static const QIcon lockedIcon(QLatin1String(":/qworkbench/images/locked.png"));
     static const QIcon unlockedIcon(QLatin1String(":/qworkbench/images/unlocked.png"));
@@ -371,6 +375,6 @@ int StackedEditorGroup::indexOf(IEditor *editor)
         if (editor == model->data(model->index(i, 0), Qt::UserRole).value<IEditor*>())
             return i;
     }
-    Q_ASSERT(false);
+    QTC_ASSERT(false, /**/);
     return 0;
 }
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 9e4e670438..48ae15dd95 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -32,6 +32,7 @@
 ***************************************************************************/
 
 #include "filemanager.h"
+
 #include "ifile.h"
 #include "mainwindow.h"
 #include "saveitemsdialog.h"
@@ -40,6 +41,8 @@
 #include "mimedatabase.h"
 #include "iversioncontrol.h"
 
+#include <utils/qtcassert.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/QSettings>
 #include <QtCore/QFileInfo>
@@ -177,22 +180,20 @@ bool FileManager::removeFile(IFile *file)
 
 void FileManager::addWatch(const QString &filename)
 {
-    if (!filename.isEmpty() && managedFiles(filename).isEmpty()) {
+    if (!filename.isEmpty() && managedFiles(filename).isEmpty())
         m_fileWatcher->addPath(filename);
-    }
 }
 
 void FileManager::removeWatch(const QString &filename)
 {
-    if (!filename.isEmpty() && managedFiles(filename).isEmpty()) {
+    if (!filename.isEmpty() && managedFiles(filename).isEmpty())
         m_fileWatcher->removePath(filename);
-    }
 }
 
 void FileManager::checkForNewFileName()
 {
     IFile *file = qobject_cast<IFile *>(sender());
-    Q_ASSERT(file);
+    QTC_ASSERT(file, return);
     const QString newfilename = fixFileName(file->fileName());
     const QString oldfilename = m_managedFiles.value(file).fileName;
     if (!newfilename.isEmpty() && newfilename != oldfilename) {
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index d796af3bdc..1b018c66d1 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -33,30 +33,34 @@
 
 #include "manhattanstyle.h"
 
-#include <QStyleOption>
-#include <QPainter>
-#include <QScrollArea>
-#include <QMainWindow>
-#include <QDockWidget>
-#include <QPixmapCache>
-#include <QDialogButtonBox>
-#include <QPixmap>
-#include <QToolBar>
-#include <QDialog>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QLibrary>
-#include <QStatusBar>
-#include <QApplication>
-#include <QStyleFactory>
-#include <QToolButton>
-#include <QLabel>
-#include <QPushButton>
-#include <QSplitter>
-#include <QMenuBar>
 #include "stylehelper.h"
 #include "styleanimator.h"
-#include <qdebug.h>
+
+#include <QtCore/QDebug>
+#include <QtCore/QLibrary>
+
+#include <QtGui/QApplication>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QDockWidget>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenuBar>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPixmapCache>
+#include <QtGui/QPushButton>
+#include <QtGui/QScrollArea>
+#include <QtGui/QSplitter>
+#include <QtGui/QStatusBar>
+#include <QtGui/QStyleFactory>
+#include <QtGui/QStyleOption>
+#include <QtGui/QToolBar>
+#include <QtGui/QToolButton>
+
+#include <utils/qtcassert.h>
 
 // We define a currently unused state for indicating animations
 #define State_Animating 0x00000040
@@ -97,7 +101,7 @@ public:
     ManhattanStylePrivate(const QString &baseStyleName)
     {
         style = QStyleFactory::create(baseStyleName);
-        Q_ASSERT(style);
+        QTC_ASSERT(style, /**/);
         buttonImage_pressed = QImage(":/qworkbench/images/pushbutton_pressed.png");
         buttonImage = QImage(":/qworkbench/images/pushbutton.png");
 
@@ -105,12 +109,15 @@ public:
         lineeditImage_disabled = QImage(":/qworkbench/images/inputfield_disabled.png");
     }
 
-    ~ManhattanStylePrivate() {
+    ~ManhattanStylePrivate()
+    {
         delete style;
         style = 0;
     }
 
     void init();
+
+public:
     QStyle *style;
     QImage buttonImage;
     QImage buttonImage_pressed;
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index 37ff518a76..26e6858c98 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -33,19 +33,22 @@
 
 #include "mimedatabase.h"
 
-#include <QtCore/QStringList>
+#include <utils/qtcassert.h>
+
+#include <QtCore/QByteArray>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
 #include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QLocale>
 #include <QtCore/QMap>
 #include <QtCore/QMultiHash>
-#include <QtCore/QDebug>
 #include <QtCore/QRegExp>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFileInfo>
-#include <QtCore/QByteArray>
 #include <QtCore/QSharedData>
 #include <QtCore/QSharedPointer>
+#include <QtCore/QStringList>
 #include <QtCore/QTextStream>
-#include <QtCore/QLocale>
+
 #include <QtXml/QXmlStreamReader>
 
 enum { debugMimeDB = 0 };
@@ -574,7 +577,7 @@ BaseMimeTypeParser:: BaseMimeTypeParser() :
     // "*.log[1-9]"
     m_suffixPattern(QLatin1String("^\\*\\.[\\w]+$"))
 {
-    Q_ASSERT(m_suffixPattern.isValid());
+    QTC_ASSERT(m_suffixPattern.isValid(), /**/);
 }
 
 void BaseMimeTypeParser::addGlobPattern(const QString &pattern, MimeTypeData *d) const
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index 3ea82b4243..31221a343c 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -32,11 +32,13 @@
 ***************************************************************************/
 
 #include "modemanager.h"
+
 #include "fancytabwidget.h"
 #include "fancyactionbar.h"
 #include "mainwindow.h"
 
 #include <aggregation/aggregate.h>
+
 #include <coreplugin/actionmanager/actionmanagerinterface.h>
 #include <coreplugin/actionmanager/icommand.h>
 #include <coreplugin/coreconstants.h>
@@ -44,9 +46,12 @@
 #include <coreplugin/imode.h>
 #include <coreplugin/uniqueidmanager.h>
 
+#include <utils/qtcassert.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QDebug>
 #include <QtCore/QSignalMapper>
+
 #include <QtGui/QAction>
 #include <QtGui/QTabWidget>
 #include <QtGui/QVBoxLayout>
@@ -225,7 +230,7 @@ void ModeManager::currentTabChanged(int index)
 void ModeManager::setFocusToCurrentMode()
 {
     IMode *mode = currentMode();
-    Q_ASSERT(mode);
+    QTC_ASSERT(mode, return);
     QWidget *widget = mode->widget();
     if (widget) {
         QWidget *focusWidget = widget->focusWidget();
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index e74198d897..be851f5267 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -40,11 +40,13 @@
 #include "uniqueidmanager.h"
 #include "viewmanagerinterface.h"
 
+#include <utils/qtcassert.h>
+
 using namespace Core;
 using namespace Core::Internal;
 
-ProgressManager::ProgressManager(QObject *parent) :
-    ProgressManagerInterface(parent)
+ProgressManager::ProgressManager(QObject *parent)
+  : ProgressManagerInterface(parent)
 {
     m_progressView = new ProgressView;
     ICore *core = CoreImpl::instance();
@@ -103,7 +105,7 @@ QWidget *ProgressManager::progressView()
 void ProgressManager::taskFinished()
 {
     QObject *taskObject = sender();
-    Q_ASSERT(taskObject);
+    QTC_ASSERT(taskObject, return);
     QFutureWatcher<void> *task = static_cast<QFutureWatcher<void> *>(taskObject);
     m_runningTasks.remove(task);
     delete task;
diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp
index 274eae8bdb..c589b4b689 100644
--- a/src/plugins/coreplugin/progressmanager/progressview.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressview.cpp
@@ -34,6 +34,8 @@
 #include "progressview.h"
 #include "futureprogress.h"
 
+#include <utils/qtcassert.h>
+
 #include <QtGui/QHBoxLayout>
 
 using namespace Core;
@@ -136,7 +138,7 @@ void ProgressView::removeTask(FutureProgress *task)
 void ProgressView::slotFinished()
 {
     FutureProgress *progress = qobject_cast<FutureProgress *>(sender());
-    Q_ASSERT(progress);
+    QTC_ASSERT(progress, return);
     if (m_keep.contains(progress) && !m_keep.value(progress) && !progress->hasError())
         removeTask(progress);
     removeOldTasks(m_type.value(progress), true);
diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
index 28c3c658e6..81e0f77b56 100644
--- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
+++ b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
@@ -38,12 +38,15 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/editormanager/editorgroup.h>
 
+#include <utils/qtcassert.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/QSettings>
 
 #include <QtGui/QMainWindow>
 #include <QtGui/QStatusBar>
 #include <QtGui/QToolBar>
+
 #include <QtScript/QScriptEngine>
 
 namespace {
@@ -107,7 +110,7 @@ QString CorePrototype::toString() const
 CorePrototype::ICore *CorePrototype::callee() const
 {
     ICore *rc = qscriptvalue_cast<ICore *>(thisObject());
-    Q_ASSERT(rc);
+    QTC_ASSERT(rc, return 0);
     return rc;
 }
 
@@ -121,14 +124,14 @@ MessageManagerPrototype::MessageManagerPrototype(QObject *parent) :
 void MessageManagerPrototype::displayStatusBarMessage(const QString &text, int ms)
 {
     MessageManager *mm = qscriptvalue_cast<MessageManager *>(thisObject());
-    Q_ASSERT(mm);
+    QTC_ASSERT(mm, return);
     mm->displayStatusBarMessage(text, ms);
 }
 
 void MessageManagerPrototype::printToOutputPane(const QString &text, bool bringToForeground)
 {
     MessageManager *mm = qscriptvalue_cast<MessageManager *>(thisObject());
-    Q_ASSERT(mm);
+    QTC_ASSERT(mm, return);
     mm->printToOutputPane(text, bringToForeground);
 }
 
@@ -147,28 +150,66 @@ FileManagerPrototype::FileManagerPrototype(QObject *parent) :
 FileManager *FileManagerPrototype::callee() const
 {
     FileManager *rc = qscriptvalue_cast<FileManager *>(thisObject());
-    Q_ASSERT(rc);
+    QTC_ASSERT(rc, return 0);
     return rc;
 }
 
-bool FileManagerPrototype::addFiles(const QList<Core::IFile *> &files) { return callee()->addFiles(files); }
-bool FileManagerPrototype::addFile(Core::IFile *file) { return callee()->addFile(file); }
-bool FileManagerPrototype::removeFile(Core::IFile *file) { return callee()->removeFile(file); }
+bool FileManagerPrototype::addFiles(const QList<Core::IFile *> &files)
+{
+    return callee()->addFiles(files);
+}
+
+bool FileManagerPrototype::addFile(Core::IFile *file)
+{
+    return callee()->addFile(file);
+}
+
+bool FileManagerPrototype::removeFile(Core::IFile *file)
+{
+    return callee()->removeFile(file);
+}
 
 QList<Core::IFile*>
-    FileManagerPrototype::saveModifiedFilesSilently(const QList<Core::IFile*> &files) { return callee()->saveModifiedFilesSilently(files); }
+FileManagerPrototype::saveModifiedFilesSilently(const QList<Core::IFile*> &files)
+{
+    return callee()->saveModifiedFilesSilently(files);
+}
+
+QString FileManagerPrototype::getSaveAsFileName(Core::IFile *file)
+{
+    return callee()->getSaveAsFileName(file);
+}
 
-QString FileManagerPrototype::getSaveAsFileName(Core::IFile *file) { return callee()->getSaveAsFileName(file); }
+bool FileManagerPrototype::isFileManaged(const QString &fileName) const
+{
+    return callee()->isFileManaged(fileName);
+}
 
-bool FileManagerPrototype::isFileManaged(const QString &fileName) const { return callee()->isFileManaged(fileName); }
 QList<Core::IFile *>
-    FileManagerPrototype::managedFiles(const QString &fileName) const { return callee()->managedFiles(fileName); }
+FileManagerPrototype::managedFiles(const QString &fileName) const
+{
+    return callee()->managedFiles(fileName);
+}
 
-void FileManagerPrototype::blockFileChange(Core::IFile *file) { callee()->blockFileChange(file); }
-void FileManagerPrototype::unblockFileChange(Core::IFile *file) { return callee()->unblockFileChange(file); }
+void FileManagerPrototype::blockFileChange(Core::IFile *file)
+{
+    callee()->blockFileChange(file);
+}
+
+void FileManagerPrototype::unblockFileChange(Core::IFile *file)
+{
+    return callee()->unblockFileChange(file);
+}
 
-void FileManagerPrototype::addToRecentFiles(const QString &fileName) { return callee()->addToRecentFiles(fileName); }
-QStringList FileManagerPrototype::recentFiles() const { return callee()->recentFiles(); }
+void FileManagerPrototype::addToRecentFiles(const QString &fileName)
+{
+    return callee()->addToRecentFiles(fileName);
+}
+
+QStringList FileManagerPrototype::recentFiles() const
+{
+    return callee()->recentFiles();
+}
 
 QString FileManagerPrototype::toString() const
 {
@@ -185,7 +226,7 @@ FilePrototype::FilePrototype(QObject *parent) :
 IFile *FilePrototype::callee() const
 {
     IFile *rc = qscriptvalue_cast<IFile *>(thisObject());
-    Q_ASSERT(rc);
+    QTC_ASSERT(rc, return 0);
     return rc;
 }
 
@@ -270,39 +311,66 @@ QString EditorManagerPrototype::toString() const
 EditorManagerPrototype::EditorManager *EditorManagerPrototype::callee() const
 {
     EditorManager *rc = qscriptvalue_cast<EditorManager *>(thisObject());
-    Q_ASSERT(rc);
+    QTC_ASSERT(rc, return 0);
     return rc;
-
 }
 
 // ------------- EditorPrototype
 
-EditorPrototype::EditorPrototype(QObject *parent) :
-    QObject(parent)
+EditorPrototype::EditorPrototype(QObject *parent)
+  : QObject(parent)
 {
 }
 
-QString EditorPrototype::displayName() const { return callee()->displayName(); }
-void EditorPrototype::setDisplayName(const QString &title) { callee()->setDisplayName(title); }
+QString EditorPrototype::displayName() const
+{
+    return callee()->displayName();
+}
 
-QString EditorPrototype::kind() const { return  QLatin1String(callee()->kind()); }
-bool EditorPrototype::duplicateSupported() const { return callee()->duplicateSupported(); }
+void EditorPrototype::setDisplayName(const QString &title)
+{
+    callee()->setDisplayName(title);
+}
 
-bool EditorPrototype::createNew(const QString &contents) { return callee()->createNew(contents); }
-bool EditorPrototype::open(const QString &fileName) { return callee()->open(fileName); }
+QString EditorPrototype::kind() const
+{
+    return  QLatin1String(callee()->kind());
+}
+
+bool EditorPrototype::duplicateSupported() const
+{
+    return callee()->duplicateSupported();
+}
+
+bool EditorPrototype::createNew(const QString &contents)
+{
+    return callee()->createNew(contents);
+}
+
+bool EditorPrototype::open(const QString &fileName)
+{
+    return callee()->open(fileName);
+}
 
 Core::IEditor *EditorPrototype::duplicate(QWidget *parent)
 {
     return callee()->duplicate(parent);
 }
 
-Core::IFile *EditorPrototype::file() const { return callee()->file(); }
-QToolBar* EditorPrototype::toolBar() const { return callee()->toolBar();}
+Core::IFile *EditorPrototype::file() const
+{
+    return callee()->file();
+}
+
+QToolBar* EditorPrototype::toolBar() const
+{
+    return callee()->toolBar();
+}
 
 Core::IEditor *EditorPrototype::callee() const
 {
     IEditor *rc = qscriptvalue_cast<IEditor *>(thisObject());
-    Q_ASSERT(rc);
+    QTC_ASSERT(rc, return 0);
     return rc;
 }
 
@@ -375,7 +443,7 @@ QString EditorGroupPrototype::toString() const
 Core::EditorGroup *EditorGroupPrototype::callee() const
 {
     EditorGroup *rc = qscriptvalue_cast<EditorGroup *>(thisObject());
-    Q_ASSERT(rc);
+    QTC_ASSERT(rc, return 0);
     return rc;
 }
 
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index 5613bd6781..a3761a17fe 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
@@ -36,8 +36,10 @@
 #include "metatypedeclarations.h"
 
 #include <extensionsystem/ExtensionSystemInterfaces>
+#include <utils/qtcassert.h>
 #include <interface_wrap_helpers.h>
 #include <wrap_helpers.h>
+
 #include <limits.h>
 
 #include <QtCore/QDebug>
@@ -154,7 +156,7 @@ static QScriptValue inputDialogGetItem(QScriptContext *context, QScriptEngine *e
 // Script function template to pop up a file box
 // with a certain icon and buttons.
 template <int TAcceptMode, int TFileMode>
-        static QScriptValue fileBox(QScriptContext *context, QScriptEngine *engine)
+static QScriptValue fileBox(QScriptContext *context, QScriptEngine *engine)
 {
     const int argumentCount = context->argumentCount();
     if (argumentCount < 2)
@@ -170,7 +172,7 @@ template <int TAcceptMode, int TFileMode>
     if (fileDialog.exec() == QDialog::Rejected)
         return  QScriptValue(engine, QScriptValue::NullValue);
     const QStringList rc = fileDialog.selectedFiles();
-    Q_ASSERT(!rc.empty());
+    QTC_ASSERT(!rc.empty(), /**/);
     return TFileMode == QFileDialog::ExistingFiles ?
         engine->toScriptValue(rc) : engine->toScriptValue(rc.front());
 }
@@ -249,7 +251,7 @@ void ScriptManager::ensureEngineInitialized()
 {
     if (m_initialized)
         return;
-    Q_ASSERT(m_core);
+    QTC_ASSERT(m_core, return);
     // register QObjects that occur as properties
     SharedTools::registerQObject<QMainWindow>(m_engine);
     SharedTools::registerQObject<QStatusBar>(m_engine);
diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp
index d2ad590ef6..0decae6cf1 100644
--- a/src/plugins/coreplugin/versiondialog.cpp
+++ b/src/plugins/coreplugin/versiondialog.cpp
@@ -32,21 +32,25 @@
 ***************************************************************************/
 
 #include "versiondialog.h"
+
 #include "coreconstants.h"
 #include "coreimpl.h"
 
-using namespace Core;
-using namespace Core::Internal;
-using namespace Core::Constants;
+#include <utils/qtcassert.h>
 
 #include <QtCore/QDate>
 #include <QtCore/QFile>
+
+#include <QtGui/QDialogButtonBox>
 #include <QtGui/QGridLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QPushButton>
-#include <QtGui/QDialogButtonBox>
 #include <QtGui/QTextBrowser>
 
+using namespace Core;
+using namespace Core::Internal;
+using namespace Core::Constants;
+
 VersionDialog::VersionDialog(QWidget *parent)
     : QDialog(parent)
 {
@@ -90,7 +94,7 @@ VersionDialog::VersionDialog(QWidget *parent)
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
     QPushButton *closeButton = buttonBox->button(QDialogButtonBox::Close);
-    Q_ASSERT(closeButton);
+    QTC_ASSERT(closeButton, /**/);
     buttonBox->addButton(closeButton, QDialogButtonBox::ButtonRole(QDialogButtonBox::RejectRole | QDialogButtonBox::AcceptRole));
     connect(buttonBox , SIGNAL(rejected()), this, SLOT(reject()));
 
@@ -118,7 +122,7 @@ void VersionDialog::popupLicense()
 
     // Read file into string
     ICore * core = CoreImpl::instance();
-    Q_ASSERT(core != NULL);
+    QTC_ASSERT(core, return);
     QString fileName = core->resourcePath() + "/license.txt";
     QFile file(fileName);