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

src/plugins/debugger/assert.h

@@ -1,46 +0,0 @@
-/***************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact:  Qt Software Information (qt-info@nokia.com)
-**
-**
-** Non-Open Source Usage
-**
-** Licensees may use this file in accordance with the Qt Beta Version
-** License Agreement, Agreement version 2.2 provided with the Software or,
-** alternatively, in accordance with the terms contained in a written
-** agreement between you and Nokia.
-**
-** GNU General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the packaging
-** of this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-**
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
-**
-***************************************************************************/
-
-#ifndef DEBUGGER_QTC_ASSERT_H
-#define DEBUGGER_QTC_ASSERT_H
-
-#ifdef Q_OS_UNIX
-#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 // DEBUGGER_QTC_ASSERT_H
-

src/plugins/debugger/breakhandler.cpp

@@ -33,8 +33,8 @@
 
 #include "breakhandler.h"
 
-#include "assert.h"
 #include "imports.h" // TextEditor::BaseTextMark
+#include "qtcassert.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QFileInfo>

src/plugins/debugger/debugger.pro

@@ -10,11 +10,12 @@ 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
 
-HEADERS += assert.h \
-    attachexternaldialog.h \
+HEADERS += attachexternaldialog.h \
     attachremotedialog.h \
     breakhandler.h \
     breakwindow.h \

src/plugins/debugger/debuggerplugin.cpp

@@ -33,13 +33,13 @@
 
 #include "debuggerplugin.h"
 
-#include "assert.h"
 #include "debuggerconstants.h"
 #include "debuggermanager.h"
 #include "debuggerrunner.h"
 #include "gdboptionpage.h"
 #include "gdbengine.h"
 #include "mode.h"
+#include "qtcassert.h"
 
 #include <coreplugin/actionmanager/actionmanagerinterface.h>
 #include <coreplugin/coreconstants.h>

src/plugins/debugger/debuggerrunner.cpp

@@ -33,8 +33,8 @@
 
 #include "debuggerrunner.h"
 
-#include "assert.h"
 #include "debuggermanager.h"
+#include "qtcassert.h"
 
 #include <projectexplorer/applicationrunconfiguration.h>
 #include <projectexplorer/environment.h>

src/plugins/debugger/gdbengine.cpp

@@ -33,11 +33,11 @@
 
 #include "gdbengine.h"
 
-#include "assert.h"
 #include "debuggerconstants.h"
 #include "debuggermanager.h"
 #include "gdbmi.h"
 #include "procinterrupt.h"
+#include "qtcassert.h"
 
 #include "disassemblerhandler.h"
 #include "breakhandler.h"

src/plugins/debugger/gdbengine.h

@@ -34,6 +34,9 @@
 #ifndef DEBUGGER_GDBENGINE_H
 #define DEBUGGER_GDBENGINE_H
 
+#include "idebuggerengine.h"
+#include "gdbmi.h"
+
 #include <QtCore/QByteArray>
 #include <QtCore/QHash>
 #include <QtCore/QMap>
@@ -48,9 +51,6 @@ class QAbstractItemModel;
 class QWidget;
 QT_END_NAMESPACE
 
-#include "idebuggerengine.h"
-#include "gdbmi.h"
-
 namespace Debugger {
 namespace Internal {
 

src/plugins/debugger/gdbmi.cpp

@@ -32,7 +32,7 @@
 ***************************************************************************/
 
 #include "gdbmi.h"
-#include "assert.h"
+#include "qtcassert.h"
 
 #include <QtCore/QByteArray>
 #include <QtCore/QDebug>

src/plugins/debugger/idebuggerengine.h

@@ -36,6 +36,11 @@
 
 #include <QtCore/QObject>
 
+QT_BEGIN_NAMESPACE
+class QPoint;
+class QString;
+QT_END_NAMESPACE
+
 namespace Debugger {
 namespace Internal {
 

src/plugins/debugger/mode.cpp

@@ -33,9 +33,9 @@
 
 #include "mode.h"
 
-#include "assert.h"
 #include "debuggerconstants.h"
 #include "debuggermanager.h"
+#include "qtcassert.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>

src/plugins/debugger/scriptengine.cpp

@@ -33,7 +33,7 @@
 
 #include "scriptengine.h"
 
-#include "assert.h"
+#include "qtcassert.h"
 #include "debuggerconstants.h"
 #include "debuggermanager.h"
 

src/plugins/debugger/stackhandler.cpp

@@ -33,7 +33,7 @@
 
 #include "stackhandler.h"
 
-#include "assert.h"
+#include "qtcassert.h"
 
 #include <QtCore/QAbstractTableModel>
 #include <QtCore/QDebug>

src/plugins/debugger/watchhandler.cpp

@@ -37,7 +37,7 @@
 #include "modeltest.h"
 #endif
 
-#include "assert.h"
+#include "qtcassert.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QEvent>