feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

use QTC_ASSERT instead of Q_ASSERT

Browse Source
This commit is contained in:
hjk
2008-12-09 15:25:01 +01:00
parent e99d8ce3fc
commit 4a552ead9f
94 changed files with 923 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/find/basetextfind.cpp
View File

@@ -33,6 +33,8 @@
#include "basetextfind.h"
#include <utils/qtcassert.h>
#include <QtGui/QTextBlock>
using namespace Find;
@@ -49,26 +51,26 @@ BaseTextFind::BaseTextFind(QPlainTextEdit *editor)
QTextCursor BaseTextFind::textCursor() const
{
Q_ASSERT(m_editor || m_plaineditor);
QTC_ASSERT(m_editor || m_plaineditor, return QTextCursor());
return m_editor ? m_editor->textCursor() : m_plaineditor->textCursor();
}
void BaseTextFind::setTextCursor(const QTextCursor& cursor)
{
Q_ASSERT(m_editor || m_plaineditor);
QTC_ASSERT(m_editor || m_plaineditor, return);
m_editor ? m_editor->setTextCursor(cursor) : m_plaineditor->setTextCursor(cursor);
}
QTextDocument *BaseTextFind::document() const
{
Q_ASSERT(m_editor || m_plaineditor);
QTC_ASSERT(m_editor || m_plaineditor, return 0);
return m_editor ? m_editor->document() : m_plaineditor->document();
}
bool BaseTextFind::isReadOnly() const
{
Q_ASSERT(m_editor || m_plaineditor);
QTC_ASSERT(m_editor || m_plaineditor, return true);
return m_editor ? m_editor->isReadOnly() : m_plaineditor->isReadOnly();
}

58
src/plugins/find/currentdocumentfind.cpp
View File

