From 3cd4e3987258385b3c3d8f2c2be0a12413994031 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 17 Feb 2009 11:16:23 +0100
Subject: [PATCH]     Fixes:    debugger: fix assert includes

---
 src/plugins/debugger/cdbdebugengine.cpp      | 5 +++--
 src/plugins/debugger/disassemblerhandler.cpp | 2 +-
 src/plugins/debugger/moduleshandler.cpp      | 2 +-
 src/plugins/debugger/registerhandler.cpp     | 3 ++-
 src/plugins/debugger/stackwindow.cpp         | 3 ++-
 src/plugins/debugger/threadswindow.cpp       | 3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/plugins/debugger/cdbdebugengine.cpp b/src/plugins/debugger/cdbdebugengine.cpp
index c7555af17c8..f7e8c6cb560 100644
--- a/src/plugins/debugger/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdbdebugengine.cpp
@@ -1,10 +1,11 @@
 #include "cdbdebugengine.h"
 
-#include "assert.h"
 #include "debuggermanager.h"
 #include "breakhandler.h"
 #include "stackhandler.h"
 
+#include <utils/qtcassert.h>
+
 #include <QDebug>
 #include <QTimerEvent>
 #include <QFileInfo>
@@ -271,7 +272,7 @@ void CdbDebugEngine::activateFrame(int frameIndex)
     //qDebug() << "ACTIVATE FRAME: " << frameIndex << oldIndex
     //    << stackHandler->currentIndex();
 
-    QWB_ASSERT(frameIndex < stackHandler->stackSize(), return);
+    QTC_ASSERT(frameIndex < stackHandler->stackSize(), return);
 
     if (oldIndex != frameIndex) {
         stackHandler->setCurrentIndex(frameIndex);
diff --git a/src/plugins/debugger/disassemblerhandler.cpp b/src/plugins/debugger/disassemblerhandler.cpp
index ff935dabfdf..59ca259e80e 100644
--- a/src/plugins/debugger/disassemblerhandler.cpp
+++ b/src/plugins/debugger/disassemblerhandler.cpp
@@ -33,7 +33,7 @@
 
 #include "disassemblerhandler.h"
 
-#include "assert.h"
+#include <utils/qtcassert.h>
 
 #include <QtCore/QDebug>
 #include <QtCore/QAbstractTableModel>
diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp
index e87c92a73d2..a49e87495ec 100644
--- a/src/plugins/debugger/moduleshandler.cpp
+++ b/src/plugins/debugger/moduleshandler.cpp
@@ -33,7 +33,7 @@
 
 #include "moduleshandler.h"
 
-#include "assert.h"
+#include <utils/qtcassert.h>
 
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index e594326009a..9300e5a4df7 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -33,9 +33,10 @@
 
 #include "registerhandler.h"
 
-#include "assert.h"
 #include "debuggerconstants.h"
 
+#include <utils/qtcassert.h>
+
 #include <QtCore/QAbstractTableModel>
 #include <QtCore/QDebug>
 
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index d40f8a3c5ff..8b33b08ae7c 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -33,9 +33,10 @@
 
 #include "stackwindow.h"
 
-#include "assert.h"
 #include "stackhandler.h"
 
+#include <utils/qtcassert.h>
+
 #include <QAction>
 #include <QComboBox>
 #include <QDebug>
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index bf418cd0fc5..5d49e5dc798 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -33,9 +33,10 @@
 
 #include "threadswindow.h"
 
-#include "assert.h"
 #include "stackhandler.h"
 
+#include <utils/qtcassert.h>
+
 #include <QAction>
 #include <QComboBox>
 #include <QDebug>
-- 
GitLab