summaryrefslogtreecommitdiffstats
path: root/languages/cpp/debugger/mi
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
commit48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /languages/cpp/debugger/mi
parent7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
downloadtdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz
tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/cpp/debugger/mi')
-rw-r--r--languages/cpp/debugger/mi/gdbmi.h2
-rw-r--r--languages/cpp/debugger/mi/milexer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/languages/cpp/debugger/mi/gdbmi.h b/languages/cpp/debugger/mi/gdbmi.h
index 64252ee5..03985958 100644
--- a/languages/cpp/debugger/mi/gdbmi.h
+++ b/languages/cpp/debugger/mi/gdbmi.h
@@ -189,7 +189,7 @@ namespace GDBMI
struct Record
{
virtual ~Record() {}
- virtual TQString toString() const { Q_ASSERT( 0 ); return TQString::null; }
+ virtual TQString toString() const { Q_ASSERT( 0 ); return TQString(); }
enum { Prompt, Stream, Result } kind;
};
diff --git a/languages/cpp/debugger/mi/milexer.cpp b/languages/cpp/debugger/mi/milexer.cpp
index 7813d091..74b8eda9 100644
--- a/languages/cpp/debugger/mi/milexer.cpp
+++ b/languages/cpp/debugger/mi/milexer.cpp
@@ -275,7 +275,7 @@ void TokenStream::positionAt(int position, int *line, int *column) const
len = half;
}
- *line = QMAX(first - 1, 0);
+ *line = TQMAX(first - 1, 0);
*column = position - m_lines.at(*line);
Q_ASSERT( *column >= 0 );