@@ -36,16 +36,17 @@
#include <aggregation/aggregate.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/modemanager.h>
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
#include <QtGui/QApplication>
#include <QtDebug>
using namespace Core;
using namespace Find;
using namespace Find::Internal;
CurrentDocumentFind::CurrentDocumentFind(ICore *core)
: m_core(core), m_currentFind(0)
: m_core(core), m_currentFind(0)
{
connect(qApp, SIGNAL(focusChanged(QWidget*, QWidget*)),
this, SLOT(updateCurrentFindFilter(QWidget*,QWidget*)));
@@ -59,16 +60,14 @@ void CurrentDocumentFind::removeConnections()
void CurrentDocumentFind::resetIncrementalSearch()
{
Q_ASSERT(m_currentFind);
if (m_currentFind)
m_currentFind->resetIncrementalSearch();
QTC_ASSERT(m_currentFind, return);
m_currentFind->resetIncrementalSearch();
}
void CurrentDocumentFind::clearResults()
{
Q_ASSERT(m_currentFind);
if (m_currentFind)
m_currentFind->clearResults();
QTC_ASSERT(m_currentFind, return);
m_currentFind->clearResults();
}
bool CurrentDocumentFind::isEnabled() const
@@ -78,67 +77,64 @@ bool CurrentDocumentFind::isEnabled() const
bool CurrentDocumentFind::supportsReplace() const
{
Q_ASSERT(m_currentFind);
return m_currentFind ? m_currentFind->supportsReplace() : false;
QTC_ASSERT(m_currentFind, return false);
return m_currentFind->supportsReplace();
}
QString CurrentDocumentFind::currentFindString() const
{
Q_ASSERT(m_currentFind);
return m_currentFind ? m_currentFind->currentFindString() : QString();
QTC_ASSERT(m_currentFind, return QString());
return m_currentFind->currentFindString();
}
QString CurrentDocumentFind::completedFindString() const
{
Q_ASSERT(m_currentFind);
return m_currentFind ? m_currentFind->completedFindString() : QString();
QTC_ASSERT(m_currentFind, return QString());
return m_currentFind->completedFindString();
}
void CurrentDocumentFind::highlightAll(const QString &txt, QTextDocument::FindFlags findFlags)
{
Q_ASSERT(m_currentFind);
if (m_currentFind)
m_currentFind->highlightAll(txt, findFlags);
QTC_ASSERT(m_currentFind, return);
m_currentFind->highlightAll(txt, findFlags);
}
bool CurrentDocumentFind::findIncremental(const QString &txt, QTextDocument::FindFlags findFlags)
{
Q_ASSERT(m_currentFind);
return (m_currentFind? m_currentFind->findIncremental(txt, findFlags) : false);
QTC_ASSERT(m_currentFind, return false);
return m_currentFind->findIncremental(txt, findFlags);
}
bool CurrentDocumentFind::findStep(const QString &txt, QTextDocument::FindFlags findFlags)
{
Q_ASSERT(m_currentFind);
return (m_currentFind? m_currentFind->findStep(txt, findFlags) : false);
QTC_ASSERT(m_currentFind, return false);
return m_currentFind->findStep(txt, findFlags);
}
bool CurrentDocumentFind::replaceStep(const QString &before, const QString &after,
QTextDocument::FindFlags findFlags)
{
Q_ASSERT(m_currentFind);
return (m_currentFind? m_currentFind->replaceStep(before, after, findFlags) : false);
QTC_ASSERT(m_currentFind, return false);
return m_currentFind->replaceStep(before, after, findFlags);
}
int CurrentDocumentFind::replaceAll(const QString &before, const QString &after,
QTextDocument::FindFlags findFlags)
{
Q_ASSERT(m_currentFind);
return (m_currentFind? m_currentFind->replaceAll(before, after, findFlags) : 0);
QTC_ASSERT(m_currentFind, return 0);
return m_currentFind->replaceAll(before, after, findFlags);
}
void CurrentDocumentFind::defineFindScope()
{
Q_ASSERT(m_currentFind);
if (m_currentFind)
m_currentFind->defineFindScope();
QTC_ASSERT(m_currentFind, return);
m_currentFind->defineFindScope();
}
void CurrentDocumentFind::clearFindScope()
{
Q_ASSERT(m_currentFind);
if (m_currentFind)
m_currentFind->clearFindScope();
QTC_ASSERT(m_currentFind, return);
m_currentFind->clearFindScope();
}
void CurrentDocumentFind::updateCurrentFindFilter(QWidget *old, QWidget *now)

19
src/plugins/find/findplugin.cpp
View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "findplugin.h"
#include "textfindconstants.h"
@@ -42,6 +43,8 @@
#include <coreplugin/actionmanager/icommand.h>
#include <coreplugin/coreconstants.h>
#include <utils/qtcassert.h>
#include <QtCore/qplugin.h>
#include <QtCore/QSettings>
@@ -102,24 +105,18 @@ void FindPlugin::filterChanged()
{
IFindFilter *changedFilter = qobject_cast<IFindFilter *>(sender());
QAction *action = m_filterActions.value(changedFilter);
Q_ASSERT(changedFilter);
Q_ASSERT(action);
if (!changedFilter || !action)
return;
QTC_ASSERT(changedFilter, return);
QTC_ASSERT(action, return);
action->setEnabled(changedFilter->isEnabled());
}
void FindPlugin::openFindFilter()
{
QAction *action = qobject_cast<QAction*>(sender());
Q_ASSERT(action);
if (!action)
return;
QTC_ASSERT(action, return);
IFindFilter *filter = action->data().value<IFindFilter *>();
Q_ASSERT(filter);
Q_ASSERT(filter->isEnabled());
if (!filter || !filter->isEnabled())
return;
QTC_ASSERT(filter, return);
QTC_ASSERT(filter->isEnabled(), return);
QString currentFindString = (m_currentDocumentFind->isEnabled() ? m_currentDocumentFind->currentFindString() : "");
if (!currentFindString.isEmpty())
m_findDialog->setFindText(currentFindString);