diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:56:07 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:56:07 +0000 |
commit | d6f8bbb45b267065a6907e71ff9c98bb6d161241 (patch) | |
tree | d109539636691d7b03036ca1c0ed29dbae6577cf /languages/cpp/debugger/mi | |
parent | 3331a47a9cad24795c7440ee8107143ce444ef34 (diff) | |
download | tdevelop-d6f8bbb45b267065a6907e71ff9c98bb6d161241.tar.gz tdevelop-d6f8bbb45b267065a6907e71ff9c98bb6d161241.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/cpp/debugger/mi')
-rw-r--r-- | languages/cpp/debugger/mi/gdbmi.cpp | 16 | ||||
-rw-r--r-- | languages/cpp/debugger/mi/gdbmi.h | 38 | ||||
-rw-r--r-- | languages/cpp/debugger/mi/milexer.cpp | 4 | ||||
-rw-r--r-- | languages/cpp/debugger/mi/milexer.h | 24 | ||||
-rw-r--r-- | languages/cpp/debugger/mi/miparser.cpp | 10 | ||||
-rw-r--r-- | languages/cpp/debugger/mi/miparser.h | 6 |
6 files changed, 49 insertions, 49 deletions
diff --git a/languages/cpp/debugger/mi/gdbmi.cpp b/languages/cpp/debugger/mi/gdbmi.cpp index fa27355f..27f90284 100644 --- a/languages/cpp/debugger/mi/gdbmi.cpp +++ b/languages/cpp/debugger/mi/gdbmi.cpp @@ -28,7 +28,7 @@ type_error::type_error() : std::logic_error("MI type error") {} -QString Value::literal() const +TQString Value::literal() const { throw type_error(); } @@ -38,12 +38,12 @@ int Value::toInt(int /*base*/) const throw type_error(); } -bool Value::hasField(const QString&) const +bool Value::hasField(const TQString&) const { throw type_error(); } -const Value& Value::operator[](const QString&) const +const Value& Value::operator[](const TQString&) const { throw type_error(); } @@ -64,7 +64,7 @@ const Value& Value::operator[](unsigned) const throw type_error(); } -QString StringLiteralValue::literal() const +TQString StringLiteralValue::literal() const { return literal_; } @@ -80,16 +80,16 @@ int StringLiteralValue::toInt(int base) const TupleValue::~TupleValue() { - for (QValueListIterator<Result*> it=results.begin(); it!=results.end(); ++it) + for (TQValueListIterator<Result*> it=results.begin(); it!=results.end(); ++it) delete *it; } -bool TupleValue::hasField(const QString& variable) const +bool TupleValue::hasField(const TQString& variable) const { return results_by_name.count(variable); } -const Value& TupleValue::operator[](const QString& variable) const +const Value& TupleValue::operator[](const TQString& variable) const { if (results_by_name.count(variable)) return *results_by_name[variable]->value; @@ -99,7 +99,7 @@ const Value& TupleValue::operator[](const QString& variable) const ListValue::~ListValue() { - for (QValueListIterator<Result*> it=results.begin(); it!=results.end(); ++it) + for (TQValueListIterator<Result*> it=results.begin(); it!=results.end(); ++it) delete *it; } diff --git a/languages/cpp/debugger/mi/gdbmi.h b/languages/cpp/debugger/mi/gdbmi.h index 667246a0..64252ee5 100644 --- a/languages/cpp/debugger/mi/gdbmi.h +++ b/languages/cpp/debugger/mi/gdbmi.h @@ -22,9 +22,9 @@ #ifndef GDBMI_H #define GDBMI_H -#include <qstring.h> -#include <qvaluelist.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqmap.h> #include <stdexcept> @@ -94,7 +94,7 @@ namespace GDBMI /** If this value is a string literals, returns the string value. Othewise, throws type_error. */ - virtual QString literal() const; + virtual TQString literal() const; /** If the value is a string literal, converts it to int and returns. If conversion fails, or the value cannot be @@ -106,7 +106,7 @@ namespace GDBMI has a field named 'variable'. Otherwise, throws type_error. */ - virtual bool hasField(const QString& variable) const; + virtual bool hasField(const TQString& variable) const; /** If this value is a tuple, and contains named field 'variable', returns it. Otherwise, throws 'type_error'. @@ -114,7 +114,7 @@ namespace GDBMI we can save on casting, when we know for sure that instance is TupleValue, or ListValue. */ - virtual const Value& operator[](const QString& variable) const; + virtual const Value& operator[](const TQString& variable) const; /** If this value is a list, returns true if the list is empty. If this value is not a list, throws 'type_error'. @@ -140,22 +140,22 @@ namespace GDBMI Result() : value(0) {} ~Result() { delete value; value = 0; } - QString variable; + TQString variable; Value *value; }; struct StringLiteralValue : public Value { - StringLiteralValue(const QString &lit) + StringLiteralValue(const TQString &lit) : literal_(lit) { Value::kind = StringLiteral; } public: // Value overrides - QString literal() const; + TQString literal() const; int toInt(int base) const; private: - QString literal_; + TQString literal_; }; struct TupleValue : public Value @@ -163,12 +163,12 @@ namespace GDBMI TupleValue() { Value::kind = Tuple; } ~TupleValue(); - bool hasField(const QString&) const; - const Value& operator[](const QString& variable) const; + bool hasField(const TQString&) const; + const Value& operator[](const TQString& variable) const; - QValueList<Result*> results; - QMap<QString, GDBMI::Result*> results_by_name; + TQValueList<Result*> results; + TQMap<TQString, GDBMI::Result*> results_by_name; }; struct ListValue : public Value @@ -182,14 +182,14 @@ namespace GDBMI const Value& operator[](unsigned index) const; - QValueList<Result*> results; + TQValueList<Result*> results; }; struct Record { virtual ~Record() {} - virtual QString toString() const { Q_ASSERT( 0 ); return QString::null; } + virtual TQString toString() const { Q_ASSERT( 0 ); return TQString::null; } enum { Prompt, Stream, Result } kind; }; @@ -198,14 +198,14 @@ namespace GDBMI { ResultRecord() { Record::kind = Result; } - QString reason; + TQString reason; }; struct PromptRecord : public Record { inline PromptRecord() { Record::kind = Prompt; } - virtual QString toString() const + virtual TQString toString() const { return "(prompt)\n"; } }; @@ -214,7 +214,7 @@ namespace GDBMI inline StreamRecord() : reason(0) { Record::kind = Stream; } char reason; - QString message; + TQString message; }; } diff --git a/languages/cpp/debugger/mi/milexer.cpp b/languages/cpp/debugger/mi/milexer.cpp index 847733ad..7813d091 100644 --- a/languages/cpp/debugger/mi/milexer.cpp +++ b/languages/cpp/debugger/mi/milexer.cpp @@ -281,10 +281,10 @@ void TokenStream::positionAt(int position, int *line, int *column) const Q_ASSERT( *column >= 0 ); } -QCString TokenStream::tokenText(int index) const +TQCString TokenStream::tokenText(int index) const { Token *t = index < 0 ? m_currentToken : m_firstToken + index; const char* data = m_contents; - return QCString(data + t->position, t->length+1); + return TQCString(data + t->position, t->length+1); } diff --git a/languages/cpp/debugger/mi/milexer.h b/languages/cpp/debugger/mi/milexer.h index 8f39820c..8f07ba58 100644 --- a/languages/cpp/debugger/mi/milexer.h +++ b/languages/cpp/debugger/mi/milexer.h @@ -20,9 +20,9 @@ #ifndef MILEXER_H #define MILEXER_H -#include <qmemarray.h> -#include <qmap.h> -#include <qstring.h> +#include <tqmemarray.h> +#include <tqmap.h> +#include <tqstring.h> class MILexer; class TokenStream; @@ -38,7 +38,7 @@ struct Token struct FileSymbol { - QCString contents; + TQCString contents; TokenStream *tokenStream; inline FileSymbol() @@ -55,10 +55,10 @@ struct TokenStream inline int currentToken() const { return m_currentToken->kind; } - inline QCString currentTokenText() const + inline TQCString currentTokenText() const { return tokenText(-1); } - QCString tokenText(int index = 0) const; + TQCString tokenText(int index = 0) const; inline int lineOffset(int line) const { return m_lines.at(line); } @@ -84,12 +84,12 @@ struct TokenStream { m_currentToken++; m_cursor++; } //private: - QCString m_contents; + TQCString m_contents; - QMemArray<int> m_lines; + TQMemArray<int> m_lines; int m_line; - QMemArray<Token> m_tokens; + TQMemArray<Token> m_tokens; int m_tokensCount; Token *m_firstToken; @@ -123,15 +123,15 @@ private: static bool s_initialized; static scan_fun_ptr s_scan_table[128 + 1]; - QCString m_contents; + TQCString m_contents; int m_ptr; // Cached 'm_contents.length()' int m_length; - QMemArray<int> m_lines; + TQMemArray<int> m_lines; int m_line; - QMemArray<Token> m_tokens; + TQMemArray<Token> m_tokens; int m_tokensCount; int m_cursor; diff --git a/languages/cpp/debugger/mi/miparser.cpp b/languages/cpp/debugger/mi/miparser.cpp index 252c4e1b..fdd16137 100644 --- a/languages/cpp/debugger/mi/miparser.cpp +++ b/languages/cpp/debugger/mi/miparser.cpp @@ -125,7 +125,7 @@ bool MIParser::parseResultRecord(Record *&record) lex->nextToken(); MATCH(Token_identifier); - QString reason = lex->currentTokenText(); + TQString reason = lex->currentTokenText(); lex->nextToken(); std::auto_ptr<ResultRecord> res(new ResultRecord); @@ -148,7 +148,7 @@ bool MIParser::parseResultRecord(Record *&record) bool MIParser::parseResult(Result *&result) { MATCH(Token_identifier); - QString variable = lex->currentTokenText(); + TQString variable = lex->currentTokenText(); lex->nextToken(); std::auto_ptr<Result> res(new Result); @@ -289,12 +289,12 @@ bool MIParser::parseCSV(GDBMI::TupleValue& value, } -QString MIParser::parseStringLiteral() +TQString MIParser::parseStringLiteral() { - QCString message = lex->currentTokenText(); + TQCString message = lex->currentTokenText(); unsigned int length = message.length(); - QString message2; + TQString message2; message2.setLength(length); // The [1,length-1] range removes quotes without extra // call to 'mid' diff --git a/languages/cpp/debugger/mi/miparser.h b/languages/cpp/debugger/mi/miparser.h index b11ba504..9bea70b2 100644 --- a/languages/cpp/debugger/mi/miparser.h +++ b/languages/cpp/debugger/mi/miparser.h @@ -23,8 +23,8 @@ #include "milexer.h" #include "gdbmi.h" -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> /** @author Roberto Raggi @@ -70,7 +70,7 @@ protected: // rules in the string. @pre lex->lookAhead(0) == Token_string_literal */ - QString parseStringLiteral(); + TQString parseStringLiteral(); |