Commit 56133d4f authored by hjk's avatar hjk
Browse files

move plugins/debugger/assert.h -> /libs/utils/qtcassert.h

parent 756de96d
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
** **
***************************************************************************/ ***************************************************************************/
#ifndef DEBUGGER_QTC_ASSERT_H #ifndef QTC_ASSERT_H
#define DEBUGGER_QTC_ASSERT_H #define QTC_ASSERT_H
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
#define QTC_ASSERT(cond, action) \ #define QTC_ASSERT(cond, action) \
...@@ -42,5 +42,5 @@ ...@@ -42,5 +42,5 @@
if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED";action;} if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED";action;}
#endif #endif
#endif // DEBUGGER_QTC_ASSERT_H #endif // QTC_ASSERT_H
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include "breakhandler.h" #include "breakhandler.h"
#include "assert.h"
#include "imports.h" // TextEditor::BaseTextMark #include "imports.h" // TextEditor::BaseTextMark
#include "qtcassert.h"
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
......
...@@ -10,11 +10,12 @@ include(../../plugins/texteditor/texteditor.pri) ...@@ -10,11 +10,12 @@ include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/cpptools/cpptools.pri) include(../../plugins/cpptools/cpptools.pri)
include(../../libs/cplusplus/cplusplus.pri) include(../../libs/cplusplus/cplusplus.pri)
INCLUDEPATH += ../../libs/utils
# DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII # DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
QT += gui network script QT += gui network script
HEADERS += assert.h \ HEADERS += attachexternaldialog.h \
attachexternaldialog.h \
attachremotedialog.h \ attachremotedialog.h \
breakhandler.h \ breakhandler.h \
breakwindow.h \ breakwindow.h \
......
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
#include "debuggerplugin.h" #include "debuggerplugin.h"
#include "assert.h"
#include "debuggerconstants.h" #include "debuggerconstants.h"
#include "debuggermanager.h" #include "debuggermanager.h"
#include "debuggerrunner.h" #include "debuggerrunner.h"
#include "gdboptionpage.h" #include "gdboptionpage.h"
#include "gdbengine.h" #include "gdbengine.h"
#include "mode.h" #include "mode.h"
#include "qtcassert.h"
#include <coreplugin/actionmanager/actionmanagerinterface.h> #include <coreplugin/actionmanager/actionmanagerinterface.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include "debuggerrunner.h" #include "debuggerrunner.h"
#include "assert.h"
#include "debuggermanager.h" #include "debuggermanager.h"
#include "qtcassert.h"
#include <projectexplorer/applicationrunconfiguration.h> #include <projectexplorer/applicationrunconfiguration.h>
#include <projectexplorer/environment.h> #include <projectexplorer/environment.h>
......
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
#include "gdbengine.h" #include "gdbengine.h"
#include "assert.h"
#include "debuggerconstants.h" #include "debuggerconstants.h"
#include "debuggermanager.h" #include "debuggermanager.h"
#include "gdbmi.h" #include "gdbmi.h"
#include "procinterrupt.h" #include "procinterrupt.h"
#include "qtcassert.h"
#include "disassemblerhandler.h" #include "disassemblerhandler.h"
#include "breakhandler.h" #include "breakhandler.h"
......
...@@ -34,6 +34,9 @@ ...@@ -34,6 +34,9 @@
#ifndef DEBUGGER_GDBENGINE_H #ifndef DEBUGGER_GDBENGINE_H
#define DEBUGGER_GDBENGINE_H #define DEBUGGER_GDBENGINE_H
#include "idebuggerengine.h"
#include "gdbmi.h"
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QMap> #include <QtCore/QMap>
...@@ -48,9 +51,6 @@ class QAbstractItemModel; ...@@ -48,9 +51,6 @@ class QAbstractItemModel;
class QWidget; class QWidget;
QT_END_NAMESPACE QT_END_NAMESPACE
#include "idebuggerengine.h"
#include "gdbmi.h"
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
***************************************************************************/ ***************************************************************************/
#include "gdbmi.h" #include "gdbmi.h"
#include "assert.h" #include "qtcassert.h"
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QDebug> #include <QtCore/QDebug>
......
...@@ -36,6 +36,11 @@ ...@@ -36,6 +36,11 @@
#include <QtCore/QObject> #include <QtCore/QObject>
QT_BEGIN_NAMESPACE
class QPoint;
class QString;
QT_END_NAMESPACE
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
#include "mode.h" #include "mode.h"
#include "assert.h"
#include "debuggerconstants.h" #include "debuggerconstants.h"
#include "debuggermanager.h" #include "debuggermanager.h"
#include "qtcassert.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "scriptengine.h" #include "scriptengine.h"
#include "assert.h" #include "qtcassert.h"
#include "debuggerconstants.h" #include "debuggerconstants.h"
#include "debuggermanager.h" #include "debuggermanager.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "stackhandler.h" #include "stackhandler.h"
#include "assert.h" #include "qtcassert.h"
#include <QtCore/QAbstractTableModel> #include <QtCore/QAbstractTableModel>
#include <QtCore/QDebug> #include <QtCore/QDebug>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "modeltest.h" #include "modeltest.h"
#endif #endif
#include "assert.h" #include "qtcassert.h"
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QEvent> #include <QtCore/QEvent>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment