diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
| commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
| tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /lib | |
| parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
| download | tdevelop-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 'lib')
183 files changed, 1037 insertions, 975 deletions
diff --git a/lib/antlr/antlr/AST.hpp b/lib/antlr/antlr/AST.hpp index b01a60a9..a25144f9 100644 --- a/lib/antlr/antlr/AST.hpp +++ b/lib/antlr/antlr/AST.hpp @@ -63,10 +63,10 @@ public: /// Add a node to the end of the child list for this node virtual void addChild(RefAST c) = 0; - /// Get the number of children. Returns 0 if the node is a leaf + /// Get the number of tqchildren. Returns 0 if the node is a leaf virtual size_t getNumberOfChildren() const = 0; - /// Get the first child of this node; null if no children + /// Get the first child of this node; null if no tqchildren virtual RefAST getFirstChild() const = 0; /// Get the next sibling in line after this one virtual RefAST getNextSibling() const = 0; @@ -151,7 +151,7 @@ extern ANTLR_API RefAST nullAST; extern ANTLR_API AST* const nullASTptr; #ifdef NEEDS_OPERATOR_LESS_THAN -// RK: apparently needed by MSVC and a SUN CC, up to and including +// RK: aptqparently 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/ASTFactory.hpp b/lib/antlr/antlr/ASTFactory.hpp index 968ab6c5..0fb78dc1 100644 --- a/lib/antlr/antlr/ASTFactory.hpp +++ b/lib/antlr/antlr/ASTFactory.hpp @@ -86,7 +86,7 @@ public: RefAST dupTree(RefAST t); /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null children nodes correctly. + * a simple list not a tree. Handles null tqchildren nodes correctly. * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * yields tree (nil a b). */ diff --git a/lib/antlr/antlr/BaseAST.hpp b/lib/antlr/antlr/BaseAST.hpp index 1bfc4e56..3a88db32 100644 --- a/lib/antlr/antlr/BaseAST.hpp +++ b/lib/antlr/antlr/BaseAST.hpp @@ -96,7 +96,7 @@ public: */ virtual size_t getNumberOfChildren() const; - /// Get the first child of this node; null if no children + /// Get the first child of this node; null if no tqchildren virtual RefAST getFirstChild() const { return RefAST(down); @@ -118,7 +118,7 @@ public: return 0; } - /// Remove all children + /// Remove all tqchildren virtual void removeChildren() { down = static_cast<BaseAST*>(static_cast<AST*>(nullAST)); diff --git a/lib/antlr/antlr/CharScanner.hpp b/lib/antlr/antlr/CharScanner.hpp index f7e58520..5f2b8e9e 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 -// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior +// Aptqparently, 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/antlr/antlr/TokenStreamBasicFilter.hpp b/lib/antlr/antlr/TokenStreamBasicFilter.hpp index bcdb131c..353014a4 100644 --- a/lib/antlr/antlr/TokenStreamBasicFilter.hpp +++ b/lib/antlr/antlr/TokenStreamBasicFilter.hpp @@ -34,7 +34,7 @@ public: void discard(int ttype); - void discard(const BitSet& mask); + void discard(const BitSet& tqmask); RefToken nextToken(); }; diff --git a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp index ed007a7a..867a4101 100644 --- a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp +++ b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp @@ -69,7 +69,7 @@ public: void hide(int m); - void hide(const BitSet& mask); + void hide(const BitSet& tqmask); protected: RefToken LA(int i); diff --git a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp b/lib/antlr/antlr/TokenStreamRewriteEngine.hpp index 9fab08c2..6aa948fe 100644 --- a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp +++ b/lib/antlr/antlr/TokenStreamRewriteEngine.hpp @@ -34,7 +34,7 @@ namespace antlr { * Useful for dumping out the input stream exactly after doing some * augmentation or other manipulations. Tokens are index from 0..n-1 * - * You can insert stuff, replace, and delete chunks. Note that the + * You can insert stuff, tqreplace, and delete chunks. Note that the * operations are done lazily--only if you convert the buffer to a * String. This is very efficient because you are not moving data around * all the time. As the buffer of tokens is converted to strings, the @@ -262,43 +262,43 @@ public: addToSortedRewriteList(programName, new InsertBeforeOp(index,text)); } - void replace(size_t index, const ANTLR_USE_NAMESPACE(std)string& text) + void tqreplace(size_t index, const ANTLR_USE_NAMESPACE(std)string& text) { - replace(DEFAULT_PROGRAM_NAME, index, index, text); + tqreplace(DEFAULT_PROGRAM_NAME, index, index, text); } - void replace( size_t from, size_t to, + void tqreplace( size_t from, size_t to, const ANTLR_USE_NAMESPACE(std)string& text) { - replace(DEFAULT_PROGRAM_NAME, from, to, text); + tqreplace(DEFAULT_PROGRAM_NAME, from, to, text); } - void replace( RefTokenWithIndex indexT, + void tqreplace( RefTokenWithIndex indexT, const ANTLR_USE_NAMESPACE(std)string& text ) { - replace(DEFAULT_PROGRAM_NAME, indexT->getIndex(), indexT->getIndex(), text); + tqreplace(DEFAULT_PROGRAM_NAME, indexT->getIndex(), indexT->getIndex(), text); } - void replace( RefTokenWithIndex from, + void tqreplace( RefTokenWithIndex from, RefTokenWithIndex to, const ANTLR_USE_NAMESPACE(std)string& text ) { - replace(DEFAULT_PROGRAM_NAME, from, to, text); + tqreplace(DEFAULT_PROGRAM_NAME, from, to, text); } - void replace(const ANTLR_USE_NAMESPACE(std)string& programName, + void tqreplace(const ANTLR_USE_NAMESPACE(std)string& programName, size_t from, size_t to, const ANTLR_USE_NAMESPACE(std)string& text ) { addToSortedRewriteList(programName,new ReplaceOp(from, to, text)); } - void replace( const ANTLR_USE_NAMESPACE(std)string& programName, + void tqreplace( const ANTLR_USE_NAMESPACE(std)string& programName, RefTokenWithIndex from, RefTokenWithIndex to, const ANTLR_USE_NAMESPACE(std)string& text ) { - replace(programName, + tqreplace(programName, from->getIndex(), to->getIndex(), text); @@ -323,13 +323,13 @@ public: void remove( const ANTLR_USE_NAMESPACE(std)string& programName, size_t from, size_t to) { - replace(programName,from,to,""); + tqreplace(programName,from,to,""); } void remove( const ANTLR_USE_NAMESPACE(std)string& programName, RefTokenWithIndex from, RefTokenWithIndex to ) { - replace(programName,from,to,""); + tqreplace(programName,from,to,""); } void discard(int ttype) { diff --git a/lib/antlr/src/ASTFactory.cpp b/lib/antlr/src/ASTFactory.cpp index 98ce6b7a..a255ca10 100644 --- a/lib/antlr/src/ASTFactory.cpp +++ b/lib/antlr/src/ASTFactory.cpp @@ -217,7 +217,7 @@ RefAST ASTFactory::dupList(RefAST t) RefAST ASTFactory::dupTree(RefAST t) { RefAST result = dup(t); // make copy of root - // copy all children of root. + // copy all tqchildren of root. if( t ) result->setFirstChild( dupList(t->getFirstChild()) ); return result; @@ -225,7 +225,7 @@ RefAST ASTFactory::dupTree(RefAST t) /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null children nodes correctly. + * a simple list not a tree. Handles null tqchildren nodes correctly. * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * yields tree (nil a b). */ @@ -240,7 +240,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST>& nodes) if( root ) root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set - // link in children; + // link in tqchildren; for( unsigned int i = 1; i < nodes.size(); i++ ) { if ( nodes[i] == 0 ) // ignore null nodes @@ -336,7 +336,7 @@ void ASTFactory::loadChildren( ANTLR_USE_NAMESPACE(std)istream& infile, { char ch; - for(;;) // for all children of this node.... + for(;;) // for all tqchildren of this node.... { eatwhite(infile); @@ -438,7 +438,7 @@ RefAST ASTFactory::LoadAST( ANTLR_USE_NAMESPACE(std)istream& infile ) infile.get(ch); // now if we have a '/' here it's a single node. If it's a '>' we get - // a tree with children + // a tree with tqchildren if( ch == '/' ) { diff --git a/lib/antlr/src/BaseAST.cpp b/lib/antlr/src/BaseAST.cpp index f10f1e16..17d8de68 100644 --- a/lib/antlr/src/BaseAST.cpp +++ b/lib/antlr/src/BaseAST.cpp @@ -47,7 +47,7 @@ void BaseAST::doWorkForFindAll( (!partialMatch && sibling->equalsTree(target)) ) { v.push_back(sibling); } - // regardless of match or not, check any children for matches + // regardless of match or not, check any tqchildren for matches if ( sibling->getFirstChild() ) { RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch); } @@ -70,7 +70,7 @@ bool BaseAST::equalsList(RefAST t) const // as a quick optimization, check roots first. if (!sibling->equals(t)) return false; - // if roots match, do full list match test on children. + // if roots match, do full list match test on tqchildren. if (sibling->getFirstChild()) { if (!sibling->getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -103,7 +103,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const // as a quick optimization, check roots first. if (!sibling->equals(sub)) return false; - // if roots match, do partial list match test on children. + // if roots match, do partial list match test on tqchildren. if (sibling->getFirstChild()) if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -125,7 +125,7 @@ bool BaseAST::equalsTree(RefAST t) const // check roots first if (!equals(t)) return false; - // if roots match, do full list match test on children. + // if roots match, do full list match test on tqchildren. if (getFirstChild()) { if (!getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -149,7 +149,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const // check roots first if (!equals(sub)) return false; - // if roots match, do full list partial match test on children. + // if roots match, do full list partial match test on tqchildren. if (getFirstChild()) if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -256,7 +256,7 @@ void BaseAST::toStream( ANTLR_USE_NAMESPACE(std)ostream& out ) const if( need_close_tag ) { - // got children so write them... + // got tqchildren so write them... if( node->getFirstChild() != 0 ) node->getFirstChild()->toStream( out ); diff --git a/lib/antlr/src/Makefile.am b/lib/antlr/src/Makefile.am index b1af9fca..3d3b94af 100644 --- a/lib/antlr/src/Makefile.am +++ b/lib/antlr/src/Makefile.am @@ -1,6 +1,6 @@ # Make #include <antlr/xxx> work.. -INCLUDES = -I$(srcdir)/.. +INCLUDES = -I$(srcdir)/.. $(all_includes) KDE_CXXFLAGS = $(USE_EXCEPTIONS) noinst_LTLIBRARIES = libantlr.la diff --git a/lib/antlr/src/TokenStreamBasicFilter.cpp b/lib/antlr/src/TokenStreamBasicFilter.cpp index 982e8645..ac6156da 100644 --- a/lib/antlr/src/TokenStreamBasicFilter.cpp +++ b/lib/antlr/src/TokenStreamBasicFilter.cpp @@ -24,9 +24,9 @@ void TokenStreamBasicFilter::discard(int ttype) discardMask.add(ttype); } -void TokenStreamBasicFilter::discard(const BitSet& mask) +void TokenStreamBasicFilter::discard(const BitSet& tqmask) { - discardMask = mask; + discardMask = tqmask; } RefToken TokenStreamBasicFilter::nextToken() diff --git a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp index 431df0c3..90d48d5a 100644 --- a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp +++ b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp @@ -94,9 +94,9 @@ void TokenStreamHiddenTokenFilter::hide(int m) hideMask.add(m); } -void TokenStreamHiddenTokenFilter::hide(const BitSet& mask) +void TokenStreamHiddenTokenFilter::hide(const BitSet& tqmask) { - hideMask = mask; + hideMask = tqmask; } RefToken TokenStreamHiddenTokenFilter::LA(int) diff --git a/lib/astyle/ASBeautifier.cpp b/lib/astyle/ASBeautifier.cpp index 432d58a9..7ea8ec5f 100644 --- a/lib/astyle/ASBeautifier.cpp +++ b/lib/astyle/ASBeautifier.cpp @@ -1067,7 +1067,7 @@ string ASBeautifier::beautify(const string &originalLine) } } - // handle parenthesies + // handle tqparenthesies 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 parenthesies + // check for preBlockStatements ONLY if not within tqparenthesies // (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 eb418760..62f7efc4 100644 --- a/lib/astyle/ASFormatter.cpp +++ b/lib/astyle/ASFormatter.cpp @@ -573,7 +573,7 @@ string ASFormatter::nextLine() } } - // handle parenthesies + // handle tqparenthesies if (currentChar == '(' || currentChar == '[' || (isInTemplate && currentChar == '<')) { parenStack->back()++; @@ -593,7 +593,7 @@ string ASFormatter::nextLine() } } - // check if this parenthesis closes a header, e.g. if (...), while (...) + // check if this tqparenthesis closes a header, e.g. if (...), while (...) if (isInHeader && parenStack->back() == 0) { isInHeader = false; @@ -1033,10 +1033,10 @@ void ASFormatter::setOperatorPaddingMode(bool state) } /** -* set parenthesis outside padding mode. +* set tqparenthesis outside padding mode. * options: -* true statement parenthesiss will be padded with spaces around them. -* false statement parenthesiss will not be padded. +* true statement tqparenthesiss will be padded with spaces around them. +* false statement tqparenthesiss will not be padded. * * @param state the padding mode. */ @@ -1046,10 +1046,10 @@ void ASFormatter::setParensOutsidePaddingMode(bool state) } /** -* set parenthesis inside padding mode. +* set tqparenthesis inside padding mode. * options: -* true statement parenthesis will be padded with spaces around them. -* false statement parenthesis will not be padded. +* true statement tqparenthesis will be padded with spaces around them. +* false statement tqparenthesis will not be padded. * * @param state the padding mode. */ @@ -1059,10 +1059,10 @@ void ASFormatter::setParensInsidePaddingMode(bool state) } /** -* set parenthesis unpadding mode. +* set tqparenthesis unpadding mode. * options: -* true statement parenthesis will be unpadded with spaces removed around them. -* false statement parenthesis will not be unpadded. +* true statement tqparenthesis will be unpadded with spaces removed around them. +* false statement tqparenthesis will not be unpadded. * * @param state the padding mode. */ diff --git a/lib/catalog/catalog.cpp b/lib/catalog/catalog.cpp index c58bbe7d..5ece8b2b 100644 --- a/lib/catalog/catalog.cpp +++ b/lib/catalog/catalog.cpp @@ -48,7 +48,7 @@ struct _Catalog_Private bool hasIndex( const TQCString& name ) const { - return indexList.contains( name ); + return indexList.tqcontains( name ); } DB* index( const TQCString& name ) @@ -172,7 +172,7 @@ void Catalog::setEnabled( bool isEnabled ) { Q_ASSERT( d->dbp != 0 ); - TQMap<TQCString, DB*>::Iterator it = d->indexList.find( name ); + TQMap<TQCString, DB*>::Iterator it = d->indexList.tqfind( name ); if( it == d->indexList.end() ){ DB* dbp = 0; @@ -213,7 +213,7 @@ void Catalog::setEnabled( bool isEnabled ) void Catalog::close() { - d->dbName = TQString::null; + d->dbName = TQString(); TQMap<TQCString, DB*>::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ @@ -369,7 +369,7 @@ void Catalog::setEnabled( bool isEnabled ) DBC** cursors = new DBC* [ args.size() + 1 ]; - TQValueList< QPair<TQCString,TQVariant> >::ConstIterator it = args.begin(); + TQValueList< TQPair<TQCString,TQVariant> >::ConstIterator it = args.begin(); int current = 0; while( it != args.end() ){ TQCString indexName = (*it).first; diff --git a/lib/catalog/catalog.h b/lib/catalog/catalog.h index 00eb5b2b..c581dc8c 100644 --- a/lib/catalog/catalog.h +++ b/lib/catalog/catalog.h @@ -42,7 +42,7 @@ never or rarely changes. System libraries are perfect examples of such code. class Catalog { public: - typedef QPair<TQCString, TQVariant> QueryArgument; + typedef TQPair<TQCString, TQVariant> QueryArgument; public: Catalog(); diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h index f796baa5..426358f4 100644 --- a/lib/catalog/tag.h +++ b/lib/catalog/tag.h @@ -122,7 +122,7 @@ public: data->fileName = fileName; } - TQString path( const TQString& sep = TQString::fromLatin1("::") ) const + TQString path( const TQString& sep = TQString::tqfromLatin1("::") ) const { TQString s = scope().join( sep ); if( s.isNull() ) @@ -194,11 +194,11 @@ public: if( hasAttribute( "spc" ) ) return data->attributes["spc"].asString(); else - return TQString::null; + return TQString(); } bool hasSpecializationDeclaration() const { - return data->attributes.contains( "spc" ); + return data->attributes.tqcontains( "spc" ); } void setSpecializationDeclaration( const TQString& str ) { @@ -216,7 +216,7 @@ public: name == "endLine" || name == "endColumn" ) return true; - return data->attributes.contains( name ); + return data->attributes.tqcontains( name ); } TQVariant attribute( const TQCString& name ) const @@ -270,7 +270,7 @@ public: } void addTemplateParam( const TQString& param , const TQString& def = "" ) { - TQMap<TQCString, TQVariant>::iterator it = data->attributes.find( "tpl" ); + TQMap<TQCString, TQVariant>::iterator it = data->attributes.tqfind( "tpl" ); if( it != data->attributes.end() && (*it).type() == TQVariant::StringList ) { }else{ it = data->attributes.insert( "tpl", TQVariant( TQStringList() ) ); @@ -289,7 +289,7 @@ private: void detach(); private: - struct TagData: public QShared + struct TagData: public TQShared { TQCString id; int kind; diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index 209a8a99..8fe6b82f 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -125,7 +125,7 @@ TQString nodeTypeToString( int type ) return "Custom"; } - return TQString::null; + return TQString(); } @@ -136,7 +136,7 @@ AST::AST() m_endLine( 0 ), m_endColumn( 0 ) { #ifndef CPPPARSER_NO_CHILDREN - m_children.setAutoDelete( false ); + m_tqchildren.setAutoDelete( false ); #endif } @@ -178,14 +178,14 @@ void AST::getEndPosition( int* line, int* col ) const * col = m_endColumn; } -void AST::setParent( AST* parent ) +void AST::setParent( AST* tqparent ) { #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) m_parent->removeChild( this ); #endif - m_parent = parent; + m_parent = tqparent; #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) @@ -196,12 +196,12 @@ void AST::setParent( AST* parent ) #ifndef CPPPARSER_NO_CHILDREN void AST::appendChild( AST* child ) { - m_children.append( child ); + m_tqchildren.append( child ); } void AST::removeChild( AST* child ) { - m_children.remove( child ); + m_tqchildren.remove( child ); } #endif @@ -235,7 +235,7 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam TQString NameAST::text() const { if( !m_unqualifiedName.get() ) - return TQString::null; + return TQString(); TQString str; @@ -470,11 +470,11 @@ void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST:: TQString ClassOrNamespaceNameAST::text() const { if( !m_name.get() ) - return TQString::null; + return TQString(); TQString str = m_name->text(); if( m_templateArgumentList.get() ) - str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); + str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >"); return str; } diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index c9750faf..58704df9 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -26,7 +26,7 @@ #include <tqstringlist.h> #include <ksharedptr.h> -#if defined( Q_OS_WIN32 ) || defined( Q_CC_SUN ) +#if defined( Q_OS_WIN32 ) || defined( TQ_CC_SUN ) #ifndef _THROW0 # define _THROW0() @@ -183,9 +183,9 @@ enum NodeType TQString nodeTypeToString( int type ); -#if defined(CPPPARSER_QUICK_ALLOCATOR) +#if defined(CPPPARSER_TQUICK_ALLOCATOR) -#include <quick_allocator.h> +#include <tquick_allocator.h> #define DECLARE_ALLOC(tp) \ void * operator new(std::size_t) \ @@ -253,8 +253,8 @@ public: int nodeType() const { return m_nodeType; } void setNodeType( int nodeType ) { m_nodeType = nodeType; } - AST* parent() { return m_parent; } - void setParent( AST* parent ); + AST* tqparent() { return m_parent; } + void setParent( AST* tqparent ); void setStartPosition( int line, int col ); void getStartPosition( int* line, int* col ) const; @@ -263,7 +263,7 @@ public: void getEndPosition( int* line, int* col ) const; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> children() { return m_children; } + TQPtrList<AST> tqchildren() { return m_tqchildren; } void appendChild( AST* child ); void removeChild( AST* child ); #endif @@ -292,7 +292,7 @@ private: int m_endLine, m_endColumn; Slice m_slice; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> m_children; + TQPtrList<AST> m_tqchildren; #endif private: @@ -854,7 +854,7 @@ public: class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } void setParameterDeclarationClause( AUTO_PTR<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); - // ### replace 'constant' with cvQualify + // ### tqreplace 'constant' with cvQualify AST* constant() { return m_constant.get(); } void setConstant( AST::Node& constant ); diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 80667a9e..52b196e5 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -383,7 +383,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep ) m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local ); if ( !TQFile::exists( file ) ) { - Problem p( i18n( "Could not find include file %1" ).arg( dep.first ), + Problem p( i18n( "Could not find include file %1" ).tqarg( dep.first ), lexer ? lexer->currentLine() : -1, lexer ? lexer->currentColumn() : -1, Problem::Level_Warning ); addProblem( fileName, p ); @@ -520,7 +520,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc if( macrosGlobal ) { for( MacroMap::iterator it = m_macros.begin(); it != m_macros.end(); ++it) { if( (*it).second.fileName() == fileName ) { - (*it).second.setFileName( TQString::null ); + (*it).second.setFileName( TQString() ); } } } @@ -597,32 +597,32 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "KDE_DEPRECATED" ); // qt - lexer->addSkipWord( "Q_OBJECT" ); - lexer->addSkipWord( "Q_OVERRIDE", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_OBJECT" ); + lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments ); - lexer->addSkipWord( "Q_PROPERTY", SkipWordAndArguments ); - lexer->addSkipWord( "Q_CLASSINFO", SkipWordAndArguments ); - lexer->addSkipWord( "Q_SETS", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_PROPERTY", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_CLASSINFO", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_SETS", SkipWordAndArguments ); lexer->addSkipWord( "Q_UNUSED", SkipWordAndArguments ); - lexer->addSkipWord( "Q_CREATE_INSTANCE", SkipWordAndArguments ); - lexer->addSkipWord( "Q_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_CREATE_INSTANCE", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments ); lexer->addSkipWord( "ACTIVATE_SIGNAL_WITH_PARAM", SkipWordAndArguments ); - lexer->addSkipWord( "Q_INLINE_TEMPLATES" ); - lexer->addSkipWord( "Q_TEMPLATE_EXTERN" ); - lexer->addSkipWord( "Q_TYPENAME" ); - lexer->addSkipWord( "Q_REFCOUNT" ); - lexer->addSkipWord( "Q_EXPLICIT" ); - lexer->addSkipWord( "QMAC_PASCAL" ); + lexer->addSkipWord( "TQ_INLINE_TEMPLATES" ); + lexer->addSkipWord( "TQ_TEMPLATE_EXTERN" ); + lexer->addSkipWord( "TQ_TYPENAME" ); + lexer->addSkipWord( "TQ_REFCOUNT" ); + lexer->addSkipWord( "TQ_EXPLICIT" ); + lexer->addSkipWord( "TQMAC_PASCAL" ); lexer->addSkipWord( "QT_STATIC_CONST" ); lexer->addSkipWord( "QT_STATIC_CONST_IMPL" ); - lexer->addSkipWord( "QT_WIN_PAINTER_MEMBERS" ); - lexer->addSkipWord( "QT_NC_MSGBOX" ); - lexer->addSkipWord( "Q_VARIANT_AS", SkipWordAndArguments ); + lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" ); + lexer->addSkipWord( "TQT_NC_MSGBOX" ); + lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments ); lexer->addSkipWord( "CALLBACK_CALL_TYPE" ); // qt4 [erbsland] - lexer->addSkipWord( "Q_DECLARE_FLAGS", SkipWordAndArguments ); - lexer->addSkipWord( "Q_DECLARE_OPERATORS_FOR_FLAGS", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_DECLARE_FLAGS", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_DECLARE_OPERATORS_FOR_FLAGS", SkipWordAndArguments ); // flex lexer->addSkipWord( "yyconst" ); @@ -688,7 +688,7 @@ TQString Driver::findIncludeFile( const Dependence& dep, const TQString& fromFil return fileInfo.absFilePath(); } - return TQString::null; + return TQString(); } TQString Driver::findIncludeFile( const Dependence& dep ) const { @@ -707,7 +707,7 @@ TQString Driver::findIncludeFile( const Dependence& dep ) const { return fileInfo.absFilePath(); } - return TQString::null; + return TQString(); } void Driver::setResolveDependencesEnabled( bool enabled ) { diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h index 3c12d34c..078c420f 100644 --- a/lib/cppparser/driver.h +++ b/lib/cppparser/driver.h @@ -49,7 +49,7 @@ enum Dep_Local }; -typedef QPair<TQString, int> Dependence; +typedef TQPair<TQString, int> Dependence; class ParsedFile; typedef KSharedPtr< ParsedFile > ParsedFilePointer; @@ -129,7 +129,7 @@ class ParsedFile : public AbstractParseResult { m_directIncludeFiles.clear(); for( int a = 0; a < directIncludeFilesCount; a++ ) { IncludeDesc i; - Q_INT8 in; + TQ_INT8 in; stream >> in; i.local = in; stream >> i.includePath; @@ -149,7 +149,7 @@ class ParsedFile : public AbstractParseResult { int i = m_directIncludeFiles.size(); stream << i; for( TQValueList<IncludeDesc>::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { - Q_INT8 i = (*it).local; + TQ_INT8 i = (*it).local; stream << i; stream << (*it).includePath; } @@ -297,7 +297,7 @@ class Driver { */ TQMap<TQString, Dependence> dependences( const TQString& fileName ) const; /** - * Get all the macros the driver contains + * Get all the macros the driver tqcontains * @return The macros */ const MacroMap& macros() const; @@ -306,7 +306,7 @@ class Driver { * Take all macros from the given map(forgetting own macros) */ void insertMacros( const MacroSet& macros ); /** - * Get the list of problem areas the driver contains + * Get the list of problem areas the driver tqcontains * @param fileName The filename to get problems for * @return The list of problems for @p fileName */ diff --git a/lib/cppparser/keywords.h b/lib/cppparser/keywords.h index e649a5a9..e48107e0 100644 --- a/lib/cppparser/keywords.h +++ b/lib/cppparser/keywords.h @@ -8,8 +8,8 @@ INSERT( "K_DCOP", Token_K_DCOP ); INSERT( "k_dcop", Token_k_dcop ); INSERT( "k_dcop_signals", Token_k_dcop_signals ); -// Qt Keywords -INSERT( "Q_OBJECT", Token_Q_OBJECT ); +// TQt Keywords +INSERT( "TQ_OBJECT", Token_TQ_OBJECT ); INSERT( "signals", Token_signals ); INSERT( "slots", Token_slots ); INSERT( "emit", Token_emit ); diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 97fe0dc0..b62cce32 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -30,7 +30,7 @@ #if defined( KDEVELOP_BGPARSER ) #include <tqthread.h> -class KDevTread: public QThread +class KDevTread: public TQThread { public: static void yield() @@ -82,7 +82,7 @@ struct LexerData const Scope& scope = *it; ++it; - if( scope.contains(name) ) + if( scope.tqcontains(name) ) return true; } @@ -96,11 +96,11 @@ struct LexerData const Scope& scope = *it; ++it; - if( scope.contains(name) ) + if( scope.tqcontains(name) ) return scope[ name ]; } - return TQString::null; + return TQString(); } }; @@ -152,7 +152,7 @@ void Lexer::reset() m_index = 0; m_size = 0; m_tokens.clear(); - m_source = TQString::null; + m_source = TQString(); m_ptr = 0; m_endPtr = 0; m_startLine = false; @@ -184,7 +184,7 @@ int Lexer::toInt( const Token& token ) int i = s[0] == 'L' ? 2 : 1; // wide char ? if( s[i] == '\\' ){ // escaped char - int c = s[i+1].unicode(); + int c = s[i+1].tqunicode(); switch( c ) { case '0': return 0; @@ -195,7 +195,7 @@ int Lexer::toInt( const Token& token ) return c; } } else { - return s[i].unicode(); + return s[i].tqunicode(); } } else { return 0; @@ -386,21 +386,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) TQString tokText = tok.text(); HashedString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText; if( str == ide ){ - //Problem p( i18n("unsafe use of macro '%1', macro is ignored").arg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); + //Problem p( i18n("unsafe use of macro '%1', macro is ignored").tqarg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); - // str = TQString::null; + // str = TQString(); } if( stringify ) { - textToInsert.append( TQString::fromLatin1("\"") + str.str() + TQString::fromLatin1("\" ") ); + textToInsert.append( TQString::tqfromLatin1("\"") + str.str() + TQString::tqfromLatin1("\" ") ); } else if( merge ){ textToInsert.truncate( textToInsert.length() - 1 ); - textToInsert.append( str.str() + TQString::fromLatin1(" ") ); + textToInsert.append( str.str() + TQString::tqfromLatin1(" ") ); } else if( tok == Token_ellipsis && d->hasBind("...") ){ textToInsert.append( ellipsisArg ); } else { - textToInsert.append( str.str() + TQString::fromLatin1(" ") ); + textToInsert.append( str.str() + TQString::tqfromLatin1(" ") ); } } @@ -419,7 +419,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); } else if( m_skipWordsEnabled ){ - __gnu_cxx::hash_map< HashedString, QPair<SkipType, TQString> >::iterator pos = m_words.find( ide ); + __gnu_cxx::hash_map< HashedString, TQPair<SkipType, TQString> >::iterator pos = m_words.find( ide ); if( pos != m_words.end() ){ if( (*pos).second.first == SkipWordAndArguments ){ readWhiteSpaces(); @@ -434,9 +434,9 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) } } else if( /*qt_rx.exactMatch(ide) ||*/ ide.str().endsWith("EXPORT") || - (ide.str().startsWith("Q_EXPORT") && ide.str() != "Q_EXPORT_INTERFACE") || - ide.str().startsWith("QM_EXPORT") || - ide.str().startsWith("QM_TEMPLATE")){ + (ide.str().startsWith("TQ_EXPORT") && ide.str() != "TQ_EXPORT_INTERFACE") || + ide.str().startsWith("TQM_EXPORT") || + ide.str().startsWith("TQM_TEMPLATE")){ readWhiteSpaces(); if( currentChar() == '(' ) @@ -514,7 +514,7 @@ void Lexer::resetSkipWords() void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str ) { - m_words[ word ] = qMakePair( skipType, str ); + m_words[ word ] = tqMakePair( skipType, str ); } void Lexer::skip( int l, int r ) @@ -1026,7 +1026,7 @@ int Lexer::macroExpression() } // *IMPORTANT* -// please, don't include lexer.moc here, because Lexer isn't a TQObject class!! +// please, don't include lexer.tqmoc here, because Lexer isn't a TQObject class!! // if you have problem while recompiling try to remove cppsupport/.deps, // cppsupport/Makefile.in and rerun automake/autoconf diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index a94e5c5e..cbaed1be 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -30,7 +30,7 @@ #include <hashedstring.h> #include <ext/hash_map> -#define CHARTYPE QChar +#define CHARTYPE TQChar enum Type { Token_eof = 0, @@ -60,7 +60,7 @@ enum Type { Token_k_dcop, Token_k_dcop_signals, - Token_Q_OBJECT, + Token_TQ_OBJECT, Token_signals, Token_slots, Token_emit, @@ -217,7 +217,7 @@ public: void setPreprocessorEnabled( bool enabled ); void resetSkipWords(); - void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString::null ); + void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString() ); TQString source() const; void setSource( const TQString& source ); @@ -243,11 +243,11 @@ public: int currentColumn() const { return m_currentColumn; } inline const CHARTYPE* offset( int offset ) const { - return m_source.unicode() + offset; + return m_source.tqunicode() + offset; } inline int getOffset( const TQChar* p ) const { - return int(p - (m_source.unicode())); + return int(p - (m_source.tqunicode())); } private: @@ -322,7 +322,7 @@ private: bool m_recordComments; bool m_recordWhiteSpaces; bool m_startLine; - __gnu_cxx::hash_map< HashedString, QPair<SkipType, TQString> > m_words; + __gnu_cxx::hash_map< HashedString, TQPair<SkipType, TQString> > m_words; int m_skippedLines; @@ -513,12 +513,12 @@ inline const Token& Lexer::nextToken() inline const Token& Lexer::tokenAt( int n ) const { - return *m_tokens[ QMIN(n, m_size-1) ]; + return *m_tokens[ TQMIN(n, m_size-1) ]; } inline const Token& Lexer::lookAhead( int n ) const { - return *m_tokens[ QMIN(m_index + n, m_size-1) ]; + return *m_tokens[ TQMIN(m_index + n, m_size-1) ]; } inline int Lexer::tokenPosition( const Token& token ) const diff --git a/lib/cppparser/lexercache.cpp b/lib/cppparser/lexercache.cpp index 230a7de1..2d28e27d 100644 --- a/lib/cppparser/lexercache.cpp +++ b/lib/cppparser/lexercache.cpp @@ -112,13 +112,13 @@ TQDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName FileModificationMap::const_iterator it = m_fileModificationCache.find( fileName ); if( it != m_fileModificationCache.end() ) { ///Use the cache for 10 seconds - if( (*it).second.m_readTime.secsTo( m_currentDateTime ) < 10 ) { + if( (*it).second.m_readTime.secsTo( m_tqcurrentDateTime ) < 10 ) { return (*it).second.m_modificationTime; } } TQFileInfo fileInfo( fileName.str() ); - m_fileModificationCache[fileName].m_readTime = TQDateTime::currentDateTime(); + m_fileModificationCache[fileName].m_readTime = TQDateTime::tqcurrentDateTime(); m_fileModificationCache[fileName].m_modificationTime = fileInfo.lastModified(); return fileInfo.lastModified(); @@ -239,7 +239,7 @@ size_t CachedLexedFile::hash() const { } void LexerCache::initFileModificationCache() { - m_currentDateTime = TQDateTime::currentDateTime(); + m_tqcurrentDateTime = TQDateTime::tqcurrentDateTime(); } void LexerCache::saveMemory() { diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h index 662e0270..a68c4a6b 100644 --- a/lib/cppparser/lexercache.h +++ b/lib/cppparser/lexercache.h @@ -155,7 +155,7 @@ class LexerCache : public CacheManager { typedef __gnu_cxx::hash_map<HashedString, FileModificationCache> FileModificationMap; FileModificationMap m_fileModificationCache; Driver* m_driver; - TQDateTime m_currentDateTime; + TQDateTime m_tqcurrentDateTime; }; diff --git a/lib/cppparser/macro.h b/lib/cppparser/macro.h index e8fe0b9c..c4912bb3 100644 --- a/lib/cppparser/macro.h +++ b/lib/cppparser/macro.h @@ -228,7 +228,7 @@ class Macro { } void read( TQDataStream& stream ) { - Q_INT8 i; + TQ_INT8 i; stream >> i; m_idHashValid = i; stream >> i; m_valueHashValid = i; stream >> i; m_hasArguments = i; @@ -244,7 +244,7 @@ class Macro { } void write( TQDataStream& stream ) const { - Q_INT8 i; + TQ_INT8 i; i = m_idHashValid; stream << i; i = m_valueHashValid; stream << i; i = m_hasArguments; stream << i; @@ -266,7 +266,7 @@ class Macro { /** Set the name for this macro */ void setName( const TQString& name ) { m_name = name; - invalidateHash(); + tqinvalidateHash(); } /** 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; - invalidateHash(); + tqinvalidateHash(); } /** 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; - invalidateHash(); + tqinvalidateHash(); } /** 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; - invalidateHash(); + tqinvalidateHash(); }; /** Check whether the macro has arguments that are passed to it */ @@ -323,7 +323,7 @@ class Macro { } void setHasArguments( bool hasArguments ) { m_hasArguments = hasArguments; - invalidateHash(); + tqinvalidateHash(); } /** Get a list of arguments passed to this macro */ TQValueList<Argument> argumentList() const { @@ -334,7 +334,7 @@ class Macro { void clearArgumentList() { m_argumentList.clear(); m_hasArguments = false; - invalidateHash(); + tqinvalidateHash(); } /** 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<Argument>& arguments ) { m_argumentList += arguments; - invalidateHash(); + tqinvalidateHash(); } ///This hash respects macro-name and argument-count @@ -359,7 +359,7 @@ class Macro { } private: - inline void invalidateHash() const { + inline void tqinvalidateHash() const { m_idHashValid = m_valueHashValid = false; } diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 31c14385..77265ce6 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -37,7 +37,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ return false; \ } \ nextToken(); \ @@ -47,7 +47,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ } \ else \ nextToken(); \ @@ -139,7 +139,7 @@ bool Parser::reportError( const Error& err ) if( s.isEmpty() ) s = i18n( "<eof>" ); - m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) ); + m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) ); } return true; @@ -216,8 +216,8 @@ bool Parser::skipUntilDeclaration() case Token_public: case Token_protected: case Token_private: - case Token_signals: // Qt - case Token_slots: // Qt + case Token_signals: // TQt + case Token_slots: // TQt return true; default: @@ -2005,7 +2005,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) if( lex->lookAhead(0) == ';' ){ nextToken(); return true; - } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ nextToken(); return true; } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){ diff --git a/lib/interfaces/KDevCoreIface.h b/lib/interfaces/KDevCoreIface.h index 5603e0f5..9fb34d13 100644 --- a/lib/interfaces/KDevCoreIface.h +++ b/lib/interfaces/KDevCoreIface.h @@ -30,6 +30,7 @@ class KDevCore; class KDevCoreIface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: diff --git a/lib/interfaces/KDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h index 3f519159..b140df97 100644 --- a/lib/interfaces/KDevPartControllerIface.h +++ b/lib/interfaces/KDevPartControllerIface.h @@ -28,6 +28,7 @@ class KDevPartController; class KDevPartControllerIface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: diff --git a/lib/interfaces/codemodel.cpp b/lib/interfaces/codemodel.cpp index e2e211ad..3d4bbe63 100644 --- a/lib/interfaces/codemodel.cpp +++ b/lib/interfaces/codemodel.cpp @@ -380,12 +380,12 @@ const FileList CodeModel::fileList( ) const bool CodeModel::hasFile( const TQString & name ) const { - return m_files.contains( name ); + return m_files.tqcontains( name ); } FileDom CodeModel::fileByName( const TQString & name ) { - TQMap<TQString, FileDom>::const_iterator it = m_files.find( name ); + TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name ); if( it != m_files.end() ) { return *it; } else { @@ -395,7 +395,7 @@ FileDom CodeModel::fileByName( const TQString & name ) const FileDom CodeModel::fileByName( const TQString & name ) const { - TQMap<TQString, FileDom>::const_iterator it = m_files.find( name ); + TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name ); if( it != m_files.end() ) { return *it; } else { @@ -502,7 +502,7 @@ bool CodeModel::addFile( FileDom file ) if( file->name().isEmpty() ) return false; - if( m_files.find( file->name() ) != m_files.end() ) { + if( m_files.tqfind( file->name() ) != m_files.end() ) { ///the error-channel is set to 9007 because this problem appears with the cpp-support, so it is needed while debugging it kdDebug(9007) << "file " << file->name() << " was added to code-model without removing it before! \n" << kdBacktrace() << endl; removeFile( fileByName( file->name() ) ); @@ -679,17 +679,17 @@ const NamespaceList NamespaceModel::namespaceList( ) const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) { - return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom(); + return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom(); } const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) const { - return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom(); + return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom(); } bool NamespaceModel::hasNamespace( const TQString & name ) const { - return m_namespaces.contains( name ); + return m_namespaces.tqcontains( name ); } bool NamespaceModel::addNamespace( NamespaceDom ns ) @@ -760,17 +760,17 @@ const ClassList ClassModel::classList( ) const bool ClassModel::hasClass( const TQString & name ) const { - return m_classes.contains( name ); + return m_classes.tqcontains( name ); } ClassList ClassModel::classByName( const TQString & name ) { - return m_classes.contains( name ) ? m_classes[ name ] : ClassList(); + return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList(); } const ClassList ClassModel::classByName( const TQString & name ) const { - return m_classes.contains( name ) ? m_classes[ name ] : ClassList(); + return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList(); } bool ClassModel::addClass( ClassDom klass ) @@ -816,17 +816,17 @@ const FunctionList ClassModel::functionList( ) const bool ClassModel::hasFunction( const TQString & name ) const { - return m_functions.contains( name ); + return m_functions.tqcontains( name ); } FunctionList ClassModel::functionByName( const TQString & name ) { - return m_functions.contains( name ) ? m_functions[ name ] : FunctionList(); + return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList(); } const FunctionList ClassModel::functionByName( const TQString & name ) const { - return m_functions.contains( name ) ? m_functions[ name ] : FunctionList(); + return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList(); } bool ClassModel::addFunction( FunctionDom fun ) @@ -872,17 +872,17 @@ const FunctionDefinitionList ClassModel::functionDefinitionList( ) const bool ClassModel::hasFunctionDefinition( const TQString & name ) const { - return m_functionDefinitions.contains( name ); + return m_functionDefinitions.tqcontains( name ); } FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) { - return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); + return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); } const FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) const { - return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); + return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); } bool ClassModel::addFunctionDefinition( FunctionDefinitionDom fun ) @@ -914,17 +914,17 @@ const VariableList ClassModel::variableList( ) const VariableDom ClassModel::variableByName( const TQString & name ) { - return m_variables.contains( name ) ? m_variables[ name ] : VariableDom(); + return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom(); } const VariableDom ClassModel::variableByName( const TQString & name ) const { - return m_variables.contains( name ) ? m_variables[ name ] : VariableDom(); + return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom(); } bool ClassModel::hasVariable( const TQString & name ) const { - return m_variables.contains( name ); + return m_variables.tqcontains( name ); } bool ClassModel::addVariable( VariableDom var ) @@ -953,17 +953,17 @@ const EnumList ClassModel::enumList( ) const EnumDom ClassModel::enumByName( const TQString & name ) { - return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom(); + return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom(); } const EnumDom ClassModel::enumByName( const TQString & name ) const { - return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom(); + return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom(); } bool ClassModel::hasEnum( const TQString & name ) const { - return m_enumerators.contains( name ); + return m_enumerators.tqcontains( name ); } bool ClassModel::addEnum( EnumDom e ) @@ -1028,17 +1028,17 @@ const TypeAliasList ClassModel::typeAliasList( ) const bool ClassModel::hasTypeAlias( const TQString & name ) const { - return m_typeAliases.contains( name ); + return m_typeAliases.tqcontains( name ); } TypeAliasList ClassModel::typeAliasByName( const TQString & name ) { - return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList(); + return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList(); } const TypeAliasList ClassModel::typeAliasByName( const TQString & name ) const { - return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList(); + return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList(); } bool ClassModel::addTypeAlias( TypeAliasDom typeAlias ) diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h index 882420b8..f85ff4c3 100644 --- a/lib/interfaces/codemodel.h +++ b/lib/interfaces/codemodel.h @@ -161,7 +161,7 @@ typedef KSharedPtr<EnumeratorModel> EnumeratorDom; @class ItemList The list of code model items. This is a type definition: @code typedef TQValueList<ItemDom> ItemList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<ItemDom> ItemList; @@ -169,7 +169,7 @@ typedef TQValueList<ItemDom> ItemList; @class FileList The list of code model files. This is a type definition: @code typedef TQValueList<FileDom> FileList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<FileDom> FileList; @@ -177,7 +177,7 @@ typedef TQValueList<FileDom> FileList; @class NamespaceList The list of code model namespaces. This is a type definition: @code typedef TQValueList<NamespaceDom> NamespaceList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<NamespaceDom> NamespaceList; @@ -185,7 +185,7 @@ typedef TQValueList<NamespaceDom> NamespaceList; @class ClassList The list of code model classes. This is a type definition: @code typedef TQValueList<ClassDom> ClassList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<ClassDom> ClassList; @@ -193,7 +193,7 @@ typedef TQValueList<ClassDom> ClassList; @class FunctionList The list of code model functions. This is a type definition: @code typedef TQValueList<FunctionDom> FunctionList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<FunctionDom> FunctionList; @@ -201,7 +201,7 @@ typedef TQValueList<FunctionDom> FunctionList; @class FunctionDefinitionList The list of code model function definitions. This is a type definition: @code typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList; @@ -209,7 +209,7 @@ typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList; @class VariableList The list of code model variables. This is a type definition: @code typedef TQValueList<VariableDom> VariableList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<VariableDom> VariableList; @@ -217,7 +217,7 @@ typedef TQValueList<VariableDom> VariableList; @class ArgumentList The list of code model arguments. This is a type definition: @code typedef TQValueList<ArgumentDom> ArgumentList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<ArgumentDom> ArgumentList; @@ -225,7 +225,7 @@ typedef TQValueList<ArgumentDom> ArgumentList; @class EnumList The list of code model enums. This is a type definition: @code typedef TQValueList<EnumDom> EnumList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<EnumDom> EnumList; @@ -233,7 +233,7 @@ typedef TQValueList<EnumDom> EnumList; @class TypeAliasList The list of code model type aliases. This is a type definition: @code typedef TQValueList<TypeAliasDom> TypeAliasList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<TypeAliasDom> TypeAliasList; @@ -241,7 +241,7 @@ typedef TQValueList<TypeAliasDom> TypeAliasList; @class EnumeratorList The list of code model enumerators. This is a type definition: @code typedef TQValueList<EnumeratorDom> EnumeratorList; @endcode -@sa QValueList +@sa TQValueList */ typedef TQValueList<EnumeratorDom> EnumeratorList; @@ -619,7 +619,7 @@ private: class TemplateModelItem { public: - typedef QPair< TQString, TQString > ParamPair; + typedef TQPair< TQString, TQString > ParamPair; typedef TQValueVector< ParamPair > ParamMap; ///The first is the name, and the second the default-parameter, or "" if there is none. virtual const ParamMap& getTemplateParams() { @@ -706,10 +706,10 @@ public: virtual bool isClass() const { return true; } - /**@return The scope of the class. Scope is a string list composed from names of parent classes and namespaces.*/ + /**@return The scope of the class. Scope is a string list composed from names of tqparent classes and namespaces.*/ TQStringList scope() const { return m_scope; } /**Sets the scope of this class. - @param scope The scope - a list of parent classes and namespaces.*/ + @param scope The scope - a list of tqparent classes and namespaces.*/ void setScope( const TQStringList& scope ) { m_scope = scope; } /**@return The list of base class names.*/ @@ -1044,7 +1044,7 @@ protected: NamespaceModel( CodeModel* model ); public: - typedef std::set<NamespaceAliasModel> NamespaceAliasModelList; ///I'm using std-sets here, because Qt-3 has no appropriate replacement + typedef std::set<NamespaceAliasModel> NamespaceAliasModelList; ///I'm using std-sets here, because TQt-3 has no appropriate replacement typedef std::set<NamespaceImportModel> NamespaceImportModelList; /**A definition of safe pointer to the namespace model.*/ @@ -1256,7 +1256,7 @@ public: virtual bool isFunction() const { return true; } /**@return The scope of the function. Scope is a string list composed - from names of parent functions, classes and namespaces.*/ + from names of tqparent functions, classes and namespaces.*/ TQStringList scope() const { return m_scope; } /**Sets the scope of the function. diff --git a/lib/interfaces/codemodel_utils.cpp b/lib/interfaces/codemodel_utils.cpp index afb946bd..5c9c71e9 100644 --- a/lib/interfaces/codemodel_utils.cpp +++ b/lib/interfaces/codemodel_utils.cpp @@ -296,7 +296,7 @@ AllFunctionDefinitions allFunctionDefinitionsDetailed( const FileDom & dom ) bool resultTypesFit( const FunctionDom & dec, const FunctionDefinitionDom & def ) { - if( !def->resultType().contains("::") ) return dec->resultType() == def->resultType(); + if( !def->resultType().tqcontains("::") ) return dec->resultType() == def->resultType(); TQStringList l1 = dec->scope() + TQStringList::split("::", dec->resultType() ); TQStringList l2 = TQStringList::split("::", def->resultType() ); diff --git a/lib/interfaces/codemodel_utils.h b/lib/interfaces/codemodel_utils.h index 2879a424..14e97656 100644 --- a/lib/interfaces/codemodel_utils.h +++ b/lib/interfaces/codemodel_utils.h @@ -462,11 +462,11 @@ class PredAmOwner{ /**@return A list of all functions in the file. @param dom File Dom to look for functions in.*/ FunctionList allFunctions(const FileDom &dom); -/**@return A detailed list of all functions in the file (detailed list contains +/**@return A detailed list of all functions in the file (detailed list tqcontains the information about a scope of each FunctionDom found). @param dom File Dom to look for functions in.*/ AllFunctions allFunctionsDetailed(const FileDom &dom); -/**@return A detailed list of all function definitions in the file (detailed list contains +/**@return A detailed list of all function definitions in the file (detailed list tqcontains the information about a scope of each FunctionDefinitionDom found). @param dom File Dom to look for functions in.*/ AllFunctionDefinitions allFunctionDefinitionsDetailed(const FileDom &dom); diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox index d306a1e8..5906ccfe 100644 --- a/lib/interfaces/extensions/Mainpage.dox +++ b/lib/interfaces/extensions/Mainpage.dox @@ -38,8 +38,8 @@ those should be loaded at a time. This can be accomplished by: @code class KDevMyExtension: public KDevPlugin { public: - KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name) - :KDevPlugin(info, parent, name) {} + KDevMyExtension(const KDevPluginInfo *info, QObject* tqparent, const char* name) + :KDevPlugin(info, tqparent, name) {} virtual void doSomething() = 0; }; diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 52dd5a1e..2ce7090b 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -27,10 +27,11 @@ namespace Extensions { class KDevCodeBrowserFrontend : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) - :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {} + KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) + :KDevPlugin(info, tqparent, name ? name : "CodeBrowserFrontend") {} ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item virtual bool jumpedToItem( ItemDom item ) = 0; diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h index 4f17154d..bd6dc559 100644 --- a/lib/interfaces/extensions/kdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -57,6 +57,7 @@ if (apf) { class KDevAppFrontend : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: /**Constructor. @@ -65,11 +66,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) - :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {} + KDevAppFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) + :KDevPlugin(info, tqparent, name ? name : "KDevAppFrontend") {} /**@return Whether the application is currently running.*/ virtual bool isRunning() = 0; diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h index b3f5e080..fd11b993 100644 --- a/lib/interfaces/extensions/kdevcreatefile.h +++ b/lib/interfaces/extensions/kdevcreatefile.h @@ -54,7 +54,7 @@ public: public: /**The status of a file.*/ - enum Status { + enum tqStatus { STATUS_OK /**<File was successfuly created.*/, STATUS_CANCELED /**<File was not created due to user intervention.*/, STATUS_NOTCREATED /**<File was not created due to error.*/, @@ -105,7 +105,7 @@ public: there are several file templates for each extension.*/ TQString subtype; /**Current status.*/ - Status status; + tqStatus status; /**true if the file should be added to a project.*/ bool addToProject; }; @@ -119,14 +119,14 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0) - :KDevPlugin(info, parent, name) {} + KDevCreateFile(const KDevPluginInfo *info, TQObject * tqparent = 0, const char * name = 0) + :KDevPlugin(info, tqparent, name) {} /**Creates a new file, within or without the project. - Supply as much information as you know. Leave what you don't know as TQString::null. + Supply as much information as you know. Leave what you don't know as TQString(). The user will be prompted as necessary for the missing information, and the file created, and added to the project as necessary. @param ext File extension (type). @@ -135,10 +135,10 @@ public: @param subtype The subtype, pass this only if an extension is not enough to find the file template. @return @ref CreatedFile instance with information about file and file creation process.*/ - virtual CreatedFile createNewFile(TQString ext = TQString::null, - TQString dir = TQString::null, - TQString name = TQString::null, - TQString subtype = TQString::null) = 0; + virtual CreatedFile createNewFile(TQString ext = TQString(), + TQString dir = TQString(), + TQString name = TQString(), + TQString subtype = TQString()) = 0; }; diff --git a/lib/interfaces/extensions/kdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp index 745703e4..a3af79d4 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.cpp +++ b/lib/interfaces/extensions/kdevdifffrontend.cpp @@ -21,8 +21,8 @@ #include "kdevdifffrontend.h" -KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name) - : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") +KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *tqparent, const char *name) + : KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend") { } diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h index ecf360ad..b1158cb4 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.h +++ b/lib/interfaces/extensions/kdevdifffrontend.h @@ -55,11 +55,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) - :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {} + KDevDiffFrontend( const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) + :KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend") {} /**Displays the patch. @param diff A string which contains a patch in unified format.*/ diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h index 96749bd2..cc136536 100644 --- a/lib/interfaces/extensions/kdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -53,6 +53,7 @@ if (mf) { class KDevMakeFrontend : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: @@ -62,11 +63,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) - :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {} + KDevMakeFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) + :KDevPlugin(info, tqparent, name ? name : "KDevMakeFrontend") {} /**@return The widget where the make output is shown.*/ virtual TQWidget* widget() { return 0L; } diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h index 09c7bb1b..e66e01b3 100644 --- a/lib/interfaces/extensions/kdevquickopen.h +++ b/lib/interfaces/extensions/kdevquickopen.h @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDEVQUICKOPEN_H -#define KDEVQUICKOPEN_H +#ifndef KDEVTQUICKOPEN_H +#define KDEVTQUICKOPEN_H #include <kdevplugin.h> #include <kurl.h> @@ -51,11 +51,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) - :KDevPlugin(info, parent, name) {} + KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name) + :KDevPlugin(info, tqparent, name) {} /**Shows the file selection dialog. @param text A list of urls to open.*/ @@ -81,8 +81,8 @@ public: the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDEVQUICKOPEN_H -#define KDEVQUICKOPEN_H +#ifndef KDEVTQUICKOPEN_H +#define KDEVTQUICKOPEN_H #include <kdevplugin.h> #include <kurl.h> @@ -116,11 +116,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) - :KDevPlugin(info, parent, name) {} + KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name) + :KDevPlugin(info, tqparent, name) {} /**Shows the file selection dialog. @param text A list of urls to open.*/ diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h index 5ca33079..0542fbf1 100644 --- a/lib/interfaces/extensions/kdevsourceformatter.h +++ b/lib/interfaces/extensions/kdevsourceformatter.h @@ -51,11 +51,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name) - :KDevPlugin(info, parent, name) {} + KDevSourceFormatter(const KDevPluginInfo *info, TQObject* tqparent, const char* name) + :KDevPlugin(info, tqparent, name) {} /**Formats the source. @param text A string with a code. diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index 9b0571b8..63656c9e 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -135,6 +135,7 @@ if (vcs) { class KDevVersionControl: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: /**Constructs a VCS plugin. @@ -143,11 +144,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name ) - :KDevPlugin(info, parent, name ) {} + KDevVersionControl(const KDevPluginInfo *info, TQObject *tqparent, const char *name ) + :KDevPlugin(info, tqparent, name ) {} /**Creates a new project in the passed path @p dir. This should instantiate VCS infrastructure and import a project into the VCS in that directory. @@ -181,22 +182,23 @@ signals: /** Basic interface for providing info on file registered in a version control repository repository. */ -class KDevVCSFileInfoProvider: public QObject +class KDevVCSFileInfoProvider: public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. - @param parent The parent VCS plugin. + @param tqparent The tqparent VCS plugin. @param name The name of a provider object.*/ - KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name) - : TQObject( parent, name ), m_owner(parent) {} + KDevVCSFileInfoProvider(KDevVersionControl *tqparent, const char *name) + : TQObject( tqparent, name ), m_owner(tqparent) {} /**Gets the status for local files in the specified directory: the info are collected locally so they are necessarily in sync with the repository This is a <b>synchronous operation</b> (blocking). @param dirPath The relative (to project dir) directory path to stat. - @return Status for all <b>registered</b> files.*/ + @return tqStatus for all <b>registered</b> files.*/ virtual const VCSFileInfoMap *status(const TQString &dirPath) = 0; /**Starts a request for directory status to the remote repository. @@ -208,18 +210,18 @@ public: @param dirPath The (relative to project directory) directory which status you are asking for. @param callerData The pointer to some data you want the provider will return to you when it has done. - @param recursive If false, retrieve information only for dirPath's immediate children. + @param recursive If false, retrieve information only for dirPath's immediate tqchildren. @param checkRepos If true, contact remote repository and augment repository's status. If false, retrieve only for local modification information. @return true if the request has been successfully started, false otherwise.*/ - virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0; + virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0; signals: /**Emitted when the status request to remote repository has finished. @param fileInfoMap The status for <b>registered in repository</b> files. @param callerData The pointer to some data you want the provider will return to you when it has done - @see requestStatus for to find out when this signal should be used.*/ + @see requesttqStatus for to find out when this signal should be used.*/ void statusReady(const VCSFileInfoMap &fileInfoMap, void *callerData); protected: diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox index 4618c3d5..8b91bf8c 100644 --- a/lib/interfaces/external/Mainpage.dox +++ b/lib/interfaces/external/Mainpage.dox @@ -10,14 +10,14 @@ GUI Designer integration framework. \section designerintegration Overview of GUI designer integration process Each KPart that wants to act as a GUI Designer must implement @ref KInterfaceDesigner::Designer -interface. It defines necessary signals to communicate with an IDE and abstract virtual +interface. It defines necessary Q_SIGNALS to communicate with an IDE and abstract virtual functions to determine designer type. If a part which can "design" user interface files of a certain mimetype implements this interface and sets itself as a default handler for that mimetype then it becomes automatically integrated into KDevelop IDE. -When a part is embedded into KDevelop shell, its signals (defined in @ref +When a part is embedded into KDevelop shell, its Q_SIGNALS (defined in @ref KInterfaceDesigner::Designer interface): @code void addedFunction(DesignerType type, const QString &formName, Function function) @@ -26,7 +26,7 @@ KInterfaceDesigner::Designer interface): void editFunction(DesignerType type, const QString &formName, const QString &functionName) void editSource(DesignerType type, const QString &formName); @endcode -are connected to corresponding slots of KDevelop designer integration engine which can be implemented in KDevelop language support plugin. +are connected to corresponding Q_SLOTS of KDevelop designer integration engine which can be implemented in KDevelop language support plugin. Each language support which wants to use integrated designer, must reimplement @code diff --git a/lib/interfaces/external/designer.cpp b/lib/interfaces/external/designer.cpp index 606fd2b4..06c28d50 100644 --- a/lib/interfaces/external/designer.cpp +++ b/lib/interfaces/external/designer.cpp @@ -20,8 +20,8 @@ namespace KInterfaceDesigner{ -Designer::Designer(TQObject *parent, const char *name) - :KParts::ReadWritePart(parent, name) +Designer::Designer(TQObject *tqparent, const char *name) + :KParts::ReadWritePart(tqparent, name) { } diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index c254ab07..72d7508a 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -26,14 +26,14 @@ namespace KInterfaceDesigner{ /**The type of a GUI Designer.*/ enum DesignerType { - QtDesigner /**<Qt Designer.*/, + TQtDesigner /**<TQt Designer.*/, Glade /**<Glade (version >= 3).*/ }; /**Function type.*/ enum FunctionType { ftFunction /**<Simple function or a callback.*/, - ftQtSlot /**<Qt slot.*/ + ftTQtSlot /**<TQt slot.*/ }; /**Function.*/ @@ -65,8 +65,9 @@ mimetype then it becomes automatically integrated into KDevelop IDE. */ class Designer: public KParts::ReadWritePart{ Q_OBJECT + TQ_OBJECT public: - Designer(TQObject *parent, const char *name); + Designer(TQObject *tqparent, const char *name); /**Reimplement this to be able to open projects.*/ virtual void openProject(const TQString &projectFile) = 0; @@ -90,7 +91,7 @@ signals: /**Emitted when a form state is changed in the designer. @param formName An absolute name of the form file. @param status 0: form is clean, 1: form is modified.*/ - void newStatus(const TQString &formName, int status); + void newtqStatus(const TQString &formName, int status); }; } diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp index 22c701f1..08f5d19f 100644 --- a/lib/interfaces/extras/kdevcompileroptions.cpp +++ b/lib/interfaces/extras/kdevcompileroptions.cpp @@ -1,7 +1,7 @@ #include "kdevcompileroptions.h" -KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name ) - :TQObject(parent, name) +KDevCompilerOptions::KDevCompilerOptions( TQObject * tqparent, const char * name ) + :TQObject(tqparent, name) { } diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h index bac7e16e..15d9a066 100644 --- a/lib/interfaces/extras/kdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -34,7 +34,7 @@ Used by build systems to give users a compiler options configuration dialog. Common use case: @code -static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -49,7 +49,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(parent, service->name().latin1(), + TQObject *obj = factory->create(tqparent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) @@ -60,21 +60,22 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec } ... -KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent); +KDevCompilerOptions *plugin = createCompilerOptions(compilerName, tqparent); TQString flags = ""; //old compiler flags if ( plugin ) { - flags = plugin->exec( parent, flags ); //new compiler flags are returned + flags = plugin->exec( tqparent, flags ); //new compiler flags are returned delete plugin; } @endcode */ -class KDevCompilerOptions : public QObject +class KDevCompilerOptions : public TQObject { Q_OBJECT + TQ_OBJECT public: - KDevCompilerOptions( TQObject *parent=0, const char *name=0 ); + KDevCompilerOptions( TQObject *tqparent=0, const char *name=0 ); /** * Opens a dialog which allows the user to configure the @@ -82,9 +83,9 @@ public: * will be set from the flags argument of this method. * After the dialog is accepted, the new settings will * be returned as a string. If the dialog was cancelled, - * TQString::null is returned. + * TQString() is returned. */ - virtual TQString exec(TQWidget *parent, const TQString &flags) = 0; + virtual TQString exec(TQWidget *tqparent, const TQString &flags) = 0; }; #endif diff --git a/lib/interfaces/extras/kdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp index 5a6ab429..cb3cb263 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.cpp +++ b/lib/interfaces/extras/kdevvcsintegrator.cpp @@ -18,8 +18,8 @@ */ #include "kdevvcsintegrator.h" -KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name) - :TQObject(parent, name) +KDevVCSIntegrator::KDevVCSIntegrator(TQObject *tqparent, const char *name) + :TQObject(tqparent, name) { } diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h index 260f2a20..e13798e2 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -35,7 +35,7 @@ VCS Integration Dialog. Usually it is created as: @code class MyVCSDialog: public TQWidget, public VCSDialog { - MyVCSDialog(TQWidget *parent = 0, const char *name = 0); + MyVCSDialog(TQWidget *tqparent = 0, const char *name = 0); virtual void accept() { ... } virtual void init(const TQString &projectName, const TQString &projectLocation) { ... } virtual TQWidget *self() { @@ -52,8 +52,8 @@ public: virtual void accept() = 0; /**Init integration dialog with the project name and location.*/ virtual void init(const TQString &projectName, const TQString &projectLocation) = 0; - /**Reimplement to return an actual integration widget. Use QWidgets for that, not - QDialogs because integrator dialogs are usually have parent containers.*/ + /**Reimplement to return an actual integration widget. Use TQWidgets for that, not + TQDialogs because integrator dialogs are usually have tqparent containers.*/ virtual TQWidget *self() = 0; }; @@ -64,13 +64,14 @@ It can, for example, perform checkout or import operations. */ class KDevVCSIntegrator: public TQObject { Q_OBJECT + TQ_OBJECT public: - KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); + KDevVCSIntegrator(TQObject *tqparent = 0, const char *name = 0); /**Reimplement to return a dialog to fetch the project from VCS.*/ - virtual VCSDialog *fetcher(TQWidget *parent) = 0; + virtual VCSDialog *fetcher(TQWidget *tqparent) = 0; /**Reimplement to return a dialog to integrate the project into VCS.*/ - virtual VCSDialog *integrator(TQWidget *parent) = 0; + virtual VCSDialog *integrator(TQWidget *tqparent) = 0; }; #endif diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp index aae068a3..723dd28b 100644 --- a/lib/interfaces/hashedstring.cpp +++ b/lib/interfaces/hashedstring.cpp @@ -30,7 +30,7 @@ size_t hashStringSafe( const TQString& str ) { size_t hash = 0; int len = str.length(); for( int a = 0; a < len; a++ ) { - hash = str[a].unicode() + (hash * 17); + hash = str[a].tqunicode() + (hash * 17); } return hash; } @@ -43,12 +43,12 @@ size_t HashedString::hashString( const TQString& str ) size_t fastHashString( const TQString& str ) { size_t hash = 0; if( !str.isEmpty() ) { - const TQChar* curr = str.unicode(); + const TQChar* curr = str.tqunicode(); const TQChar* end = curr + str.length(); TQChar c; for(; curr < end ;) { c = *curr; - hash = c.unicode() + ( hash * 17 ); + hash = c.tqunicode() + ( hash * 17 ); ++curr; } } @@ -72,7 +72,7 @@ class HashedStringSetData : public KShared { mutable size_t m_hash; HashedStringSetData() : m_hashValid( false ) { } - inline void invalidateHash() { + inline void tqinvalidateHash() { 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->invalidateHash(); + m_data->tqinvalidateHash(); } bool HashedStringSet::operator <= ( const HashedStringSet& rhs ) const { diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h index f4264d2e..97ef2ad4 100644 --- a/lib/interfaces/katedocumentmanagerinterface.h +++ b/lib/interfaces/katedocumentmanagerinterface.h @@ -33,6 +33,7 @@ This is an emulated interface to provide compatibility with Kate scripts. class KateDocumentManagerInterface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: KateDocumentManagerInterface( KDevPartController *pc ); diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/kdevapi.h index a933811e..36fc3605 100644 --- a/lib/interfaces/kdevapi.h +++ b/lib/interfaces/kdevapi.h @@ -44,9 +44,10 @@ The interface to KDevelop's core components. Needs to be implemented in a shell. Developers do not need to use this class because @ref KDevPlugin already provides API convenience methods. */ -class KDevApi: public QObject +class KDevApi: public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor.*/ KDevApi(); diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/kdevcoderepository.h index 8b862f6b..791ae580 100644 --- a/lib/interfaces/kdevcoderepository.h +++ b/lib/interfaces/kdevcoderepository.h @@ -45,9 +45,10 @@ never or rarely changes. System libraries are perfect examples of such code. Symbols from code contained in project files are better stored in memory symbol store like @ref CodeModel. */ -class KDevCodeRepository : public QObject +class KDevCodeRepository : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor.*/ KDevCodeRepository(); diff --git a/lib/interfaces/kdevcore.cpp b/lib/interfaces/kdevcore.cpp index dda66cbf..700693d6 100644 --- a/lib/interfaces/kdevcore.cpp +++ b/lib/interfaces/kdevcore.cpp @@ -285,8 +285,8 @@ const ProjectModelItem* ProjectModelItemContext::item() const // class KDevCore /////////////////////////////////////////////////////////////////////////////// -KDevCore::KDevCore( TQObject *parent, const char *name ) - : TQObject( parent, name ) +KDevCore::KDevCore( TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ) { new KDevCoreIface(this); } diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index de2fccd8..09fba17c 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -297,14 +297,15 @@ It defines: - etc. . */ -class KDevCore: public QObject +class KDevCore: public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor - @param parent The TQObject that's the parent of this class. + @param tqparent The TQObject that's the tqparent of this class. @param name The name of the class.*/ - KDevCore(TQObject *parent=0, const char *name=0); + KDevCore(TQObject *tqparent=0, const char *name=0); /**Destructor.*/ virtual ~KDevCore(); diff --git a/lib/interfaces/kdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp index 0ba325ab..c95cfbe9 100644 --- a/lib/interfaces/kdevdesignerintegration.cpp +++ b/lib/interfaces/kdevdesignerintegration.cpp @@ -24,8 +24,8 @@ public: KDevDesignerIntegrationIface *m_iface; }; -KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name) - : TQObject(parent, name) +KDevDesignerIntegration::KDevDesignerIntegration(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { dptr = new KDevDesignerIntegrationPrivate(); diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h index c1604a4a..6cd8fffb 100644 --- a/lib/interfaces/kdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -40,22 +40,23 @@ into KDevelop GUI designers: Designer integration is a layer between visual form (GUI) designer of any type and the current language support. Usually designers create some kind of forms and allow developers to define actions which are executed upon some GUI events -(for example, Qt Designer allows to define slots connected to GUI signals). +(for example, TQt Designer allows to define slots connected to GUI signals). The actual code with action implementations needs to be written by hand in source files. Designer integration captures such implementation requests and opens necessary files at desired line numbers and adds (edits, removes) code for implementations. -For example, Qt Designer integration should be able to create an subclass for a form +For example, TQt Designer integration should be able to create an subclass for a form and reimplement slots defined in the form. */ -class KDevDesignerIntegration : public QObject +class KDevDesignerIntegration : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. - @param parent Parent object. + @param tqparent Parent object. @param name Internal name.*/ - KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0); + KDevDesignerIntegration(TQObject *tqparent = 0, const char *name = 0); /**Destructor.*/ ~KDevDesignerIntegration(); diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h index f928d815..4199d14a 100644 --- a/lib/interfaces/kdevgenericfactory.h +++ b/lib/interfaces/kdevgenericfactory.h @@ -51,8 +51,8 @@ static const KDevPluginInfo data("KDevDummyPlugin"); typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory; K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) -DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & ) - :KDevPlugin(&data, parent, name) +DummyPlugin::DummyPlugin(TQObject *tqparent, const char *name, const TQStringList & ) + :KDevPlugin(&data, tqparent, name) { } @endcode diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp index 9b3cc40b..b0449d6b 100644 --- a/lib/interfaces/kdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -29,8 +29,8 @@ #include "kdevdesignerintegration.h" #include "kdevlanguagesupport.h" -KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name) - : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" ) +KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name) + : KDevPlugin(info, tqparent, name ? name : "KDevLanguageSupport" ) { } @@ -50,7 +50,7 @@ KMimeType::List KDevLanguageSupport::mimeTypes() TQString KDevLanguageSupport::formatTag( const Tag& /*tag*/ ) { - return TQString::null; + return TQString(); } TQString KDevLanguageSupport::formatClassName(const TQString &name) diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index 78694193..765fde79 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -61,6 +61,7 @@ formatted name). class KDevLanguageSupport: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: @@ -90,10 +91,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name); + KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name); /**Destructor.*/ ~KDevLanguageSupport(); @@ -164,13 +165,13 @@ public: */ virtual void createAccessMethods(ClassDom theClass, VariableDom theVariable); - /**Opens an "Subclass Widget" dialog for given Qt .ui file (formName) + /**Opens an "Subclass Widget" dialog for given TQt .ui file (formName) and propmts to implement it's slots. @param formName The name of a form to subclass. @return A list of newly created files.*/ virtual TQStringList subclassWidget(const TQString& formName); - /**Opens an "Update Widget" dialog for given Qt .ui file (formName) + /**Opens an "Update Widget" dialog for given TQt .ui file (formName) and prompts to add missing slot implementations in the subclass located in fileName. @param formName The name of a form which is being subclassed. @@ -185,12 +186,12 @@ public: KDevDesignerIntegration *des = 0; switch (type) { - case KInterfaceDesigner::QtDesigner: + case KInterfaceDesigner::TQtDesigner: des = getDesignerFromCache(type); if (des == 0) { MyLanguageImplementationWidget *impl = new MyLanguageImplementationWidget(this); - des = new QtDesignerMyLanguageIntegration(this, impl); + des = new TQtDesignerMyLanguageIntegration(this, impl); des->loadSettings(*project()->projectDom(), "kdevmylangsupport/designerintegration"); saveDesignerToCache(type, des); } @@ -198,7 +199,7 @@ public: } return des; @endcode - @ref ImplementationWidget and @ref QtDesignerIntegration classes are available + @ref ImplementationWidget and @ref TQtDesignerIntegration classes are available from designerintegration support library. @param type The type of the designer to integrate. @return The pointer to designer integration of given type or 0.*/ diff --git a/lib/interfaces/kdevmainwindow.h b/lib/interfaces/kdevmainwindow.h index 5750be7e..c68dac77 100644 --- a/lib/interfaces/kdevmainwindow.h +++ b/lib/interfaces/kdevmainwindow.h @@ -47,7 +47,7 @@ public: @param view The view to embed. Must be a KPart. @param title The title of a view. @param toolTip The tooltip of a view.*/ - virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString::null) = 0; + virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString()) = 0; /**Embeds a toolview at the left of the main window. @param view The view to embed. Must be a KPart. diff --git a/lib/interfaces/kdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp index 58f1dc2a..09a47493 100644 --- a/lib/interfaces/kdevpartcontroller.cpp +++ b/lib/interfaces/kdevpartcontroller.cpp @@ -20,8 +20,8 @@ #include "kdevpartcontroller.h" #include "katedocumentmanagerinterface.h" -KDevPartController::KDevPartController(TQWidget *parent) - : KParts::PartManager(parent) +KDevPartController::KDevPartController(TQWidget *tqparent) + : KParts::PartManager(tqparent) { new KDevPartControllerIface(this); new KateDocumentManagerInterface(this); diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index be7084b9..e2ff8069 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -56,11 +56,12 @@ GUI designers, etc. class KDevPartController: public KParts::PartManager { Q_OBJECT + TQ_OBJECT public: /**Constructor. - @param parent The parent object.*/ - KDevPartController(TQWidget *parent); + @param tqparent The tqparent object.*/ + KDevPartController(TQWidget *tqparent); /**Call this before a call to @ref editDocument to set the encoding of the document to be opened. diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp index 5b4de199..d2a40332 100644 --- a/lib/interfaces/kdevplugin.cpp +++ b/lib/interfaces/kdevplugin.cpp @@ -54,11 +54,11 @@ struct KDevPlugin::Private // class KDevPlugin /////////////////////////////////////////////////////////////////////////////// -KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name) - :TQObject(parent, name), d(new Private) +KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name) + :TQObject(tqparent, name), d(new Private) { - assert(parent->inherits( "KDevApi" )); - m_api = static_cast<KDevApi *>( parent ); + assert(tqparent->inherits( "KDevApi" )); + m_api = static_cast<KDevApi *>( tqparent ); actionCollection()->setHighlightingEnabled( true ); diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index a683c5db..249ff808 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -78,7 +78,7 @@ plugin names in GUI (required); - <i>X-KDevelop-Plugin-Version</i> is a version of a plugin (optional); - <i>X-KDevelop-Plugin-Homepage</i> is a home page of a plugin (optional); - <i>X-KDevelop-Plugin-License</i> is a license (optional). can be: GPL, LGPL, BSD, Artistic, -QPL or Custom. If this property is not set, license is considered as unknown; +TQPL or Custom. If this property is not set, license is considered as unknown; - <i>X-KDevelop-Plugin-BugsEmailAddress</i> is an email address for bug reports (optional); - <i>X-KDevelop-Plugin-Copyright</i> is a copyright statement (optional); - <i>X-KDE-Library</i> is a name of library which contains the plugin (required); @@ -107,6 +107,7 @@ from shell applications. class KDevPlugin: public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: /**Constructs a plugin. @@ -115,10 +116,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0); + KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name = 0); /**Destructs a plugin.*/ virtual ~KDevPlugin(); @@ -182,7 +183,7 @@ public: They belong to the application rc file (kdeveloprc) @note Project session file is useful for settings which cannot be shared between developers. If a setting should be shared, modify projectDom instead. - @param el The parent DOM element for plugins session settings.*/ + @param el The tqparent DOM element for plugins session settings.*/ virtual void restorePartialProjectSession(const TQDomElement* el); /**Saves session settings. diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index 686fd1ce..d2459d17 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -28,7 +28,7 @@ KTrader::OfferList KDevPluginController::query(const TQString &serviceType, const TQString &constraint) { return KTrader::self()->query(serviceType, - TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION)); + TQString("%1 and [X-KDevelop-Version] == %2").tqarg(constraint).tqarg(KDEVELOP_PLUGIN_VERSION)); } KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h index 2ffba0ba..ee583ff4 100644 --- a/lib/interfaces/kdevplugincontroller.h +++ b/lib/interfaces/kdevplugincontroller.h @@ -36,9 +36,10 @@ class ProfileEngine; The base class for KDevelop plugin controller. Plugin controller is responsible for quering, loading and unloading available plugins. */ -class KDevPluginController: public QObject +class KDevPluginController: public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index daa64c2b..613c759d 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -149,7 +149,7 @@ TQString KDevPluginInfo::bugsEmailAddress() const TQVariant KDevPluginInfo::property(const TQString &name) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->property(name); return TQVariant(); @@ -162,7 +162,7 @@ TQVariant KDevPluginInfo::operator [](const TQString &name) const TQStringList KDevPluginInfo::propertyNames( ) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->propertyNames(); return TQStringList(); diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/kdevplugininfo.h index 50fe4601..746098c7 100644 --- a/lib/interfaces/kdevplugininfo.h +++ b/lib/interfaces/kdevplugininfo.h @@ -60,7 +60,7 @@ public: TQString version() const; /**@return A license type of a plugin. Information is taken from .desktop file.*/ int licenseType() const; - /**@return A license text for known license types (GPL, LGPL, BSD, Artistic, QPL).*/ + /**@return A license text for known license types (GPL, LGPL, BSD, Artistic, TQPL).*/ TQString license() const; /**@return A copyright statement of a plugin. Information is taken from .desktop file.*/ TQString copyrightStatement() const; diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index f558cc48..1c334a8d 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -37,8 +37,8 @@ struct KDevProject::Private { KDevProjectIface *m_iface; }; -KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) - : KDevPlugin(info, parent, name), d(new KDevProject::Private()) +KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *tqparent, const char *name) + : KDevPlugin(info, tqparent, name), d(new KDevProject::Private()) { connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); @@ -80,14 +80,14 @@ KDevProject::Options KDevProject::options() const bool KDevProject::isProjectFile( const TQString & absFileName ) { - return d->m_absToRel.contains( absFileName ); + return d->m_absToRel.tqcontains( absFileName ); } TQString KDevProject::relativeProjectFile( const TQString & absFileName ) { if( isProjectFile(absFileName) ) return d->m_absToRel[ absFileName ]; - return TQString::null; + return TQString(); } void KDevProject::buildFileMap() diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h index 3e27d886..62e936b4 100644 --- a/lib/interfaces/kdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -48,6 +48,7 @@ as a way of providing support for a build system (like it is done in KDevelop ID class KDevProject: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: /**Constructs a project plugin. @param info Important information about the plugin - plugin internal and generic @@ -55,10 +56,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref KDevApi + @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0); + KDevProject(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0); /**Destructor.*/ virtual ~KDevProject(); @@ -66,7 +67,7 @@ public: enum Options { UsesOtherBuildSystem = 0 /**<Project uses unknown or unspecified build system or build system is not used at all.*/, UsesAutotoolsBuildSystem = 1 /**<Project uses autotools for building.*/, - UsesQMakeBuildSystem =2 /**<Project uses qmake for building.*/ + UsesTQMakeBuildSystem =2 /**<Project uses qmake for building.*/ }; /**This method is invoked when the project is opened diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/kdevprojectiface.h index eb2a0f32..59323f71 100644 --- a/lib/interfaces/kdevprojectiface.h +++ b/lib/interfaces/kdevprojectiface.h @@ -34,6 +34,7 @@ DCOP Interface for the @ref KDevProject object. class KDevProjectIface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: KDevProjectIface(KDevProject *prj); @@ -62,7 +63,7 @@ k_dcop: TQStringList symlinkProjectFiles(); // Project DOM access - TQString readEntry(const TQString &path, const TQString &defaultEntry = TQString::null); + TQString readEntry(const TQString &path, const TQString &defaultEntry = TQString()); int readIntEntry(const TQString &path, int defaultEntry = 0); bool readBoolEntry(const TQString &path, bool defaultEntry = false); TQStringList readListEntry(const TQString &path, const TQString &tag); diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index 9c9d9130..2a99f23b 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -14,8 +14,8 @@ #include <tqapplication.h> #include <tqtimer.h> -BlockingKProcess::BlockingKProcess(TQObject *parent, const char *name) - : KProcess(parent, name) +BlockingKProcess::BlockingKProcess(TQObject *tqparent, const char *name) + : KProcess(tqparent, name) { m_stdOut = ""; m_stdErr = ""; @@ -68,24 +68,24 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm) void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen) { - m_stdOut += TQString::fromLatin1(buffer, buflen); + m_stdOut += TQString::tqfromLatin1(buffer, buflen); } void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen) { - m_stdErr += TQString::fromLatin1(buffer, buflen); + m_stdErr += TQString::tqfromLatin1(buffer, buflen); } void BlockingKProcess::slotProcessExited(KProcess *) { - qApp->exit_loop(); + tqApp->exit_loop(); } void BlockingKProcess::slotTimeOut() { m_timeout = true; kill(); - qApp->exit_loop(); + tqApp->exit_loop(); } @@ -95,9 +95,9 @@ void qt_leave_modal( TQWidget *widget ); void BlockingKProcess::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQWidget::NoFocus ); + dummy.setFocusPolicy( TQ_NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h index 4006af74..dd15002e 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingkprocess.h @@ -31,9 +31,10 @@ class TQTimer; class BlockingKProcess : public KProcess { Q_OBJECT + TQ_OBJECT public: - BlockingKProcess(TQObject *parent, const char *name=0); + BlockingKProcess(TQObject *tqparent, const char *name=0); BlockingKProcess(); virtual ~BlockingKProcess(); diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index 66f267b7..5ce6becf 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -43,12 +43,12 @@ ConfigWidgetProxy::~ConfigWidgetProxy() void ConfigWidgetProxy::createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) { - _globalTitleMap.insert( pagenumber, qMakePair( title, icon ) ); + _globalTitleMap.insert( pagenumber, tqMakePair( title, icon ) ); } void ConfigWidgetProxy::createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) { - _projectTitleMap.insert( pagenumber, qMakePair( title, icon ) ); + _projectTitleMap.insert( pagenumber, tqMakePair( title, icon ) ); } void ConfigWidgetProxy::removeConfigPage( int pagenumber ) @@ -92,14 +92,14 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page ) { if ( !page ) return; - PageMap::Iterator it = _pageMap.find( page ); + PageMap::Iterator it = _pageMap.tqfind( page ); if ( it != _pageMap.end() ) { - emit insertConfigWidget( static_cast<KDialogBase*>(const_cast<TQObject*>(sender())), page, it.data() ); + emit insertConfigWidget( static_cast<KDialogBase*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))), page, it.data() ); _pageMap.remove( it ); } } #include "configwidgetproxy.moc" -// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4; +// kate: space-indent off; indent-width 4; tqreplace-tabs off; tab-width 4; diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index 1ba7e5c5..c35c09c9 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -68,9 +68,10 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned Note that this replaces the functionality of typical KDevCore::configWidget() and KDevCore::projectConfigWidget() slots. */ -class ConfigWidgetProxy : public QObject +class ConfigWidgetProxy : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. @@ -104,7 +105,7 @@ signals: /** * The proxy emits this signal to notify the client that a specific config page has been requested. * @param dlg The settings dialog. The client should connect to its okClicked() signal. - * @param page The setting page. The client should use this as parent to the config widget. + * @param page The setting page. The client should use this as tqparent to the config widget. * @param pagenumber The identifier set in createGlobalConfigPage() or createProjectConfigPage(). Identifies the requested config page. */ void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ); @@ -116,7 +117,7 @@ private slots: void slotAboutToShowPage( TQWidget * page ); private: - typedef TQMap<unsigned int, QPair<TQString,TQString> > TitleMap; + typedef TQMap<unsigned int, TQPair<TQString,TQString> > TitleMap; typedef TQMap<TQWidget*, int> PageMap; TitleMap _globalTitleMap; @@ -126,4 +127,4 @@ private: #endif -// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4; +// kate: space-indent off; indent-width 4; tqreplace-tabs off; tab-width 4; diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp index 9f5d40c9..a8f036e6 100644 --- a/lib/util/domutil.cpp +++ b/lib/util/domutil.cpp @@ -57,7 +57,7 @@ TQString DomUtil::readEntryAux(const TQDomDocument &doc, const TQString &path) { TQDomElement el = elementByPath(doc, path); if (el.isNull()) - return TQString::null; + return TQString(); else return el.firstChild().toText().data(); } @@ -260,18 +260,18 @@ TQDomElement DomUtil::elementByPathExt(TQDomDocument &doc, const TQString &paths { DomPath dompath = resolvPathStringExt(pathstring); TQDomElement elem = doc.documentElement(); - TQDomNodeList children; + TQDomNodeList tqchildren; TQDomElement nextElem = elem; for (unsigned int j=0; j<dompath.count(); j++) { - children = nextElem.childNodes(); + tqchildren = nextElem.childNodes(); DomPathElement dompathelement= dompath[j]; bool wrongchild = false; int matchCount = 0; - for (unsigned int i=0; i<children.count(); i++) + for (unsigned int i=0; i<tqchildren.count(); i++) { wrongchild = false; - TQDomElement child = children.item(i).toElement(); + TQDomElement child = tqchildren.item(i).toElement(); TQString tag = child.tagName(); tag = dompathelement.tagName; if (child.tagName() == dompathelement.tagName) @@ -339,10 +339,10 @@ bool DomUtil::removeTextNodes(TQDomDocument doc,TQString pathExt) TQDomElement elem = elementByPathExt(doc,pathExt); if (elem.isNull()) return false; - TQDomNodeList children = elem.childNodes(); - for (unsigned int i=0;i<children.count();i++) - if (children.item(i).isText()) - elem.removeChild(children.item(i)); + TQDomNodeList tqchildren = elem.childNodes(); + for (unsigned int i=0;i<tqchildren.count();i++) + if (tqchildren.item(i).isText()) + elem.removeChild(tqchildren.item(i)); return true; } diff --git a/lib/util/domutil.h b/lib/util/domutil.h index 08d2571a..394b3600 100644 --- a/lib/util/domutil.h +++ b/lib/util/domutil.h @@ -45,7 +45,7 @@ typedef TQValueList<DomPathElement> DomPath; class DomUtil { public: - typedef QPair<TQString, TQString> Pair; + typedef TQPair<TQString, TQString> Pair; typedef TQValueList<Pair> PairList; /** * Remove all child elements from a given element. @@ -54,7 +54,7 @@ public: /** * Reads a string entry. */ - static TQString readEntry(const TQDomDocument &doc, const TQString &path, const TQString &defaultEntry = TQString::null); + static TQString readEntry(const TQDomDocument &doc, const TQString &path, const TQString &defaultEntry = TQString()); /** * Reads a number entry. */ @@ -168,13 +168,13 @@ public: Retrieve an element specified with extended path examples: - - 1: "widget|class=QDialog/property|name=geometry" - or "widget|class=QDialog/property||1" + - 1: "widget|class=TQDialog/property|name=tqgeometry" + or "widget|class=TQDialog/property||1" - 2: "widget/property|name=caption/string" or "widget/property||2/string" . \verbatim - <widget class="TQDialog"> + <widget class=TQDIALOG_OBJECT_NAME_STRING> <property name="name"> <cstring>KdevFormName</cstring> </property> @@ -205,17 +205,17 @@ public: static bool saveDOMFile(TQDomDocument &doc, TQString filename); /** - * Remove all child text nodes of parent described in pathExt + * Remove all child text nodes of tqparent described in pathExt */ static bool removeTextNodes(TQDomDocument doc,TQString pathExt); /** - * Add child text node to parent described in pathExt + * Add child text node to tqparent described in pathExt */ static bool appendText(TQDomDocument doc, TQString pathExt, TQString text); /** - * Replace all chilt text nodes of parent described in pathExt with one new. + * Replace all chilt text nodes of tqparent described in pathExt with one new. */ static bool replaceText(TQDomDocument doc, TQString pathExt, TQString text); diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 7c4fea89..e1236474 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -26,8 +26,8 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, const TQString& workingDir, const TQStringList& env, - TQObject* parent, const char* name ): - TQObject( parent, name ), out( "" ) /* make sure out is not TQString::null since that would mean "error" */ + TQObject* tqparent, const char* name ): + TQObject( tqparent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */ { progressDlg = 0; @@ -49,15 +49,15 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); if ( !ok ) { - KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ), + KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").tqarg( executable ), i18n("Error Invoking Command") ); - emit finished( TQString::null, TQString::null ); + emit finished( TQString(), TQString() ); deleteLater(); } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), - i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); + i18n("Please wait until the \"%1\" command finishes.").tqarg( executable ), false ); connect( progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()) ); } @@ -88,7 +88,7 @@ void ExecCommand::cancelClicked() progressDlg = 0; proc->kill(); - emit finished( TQString::null, TQString::null ); + emit finished( TQString(), TQString() ); deleteLater(); } diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h index c3e20d47..5be67682 100644 --- a/lib/util/execcommand.h +++ b/lib/util/execcommand.h @@ -37,18 +37,19 @@ Command execution facilities. * a progress dialog with the possibility to cancel the command. * * If there was an error or the user pressed cancel, finished () - * will emit a TQString::null, otherwise QStrings containing the stdout/stderr. + * will emit a TQString(), otherwise TQStrings containing the stdout/stderr. * * The object will delete itself after the finished signal has been emitted. - * Additional environment can be set in the TQStringList env via QStrings with the format "foo=blah" + * Additional environment can be set in the TQStringList env via TQStrings with the format "foo=blah" */ -class ExecCommand : public QObject +class ExecCommand : public TQObject { Q_OBJECT + TQ_OBJECT public: ExecCommand( const TQString& executable, const TQStringList& args, - const TQString& workingDir = TQString::null, - const TQStringList& env = TQStringList(), TQObject* parent = 0, const char* name = 0 ); + const TQString& workingDir = TQString(), + const TQStringList& env = TQStringList(), TQObject* tqparent = 0, const char* name = 0 ); ~ExecCommand(); signals: diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp index cbf4f8bb..f153642f 100644 --- a/lib/util/filetemplate.cpp +++ b/lib/util/filetemplate.cpp @@ -56,7 +56,7 @@ TQString FileTemplate::readFile(KDevPlugin *part, const TQString &fileName) TQFile f(fileName); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQTextStream stream(&f); TQString str = stream.read(); @@ -69,19 +69,19 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString & TQString email = DomUtil::readEntry(dom, "/general/email"); TQString version = DomUtil::readEntry(dom, "/general/version"); TQString appname = DomUtil::readEntry(dom, "/general/projectname"); - TQString date = TQDate::currentDate().toString(); - TQString year = TQString::number(TQDate::currentDate().year()); + TQString date = TQDate::tqcurrentDate().toString(); + TQString year = TQString::number(TQDate::tqcurrentDate().year()); TQString str = text; - str.replace(TQRegExp("\\$EMAIL\\$"),email); - str.replace(TQRegExp("\\$AUTHOR\\$"),author); - str.replace(TQRegExp("\\$VERSION\\$"),version); - str.replace(TQRegExp("\\$DATE\\$"),date); - str.replace(TQRegExp("\\$YEAR\\$"),year); - str.replace(TQRegExp("\\$APPNAME\\$"),appname); - str.replace(TQRegExp("\\$APPNAME\\$"),appname); - str.replace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper()); - str.replace(TQRegExp("\\$APPNAMELC\\$"),appname.lower()); + str.tqreplace(TQRegExp("\\$EMAIL\\$"),email); + str.tqreplace(TQRegExp("\\$AUTHOR\\$"),author); + str.tqreplace(TQRegExp("\\$VERSION\\$"),version); + str.tqreplace(TQRegExp("\\$DATE\\$"),date); + str.tqreplace(TQRegExp("\\$YEAR\\$"),year); + str.tqreplace(TQRegExp("\\$APPNAME\\$"),appname); + str.tqreplace(TQRegExp("\\$APPNAME\\$"),appname); + str.tqreplace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper()); + str.tqreplace(TQRegExp("\\$APPNAMELC\\$"),appname.lower()); return str; } @@ -99,8 +99,8 @@ bool FileTemplate::copy(KDevPlugin *part, const TQString &name, TQFileInfo fi(f); TQString module = fi.baseName(); TQString basefilename = fi.baseName(true); - text.replace(TQRegExp("\\$MODULE\\$"),module); - text.replace(TQRegExp("\\$FILENAME\\$"),basefilename); + text.tqreplace(TQRegExp("\\$MODULE\\$"),module); + text.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename); TQTextStream stream(&f); stream << text; diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp index ca946ce6..3c01f780 100644 --- a/lib/util/kdeveditorutil.cpp +++ b/lib/util/kdeveditorutil.cpp @@ -66,7 +66,7 @@ TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor:: TQString linestr = editIface->textLine(line); - int startPos = QMAX( QMIN( (int)col, (int)linestr.length()-1 ), 0 ); + int startPos = TQMAX( TQMIN( (int)col, (int)linestr.length()-1 ), 0 ); int endPos = startPos; startPos--; while (startPos >= 0 && ( linestr[startPos].isLetterOrNumber() || linestr[startPos] == '_' || linestr[startPos] == '~') ) @@ -74,7 +74,7 @@ TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor:: while (endPos < (int)linestr.length() && ( linestr[endPos].isLetterOrNumber() || linestr[endPos] == '_' ) ) endPos++; - return ( ( startPos == endPos ) ? TQString::null : linestr.mid( startPos+1, endPos-startPos-1 ) ); + return ( ( startPos == endPos ) ? TQString() : linestr.mid( startPos+1, endPos-startPos-1 ) ); } diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp index b0b78250..a4ac7aa2 100644 --- a/lib/util/kdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -11,8 +11,8 @@ #include "kdevjobtimer.h" -KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) - : TQTimer(parent, name) +KDevJobTimer::KDevJobTimer( void * payload, TQObject *tqparent, const char *name) + : TQTimer(tqparent, name) { m_payload = payload; connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h index 19915d06..5fb9dbba 100644 --- a/lib/util/kdevjobtimer.h +++ b/lib/util/kdevjobtimer.h @@ -14,9 +14,10 @@ #include <tqtimer.h> -class KDevJobTimer : public QTimer +class KDevJobTimer : public TQTimer { Q_OBJECT + TQ_OBJECT public: static void singleShot( int msec, TQObject * receiver, const char * member, void * payload ); @@ -24,7 +25,7 @@ signals: void timeout(void*); private: - KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0); + KDevJobTimer( void * payload, TQObject *tqparent = 0, const char *name = 0); ~KDevJobTimer(); private slots: diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index f9f07fd8..0ea05299 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -20,8 +20,8 @@ #include "kdevshellwidget.h" -KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name) - : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false ) +KDevShellWidget::KDevShellWidget(TQWidget *tqparent, const char *name) + : TQVBox(tqparent, name), m_doAutoActivate( false ), m_isRunning( false ) { } @@ -41,14 +41,14 @@ void KDevShellWidget::activate( ) KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); if ( !factory ) return; - m_konsolePart = (KParts::ReadOnlyPart *) factory->create( this, "libkonsolepart", "KParts::ReadOnlyPart" ); + m_konsolePart = (KParts::ReadOnlyPart *) factory->create( TQT_TQOBJECT(this), "libkonsolepart", "KParts::ReadOnlyPart" ); if ( !m_konsolePart ) return; connect( m_konsolePart, TQT_SIGNAL( processExited(KProcess *) ), this, TQT_SLOT( processExited(KProcess *) ) ); connect( m_konsolePart, TQT_SIGNAL( receivedData( const TQString& ) ), this, TQT_SIGNAL( receivedData( const TQString& ) ) ); connect( m_konsolePart, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()) ); - m_konsolePart->widget()->setFocusPolicy( TQWidget::WheelFocus ); + m_konsolePart->widget()->setFocusPolicy( TQ_WheelFocus ); setFocusProxy( m_konsolePart->widget() ); m_konsolePart->widget()->setFocus(); diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 69198a7a..62dbf171 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -23,13 +23,14 @@ namespace KParts class ReadOnlyPart; } -class KDevShellWidget : public QVBox +class KDevShellWidget : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KDevShellWidget(TQWidget *parent = 0, const char *name = 0); + KDevShellWidget(TQWidget *tqparent = 0, const char *name = 0); virtual ~KDevShellWidget(); /** diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index ffc3a536..9b764a75 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -95,12 +95,12 @@ void KScriptAction::activate( ) } else { - KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").arg(m_scriptType), i18n("KScript Error")); + KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").tqarg(m_scriptType), i18n("KScript Error")); kdDebug() << "Query string: " << scriptTypeQuery << endl; return; } } - m_interface->run(parent(), TQVariant()); + m_interface->run(tqparent(), TQVariant()); m_timeout->start(60000,FALSE); // after 1 minute unload m_refs++; } @@ -119,7 +119,7 @@ void KScriptAction::scriptFinished() m_refs--; } -KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac) +KScriptActionManager::KScriptActionManager( TQObject *tqparent, KActionCollection * ac ) : TQObject(tqparent), m_ac(ac) { m_actions.setAutoDelete(true); } diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h index d04c0518..69de43ac 100644 --- a/lib/util/kscriptactionmanager.h +++ b/lib/util/kscriptactionmanager.h @@ -37,6 +37,7 @@ class TQTimer; */ class KScriptAction : public TQObject, public KScriptClientInterface { Q_OBJECT + TQ_OBJECT public: KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ); @@ -92,12 +93,13 @@ private: */ class KScriptActionManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Create a script manager that is attached to an action collection. */ - KScriptActionManager( TQObject *parent, KActionCollection *ac ); + KScriptActionManager( TQObject *tqparent, KActionCollection *ac ); ~KScriptActionManager(); /** diff --git a/lib/util/rurl.cpp b/lib/util/rurl.cpp index 0d631bda..86ca920a 100644 --- a/lib/util/rurl.cpp +++ b/lib/util/rurl.cpp @@ -113,26 +113,26 @@ TQString Name::extension( bool complete ) const { TQString temp = fileName(); if (complete) - return temp.mid(temp.find('.')+1); + return temp.mid(temp.tqfind('.')+1); else - return temp.mid(temp.findRev('.')+1); + return temp.mid(temp.tqfindRev('.')+1); } - return TQString::null; + return TQString(); } TQString Name::fileName( ) const { if (m_type == File) return m_rurl.section('/', -1); - return TQString::null; + return TQString(); } TQString Name::directory( ) const { - if ( (m_type == File) && (m_rurl.findRev('/') == -1) ) - return TQString::null; + if ( (m_type == File) && (m_rurl.tqfindRev('/') == -1) ) + return TQString(); - return m_rurl.mid(0, m_rurl.findRev('/')+1); + return m_rurl.mid(0, m_rurl.tqfindRev('/')+1); } bool Name::isFile( ) const @@ -159,7 +159,7 @@ bool Name::isValid( ) const { if (m_rurl.startsWith("/")) return false; - if (m_rurl.contains("//")) + if (m_rurl.tqcontains("//")) return false; if ( (m_rurl.endsWith("/")) && (m_type == File) ) return false; diff --git a/lib/util/rurl.h b/lib/util/rurl.h index 5ab2ec73..09d14b43 100644 --- a/lib/util/rurl.h +++ b/lib/util/rurl.h @@ -41,14 +41,14 @@ public: /**Removes "//" from the name.*/ void cleanRURL(); - /**Returns the extension of a file or TQString::null for directories. + /**Returns the extension of a file or TQString() for directories. If complete is true then returns extensions like "tar.gz". Else returns "gz".*/ TQString extension(bool complete = true) const; - /**Returns the name of the file without the path or TQString::null + /**Returns the name of the file without the path or TQString() for directories.*/ TQString fileName() const; - /**Returns the name of the directory or TQString::null if there are no dirs in path.*/ + /**Returns the name of the directory or TQString() if there are no dirs in path.*/ TQString directory() const; /**Returns true if the type of RName is file.*/ diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index 129cdd66..9855b06b 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -23,12 +23,12 @@ TQString Settings::terminalEmulatorName( KConfig & config ) if ( useKDESetting ) { - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); - terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + terminal = confGroup.readEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); } else { - terminal = config.readEntry( "TerminalApplication", TQString::fromLatin1("konsole")); + terminal = config.readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole")); } return terminal; } @@ -46,9 +46,9 @@ TQString Settings::profileByAttributes(const TQString &language, const TQStringL for (TQStringList::const_iterator it = profileKeywords.constBegin(); it != profileKeywords.constEnd(); ++it) { - if (keywords.contains(*it)) + if (keywords.tqcontains(*it)) { - idx = profileKeywords.findIndex(*it); + idx = profileKeywords.tqfindIndex(*it); break; } } diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp index 849cc555..5f4d2dcd 100644 --- a/lib/util/urlutil.cpp +++ b/lib/util/urlutil.cpp @@ -37,14 +37,14 @@ /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::filename(const TQString & name) { - int slashPos = name.findRev("/"); + int slashPos = name.tqfindRev("/"); return slashPos<0 ? name : name.mid(slashPos+1); } /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::directory(const TQString & name) { - int slashPos = name.findRev("/"); + int slashPos = name.tqfindRev("/"); return slashPos<0 ? TQString("") : name.left(slashPos); } @@ -82,29 +82,29 @@ TQString URLUtil::getRelativePath(const TQString& basepath, const TQString& dest /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) { +TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) { bool slashPrefix = slashPolicy & SLASH_PREFIX; bool slashSuffix = slashPolicy & SLASH_SUFFIX; - if (parent.equals(child,true)) + if (tqparent.equals(child,true)) return slashPrefix ? TQString("/") : TQString(""); - if (!parent.isParentOf(child)) return TQString(); + if (!tqparent.isParentOf(child)) return TQString(); int a=slashPrefix ? -1 : 1; int b=slashSuffix ? 1 : -1; - return child.path(b).mid(parent.path(a).length()); + return child.path(b).mid(tqparent.path(a).length()); } /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) { - return relativePath(KURL(parent), KURL(child), slashPolicy); +TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) { + return relativePath(KURL(tqparent), KURL(child), slashPolicy); } /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::upDir(const TQString & path, bool slashSuffix) { - int slashPos = path.findRev("/"); - if (slashPos<1) return TQString::null; + int slashPos = path.tqfindRev("/"); + if (slashPos<1) return TQString(); return path.mid(0,slashPos+ (slashSuffix ? 1 : 0) ); } @@ -132,7 +132,7 @@ KURL URLUtil::mergeURL(const KURL & source, const KURL & dest, const KURL & chil /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::getExtension(const TQString & path) { - int dotPos = path.findRev('.'); + int dotPos = path.tqfindRev('.'); if (dotPos<0) return TQString(""); return path.mid(dotPos+1); } @@ -143,7 +143,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur { TQString absBase = extractPathNameAbsolute( baseDirUrl ), absRef = extractPathNameAbsolute( url ); - int i = absRef.find( absBase, 0, true ); + int i = absRef.tqfind( absBase, 0, true ); if (i == -1) return TQString(); @@ -151,7 +151,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur if (absRef == absBase) return TQString( "." ); else - return absRef.replace( 0, absBase.length(), TQString() ); + return absRef.tqreplace( 0, absBase.length(), TQString() ); } /////////////////////////////////////////////////////////////////////////////// @@ -298,12 +298,12 @@ TQString URLUtil::envExpand ( const TQString& str ) if (len > 1 && str[0] == '$') { - int pos = str.find ('/'); + int pos = str.tqfind ('/'); if (pos < 0) pos = len; - char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); + char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() ); if (ret) { diff --git a/lib/util/urlutil.h b/lib/util/urlutil.h index e8c84607..39615858 100644 --- a/lib/util/urlutil.h +++ b/lib/util/urlutil.h @@ -50,27 +50,27 @@ namespace URLUtil */ TQString directory(const TQString & pathName); /** - * @return The relative path between a parent and child URL, or blank if the specified - * child is not a child of parent. - * @param parent The parent URL. + * @return The relative path between a tqparent and child URL, or blank if the specified + * child is not a child of tqparent. + * @param tqparent The tqparent URL. * @param child The child URL. - * @param slashPolicy If parent and child are equal then the function returns "/" if + * @param slashPolicy If tqparent and child are equal then the function returns "/" if * slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX); /** - * @return The relative path between a parent and child URL, or blank if the specified - * child is not a child of parent. - * @param parent The parent URL. + * @return The relative path between a tqparent and child URL, or blank if the specified + * child is not a child of tqparent. + * @param tqparent The tqparent URL. * @param child The child URL. - * @param slashPolicy If parent and child are equal then the function returns "/" if + * @param slashPolicy If tqparent and child are equal then the function returns "/" if * slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX); /** * @return The relative path between a base path and destination path or. * @param base The base Path. @@ -133,7 +133,7 @@ namespace URLUtil TQString extractPathNameRelative(const KURL &baseDirUrl, const KURL &url ); /**Same as above. @p basePath is TQString.*/ TQString extractPathNameRelative(const TQString &basePath, const KURL &url ); - /**Same as above. Both @p basePath and @p absFilePath are QStrings.*/ + /**Same as above. Both @p basePath and @p absFilePath are TQStrings.*/ TQString extractPathNameRelative(const TQString &basePath, const TQString &absFilePath ); /** @@ -167,10 +167,10 @@ namespace URLUtil * @param urls URLs to dump. * @param aMessage Message to be written onto a stdout. */ - void dump( const KURL::List &urls, const TQString &aMessage = TQString::null ); + void dump( const KURL::List &urls, const TQString &aMessage = TQString() ); /** - * Same as TQDir::canonicalPath in later versions of Qt. Earlier versions of Qt + * Same as TQDir::canonicalPath in later versions of TQt. Earlier versions of TQt * had this broken, so it's reproduced here. * Deprecated, use TQDir::canonicalPath instead. */ diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp index 6e60f1a4..26677de6 100644 --- a/lib/widgets/fancylistviewitem.cpp +++ b/lib/widgets/fancylistviewitem.cpp @@ -108,13 +108,13 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg, if ( isEnabled() || !lv ) p->setPen( cg.highlightedText() ); else if ( !isEnabled() && lv) - p->setPen( lv->palette().disabled().highlightedText() ); + p->setPen( lv->tqpalette().disabled().highlightedText() ); } { if ( isEnabled() || !lv ) p->setPen( cg.text() ); else if ( !isEnabled() && lv) - p->setPen( lv->palette().disabled().text() ); + p->setPen( lv->tqpalette().disabled().text() ); int iconWidth = 0; @@ -129,7 +129,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg, else if ( align & AlignTop ) yo = 0; -// respect horizontal alignment when there is no text for an item. +// respect horizontal tqalignment when there is no text for an item. if ( t.isEmpty() ) { if ( align & AlignRight ) xo = width - 2 * marg - iconWidth; @@ -193,7 +193,7 @@ int FancyListViewItem::width(const TQFontMetrics &fm, const TQListView *lv, int if ( pm ) width += pm->width() + lv->itemMargin(); - width = QMAX( width, TQApplication::globalStrut().width() ); + width = TQMAX( width, TQApplication::globalStrut().width() ); } else width = TQListViewItem::width(fm, lv, column); diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h index ab8b3310..9673d8cc 100644 --- a/lib/widgets/fancylistviewitem.h +++ b/lib/widgets/fancylistviewitem.h @@ -53,7 +53,7 @@ class TextPaintStyleStore { } Item& getStyle( int num ) { - Store::Iterator it = m_styles.find( num ); + Store::Iterator it = m_styles.tqfind( num ); if( it != m_styles.end() ) return *it; return m_styles[0]; } @@ -67,7 +67,7 @@ class TextPaintStyleStore { } bool hasStyle( int num ) { - Store::Iterator it = m_styles.find( num ); + Store::Iterator it = m_styles.tqfind( num ); return ( it != m_styles.end() ); } @@ -124,11 +124,11 @@ class TextPaintItem { class FancyListViewItem : public KListViewItem { public: - FancyListViewItem(TextPaintStyleStore& styles, TQListView *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListView *tqparent, const TQString &label1, const TQString &label2="") : KListViewItem(tqparent, label1, label2), m_styles(styles) { init(label1, label2); } - FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *tqparent, const TQString &label1, const TQString &label2="") : KListViewItem(tqparent, label1, label2), m_styles(styles) { init(label1, label2); } diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index e109a36d..53a9af77 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -35,8 +35,8 @@ #include "flagboxes.h" -// partial copy of Qt-3.1 for back-compatibility to KDE-3.0 -TQString QRegExp_escape( const TQString& str ) +// partial copy of TQt-3.1 for back-compatibility to KDE-3.0 +TQString TQRegExp_escape( const TQString& str ) { static const char meta[] = "$()*+.?[\\]^{|}"; TQString quoted = str; @@ -51,47 +51,47 @@ TQString QRegExp_escape( const TQString& str ) } -class FlagListToolTip : public QToolTip +class FlagListToolTip : public TQToolTip { public: - FlagListToolTip(TQWidget *parent); + FlagListToolTip(TQWidget *tqparent); protected: void maybeTip(const TQPoint &p); }; -FlagListToolTip::FlagListToolTip(TQWidget *parent) - : TQToolTip(parent) +FlagListToolTip::FlagListToolTip(TQWidget *tqparent) + : TQToolTip(tqparent) {} void FlagListToolTip::maybeTip(const TQPoint &pos) { - FlagListBox *listbox = static_cast<FlagListBox*>(parentWidget()); + FlagListBox *listbox = static_cast<FlagListBox*>(tqparentWidget()); TQListViewItem *item = listbox->itemAt(pos); FlagListItem *flitem = static_cast<FlagListItem*>(item); if (item) - tip(listbox->itemRect(item), flitem->desc); + tip(listbox->tqitemRect(item), flitem->desc); } -FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr, +FlagListItem::FlagListItem(FlagListBox *tqparent, const TQString &flagstr, const TQString &description) - : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), + : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), desc(description) {} -FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr, +FlagListItem::FlagListItem(FlagListBox *tqparent, const TQString &flagstr, const TQString &description, const TQString &offstr) - : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), + : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), off(offstr), desc(description) {} -FlagListBox::FlagListBox(TQWidget *parent, const char *name) - : TQListView(parent, name) +FlagListBox::FlagListBox(TQWidget *tqparent, const char *name) + : TQListView(tqparent, name) { setResizeMode(LastColumn); header()->hide(); @@ -105,12 +105,12 @@ void FlagListBox::readFlags(TQStringList *list) TQListViewItem *item = firstChild(); for (; item; item = item->nextSibling()) { FlagListItem *flitem = static_cast<FlagListItem*>(item); - TQStringList::Iterator sli = list->find(flitem->flag); + TQStringList::Iterator sli = list->tqfind(flitem->flag); if (sli != list->end()) { flitem->setOn(true); list->remove(sli); } - sli = list->find(flitem->off); + sli = list->tqfind(flitem->off); if (sli != list->end()) { flitem->setOn(false); list->remove(sli); @@ -130,28 +130,28 @@ void FlagListBox::writeFlags(TQStringList *list) } -FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description) - : TQCheckBox(description, parent), flag(flagstr), includeOff(false), useDef(false), defSet(false) + : TQCheckBox(description, tqparent), flag(flagstr), includeOff(false), useDef(false), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr) - : TQCheckBox(description, parent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false) + : TQCheckBox(description, tqparent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr, const TQString &defstr) - : TQCheckBox(description, parent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false) + : TQCheckBox(description, tqparent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); @@ -205,13 +205,13 @@ void FlagCheckBoxController::readFlags(TQStringList *list) TQPtrListIterator<FlagCheckBox> it(cblist); for (; it.current(); ++it) { FlagCheckBox *fitem = it.current(); - TQStringList::Iterator sli = list->find(fitem->flag); + TQStringList::Iterator sli = list->tqfind(fitem->flag); if (sli != list->end()) { fitem->setChecked(true); fitem->useDef = false; list->remove(sli); } - sli = list->find(fitem->off); + sli = list->tqfind(fitem->off); if (sli != list->end()) { fitem->setChecked(false); fitem->includeOff = true; @@ -270,13 +270,13 @@ void FlagPathEditController::readFlags( TQStringList * list ) if ((*sli).startsWith(peitem->flag)) { // kdDebug() << "Processing.." << endl; - peitem->setText((*sli).replace(TQRegExp(QRegExp_escape(peitem->flag)),"")); + peitem->setText((*sli).tqreplace(TQRegExp(TQRegExp_escape(peitem->flag)),"")); sli = list->remove(sli); continue; } ++sli; } -/* TQStringList::Iterator sli = list->find(peitem->flag); +/* TQStringList::Iterator sli = list->tqfind(peitem->flag); if (sli != list->end()) { peitem->setText((*sli).remove(peitem->flag)); list->remove(sli); @@ -299,29 +299,29 @@ void FlagPathEditController::addPathEdit( FlagPathEdit * item ) plist.append(item); } -FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, +FlagPathEdit::FlagPathEdit( TQWidget * tqparent, TQString pathDelimiter, FlagPathEditController * controller, const TQString & flagstr, const TQString & description, KFile::Mode mode ) - : TQWidget(parent), delimiter(pathDelimiter), flag(flagstr), m_description(description) + : TQWidget(tqparent), delimiter(pathDelimiter), flag(flagstr), m_description(description) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); - TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); if (delimiter.isEmpty()) { url = new KURLRequester(this); url->setMode(mode); - layout->addWidget(url); + tqlayout->addWidget(url); } else { edit = new KLineEdit(this); - layout->addWidget(edit); + tqlayout->addWidget(edit); details = new TQPushButton("...", this); details->setMaximumWidth(30); connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails())); - layout->addWidget(details); + tqlayout->addWidget(details); } TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); @@ -379,8 +379,8 @@ bool FlagPathEdit::isEmpty( ) return edit->text().isEmpty(); } -FlagRadioButton::FlagRadioButton( TQWidget * parent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description ) - : TQRadioButton(description, parent), flag(flagstr) +FlagRadioButton::FlagRadioButton( TQWidget * tqparent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description ) + : TQRadioButton(description, tqparent), flag(flagstr) { TQToolTip::add(this, flagstr); controller->addRadioButton(this); @@ -433,7 +433,7 @@ void FlagRadioButtonController::readFlags(TQStringList *list) TQPtrListIterator<FlagRadioButton> it(cblist); for (; it.current(); ++it) { FlagRadioButton *fitem = it.current(); - TQStringList::Iterator sli = list->find(fitem->flag); + TQStringList::Iterator sli = list->tqfind(fitem->flag); if (sli != list->end()) { fitem->setChecked(true); list->remove(sli); @@ -471,7 +471,7 @@ void FlagEditController::readFlags( TQStringList * list ) { if ((*sli).startsWith(peitem->flag)) { - peitem->appendText((*sli).replace(TQRegExp(QRegExp_escape(peitem->flag)),"")); + peitem->appendText((*sli).tqreplace(TQRegExp(TQRegExp_escape(peitem->flag)),"")); sli = list->remove(sli); continue; } @@ -489,7 +489,7 @@ void FlagEditController::readFlags( TQStringList * list ) { if ((*sli).startsWith(sitem->flag)) { - sitem->setText((*sli).replace(TQRegExp(QRegExp_escape(sitem->flag)),"")); + sitem->setText((*sli).tqreplace(TQRegExp(TQRegExp_escape(sitem->flag)),"")); sli = list->remove(sli); continue; } @@ -526,22 +526,22 @@ void FlagEditController::addSpinBox(FlagSpinEdit *item) } -FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditController * controller, +FlagListEdit::FlagListEdit( TQWidget * tqparent, TQString listDelimiter, FlagEditController * controller, const TQString & flagstr, const TQString & description) - : TQWidget(parent), delimiter(listDelimiter), flag(flagstr), m_description(description) + : TQWidget(tqparent), delimiter(listDelimiter), flag(flagstr), m_description(description) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); - TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); edit = new KLineEdit(this); - layout->addWidget(edit); + tqlayout->addWidget(edit); if (! listDelimiter.isEmpty()) { details = new TQPushButton("...", this); details->setMaximumWidth(30); connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails())); - layout->addWidget(details); + tqlayout->addWidget(details); } TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); @@ -601,8 +601,8 @@ TQStringList FlagListEdit::flags( ) return fl; } -FlagSpinEdit::FlagSpinEdit( TQWidget * parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description ) - :TQWidget(parent), m_defaultVal(defaultVal), flag(flagstr) +FlagSpinEdit::FlagSpinEdit( TQWidget * tqparent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description ) + :TQWidget(tqparent), m_defaultVal(defaultVal), flag(flagstr) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); @@ -624,7 +624,7 @@ void FlagSpinEdit::setText( const TQString text ) TQString FlagSpinEdit::text( ) { - return TQString("%1").arg(spb->value()); + return TQString("%1").tqarg(spb->value()); } TQString FlagSpinEdit::flags( ) diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h index e45d8230..a2193277 100644 --- a/lib/widgets/flagboxes.h +++ b/lib/widgets/flagboxes.h @@ -46,12 +46,12 @@ class TQPushButton; class KURLRequester; /**List item holding a compiler flag.*/ -class FlagListItem : public QCheckListItem +class FlagListItem : public TQCheckListItem { public: - FlagListItem(FlagListBox *parent, const TQString &flagstr, + FlagListItem(FlagListBox *tqparent, const TQString &flagstr, const TQString &description); - FlagListItem(FlagListBox *parent, const TQString &flagstr, + FlagListItem(FlagListBox *tqparent, const TQString &flagstr, const TQString &description, const TQString &offstr); ~FlagListItem() {} @@ -65,11 +65,12 @@ private: /**List box item holding a compiler flag.*/ -class FlagListBox : public QListView +class FlagListBox : public TQListView { Q_OBJECT + TQ_OBJECT public: - FlagListBox( TQWidget *parent=0, const char *name=0 ); + FlagListBox( TQWidget *tqparent=0, const char *name=0 ); ~FlagListBox() {} @@ -79,16 +80,17 @@ public: /**Check box item holding a compiler flag.*/ -class FlagCheckBox : public QCheckBox +class FlagCheckBox : public TQCheckBox { Q_OBJECT + TQ_OBJECT public: - FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description); - FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr); - FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr, const TQString &defstr); ~FlagCheckBox() @@ -105,11 +107,12 @@ private: }; /**Radiobutton item holding an option of a compiler flag.*/ -class FlagRadioButton : public QRadioButton +class FlagRadioButton : public TQRadioButton { Q_OBJECT + TQ_OBJECT public: - FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller, + FlagRadioButton(TQWidget *tqparent, FlagRadioButtonController *controller, const TQString &flagstr, const TQString &description); ~FlagRadioButton() {} @@ -120,12 +123,13 @@ private: }; /**Path editor if path is a compiler flag.*/ -class FlagPathEdit: public QWidget +class FlagPathEdit: public TQWidget { Q_OBJECT + TQ_OBJECT public: /**If the pathDelimiter is not empty then path edit can contain a list of paths*/ - FlagPathEdit(TQWidget *parent, TQString pathDelimiter, FlagPathEditController *controller, + FlagPathEdit(TQWidget *tqparent, TQString pathDelimiter, FlagPathEditController *controller, const TQString &flagstr, const TQString &description, KFile::Mode mode = KFile::Directory); ~FlagPathEdit() {} @@ -149,12 +153,13 @@ private: }; /**List editor if list is a compiler flag.*/ -class FlagListEdit: public QWidget +class FlagListEdit: public TQWidget { Q_OBJECT + TQ_OBJECT public: /**If the listDelimiter is not empty then list edit can contain a list of entries*/ - FlagListEdit(TQWidget *parent, TQString listDelimiter, FlagEditController *controller, + FlagListEdit(TQWidget *tqparent, TQString listDelimiter, FlagEditController *controller, const TQString &flagstr, const TQString &description); ~FlagListEdit() {} @@ -179,10 +184,10 @@ private: }; /**Spin editor of a compiler flag.*/ -class FlagSpinEdit: public QWidget +class FlagSpinEdit: public TQWidget { public: - FlagSpinEdit(TQWidget *parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller, + FlagSpinEdit(TQWidget *tqparent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller, const TQString &flagstr, const TQString &description); ~FlagSpinEdit() {} diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp index 2576ed0c..ad4cd188 100644 --- a/lib/widgets/kcomboview.cpp +++ b/lib/widgets/kcomboview.cpp @@ -25,8 +25,8 @@ #include "kcomboview.h" -KComboView::KComboView( bool rw, int defaultWidth, TQWidget* parent, const char* name , CustomCompleter* comp) - :QComboView(rw, parent, name), m_comp( comp ), m_defaultWidth(defaultWidth) +KComboView::KComboView( bool rw, int defaultWidth, TQWidget* tqparent, const char* name , CustomCompleter* comp) + :QComboView(rw, tqparent, name), m_comp( comp ), m_defaultWidth(defaultWidth) { if (rw) { diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h index e0230b52..e73b73e6 100644 --- a/lib/widgets/kcomboview.h +++ b/lib/widgets/kcomboview.h @@ -55,9 +55,10 @@ class CustomCompleter : public KCompletion { class KComboView: public QComboView { Q_OBJECT + TQ_OBJECT public: ///The combo-view takes the ownership of the completer and deletes it on destruction - KComboView( bool rw, int defaultWidth = 100, TQWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); + KComboView( bool rw, int defaultWidth = 100, TQWidget* tqparent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); virtual ~KComboView(); virtual void addItem(TQListViewItem *it); diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index c99dcf36..5bda3bed 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -97,7 +97,7 @@ void KDevHTMLPart::popup( const TQString & url, const TQPoint & p ) if (!url.isEmpty() && (m_options & CanOpenInNewWindow)) { idNewWindow = popup.insertItem(SmallIcon("window_new"),i18n("Open in New Tab")); - popup.setWhatsThis(idNewWindow, i18n("<b>Open in new window</b><p>Opens current link in a new window.")); + popup.TQMenuData::setWhatsThis(idNewWindow, i18n("<b>Open in new window</b><p>Opens current link in a new window.")); needSep = true; } if (m_options & CanDuplicate) @@ -254,7 +254,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) { // check for environment variables and make necessary translations TQString path = url; - int nDollarPos = path.find( '$' ); + int nDollarPos = path.tqfind( '$' ); // Note: the while loop below is a copy of code in kdecore/kconfigbase.cpp ;) while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(path.length())) { @@ -275,7 +275,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) result = ts.read().stripWhiteSpace(); pclose(fs); } - path.replace( nDollarPos, nEndPos-nDollarPos, result ); + path.tqreplace( nDollarPos, nEndPos-nDollarPos, result ); } else if( (path)[nDollarPos+1] != '$' ) { uint nEndPos = nDollarPos+1; // the next character is no $ @@ -302,9 +302,9 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) // A environment variables may contain values in 8bit // locale cpecified encoding or in UTF8 encoding. if (isUtf8( pEnv )) - path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) ); + path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) ); else - path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) ); + path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) ); } else path.remove( nDollarPos, nEndPos-nDollarPos ); } else { @@ -312,7 +312,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) path.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = path.find( '$', nDollarPos ); + nDollarPos = path.tqfind( '$', nDollarPos ); } return path; @@ -494,8 +494,8 @@ void KDevHTMLPart::addHistoryEntry() void KDevHTMLPart::slotCopy( ) { TQString text = selectedText(); - text.replace( TQChar( 0xa0 ), ' ' ); - QClipboard *cb = TQApplication::clipboard(); + text.tqreplace( TQChar( 0xa0 ), ' ' ); + TQClipboard *cb = TQApplication::tqclipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index 4a03eec9..22da1d65 100644 --- a/lib/widgets/kdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -44,6 +44,7 @@ It has it's own popup menu and font/zoom settings. class KDevHTMLPart : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index a7d12348..4631f16a 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -18,7 +18,7 @@ #include "kdevtabwidget.h" -KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name) +KDevTabWidget::KDevTabWidget(TQWidget *tqparent, const char *name) : TQTabWidget(tqparent,name) { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); @@ -26,7 +26,7 @@ KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(p connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*))); } -KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) +KTabBar::KTabBar(TQWidget *tqparent, const char *name) : TQTabBar(tqparent,name) { m_pPopupMenu = new TQPopupMenu(this); @@ -55,7 +55,7 @@ void KTabBar::mousePressEvent(TQMouseEvent *e) TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; - m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) ); + m_pPage = ((KDevTabWidget*)tqparent())->page(indexOf(tab->identifier() ) ); if(m_pPage == 0L) return; m_pPopupMenu->exec(mapToGlobal(e->pos())); diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp index 0a219da5..f439de6b 100644 --- a/lib/widgets/klistviewaction.cpp +++ b/lib/widgets/klistviewaction.cpp @@ -38,8 +38,8 @@ KListViewAction::~KListViewAction() } KListViewAction::KListViewAction(KComboView *view, const TQString & text, const KShortcut & cut, - const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name ): - KWidgetAction(view, text, cut, receiver, slot, parent, name), m_view(view) + const TQObject * receiver, const char * slot, KActionCollection * tqparent, const char * name ): + KWidgetAction(view, text, cut, receiver, slot, tqparent, name), m_view(view) { m_view->setDuplicatesEnabled(false); m_view->setInsertionPolicy(KComboView::NoInsertion); @@ -48,8 +48,8 @@ KListViewAction::KListViewAction(KComboView *view, const TQString & text, const } KListViewAction::KListViewAction( KComboView * view, const TQString & text, const KShortcut & cut, - const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name, const bool /*dummy*/ ): - KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, parent, name), m_view(view) + const TQObject * receiver, const char * slot, KActionCollection * tqparent, const char * name, const bool /*dummy*/ ): + KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, tqparent, name), m_view(view) { m_view->setDuplicatesEnabled(false); m_view->setInsertionPolicy(KComboView::NoInsertion); diff --git a/lib/widgets/klistviewaction.h b/lib/widgets/klistviewaction.h index d8f53eb8..0334ec30 100644 --- a/lib/widgets/klistviewaction.h +++ b/lib/widgets/klistviewaction.h @@ -38,8 +38,8 @@ Can be used on toolbars. It appears as @ref ResizableCombo. class KListViewAction: public KWidgetAction { public: - KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name); - KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name, const bool); + KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name); + KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name, const bool); ~KListViewAction(); diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index 8ddb5c89..ab267ff2 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -32,7 +32,7 @@ namespace { -class CheckURL : public QCheckListItem +class CheckURL : public TQCheckListItem { public: CheckURL( TQListView * lv, KURL const & url ) @@ -49,8 +49,8 @@ private: } -KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ) : - KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), +KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ) : + KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { TQVBox *top = makeVBoxMainWidget(); @@ -62,7 +62,7 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co _listview->header()->hide(); _listview->setResizeMode( TQListView::LastColumn ); - setButtonOK( KGuiItem(i18n("Save &Selected"), TQString::null, i18n("Saves all selected files")) ); + setButtonOK( KGuiItem(i18n("Save &Selected"), TQString(), i18n("Saves all selected files")) ); setButtonText( User1, i18n("Save &None") ); setButtonText( Close, KStdGuiItem::cancel().text() ); setButtonTip( User1, i18n("Lose all modifications") ); @@ -71,7 +71,7 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co KURL::List::ConstIterator it = filelist.begin(); while ( it != filelist.end() ) { - if ( !ignorelist.contains( *it ) ) + if ( !ignorelist.tqcontains( *it ) ) { TQCheckListItem * x = new CheckURL( _listview, *it ); x->setOn( true ); @@ -140,8 +140,8 @@ KURL::List KSaveSelectDialog::filesNotToSave( ) } -KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ) : - KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), +KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ) : + KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { m_result = Cancel; @@ -153,7 +153,7 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent lb->setMinimumHeight( lb->fontMetrics().height() * 5 ); lb->insertStringList( filenames ); - setButtonOK( KGuiItem(i18n("Save &All"), TQString::null, i18n("Saves all modified files")) ); + setButtonOK( KGuiItem(i18n("Save &All"), TQString(), i18n("Saves all modified files")) ); setButtonText( User1, i18n("Save &None") ); setButtonText( Close, KStdGuiItem::cancel().text() ); setButtonTip( User1, i18n("Lose all modifications") ); diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h index c6592b4a..091a3ae0 100644 --- a/lib/widgets/ksavealldialog.h +++ b/lib/widgets/ksavealldialog.h @@ -36,9 +36,10 @@ Dialog to save selected files. class KSaveSelectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ); + KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ); virtual ~KSaveSelectDialog(); KURL::List filesToSave(); @@ -61,11 +62,12 @@ Dialog to save all files. class KSaveAllDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum SaveAllResult{ SaveAll, Cancel, Revert }; - KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ); + KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ); virtual ~KSaveAllDialog(); SaveAllResult result() const { return m_result; } diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp index 8fdbc5d2..ad5f307c 100644 --- a/lib/widgets/processlinemaker.cpp +++ b/lib/widgets/processlinemaker.cpp @@ -39,7 +39,7 @@ void ProcessLineMaker::slotReceivedStdout( const char *buffer ) { stdoutbuf += buffer; int pos; - while ( (pos = stdoutbuf.find('\n')) != -1) { + while ( (pos = stdoutbuf.tqfind('\n')) != -1) { TQCString line = stdoutbuf.left( pos ); emit receivedStdoutLine(line); stdoutbuf.remove(0, pos+1); @@ -60,7 +60,7 @@ void ProcessLineMaker::slotReceivedStderr( const char *buffer ) { stderrbuf += buffer; int pos; - while ( (pos = stderrbuf.find('\n')) != -1) { + while ( (pos = stderrbuf.tqfind('\n')) != -1) { TQCString line = stderrbuf.left( pos ); emit receivedStderrLine(line); stderrbuf.remove(0, pos+1); diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h index d124e2ed..cf5e78e4 100644 --- a/lib/widgets/processlinemaker.h +++ b/lib/widgets/processlinemaker.h @@ -32,9 +32,10 @@ class KProcess; /** Convenience class to catch output of KProcess. */ -class ProcessLineMaker : public QObject +class ProcessLineMaker : public TQObject { Q_OBJECT + TQ_OBJECT public: ProcessLineMaker(); @@ -64,4 +65,4 @@ private: #endif -//kate: replace-tabs off; indent-spaces off; +//kate: tqreplace-tabs off; indent-spaces off; diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index a49a1078..66796266 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -33,9 +33,9 @@ ProcessListBoxItem::ProcessListBoxItem(const TQString &s, Type type) : TQListBoxText(s), t(type) { TQString clean = s; - clean.replace( TQChar('\t'), TQString(" ") ); - clean.replace( TQChar('\n'), TQString() ); - clean.replace( TQChar('\r'), TQString() ); + clean.tqreplace( TQChar('\t'), TQString(" ") ); + clean.tqreplace( TQChar('\n'), TQString() ); + clean.tqreplace( TQChar('\r'), TQString() ); setText( clean ); setCustomHighlighting(true); @@ -66,14 +66,14 @@ TQColor ProcessListBoxItem::blend(const TQColor &c1, const TQColor &c2, double k int g = normalize((int)blend1((double)c1.green(), (double)c2.green(), k)); int b = normalize((int)blend1((double)c1.blue(), (double)c2.blue(), k)); - return TQColor(qRgb(r, g, b)); + return TQColor(tqRgb(r, g, b)); } void ProcessListBoxItem::paint(TQPainter *p) { TQColor dim, warn, err, back; if (listBox()) { - const TQColorGroup& group = listBox()->palette().active(); + const TQColorGroup& group = listBox()->tqpalette().active(); if (isSelected()) { back = group.button(); warn = group.buttonText(); @@ -88,13 +88,13 @@ void ProcessListBoxItem::paint(TQPainter *p) } else { - warn = Qt::black; - dim = Qt::darkBlue; - err = Qt::darkRed; + warn = TQt::black; + dim = TQt::darkBlue; + err = TQt::darkRed; if (isSelected()) - back = Qt::lightGray; + back = TQt::lightGray; else - back = Qt::white; + back = TQt::white; } p->fillRect(p->window(), TQBrush(back)); p->setPen((t==Error)? err : @@ -103,10 +103,10 @@ void ProcessListBoxItem::paint(TQPainter *p) } -ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) - : KListBox(parent, name) +ProcessWidget::ProcessWidget(TQWidget *tqparent, const char *name) + : KListBox(tqparent, name) { - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); // Don't override the palette, as that can mess up styles. Instead, draw // the background ourselves (see ProcessListBoxItem::paint). @@ -227,7 +227,7 @@ void ProcessWidget::childFinished(bool normal, int status) if (normal) { if (status) { - s = i18n("*** Exited with status: %1 ***").arg(status); + s = i18n("*** Exited with status: %1 ***").tqarg(status); t = ProcessListBoxItem::Error; } else { s = i18n("*** Exited normally ***"); @@ -249,12 +249,12 @@ void ProcessWidget::childFinished(bool normal, int status) } -TQSize ProcessWidget::minimumSizeHint() const +TQSize ProcessWidget::tqminimumSizeHint() const { - // I'm not sure about this, but when I don't use override minimumSizeHint(), + // I'm not sure about this, but when I don't use override tqminimumSizeHint(), // the initial size in clearly too small - return TQSize( TQListBox::sizeHint().width(), + return TQSize( TQListBox::tqsizeHint().width(), (fontMetrics().lineSpacing()+2)*4 ); } diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index ee1a6012..e4ef0c5d 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -33,7 +33,7 @@ class ProcessLineMaker; /** Listbox item for process widgets. */ -class ProcessListBoxItem : public QListBoxText +class ProcessListBoxItem : public TQListBoxText { public: enum Type { Diagnostic, Normal, Error }; @@ -58,9 +58,10 @@ private: class ProcessWidget : public KListBox { Q_OBJECT + TQ_OBJECT public: - ProcessWidget(TQWidget *parent, const char *name=0); + ProcessWidget(TQWidget *tqparent, const char *name=0); ~ProcessWidget(); /** @@ -108,7 +109,7 @@ signals: void rowSelected(int row); protected: - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; void maybeScrollToBottom(); protected slots: diff --git a/lib/widgets/propeditor/Mainpage.dox b/lib/widgets/propeditor/Mainpage.dox index 6bc81be0..1f98b4ac 100644 --- a/lib/widgets/propeditor/Mainpage.dox +++ b/lib/widgets/propeditor/Mainpage.dox @@ -56,7 +56,7 @@ called @ref PropertyLib::PropertyMachineFactory. Static function @ref PropertyLi can be used to obtain the reference to the factory instance. Factory creates and returns so-called @ref PropertyLib::Machine for each registered property type (either predefined or user defined). -@ref PropertyLib::Machine contains @ref PropertyLib::PropertyWidget and a list of "detailed" machines. +@ref PropertyLib::Machine tqcontains @ref PropertyLib::PropertyWidget and a list of "detailed" machines. Usually only property widget is necessary for a property but there are complex properties like "Font" for example. We would like to see separate editors for font family, size, etc. and a button to choose all of these in the dialog. diff --git a/lib/widgets/propeditor/childproperty.cpp b/lib/widgets/propeditor/childproperty.cpp index ac53936a..aa1326c9 100644 --- a/lib/widgets/propeditor/childproperty.cpp +++ b/lib/widgets/propeditor/childproperty.cpp @@ -28,16 +28,16 @@ namespace PropertyLib{ -ChildProperty::ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name, +ChildProperty::ChildProperty(MultiProperty *tqparent, int type, ChildPropertyType childType, const TQString &name, const TQString &description, const TQVariant &value, bool save, bool readOnly) - :Property(type, name, description, value, save, readOnly), m_parent(parent), m_childType(childType) + :Property(type, name, description, value, save, readOnly), m_parent(tqparent), m_childType(childType) { } -ChildProperty::ChildProperty(MultiProperty *parent, const TQString & name, ChildPropertyType childType, +ChildProperty::ChildProperty(MultiProperty *tqparent, const TQString & name, ChildPropertyType childType, const TQMap<TQString, TQVariant> &v_valueList, const TQString &description, const TQVariant &value, bool save, bool readOnly) - :Property(name, v_valueList, description, value, save, readOnly), m_parent(parent), m_childType(childType) + :Property(name, v_valueList, description, value, save, readOnly), m_parent(tqparent), m_childType(childType) { } diff --git a/lib/widgets/propeditor/childproperty.h b/lib/widgets/propeditor/childproperty.h index 6e247fd3..0d1655ae 100644 --- a/lib/widgets/propeditor/childproperty.h +++ b/lib/widgets/propeditor/childproperty.h @@ -29,7 +29,7 @@ class MultiProperty; /** @short Child property -Child property is a detailed property for complex parent properties. +Child property is a detailed property for complex tqparent properties. For example, to edit a property of Point type one can request two child properties for "x" and "y" components of a point. @@ -60,11 +60,11 @@ public: /**Constructs empty property.*/ ChildProperty() {} /**Constructs property.*/ - ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name, + ChildProperty(MultiProperty *tqparent, int type, ChildPropertyType childType, const TQString &name, const TQString &description, const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); /**Constructs property with @ref ValueFromList type.*/ - ChildProperty(MultiProperty *parent, const TQString &name, ChildPropertyType childType, + ChildProperty(MultiProperty *tqparent, const TQString &name, ChildPropertyType childType, const TQMap<TQString, TQVariant> &v_valueList, const TQString &description, const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); diff --git a/lib/widgets/propeditor/multiproperty.cpp b/lib/widgets/propeditor/multiproperty.cpp index 9c3b04c4..ac1cb0fb 100644 --- a/lib/widgets/propeditor/multiproperty.cpp +++ b/lib/widgets/propeditor/multiproperty.cpp @@ -47,7 +47,7 @@ TQString MultiProperty::name() const { if (list.count() >= 1) return list.getFirst()->name(); - return TQString::null; + return TQString(); } int MultiProperty::type() const @@ -86,7 +86,7 @@ TQString MultiProperty::description() const while ((property = it.current()) != 0) { if (property->description() != description) - return TQString::null; + return TQString(); ++it; } diff --git a/lib/widgets/propeditor/multiproperty.h b/lib/widgets/propeditor/multiproperty.h index 49410a04..2330ffa0 100644 --- a/lib/widgets/propeditor/multiproperty.h +++ b/lib/widgets/propeditor/multiproperty.h @@ -43,7 +43,7 @@ with many properties of the same name and type at the same type. MultiProperty is also responsible for storing detailed %property editors (instances of @ref ChildProperty class. It's too much overhead to store child properties -with their parent properties. MultiProperty provides a way to store child properties +with their tqparent properties. MultiProperty provides a way to store child properties only once for all properties with the same name and same type. */ class MultiProperty diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index 3f406e4d..e4a14389 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -31,12 +31,12 @@ namespace PropertyLib{ -PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PCheckBox::PCheckBox(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQCheckBox(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); @@ -64,9 +64,9 @@ void PCheckBox::updateProperty(bool val) void PCheckBox::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { p->setBrush(cg.background()); - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toBool() ? i18n("true") : i18n("false")); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toBool() ? i18n("true") : i18n("false")); } } diff --git a/lib/widgets/propeditor/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h index b2fffc8e..5e593588 100644 --- a/lib/widgets/propeditor/pcheckbox.h +++ b/lib/widgets/propeditor/pcheckbox.h @@ -31,8 +31,9 @@ namespace PropertyLib{ */ class PCheckBox: public PropertyWidget{ Q_OBJECT + TQ_OBJECT public: - PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PCheckBox(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index 9609442f..aef37f4a 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -33,8 +33,8 @@ namespace PropertyLib { -PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char* name) - :PropertyWidget(property, parent, name) +PColorButton::PColorButton(MultiProperty* property, TQWidget* tqparent, const char* name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT @@ -45,7 +45,7 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor())); #endif - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); } @@ -61,14 +61,14 @@ TQVariant PColorButton::value() const void PColorButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { /* p->setBrush(value.toColor()); - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->drawRect(r);*/ - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); p->setBrush(value.toColor()); - p->setPen(Qt::SolidLine); + p->setPen(TQt::SolidLine); TQRect r2(r); r2.setTopLeft(r.topLeft() + TQPoint(5,5)); r2.setBottomRight(r.bottomRight() - TQPoint(5,5)); @@ -103,7 +103,7 @@ void PColorButton::updateProperty(const TQColor &// color void PColorButton::changeColor() { #ifdef PURE_QT - m_color = QColorDialog::getColor(m_color,this); + m_color = TQColorDialog::getColor(m_color,this); updateProperty(m_color); m_edit->setText(m_color.name()); TQPixmap px; diff --git a/lib/widgets/propeditor/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h index 8a18ab9c..a132f0ce 100644 --- a/lib/widgets/propeditor/pcolorbutton.h +++ b/lib/widgets/propeditor/pcolorbutton.h @@ -36,8 +36,9 @@ namespace PropertyLib{ class PColorButton: public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PColorButton(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index eeac7de8..5fee6b1f 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -26,12 +26,12 @@ namespace PropertyLib{ -PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PColorCombo::PColorCombo(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); @@ -58,12 +58,12 @@ void PColorCombo::updateProperty(int /*val*/) void PColorCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); p->setBrush(value.toColor()); - p->setPen(Qt::SolidLine); + p->setPen(TQt::SolidLine); TQRect r2(r); r2.setTopLeft(r.topLeft() + TQPoint(5,5)); r2.setBottomRight(r.bottomRight() - TQPoint(5,5)); diff --git a/lib/widgets/propeditor/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h index 68f19e58..88c5b355 100644 --- a/lib/widgets/propeditor/pcolorcombo.h +++ b/lib/widgets/propeditor/pcolorcombo.h @@ -31,8 +31,9 @@ namespace PropertyLib{ */ class PColorCombo: public PropertyWidget{ Q_OBJECT + TQ_OBJECT public: - PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PColorCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index 958ba34d..18cad9b6 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -24,14 +24,14 @@ namespace PropertyLib{ -PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name), m_valueList(list) +PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name), m_valueList(list) { init(false); } -PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name), m_valueList(list) +PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name), m_valueList(list) { init(rw); } @@ -40,7 +40,7 @@ void PComboBox::init(bool rw) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(rw, this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); fillBox(); @@ -58,7 +58,7 @@ void PComboBox::fillBox() TQVariant PComboBox::value() const { - TQMap<TQString, TQVariant>::const_iterator it = m_valueList.find(m_edit->currentText()); + TQMap<TQString, TQVariant>::const_iterator it = m_valueList.tqfind(m_edit->currentText()); if (it == m_valueList.end()) return TQVariant(""); return TQVariant(it.data()); @@ -66,11 +66,7 @@ TQVariant PComboBox::value() const void PComboBox::setValue(const TQVariant &value, bool emitChange) { -#if QT_VERSION >= 0x030100 if (!value.isNull()) -#else - if (value.canCast(TQVariant::String)) -#endif { disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); m_edit->setCurrentText(findDescription(value)); diff --git a/lib/widgets/propeditor/pcombobox.h b/lib/widgets/propeditor/pcombobox.h index 9f03407c..4176e2ed 100644 --- a/lib/widgets/propeditor/pcombobox.h +++ b/lib/widgets/propeditor/pcombobox.h @@ -35,11 +35,12 @@ namespace PropertyLib{ */ class PComboBox: public PropertyWidget{ Q_OBJECT + TQ_OBJECT public: /**This constructor is used for read-only selection combo. It provides a value from valueList*/ - PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent = 0, const char *name = 0); + PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent = 0, const char *name = 0); /**This constructor is used for read-write selection combo. It provides a value from valueList*/ - PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent = 0, const char *name = 0); + PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcursoredit.cpp b/lib/widgets/propeditor/pcursoredit.cpp index 85aefd5e..02a2148c 100644 --- a/lib/widgets/propeditor/pcursoredit.cpp +++ b/lib/widgets/propeditor/pcursoredit.cpp @@ -24,8 +24,8 @@ namespace PropertyLib{ PCursorEdit::PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, - TQWidget* parent, const char* name) - :PComboBox(property, spValues, parent, name) + TQWidget* tqparent, const char* name) + :PComboBox(property, spValues, tqparent, name) { } diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h index 6149bce7..82924fd2 100644 --- a/lib/widgets/propeditor/pcursoredit.h +++ b/lib/widgets/propeditor/pcursoredit.h @@ -30,9 +30,10 @@ namespace PropertyLib{ class PCursorEdit: public PComboBox { Q_OBJECT + TQ_OBJECT public: PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, - TQWidget* parent = 0, const char* name = 0); + TQWidget* tqparent = 0, const char* name = 0); virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); }; diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index 141eef20..46de4069 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -25,12 +25,12 @@ namespace PropertyLib{ -PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name) - :PropertyWidget(property, parent, name) +PDateEdit::PDateEdit(MultiProperty* property, TQWidget* tqparent, const char* name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); - m_edit = new QDateEdit(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit = new TQDateEdit(this); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); @@ -43,10 +43,10 @@ TQVariant PDateEdit::value() const void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toDate().toString(Qt::LocalDate)); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDate().toString(Qt::LocalDate)); } void PDateEdit::setValue(const TQVariant& value, bool emitChange) diff --git a/lib/widgets/propeditor/pdateedit.h b/lib/widgets/propeditor/pdateedit.h index da458737..a21dbc3f 100644 --- a/lib/widgets/propeditor/pdateedit.h +++ b/lib/widgets/propeditor/pdateedit.h @@ -22,7 +22,7 @@ #include "propertywidget.h" -class QDateEdit; +class TQDateEdit; namespace PropertyLib{ @@ -32,8 +32,9 @@ namespace PropertyLib{ class PDateEdit : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); + PDateEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); @@ -43,7 +44,7 @@ private slots: void updateProperty(const TQDate &val); private: - QDateEdit *m_edit; + TQDateEdit *m_edit; }; } diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 5e414c77..e7a4b04f 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -25,11 +25,11 @@ namespace PropertyLib{ -PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) +PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); - m_edit = new QDateTimeEdit(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit = new TQDateTimeEdit(this); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); @@ -42,10 +42,10 @@ TQVariant PDateTimeEdit::value() const void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toDateTime().toString(Qt::LocalDate)); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDateTime().toString(Qt::LocalDate)); } void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange) diff --git a/lib/widgets/propeditor/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h index 40e8b428..e44c07d6 100644 --- a/lib/widgets/propeditor/pdatetimeedit.h +++ b/lib/widgets/propeditor/pdatetimeedit.h @@ -22,7 +22,7 @@ #include "propertywidget.h" -class QDateTimeEdit; +class TQDateTimeEdit; namespace PropertyLib{ @@ -32,8 +32,9 @@ namespace PropertyLib{ class PDateTimeEdit : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); + PDateTimeEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); @@ -43,7 +44,7 @@ private slots: void updateProperty(const TQDateTime &val); private: - QDateTimeEdit *m_edit; + TQDateTimeEdit *m_edit; }; diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index df6b3bcb..742180b4 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -22,7 +22,7 @@ #ifndef PURE_QT #include <knuminput.h> #else -#include "qfloatinput.h" +#include "tqfloatinput.h" #endif #include <limits.h> @@ -31,19 +31,19 @@ namespace PropertyLib{ -PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT m_edit = new KDoubleNumInput(-999999.0, 999999.0, 0.0, 0.01, 2, this); - m_edit->setLabel(TQString::null); + m_edit->setLabel(TQString()); connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); #else - m_edit = new QFloatInput(-999999, 999999, 0.01, 2, this ); + m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this ); connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); #endif - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); /* m_edit->setMinValue(-999999999); m_edit->setMaxValue(+999999999); m_edit->setPrecision(2);*/ @@ -78,7 +78,7 @@ void PDoubleNumInput::updateProperty(double val) void PDoubleNumInput::updateProperty(int val) { #ifdef PURE_QT - TQString format = TQString("%.%1f").arg( m_edit->digits() ); + TQString format = TQString("%.%1f").tqarg( m_edit->digits() ); TQString strVal = TQString().sprintf(format.latin1(), (val/(float)pow(m_edit->digits(),10)) ); emit propertyChanged(m_property, TQVariant(strVal)); diff --git a/lib/widgets/propeditor/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h index 83849335..a59ae43d 100644 --- a/lib/widgets/propeditor/pdoublenuminput.h +++ b/lib/widgets/propeditor/pdoublenuminput.h @@ -25,7 +25,7 @@ #ifndef PURE_QT class KDoubleNumInput; #else -class QFloatInput; +class TQFloatInput; #endif namespace PropertyLib{ @@ -36,8 +36,9 @@ namespace PropertyLib{ class PDoubleNumInput: public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PDoubleNumInput(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; @@ -46,7 +47,7 @@ public: virtual void setValue(const TQVariant &value, bool emitChange=true); private slots: - //because of a bug in moc which doesn't detect conditional slots + //because of a bug in tqmoc which doesn't detect conditional slots //we need them both void updateProperty(double val); void updateProperty(int val); @@ -55,7 +56,7 @@ private: #ifndef PURE_QT KDoubleNumInput *m_edit; #else - QFloatInput *m_edit; + TQFloatInput *m_edit; #endif }; diff --git a/lib/widgets/propeditor/pdummywidget.cpp b/lib/widgets/propeditor/pdummywidget.cpp index 65ec35e3..428953f2 100644 --- a/lib/widgets/propeditor/pdummywidget.cpp +++ b/lib/widgets/propeditor/pdummywidget.cpp @@ -23,8 +23,8 @@ namespace PropertyLib{ -PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { } @@ -43,7 +43,7 @@ void PDummyWidget::setValue(const TQVariant &value, bool emitChange) void PDummyWidget::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &/*value*/) { p->setBrush(cg.background()); - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->drawRect(r); } diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h index 0e191e87..f58e92b9 100644 --- a/lib/widgets/propeditor/pdummywidget.h +++ b/lib/widgets/propeditor/pdummywidget.h @@ -35,13 +35,14 @@ namespace PropertyLib{ @short %Property editor with empty widget. This is usefull for properties which can't be edited in a generic way -like QValueList's or QMap's stored in a variant. +like TQValueList's or TQMap's stored in a variant. */ class PDummyWidget: public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PDummyWidget(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index dc976b8f..d2a10217 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -33,12 +33,12 @@ namespace PropertyLib{ -PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* name) - :PropertyWidget(property, parent, name) +PFontButton::PFontButton(MultiProperty* property, TQWidget* tqparent, const char* name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontRequester(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifndef PURE_QT m_edit->button()->setText(i18n("...")); #endif @@ -54,14 +54,14 @@ TQVariant PFontButton::value() const void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); TQFontInfo fi(value.toFont()); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) + (fi.italic() ? i18n(" Italic") : TQString("")) + - " " + TQString("%1").arg(fi.pointSize()) ); + " " + TQString("%1").tqarg(fi.pointSize()) ); } void PFontButton::setValue(const TQVariant& value, bool emitChange) diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h index 6538f5ae..d875f307 100644 --- a/lib/widgets/propeditor/pfontbutton.h +++ b/lib/widgets/propeditor/pfontbutton.h @@ -32,8 +32,9 @@ namespace PropertyLib{ class PFontButton : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); + PFontButton(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index 8b0ee7a7..240310c7 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -33,12 +33,12 @@ namespace PropertyLib{ -PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PFontCombo::PFontCombo(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontCombo(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); /*adymo: KFontCombo seems to have a bug: when it is not editable, the signals diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h index a703c99d..63f07f51 100644 --- a/lib/widgets/propeditor/pfontcombo.h +++ b/lib/widgets/propeditor/pfontcombo.h @@ -23,7 +23,7 @@ #include "propertywidget.h" #ifdef PURE_QT -#define KFontCombo QComboBox +#define KFontCombo TQComboBox #endif class KFontCombo; @@ -35,8 +35,9 @@ namespace PropertyLib{ */ class PFontCombo: public PropertyWidget{ Q_OBJECT + TQ_OBJECT public: - PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PFontCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index f5e1ecb0..0d3afa85 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -24,12 +24,12 @@ namespace PropertyLib{ -PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PLineEdit::PLineEdit(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); diff --git a/lib/widgets/propeditor/plineedit.h b/lib/widgets/propeditor/plineedit.h index 6feb2a7b..c4d0c0f1 100644 --- a/lib/widgets/propeditor/plineedit.h +++ b/lib/widgets/propeditor/plineedit.h @@ -31,8 +31,9 @@ namespace PropertyLib{ */ class PLineEdit: public PropertyWidget{ Q_OBJECT + TQ_OBJECT public: - PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PLineEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index adee930e..13094245 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -127,11 +127,11 @@ namespace PropertyLib { "................................................"}; -PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) +PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->insertItem(TQPixmap(nopen)); @@ -150,7 +150,7 @@ TQVariant PLineStyleEdit::value() const void PLineStyleEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); diff --git a/lib/widgets/propeditor/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h index 8bb076d4..6021cb9c 100644 --- a/lib/widgets/propeditor/plinestyleedit.h +++ b/lib/widgets/propeditor/plinestyleedit.h @@ -31,8 +31,9 @@ namespace PropertyLib { */ class PLineStyleEdit : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); + PLineStyleEdit(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index a4c18791..0eaec74b 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -41,23 +41,23 @@ namespace PropertyLib{ -PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* name) - :PropertyWidget(property, parent, name) +PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* tqparent, const char* name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLabel(this); - m_edit->setAlignment(Qt::AlignTop); + m_edit->tqsetAlignment(TQt::AlignTop); m_edit->resize(width(), height()-1); - m_edit->setBackgroundMode(Qt::PaletteBase); + m_edit->setBackgroundMode(TQt::PaletteBase); m_edit->installEventFilter(this); m_button = new TQPushButton(i18n("..."), this); m_button->resize(height(), height()-8); m_button->move(width() - m_button->width() -1, 0); - m_button->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); + m_button->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); l->addWidget(m_edit); l->addWidget(m_button); - m_popup = new TQLabel(0, 0, Qt::WStyle_NoBorder|Qt::WX11BypassWM|WStyle_StaysOnTop); + m_popup = new TQLabel(0, 0, TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop); m_popup->hide(); @@ -71,7 +71,7 @@ TQVariant PPixmapEdit::value() const void PPixmapEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); p->drawPixmap(r.topLeft().x(), r.topLeft().y(), value.toPixmap()); @@ -87,7 +87,7 @@ void PPixmapEdit::setValue(const TQVariant& value, bool emitChange) void PPixmapEdit::updateProperty() { #ifndef PURE_QT - KURL url = KFileDialog::getImageOpenURL(TQString::null, this); + KURL url = KFileDialog::getImageOpenURL(TQString(), this); if (!url.isEmpty()) { m_edit->setPixmap(TQPixmap(url.path())); @@ -112,7 +112,7 @@ void PPixmapEdit::resizeEvent(TQResizeEvent *ev) bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev) { - if(o == m_edit) + if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_edit)) { if(ev->type() == TQEvent::MouseButtonPress) { @@ -131,7 +131,7 @@ bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev) } if(ev->type() == TQEvent::KeyPress) { - TQKeyEvent* e = static_cast<TQKeyEvent*>(ev); + TQKeyEvent* e = TQT_TQKEYEVENT(ev); if((e->key() == Key_Enter) || (e->key()== Key_Space) || (e->key() == Key_Return)) { m_button->animateClick(); diff --git a/lib/widgets/propeditor/ppixmapedit.h b/lib/widgets/propeditor/ppixmapedit.h index 7f431289..09d7ffef 100644 --- a/lib/widgets/propeditor/ppixmapedit.h +++ b/lib/widgets/propeditor/ppixmapedit.h @@ -33,8 +33,9 @@ namespace PropertyLib{ class PPixmapEdit : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); + PPixmapEdit(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp index eb1a382e..7f31d92d 100644 --- a/lib/widgets/propeditor/ppointedit.cpp +++ b/lib/widgets/propeditor/ppointedit.cpp @@ -25,11 +25,11 @@ namespace PropertyLib{ -PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) +PPointEdit::PPointEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -42,16 +42,16 @@ TQVariant PPointEdit::value() const void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); } void PPointEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); + m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/ppointedit.h b/lib/widgets/propeditor/ppointedit.h index e78f9928..e7de9178 100644 --- a/lib/widgets/propeditor/ppointedit.h +++ b/lib/widgets/propeditor/ppointedit.h @@ -32,8 +32,9 @@ namespace PropertyLib{ class PPointEdit : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); + PPointEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp index 6b7de9ce..562c013b 100644 --- a/lib/widgets/propeditor/prectedit.cpp +++ b/lib/widgets/propeditor/prectedit.cpp @@ -25,11 +25,11 @@ namespace PropertyLib{ -PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) +PRectEdit::PRectEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -42,16 +42,16 @@ TQVariant PRectEdit::value() const void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); } void PRectEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); + m_edit->setText(TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/prectedit.h b/lib/widgets/propeditor/prectedit.h index 116ee668..14381f80 100644 --- a/lib/widgets/propeditor/prectedit.h +++ b/lib/widgets/propeditor/prectedit.h @@ -32,8 +32,9 @@ namespace PropertyLib{ class PRectEdit : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); + PRectEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/property.h b/lib/widgets/propeditor/property.h index a94ea4cb..48c6987f 100644 --- a/lib/widgets/propeditor/property.h +++ b/lib/widgets/propeditor/property.h @@ -105,7 +105,7 @@ public: //predefined custom types ValueFromList = 2000 /**<string value from a list*/, - Symbol = 2001 /**<unicode symbol code*/, + Symbol = 2001 /**<tqunicode symbol code*/, FontName = 2002 /**<font name, e.g. "times new roman"*/, FileURL = 2003 /**<url of a file*/, DirectoryURL = 2004 /**<url of a directory*/, diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index 3cd974db..ce154236 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -42,14 +42,14 @@ namespace PropertyLib{ class PropertyItem: public KListViewItem{ public: - PropertyItem(PropertyEditor *parent, MultiProperty *property) - :KListViewItem(parent, property->description()), m_editor(parent), m_property(property), + PropertyItem(PropertyEditor *tqparent, MultiProperty *property) + :KListViewItem(tqparent, property->description()), m_editor(tqparent), m_property(property), m_changed(false) { } - PropertyItem(PropertyEditor *editor, KListViewItem *parent, MultiProperty *property) - :KListViewItem(parent, property->description()), m_editor(editor), + PropertyItem(PropertyEditor *editor, KListViewItem *tqparent, MultiProperty *property) + :KListViewItem(tqparent, property->description()), m_editor(editor), m_property(property), m_changed(false) { } @@ -120,13 +120,13 @@ private: class PropertyGroupItem: public KListViewItem{ public: - PropertyGroupItem(KListView *parent, const TQString &name) - :KListViewItem(parent, name) + PropertyGroupItem(KListView *tqparent, const TQString &name) + :KListViewItem(tqparent, name) { init(); } - PropertyGroupItem(KListViewItem *parent, const TQString &name) - :KListViewItem(parent, name) + PropertyGroupItem(KListViewItem *tqparent, const TQString &name) + :KListViewItem(tqparent, name) { init(); } @@ -158,14 +158,14 @@ private: class SeparatorItem: public KListViewItem{ public: - SeparatorItem(KListView *parent) - :KListViewItem(parent) + SeparatorItem(KListView *tqparent) + :KListViewItem(tqparent) { setSelectable(false); } }; -PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) - :KListView(parent, name) +PropertyEditor::PropertyEditor(TQWidget *tqparent, const char *name) + :KListView(tqparent, name) { setSorting(-1); @@ -196,7 +196,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) #else m_undoButton->setPixmap( TQPixmap("undo.xpm") ); #endif - m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_undoButton->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_undoButton->resize(m_undoButton->height(), m_undoButton->height()); m_undoButton->hide(); connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); @@ -215,8 +215,8 @@ void PropertyEditor::populateProperties(PropertyList *list) return; m_list = list; connect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*))); - const TQValueList<QPair<TQString, TQValueList<TQString> > >& groups = m_list->propertiesOfGroup(); - for (TQValueList<QPair<TQString, TQValueList<TQString> > >::const_iterator it = groups.begin(); + const TQValueList<TQPair<TQString, TQValueList<TQString> > >& groups = m_list->propertiesOfGroup(); + for (TQValueList<TQPair<TQString, TQValueList<TQString> > >::const_iterator it = groups.begin(); it != groups.end(); ++it) { // qWarning("PropertyEditor::populateProperties: adding group %s", (*it).first.ascii()); @@ -259,24 +259,24 @@ void PropertyEditor::addProperty(const TQString &name) addChildProperties(pitem); } -void PropertyEditor::addChildProperties(PropertyItem *parent) +void PropertyEditor::addChildProperties(PropertyItem *tqparent) { - MultiProperty *prop = parent->property(); + MultiProperty *prop = tqparent->property(); //force machine creation to get detailed properties appended to current multiproperty - if ( !m_registeredForType.contains(prop->name()) + if ( !m_registeredForType.tqcontains(prop->name()) && (PropertyMachineFactory::getInstance()->hasDetailedEditors(prop->type())) ) { //FIXME: find better solution machine(prop); } -// qWarning("seeking children: count: %d", prop->details.count()); +// qWarning("seeking tqchildren: count: %d", prop->details.count()); - parent->setOpen(true); + tqparent->setOpen(true); for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it) { // qWarning("found child %s", (*it).name().ascii()); - new PropertyItem(this, parent, new MultiProperty(&m_detailedList, &(*it))); + new PropertyItem(this, tqparent, new MultiProperty(&m_detailedList, &(*it))); } } @@ -301,11 +301,11 @@ void PropertyEditor::propertyValueChanged(Property *property) m_currentEditWidget->setValue(property->value(), false); else { -// repaint all items +// tqrepaint all items TQListViewItemIterator it(this); while (it.current()) { - repaintItem(it.current()); + tqrepaintItem(it.current()); ++it; } } @@ -323,15 +323,15 @@ void PropertyEditor::propertyChanged(MultiProperty *property, const TQVariant &v if (m_currentEditItem && (m_currentEditItem->property() == property)) { m_currentEditItem->setChanged(true); - repaintItem(m_currentEditItem); + tqrepaintItem(m_currentEditItem); } emit changed(); -/* if (m_list->contains(name)) +/* if (m_list->tqcontains(name)) { (*m_list)[name]->setValue(value, false); -// else if (m_detailedList->contains(*/ +// else if (m_detailedList->tqcontains(*/ } void PropertyEditor::hideEditor() @@ -360,11 +360,11 @@ void PropertyEditor::showEditor(PropertyItem *item) void PropertyEditor::placeEditor(PropertyItem *item) { - TQRect r = itemRect(item); + TQRect r = tqitemRect(item); if (!r.size().isValid()) { ensureItemVisible(item); - r = itemRect(item); + r = tqitemRect(item); } r.setX(header()->sectionPos(1)); @@ -386,7 +386,7 @@ void PropertyEditor::placeEditor(PropertyItem *item) m_currentEditLayout->addWidget(editor, 0, 0); m_currentEditLayout->addWidget(m_undoButton, 0, 1); m_currentEditArea->resize(r.size()); -// m_currentEditLayout->invalidate(); +// m_currentEditLayout->tqinvalidate(); moveChild(m_currentEditArea, r.x(), r.y()); m_currentEditWidget = editor; } @@ -447,7 +447,7 @@ Machine *PropertyEditor::machine(MultiProperty *property) m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property); connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); - m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft()); + m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->tqchildrenRect().topLeft()); m_registeredForType[name]->propertyEditor->hide(); } return m_registeredForType[name]; @@ -470,7 +470,7 @@ void PropertyEditor::undo() m_currentEditWidget->undo(); m_currentEditItem->setChanged(false); - repaintItem(m_currentEditItem); + tqrepaintItem(m_currentEditItem); } } diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h index 6bdd3e32..ee868a55 100644 --- a/lib/widgets/propeditor/propertyeditor.h +++ b/lib/widgets/propeditor/propertyeditor.h @@ -24,8 +24,8 @@ #include <klistview.h> #else #include <tqlistview.h> -#define KListView QListView -#define KListViewItem QListViewItem +#define KListView TQListView +#define KListViewItem TQListViewItem #endif #include "propertylist.h" @@ -57,9 +57,10 @@ creation of property widgets from the machine factory. */ class PropertyEditor: public KListView{ Q_OBJECT + TQ_OBJECT public: /**Constructs the property editor.*/ - PropertyEditor(TQWidget *parent = 0, const char *name = 0); + PropertyEditor(TQWidget *tqparent = 0, const char *name = 0); ~PropertyEditor(); /**@return @ref Machine for given property. @@ -102,7 +103,7 @@ protected: void addGroup(const TQString &name); void addProperty(PropertyGroupItem *group, const TQString &name); void addProperty(const TQString &name); - void addChildProperties(PropertyItem *parent); + void addChildProperties(PropertyItem *tqparent); private: PropertyList *m_list; diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp index 491c2ebb..20feeb43 100644 --- a/lib/widgets/propeditor/propertylist.cpp +++ b/lib/widgets/propeditor/propertylist.cpp @@ -41,7 +41,7 @@ PropertyList::~PropertyList() MultiProperty *PropertyList::operator[](const TQString &name) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) return m_list[name]; else return new MultiProperty(this); @@ -49,7 +49,7 @@ MultiProperty *PropertyList::operator[](const TQString &name) MultiProperty *PropertyList::property( const TQString &name ) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) return m_list[name]; else return new MultiProperty(this); @@ -60,7 +60,7 @@ void PropertyList::addProperty(Property *property) if (property == 0) return; MultiProperty *mp = 0; - if ( m_list.contains(property->name()) ) + if ( m_list.tqcontains(property->name()) ) { mp = m_list[property->name()]; mp->addProperty(property); @@ -79,7 +79,7 @@ void PropertyList::addProperty(const TQString &group, Property *property) return; MultiProperty *mp = 0; - if (m_list.contains(property->name())) + if (m_list.tqcontains(property->name())) { mp = m_list[property->name()]; mp->addProperty(property); @@ -119,7 +119,7 @@ void PropertyList::removeProperty(Property *property) void PropertyList::removeProperty(const TQString &name) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) { TQString group = m_groupOfProperty[m_list[name]]; removeFromGroup(m_list[name]); @@ -146,7 +146,7 @@ void PropertyList::removeProperty(const TQString &name) } } -const TQValueList<QPair<TQString, TQValueList<TQString> > >& PropertyList::propertiesOfGroup() const +const TQValueList<TQPair<TQString, TQValueList<TQString> > >& PropertyList::propertiesOfGroup() const { return m_propertiesOfGroup; } @@ -162,11 +162,11 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) return; //do not add same property to the group twice - if (m_groupOfProperty.contains(property) && (m_groupOfProperty[property] == group)) + if (m_groupOfProperty.tqcontains(property) && (m_groupOfProperty[property] == group)) return; - QPair<TQString, TQValueList<TQString> > *groupPair = 0; - for(TQValueList<QPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin(); + TQPair<TQString, TQValueList<TQString> > *groupPair = 0; + for(TQValueList<TQPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin(); it != m_propertiesOfGroup.end(); ++it) { if ((*it).first == group) @@ -177,7 +177,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) } if (groupPair == 0) { - groupPair = new QPair<TQString, TQValueList<TQString> >(); + groupPair = new TQPair<TQString, TQValueList<TQString> >(); groupPair->first = group; groupPair->second.append(property->name()); m_propertiesOfGroup.append(*groupPair); @@ -185,7 +185,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) return; } //check if group already contains property with the same name - if (!groupPair->second.contains(property->name())) + if (!groupPair->second.tqcontains(property->name())) groupPair->second.append(property->name()); m_groupOfProperty[property] = group; @@ -196,7 +196,7 @@ void PropertyList::removeFromGroup(MultiProperty *property) TQString group = m_groupOfProperty[property]; // qWarning("removeFromGroup group=%s", group.ascii()); - for(TQValueList<QPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin(); + for(TQValueList<TQPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin(); it != m_propertiesOfGroup.end(); ++it) { // qWarning("removeFromGroup checking %s", (*it).first.ascii()); @@ -217,16 +217,16 @@ void PropertyList::clear( ) removeProperty(it.key()); } -bool PropertyList::contains( const TQString & name ) +bool PropertyList::tqcontains( const TQString & name ) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) return true; return false; } TQPtrList<Property> PropertyList::properties(const TQString &name) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) return m_list[name]->list; return TQPtrList<Property>(); } @@ -309,9 +309,9 @@ void PropertyBuffer::intersect(const PropertyList *list) for (TQMap<TQString, MultiProperty*>::iterator it = m_list.begin(); it != m_list.end(); ++it) { // qWarning("intersect:: for mp = %s", it.data()->name().ascii()); - if (list->m_list.contains(it.key())) + if (list->m_list.tqcontains(it.key())) { -/* qWarning("intersect:: list contains %s", it.key().ascii()); +/* qWarning("intersect:: list tqcontains %s", it.key().ascii()); if ( (*(it.data()) == *(list->m_list[it.key()]))) qWarning("intersect:: equal properties"); else @@ -334,7 +334,7 @@ void PropertyBuffer::intersectedValueChanged(Property *property) { // qWarning("PropertyBuffer::intersectedValueChanged"); TQString propertyName = property->name(); - if (!contains(propertyName)) + if (!tqcontains(propertyName)) return; MultiProperty mp(property); diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h index 96e351fc..c549048b 100644 --- a/lib/widgets/propeditor/propertylist.h +++ b/lib/widgets/propeditor/propertylist.h @@ -52,9 +52,10 @@ PropertyList is also capable of grouping properties. You can have unsorted list of groups of properties or a plain alphabetically sorted list of properties or both at the same time. */ -class PropertyList: public QObject +class PropertyList: public TQObject { Q_OBJECT + TQ_OBJECT public: class Iterator { @@ -110,14 +111,14 @@ public: virtual void removeProperty(const TQString &name); /**@return the list of grouped properties.*/ - virtual const TQValueList<QPair<TQString, TQValueList<TQString> > >& propertiesOfGroup() const; + virtual const TQValueList<TQPair<TQString, TQValueList<TQString> > >& propertiesOfGroup() const; /**@return the map: property - group name.*/ virtual const TQMap<MultiProperty*, TQString>& groupOfProperty() const; /**Clears the list of properties.*/ virtual void clear(); /**Returns true if the list of properties contains property with given name.*/ - virtual bool contains(const TQString &name); + virtual bool tqcontains(const TQString &name); /**The list of properties with given name.*/ TQPtrList<Property> properties(const TQString &name); @@ -146,7 +147,7 @@ private: //groups of properties: // list of group name: (list of property names) - TQValueList<QPair<TQString, TQValueList<TQString> > > m_propertiesOfGroup; + TQValueList<TQPair<TQString, TQValueList<TQString> > > m_propertiesOfGroup; // map of property: group TQMap<MultiProperty*, TQString> m_groupOfProperty; @@ -181,6 +182,7 @@ buf->intersect(list3); */ class PropertyBuffer: public PropertyList{ Q_OBJECT + TQ_OBJECT public: /**Constructs a buffer from given property list.*/ PropertyBuffer(PropertyList *list); diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp index 613777d6..cccc3a37 100644 --- a/lib/widgets/propeditor/propertymachinefactory.cpp +++ b/lib/widgets/propeditor/propertymachinefactory.cpp @@ -76,7 +76,7 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property) TQString propertyName = property->name(); TQMap<TQString, TQVariant> valueList = property->valueList(); - if (m_registeredForType.contains(propertyName)) + if (m_registeredForType.tqcontains(propertyName)) return (*m_registeredForType[propertyName])(); switch (type) @@ -162,22 +162,22 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property) case Property::Cursor: { TQMap<TQString, TQVariant> spValues; - spValues[i18n("Arrow")] = Qt::ArrowCursor; - spValues[i18n("Up Arrow")] = Qt::UpArrowCursor; - spValues[i18n("Cross")] = Qt::CrossCursor; - spValues[i18n("Waiting")] = Qt::WaitCursor; - spValues[i18n("iBeam")] = Qt::IbeamCursor; - spValues[i18n("Size Vertical")] = Qt::SizeVerCursor; - spValues[i18n("Size Horizontal")] = Qt::SizeHorCursor; - spValues[i18n("Size Slash")] = Qt::SizeBDiagCursor; - spValues[i18n("Size Backslash")] = Qt::SizeFDiagCursor; - spValues[i18n("Size All")] = Qt::SizeAllCursor; - spValues[i18n("Blank")] = Qt::BlankCursor; - spValues[i18n("Split Vertical")] = Qt::SplitVCursor; - spValues[i18n("Split Horizontal")] = Qt::SplitHCursor; - spValues[i18n("Pointing Hand")] = Qt::PointingHandCursor; - spValues[i18n("Forbidden")] = Qt::ForbiddenCursor; - spValues[i18n("What's this")] = Qt::WhatsThisCursor; + spValues[i18n("Arrow")] = TQt::ArrowCursor; + spValues[i18n("Up Arrow")] = TQt::UpArrowCursor; + spValues[i18n("Cross")] = TQt::CrossCursor; + spValues[i18n("Waiting")] = TQt::WaitCursor; + spValues[i18n("iBeam")] = TQt::IbeamCursor; + spValues[i18n("SizeQt::Vertical")] = TQt::SizeVerCursor; + spValues[i18n("SizeQt::Horizontal")] = TQt::SizeHorCursor; + spValues[i18n("Size Slash")] = TQt::SizeBDiagCursor; + spValues[i18n("Size Backslash")] = TQt::SizeFDiagCursor; + spValues[i18n("Size All")] = TQt::SizeAllCursor; + spValues[i18n("Blank")] = TQt::BlankCursor; + spValues[i18n("SplitQt::Vertical")] = TQt::SplitVCursor; + spValues[i18n("SplitQt::Horizontal")] = TQt::SplitHCursor; + spValues[i18n("Pointing Hand")] = TQt::PointingHandCursor; + spValues[i18n("Forbidden")] = TQt::ForbiddenCursor; + spValues[i18n("What's this")] = TQt::WhatsThisCursor; Machine *mach = new Machine(new PCursorEdit(property, spValues)); return mach; } diff --git a/lib/widgets/propeditor/propertymachinefactory.h b/lib/widgets/propeditor/propertymachinefactory.h index fae5569f..84da3e71 100644 --- a/lib/widgets/propeditor/propertymachinefactory.h +++ b/lib/widgets/propeditor/propertymachinefactory.h @@ -74,7 +74,7 @@ public: void registerEditor(int type, createMachine creator); /**Creates and returns the editor for given property type. - Warning: editor and viewer widgets won't have parent widget. %Property editor + Warning: editor and viewer widgets won't have tqparent widget. %Property editor cares about reparenting and deletion of returned widgets in machines.*/ Machine *machineForProperty(MultiProperty *property); bool hasDetailedEditors(int type); diff --git a/lib/widgets/propeditor/propertywidget.cpp b/lib/widgets/propeditor/propertywidget.cpp index dad296c5..df0df75a 100644 --- a/lib/widgets/propeditor/propertywidget.cpp +++ b/lib/widgets/propeditor/propertywidget.cpp @@ -23,8 +23,8 @@ namespace PropertyLib{ -PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *parent, const char *name) - :TQWidget(parent, name), m_property(property) +PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_property(property) { } @@ -40,10 +40,10 @@ void PropertyWidget::setProperty(MultiProperty *property) void PropertyWidget::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toString()); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toString()); } void PropertyWidget::setValueList(const TQMap<TQString, TQVariant> &// valueList diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h index edbdf6f3..d5a22777 100644 --- a/lib/widgets/propeditor/propertywidget.h +++ b/lib/widgets/propeditor/propertywidget.h @@ -40,17 +40,18 @@ Descendants should implement value() and setValue() methods. Hint: in case you want to implement your property editor widget using existing widgets like TQLineEdit, TQComboBox, etc. you can't use multiple -inheritance from two TQObject descendants due to Qt library restriction. +inheritance from two TQObject descendants due to TQt library restriction. Therefore use line edits and combo boxes as child widgets. A set of predefined widgets for predefined property types are available in the library. */ -class PropertyWidget: public QWidget{ +class PropertyWidget: public TQWidget{ Q_OBJECT + TQ_OBJECT public: /**Constructs widget for property with name "propertyName".*/ - PropertyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PropertyWidget(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); virtual ~PropertyWidget() {} /**@return the value currently entered in the editor widget.*/ diff --git a/lib/widgets/propeditor/propertywidgetproxy.cpp b/lib/widgets/propeditor/propertywidgetproxy.cpp index 813708ca..27f2a49c 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.cpp +++ b/lib/widgets/propeditor/propertywidgetproxy.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *parent, const char *name) - :TQWidget(parent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0) +PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *tqparent, const char *name) + :TQWidget(tqparent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0) { p = new Property(); m_layout = new TQHBoxLayout(this, 0, 0); diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h index 43ef3311..04a2503a 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.h +++ b/lib/widgets/propeditor/propertywidgetproxy.h @@ -39,13 +39,14 @@ It is sometimes useful to create single property editor widgets instead of havin all in the property editor. Proxy creates an empty widget and shows the property editor depending on the property type. */ -class PropertyWidgetProxy: public QWidget +class PropertyWidgetProxy: public TQWidget { Q_OBJECT -Q_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true ) -Q_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false ) + TQ_OBJECT +TQ_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true ) +TQ_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false ) public: - PropertyWidgetProxy(TQWidget *parent = 0, const char *name = 0); + PropertyWidgetProxy(TQWidget *tqparent = 0, const char *name = 0); ~PropertyWidgetProxy(); /**Sets the type of a property editor to appear.*/ diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp index 90208304..4ce6561c 100644 --- a/lib/widgets/propeditor/psizeedit.cpp +++ b/lib/widgets/propeditor/psizeedit.cpp @@ -25,12 +25,12 @@ namespace PropertyLib{ -PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -43,16 +43,16 @@ TQVariant PSizeEdit::value() const void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); } void PSizeEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); + m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/psizeedit.h b/lib/widgets/propeditor/psizeedit.h index 38f29132..5fbd6d6d 100644 --- a/lib/widgets/propeditor/psizeedit.h +++ b/lib/widgets/propeditor/psizeedit.h @@ -34,8 +34,9 @@ namespace PropertyLib{ class PSizeEdit: public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PSizeEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp index 9447a4bc..9c417005 100644 --- a/lib/widgets/propeditor/psizepolicyedit.cpp +++ b/lib/widgets/propeditor/psizepolicyedit.cpp @@ -26,12 +26,12 @@ namespace PropertyLib{ -PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent, const char* name) - :PropertyWidget(property, parent, name), m_spValues(spValues) +PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* tqparent, const char* name) + :PropertyWidget(property, tqparent, name), m_spValues(spValues) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -44,16 +44,16 @@ TQVariant PSizePolicyEdit::value() const void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); } void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); + m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h index 36c26d1b..613c65ea 100644 --- a/lib/widgets/propeditor/psizepolicyedit.h +++ b/lib/widgets/propeditor/psizepolicyedit.h @@ -34,8 +34,9 @@ namespace PropertyLib{ class PSizePolicyEdit : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent=0, const char* name=0); + PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* tqparent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index 755041c1..48b36324 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -26,19 +26,19 @@ namespace PropertyLib{ -PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PSpinBox::PSpinBox(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); } -PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQSpinBox(minValue, maxValue, step, this); diff --git a/lib/widgets/propeditor/pspinbox.h b/lib/widgets/propeditor/pspinbox.h index d4486cae..28d34ef2 100644 --- a/lib/widgets/propeditor/pspinbox.h +++ b/lib/widgets/propeditor/pspinbox.h @@ -31,9 +31,10 @@ namespace PropertyLib{ */ class PSpinBox: public PropertyWidget{ Q_OBJECT + TQ_OBJECT public: - PSpinBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); - PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *parent = 0, const char *name = 0); + PSpinBox(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index f6803304..e4eeeccf 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -29,24 +29,24 @@ #include <kpushbutton.h> #include <kstdguiitem.h> #else -#include "qeditlistbox.h" +#include "tqeditlistbox.h" #include <tqpushbutton.h> #include "compat_tools.h" #endif namespace PropertyLib{ -PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { l = new TQHBoxLayout(this); edit = new KLineEdit(this); edit->setReadOnly(true); - edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(edit); pbSelect = new TQPushButton("...", this); - pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + pbSelect->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(pbSelect); connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); @@ -71,7 +71,7 @@ void PStringListEdit::showEditor() TQVBoxLayout *dv = new TQVBoxLayout(dia, 2); #ifdef PURE_QT - QEditListBox *select = new QEditListBox(dia, "select_char"); + TQEditListBox *select = new TQEditListBox(dia, "select_char"); #else KEditListBox *select = new KEditListBox(dia, "select_char"); #endif @@ -108,10 +108,10 @@ void PStringListEdit::showEditor() void PStringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toStringList().join(", ")); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toStringList().join(", ")); } } diff --git a/lib/widgets/propeditor/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h index e1b076ca..45aa0e4e 100644 --- a/lib/widgets/propeditor/pstringlistedit.h +++ b/lib/widgets/propeditor/pstringlistedit.h @@ -35,8 +35,9 @@ namespace PropertyLib{ class PStringListEdit: public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PStringListEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index 24f4259c..087f7a8d 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -35,16 +35,16 @@ namespace PropertyLib{ -PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char *name) - :PropertyWidget(property, parent, name) +PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *tqparent, const char *name) + :PropertyWidget(property, tqparent, name) { l = new TQHBoxLayout(this); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); m_edit->setMaxLength(1); l->addWidget(m_edit); m_select = new TQPushButton("...", this); - m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(m_select); #ifdef PURE_QT @@ -58,18 +58,14 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char TQVariant PSymbolCombo::value() const { if (!(m_edit->text().isNull())) - return TQVariant(TQString("%1").arg(m_edit->text().at(0).unicode())); + return TQVariant(TQString("%1").tqarg(m_edit->text().tqat(0).tqunicode())); else return TQVariant(0); } void PSymbolCombo::setValue(const TQVariant &value, bool emitChange) { -#if QT_VERSION >= 0x030100 if (!(value.isNull())) -#else - if (value.canCast(TQVariant::Int)) -#endif { disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); m_edit->setText(TQChar(value.toInt())); @@ -113,15 +109,15 @@ void PSymbolCombo::selectChar() void PSymbolCombo::updateProperty(const TQString& val) { - emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).unicode()))); + emit propertyChanged(m_property, TQVariant(TQString("%1").tqarg(val.tqat(0).tqunicode()))); } void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { p->setBrush(cg.background()); - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQChar(value.toInt())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQChar(value.toInt())); } } diff --git a/lib/widgets/propeditor/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h index b9682023..9c559844 100644 --- a/lib/widgets/propeditor/psymbolcombo.h +++ b/lib/widgets/propeditor/psymbolcombo.h @@ -34,8 +34,9 @@ namespace PropertyLib{ */ class PSymbolCombo: public PropertyWidget{ Q_OBJECT + TQ_OBJECT public: - PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PSymbolCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index 64e4d0c7..d27a0552 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -30,8 +30,8 @@ namespace PropertyLib{ -PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const char* name) - :PropertyWidget(property, parent, name) +PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* tqparent, const char* name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT @@ -47,7 +47,7 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c m_mode = mode; connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); #endif - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } TQVariant PUrlEdit::value() const @@ -84,7 +84,7 @@ void PUrlEdit::select() if( m_mode == Directory ) m_url = TQFileDialog::getExistingDirectory( m_url,this); else - m_url = TQFileDialog::getOpenFileName(m_url, TQString::null, this); + m_url = TQFileDialog::getOpenFileName(m_url, TQString(), this); updateProperty(m_url); m_edit->setText(m_url); #endif diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h index d54dc3d2..4aff51b8 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -39,6 +39,7 @@ namespace PropertyLib{ class PUrlEdit : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: #ifndef PURE_QT enum Mode {File = KFile::File,Directory = KFile::Directory}; @@ -46,7 +47,7 @@ public: enum Mode {File,Directory}; #endif - PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent=0, const char* name=0); + PUrlEdit(Mode mode, MultiProperty* property, TQWidget* tqparent=0, const char* name=0); virtual TQVariant value() const; virtual void setValue(const TQVariant& value, bool emitChange); diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index 308570be..9448d672 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -31,13 +31,13 @@ namespace PropertyLib{ -PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char* name) - :PropertyWidget(property, parent, name) +PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* tqparent, const char* name) + :PropertyWidget(property, tqparent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQPushButton(this); m_edit->setToggleButton(true); - m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); diff --git a/lib/widgets/propeditor/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h index 408dec4b..efe33584 100644 --- a/lib/widgets/propeditor/pyesnobutton.h +++ b/lib/widgets/propeditor/pyesnobutton.h @@ -32,8 +32,9 @@ namespace PropertyLib{ class PYesNoButton : public PropertyWidget { Q_OBJECT + TQ_OBJECT public: - PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); + PYesNoButton(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index db40e8e7..565786f0 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -46,24 +46,24 @@ public: int buttons; }; -QEditListBox::QEditListBox(TQWidget *parent, const char *name, +QEditListBox::QEditListBox(TQWidget *tqparent, const char *name, bool checkAtEntering, int buttons ) - :TQGroupBox(parent, name ) + :TQGroupBox(tqparent, name ) { init( checkAtEntering, buttons ); } -QEditListBox::QEditListBox(const TQString& title, TQWidget *parent, +QEditListBox::QEditListBox(const TQString& title, TQWidget *tqparent, const char *name, bool checkAtEntering, int buttons) - :TQGroupBox(title, parent, name ) + :TQGroupBox(title, tqparent, name ) { init( checkAtEntering, buttons ); } QEditListBox::QEditListBox(const TQString& title, const CustomEditor& custom, - TQWidget *parent, const char *name, + TQWidget *tqparent, const char *name, bool checkAtEntering, int buttons) - :TQGroupBox(title, parent, name ) + :TQGroupBox(title, tqparent, name ) { m_lineEdit = custom.lineEdit(); init( checkAtEntering, buttons, custom.representationWidget() ); @@ -92,7 +92,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, servNewButton = servRemoveButton = servUpButton = servDownButton = 0L; - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); TQWidget * gb = this; @@ -185,7 +185,7 @@ void QEditListBox::typedSomething(const TQString& text) else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - bool enable = (m_listBox->findItem( text, mode ) == 0L); + bool enable = (m_listBox->tqfindItem( text, mode ) == 0L); servNewButton->setEnabled( enable ); } } @@ -256,7 +256,7 @@ void QEditListBox::addItem() else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - alreadyInList =(m_listBox->findItem(currentTextLE, mode) != 0); + alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) != 0); } } @@ -298,7 +298,7 @@ void QEditListBox::removeItem() m_listBox->removeItem( selected ); if ( count() > 0 ) - m_listBox->setSelected( QMIN( selected, count() - 1 ), true ); + m_listBox->setSelected( TQMIN( selected, count() - 1 ), true ); emit changed(); emit removed( removedText ); diff --git a/lib/widgets/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h index 7a4a34a2..78a61bfc 100644 --- a/lib/widgets/propeditor/qeditlistbox.h +++ b/lib/widgets/propeditor/qeditlistbox.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QEDITLISTBOX_H -#define QEDITLISTBOX_H +#ifndef TQEDITLISTBOX_H +#define TQEDITLISTBOX_H #include <tqgroupbox.h> #include <tqlistbox.h> @@ -42,11 +42,12 @@ class TQPushButton; class QEditListBoxPrivate; -class QEditListBox : public QGroupBox +class QEditListBox : public TQGroupBox { Q_OBJECT + TQ_OBJECT - Q_PROPERTY( TQStringList items READ items WRITE setItems ) + TQ_PROPERTY( TQStringList items READ items WRITE setItems ) public: // @since 3.1 @@ -100,7 +101,7 @@ public: * it will be checked if you press the Add-button. It is not * possible to enter items twice into the listbox. */ - QEditListBox(TQWidget *parent = 0, const char *name = 0, + QEditListBox(TQWidget *tqparent = 0, const char *name = 0, bool checkAtEntering=false, int buttons = All ); /** * Create an editable listbox. @@ -108,7 +109,7 @@ public: * The same as the other constructor, additionally it takes * @p title, which will be the title of the frame around the listbox. */ - QEditListBox(const TQString& title, TQWidget *parent = 0, + QEditListBox(const TQString& title, TQWidget *tqparent = 0, const char *name = 0, bool checkAtEntering=false, int buttons = All ); @@ -126,7 +127,7 @@ public: */ QEditListBox( const TQString& title, const CustomEditor &customEditor, - TQWidget *parent = 0, const char *name = 0, + TQWidget *tqparent = 0, const char *name = 0, bool checkAtEntering = false, int buttons = All ); virtual ~QEditListBox(); diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp index a8522105..d14ea9c7 100644 --- a/lib/widgets/propeditor/qfloatinput.cpp +++ b/lib/widgets/propeditor/qfloatinput.cpp @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ -#include "qfloatinput.h" +#include "tqfloatinput.h" #include <math.h> -QFloatInput::QFloatInput( int min, int max, float step, int digits, - TQWidget *parent, const char *name ) +TQFloatInput::TQFloatInput( int min, int max, float step, int digits, + TQWidget *tqparent, const char *name ) : TQSpinBox( (int) (min*pow(digits,10)), (int) (max*pow(digits,10)), - (int) (step*pow(digits,10)), parent, name ), + (int) (step*pow(digits,10)), tqparent, name ), m_digits( digits ) { setValue( (int) (min*pow(digits,10)) ); @@ -36,14 +36,14 @@ QFloatInput::QFloatInput( int min, int max, float step, int digits, setValidator( validator ); } -TQString QFloatInput::mapValueToText( int value ) +TQString TQFloatInput::mapValueToText( int value ) { - TQString format = TQString("%.%1f").arg( m_digits ); + TQString format = TQString("%.%1f").tqarg( m_digits ); return TQString().sprintf(format.latin1(), (value/(float)pow(m_digits,10)) ); } -int QFloatInput::mapTextToValue( bool* ok ) +int TQFloatInput::mapTextToValue( bool* ok ) { return int(cleanText().toFloat(ok)*pow(m_digits,10)); } diff --git a/lib/widgets/propeditor/qfloatinput.h b/lib/widgets/propeditor/qfloatinput.h index 4bbe63e6..dececcbf 100644 --- a/lib/widgets/propeditor/qfloatinput.h +++ b/lib/widgets/propeditor/qfloatinput.h @@ -18,18 +18,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ -#ifndef QFLOATINPUT_H -#define QFLOATINPUT_H +#ifndef TQFLOATINPUT_H +#define TQFLOATINPUT_H #include <tqapplication.h> #include <tqspinbox.h> #include <tqvalidator.h> -class QFloatInput : public QSpinBox +class TQFloatInput : public TQSpinBox { public: - QFloatInput( int min, int max, float step, int digits, - TQWidget *parent, const char *name = 0 ); + TQFloatInput( int min, int max, float step, int digits, + TQWidget *tqparent, const char *name = 0 ); virtual TQString mapValueToText( int value ); diff --git a/lib/widgets/propeditor/test.cpp b/lib/widgets/propeditor/test.cpp index 82665f98..a55a496b 100644 --- a/lib/widgets/propeditor/test.cpp +++ b/lib/widgets/propeditor/test.cpp @@ -38,7 +38,7 @@ int main( int argc, char **argv ) "Sample description", "value" ) ); currentList->addProperty( new Property(Property::Color, "Color", - "Sample color description", Qt::red ) ); + "Sample color description", TQt::red ) ); currentList->addProperty( new Property( Property::Pixmap, "Pixmap", "sample pixmap description" ) ); diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 800eec47..eea88588 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -15,7 +15,7 @@ #include "qcomboview.h" #include <kdeversion.h> -#ifndef QT_NO_COMBOBOX +#ifndef TQT_NO_COMBOBOX #include "tqpopupmenu.h" #include "tqlistview.h" #include "tqpainter.h" @@ -26,7 +26,7 @@ #include "tqapplication.h" #include "tqlineedit.h" #include "tqbitmap.h" -#include "private/qeffects_p.h" +#include "private/tqeffects_p.h" #include "tqstringlist.h" #include "tqcombobox.h" #include "tqstyle.h" @@ -39,7 +39,7 @@ public: QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb ) { duplicatesEnabled = TRUE; - cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + cb->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); } inline TQListView * listView() { return lView; } @@ -68,7 +68,7 @@ public: TQLineEdit * ed; // /bin/ed rules! TQTimer *completionTimer; - TQSize sizeHint; + TQSize tqsizeHint; private: bool usinglView; @@ -81,14 +81,14 @@ void QComboViewData::updateLinedGeometry() { if ( !ed || !combo ) return; - TQRect r = TQStyle::visualRect( combo->style().querySubControlMetrics(TQStyle::CC_ComboBox, combo, + TQRect r = TQStyle::tqvisualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo, TQStyle::SC_ComboBoxEditField), combo ); // qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1); const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0; if ( pix && pix->width() < r.width() ) r.setLeft( r.left() + pix->width() + 4 ); - if ( r != ed->geometry() ) + if ( r != ed->tqgeometry() ) ed->setGeometry( r ); } @@ -96,7 +96,7 @@ static inline bool checkInsertIndex( const char *method, const char * name, int count, int *index) { bool range_err = (*index > count); -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) if ( range_err ) qWarning( "QComboView::%s: (%s) Index %d out of range", method, name ? name : "<no name>", *index ); @@ -114,7 +114,7 @@ static inline bool checkIndex( const char *method, const char * name, int count, int index ) { bool range_err = (index >= count); -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) if ( range_err ) qWarning( "QComboView::%s: (%s) Index %i out of range", method, name ? name : "<no name>", index ); @@ -133,13 +133,13 @@ static inline bool checkIndex( const char *method, const char * name, The input field can be edited if \a rw is TRUE, otherwise the user may only choose one of the items in the combobox. - The \a parent and \a name arguments are passed on to the QWidget + The \a tqparent and \a name arguments are passed on to the TQWidget constructor. */ -QComboView::QComboView( bool rw, TQWidget *parent, const char *name ) - : TQWidget( parent, name, WResizeNoErase ) +QComboView::QComboView( bool rw, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name, WResizeNoErase ) { d = new QComboViewData( this ); setUpListView(); @@ -158,7 +158,7 @@ QComboView::QComboView( bool rw, TQWidget *parent, const char *name ) d->completeNow = FALSE; d->completionTimer = new TQTimer( this ); - setFocusPolicy( StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); d->ed = 0; if ( rw ) @@ -204,7 +204,7 @@ void QComboView::clear() d->current = 0; if ( d->ed ) { - d->ed->setText( TQString::fromLatin1("") ); + d->ed->setText( TQString::tqfromLatin1("") ); d->updateLinedGeometry(); } currentChanged(); @@ -269,20 +269,20 @@ void QComboView::setAutoResize( bool enable ) reimp This implementation caches the size hint to avoid resizing when - the contents change dynamically. To invalidate the cached value + the contents change dynamically. To tqinvalidate the cached value call setFont(). */ -TQSize QComboView::sizeHint() const +TQSize QComboView::tqsizeHint() const { - if ( isVisible() && d->sizeHint.isValid() ) - return d->sizeHint; + if ( isVisible() && d->tqsizeHint.isValid() ) + return d->tqsizeHint; constPolish(); // int i, w; TQFontMetrics fm = fontMetrics(); int maxW = childCount() ? 18 : 7 * fm.width(TQChar('x')) + 18; - int maxH = QMAX( fm.lineSpacing(), 14 ) + 2; + int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; /* for( i = 0; i < count(); i++ ) { w = d->listView()->item( i )->width( d->listView() ); @@ -290,10 +290,10 @@ TQSize QComboView::sizeHint() const maxW = w; } */ - d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, + d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut())); - return d->sizeHint; + return d->tqsizeHint; } @@ -385,7 +385,7 @@ void QComboView::setPalette( const TQPalette &palette ) void QComboView::setFont( const TQFont &font ) { - d->sizeHint = TQSize(); // invalidate size hint + d->tqsizeHint = TQSize(); // tqinvalidate size hint TQWidget::setFont( font ); d->listView()->setFont( font ); if (d->ed) @@ -412,7 +412,7 @@ void QComboView::resizeEvent( TQResizeEvent * e ) void QComboView::paintEvent( TQPaintEvent * ) { TQPainter p( this ); - const TQColorGroup & g = colorGroup(); + const TQColorGroup & g = tqcolorGroup(); p.setPen(g.text()); TQStyle::SFlags flags = TQStyle::Style_Default; @@ -428,31 +428,31 @@ void QComboView::paintEvent( TQPaintEvent * ) } // bool reverse = TQApplication::reverseLayout(); - style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, + tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, flags, TQStyle::SC_All, (d->arrowDown ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None )); - TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::visualRect(re, this); + re = TQStyle::tqvisualRect(re, this); p.setClipRect( re ); if ( !d->ed ) { TQListViewItem * item = d->current; if ( item ) { - // we calculate the QListBoxTexts height (ignoring strut) + // we calculate the TQListBoxTexts height (ignoring strut) int itemh = d->listView()->fontMetrics().lineSpacing() + 2; p.translate( re.x(), re.y() + (re.height() - itemh)/2 ); - item->paintCell( &p, d->listView()->colorGroup(), 0, width(), AlignLeft | AlignVCenter ); + item->paintCell( &p, d->listView()->tqcolorGroup(), 0, width(), AlignLeft | AlignVCenter ); } } else if ( d->listView() && d->listView()->currentItem( ) && d->current ) { TQListViewItem * item = d->current ; const TQPixmap *pix = item->pixmap(0); if ( pix ) { p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(), - colorGroup().brush( TQColorGroup::Base ) ); + tqcolorGroup().brush( TQColorGroup::Base ) ); p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix->height() ) / 2, *pix ); } @@ -466,30 +466,30 @@ void QComboView::paintEvent( TQPaintEvent * ) void QComboView::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() != LeftButton ) + if ( e->button() != Qt::LeftButton ) return; if ( d->discardNextMousePress ) { d->discardNextMousePress = FALSE; return; } - TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::visualRect(arrowRect, this); + arrowRect = TQStyle::tqvisualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. - arrowRect.setHeight( QMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); + arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( childCount() && ( !editable() || arrowRect.contains( e->pos() ) ) ) { + if ( childCount() && ( !editable() || arrowRect.tqcontains( e->pos() ) ) ) { d->arrowPressed = FALSE; listView()->blockSignals( TRUE ); - qApp->sendEvent( listView(), e ); // trigger the listbox's autoscroll + tqApp->sendEvent( listView(), e ); // trigger the listbox's autoscroll listView()->blockSignals( FALSE ); popup(); - if ( arrowRect.contains( e->pos() ) ) { + if ( arrowRect.tqcontains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; - repaint( FALSE ); + tqrepaint( FALSE ); } TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); d->shortClick = TRUE; @@ -604,7 +604,7 @@ TQString QComboView::currentText() const else if ( d->current ) return currentItem()->text(0); else - return TQString::null; + return TQString(); } /*!reimp @@ -689,23 +689,23 @@ int childCount(TQListView *lv) static int listHeight( TQListView *l, int /*sl*/ ) { /* if ( l->childCount() > 0 ) - return QMIN( l->childCount(), (uint)sl) * l->firstChild()->height(); + return TQMIN( l->childCount(), (uint)sl) * l->firstChild()->height(); else*/ int prefH = 0; int ch = childCount(l); - ch = QMIN(ch, 10); + ch = TQMIN(ch, 10); if (l->firstChild()) { prefH = ch * l->firstChild()->height(); } else - prefH = l->sizeHint().height(); + prefH = l->tqsizeHint().height(); if (l->header()->isVisible()) - prefH += l->header()->sizeHint().height(); + prefH += l->header()->tqsizeHint().height(); -// return prefH < l->sizeHint().height() ? prefH : l->sizeHint().height(); +// return prefH < l->tqsizeHint().height() ? prefH : l->tqsizeHint().height(); return prefH+2; } @@ -727,7 +727,7 @@ void QComboView::popup() lb->installEventFilter( this ); lb->viewport()->installEventFilter( this ); d->mouseWasInsidePopup = FALSE; -// int w = lb->variableWidth() ? lb->sizeHint().width() : width(); +// int w = lb->variableWidth() ? lb->tqsizeHint().width() : width(); int w = width(); int h = listHeight( lb, d->sizeLimit ); TQRect screen = TQApplication::desktop()->availableGeometry( const_cast<QComboView*>(this) ); @@ -737,7 +737,7 @@ void QComboView::popup() int sw = screen.width(); // screen width int sh = screen.height(); // screen height TQPoint pos = mapToGlobal( TQPoint(0,height()) ); - // ## Similar code is in QPopupMenu + // ## Similar code is in TQPopupMenu int x = pos.x(); int y = pos.y(); @@ -749,7 +749,7 @@ void QComboView::popup() if (y + h > sy+sh && y - h - height() >= 0 ) y = y - h - height(); TQRect rect = - style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxListBoxPopup, TQStyleOption( x, y, w, h ) ); if ( rect.isNull() ) @@ -767,10 +767,10 @@ void QComboView::popup() lb->blockSignals( block ); lb->setVScrollBarMode(TQScrollView::Auto); -//#ifndef QT_NO_EFFECTS +//#ifndef TQT_NO_EFFECTS /* if ( TQApplication::isEffectEnabled( UI_AnimateCombo ) ) { if ( lb->y() < mapToGlobal(TQPoint(0,0)).y() ) - qScrollEffect( lb, QEffects::UpScroll ); + qScrollEffect( lb, TQEffects::UpScroll ); else qScrollEffect( lb ); } else*/ @@ -790,7 +790,7 @@ void QComboView::updateMask() { TQPainter p( &bm, this ); - style().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); + tqstyle().tqdrawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); } setMask( bm ); @@ -808,7 +808,7 @@ void QComboView::popDownListView() d->listView()->setCurrentItem( d->current ); if ( d->arrowDown ) { d->arrowDown = FALSE; - repaint( FALSE ); + tqrepaint( FALSE ); } d->poppedUp = FALSE; } @@ -850,7 +850,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) { if ( !event ) return TRUE; - else if ( object == d->ed ) { + else if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->ed) ) { if ( event->type() == TQEvent::KeyPress ) { bool isAccepted = ( (TQKeyEvent*)event )->isAccepted(); keyPressEvent( (TQKeyEvent *)event ); @@ -887,38 +887,38 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) } } } - } else if ( ( object == d->listView() || - object == d->listView()->viewport() )) { + } else if ( ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()) || + TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()->viewport()) )) { TQMouseEvent *e = (TQMouseEvent*)event; switch( event->type() ) { case TQEvent::MouseMove: if ( !d->mouseWasInsidePopup ) { // qWarning("!d->mouseWasInsidePopup"); TQPoint pos = e->pos(); - if ( d->listView()->rect().contains( pos ) ) + if ( TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( pos ) ) d->mouseWasInsidePopup = TRUE; // Check if arrow button should toggle if ( d->arrowPressed ) { TQPoint comboPos; comboPos = mapFromGlobal( d->listView()->mapToGlobal(pos) ); TQRect arrowRect = - style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::visualRect(arrowRect, this); - if ( arrowRect.contains( comboPos ) ) { + arrowRect = TQStyle::tqvisualRect(arrowRect, this); + if ( arrowRect.tqcontains( comboPos ) ) { if ( !d->arrowDown ) { d->arrowDown = TRUE; - repaint( FALSE ); + tqrepaint( FALSE ); } } else { if ( d->arrowDown ) { d->arrowDown = FALSE; - repaint( FALSE ); + tqrepaint( FALSE ); } } } - } else if ((e->state() & ( RightButton | LeftButton | MidButton ) ) == 0 && - style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { + } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 && + tqstyle().tqstyleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // qWarning("event filter:: emu"); TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); // if ( mouseW == d->listView()->viewport() ) { //### @@ -935,7 +935,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonRelease: - if ( d->listView()->rect().contains( e->pos() ) ) { + if ( TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( e->pos() ) ) { TQMouseEvent tmp( TQEvent::MouseButtonDblClick, e->pos(), e->button(), e->state() ) ; // will hide popup @@ -948,14 +948,14 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) d->arrowPressed = FALSE; if ( d->arrowDown ) { d->arrowDown = FALSE; - repaint( FALSE ); + tqrepaint( FALSE ); } } } break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !d->listView()->rect().contains( e->pos() ) ) { + if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( e->pos() ) ) { TQPoint globalPos = d->listView()->mapToGlobal(e->pos()); if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { d->discardNextMousePress = TRUE; @@ -980,7 +980,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) break; case Key_Enter: case Key_Return: - // work around QDialog's enter handling + // work around TQDialog's enter handling return FALSE; default: break; @@ -1085,7 +1085,7 @@ void QComboView::returnPressed() TQListViewItem *c = 0; bool doInsert = TRUE; if ( !d->duplicatesEnabled ) { - c = listView()->findItem(s, 0); + c = listView()->tqfindItem(s, 0); if ( c ) doInsert = FALSE; } @@ -1161,7 +1161,7 @@ void QComboView::setEnabled( bool enable ) This function does nothing if the combobox is not editable. - \sa validator() clearValidator() QValidator + \sa validator() clearValidator() TQValidator */ void QComboView::setValidator( const TQValidator * v ) @@ -1175,7 +1175,7 @@ void QComboView::setValidator( const TQValidator * v ) Returns the validator which constrains editing for this combobox if there is one; otherwise returns 0. - \sa setValidator() clearValidator() QValidator + \sa setValidator() clearValidator() TQValidator */ const TQValidator * QComboView::validator() const @@ -1333,7 +1333,7 @@ bool QComboView::autoCompletion() const */ void QComboView::styleChange( TQStyle& s ) { - d->sizeHint = TQSize(); // invalidate size hint... + d->tqsizeHint = TQSize(); // tqinvalidate size hint... if ( d->ed ) d->updateLinedGeometry(); TQWidget::styleChange( s ); @@ -1359,7 +1359,7 @@ void QComboView::setEditable( bool y ) d->ed = 0; } - setFocusPolicy( StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); updateGeometry(); update(); } @@ -1412,7 +1412,7 @@ void QComboView::setUpLineEdit() void QComboView::setLineEdit( TQLineEdit *edit ) { if ( !edit ) { -#if defined(QT_CHECK_NULL) +#if defined(TQT_CHECK_NULL) Q_ASSERT( edit != 0 ); #endif return; @@ -1430,7 +1430,7 @@ void QComboView::setLineEdit( TQLineEdit *edit ) d->ed = edit; - if ( edit->parent() != this ) { + if ( TQT_BASE_OBJECT(edit->tqparent()) != TQT_BASE_OBJECT(this) ) { edit->reparent( this, TQPoint(0,0), FALSE ); edit->setFont( font() ); } @@ -1443,7 +1443,7 @@ void QComboView::setLineEdit( TQLineEdit *edit ) d->updateLinedGeometry(); edit->installEventFilter( this ); setFocusProxy( edit ); - setFocusPolicy( StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setUpListView(); @@ -1457,7 +1457,7 @@ void QComboView::setLineEdit( TQLineEdit *edit ) void QComboView::setCurrentText( const TQString& txt ) { TQListViewItem *i; - i = listView()->findItem(txt, 0); + i = listView()->tqfindItem(txt, 0); if ( i ) setCurrentItem( i ); else if ( d->ed ) @@ -1501,5 +1501,5 @@ void QComboView::setCurrentActiveItem( TQListViewItem * item ) #include "qcomboview.moc" -#endif // QT_NO_COMBOBOX +#endif // TQT_NO_COMBOBOX diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index 1fc87e14..213c278f 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -13,14 +13,14 @@ ** **********************************************************************/ -#ifndef QCOMBOVIEW_H -#define QCOMBOVIEW_H +#ifndef TQCOMBOVIEW_H +#define TQCOMBOVIEW_H -#ifndef QT_H +#ifndef TQT_H #include "tqwidget.h" -#endif // QT_H +#endif // TQT_H -#ifndef QT_NO_COMBOBOX +#ifndef TQT_NO_COMBOBOX /** @file qcomboview.h @@ -40,25 +40,26 @@ QComboView - a combo with a TQListView as a popup widget. This means that you can have a treeview inside of a combo. Otherwise it works in the same way as TQComboBox and have similar API. */ -class Q_EXPORT QComboView : public QWidget +class TQ_EXPORT QComboView : public TQWidget { Q_OBJECT + TQ_OBJECT Q_ENUMS( Policy ) - Q_PROPERTY( bool editable READ editable WRITE setEditable ) -// Q_PROPERTY( int count READ count ) - Q_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false ) -// Q_PROPERTY( TQListView *currentItem READ currentItem WRITE setCurrentItem ) - Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false ) - Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit ) -// Q_PROPERTY( int maxCount READ maxCount WRITE setMaxCount ) - Q_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy ) - Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion ) - Q_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled ) - Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) + TQ_PROPERTY( bool editable READ editable WRITE setEditable ) +// TQ_PROPERTY( int count READ count ) + TQ_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false ) +// TQ_PROPERTY( TQListView *currentItem READ currentItem WRITE setCurrentItem ) + TQ_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false ) + TQ_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit ) +// TQ_PROPERTY( int maxCount READ maxCount WRITE setMaxCount ) + TQ_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy ) + TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion ) + TQ_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled ) + TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: -// QComboView( TQWidget* parent=0, const char* name=0 ); - QComboView( bool rw, TQWidget* parent=0, const char* name=0 ); +// QComboView( TQWidget* tqparent=0, const char* name=0 ); + QComboView( bool rw, TQWidget* tqparent=0, const char* name=0 ); ~QComboView(); int childCount() const; @@ -69,7 +70,7 @@ public: bool autoResize() const; virtual void setAutoResize( bool ); - QSize sizeHint() const; + TQSize tqsizeHint() const; void setPalette( const TQPalette & ); void setFont( const TQFont & ); @@ -160,13 +161,13 @@ private: QComboViewData *d; private: // Disabled copy constructor and operator= -#if defined(Q_DISABLE_COPY) +#if defined(TQ_DISABLE_COPY) QComboView( const QComboView & ); QComboView &operator=( const QComboView & ); #endif }; -#endif // QT_NO_COMBOBOX +#endif // TQT_NO_COMBOBOX -#endif // QCOMBOVIEW_H +#endif // TQCOMBOVIEW_H diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp index 6ca7e239..eeeba8d0 100644 --- a/lib/widgets/resizablecombo.cpp +++ b/lib/widgets/resizablecombo.cpp @@ -51,8 +51,8 @@ static const char * resize_xpm[] = { " . ", " "}; -ResizableCombo::ResizableCombo(KComboView *view, TQWidget *parent, const char *name): - TQWidget(parent, name), m_sizer(0), m_combo(view) +ResizableCombo::ResizableCombo(KComboView *view, TQWidget *tqparent, const char *name): + TQWidget(tqparent, name), m_sizer(0), m_combo(view) { TQHBoxLayout *l = new TQHBoxLayout(this); view->reparent(this, TQPoint(0,0)); @@ -86,10 +86,10 @@ void MyPushButton::mouseMoveEvent( TQMouseEvent * e ) TQPushButton::mouseMoveEvent(e); } -MyPushButton::MyPushButton( ResizableCombo * parent, const char * name ) - :TQPushButton(parent, name), m_resizing(false), m_combo(parent) +MyPushButton::MyPushButton( ResizableCombo * tqparent, const char * name ) + :TQPushButton(tqparent, name), m_resizing(false), m_combo(tqparent) { - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); setFlat(true); m_width = m_combo->m_combo->width(); } diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h index 9301ddea..bafefe33 100644 --- a/lib/widgets/resizablecombo.h +++ b/lib/widgets/resizablecombo.h @@ -35,10 +35,11 @@ Resizable combo box. Resizable combo box. Used to place resizable KComboBox onto toolbars. */ -class ResizableCombo: public QWidget{ +class ResizableCombo: public TQWidget{ Q_OBJECT + TQ_OBJECT public: - ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0); + ResizableCombo(KComboView *view, TQWidget *tqparent = 0, const char *name = 0); private: MyPushButton *m_sizer; @@ -47,10 +48,10 @@ private: friend class MyPushButton; }; -class MyPushButton: public QPushButton +class MyPushButton: public TQPushButton { public: - MyPushButton(ResizableCombo *parent = 0, const char *name = 0 ); + MyPushButton(ResizableCombo *tqparent = 0, const char *name = 0 ); TQPoint pressedPos() { |