Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
18b3d258
Commit
18b3d258
authored
Dec 09, 2008
by
hjk
Browse files
some QTC_ASSERT polishing
parent
4a552ead
Changes
11
Hide whitespace changes
Inline
Side-by-side
src/libs/utils/qtcassert.h
View file @
18b3d258
...
...
@@ -36,13 +36,11 @@
#include <QtCore/QDebug>
#ifdef Q_OS_UNIX
// we do not use the 'do {...} while (0)' idiom here to be able to use
// 'break' and 'continue' as 'actions'.
#define QTC_ASSERT(cond, action) \
if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED"<<__FILE__<<__LINE__;action;}
#else
#define QTC_ASSERT(cond, action) \
if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED";action;}
#endif
#endif // QTC_ASSERT_H
src/plugins/debugger/breakhandler.cpp
View file @
18b3d258
...
...
@@ -34,7 +34,8 @@
#include "breakhandler.h"
#include "imports.h" // TextEditor::BaseTextMark
#include "qtcassert.h"
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
#include <QtCore/QFileInfo>
...
...
src/plugins/debugger/debugger.pro
View file @
18b3d258
...
...
@@ -10,8 +10,6 @@ include(../../plugins/texteditor/texteditor.pri)
include
(..
/../
plugins
/
cpptools
/
cpptools
.
pri
)
include
(..
/../
libs
/
cplusplus
/
cplusplus
.
pri
)
INCLUDEPATH
+=
..
/../
libs
/
utils
#
DEFINES
+=
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
QT
+=
gui
network
script
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
18b3d258
...
...
@@ -39,7 +39,6 @@
#include "gdboptionpage.h"
#include "gdbengine.h"
#include "mode.h"
#include "qtcassert.h"
#include <coreplugin/actionmanager/actionmanagerinterface.h>
#include <coreplugin/coreconstants.h>
...
...
@@ -48,20 +47,27 @@
#include <coreplugin/messagemanager.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/uniqueidmanager.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <cppeditor/cppeditorconstants.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/session.h>
#include <texteditor/basetexteditor.h>
#include <texteditor/basetextmark.h>
#include <texteditor/itexteditor.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/basetexteditor.h>
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
#include <QtCore/qplugin.h>
#include <QtCore/QObject>
#include <QtCore/QPoint>
#include <QtCore/QSettings>
#include <QtGui/QPlainTextEdit>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
...
...
src/plugins/debugger/gdbengine.cpp
View file @
18b3d258
...
...
@@ -37,7 +37,6 @@
#include "debuggermanager.h"
#include "gdbmi.h"
#include "procinterrupt.h"
#include "qtcassert.h"
#include "disassemblerhandler.h"
#include "breakhandler.h"
...
...
@@ -49,6 +48,8 @@
#include "startexternaldialog.h"
#include "attachexternaldialog.h"
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
...
...
src/plugins/debugger/gdbmi.cpp
View file @
18b3d258
...
...
@@ -32,10 +32,10 @@
***************************************************************************/
#include "gdbmi.h"
#include "qtcassert.h"
#include <utils/qtcassert.h>
#include <QtCore/QByteArray>
#include <QtCore/QDebug>
#include <QtCore/QTextStream>
namespace
Debugger
{
...
...
src/plugins/debugger/mode.cpp
View file @
18b3d258
...
...
@@ -35,7 +35,6 @@
#include "debuggerconstants.h"
#include "debuggermanager.h"
#include "qtcassert.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
...
...
@@ -48,10 +47,14 @@
#include <coreplugin/outputpane.h>
#include <coreplugin/navigationwidget.h>
#include <coreplugin/rightpane.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
#include <QtCore/QSettings>
#include <QtGui/QDockWidget>
#include <QtGui/QLabel>
#include <QtGui/QMainWindow>
...
...
src/plugins/debugger/scriptengine.cpp
View file @
18b3d258
...
...
@@ -33,19 +33,18 @@
#include "scriptengine.h"
#include "qtcassert.h"
#include "attachexternaldialog.h"
#include "breakhandler.h"
#include "debuggerconstants.h"
#include "debuggermanager.h"
#include "disassemblerhandler.h"
#include "breakhandler.h"
#include "moduleshandler.h"
#include "registerhandler.h"
#include "stackhandler.h"
#include "startexternaldialog.h"
#include "watchhandler.h"
#include "startexternaldialog.h"
#include "attachexternaldialog.h"
#include <utils/qtcassert.h>
#include <QtCore/QDateTime>
#include <QtCore/QDebug>
...
...
src/plugins/debugger/stackhandler.cpp
View file @
18b3d258
...
...
@@ -33,7 +33,7 @@
#include "stackhandler.h"
#include
"
qtcassert.h
"
#include
<utils/
qtcassert.h
>
#include <QtCore/QAbstractTableModel>
#include <QtCore/QDebug>
...
...
src/plugins/debugger/watchhandler.cpp
View file @
18b3d258
...
...
@@ -37,7 +37,7 @@
#include "modeltest.h"
#endif
#include
"
qtcassert.h
"
#include
<utils/
qtcassert.h
>
#include <QtCore/QDebug>
#include <QtCore/QEvent>
...
...
src/plugins/projectexplorer/projectnodes.cpp
View file @
18b3d258
...
...
@@ -314,8 +314,8 @@ void ProjectNode::addProjectNodes(const QList<ProjectNode*> &subProjects)
emit
watcher
->
foldersAboutToBeAdded
(
this
,
folderNodes
);
foreach
(
ProjectNode
*
project
,
subProjects
)
{
Q_ASSERT
_X
(
!
project
->
parentFolderNode
(),
"addProjectNodes"
,
"Project node has already a parent"
);
Q
TC
_ASSERT
(
!
project
->
parentFolderNode
(),
qDebug
(
"Project node has already a parent"
)
)
;
project
->
setParentFolderNode
(
this
);
foreach
(
NodesWatcher
*
watcher
,
m_watchers
)
project
->
registerWatcher
(
watcher
);
...
...
@@ -353,13 +353,13 @@ void ProjectNode::removeProjectNodes(const QList<ProjectNode*> &subProjects)
for
(;
toRemoveIter
!=
toRemove
.
constEnd
();
++
toRemoveIter
)
{
while
((
*
projectIter
)
->
path
()
!=
(
*
toRemoveIter
)
->
path
())
{
++
projectIter
;
Q_ASSERT
_X
(
projectIter
!=
m_subProjectNodes
.
end
(),
"removeProjectNodes"
,
"Project to remove is not part of specified folder!"
);
Q
TC
_ASSERT
(
projectIter
!=
m_subProjectNodes
.
end
(),
qDebug
(
"Project to remove is not part of specified folder!"
)
)
;
}
while
((
*
folderIter
)
->
path
()
!=
(
*
toRemoveIter
)
->
path
())
{
++
folderIter
;
Q_ASSERT
_X
(
folderIter
!=
m_subFolderNodes
.
end
(),
"removeProjectNodes"
,
"Project to remove is not part of specified folder!"
);
Q
TC
_ASSERT
(
folderIter
!=
m_subFolderNodes
.
end
(),
qDebug
(
"Project to remove is not part of specified folder!"
)
)
;
}
delete
*
projectIter
;
projectIter
=
m_subProjectNodes
.
erase
(
projectIter
);
...
...
@@ -386,15 +386,15 @@ void ProjectNode::addFolderNodes(const QList<FolderNode*> &subFolders, FolderNod
watcher
->
foldersAboutToBeAdded
(
parentFolder
,
subFolders
);
foreach
(
FolderNode
*
folder
,
subFolders
)
{
Q_ASSERT
_X
(
!
folder
->
parentFolderNode
(),
"addFolderNodes"
,
"Project node has already a parent folder"
);
Q
TC
_ASSERT
(
!
folder
->
parentFolderNode
(),
qDebug
(
"Project node has already a parent folder"
)
)
;
folder
->
setParentFolderNode
(
parentFolder
);
folder
->
setProjectNode
(
this
);
parentFolder
->
m_subFolderNodes
.
append
(
folder
);
// project nodes have to be added via addProjectNodes
Q_ASSERT
_X
(
folder
->
nodeType
()
!=
ProjectNodeType
,
"addFolderNodes"
,
"project nodes have to be added via addProjectNodes"
);
Q
TC
_ASSERT
(
folder
->
nodeType
()
!=
ProjectNodeType
,
qDebug
(
"project nodes have to be added via addProjectNodes"
)
)
;
}
qSort
(
parentFolder
->
m_subFolderNodes
.
begin
(),
parentFolder
->
m_subFolderNodes
.
end
(),
sortNodesByPath
);
...
...
@@ -427,12 +427,12 @@ void ProjectNode::removeFolderNodes(const QList<FolderNode*> &subFolders,
QList
<
FolderNode
*>::
const_iterator
toRemoveIter
=
toRemove
.
constBegin
();
QList
<
FolderNode
*>::
iterator
folderIter
=
parentFolder
->
m_subFolderNodes
.
begin
();
for
(;
toRemoveIter
!=
toRemove
.
constEnd
();
++
toRemoveIter
)
{
Q_ASSERT
_X
(
((
*
toRemoveIter
)
->
nodeType
()
!=
ProjectNodeType
),
"removeFolderNodes"
,
"project nodes have to be removed via removeProjectNodes"
);
Q
TC
_ASSERT
((
*
toRemoveIter
)
->
nodeType
()
!=
ProjectNodeType
,
qDebug
(
"project nodes have to be removed via removeProjectNodes"
)
)
;
while
((
*
folderIter
)
->
path
()
!=
(
*
toRemoveIter
)
->
path
())
{
++
folderIter
;
Q_ASSERT
_X
(
folderIter
!=
parentFolder
->
m_subFolderNodes
.
end
(),
"removeFileNodes"
,
"Folder to remove is not part of specified folder!"
);
Q
TC
_ASSERT
(
folderIter
!=
parentFolder
->
m_subFolderNodes
.
end
(),
qDebug
(
"Folder to remove is not part of specified folder!"
)
)
;
}
delete
*
folderIter
;
folderIter
=
parentFolder
->
m_subFolderNodes
.
erase
(
folderIter
);
...
...
@@ -460,8 +460,8 @@ void ProjectNode::addFileNodes(const QList<FileNode*> &files, FolderNode *folder
emit
watcher
->
filesAboutToBeAdded
(
folder
,
files
);
foreach
(
FileNode
*
file
,
files
)
{
Q_ASSERT
_X
(
!
file
->
parentFolderNode
(),
"addFileNodes"
,
"File node has already a parent folder"
);
Q
TC
_ASSERT
(
!
file
->
parentFolderNode
(),
qDebug
(
"File node has already a parent folder"
)
)
;
file
->
setParentFolderNode
(
folder
);
file
->
setProjectNode
(
this
);
...
...
@@ -499,8 +499,8 @@ void ProjectNode::removeFileNodes(const QList<FileNode*> &files, FolderNode *fol
for
(;
toRemoveIter
!=
toRemove
.
constEnd
();
++
toRemoveIter
)
{
while
((
*
filesIter
)
->
path
()
!=
(
*
toRemoveIter
)
->
path
())
{
++
filesIter
;
Q_ASSERT
_X
(
filesIter
!=
folder
->
m_fileNodes
.
end
(),
"removeFileNodes"
,
"File to remove is not part of specified folder!"
);
Q
TC
_ASSERT
(
filesIter
!=
folder
->
m_fileNodes
.
end
(),
qDebug
(
"File to remove is not part of specified folder!"
)
)
;
}
delete
*
filesIter
;
filesIter
=
folder
->
m_fileNodes
.
erase
(
filesIter
);
...
...
@@ -591,8 +591,8 @@ void SessionNode::addProjectNodes(const QList<ProjectNode*> &projectNodes)
emit
watcher
->
foldersAboutToBeAdded
(
this
,
folderNodes
);
foreach
(
ProjectNode
*
project
,
projectNodes
)
{
Q_ASSERT
_X
(
!
project
->
parentFolderNode
(),
"addProjectNodes"
,
"Project node has already a parent folder"
);
Q
TC
_ASSERT
(
!
project
->
parentFolderNode
(),
qDebug
(
"Project node has already a parent folder"
)
)
;
project
->
setParentFolderNode
(
this
);
foreach
(
NodesWatcher
*
watcher
,
m_watchers
)
project
->
registerWatcher
(
watcher
);
...
...
@@ -621,13 +621,13 @@ void SessionNode::removeProjectNodes(const QList<ProjectNode*> &projectNodes)
for
(;
toRemoveIter
!=
toRemove
.
constEnd
();
++
toRemoveIter
)
{
while
((
*
projectIter
)
->
path
()
!=
(
*
toRemoveIter
)
->
path
())
{
++
projectIter
;
Q_ASSERT
_X
(
projectIter
!=
m_projectNodes
.
end
(),
"removeProjectNodes"
,
"Project to remove is not part of specified folder!"
);
Q
TC
_ASSERT
(
projectIter
!=
m_projectNodes
.
end
(),
qDebug
(
"Project to remove is not part of specified folder!"
)
)
;
}
while
((
*
folderIter
)
->
path
()
!=
(
*
toRemoveIter
)
->
path
())
{
++
folderIter
;
Q_ASSERT
_X
(
folderIter
!=
m_subFolderNodes
.
end
(),
"removeProjectNodes"
,
"Project to remove is not part of specified folder!"
);
Q
TC
_ASSERT
(
folderIter
!=
m_subFolderNodes
.
end
(),
qDebug
(
"Project to remove is not part of specified folder!"
)
)
;
}
projectIter
=
m_projectNodes
.
erase
(
projectIter
);
folderIter
=
m_subFolderNodes
.
erase
(
folderIter
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment