use QTC_ASSERT instead of Q_ASSERT

2008-12-09 15:25:01 +01:00
parent e99d8ce3fc
commit 4a552ead9f
94 changed files with 923 additions and 673 deletions
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -32,36 +32,38 @@
 ***************************************************************************/

 #include "gitclient.h"
-#include "gitplugin.h"
-#include "gitconstants.h"
+
 #include "commitdata.h"
+#include "gitconstants.h"
+#include "gitplugin.h"
 #include "gitsubmiteditor.h"

-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanagerinterface.h>
-#include <vcsbase/vcsbaseeditor.h>
+#include <coreplugin/uniqueidmanager.h>
 #include <texteditor/itexteditor.h>
+#include <utils/qtcassert.h>
+#include <vcsbase/vcsbaseeditor.h>

+#include <QtCore/QFuture>
 #include <QtCore/QRegExp>
 #include <QtCore/QTemporaryFile>
-#include <QtCore/QFuture>
 #include <QtCore/QTime>

-#include <QtGui/QMessageBox>
 #include <QtGui/QMainWindow> // for msg box parent
+#include <QtGui/QMessageBox>
 #include <QtGui/QPushButton>

 using namespace Git;
 using namespace Git::Internal;

-const char* const kGitCommand = "git";
-const char* const kGitDirectoryC = ".git";
-const char* const kBranchIndicatorC = "# On branch";
+const char *const kGitCommand = "git";
+const char *const kGitDirectoryC = ".git";
+const char *const kBranchIndicatorC = "# On branch";

 enum { untrackedFilesInCommit = 0 };

@@ -169,14 +171,14 @@ VCSBase::VCSBaseEditor
         // Exists already
        outputEditor->createNew(m_msgWait);
        rc = VCSBase::VCSBaseEditor::getVcsBaseEditor(outputEditor);
