From 56133d4f4f3d0910abca1d3fa586f7c74882f3d9 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 9 Dec 2008 12:27:55 +0100
Subject: [PATCH] move plugins/debugger/assert.h -> /libs/utils/qtcassert.h

---
 src/{plugins/debugger/assert.h => libs/utils/qtcassert.h} | 6 +++---
 src/plugins/debugger/breakhandler.cpp                     | 2 +-
 src/plugins/debugger/debugger.pro                         | 5 +++--
 src/plugins/debugger/debuggerplugin.cpp                   | 2 +-
 src/plugins/debugger/debuggerrunner.cpp                   | 2 +-
 src/plugins/debugger/gdbengine.cpp                        | 2 +-
 src/plugins/debugger/gdbengine.h                          | 6 +++---
 src/plugins/debugger/gdbmi.cpp                            | 2 +-
 src/plugins/debugger/idebuggerengine.h                    | 5 +++++
 src/plugins/debugger/mode.cpp                             | 2 +-
 src/plugins/debugger/scriptengine.cpp                     | 2 +-
 src/plugins/debugger/stackhandler.cpp                     | 2 +-
 src/plugins/debugger/watchhandler.cpp                     | 2 +-
 13 files changed, 23 insertions(+), 17 deletions(-)
 rename src/{plugins/debugger/assert.h => libs/utils/qtcassert.h} (94%)

diff --git a/src/plugins/debugger/assert.h b/src/libs/utils/qtcassert.h
similarity index 94%
rename from src/plugins/debugger/assert.h
rename to src/libs/utils/qtcassert.h
index 4989dba6c26..538d906f827 100644
--- a/src/plugins/debugger/assert.h
+++ b/src/libs/utils/qtcassert.h
@@ -31,8 +31,8 @@
 **
 ***************************************************************************/
 
-#ifndef DEBUGGER_QTC_ASSERT_H
-#define DEBUGGER_QTC_ASSERT_H
+#ifndef QTC_ASSERT_H
+#define QTC_ASSERT_H
 
 #ifdef Q_OS_UNIX
 #define QTC_ASSERT(cond, action) \
@@ -42,5 +42,5 @@
     if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED";action;}
 #endif
 
-#endif // DEBUGGER_QTC_ASSERT_H
+#endif // QTC_ASSERT_H
 
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index b4e7239cc2e..926568517da 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/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>
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index d21eb7cdc01..6b8c2e74ca4 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/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 \
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 68792675b89..03f86bec249 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/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>
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 510bace05d4..21da78fae9f 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/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>
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index 6eb2f4a4261..13af8e3075b 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/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"
diff --git a/src/plugins/debugger/gdbengine.h b/src/plugins/debugger/gdbengine.h
index b3e13233526..56106a75244 100644
--- a/src/plugins/debugger/gdbengine.h
+++ b/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 {
 
diff --git a/src/plugins/debugger/gdbmi.cpp b/src/plugins/debugger/gdbmi.cpp
index 587e7c48315..3beadc385fa 100644
--- a/src/plugins/debugger/gdbmi.cpp
+++ b/src/plugins/debugger/gdbmi.cpp
@@ -32,7 +32,7 @@
 ***************************************************************************/
 
 #include "gdbmi.h"
-#include "assert.h"
+#include "qtcassert.h"
 
 #include <QtCore/QByteArray>
 #include <QtCore/QDebug>
diff --git a/src/plugins/debugger/idebuggerengine.h b/src/plugins/debugger/idebuggerengine.h
index 22ed3ca1845..8c7f2d2b2e8 100644
--- a/src/plugins/debugger/idebuggerengine.h
+++ b/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 {
 
diff --git a/src/plugins/debugger/mode.cpp b/src/plugins/debugger/mode.cpp
index 92bd6fb9b2b..c1bbdd550f1 100644
--- a/src/plugins/debugger/mode.cpp
+++ b/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>
diff --git a/src/plugins/debugger/scriptengine.cpp b/src/plugins/debugger/scriptengine.cpp
index 00b37c8e368..50f9dcdf4e2 100644
--- a/src/plugins/debugger/scriptengine.cpp
+++ b/src/plugins/debugger/scriptengine.cpp
@@ -33,7 +33,7 @@
 
 #include "scriptengine.h"
 
-#include "assert.h"
+#include "qtcassert.h"
 #include "debuggerconstants.h"
 #include "debuggermanager.h"
 
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index 870a24e2bd4..818b6b61888 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -33,7 +33,7 @@
 
 #include "stackhandler.h"
 
-#include "assert.h"
+#include "qtcassert.h"
 
 #include <QtCore/QAbstractTableModel>
 #include <QtCore/QDebug>
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index ba239e170f2..e03c91f7100 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/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>
-- 
GitLab