From 539a1fd1ae6290cc3eec745226c0ce45b02c1545 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- lib/antlr/antlr/AST.hpp | 2 +- lib/antlr/antlr/CharScanner.hpp | 2 +- lib/astyle/ASBeautifier.cpp | 4 ++-- lib/astyle/ASFormatter.cpp | 22 +++++++++++----------- lib/cppparser/macro.h | 16 ++++++++-------- lib/interfaces/hashedstring.cpp | 4 ++-- lib/widgets/flagboxes.cpp | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) (limited to 'lib') diff --git a/lib/antlr/antlr/AST.hpp b/lib/antlr/antlr/AST.hpp index a25144f9..b14b123b 100644 --- a/lib/antlr/antlr/AST.hpp +++ b/lib/antlr/antlr/AST.hpp @@ -151,7 +151,7 @@ extern ANTLR_API RefAST nullAST; extern ANTLR_API AST* const nullASTptr; #ifdef NEEDS_OPERATOR_LESS_THAN -// RK: aptqparently needed by MSVC and a SUN CC, up to and including +// RK: apparently needed by MSVC and a SUN CC, up to and including // 2.7.2 this was undefined ? inline bool operator<( RefAST l, RefAST r ) { diff --git a/lib/antlr/antlr/CharScanner.hpp b/lib/antlr/antlr/CharScanner.hpp index 5f2b8e9e..f7e58520 100644 --- a/lib/antlr/antlr/CharScanner.hpp +++ b/lib/antlr/antlr/CharScanner.hpp @@ -43,7 +43,7 @@ class ANTLR_API CharScanner; ANTLR_C_USING(tolower) #ifdef ANTLR_REALLY_NO_STRCASECMP -// Aptqparently, neither strcasecmp nor stricmp is standard, and Codewarrior +// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior // on the mac has neither... inline int strcasecmp(const char *s1, const char *s2) { diff --git a/lib/astyle/ASBeautifier.cpp b/lib/astyle/ASBeautifier.cpp index 7ea8ec5f..432d58a9 100644 --- a/lib/astyle/ASBeautifier.cpp +++ b/lib/astyle/ASBeautifier.cpp @@ -1067,7 +1067,7 @@ string ASBeautifier::beautify(const string &originalLine) } } - // handle tqparenthesies + // handle parenthesies if (ch == '(' || ch == '[' || ch == ')' || ch == ']') { if (ch == '(' || ch == '[') @@ -1555,7 +1555,7 @@ string ASBeautifier::beautify(const string &originalLine) } - // check for preBlockStatements ONLY if not within tqparenthesies + // check for preBlockStatements ONLY if not within parenthesies // (otherwise 'struct XXX' statements would be wrongly interpreted...) if (isWhiteSpace(prevCh) && !isInTemplate && parenDepth == 0) { diff --git a/lib/astyle/ASFormatter.cpp b/lib/astyle/ASFormatter.cpp index 62f7efc4..eb418760 100644 --- a/lib/astyle/ASFormatter.cpp +++ b/lib/astyle/ASFormatter.cpp @@ -573,7 +573,7 @@ string ASFormatter::nextLine() } } - // handle tqparenthesies + // handle parenthesies if (currentChar == '(' || currentChar == '[' || (isInTemplate && currentChar == '<')) { parenStack->back()++; @@ -593,7 +593,7 @@ string ASFormatter::nextLine() } } - // check if this tqparenthesis closes a header, e.g. if (...), while (...) + // check if this parenthesis closes a header, e.g. if (...), while (...) if (isInHeader && parenStack->back() == 0) { isInHeader = false; @@ -1033,10 +1033,10 @@ void ASFormatter::setOperatorPaddingMode(bool state) } /** -* set tqparenthesis outside padding mode. +* set parenthesis outside padding mode. * options: -* true statement tqparenthesiss will be padded with spaces around them. -* false statement tqparenthesiss will not be padded. +* true statement parenthesiss will be padded with spaces around them. +* false statement parenthesiss will not be padded. * * @param state the padding mode. */ @@ -1046,10 +1046,10 @@ void ASFormatter::setParensOutsidePaddingMode(bool state) } /** -* set tqparenthesis inside padding mode. +* set parenthesis inside padding mode. * options: -* true statement tqparenthesis will be padded with spaces around them. -* false statement tqparenthesis will not be padded. +* true statement parenthesis will be padded with spaces around them. +* false statement parenthesis will not be padded. * * @param state the padding mode. */ @@ -1059,10 +1059,10 @@ void ASFormatter::setParensInsidePaddingMode(bool state) } /** -* set tqparenthesis unpadding mode. +* set parenthesis unpadding mode. * options: -* true statement tqparenthesis will be unpadded with spaces removed around them. -* false statement tqparenthesis will not be unpadded. +* true statement parenthesis will be unpadded with spaces removed around them. +* false statement parenthesis will not be unpadded. * * @param state the padding mode. */ diff --git a/lib/cppparser/macro.h b/lib/cppparser/macro.h index c4912bb3..26f2c2db 100644 --- a/lib/cppparser/macro.h +++ b/lib/cppparser/macro.h @@ -266,7 +266,7 @@ class Macro { /** Set the name for this macro */ void setName( const TQString& name ) { m_name = name; - tqinvalidateHash(); + invalidateHash(); } /** Get the file name that contains this macro */ @@ -276,7 +276,7 @@ class Macro { /** Set the file name that contains this macro */ void setFileName( const TQString& fileName ) { m_fileName = fileName; - tqinvalidateHash(); + invalidateHash(); } /** Get the line the macro is defined on */ @@ -304,7 +304,7 @@ class Macro { /** Set the body of the macro */ void setBody( const TQString& body ) { m_body = body; - tqinvalidateHash(); + invalidateHash(); } /** This is used so the lexer does not have to remove macros that should really stay(they are just temporarily shadowed by an isUndef-macro */ @@ -314,7 +314,7 @@ class Macro { void setUndef() { m_isUndefMacro = true; - tqinvalidateHash(); + invalidateHash(); }; /** Check whether the macro has arguments that are passed to it */ @@ -323,7 +323,7 @@ class Macro { } void setHasArguments( bool hasArguments ) { m_hasArguments = hasArguments; - tqinvalidateHash(); + invalidateHash(); } /** Get a list of arguments passed to this macro */ TQValueList argumentList() const { @@ -334,7 +334,7 @@ class Macro { void clearArgumentList() { m_argumentList.clear(); m_hasArguments = false; - tqinvalidateHash(); + invalidateHash(); } /** Add an argument to this macro */ void addArgument( const Argument& argument ) { @@ -343,7 +343,7 @@ class Macro { /** Add a list of arguments to this macro */ void addArgumentList( const TQValueList& arguments ) { m_argumentList += arguments; - tqinvalidateHash(); + invalidateHash(); } ///This hash respects macro-name and argument-count @@ -359,7 +359,7 @@ class Macro { } private: - inline void tqinvalidateHash() const { + inline void invalidateHash() const { m_idHashValid = m_valueHashValid = false; } diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp index 723dd28b..4043d8a7 100644 --- a/lib/interfaces/hashedstring.cpp +++ b/lib/interfaces/hashedstring.cpp @@ -72,7 +72,7 @@ class HashedStringSetData : public KShared { mutable size_t m_hash; HashedStringSetData() : m_hashValid( false ) { } - inline void tqinvalidateHash() { + inline void invalidateHash() { m_hashValid = false; } @@ -180,7 +180,7 @@ void HashedStringSet::insert( const HashedString& str ) { if( str.str().isEmpty() ) return; makeDataPrivate(); m_data->m_files.insert( str ); - m_data->tqinvalidateHash(); + m_data->invalidateHash(); } bool HashedStringSet::operator <= ( const HashedStringSet& rhs ) const { diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 53a9af77..47659fc4 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -67,7 +67,7 @@ FlagListToolTip::FlagListToolTip(TQWidget *tqparent) void FlagListToolTip::maybeTip(const TQPoint &pos) { - FlagListBox *listbox = static_cast(tqparentWidget()); + FlagListBox *listbox = static_cast(parentWidget()); TQListViewItem *item = listbox->itemAt(pos); FlagListItem *flitem = static_cast(item); -- cgit v1.2.3