-        Q_ASSERT(rc);
+        QTC_ASSERT(rc, return 0);
        m_core->editorManager()->setCurrentEditor(outputEditor);
    } else {
        // Create new, set wait message, set up with source and codec
        outputEditor = m_core->editorManager()->newFile(kind, &title, m_msgWait);
        outputEditor->setProperty(registerDynamicProperty, dynamicPropertyValue);
        rc = VCSBase::VCSBaseEditor::getVcsBaseEditor(outputEditor);
-        Q_ASSERT(rc);
+        QTC_ASSERT(rc, return 0);
        rc->setSource(source);
        if (setSourceCodec)
            rc->setCodec(VCSBase::VCSBaseEditor::getCodec(m_core, source));
@@ -394,11 +396,10 @@ void GitClient::executeGit(const QString &workingDirectory, const QStringList &a

    GitCommand* command = new GitCommand();
    if (outputToWindow) {
-        Q_ASSERT(outputWindow);
        connect(command, SIGNAL(outputText(QString)), outputWindow, SLOT(append(QString)));
        connect(command, SIGNAL(outputData(QByteArray)), outputWindow, SLOT(appendData(QByteArray)));
    } else {
-        Q_ASSERT(editor);
+        QTC_ASSERT(editor, /**/);
        connect(command, SIGNAL(outputText(QString)), editor, SLOT(setPlainText(QString)));
        connect(command, SIGNAL(outputData(QByteArray)), editor, SLOT(setPlainTextData(QByteArray)));
    }
@@ -515,7 +516,7 @@ static bool parseFiles(const QString &output, CommitData *d)
    State s = None;
    // Match added/changed-not-updated files: "#<tab>modified: foo.cpp"
    QRegExp filesPattern(QLatin1String("#\\t[^:]+:\\s+.+"));
-    Q_ASSERT(filesPattern.isValid());
+    QTC_ASSERT(filesPattern.isValid(), return false);

    const QStringList::const_iterator cend = lines.constEnd();
    for (QStringList::const_iterator it =  lines.constBegin(); it != cend; ++it) {
@@ -533,7 +534,7 @@ static bool parseFiles(const QString &output, CommitData *d)
                        // Now match untracked: "#<tab>foo.cpp"
                        s = UntrackedFiles;
                        filesPattern = QRegExp(QLatin1String("#\\t.+"));
-                        Q_ASSERT(filesPattern.isValid());
+                        QTC_ASSERT(filesPattern.isValid(), return false);
                    } else {
                        if (filesPattern.exactMatch(line)) {
                            const QString fileSpec = line.mid(2).trimmed();
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -32,22 +32,25 @@
 ***************************************************************************/

 #include "giteditor.h"
+
 #include "annotationhighlighter.h"
+#include "gitclient.h"
 #include "gitconstants.h"
 #include "gitplugin.h"
-#include "gitclient.h"

-#include <vcsbase/diffhighlighter.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <utils/qtcassert.h>
+#include <vcsbase/diffhighlighter.h>

-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtCore/QSet>
-#include <QtCore/QRegExp>
-#include <QtCore/QDir>
 #include <QtCore/QDebug>
-#include <QtGui/QTextEdit>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QRegExp>
+#include <QtCore/QSet>
+#include <QtCore/QTextStream>
+
 #include <QtGui/QTextCursor>
+#include <QtGui/QTextEdit>

 #define CHANGE_PATTERN_8C "[a-f0-9]{8,8}"
 #define CHANGE_PATTERN_40C "[a-f0-9]{40,40}"
@@ -62,8 +65,8 @@ GitEditor::GitEditor(const VCSBase::VCSBaseEditorParameters *type,
    m_changeNumberPattern8(QLatin1String(CHANGE_PATTERN_8C)),
    m_changeNumberPattern40(QLatin1String(CHANGE_PATTERN_40C))
 {
-    Q_ASSERT(m_changeNumberPattern8.isValid());
-    Q_ASSERT(m_changeNumberPattern40.isValid());
+    QTC_ASSERT(m_changeNumberPattern8.isValid(), return);
+    QTC_ASSERT(m_changeNumberPattern40.isValid(), return);
    if (Git::Constants::debug)
        qDebug() << "GitEditor::GitEditor" << type->type << type->kind;
 }
@@ -76,11 +79,11 @@ QSet<QString> GitEditor::annotationChanges() const
        return changes;
    // Hunt for first change number in annotation: "<change>:"
    QRegExp r(QLatin1String("^("CHANGE_PATTERN_8C") "));
-    Q_ASSERT(r.isValid());
+    QTC_ASSERT(r.isValid(), return changes);
    if (r.indexIn(txt) != -1) {
        changes.insert(r.cap(1));
        r.setPattern(QLatin1String("\n("CHANGE_PATTERN_8C") "));
-        Q_ASSERT(r.isValid());
+        QTC_ASSERT(r.isValid(), return changes);
        int pos = 0;
        while ((pos = r.indexIn(txt, pos)) != -1) {
            pos += r.matchedLength();
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -32,13 +32,14 @@
 ***************************************************************************/

 #include "gitplugin.h"
-#include "gitclient.h"
-#include "gitversioncontrol.h"
-#include "giteditor.h"
-#include "gitconstants.h"
+
 #include "changeselectiondialog.h"
-#include "gitsubmiteditor.h"
 #include "commitdata.h"
+#include "gitclient.h"
+#include "gitconstants.h"
+#include "giteditor.h"
+#include "gitsubmiteditor.h"
+#include "gitversioncontrol.h"

 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
@@ -47,20 +48,24 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanagerinterface.h>
 #include <coreplugin/editormanager/editormanager.h>
+
+#include <utils/qtcassert.h>
+
 #include <vcsbase/basevcseditorfactory.h>
 #include <vcsbase/vcsbaseeditor.h>
 #include <vcsbase/basevcssubmiteditorfactory.h>

 #include <QtCore/qplugin.h>
 #include <QtCore/QDebug>
+#include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QTemporaryFile>
-#include <QtCore/QDir>
+
 #include <QtGui/QAction>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMainWindow>
 #include <QtGui/QMenu>
 #include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
-#include <QtGui/QFileDialog>

 static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
 {
@@ -142,7 +147,6 @@ GitPlugin::GitPlugin() :
    m_versionControl(0),
    m_changeTmpFile(0)
 {
-    Q_ASSERT(m_instance == 0);
    m_instance = this;
 }

@@ -212,10 +216,10 @@ static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = {
    Git::Constants::DIFF_SELECTED
 };

-static inline Core::ICommand *createSeparator(Core::ActionManagerInterface *am,
-                                              const QList<int> &context,
-                                              const QString &id,
-                                              QObject *parent)
+static Core::ICommand *createSeparator(Core::ActionManagerInterface *am,
+                                       const QList<int> &context,
+                                       const QString &id,
+                                       QObject *parent)
 {
    QAction *a = new QAction(parent);
    a->setSeparator(true);
@@ -627,7 +631,7 @@ Core::IEditor *GitPlugin::openSubmitEditor(const QString &fileName, const Commit
        qDebug() << Q_FUNC_INFO << fileName << editor;
    m_core->editorManager()->ensureEditorManagerVisible();
    GitSubmitEditor *submitEditor = qobject_cast<GitSubmitEditor*>(editor);
-    Q_ASSERT(submitEditor);
+    QTC_ASSERT(submitEditor, return 0);
    // The actions are for some reason enabled by the context switching
    // mechanism. Disable them correctly.
    m_submitCurrentAction->setEnabled(!cd.stagedFiles.empty());