diff options
Diffstat (limited to 'lib')
188 files changed, 3484 insertions, 3484 deletions
diff --git a/lib/catalog/catalog.cpp b/lib/catalog/catalog.cpp index 96853ff1..c58bbe7d 100644 --- a/lib/catalog/catalog.cpp +++ b/lib/catalog/catalog.cpp @@ -17,10 +17,10 @@ Boston, MA 02110-1301, USA. */ #include "catalog.h" -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdatastream.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdatastream.h> #include <krandomsequence.h> #include <kdebug.h> @@ -34,10 +34,10 @@ struct _Catalog_Private { - QString dbName; + TQString dbName; DB* dbp; - QMap<QCString, DB*> indexList; + TQMap<TQCString, DB*> indexList; KRandomSequence rnd; bool enabled; @@ -46,17 +46,17 @@ struct _Catalog_Private { } - bool hasIndex( const QCString& name ) const + bool hasIndex( const TQCString& name ) const { return indexList.contains( name ); } - DB* index( const QCString& name ) + DB* index( const TQCString& name ) { return indexList[ name ]; } - bool addItem( DB* dbp, const QCString& id, const Tag& tag ) + bool addItem( DB* dbp, const TQCString& id, const Tag& tag ) { Q_ASSERT( dbp != 0 ); @@ -66,17 +66,17 @@ struct _Catalog_Private std::memset( &key, 0, sizeof(key) ); std::memset( &data, 0, sizeof(data) ); - QByteArray a1; + TQByteArray a1; { - QDataStream stream( a1, IO_WriteOnly ); + TQDataStream stream( a1, IO_WriteOnly ); stream << id; key.data = a1.data(); key.size = a1.size(); } - QByteArray a2; + TQByteArray a2; { - QDataStream stream( a2, IO_WriteOnly ); + TQDataStream stream( a2, IO_WriteOnly ); tag.store( stream ); data.data = a2.data(); data.size = a2.size(); @@ -87,7 +87,7 @@ struct _Catalog_Private return ret == 0; } - bool addItem( DB* dbp, const QVariant& id, const QCString& v ) + bool addItem( DB* dbp, const TQVariant& id, const TQCString& v ) { Q_ASSERT( dbp != 0 ); @@ -97,17 +97,17 @@ struct _Catalog_Private std::memset( &key, 0, sizeof(key) ); std::memset( &data, 0, sizeof(data) ); - QByteArray a1; + TQByteArray a1; { - QDataStream stream( a1, IO_WriteOnly ); + TQDataStream stream( a1, IO_WriteOnly ); stream << id; key.data = a1.data(); key.size = a1.size(); } - QByteArray a2; + TQByteArray a2; { - QDataStream stream( a2, IO_WriteOnly ); + TQDataStream stream( a2, IO_WriteOnly ); stream << v; data.data = a2.data(); data.size = a2.size(); @@ -142,10 +142,10 @@ struct _Catalog_Private /*! \fn Catalog::indexList() const */ - QValueList<QCString> Catalog::indexList() const + TQValueList<TQCString> Catalog::indexList() const { - QValueList<QCString> l; - QMap<QCString, DB*>::Iterator it = d->indexList.begin(); + TQValueList<TQCString> l; + TQMap<TQCString, DB*>::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ l << it.key(); ++it; @@ -165,14 +165,14 @@ void Catalog::setEnabled( bool isEnabled ) } /*! - \fn Catalog::addIndex( const QString& name ) + \fn Catalog::addIndex( const TQString& name ) @todo document these functions */ - void Catalog::addIndex( const QCString& name ) + void Catalog::addIndex( const TQCString& name ) { Q_ASSERT( d->dbp != 0 ); - QMap<QCString, DB*>::Iterator it = d->indexList.find( name ); + TQMap<TQCString, DB*>::Iterator it = d->indexList.find( name ); if( it == d->indexList.end() ){ DB* dbp = 0; @@ -189,15 +189,15 @@ void Catalog::setEnabled( bool isEnabled ) return; } - QFileInfo fileInfo( d->dbName ); - QString indexName = fileInfo.dirPath(true) + "/" + fileInfo.baseName(true) + "." + QString(name) + ".idx"; + TQFileInfo fileInfo( d->dbName ); + TQString indexName = fileInfo.dirPath(true) + "/" + fileInfo.baseName(true) + "." + TQString(name) + ".idx"; if( (ret = dbp->set_cachesize( dbp, 0, 2 * 1024 * 1024, 0 )) != 0 ){ kdDebug() << "set_cachesize: " << db_strerror(ret) << endl; } if ((ret = dbp->open( - dbp, NULL, QFile::encodeName( indexName ).data(), 0, DB_BTREE, DB_CREATE, 0664)) != 0) { + dbp, NULL, TQFile::encodeName( indexName ).data(), 0, DB_BTREE, DB_CREATE, 0664)) != 0) { kdDebug() << "db_open: " << db_strerror(ret) << endl; dbp->close( dbp, 0 ); return; @@ -213,9 +213,9 @@ void Catalog::setEnabled( bool isEnabled ) void Catalog::close() { - d->dbName = QString::null; + d->dbName = TQString::null; - QMap<QCString, DB*>::Iterator it = d->indexList.begin(); + TQMap<TQCString, DB*>::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ if( it.data() ){ it.data()->close( it.data(), 0 ); @@ -231,10 +231,10 @@ void Catalog::setEnabled( bool isEnabled ) } /*! - \fn Catalog::open( const QString& dbName ) + \fn Catalog::open( const TQString& dbName ) */ - void Catalog::open( const QString& dbName ) + void Catalog::open( const TQString& dbName ) { Q_ASSERT( d->dbp == 0 ); @@ -269,7 +269,7 @@ void Catalog::setEnabled( bool isEnabled ) \fn Catalog::dbName() const */ - QString Catalog::dbName() const + TQString Catalog::dbName() const { return d->dbName; } @@ -292,11 +292,11 @@ void Catalog::setEnabled( bool isEnabled ) if( tag.name().isEmpty() ) return; - QCString id = generateId(); + TQCString id = generateId(); tag.setId( id ); if( d->addItem(d->dbp, id, tag) ){ - QMap<QCString, DB*>::Iterator it = d->indexList.begin(); + TQMap<TQCString, DB*>::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ if( tag.hasAttribute(it.key()) ) d->addItem( it.data(), tag.attribute(it.key()), id ); @@ -306,10 +306,10 @@ void Catalog::setEnabled( bool isEnabled ) } /*! - \fn Catalog::getItemById( const QString& id ) + \fn Catalog::getItemById( const TQString& id ) */ - Tag Catalog::getItemById( const QCString& id ) + Tag Catalog::getItemById( const TQCString& id ) { Q_ASSERT( d->dbp != 0 ); @@ -317,9 +317,9 @@ void Catalog::setEnabled( bool isEnabled ) std::memset( &key, 0, sizeof(key) ); std::memset( &data, 0, sizeof(data) ); - QByteArray a1; + TQByteArray a1; { - QDataStream stream( a1, IO_WriteOnly ); + TQDataStream stream( a1, IO_WriteOnly ); stream << id; key.data = a1.data(); key.size = a1.size(); @@ -331,9 +331,9 @@ void Catalog::setEnabled( bool isEnabled ) Tag tag; if( ret == 0 ){ - QByteArray a; + TQByteArray a; a.setRawData( (const char*) data.data, data.size ); - QDataStream stream( a, IO_ReadOnly ); + TQDataStream stream( a, IO_ReadOnly ); tag.load( stream ); a.resetRawData( (const char*) data.data, data.size ); } @@ -350,7 +350,7 @@ void Catalog::setEnabled( bool isEnabled ) Q_ASSERT( d->dbp != 0 ); d->dbp->sync( d->dbp, 0 ); - QMap<QCString, DB*>::Iterator it = d->indexList.begin(); + TQMap<TQCString, DB*>::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ it.data()->sync( it.data(), 0 ); ++it; @@ -358,22 +358,22 @@ void Catalog::setEnabled( bool isEnabled ) } /*! - \fn Catalog::query( const QValueList<QueryArgument>& args ) + \fn Catalog::query( const TQValueList<QueryArgument>& args ) */ - QValueList<Tag> Catalog::query( const QValueList<QueryArgument>& args ) + TQValueList<Tag> Catalog::query( const TQValueList<QueryArgument>& args ) { - QValueList<Tag> tags; + TQValueList<Tag> tags; DBT key, data; DBC** cursors = new DBC* [ args.size() + 1 ]; - QValueList< QPair<QCString,QVariant> >::ConstIterator it = args.begin(); + TQValueList< QPair<TQCString,TQVariant> >::ConstIterator it = args.begin(); int current = 0; while( it != args.end() ){ - QCString indexName = (*it).first; - QVariant value = (*it).second; + TQCString indexName = (*it).first; + TQVariant value = (*it).second; if( d->hasIndex(indexName) ) { DB* dbp = d->index( indexName ); @@ -382,9 +382,9 @@ void Catalog::setEnabled( bool isEnabled ) std::memset( &key, 0, sizeof(key) ); std::memset( &data, 0, sizeof(data) ); - QByteArray a1; + TQByteArray a1; { - QDataStream stream( a1, IO_WriteOnly ); + TQDataStream stream( a1, IO_WriteOnly ); stream << value; key.data = a1.data(); key.size = a1.size(); @@ -426,9 +426,9 @@ void Catalog::setEnabled( bool isEnabled ) while( join_curs->c_get(join_curs, &key, &data, 0) == 0 ) { - QByteArray a2; + TQByteArray a2; a2.setRawData( (const char*) data.data, data.size ); - QDataStream s( a2, IO_ReadOnly ); + TQDataStream s( a2, IO_ReadOnly ); Tag tag; tag.load( s ); a2.resetRawData( (const char*) data.data, data.size ); @@ -452,10 +452,10 @@ void Catalog::setEnabled( bool isEnabled ) return tags; } - QCString Catalog::generateId() + TQCString Catalog::generateId() { static int n = 1; - QCString asStr; + TQCString asStr; asStr.sprintf( "%05d", n++ ); return asStr; } diff --git a/lib/catalog/catalog.h b/lib/catalog/catalog.h index 6ab985a9..00eb5b2b 100644 --- a/lib/catalog/catalog.h +++ b/lib/catalog/catalog.h @@ -20,9 +20,9 @@ #ifndef CATALOG_H #define CATALOG_H -#include <qvaluelist.h> -#include <qpair.h> -#include <qvariant.h> +#include <tqvaluelist.h> +#include <tqpair.h> +#include <tqvariant.h> #include "tag.h" @@ -42,31 +42,31 @@ never or rarely changes. System libraries are perfect examples of such code. class Catalog { public: - typedef QPair<QCString, QVariant> QueryArgument; + typedef QPair<TQCString, TQVariant> QueryArgument; public: Catalog(); virtual ~Catalog(); bool isValid() const; - QString dbName() const; + TQString dbName() const; bool enabled() const; void setEnabled( bool en ); - virtual void open( const QString& dbName ); + virtual void open( const TQString& dbName ); virtual void close(); virtual void sync(); - QValueList<QCString> indexList() const; - void addIndex( const QCString& name ); + TQValueList<TQCString> indexList() const; + void addIndex( const TQCString& name ); void addItem( Tag& tag ); - Tag getItemById( const QCString& id ); - QValueList<Tag> query( const QValueList<QueryArgument>& args ); + Tag getItemById( const TQCString& id ); + TQValueList<Tag> query( const TQValueList<QueryArgument>& args ); - QCString generateId(); + TQCString generateId(); private: class _Catalog_Private* d; diff --git a/lib/catalog/tag.cpp b/lib/catalog/tag.cpp index 748ca994..966e9713 100644 --- a/lib/catalog/tag.cpp +++ b/lib/catalog/tag.cpp @@ -18,7 +18,7 @@ */ #include "tag.h" -#include <qdatastream.h> +#include <tqdatastream.h> Tag::Tag() { @@ -81,7 +81,7 @@ Tag& Tag::operator = ( const Tag& source ) return( *this ); } -void Tag::load( QDataStream& stream ) +void Tag::load( TQDataStream& stream ) { stream >> data->id @@ -97,7 +97,7 @@ void Tag::load( QDataStream& stream ) >> data->attributes; } -void Tag::store( QDataStream& stream ) const +void Tag::store( TQDataStream& stream ) const { stream << data->id @@ -113,13 +113,13 @@ void Tag::store( QDataStream& stream ) const << data->attributes; } -QDataStream& operator << ( QDataStream& s, const Tag& t) +TQDataStream& operator << ( TQDataStream& s, const Tag& t) { t.store( s ); return s; } -QDataStream& operator >> ( QDataStream& s, Tag& t ) +TQDataStream& operator >> ( TQDataStream& s, Tag& t ) { t.load( s ); return s; diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h index da67b083..5c1fac41 100644 --- a/lib/catalog/tag.h +++ b/lib/catalog/tag.h @@ -20,9 +20,9 @@ #ifndef TAG_H #define TAG_H -#include <qmap.h> -#include <qvariant.h> -#include <qshared.h> +#include <tqmap.h> +#include <tqvariant.h> +#include <tqshared.h> class QDataStream; @@ -78,12 +78,12 @@ public: Tag& operator = ( const Tag& source ); - QCString id() const + TQCString id() const { return data->id; } - void setId( const QCString& id ) + void setId( const TQCString& id ) { detach(); data->id = id; @@ -111,31 +111,31 @@ public: data->flags = flags; } - QString fileName() const + TQString fileName() const { return data->fileName; } - void setFileName( const QString& fileName ) + void setFileName( const TQString& fileName ) { detach(); data->fileName = fileName; } - QString path( const QString& sep = QString::fromLatin1("::") ) const + TQString path( const TQString& sep = TQString::fromLatin1("::") ) const { - QString s = scope().join( sep ); + TQString s = scope().join( sep ); if( s.isNull() ) return name(); return s + sep + name(); } - QString name() const + TQString name() const { return data->name; } - QString comment() const { + TQString comment() const { if( hasAttribute( "cmt" ) ) { return attribute( "cmt" ).asString(); } else { @@ -143,22 +143,22 @@ public: } } - void setComment( const QString& comment ) { + void setComment( const TQString& comment ) { setAttribute( "cmt", comment ); } - void setName( const QString& name ) + void setName( const TQString& name ) { detach(); data->name = name; } - QStringList scope() const + TQStringList scope() const { return data->scope; } - void setScope( const QStringList& scope ) + void setScope( const TQStringList& scope ) { detach(); data->scope = scope; @@ -190,22 +190,22 @@ public: data->endColumn = column; } - QString getSpecializationDeclaration() const { + TQString getSpecializationDeclaration() const { if( hasAttribute( "spc" ) ) return data->attributes["spc"].asString(); else - return QString::null; + return TQString::null; } bool hasSpecializationDeclaration() const { return data->attributes.contains( "spc" ); } - void setSpecializationDeclaration( const QString& str ) { + void setSpecializationDeclaration( const TQString& str ) { data->attributes["spc"] = str; } - bool hasAttribute( const QCString& name ) const + bool hasAttribute( const TQCString& name ) const { if( name == "kind" || name == "name" || @@ -219,7 +219,7 @@ public: return data->attributes.contains( name ); } - QVariant attribute( const QCString& name ) const + TQVariant attribute( const TQCString& name ) const { if( name == "id" ) return data->id; @@ -244,7 +244,7 @@ public: return data->attributes[ name ]; } - void setAttribute( const QCString& name, const QVariant& value ) + void setAttribute( const TQCString& name, const TQVariant& value ) { detach(); if( name == "id" ) @@ -269,20 +269,20 @@ public: data->attributes[ name ] = value; } - void addTemplateParam( const QString& param , const QString& def = "" ) { - QMap<QCString, QVariant>::iterator it = data->attributes.find( "tpl" ); - if( it != data->attributes.end() && (*it).type() == QVariant::StringList ) { + void addTemplateParam( const TQString& param , const TQString& def = "" ) { + TQMap<TQCString, TQVariant>::iterator it = data->attributes.find( "tpl" ); + if( it != data->attributes.end() && (*it).type() == TQVariant::StringList ) { }else{ - it = data->attributes.insert( "tpl", QVariant( QStringList() ) ); + it = data->attributes.insert( "tpl", TQVariant( TQStringList() ) ); } - QStringList& l( (*it).asStringList() ); + TQStringList& l( (*it).asStringList() ); l << param; l << def; } - void load( QDataStream& stream ); - void store( QDataStream& stream ) const; + void load( TQDataStream& stream ); + void store( TQDataStream& stream ) const; private: Tag copy(); @@ -291,19 +291,19 @@ private: private: struct TagData: public QShared { - QCString id; + TQCString id; int kind; unsigned long flags; - QString name; - QStringList scope; - QString fileName; + TQString name; + TQStringList scope; + TQString fileName; int startLine, startColumn; int endLine, endColumn; - QMap<QCString, QVariant> attributes; + TQMap<TQCString, TQVariant> attributes; } *data; }; -QDataStream& operator << ( QDataStream&, const Tag& ); -QDataStream& operator >> ( QDataStream&, Tag& ); +TQDataStream& operator << ( TQDataStream&, const Tag& ); +TQDataStream& operator >> ( TQDataStream&, Tag& ); #endif diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index 978d9408..209a8a99 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -18,10 +18,10 @@ */ #include "ast.h" -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdebug.h> -QString nodeTypeToString( int type ) +TQString nodeTypeToString( int type ) { switch( type ) { @@ -125,7 +125,7 @@ QString nodeTypeToString( int type ) return "Custom"; } - return QString::null; + return TQString::null; } @@ -232,18 +232,18 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam m_classOrNamespaceNameList.append( classOrNamespaceName.release() ); } -QString NameAST::text() const +TQString NameAST::text() const { if( !m_unqualifiedName.get() ) - return QString::null; + return TQString::null; - QString str; + TQString str; if( m_global ) str += "::"; - QStringList l; - QPtrListIterator<ClassOrNamespaceNameAST> it( m_classOrNamespaceNameList ); + TQStringList l; + TQPtrListIterator<ClassOrNamespaceNameAST> it( m_classOrNamespaceNameList ); while( it.current() ){ str += it.current()->text() + "::"; ++it; @@ -414,11 +414,11 @@ void TemplateArgumentListAST::addArgument( AST::Node& arg ) m_argumentList.append( arg.release() ); } -QString TemplateArgumentListAST::text() const +TQString TemplateArgumentListAST::text() const { - QStringList l; + TQStringList l; - QPtrListIterator<AST> it( m_argumentList ); + TQPtrListIterator<AST> it( m_argumentList ); while( it.current() ){ l.append( it.current()->text() ); ++it; @@ -467,14 +467,14 @@ void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST:: if( m_templateArgumentList.get() ) m_templateArgumentList->setParent( this ); } -QString ClassOrNamespaceNameAST::text() const +TQString ClassOrNamespaceNameAST::text() const { if( !m_name.get() ) - return QString::null; + return TQString::null; - QString str = m_name->text(); + TQString str = m_name->text(); if( m_templateArgumentList.get() ) - str += QString::fromLatin1("< ") + m_templateArgumentList->text() + QString::fromLatin1(" >"); + str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); return str; } @@ -496,9 +496,9 @@ void TypeSpecifierAST::setCv2Qualify( GroupAST::Node& cv2Qualify ) if( m_cv2Qualify.get() ) m_cv2Qualify->setParent( this ); } -QString TypeSpecifierAST::text() const +TQString TypeSpecifierAST::text() const { - QString str; + TQString str; if( m_cvQualify.get() ) str += m_cvQualify->text() + " "; @@ -507,7 +507,7 @@ QString TypeSpecifierAST::text() const str += m_name->text(); if( m_cv2Qualify.get() ) - str += QString(" ") + m_cv2Qualify->text(); + str += TQString(" ") + m_cv2Qualify->text(); return str; } @@ -566,7 +566,7 @@ void ElaboratedTypeSpecifierAST::setKind( AST::Node& kind ) if( m_kind.get() ) m_kind->setParent( this ); } -QString ElaboratedTypeSpecifierAST::text() const +TQString ElaboratedTypeSpecifierAST::text() const { if( m_kind.get() ) return m_kind->text() + " " + TypeSpecifierAST::text(); @@ -1040,9 +1040,9 @@ void ParameterDeclarationAST::setExpression( AST::Node& expression ) if( m_expression.get() ) m_expression->setParent( this ); } -QString ParameterDeclarationAST::text() const +TQString ParameterDeclarationAST::text() const { - QString str; + TQString str; if( m_typeSpec.get() ) str += m_typeSpec->text() + " "; @@ -1050,7 +1050,7 @@ QString ParameterDeclarationAST::text() const str += m_declarator->text(); if( m_expression.get() ) - str += QString( " = " ) + m_expression->text(); + str += TQString( " = " ) + m_expression->text(); return str; } @@ -1070,11 +1070,11 @@ void ParameterDeclarationListAST::addParameter( ParameterDeclarationAST::Node& p m_parameterList.append( parameter.release() ); } -QString ParameterDeclarationListAST::text() const +TQString ParameterDeclarationListAST::text() const { - QStringList l; + TQStringList l; - QPtrListIterator<ParameterDeclarationAST> it( m_parameterList ); + TQPtrListIterator<ParameterDeclarationAST> it( m_parameterList ); while( it.current() ){ l.append( it.current()->text() ); ++it; @@ -1101,9 +1101,9 @@ void ParameterDeclarationClauseAST::setEllipsis( AST::Node& ellipsis ) if( m_ellipsis.get() ) m_ellipsis->setParent( this ); } -QString ParameterDeclarationClauseAST::text() const +TQString ParameterDeclarationClauseAST::text() const { - QString str; + TQString str; if( m_parameterDeclarationList.get() ) str += m_parameterDeclarationList->text(); @@ -1130,11 +1130,11 @@ void GroupAST::addNode( AST::Node& node ) m_nodeList.append( node.release() ); } -QString GroupAST::text() const +TQString GroupAST::text() const { - QStringList l; + TQStringList l; - QPtrListIterator<AST> it( m_nodeList ); + TQPtrListIterator<AST> it( m_nodeList ); while( it.current() ){ l.append( it.current()->text() ); ++it; @@ -1158,11 +1158,11 @@ void AccessDeclarationAST::addAccess( AST::Node& access ) m_accessList.append( access.release() ); } -QString AccessDeclarationAST::text() const +TQString AccessDeclarationAST::text() const { - QStringList l; + TQStringList l; - QPtrListIterator<AST> it( m_accessList ); + TQPtrListIterator<AST> it( m_accessList ); while( it.current() ){ l.append( it.current()->text() ); ++it; diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index b8756bf3..c9750faf 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -21,9 +21,9 @@ #define __ast_h #include <memory> -#include <qstring.h> -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqptrlist.h> +#include <tqstringlist.h> #include <ksharedptr.h> #if defined( Q_OS_WIN32 ) || defined( Q_CC_SUN ) @@ -180,7 +180,7 @@ enum NodeType NodeType_Custom = 2000 }; -QString nodeTypeToString( int type ); +TQString nodeTypeToString( int type ); #if defined(CPPPARSER_QUICK_ALLOCATOR) @@ -205,7 +205,7 @@ QString nodeTypeToString( int type ); struct Slice { - QString source; + TQString source; int position; int length; @@ -215,13 +215,13 @@ struct Slice class CommentAST { - QString m_comment; + TQString m_comment; public: - void setComment( const QString& comment ) { + void setComment( const TQString& comment ) { m_comment = comment; } - void addComment( const QString& comment ) { + void addComment( const TQString& comment ) { if( !m_comment.isEmpty() ) { m_comment += "\n(" + comment + ")"; } else { @@ -229,7 +229,7 @@ class CommentAST { } } - QString comment() const { + TQString comment() const { return m_comment; } @@ -263,18 +263,18 @@ public: void getEndPosition( int* line, int* col ) const; #ifndef CPPPARSER_NO_CHILDREN - QPtrList<AST> children() { return m_children; } + TQPtrList<AST> children() { return m_children; } void appendChild( AST* child ); void removeChild( AST* child ); #endif - virtual inline QString text() const + virtual inline TQString text() const { return m_slice.source.mid(m_slice.position, m_slice.length); } inline void setSlice( const Slice& slice ) { m_slice = slice; } - inline void setSlice( const QString &text, int position, int length ) + inline void setSlice( const TQString &text, int position, int length ) { CommentAST a; m_slice.source = text; @@ -282,7 +282,7 @@ public: m_slice.length = length; } - inline void setText(const QString &text) + inline void setText(const TQString &text) { setSlice(text, 0, text.length()); } private: @@ -292,7 +292,7 @@ private: int m_endLine, m_endColumn; Slice m_slice; #ifndef CPPPARSER_NO_CHILDREN - QPtrList<AST> m_children; + TQPtrList<AST> m_children; #endif private: @@ -311,13 +311,13 @@ public: public: GroupAST(); - QPtrList<AST> nodeList() { return m_nodeList; } + TQPtrList<AST> nodeList() { return m_nodeList; } void addNode( AST::Node& node ); - virtual QString text() const; + virtual TQString text() const; private: - QPtrList<AST> m_nodeList; + TQPtrList<AST> m_nodeList; private: GroupAST( const GroupAST& source ); @@ -337,12 +337,12 @@ public: TemplateArgumentListAST(); void addArgument( AST::Node& arg ); - QPtrList<AST> argumentList() { return m_argumentList; } + TQPtrList<AST> argumentList() { return m_argumentList; } - virtual QString text() const; + virtual TQString text() const; private: - QPtrList<AST> m_argumentList; + TQPtrList<AST> m_argumentList; private: TemplateArgumentListAST( const TemplateArgumentListAST& source ); @@ -366,7 +366,7 @@ public: TemplateArgumentListAST* templateArgumentList() { return m_templateArgumentList.get(); } void setTemplateArgumentList( TemplateArgumentListAST::Node& templateArgumentList ); - virtual QString text() const; + virtual TQString text() const; private: AST::Node m_name; @@ -392,17 +392,17 @@ public: void setGlobal( bool b ); void addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNamespaceName ); - QPtrList<ClassOrNamespaceNameAST> classOrNamespaceNameList() { return m_classOrNamespaceNameList; } + TQPtrList<ClassOrNamespaceNameAST> classOrNamespaceNameList() { return m_classOrNamespaceNameList; } ClassOrNamespaceNameAST* unqualifiedName() { return m_unqualifiedName.get(); } void setUnqualifiedName( ClassOrNamespaceNameAST::Node& unqualifiedName ); - virtual QString text() const; + virtual TQString text() const; private: bool m_global; ClassOrNamespaceNameAST::Node m_unqualifiedName; - QPtrList<ClassOrNamespaceNameAST> m_classOrNamespaceNameList; + TQPtrList<ClassOrNamespaceNameAST> m_classOrNamespaceNameList; private: NameAST( const NameAST& source ); @@ -470,13 +470,13 @@ public: public: AccessDeclarationAST(); - QPtrList<AST> accessList() { return m_accessList; } + TQPtrList<AST> accessList() { return m_accessList; } void addAccess( AST::Node& access ); - virtual QString text() const; + virtual TQString text() const; private: - QPtrList<AST> m_accessList; + TQPtrList<AST> m_accessList; private: AccessDeclarationAST( const AccessDeclarationAST& source ); @@ -503,7 +503,7 @@ public: GroupAST* cv2Qualify() { return m_cv2Qualify.get(); } void setCv2Qualify( GroupAST::Node& cv2Qualify ); - virtual QString text() const; + virtual TQString text() const; private: NameAST::Node m_name; @@ -557,10 +557,10 @@ public: BaseClauseAST(); void addBaseSpecifier( BaseSpecifierAST::Node& baseSpecifier ); - QPtrList<BaseSpecifierAST> baseSpecifierList() { return m_baseSpecifierList; } + TQPtrList<BaseSpecifierAST> baseSpecifierList() { return m_baseSpecifierList; } private: - QPtrList<BaseSpecifierAST> m_baseSpecifierList; + TQPtrList<BaseSpecifierAST> m_baseSpecifierList; private: BaseClauseAST( const BaseClauseAST& source ); @@ -587,14 +587,14 @@ public: BaseClauseAST* baseClause() { return m_baseClause.get(); } void setBaseClause( BaseClauseAST::Node& baseClause ); - QPtrList<DeclarationAST> declarationList() { return m_declarationList; } + TQPtrList<DeclarationAST> declarationList() { return m_declarationList; } void addDeclaration( DeclarationAST::Node& declaration ); private: GroupAST::Node m_winDeclSpec; AST::Node m_classKey; BaseClauseAST::Node m_baseClause; - QPtrList<DeclarationAST> m_declarationList; + TQPtrList<DeclarationAST> m_declarationList; private: ClassSpecifierAST( const ClassSpecifierAST& source ); void operator = ( const ClassSpecifierAST& source ); @@ -638,10 +638,10 @@ public: EnumSpecifierAST(); void addEnumerator( EnumeratorAST::Node& enumerator ); - QPtrList<EnumeratorAST> enumeratorList() { return m_enumeratorList; } + TQPtrList<EnumeratorAST> enumeratorList() { return m_enumeratorList; } private: - QPtrList<EnumeratorAST> m_enumeratorList; + TQPtrList<EnumeratorAST> m_enumeratorList; private: EnumSpecifierAST( const EnumSpecifierAST& source ); @@ -662,7 +662,7 @@ public: AST* kind() { return m_kind.get(); } void setKind( AST::Node& kind ); - virtual QString text() const; + virtual TQString text() const; private: AST::Node m_kind; @@ -685,10 +685,10 @@ public: LinkageBodyAST(); void addDeclaration( DeclarationAST::Node& ast ); - QPtrList<DeclarationAST> declarationList() { return m_declarationList; } + TQPtrList<DeclarationAST> declarationList() { return m_declarationList; } private: - QPtrList<DeclarationAST> m_declarationList; + TQPtrList<DeclarationAST> m_declarationList; private: LinkageBodyAST( const LinkageBodyAST& source ); @@ -836,7 +836,7 @@ public: public: DeclaratorAST(); - QPtrList<AST> ptrOpList() { return m_ptrOpList; } + TQPtrList<AST> ptrOpList() { return m_ptrOpList; } void addPtrOp( AST::Node& ptrOp ); DeclaratorAST* subDeclarator() { return m_subDeclarator.get(); } @@ -848,7 +848,7 @@ public: AST* bitfieldInitialization() { return m_bitfieldInitialization.get(); } void setBitfieldInitialization( AST::Node& bitfieldInitialization ); - QPtrList<AST> arrayDimensionList() { return m_arrayDimensionList; } + TQPtrList<AST> arrayDimensionList() { return m_arrayDimensionList; } void addArrayDimension( AST::Node& arrayDimension ); class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } @@ -862,11 +862,11 @@ public: void setExceptionSpecification( GroupAST::Node& exceptionSpecification ); private: - QPtrList<AST> m_ptrOpList; + TQPtrList<AST> m_ptrOpList; AUTO_PTR<DeclaratorAST> m_subDeclarator; NameAST::Node m_declaratorId; AST::Node m_bitfieldInitialization; - QPtrList<AST> m_arrayDimensionList; + TQPtrList<AST> m_arrayDimensionList; AUTO_PTR<class ParameterDeclarationClauseAST> m_parameterDeclarationClause; AST::Node m_constant; GroupAST::Node m_exceptionSpecification; @@ -896,7 +896,7 @@ public: AST* expression() { return m_expression.get(); } void setExpression( AST::Node& expression ); - virtual QString text() const; + virtual TQString text() const; private: TypeSpecifierAST::Node m_typeSpec; @@ -919,13 +919,13 @@ public: public: ParameterDeclarationListAST(); - QPtrList<ParameterDeclarationAST> parameterList() { return m_parameterList; } + TQPtrList<ParameterDeclarationAST> parameterList() { return m_parameterList; } void addParameter( ParameterDeclarationAST::Node& parameter ); - virtual QString text() const; + virtual TQString text() const; private: - QPtrList<ParameterDeclarationAST> m_parameterList; + TQPtrList<ParameterDeclarationAST> m_parameterList; private: ParameterDeclarationListAST( const ParameterDeclarationListAST& source ); @@ -949,7 +949,7 @@ public: AST* ellipsis() { return m_ellipsis.get(); } void setEllipsis( AST::Node& ellipsis ); - virtual QString text() const; + virtual TQString text() const; private: ParameterDeclarationListAST::Node m_parameterDeclarationList; @@ -998,11 +998,11 @@ public: public: InitDeclaratorListAST(); - QPtrList<InitDeclaratorAST> initDeclaratorList() { return m_initDeclaratorList; } + TQPtrList<InitDeclaratorAST> initDeclaratorList() { return m_initDeclaratorList; } void addInitDeclarator( InitDeclaratorAST::Node& decl ); private: - QPtrList<InitDeclaratorAST> m_initDeclaratorList; + TQPtrList<InitDeclaratorAST> m_initDeclaratorList; private: InitDeclaratorListAST( const InitDeclaratorListAST& source ); @@ -1072,11 +1072,11 @@ public: public: TemplateParameterListAST(); - QPtrList<TemplateParameterAST> templateParameterList() { return m_templateParameterList; } + TQPtrList<TemplateParameterAST> templateParameterList() { return m_templateParameterList; } void addTemplateParameter( TemplateParameterAST::Node& templateParameter ); private: - QPtrList<TemplateParameterAST> m_templateParameterList; + TQPtrList<TemplateParameterAST> m_templateParameterList; private: TemplateParameterListAST( const TemplateParameterListAST& source ); @@ -1403,11 +1403,11 @@ public: public: StatementListAST(); - QPtrList<StatementAST> statementList() { return m_statementList; } + TQPtrList<StatementAST> statementList() { return m_statementList; } void addStatement( StatementAST::Node& statement ); private: - QPtrList<StatementAST> m_statementList; + TQPtrList<StatementAST> m_statementList; private: StatementListAST( const StatementListAST& source ); @@ -1451,11 +1451,11 @@ public: public: CatchStatementListAST(); - QPtrList<CatchStatementAST> statementList() { return m_statementList; } + TQPtrList<CatchStatementAST> statementList() { return m_statementList; } void addStatement( CatchStatementAST::Node& statement ); private: - QPtrList<CatchStatementAST> m_statementList; + TQPtrList<CatchStatementAST> m_statementList; private: CatchStatementListAST( const CatchStatementListAST& source ); @@ -1565,10 +1565,10 @@ public: TranslationUnitAST(); void addDeclaration( DeclarationAST::Node& ast ); - QPtrList<DeclarationAST> declarationList() { return m_declarationList; } + TQPtrList<DeclarationAST> declarationList() { return m_declarationList; } private: - QPtrList<DeclarationAST> m_declarationList; + TQPtrList<DeclarationAST> m_declarationList; private: TranslationUnitAST( const TranslationUnitAST& source ); diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index a7592b97..80667a9e 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -26,17 +26,17 @@ #include <kdebug.h> #include <klocale.h> #include <stdlib.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qdatastream.h> -#include <qbuffer.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqdatastream.h> +#include <tqbuffer.h> #include <assert.h> #include <iostream> -// void Macro::read( QDataStream& stream ) { +// void Macro::read( TQDataStream& stream ) { // stream >> m_idHashValid; // stream >> m_valueHashValid; // stream >> m_idHash; @@ -48,7 +48,7 @@ // stream >> m_argumentList; // } // -// void Macro::write( QDataStream& stream ) const { +// void Macro::write( TQDataStream& stream ) const { // stream << m_idHashValid; // stream << m_valueHashValid; // stream << m_idHash; @@ -77,19 +77,19 @@ class DefaultSourceProvider: public SourceProvider { public: DefaultSourceProvider() {} - virtual QString contents( const QString& fileName ) { - QString source; + virtual TQString contents( const TQString& fileName ) { + TQString source; - QFile f( fileName ); + TQFile f( fileName ); if ( f.open( IO_ReadOnly ) ) { - QTextStream s( &f ); + TQTextStream s( &f ); source = s.read(); f.close(); } return source; } - virtual bool isModified( const QString& fileName ) { + virtual bool isModified( const TQString& fileName ) { Q_UNUSED( fileName ); return true; } @@ -137,18 +137,18 @@ void Driver::reset( ) { } } -QStringList Driver::getCustomIncludePath( const QString& ) { +TQStringList Driver::getCustomIncludePath( const TQString& ) { return includePaths(); } void Driver::remove - ( const QString & fileName ) { + ( const TQString & fileName ) { m_dependences.remove( fileName ); m_problems.remove( fileName ); if( !isResolveDependencesEnabled() ) removeAllMacrosInFile( fileName ); - QMap<QString, ParsedFilePointer>::Iterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, ParsedFilePointer>::Iterator it = m_parsedUnits.find( fileName ); if ( it != m_parsedUnits.end() ) { //TranslationUnitAST * unit = **it; m_parsedUnits.remove( it ); @@ -156,7 +156,7 @@ void Driver::remove } } -void Driver::removeAllMacrosInFile( const QString& fileName ) { +void Driver::removeAllMacrosInFile( const TQString& fileName ) { MacroMap::iterator it = m_macros.begin(); while ( it != m_macros.end() ) { Macro m = ( *it ).second; @@ -190,7 +190,7 @@ bool Driver::hasMacro( const HashedString& name ) { return false; } -QString deepCopy( const QString& str ) { +TQString deepCopy( const TQString& str ) { return str; //return str.ascii(); } @@ -237,8 +237,8 @@ void Driver::removeMacro( const HashedString& macroName ) { } } -ParsedFilePointer Driver::takeTranslationUnit( const QString& fileName ) { - QMap<QString, ParsedFilePointer>::Iterator it = m_parsedUnits.find( fileName ); +ParsedFilePointer Driver::takeTranslationUnit( const TQString& fileName ) { + TQMap<TQString, ParsedFilePointer>::Iterator it = m_parsedUnits.find( fileName ); ParsedFilePointer unit( *it ); //m_parsedUnits.remove( it ); m_parsedUnits[ fileName ] = 0; @@ -246,19 +246,19 @@ ParsedFilePointer Driver::takeTranslationUnit( const QString& fileName ) { } void Driver::takeTranslationUnit( const ParsedFile& file ) { - QMap<QString, ParsedFilePointer>::Iterator it = m_parsedUnits.find( file.fileName() ); + TQMap<TQString, ParsedFilePointer>::Iterator it = m_parsedUnits.find( file.fileName() ); m_parsedUnits[ file.fileName() ] = 0; } -ParsedFilePointer Driver::translationUnit( const QString& fileName ) const { - QMap<QString, ParsedFilePointer>::ConstIterator it = m_parsedUnits.find( fileName ); +ParsedFilePointer Driver::translationUnit( const TQString& fileName ) const { + TQMap<TQString, ParsedFilePointer>::ConstIterator it = m_parsedUnits.find( fileName ); return it != m_parsedUnits.end() ? *it : 0; } class Driver::ParseHelper { public: - ParseHelper( const QString& fileName, bool force, Driver* driver, bool reportMessages = true, QString includedFrom = QString() ) : m_wasReset( false ), m_fileName( fileName ), m_previousFileName( driver->m_currentFileName ), m_previousLexer( driver->lexer ), m_previousParsedFile( driver->m_currentParsedFile ), m_previousCachedLexedFile( driver->m_currentLexerCache ), m_force( force ), m_driver( driver ), m_lex( m_driver ) { - QFileInfo fileInfo( fileName ); + ParseHelper( const TQString& fileName, bool force, Driver* driver, bool reportMessages = true, TQString includedFrom = TQString() ) : m_wasReset( false ), m_fileName( fileName ), m_previousFileName( driver->m_currentFileName ), m_previousLexer( driver->lexer ), m_previousParsedFile( driver->m_currentParsedFile ), m_previousCachedLexedFile( driver->m_currentLexerCache ), m_force( force ), m_driver( driver ), m_lex( m_driver ) { + TQFileInfo fileInfo( fileName ); m_driver->m_currentParsedFile = new ParsedFile( fileName, fileInfo.lastModified() ); if( !includedFrom.isEmpty() ) m_driver->m_currentParsedFile->setIncludedFrom( includedFrom ); @@ -267,7 +267,7 @@ class Driver::ParseHelper { #endif m_absFilePath = fileInfo.absFilePath(); - QMap<QString, ParsedFilePointer>::Iterator it = m_driver->m_parsedUnits.find( m_absFilePath ); + TQMap<TQString, ParsedFilePointer>::Iterator it = m_driver->m_parsedUnits.find( m_absFilePath ); if ( force && it != m_driver->m_parsedUnits.end() ) { m_driver->takeTranslationUnit( m_absFilePath ); @@ -304,7 +304,7 @@ class Driver::ParseHelper { } void parse() { - QString oldMasterFileName = m_driver->m_currentMasterFileName; //Change the master-file so problems will be reported correctly + TQString oldMasterFileName = m_driver->m_currentMasterFileName; //Change the master-file so problems will be reported correctly m_driver->m_currentMasterFileName = m_absFilePath; CachedLexedFilePointer lf = m_driver->m_currentLexerCache; //Set the lexer-cache to zero, so the problems registered through addProblem go directly into the file @@ -349,9 +349,9 @@ class Driver::ParseHelper { private: bool m_wasReset; - QString m_fileName; - QString m_absFilePath; - QString m_previousFileName; + TQString m_fileName; + TQString m_absFilePath; + TQString m_previousFileName; Lexer* m_previousLexer; ParsedFilePointer m_previousParsedFile; CachedLexedFilePointer m_previousCachedLexedFile; @@ -361,15 +361,15 @@ class Driver::ParseHelper { }; -void Driver::addDependence( const QString & fileName, const Dependence & dep ) { +void Driver::addDependence( const TQString & fileName, const Dependence & dep ) { // this can happen if the parser was invoked on a snippet of text and not a file if ( fileName.isEmpty() || !m_currentParsedFile ) return; //@todo prevent cyclic dependency-loops - QFileInfo fileInfo( dep.first ); - QString fn = fileInfo.absFilePath(); + TQFileInfo fileInfo( dep.first ); + TQString fn = fileInfo.absFilePath(); if ( !depresolv ) { findOrInsertDependenceList( fileName ).insert( fn, dep ); @@ -377,12 +377,12 @@ void Driver::addDependence( const QString & fileName, const Dependence & dep ) { return ; } - QString file = findIncludeFile( dep ); + TQString file = findIncludeFile( dep ); findOrInsertDependenceList( fileName ).insert( file, dep ); m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local ); - if ( !QFile::exists( file ) ) { + if ( !TQFile::exists( file ) ) { Problem p( i18n( "Could not find include file %1" ).arg( dep.first ), lexer ? lexer->currentLine() : -1, lexer ? lexer->currentColumn() : -1, Problem::Level_Warning ); @@ -391,7 +391,7 @@ void Driver::addDependence( const QString & fileName, const Dependence & dep ) { } if( m_currentLexerCache ) - m_currentLexerCache->addIncludeFile( file, QDateTime() ); ///The time will be overwritten in CachedLexedFile::merge(...) + m_currentLexerCache->addIncludeFile( file, TQDateTime() ); ///The time will be overwritten in CachedLexedFile::merge(...) /**What should be done: * 1. Lex the file to get all the macros etc. @@ -428,7 +428,7 @@ void Driver::addDependence( const QString & fileName, const Dependence & dep ) { h.parse(); } -void Driver::addProblem( const QString & fileName, const Problem & problem ) { +void Driver::addProblem( const TQString & fileName, const Problem & problem ) { Problem p( problem ); p.setFileName( fileName ); @@ -438,31 +438,31 @@ void Driver::addProblem( const QString & fileName, const Problem & problem ) { findOrInsertProblemList( m_currentMasterFileName ).append( problem ); } -QMap< QString, Dependence >& Driver::findOrInsertDependenceList( const QString & fileName ) { - QMap<QString, QMap<QString, Dependence> >::Iterator it = m_dependences.find( fileName ); +TQMap< TQString, Dependence >& Driver::findOrInsertDependenceList( const TQString & fileName ) { + TQMap<TQString, TQMap<TQString, Dependence> >::Iterator it = m_dependences.find( fileName ); if ( it != m_dependences.end() ) return it.data(); - QMap<QString, Dependence> l; + TQMap<TQString, Dependence> l; m_dependences.insert( deepCopy( fileName ), l ); return m_dependences[ fileName ]; } -QValueList < Problem >& Driver::findOrInsertProblemList( const QString & fileName ) { - QMap<QString, QValueList<Problem> >::Iterator it = m_problems.find( fileName ); +TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName ) { + TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.find( fileName ); if ( it != m_problems.end() ) return it.data(); - QValueList<Problem> l; + TQValueList<Problem> l; m_problems.insert( fileName, l ); return m_problems[ fileName ]; } -QMap< QString, Dependence > Driver::dependences( const QString & fileName ) const { - QMap<QString, QMap<QString, Dependence> >::ConstIterator it = m_dependences.find( fileName ); +TQMap< TQString, Dependence > Driver::dependences( const TQString & fileName ) const { + TQMap<TQString, TQMap<TQString, Dependence> >::ConstIterator it = m_dependences.find( fileName ); if ( it != m_dependences.end() ) return it.data(); - return QMap<QString, Dependence>(); + return TQMap<TQString, Dependence>(); } const Driver::MacroMap& Driver::macros() const { @@ -475,11 +475,11 @@ void Driver::insertMacros( const MacroSet& macros ) { } } -QValueList < Problem > Driver::problems( const QString & fileName ) const { - QMap<QString, QValueList<Problem> >::ConstIterator it = m_problems.find( fileName ); +TQValueList < Problem > Driver::problems( const TQString & fileName ) const { + TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.find( fileName ); if ( it != m_problems.end() ) return it.data(); - return QValueList<Problem>(); + return TQValueList<Problem>(); } void Driver::clearMacros() { @@ -497,9 +497,9 @@ void Driver::clearParsedMacros() { } } -void Driver::parseFile( const QString& fileName, bool onlyPreProcess, bool force , bool macrosGlobal ) +void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool force , bool macrosGlobal ) { - QString oldMasterFileName = m_currentMasterFileName; + TQString oldMasterFileName = m_currentMasterFileName; m_currentMasterFileName = fileName; //if( isResolveDependencesEnabled() ) @@ -510,7 +510,7 @@ void Driver::parseFile( const QString& fileName, bool onlyPreProcess, bool force //Remove the problems now instead of in ParseHelper, because this way the problems reported by getCustomIncludePath(...) will not be discarded m_problems.remove( fileName ); - QStringList oldIncludePaths = m_includePaths; + TQStringList oldIncludePaths = m_includePaths; m_includePaths = getCustomIncludePath( fileName ); ParseHelper p( fileName, force, this ); @@ -520,7 +520,7 @@ void Driver::parseFile( const QString& fileName, bool onlyPreProcess, bool force if( macrosGlobal ) { for( MacroMap::iterator it = m_macros.begin(); it != m_macros.end(); ++it) { if( (*it).second.fileName() == fileName ) { - (*it).second.setFileName( QString::null ); + (*it).second.setFileName( TQString::null ); } } } @@ -665,49 +665,49 @@ void Driver::clearIncludePaths() { m_includePaths.clear(); } -void Driver::addIncludePath( const QString &path ) { +void Driver::addIncludePath( const TQString &path ) { if ( !path.stripWhiteSpace().isEmpty() ) m_includePaths << path; } -QString Driver::findIncludeFile( const Dependence& dep, const QString& fromFile ) { - QString fileName = dep.first; +TQString Driver::findIncludeFile( const Dependence& dep, const TQString& fromFile ) { + TQString fileName = dep.first; if ( dep.second == Dep_Local ) { - QString path = QFileInfo( fromFile ).dirPath( true ); - QFileInfo fileInfo( QFileInfo( path, fileName ) ); + TQString path = TQFileInfo( fromFile ).dirPath( true ); + TQFileInfo fileInfo( TQFileInfo( path, fileName ) ); if ( fileInfo.exists() && fileInfo.isFile() ) return fileInfo.absFilePath(); } - QStringList includePaths = getCustomIncludePath( fromFile ); + TQStringList includePaths = getCustomIncludePath( fromFile ); - for ( QStringList::ConstIterator it = includePaths.begin(); it != includePaths.end(); ++it ) { - QFileInfo fileInfo( *it, fileName ); + for ( TQStringList::ConstIterator it = includePaths.begin(); it != includePaths.end(); ++it ) { + TQFileInfo fileInfo( *it, fileName ); if ( fileInfo.exists() && fileInfo.isFile() ) return fileInfo.absFilePath(); } - return QString::null; + return TQString::null; } -QString Driver::findIncludeFile( const Dependence& dep ) const { - QString fileName = dep.first; +TQString Driver::findIncludeFile( const Dependence& dep ) const { + TQString fileName = dep.first; if ( dep.second == Dep_Local ) { - QString path = QFileInfo( currentFileName() ).dirPath( true ); - QFileInfo fileInfo( QFileInfo( path, fileName ) ); + TQString path = TQFileInfo( currentFileName() ).dirPath( true ); + TQFileInfo fileInfo( TQFileInfo( path, fileName ) ); if ( fileInfo.exists() && fileInfo.isFile() ) return fileInfo.absFilePath(); } - for ( QStringList::ConstIterator it = m_includePaths.begin(); it != m_includePaths.end(); ++it ) { - QFileInfo fileInfo( *it, fileName ); + for ( TQStringList::ConstIterator it = m_includePaths.begin(); it != m_includePaths.end(); ++it ) { + TQFileInfo fileInfo( *it, fileName ); if ( fileInfo.exists() && fileInfo.isFile() ) return fileInfo.absFilePath(); } - return QString::null; + return TQString::null; } void Driver::setResolveDependencesEnabled( bool enabled ) { @@ -742,7 +742,7 @@ void Driver::usingMacro( const Macro& macro ) { // // m_valueHash = 27 * ( HashedString::hashString( m_body ) + (m_isUndefMacro ? 1 : 0 ) ); // -// for( QValueList<Argument>::const_iterator it = m_argumentList.begin(); it != m_argumentList.end(); ++it ) { +// for( TQValueList<Argument>::const_iterator it = m_argumentList.begin(); it != m_argumentList.end(); ++it ) { // a *= 19; // m_valueHash += a * HashedString::hashString( *it ); // } @@ -793,7 +793,7 @@ void MacroSet::computeHash() const { } } -// void MacroSet::read( QDataStream& stream ) { +// void MacroSet::read( TQDataStream& stream ) { // stream >> m_idHashValid >> m_idHash >> m_valueHashValid >> m_valueHash; // int cnt; // stream >> cnt; @@ -805,7 +805,7 @@ void MacroSet::computeHash() const { // } // } // -// void MacroSet::write( QDataStream& stream ) const { +// void MacroSet::write( TQDataStream& stream ) const { // stream << m_idHashValid << m_idHash << m_valueHashValid << m_valueHash; // stream << m_usedMacros.size(); // for( Macros::const_iterator it = m_usedMacros.begin(); it != m_usedMacros.end(); ++it ) { @@ -824,33 +824,33 @@ const MacroSet& ParsedFile::usedMacros() const { return m_usedMacros; } -ParsedFile::ParsedFile( const QString& fileName, const QDateTime& timeStamp ) : m_translationUnit( 0 ), m_fileName( fileName ), m_timeStamp( timeStamp ) { +ParsedFile::ParsedFile( const TQString& fileName, const TQDateTime& timeStamp ) : m_translationUnit( 0 ), m_fileName( fileName ), m_timeStamp( timeStamp ) { m_includeFiles.insert( fileName ); } -ParsedFile::ParsedFile( const QByteArray& array ) { - QBuffer b( array ); - QDataStream d( &b ); +ParsedFile::ParsedFile( const TQByteArray& array ) { + TQBuffer b( array ); + TQDataStream d( &b ); read( d ); } -QString ParsedFile::includedFrom() const { +TQString ParsedFile::includedFrom() const { return m_includedFrom; } -void ParsedFile::setIncludedFrom( const QString& str ) { +void ParsedFile::setIncludedFrom( const TQString& str ) { m_includedFrom = str; } -QByteArray ParsedFile::serialize() const { - QByteArray array; - QBuffer b( array ); - QDataStream d( &b ); +TQByteArray ParsedFile::serialize() const { + TQByteArray array; + TQBuffer b( array ); + TQDataStream d( &b ); write( d ); return array; } -// void ParsedFile::read( QDataStream& stream ) { +// void ParsedFile::read( TQDataStream& stream ) { // int directIncludeFilesCount; // stream >> directIncludeFilesCount; // m_directIncludeFiles.clear(); @@ -868,8 +868,8 @@ QByteArray ParsedFile::serialize() const { // m_includeFiles.read( stream ); // } // -// void ParsedFile::write( QDataStream& stream ) const { -// for( QValueList<IncludeDesc>::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { +// void ParsedFile::write( TQDataStream& stream ) const { +// for( TQValueList<IncludeDesc>::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { // stream << (*it).local; // stream << (*it).includePath; // } @@ -904,11 +904,11 @@ const HashedStringSet& ParsedFile::includeFiles() const { return m_includeFiles; } -QString ParsedFile::fileName() const { +TQString ParsedFile::fileName() const { return m_fileName; } -QDateTime ParsedFile::timeStamp() const { +TQDateTime ParsedFile::timeStamp() const { return m_timeStamp; } @@ -916,7 +916,7 @@ void ParsedFile::addIncludeFiles( const HashedStringSet& includeFiles ) { m_includeFiles += includeFiles; } -void ParsedFile::addIncludeFile( const QString& includePath, const ParsedFilePointer& parsed, bool localInclude ) { +void ParsedFile::addIncludeFile( const TQString& includePath, const ParsedFilePointer& parsed, bool localInclude ) { m_includeFiles.insert( includePath ); if( parsed ) m_includeFiles += parsed->includeFiles(); @@ -927,11 +927,11 @@ void ParsedFile::addIncludeFile( const QString& includePath, const ParsedFilePoi m_directIncludeFiles << d; } -const QValueList<ParsedFile::IncludeDesc>& ParsedFile::directIncludeFiles() const { +const TQValueList<ParsedFile::IncludeDesc>& ParsedFile::directIncludeFiles() const { return m_directIncludeFiles; } -bool MacroSet::hasMacro( const QString& name ) const { +bool MacroSet::hasMacro( const TQString& name ) const { Macros::const_iterator it = m_usedMacros.find( Macro( name, "" ) ); if( it != m_usedMacros.end() ) { return true; @@ -949,7 +949,7 @@ bool MacroSet::hasMacro( const HashedString& name ) const { } } -Macro MacroSet::macro( const QString& name ) const { +Macro MacroSet::macro( const TQString& name ) const { Macros::const_iterator it = m_usedMacros.find( Macro( name, "" ) ); if( it != m_usedMacros.end() ) { diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h index 826375e3..3c12d34c 100644 --- a/lib/cppparser/driver.h +++ b/lib/cppparser/driver.h @@ -23,14 +23,14 @@ #include "ast.h" #include "macro.h" -#include <qpair.h> -#include <qvaluestack.h> -#include <qstringlist.h> -#include <qcstring.h> -#include <qdatastream.h> -#include <qmap.h> -#include <qdatetime.h> -#include <qvaluelist.h> +#include <tqpair.h> +#include <tqvaluestack.h> +#include <tqstringlist.h> +#include <tqcstring.h> +#include <tqdatastream.h> +#include <tqmap.h> +#include <tqdatetime.h> +#include <tqvaluelist.h> #include <map> #include <set> #include <hashedstring.h> @@ -49,7 +49,7 @@ enum Dep_Local }; -typedef QPair<QString, int> Dependence; +typedef QPair<TQString, int> Dependence; class ParsedFile; typedef KSharedPtr< ParsedFile > ParsedFilePointer; @@ -58,19 +58,19 @@ class ParsedFile : public AbstractParseResult { public: struct IncludeDesc { bool local; //Whether it is a local include(#include "local.h", not #include <global.h>) - QString includePath; + TQString includePath; ParsedFilePointer parsed; //May be zero! }; // ParsedFile() { // } - ParsedFile( QDataStream& s ) { + ParsedFile( TQDataStream& s ) { read( s ); } - ParsedFile( const QString& fileName, const QDateTime& timeStamp ); + ParsedFile( const TQString& fileName, const TQDateTime& timeStamp ); ///Deserializes the ParsedFile from a previous call to serialize(). AST will always be zero after a call to this. - ParsedFile( const QByteArray& array ); + ParsedFile( const TQByteArray& array ); /** * @return All Macros that were used while processing this translation-unit. May be modified. @@ -93,16 +93,16 @@ class ParsedFile : public AbstractParseResult { void addIncludeFiles( const HashedStringSet& includeFiles ); - void addIncludeFile( const QString& includePath, const ParsedFilePointer& parsed, bool localInclude ); + void addIncludeFile( const TQString& includePath, const ParsedFilePointer& parsed, bool localInclude ); ///If this file was parsed while resolving the dependencies of another file, this returns the file this one was included from. Else returns an empty string. - QString includedFrom() const; + TQString includedFrom() const; - void setIncludedFrom( const QString& str ); + void setIncludedFrom( const TQString& str ); /** * @return Reference to the internal list of all directly included files(without those included indirectly) */ - const QValueList<IncludeDesc>& directIncludeFiles() const; + const TQValueList<IncludeDesc>& directIncludeFiles() const; operator TranslationUnitAST* () const; //May be zero! @@ -113,17 +113,17 @@ class ParsedFile : public AbstractParseResult { void setTranslationUnit( const TranslationUnitAST::Node& trans ); - QString fileName() const; + TQString fileName() const; - QDateTime timeStamp() const; + TQDateTime timeStamp() const; ///Serializes the content of this class into a byte-array. Note that this does not serialize the AST. - QByteArray serialize() const; + TQByteArray serialize() const; - /*void read( QDataStream& stream ); - void write( QDataStream& stream ) const;*/ + /*void read( TQDataStream& stream ); + void write( TQDataStream& stream ) const;*/ - virtual void read( QDataStream& stream ) { + virtual void read( TQDataStream& stream ) { int directIncludeFilesCount; stream >> directIncludeFilesCount; m_directIncludeFiles.clear(); @@ -145,10 +145,10 @@ class ParsedFile : public AbstractParseResult { m_includeFiles.read( stream ); } - virtual void write( QDataStream& stream ) const { + virtual void write( TQDataStream& stream ) const { int i = m_directIncludeFiles.size(); stream << i; - for( QValueList<IncludeDesc>::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { + for( TQValueList<IncludeDesc>::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { Q_INT8 i = (*it).local; stream << i; stream << (*it).includePath; @@ -166,14 +166,14 @@ class ParsedFile : public AbstractParseResult { } private: - QValueList<IncludeDesc> m_directIncludeFiles; + TQValueList<IncludeDesc> m_directIncludeFiles; MacroSet m_usedMacros; TranslationUnitAST::Node m_translationUnit; HashedStringSet m_includeFiles; int m_skippedLines; - QString m_fileName; - QDateTime m_timeStamp; - QString m_includedFrom; + TQString m_fileName; + TQDateTime m_timeStamp; + TQString m_includedFrom; }; /** @@ -188,9 +188,9 @@ class SourceProvider { * Get the contents of a file * \param fileName The name of the file to get the contents for. An absolute * path should be used. - * \return A QString that contains the contents of the file + * \return A TQString that contains the contents of the file */ - virtual QString contents( const QString& fileName ) = 0; + virtual TQString contents( const TQString& fileName ) = 0; /** * Check to see if a file has been modified @@ -199,7 +199,7 @@ class SourceProvider { * \return true if the file has been modified * \return false if the file has not been modified */ - virtual bool isModified( const QString& fileName ) = 0; + virtual bool isModified( const TQString& fileName ) = 0; private: SourceProvider( const SourceProvider& source ); @@ -239,7 +239,7 @@ class Driver { * @param force Force the parsing of the file. Defaults to false * @param macrosGlobal Should the macros be global? (Global macros are not deleted once a new translation-unit is parsed) */ - virtual void parseFile( const QString& fileName, bool onlyPreProcesss = false, bool force = false, bool macrosGlobal = false ); + virtual void parseFile( const TQString& fileName, bool onlyPreProcesss = false, bool force = false, bool macrosGlobal = false ); /** * Indicates that the file has been parsed @@ -252,14 +252,14 @@ class Driver { * @param fileName The name of the file to remove */ virtual void remove - ( const QString& fileName ); + ( const TQString& fileName ); /** * Add a dependency on another header file for @p fileName * @param fileName The file name to add the dependency for * @param dep The dependency to add */ - virtual void addDependence( const QString& fileName, const Dependence& dep ); + virtual void addDependence( const TQString& fileName, const Dependence& dep ); /** * Add a macro to the driver @@ -272,15 +272,15 @@ class Driver { * @param fileName The file name to add the problem for * @param problem The problem to add */ - virtual void addProblem( const QString& fileName, const Problem& problem ); + virtual void addProblem( const TQString& fileName, const Problem& problem ); /** * The current file name the driver is working with */ - QString currentFileName() const { + TQString currentFileName() const { return m_currentFileName; } - ParsedFilePointer takeTranslationUnit( const QString& fileName ); + ParsedFilePointer takeTranslationUnit( const TQString& fileName ); void takeTranslationUnit( const ParsedFile& file ); /** @@ -289,13 +289,13 @@ class Driver { * @return The TranslationUnitAST pointer that represents the translation unit * @return 0 if no translation unit exists for the file */ - ParsedFilePointer translationUnit( const QString& fileName ) const; + ParsedFilePointer translationUnit( const TQString& fileName ) const; /** * Get the dependencies for a file * @param fileName The file name to get dependencies for * @return The dependencies for the file */ - QMap<QString, Dependence> dependences( const QString& fileName ) const; + TQMap<TQString, Dependence> dependences( const TQString& fileName ) const; /** * Get all the macros the driver contains * @return The macros @@ -310,7 +310,7 @@ class Driver { * @param fileName The filename to get problems for * @return The list of problems for @p fileName */ - QValueList<Problem> problems( const QString& fileName ) const; + TQValueList<Problem> problems( const TQString& fileName ) const; void usingString( const HashedString& str ); /** @@ -346,21 +346,21 @@ class Driver { * Remove all macros from the driver for a certain file * @param fileName The file name */ - virtual void removeAllMacrosInFile( const QString& fileName ); ///Check when this is called. It may be wrong. + virtual void removeAllMacrosInFile( const TQString& fileName ); ///Check when this is called. It may be wrong. - QStringList includePaths() const { + TQStringList includePaths() const { return m_includePaths; } - virtual QStringList getCustomIncludePath( const QString& ); + virtual TQStringList getCustomIncludePath( const TQString& ); - virtual void addIncludePath( const QString &path ); + virtual void addIncludePath( const TQString &path ); virtual void clearIncludePaths(); /// @todo remove - const QMap<QString, ParsedFilePointer> &parsedUnits() const { + const TQMap<TQString, ParsedFilePointer> &parsedUnits() const { return m_parsedUnits; } @@ -391,11 +391,11 @@ class Driver { LexerCache* lexerCache(); ///This uses getCustomIncludePath(..) to resolve the include-path internally - QString findIncludeFile( const Dependence& dep, const QString& fromFile ); + TQString findIncludeFile( const Dependence& dep, const TQString& fromFile ); protected: ///This uses the state of the parser to find the include-file - QString findIncludeFile( const Dependence& dep ) const; + TQString findIncludeFile( const Dependence& dep ) const; /** * Set up the lexer. @@ -423,20 +423,20 @@ class Driver { void clearParsedMacros(); private: - QMap<QString, Dependence>& findOrInsertDependenceList( const QString& fileName ); - QValueList<Problem>& findOrInsertProblemList( const QString& fileName ); + TQMap<TQString, Dependence>& findOrInsertDependenceList( const TQString& fileName ); + TQValueList<Problem>& findOrInsertProblemList( const TQString& fileName ); private: - QString m_currentFileName; - QString m_currentMasterFileName; - typedef QMap<QString, Dependence> DependenceMap; - typedef QMap< QString, DependenceMap> DependencesMap; + TQString m_currentFileName; + TQString m_currentMasterFileName; + typedef TQMap<TQString, Dependence> DependenceMap; + typedef TQMap< TQString, DependenceMap> DependencesMap; DependencesMap m_dependences; MacroMap m_macros; - QMap< QString, QValueList<Problem> > m_problems; - QMap<QString, ParsedFilePointer> m_parsedUnits; - QStringList m_includePaths; + TQMap< TQString, TQValueList<Problem> > m_problems; + TQMap<TQString, ParsedFilePointer> m_parsedUnits; + TQStringList m_includePaths; uint depresolv : 1; Lexer *lexer; diff --git a/lib/cppparser/errors.h b/lib/cppparser/errors.h index 813d3a3f..6751475e 100644 --- a/lib/cppparser/errors.h +++ b/lib/cppparser/errors.h @@ -20,15 +20,15 @@ #ifndef ERRORS_H #define ERRORS_H -#include <qstring.h> +#include <tqstring.h> struct Error{ int code; int level; - QString text; + TQString text; - Error( int c, int l, const QString& s ) + Error( int c, int l, const TQString& s ) : code( c ), level( l ), text( s ) {} }; diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 3f2ec712..97fe0dc0 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -23,12 +23,12 @@ #include <kdebug.h> #include <klocale.h> -#include <qregexp.h> -#include <qmap.h> -#include <qvaluelist.h> +#include <tqregexp.h> +#include <tqmap.h> +#include <tqvaluelist.h> #if defined( KDEVELOP_BGPARSER ) -#include <qthread.h> +#include <tqthread.h> class KDevTread: public QThread { @@ -53,8 +53,8 @@ using namespace std; struct LexerData { - typedef QMap<QString, QString> Scope; - typedef QValueList<Scope> StaticChain; + typedef TQMap<TQString, TQString> Scope; + typedef TQValueList<Scope> StaticChain; StaticChain staticChain; @@ -69,13 +69,13 @@ struct LexerData staticChain.pop_front(); } - void bind( const QString& name, const QString& value ) + void bind( const TQString& name, const TQString& value ) { Q_ASSERT( staticChain.size() > 0 ); staticChain.front().insert( name, value ); } - bool hasBind( const QString& name ) const + bool hasBind( const TQString& name ) const { StaticChain::ConstIterator it = staticChain.begin(); while( it != staticChain.end() ){ @@ -89,7 +89,7 @@ struct LexerData return false; } - QString apply( const QString& name ) const + TQString apply( const TQString& name ) const { StaticChain::ConstIterator it = staticChain.begin(); while( it != staticChain.end() ){ @@ -100,7 +100,7 @@ struct LexerData return scope[ name ]; } - return QString::null; + return TQString::null; } }; @@ -126,7 +126,7 @@ Lexer::~Lexer() delete( d ); } -void Lexer::setSource( const QString& source ) +void Lexer::setSource( const TQString& source ) { reset(); m_source = source; @@ -136,7 +136,7 @@ void Lexer::setSource( const QString& source ) if( !source.isEmpty() ) { m_currentChar = m_source[0]; } else { - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } tokenize(); @@ -152,7 +152,7 @@ void Lexer::reset() m_index = 0; m_size = 0; m_tokens.clear(); - m_source = QString::null; + m_source = TQString::null; m_ptr = 0; m_endPtr = 0; m_startLine = false; @@ -169,12 +169,12 @@ void Lexer::reset() // ### should all be done with a "long" type IMO int Lexer::toInt( const Token& token ) { - QString s = token.text(); + TQString s = token.text(); if( token.type() == Token_number_literal ){ // hex literal ? if( s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) return s.mid( 2 ).toInt( 0, 16 ); - QString n; + TQString n; int i = 0; while( i < int(s.length()) && s[i].isDigit() ) n += s[i++]; @@ -220,8 +220,8 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) int startLine = m_currentLine; int startColumn = m_currentColumn; - QChar ch = currentChar(); - QChar ch1 = peekChar(); + TQChar ch = currentChar(); + TQChar ch1 = peekChar(); if( ch.isNull() || ch.isSpace() ){ /* skip */ @@ -233,7 +233,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) int start = currentPosition(); readIdentifier(); // read the directive - QString directive = m_source.mid( start, currentPosition() - start ); + TQString directive = m_source.mid( start, currentPosition() - start ); handleDirective( directive ); } else if( m_startLine && m_skipping[ m_ifLevel ] ){ @@ -301,7 +301,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) Macro m = m_driver->macro( ide ); m_driver->usingMacro( m ); - QString ellipsisArg; + TQString ellipsisArg; if( m.hasArguments() ){ int endIde = currentPosition(); @@ -314,11 +314,11 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) while( currentChar() && argIdx<argCount ){ readWhiteSpaces(); - QString argName = m.argumentList()[ argIdx ]; + TQString argName = m.argumentList()[ argIdx ]; bool ellipsis = argName == "..."; - QString arg = readArgument(); + TQString arg = readArgument(); if( !ellipsis ) d->bind( argName, arg ); @@ -363,7 +363,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) // tokenize the macro body - QString textToInsert; + TQString textToInsert; setEndPtr( offset( currentPosition() + m.body().length() ) ); @@ -383,24 +383,24 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) if( tok == Token_eof ) break; - QString tokText = tok.text(); + 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 ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); - // str = QString::null; + // str = TQString::null; } if( stringify ) { - textToInsert.append( QString::fromLatin1("\"") + str.str() + QString::fromLatin1("\" ") ); + textToInsert.append( TQString::fromLatin1("\"") + str.str() + TQString::fromLatin1("\" ") ); } else if( merge ){ textToInsert.truncate( textToInsert.length() - 1 ); - textToInsert.append( str.str() + QString::fromLatin1(" ") ); + textToInsert.append( str.str() + TQString::fromLatin1(" ") ); } else if( tok == Token_ellipsis && d->hasBind("...") ){ textToInsert.append( ellipsisArg ); } else { - textToInsert.append( str.str() + QString::fromLatin1(" ") ); + textToInsert.append( str.str() + TQString::fromLatin1(" ") ); } } @@ -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, QString> >::iterator pos = m_words.find( ide ); + __gnu_cxx::hash_map< HashedString, QPair<SkipType, TQString> >::iterator pos = m_words.find( ide ); if( pos != m_words.end() ){ if( (*pos).second.first == SkipWordAndArguments ){ readWhiteSpaces(); @@ -430,7 +430,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) #if defined( KDEVELOP_BGPARSER ) qthread_yield(); #endif - insertCurrent( QString(" ") + (*pos).second.second + QString(" ") ); + insertCurrent( TQString(" ") + (*pos).second.second + TQString(" ") ); } } else if( /*qt_rx.exactMatch(ide) ||*/ ide.str().endsWith("EXPORT") || @@ -512,7 +512,7 @@ void Lexer::resetSkipWords() m_words.clear(); } -void Lexer::addSkipWord( const QString& word, SkipType skipType, const QString& str ) +void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str ) { m_words[ word ] = qMakePair( skipType, str ); } @@ -541,17 +541,17 @@ void Lexer::skip( int l, int r ) m_currentColumn = svCurrentColumn; } -QString Lexer::readArgument() +TQString Lexer::readArgument() { int count = 0; - QString arg; + TQString arg; readWhiteSpaces(); while( currentChar() ){ readWhiteSpaces(); - QChar ch = currentChar(); + TQChar ch = currentChar(); if( ch.isNull() || (!count && (ch == ',' || ch == ')')) ) break; @@ -572,7 +572,7 @@ QString Lexer::readArgument() return arg.stripWhiteSpace(); } -void Lexer::handleDirective( const QString& directive ) +void Lexer::handleDirective( const TQString& directive ) { m_inPreproc = true; @@ -651,7 +651,7 @@ void Lexer::processDefine( Macro& m ) int startMacroName = currentPosition(); readIdentifier(); - QString macroName = m_source.mid( startMacroName, int(currentPosition()-startMacroName) ); + TQString macroName = m_source.mid( startMacroName, int(currentPosition()-startMacroName) ); m.setName( macroName ); if( currentChar() == '(' ){ @@ -670,7 +670,7 @@ void Lexer::processDefine( Macro& m ) else readIdentifier(); - QString arg = m_source.mid( startArg, int(currentPosition()-startArg) ); + TQString arg = m_source.mid( startArg, int(currentPosition()-startArg) ); m.addArgument( Macro::Argument(arg) ); @@ -687,7 +687,7 @@ void Lexer::processDefine( Macro& m ) setPreprocessorEnabled( true ); - QString body; + TQString body; while( currentChar() && currentChar() != '\n' ){ if( currentChar().isSpace() ){ @@ -700,7 +700,7 @@ void Lexer::processDefine( Macro& m ) //Do not ignore c-style comments, those may be useful in the body, and ignoring them using this check causes problems if( tk.type() != -1 && (tk.type() != Token_comment || ( tk.text().length() >= 2 && tk.text()[1] == '*') ) ){ - QString s = tk.text(); + TQString s = tk.text(); body += s; } } @@ -792,16 +792,16 @@ void Lexer::processInclude() readWhiteSpaces( false ); if( currentChar() ){ - QChar ch = currentChar(); + TQChar ch = currentChar(); if( ch == '"' || ch == '<' ){ nextChar(); - QChar ch2 = ch == QChar('"') ? QChar('"') : QChar('>'); + TQChar ch2 = ch == TQChar('"') ? TQChar('"') : TQChar('>'); int startWord = currentPosition(); while( currentChar() && currentChar() != ch2 ) nextChar(); if( currentChar() ){ - QString word = m_source.mid( startWord, int(currentPosition()-startWord) ); + TQString word = m_source.mid( startWord, int(currentPosition()-startWord) ); m_driver->addDependence( m_driver->currentFileName(), Dependence(word, ch == '"' ? Dep_Local : Dep_Global) ); nextChar(); @@ -815,7 +815,7 @@ void Lexer::processUndef() readWhiteSpaces(); int startWord = currentPosition(); readIdentifier(); - QString word = m_source.mid( startWord, currentPosition() - startWord ); + TQString word = m_source.mid( startWord, currentPosition() - startWord ); Macro m( word, "" ); m.setFileName( m_driver->currentFileName() ); @@ -845,7 +845,7 @@ int Lexer::macroPrimary() case '!': case '~': { - QChar tk = currentChar(); + TQChar tk = currentChar(); nextChar(); int result = macroPrimary(); if( tk == '-' ) return -result; @@ -1003,7 +1003,7 @@ int Lexer::macroLogicalAnd() nextChar( 2 ); int start = currentPosition(); result = macroBoolOr() && result; - QString s = m_source.mid( start, currentPosition() - start ); + TQString s = m_source.mid( start, currentPosition() - start ); } return result; } @@ -1026,7 +1026,7 @@ int Lexer::macroExpression() } // *IMPORTANT* -// please, don't include lexer.moc here, because Lexer isn't a QObject class!! +// please, don't include lexer.moc 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 08681a4d..a94e5c5e 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -22,11 +22,11 @@ #include "driver.h" -#include <qstring.h> -#include <qmap.h> -#include <qvaluestack.h> -#include <qpair.h> -#include <qptrvector.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqvaluestack.h> +#include <tqpair.h> +#include <tqptrvector.h> #include <hashedstring.h> #include <ext/hash_map> @@ -151,8 +151,8 @@ struct LexerData; class Token { - Token(const QString &); - Token( int type, int position, int length, const QString& text ); + Token(const TQString &); + Token( int type, int position, int length, const TQString& text ); Token( const Token& source ); Token& operator = ( const Token& source ); @@ -176,7 +176,7 @@ public: int position() const; void setPosition( int position ); - QString text() const; + TQString text() const; private: int m_type; @@ -186,7 +186,7 @@ private: int m_startColumn; int m_endLine; int m_endColumn; - const QString & m_text; + const TQString & m_text; friend class Lexer; friend class Parser; @@ -217,10 +217,10 @@ public: void setPreprocessorEnabled( bool enabled ); void resetSkipWords(); - void addSkipWord( const QString& word, SkipType skipType=SkipWord, const QString& str = QString::null ); + void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString::null ); - QString source() const; - void setSource( const QString& source ); + TQString source() const; + void setSource( const TQString& source ); int index() const; void setIndex( int index ); @@ -246,23 +246,23 @@ public: return m_source.unicode() + offset; } - inline int getOffset( const QChar* p ) const { + inline int getOffset( const TQChar* p ) const { return int(p - (m_source.unicode())); } private: - void setEndPtr( const QChar* c ) { + void setEndPtr( const TQChar* c ) { m_endPtr = c; if( m_ptr < m_endPtr ) m_currentChar = *m_ptr; else - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } - const QChar currentChar() const; - QChar peekChar( int n=1 ) const; + const TQChar currentChar() const; + TQChar peekChar( int n=1 ) const; int currentPosition() const; - void insertCurrent( const QString& str ); + void insertCurrent( const TQString& str ); void tokenize(); void nextToken( Token& token, bool stopOnNewline=false ); @@ -284,7 +284,7 @@ private: // preprocessor (based on an article of Al Stevens on Dr.Dobb's journal) int testIfLevel(); int macroDefined(); - QString readArgument(); + TQString readArgument(); int macroPrimary(); int macroMultiplyDivide(); @@ -298,7 +298,7 @@ private: int macroLogicalOr(); int macroExpression(); - void handleDirective( const QString& directive ); + void handleDirective( const TQString& directive ); void processDefine( Macro& macro ); void processElse(); void processElif(); @@ -312,17 +312,17 @@ private: private: LexerData* d; Driver* m_driver; - QPtrVector< Token > m_tokens; + TQPtrVector< Token > m_tokens; int m_size; int m_index; - QString m_source; - const QChar* m_ptr; - const QChar* m_endPtr; - QChar m_currentChar; + TQString m_source; + const TQChar* m_ptr; + const TQChar* m_endPtr; + TQChar m_currentChar; bool m_recordComments; bool m_recordWhiteSpaces; bool m_startLine; - __gnu_cxx::hash_map< HashedString, QPair<SkipType, QString> > m_words; + __gnu_cxx::hash_map< HashedString, QPair<SkipType, TQString> > m_words; int m_skippedLines; @@ -331,8 +331,8 @@ private: bool m_skipWordsEnabled; // preprocessor - QMemArray<bool> m_skipping; - QMemArray<bool> m_trueTest; + TQMemArray<bool> m_skipping; + TQMemArray<bool> m_trueTest; int m_ifLevel; bool m_preprocessorEnabled; bool m_inPreproc; @@ -346,7 +346,7 @@ private: }; -inline Token::Token(const QString & text = "") +inline Token::Token(const TQString & text = "") : m_type( -1 ), m_position( 0 ), m_length( 0 ), @@ -354,7 +354,7 @@ inline Token::Token(const QString & text = "") { } -inline Token::Token( int type, int position, int length, const QString& text ) +inline Token::Token( int type, int position, int length, const TQString& text ) : m_type( type ), m_position( position ), m_length( length ), @@ -424,7 +424,7 @@ inline int Token::position() const return m_position; } -inline QString Token::text() const +inline TQString Token::text() const { return m_text.mid(m_position, m_length); } @@ -488,7 +488,7 @@ inline void Lexer::setRecordWhiteSpaces( bool record ) m_recordWhiteSpaces = record; } -inline QString Lexer::source() const +inline TQString Lexer::source() const { return m_source; } @@ -540,7 +540,7 @@ inline void Lexer::nextChar() if( m_ptr < m_endPtr ) m_currentChar = *m_ptr; else - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } inline void Lexer::nextChar( int n ) @@ -551,7 +551,7 @@ inline void Lexer::nextChar( int n ) if( m_ptr < m_endPtr ) m_currentChar = *m_ptr; else - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } inline void Lexer::readIdentifier() @@ -563,7 +563,7 @@ inline void Lexer::readIdentifier() inline void Lexer::readWhiteSpaces( bool skipNewLine, bool skipOnlyOnce ) { while( !currentChar().isNull() ){ - QChar ch = currentChar(); + TQChar ch = currentChar(); if( ch == '\n' && !skipNewLine ){ break; @@ -582,7 +582,7 @@ inline void Lexer::readWhiteSpaces( bool skipNewLine, bool skipOnlyOnce ) } //little hack for better performance -inline bool isTodo( const QString& txt, int position ) { +inline bool isTodo( const TQString& txt, int position ) { if( txt.length() < position + 4 ) return false; return (txt[ position ] == 't' || txt[ position ] == 'T') && (txt[ position+1 ] == 'o' || txt[ position+1 ] == 'O') @@ -590,7 +590,7 @@ inline bool isTodo( const QString& txt, int position ) { && (txt[ position+3 ] == 'o' || txt[ position+3 ] == 'O'); } -inline bool isFixme( const QString& txt, int position ) { +inline bool isFixme( const TQString& txt, int position ) { if( txt.length() < position + 5 ) return false; return (txt[ position ] == 'f' || txt[ position ] == 'F') && (txt[ position+1 ] == 'i' || txt[ position+1 ] == 'I') @@ -604,7 +604,7 @@ inline void Lexer::readLineComment() while( !currentChar().isNull() && currentChar() != '\n' ){ if( m_reportMessages && isTodo( m_source, currentPosition() ) ){ nextChar( 4 ); - QString msg; + TQString msg; int line = m_currentLine; int col = m_currentColumn; @@ -621,7 +621,7 @@ inline void Lexer::readLineComment() } else if( m_reportMessages && isFixme( m_source, currentPosition() ) ){ nextChar( 5 ); - QString msg; + TQString msg; int line = m_currentLine; int col = m_currentColumn; @@ -648,7 +648,7 @@ inline void Lexer::readMultiLineComment() return; } else if( m_reportMessages && isTodo( m_source, currentPosition() ) ){ nextChar( 4 ); - QString msg; + TQString msg; int line = m_currentLine; int col = m_currentColumn; @@ -664,7 +664,7 @@ inline void Lexer::readMultiLineComment() } else if( m_reportMessages && isFixme( m_source, currentPosition() ) ) { nextChar( 5 ); - QString msg; + TQString msg; int line = m_currentLine; int col = m_currentColumn; @@ -742,7 +742,7 @@ inline int Lexer::findOperator3() const int n = getOffset( m_endPtr ) - currentPosition(); if( n >= 3){ - QChar ch = currentChar(), ch1=peekChar(), ch2=peekChar(2); + TQChar ch = currentChar(), ch1=peekChar(), ch2=peekChar(2); if( ch == '<' && ch1 == '<' && ch2 == '=' ) return Token_assign; else if( ch == '>' && ch1 == '>' && ch2 == '=' ) return Token_assign; @@ -758,7 +758,7 @@ inline int Lexer::findOperator2() const int n = getOffset( m_endPtr ) - currentPosition(); if( n>=2 ){ - QChar ch = currentChar(), ch1=peekChar(); + TQChar ch = currentChar(), ch1=peekChar(); if( ch == ':' && ch1 == ':' ) return Token_scope; else if( ch == '.' && ch1 == '*' ) return Token_ptrmem; @@ -812,19 +812,19 @@ inline int Lexer::currentPosition() const return getOffset( m_ptr ); } -inline const QChar Lexer::currentChar() const +inline const TQChar Lexer::currentChar() const { return m_currentChar; } -inline QChar Lexer::peekChar( int n ) const +inline TQChar Lexer::peekChar( int n ) const { - const QChar* p = m_ptr + n; + const TQChar* p = m_ptr + n; if( p < m_endPtr ) return *p; else - return QChar::null; + return TQChar::null; } inline bool Lexer::eof() const @@ -852,7 +852,7 @@ inline void Lexer::setReportMessages( bool enable ) m_reportMessages = enable; } -inline void Lexer::insertCurrent( const QString& str ) { +inline void Lexer::insertCurrent( const TQString& str ) { int posi = currentPosition(); m_source.insert( posi, str ); @@ -861,7 +861,7 @@ inline void Lexer::insertCurrent( const QString& str ) { if( m_ptr < m_endPtr ) m_currentChar = *m_ptr; else - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } #endif diff --git a/lib/cppparser/lexercache.cpp b/lib/cppparser/lexercache.cpp index a7e40dd6..230a7de1 100644 --- a/lib/cppparser/lexercache.cpp +++ b/lib/cppparser/lexercache.cpp @@ -108,7 +108,7 @@ CachedLexedFilePointer LexerCache::lexedFile( const HashedString& fileName ) { return CachedLexedFilePointer(); } -QDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName ) { +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 @@ -117,8 +117,8 @@ QDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName ) } } - QFileInfo fileInfo( fileName.str() ); - m_fileModificationCache[fileName].m_readTime = QDateTime::currentDateTime(); + TQFileInfo fileInfo( fileName.str() ); + m_fileModificationCache[fileName].m_readTime = TQDateTime::currentDateTime(); m_fileModificationCache[fileName].m_modificationTime = fileInfo.lastModified(); return fileInfo.lastModified(); @@ -128,13 +128,13 @@ QDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName ) bool LexerCache::sourceChanged( const CachedLexedFile& file ) { //@todo Check if any of the dependencies changed - QDateTime modTime = fileModificationTimeCached( file.fileName() ); + TQDateTime modTime = fileModificationTimeCached( file.fileName() ); if ( modTime != file.modificationTime() ) return true; - for( QMap<HashedString, QDateTime>::const_iterator it = file.allModificationTimes().begin(); it != file.allModificationTimes().end(); ++it ) { - QDateTime modTime = fileModificationTimeCached( it.key() ); + for( TQMap<HashedString, TQDateTime>::const_iterator it = file.allModificationTimes().begin(); it != file.allModificationTimes().end(); ++it ) { + TQDateTime modTime = fileModificationTimeCached( it.key() ); if( modTime != *it ) return true; } @@ -162,7 +162,7 @@ void LexerCache::erase( const CacheNode* node ) { } CachedLexedFile::CachedLexedFile( const HashedString& fileName, LexerCache* manager ) : CacheNode( manager ), m_fileName( fileName ) { - QFileInfo fileInfo( fileName.str() ); + TQFileInfo fileInfo( fileName.str() ); m_modificationTime = fileInfo.lastModified(); m_allModificationTimes[ fileName ] = m_modificationTime; } @@ -184,13 +184,13 @@ void CachedLexedFile::addUsedMacro( const Macro& macro ) { } } -void CachedLexedFile::addIncludeFile( const HashedString& file, const QDateTime& modificationTime ) { +void CachedLexedFile::addIncludeFile( const HashedString& file, const TQDateTime& modificationTime ) { m_includeFiles.insert( file ); m_allModificationTimes[file] = modificationTime; } -QDateTime CachedLexedFile::modificationTime() const { +TQDateTime CachedLexedFile::modificationTime() const { return m_modificationTime; } @@ -198,7 +198,7 @@ void CachedLexedFile::addProblem( const Problem& p ) { m_problems << p; } -QValueList<Problem> CachedLexedFile::problems() const { +TQValueList<Problem> CachedLexedFile::problems() const { return m_problems; } @@ -224,7 +224,7 @@ void CachedLexedFile::merge( const CachedLexedFile& file ) { m_definedMacros.merge( file.m_definedMacros ); m_definedMacroNames += file.m_definedMacroNames; - for( QMap<HashedString, QDateTime>::const_iterator it = file.m_allModificationTimes.begin(); it != file.m_allModificationTimes.end(); ++it ) + for( TQMap<HashedString, TQDateTime>::const_iterator it = file.m_allModificationTimes.begin(); it != file.m_allModificationTimes.end(); ++it ) m_allModificationTimes[it.key()] = *it; @@ -239,7 +239,7 @@ size_t CachedLexedFile::hash() const { } void LexerCache::initFileModificationCache() { - m_currentDateTime = QDateTime::currentDateTime(); + m_currentDateTime = TQDateTime::currentDateTime(); } void LexerCache::saveMemory() { diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h index c32d5406..662e0270 100644 --- a/lib/cppparser/lexercache.h +++ b/lib/cppparser/lexercache.h @@ -19,8 +19,8 @@ #include <ksharedptr.h> #include "macro.h" #include <kdebug.h> -#include <qdatetime.h> -#include <qfileinfo.h> +#include <tqdatetime.h> +#include <tqfileinfo.h> #include <ext/hash_set> #include "cachemanager.h" @@ -43,17 +43,17 @@ class CachedLexedFile : public KShared, public CacheNode { void addUsedMacro( const Macro& macro ); - void addIncludeFile( const HashedString& file, const QDateTime& modificationTime ); + void addIncludeFile( const HashedString& file, const TQDateTime& modificationTime ); inline bool hasString( const HashedString& string ) const { return m_strings[string]; } - QDateTime modificationTime() const; + TQDateTime modificationTime() const; void addProblem( const Problem& p ); - QValueList<Problem> problems() const; + TQValueList<Problem> problems() const; //The parameter should be a CachedLexedFile that was lexed AFTER the content of this file void merge( const CachedLexedFile& file ); @@ -81,21 +81,21 @@ class CachedLexedFile : public KShared, public CacheNode { } ///Should contain a modification-time for each include-file - const QMap<HashedString, QDateTime>& allModificationTimes() const { + const TQMap<HashedString, TQDateTime>& allModificationTimes() const { return m_allModificationTimes; } private: friend class LexerCache; HashedString m_fileName; - QDateTime m_modificationTime; + TQDateTime m_modificationTime; HashedStringSet m_strings; //Set of all strings that can be affected by macros from outside HashedStringSet m_includeFiles; //Set of all files MacroSet m_usedMacros; //Set of all macros that were used, and were defined outside of this file MacroSet m_definedMacros; //Set of all macros that were defined while lexing this file HashedStringSet m_definedMacroNames; - QValueList<Problem> m_problems; - QMap<HashedString, QDateTime> m_allModificationTimes; + TQValueList<Problem> m_problems; + TQMap<HashedString, TQDateTime> m_allModificationTimes; /* Needed data: 1. Set of all strings that appear in this file(For memory-reasons they should be taken from a global string-repository, because many will be the same) @@ -140,22 +140,22 @@ class LexerCache : public CacheManager { virtual void saveMemory(); private: ///before this can be called, initFileModificationCache should be called once - QDateTime fileModificationTimeCached( const HashedString& fileName ); + TQDateTime fileModificationTimeCached( const HashedString& fileName ); void initFileModificationCache(); virtual void erase( const CacheNode* node ); bool sourceChanged( const CachedLexedFile& file );///Returns true if the file itself, or any of its dependencies was modified. //typedef __gnu_cxx::hash_multimap<HashedString, CachedLexedFilePointer> CachedLexedFileMap; typedef std::multimap<HashedString, CachedLexedFilePointer> CachedLexedFileMap; CachedLexedFileMap m_files; - __gnu_cxx::hash_set<HashedString> m_totalStringSet; ///This is used to reduce memory-usage: Most strings appear again and again. Because QString is reference-counted, this set contains a unique copy of each string to used for each appearance of the string + __gnu_cxx::hash_set<HashedString> m_totalStringSet; ///This is used to reduce memory-usage: Most strings appear again and again. Because TQString is reference-counted, this set contains a unique copy of each string to used for each appearance of the string struct FileModificationCache { - QDateTime m_readTime; - QDateTime m_modificationTime; + TQDateTime m_readTime; + TQDateTime m_modificationTime; }; typedef __gnu_cxx::hash_map<HashedString, FileModificationCache> FileModificationMap; FileModificationMap m_fileModificationCache; Driver* m_driver; - QDateTime m_currentDateTime; + TQDateTime m_currentDateTime; }; diff --git a/lib/cppparser/lookup.h b/lib/cppparser/lookup.h index 0fabd010..54bbfeff 100644 --- a/lib/cppparser/lookup.h +++ b/lib/cppparser/lookup.h @@ -21,8 +21,8 @@ #ifndef _LOOKUP_H_ #define _LOOKUP_H_ -#include <qstring.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqmap.h> #include "lexer.h" #include <ext/hash_map> diff --git a/lib/cppparser/macro.h b/lib/cppparser/macro.h index 03e76984..e8fe0b9c 100644 --- a/lib/cppparser/macro.h +++ b/lib/cppparser/macro.h @@ -15,14 +15,14 @@ #ifndef MACRO_H #define MACRO_H -#include <qpair.h> -#include <qvaluestack.h> -#include <qstringlist.h> -#include <qcstring.h> -#include <qdatastream.h> -#include <qmap.h> -#include <qdatetime.h> -#include <qvaluelist.h> +#include <tqpair.h> +#include <tqvaluestack.h> +#include <tqstringlist.h> +#include <tqcstring.h> +#include <tqdatastream.h> +#include <tqmap.h> +#include <tqdatetime.h> +#include <tqvaluelist.h> #include <map> #include <set> #include <hashedstring.h> @@ -50,12 +50,12 @@ class Problem { Problem( const Problem& source ) : m_text( source.m_text ), m_line( source.m_line ), m_column( source.m_column ), m_level( source.m_level ), m_file( source.m_file ) {} - Problem( const QString& text, int line, int column, int level = Level_Error ) + Problem( const TQString& text, int line, int column, int level = Level_Error ) : m_text( text ), m_line( line ), m_column( column ), m_level( level ) {} Problem( const Problem& source, bool /*threadSafeClone*/ ) - : m_text( QString::fromUtf8( source.m_text.utf8().data() ) ), m_line( source.m_line ), - m_column( source.m_column ), m_level( source.m_level ), m_file( QString::fromUtf8( source.m_file.utf8().data() ) ) {} + : m_text( TQString::fromUtf8( source.m_text.utf8().data() ) ), m_line( source.m_line ), + m_column( source.m_column ), m_level( source.m_level ), m_file( TQString::fromUtf8( source.m_file.utf8().data() ) ) {} Problem& operator = ( const Problem& source ) { m_text = source.m_text; @@ -66,7 +66,7 @@ class Problem { return ( *this ); } - void setFileName( const QString& fileName ) { + void setFileName( const TQString& fileName ) { m_file = fileName; } @@ -75,12 +75,12 @@ class Problem { } /** Get the filename in which the problem was encountered */ - QString fileName() const { + TQString fileName() const { return m_file; } /** Get the text for the problem */ - QString text() const { + TQString text() const { return m_text; } /** Get the line number of the problem */ @@ -103,11 +103,11 @@ class Problem { } private: - QString m_text; + TQString m_text; int m_line; int m_column; int m_level; - QString m_file; + TQString m_file; }; @@ -117,11 +117,11 @@ class Problem { */ class Macro { public: - typedef QString Argument; + typedef TQString Argument; public: Macro( bool hasArguments = false ) : m_idHashValid( false ), m_valueHashValid( false ), m_line( 0 ), m_column( 0 ), m_hasArguments( hasArguments ), m_isUndefMacro( false ) {} - Macro( const QString &n, const QString &b ) : m_idHashValid( false ), m_valueHashValid( false ), m_name( n ), m_line( 0 ), m_column( 0 ), m_body( b ), m_hasArguments( false ), m_isUndefMacro( false ) {} + Macro( const TQString &n, const TQString &b ) : m_idHashValid( false ), m_valueHashValid( false ), m_name( n ), m_line( 0 ), m_column( 0 ), m_body( b ), m_hasArguments( false ), m_isUndefMacro( false ) {} //Sorts the macros by their hash-value, then by their name. struct NameArgCompare { @@ -173,8 +173,8 @@ class Macro { return false; } else { if( lhs.m_argumentList.count() != rhs.m_argumentList.count() ) return false; - /*QStringList::const_iterator it2 = rhs.m_argumentList.begin(); - for( QStringList::const_iterator it = lhs.m_argumentList.begin(); it != lhs.m_argumentList.end(); ) { + /*TQStringList::const_iterator it2 = rhs.m_argumentList.begin(); + for( TQStringList::const_iterator it = lhs.m_argumentList.begin(); it != lhs.m_argumentList.end(); ) { if( *it != *it2 ) return false; ++it; @@ -227,7 +227,7 @@ class Macro { m_argumentList == source.m_argumentList && m_isUndefMacro == source.m_isUndefMacro; } - void read( QDataStream& stream ) { + void read( TQDataStream& stream ) { Q_INT8 i; stream >> i; m_idHashValid = i; stream >> i; m_valueHashValid = i; @@ -243,7 +243,7 @@ class Macro { stream >> m_argumentList; } - void write( QDataStream& stream ) const { + void write( TQDataStream& stream ) const { Q_INT8 i; i = m_idHashValid; stream << i; i = m_valueHashValid; stream << i; @@ -260,21 +260,21 @@ class Macro { } /** Get the name for this macro */ - QString name() const { + TQString name() const { return m_name; } /** Set the name for this macro */ - void setName( const QString& name ) { + void setName( const TQString& name ) { m_name = name; invalidateHash(); } /** Get the file name that contains this macro */ - QString fileName() const { + TQString fileName() const { return m_fileName; } /** Set the file name that contains this macro */ - void setFileName( const QString& fileName ) { + void setFileName( const TQString& fileName ) { m_fileName = fileName; invalidateHash(); } @@ -298,11 +298,11 @@ class Macro { } /** Get the body of the macro */ - QString body() const { + TQString body() const { return m_body; } /** Set the body of the macro */ - void setBody( const QString& body ) { + void setBody( const TQString& body ) { m_body = body; invalidateHash(); } @@ -326,7 +326,7 @@ class Macro { invalidateHash(); } /** Get a list of arguments passed to this macro */ - QValueList<Argument> argumentList() const { + TQValueList<Argument> argumentList() const { return m_argumentList; } @@ -341,7 +341,7 @@ class Macro { m_argumentList << argument; } /** Add a list of arguments to this macro */ - void addArgumentList( const QValueList<Argument>& arguments ) { + void addArgumentList( const TQValueList<Argument>& arguments ) { m_argumentList += arguments; invalidateHash(); } @@ -370,7 +370,7 @@ class Macro { m_valueHash = 27 * ( HashedString::hashString( m_body ) + (m_isUndefMacro ? 1 : 0 ) ); - for( QValueList<Argument>::const_iterator it = m_argumentList.begin(); it != m_argumentList.end(); ++it ) { + for( TQValueList<Argument>::const_iterator it = m_argumentList.begin(); it != m_argumentList.end(); ++it ) { a *= 19; m_valueHash += a * HashedString::hashString( *it ); } @@ -383,13 +383,13 @@ class Macro { mutable size_t m_idHash; //Hash that represents the ids of all macros mutable size_t m_valueHash; //Hash that represents the values of all macros - QString m_name; - QString m_fileName; + TQString m_name; + TQString m_fileName; int m_line; int m_column; - QString m_body; + TQString m_body; bool m_hasArguments; - QStringList m_argumentList; //While identification, only the count plays a role, not the values. + TQStringList m_argumentList; //While identification, only the count plays a role, not the values. bool m_isUndefMacro; friend class NameCompare; friend class NameArgEqual; @@ -404,7 +404,7 @@ class MacroSet { void addMacro( const Macro& macro ); - void read( QDataStream& stream ) { + void read( TQDataStream& stream ) { //stream >> m_idHashValid >> m_idHash >> m_valueHashValid >> m_valueHash; m_idHashValid = false; m_valueHashValid = false; @@ -418,7 +418,7 @@ class MacroSet { } } - void write( QDataStream& stream ) const { + void write( TQDataStream& stream ) const { //stream << m_idHashValid << m_idHash << m_valueHashValid << m_valueHash; stream << int( m_usedMacros.size() ); for( Macros::const_iterator it = m_usedMacros.begin(); it != m_usedMacros.end(); ++it ) { @@ -426,9 +426,9 @@ class MacroSet { } } - bool hasMacro( const QString& name ) const; + bool hasMacro( const TQString& name ) const; bool hasMacro( const HashedString& name ) const; - Macro macro( const QString& name ) const; + Macro macro( const TQString& name ) const; size_t idHash() const; size_t valueHash() const; diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index bed7cbd8..31c14385 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -24,9 +24,9 @@ #include "errors.h" // qt -#include <qstring.h> -#include <qstringlist.h> -#include <qasciidict.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqasciidict.h> #include <kdebug.h> #include <klocale.h> @@ -134,7 +134,7 @@ bool Parser::reportError( const Error& err ) const Token& token = lex->lookAhead( 0 ); lex->getTokenPosition( token, &line, &col ); - QString s = lex->lookAhead(0).text(); + TQString s = lex->lookAhead(0).text(); s = s.left( 30 ).stripWhiteSpace(); if( s.isEmpty() ) s = i18n( "<eof>" ); @@ -145,7 +145,7 @@ bool Parser::reportError( const Error& err ) return true; } -bool Parser::reportError( const QString& msg ) +bool Parser::reportError( const TQString& msg ) { ////kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- " << "Parser::reportError()" << endl; if( m_problems < m_maxProblems ){ @@ -947,7 +947,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) bool Parser::parseOperator( AST::Node& /*node*/ ) { ////kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- " << "Parser::parseOperator()" << endl; - QString text = lex->lookAhead(0).text(); + TQString text = lex->lookAhead(0).text(); switch( lex->lookAhead(0) ){ case Token_new: @@ -3297,9 +3297,9 @@ bool Parser::parseFunctionBody( StatementListAST::Node& node ) return true; } -QString Parser::toString( int start, int end, const QString& sep ) const +TQString Parser::toString( int start, int end, const TQString& sep ) const { - QStringList l; + TQStringList l; for( int i=start; i<end; ++i ){ const Token& t = lex->tokenAt(i); diff --git a/lib/cppparser/parser.h b/lib/cppparser/parser.h index d675c3da..771df635 100644 --- a/lib/cppparser/parser.h +++ b/lib/cppparser/parser.h @@ -22,10 +22,10 @@ #include "ast.h" -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> -#include <qvaluestack.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> +#include <tqvaluestack.h> #include <set> #include <iostream> @@ -38,11 +38,11 @@ struct Error; class CommentFormatter { - static inline bool isWhite( QChar c ) { + static inline bool isWhite( TQChar c ) { return c.isSpace(); } - static void rStrip( QString str, QString& from ) { + static void rStrip( TQString str, TQString& from ) { if( str.isEmpty() ) return; int i = 0; @@ -66,7 +66,7 @@ class CommentFormatter { if( ip != (int)from.length() ) from = from.left( ip ); } - static void strip( QString str, QString& from ) { + static void strip( TQString str, TQString& from ) { if( str.isEmpty() ) return; int i = 0; @@ -92,8 +92,8 @@ class CommentFormatter { public: - static QString formatComment( QString comment ) { - QString ret; + static TQString formatComment( TQString comment ) { + TQString ret; int i = 0; int s = comment.length(); while( i < s && comment[i] == '/' ) { @@ -104,16 +104,16 @@ class CommentFormatter { ret = comment.mid( i ); } else { ///remove the star in each line - QStringList lines = QStringList::split( "\n", comment ); + TQStringList lines = TQStringList::split( "\n", comment ); if( lines.isEmpty() ) return ret; strip( "/**", lines.front() ); rStrip( "/**", lines.back() ); - QStringList::iterator it = lines.begin(); + TQStringList::iterator it = lines.begin(); ++it; - QStringList::iterator eit = lines.end(); + TQStringList::iterator eit = lines.end(); if( it != lines.end() ) { --eit; @@ -137,7 +137,7 @@ class CommentFormatter { }; class Comment { - QString m_text; + TQString m_text; int m_line; bool m_formatted; @@ -149,7 +149,7 @@ class Comment { } public: - Comment( QString text = "", int line = -1 ) : m_text( text ), m_line( line ), m_formatted(false) { + Comment( TQString text = "", int line = -1 ) : m_text( text ), m_line( line ), m_formatted(false) { } Comment( int line ) : m_line( line ) { @@ -165,7 +165,7 @@ class Comment { return !m_text.isEmpty(); } - operator QString() { + operator TQString() { format(); return m_text; } @@ -264,7 +264,7 @@ public: private: virtual bool reportError( const Error& err ); - /** @todo remove*/ virtual bool reportError( const QString& msg ); + /** @todo remove*/ virtual bool reportError( const TQString& msg ); /** @todo remove*/ virtual void syntaxError(); public /*rules*/ : @@ -431,7 +431,7 @@ public /*rules*/ : bool skipUntilDeclaration(); bool skipUntilStatement(); bool skip( int l, int r ); - QString toString( int start, int end, const QString& sep=" " ) const; + TQString toString( int start, int end, const TQString& sep=" " ) const; private: int currentLine(); diff --git a/lib/cppparser/tree_parser.cpp b/lib/cppparser/tree_parser.cpp index 21f451f3..508c5229 100644 --- a/lib/cppparser/tree_parser.cpp +++ b/lib/cppparser/tree_parser.cpp @@ -33,8 +33,8 @@ void TreeParser::parseTranslationUnit( const ParsedFile& translationUnit ) { ////kdDebug(9007) << "TreeParser::parseTranslationUnit()" << endl; - QPtrList<DeclarationAST> declarations = translationUnit->declarationList(); - QPtrListIterator<DeclarationAST> it( declarations ); + TQPtrList<DeclarationAST> declarations = translationUnit->declarationList(); + TQPtrListIterator<DeclarationAST> it( declarations ); while( it.current() ){ if( (it.current() == 0 ) ) { //kdDebug( 9007 ) << "declaration is zero" << endl; @@ -158,8 +158,8 @@ void TreeParser::parseFunctionDefinition( FunctionDefinitionAST* def ) void TreeParser::parseLinkageBody( LinkageBodyAST* linkageBody ) { ////kdDebug(9007) << "TreeParser::parseLinkageBody()" << endl; - QPtrList<DeclarationAST> declarations = linkageBody->declarationList(); - for( QPtrListIterator<DeclarationAST> it(declarations); it.current(); ++it ){ + TQPtrList<DeclarationAST> declarations = linkageBody->declarationList(); + for( TQPtrListIterator<DeclarationAST> it(declarations); it.current(); ++it ){ parseDeclaration( it.current() ); } } @@ -186,8 +186,8 @@ void TreeParser::parseTypeSpecifier( TypeSpecifierAST* typeSpec ) void TreeParser::parseClassSpecifier( ClassSpecifierAST* classSpec ) { ////kdDebug(9007) << "TreeParser::parseClassSpecifier()" << endl; - QPtrList<DeclarationAST> declarations = classSpec->declarationList(); - for( QPtrListIterator<DeclarationAST> it(declarations); it.current(); ++it ){ + TQPtrList<DeclarationAST> declarations = classSpec->declarationList(); + for( TQPtrListIterator<DeclarationAST> it(declarations); it.current(); ++it ){ parseDeclaration( it.current() ); } } diff --git a/lib/interfaces/KDevCoreIface.cpp b/lib/interfaces/KDevCoreIface.cpp index f99afc53..aa70e01b 100644 --- a/lib/interfaces/KDevCoreIface.cpp +++ b/lib/interfaces/KDevCoreIface.cpp @@ -27,10 +27,10 @@ KDevCoreIface::KDevCoreIface(KDevCore *core) - : QObject(core), DCOPObject("KDevCore"), m_core(core) + : TQObject(core), DCOPObject("KDevCore"), m_core(core) { - connect( m_core, SIGNAL(projectOpened()), this, SLOT(forwardProjectOpened()) ); - connect( m_core, SIGNAL(projectClosed()), this, SLOT(forwardProjectClosed()) ); + connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) ); + connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) ); } @@ -41,17 +41,17 @@ KDevCoreIface::~KDevCoreIface() void KDevCoreIface::forwardProjectOpened() { kdDebug(9000) << "dcop emitting project opened" << endl; - emitDCOPSignal("projectOpened()", QByteArray()); + emitDCOPSignal("projectOpened()", TQByteArray()); } void KDevCoreIface::forwardProjectClosed() { kdDebug(9000) << "dcop emitting project closed" << endl; - emitDCOPSignal("projectClosed()", QByteArray()); + emitDCOPSignal("projectClosed()", TQByteArray()); } -void KDevCoreIface::openProject( const QString & projectFileName ) +void KDevCoreIface::openProject( const TQString & projectFileName ) { m_core->openProject(projectFileName); } diff --git a/lib/interfaces/KDevCoreIface.h b/lib/interfaces/KDevCoreIface.h index e37db975..5603e0f5 100644 --- a/lib/interfaces/KDevCoreIface.h +++ b/lib/interfaces/KDevCoreIface.h @@ -27,7 +27,7 @@ class KDevCore; -class KDevCoreIface : public QObject, public DCOPObject +class KDevCoreIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -38,7 +38,7 @@ public: ~KDevCoreIface(); k_dcop: - void openProject(const QString& projectFileName); + void openProject(const TQString& projectFileName); private slots: void forwardProjectOpened(); diff --git a/lib/interfaces/KDevPartControllerIface.cpp b/lib/interfaces/KDevPartControllerIface.cpp index a352d1df..1b184453 100644 --- a/lib/interfaces/KDevPartControllerIface.cpp +++ b/lib/interfaces/KDevPartControllerIface.cpp @@ -26,11 +26,11 @@ KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc) - : QObject(pc), DCOPObject("KDevPartController"), m_controller(pc) + : TQObject(pc), DCOPObject("KDevPartController"), m_controller(pc) { - connect(pc, SIGNAL(loadedFile(const KURL &)), this, SLOT(forwardLoadedFile(const KURL &))); - connect(pc, SIGNAL(savedFile(const KURL &)), this, SLOT(forwardSavedFile(const KURL &))); - connect(pc, SIGNAL(closedFile(const KURL &)), this, SLOT(forwardClosedFile(const KURL &))); + connect(pc, TQT_SIGNAL(loadedFile(const KURL &)), this, TQT_SLOT(forwardLoadedFile(const KURL &))); + connect(pc, TQT_SIGNAL(savedFile(const KURL &)), this, TQT_SLOT(forwardSavedFile(const KURL &))); + connect(pc, TQT_SIGNAL(closedFile(const KURL &)), this, TQT_SLOT(forwardClosedFile(const KURL &))); } @@ -39,13 +39,13 @@ KDevPartControllerIface::~KDevPartControllerIface() } -void KDevPartControllerIface::editDocument(const QString &url, int lineNum) +void KDevPartControllerIface::editDocument(const TQString &url, int lineNum) { m_controller->editDocument(KURL(url), lineNum); } -void KDevPartControllerIface::showDocument(const QString &url, bool newWin) +void KDevPartControllerIface::showDocument(const TQString &url, bool newWin) { m_controller->showDocument(KURL(url), newWin); } @@ -66,20 +66,20 @@ void KDevPartControllerIface::revertAllFiles() void KDevPartControllerIface::forwardLoadedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting loadedFile " << fileName << endl; - emitDCOPSignal("projectOpened()", QByteArray()); + emitDCOPSignal("projectOpened()", TQByteArray()); } void KDevPartControllerIface::forwardSavedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting savedFile " << fileName << endl; - emitDCOPSignal("projectClosed()", QByteArray()); + emitDCOPSignal("projectClosed()", TQByteArray()); } void KDevPartControllerIface::forwardClosedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting closedFile " << fileName << endl; - emitDCOPSignal("projectClosed()", QByteArray()); + emitDCOPSignal("projectClosed()", TQByteArray()); } bool KDevPartControllerIface::closeAllFiles( ) diff --git a/lib/interfaces/KDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h index e55c37a5..3f519159 100644 --- a/lib/interfaces/KDevPartControllerIface.h +++ b/lib/interfaces/KDevPartControllerIface.h @@ -25,7 +25,7 @@ class KDevPartController; -class KDevPartControllerIface : public QObject, public DCOPObject +class KDevPartControllerIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -38,8 +38,8 @@ public: k_dcop: - void editDocument(const QString &url, int lineNum); - void showDocument(const QString &url, bool newWin); + void editDocument(const TQString &url, int lineNum); + void showDocument(const TQString &url, bool newWin); void saveAllFiles(); void revertAllFiles(); diff --git a/lib/interfaces/codemodel.cpp b/lib/interfaces/codemodel.cpp index 050abb55..e2e211ad 100644 --- a/lib/interfaces/codemodel.cpp +++ b/lib/interfaces/codemodel.cpp @@ -111,9 +111,9 @@ inline bool isSingleGroup( const int group ) { return (group % 2) == 0; } -QStringList CodeModel::getGroupStrings(int gid) const { - QStringList ret; - for(QMap<QString, FileDom>::ConstIterator it = m_files.begin(); it != m_files.end(); ++it) { +TQStringList CodeModel::getGroupStrings(int gid) const { + TQStringList ret; + for(TQMap<TQString, FileDom>::ConstIterator it = m_files.begin(); it != m_files.end(); ++it) { if((*it)->groupId() == gid) ret.append( (*it)-> name() ); } return ret; @@ -122,7 +122,7 @@ QStringList CodeModel::getGroupStrings(int gid) const { FileList CodeModel::getGroup(int gid) const { FileList ret; - for(QMap<QString, FileDom>::ConstIterator it = m_files.begin(); it != m_files.end(); ++it) { + for(TQMap<TQString, FileDom>::ConstIterator it = m_files.begin(); it != m_files.end(); ++it) { if((*it)->groupId() == gid) ret.append(*it); } return ret; @@ -139,14 +139,14 @@ int CodeModel::mergeGroups( int g1, int g2) { if( isSingleGroup( ng ) ) ng = newGroupId() + 1; - for( QMap<QString, FileDom>::iterator it = m_files.begin(); it != m_files.end(); ++it ) { + for( TQMap<TQString, FileDom>::iterator it = m_files.begin(); it != m_files.end(); ++it ) { if( (*it)->groupId() == g2 || (*it)->groupId() == g1 ) (*it)->setGroupId( ng ); } return ng; } -template<class Type> static void dumpMap( std::ostream& file, QMap<QString, Type>& map ) { - typename QMap<QString, Type>::Iterator it = map.begin(); +template<class Type> static void dumpMap( std::ostream& file, TQMap<TQString, Type>& map ) { + typename TQMap<TQString, Type>::Iterator it = map.begin(); for( ; it != map.end(); ++it) { typename Type::Iterator it2 = (*it).begin(); for( ; it2 != (*it).end(); ++it2) { @@ -155,14 +155,14 @@ template<class Type> static void dumpMap( std::ostream& file, QMap<QString, Type } } -template<class Type> static void dumpMapDirect( std::ostream& file, QMap<QString, Type>& map ) { - typename QMap<QString, Type>::Iterator it = map.begin(); +template<class Type> static void dumpMapDirect( std::ostream& file, TQMap<TQString, Type>& map ) { + typename TQMap<TQString, Type>::Iterator it = map.begin(); for( ; it != map.end(); ++it) { (*it) -> dump( file, true ); } } -void CodeModelItem::dump( std::ostream& file, bool recurse, QString Info ) +void CodeModelItem::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -195,7 +195,7 @@ void CodeModelItem::dump( std::ostream& file, bool recurse, QString Info ) if(recurse) {} ///just to get rid of the warning } -void ClassModel::dump( std::ostream& file, bool recurse, QString Info ) +void ClassModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -212,27 +212,27 @@ void ClassModel::dump( std::ostream& file, bool recurse, QString Info ) } } -void NamespaceAliasModel::read( QDataStream& stream ) { - QString tempFileName; +void NamespaceAliasModel::read( TQDataStream& stream ) { + TQString tempFileName; stream >> m_name >> m_aliasName >> tempFileName; m_fileName = HashedString( tempFileName ); } -void NamespaceAliasModel::write( QDataStream& stream ) const { +void NamespaceAliasModel::write( TQDataStream& stream ) const { stream << m_name << m_aliasName << m_fileName.str(); } -void NamespaceImportModel::read( QDataStream& stream ) { - QString tempFileName; +void NamespaceImportModel::read( TQDataStream& stream ) { + TQString tempFileName; stream >> m_name >> tempFileName; m_fileName = HashedString( tempFileName ); } -void NamespaceImportModel::write( QDataStream& stream ) const { +void NamespaceImportModel::write( TQDataStream& stream ) const { stream << m_name << m_fileName.str(); } -void NamespaceModel::dump( std::ostream& file, bool recurse, QString Info ) +void NamespaceModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -245,7 +245,7 @@ void NamespaceModel::dump( std::ostream& file, bool recurse, QString Info ) } } -void ArgumentModel::dump( std::ostream& file, bool recurse, QString Info ) +void ArgumentModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -258,7 +258,7 @@ void ArgumentModel::dump( std::ostream& file, bool recurse, QString Info ) if(recurse) {} ///just to get rid of the warning } -void FunctionModel::dump( std::ostream& file, bool recurse, QString Info ) +void FunctionModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -289,7 +289,7 @@ void FunctionModel::dump( std::ostream& file, bool recurse, QString Info ) } } -void VariableModel::dump( std::ostream& file, bool recurse, QString Info ) +void VariableModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -306,20 +306,20 @@ void VariableModel::dump( std::ostream& file, bool recurse, QString Info ) if(recurse) {} ///just to get rid of the warning } -void CodeModel::dump( std::ostream& file, QString Info ) { +void CodeModel::dump( std::ostream& file, TQString Info ) { ostringstream str(ostringstream::out); Info.prepend( str.str().c_str() ); file << Info.ascii() << "\n"; - QMap<QString, FileDom>::iterator it = m_files.begin(); + TQMap<TQString, FileDom>::iterator it = m_files.begin(); for(; it != m_files.end(); ++it) { (*it) -> dump( file, true ); } } -void EnumModel::dump( std::ostream& file, bool recurse, QString Info ) +void EnumModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -334,7 +334,7 @@ void EnumModel::dump( std::ostream& file, bool recurse, QString Info ) } } -void EnumeratorModel::dump( std::ostream& file, bool recurse, QString Info ) +void EnumeratorModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -347,7 +347,7 @@ void EnumeratorModel::dump( std::ostream& file, bool recurse, QString Info ) if(recurse) {} ///just to get rid of the warning } -void TypeAliasModel::dump( std::ostream& file, bool recurse, QString Info ) { +void TypeAliasModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); str << "type: " << m_type.ascii() << "\n"; @@ -378,14 +378,14 @@ const FileList CodeModel::fileList( ) const return m_files.values(); } -bool CodeModel::hasFile( const QString & name ) const +bool CodeModel::hasFile( const TQString & name ) const { return m_files.contains( name ); } -FileDom CodeModel::fileByName( const QString & name ) +FileDom CodeModel::fileByName( const TQString & name ) { - QMap<QString, FileDom>::const_iterator it = m_files.find( name ); + TQMap<TQString, FileDom>::const_iterator it = m_files.find( name ); if( it != m_files.end() ) { return *it; } else { @@ -393,9 +393,9 @@ FileDom CodeModel::fileByName( const QString & name ) } } -const FileDom CodeModel::fileByName( const QString & name ) const +const FileDom CodeModel::fileByName( const TQString & name ) const { - QMap<QString, FileDom>::const_iterator it = m_files.find( name ); + TQMap<TQString, FileDom>::const_iterator it = m_files.find( name ); if( it != m_files.end() ) { return *it; } else { @@ -592,12 +592,12 @@ CodeModelItem::~ CodeModelItem( ) { } -QString CodeModelItem::name( ) const +TQString CodeModelItem::name( ) const { return m_name; } -void CodeModelItem::setName( const QString & name ) +void CodeModelItem::setName( const TQString & name ) { m_name = name; } @@ -612,12 +612,12 @@ FileDom CodeModelItem::file( ) return m_model->fileByName( m_fileName ); } -QString CodeModelItem::fileName() const +TQString CodeModelItem::fileName() const { return m_fileName; } -void CodeModelItem::setFileName( const QString& fileName ) +void CodeModelItem::setFileName( const TQString& fileName ) { m_fileName = fileName; } @@ -677,17 +677,17 @@ const NamespaceList NamespaceModel::namespaceList( ) const return m_namespaces.values(); } -NamespaceDom NamespaceModel::namespaceByName( const QString & name ) +NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) { return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom(); } -const NamespaceDom NamespaceModel::namespaceByName( const QString & name ) const +const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) const { return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom(); } -bool NamespaceModel::hasNamespace( const QString & name ) const +bool NamespaceModel::hasNamespace( const TQString & name ) const { return m_namespaces.contains( name ); } @@ -718,18 +718,18 @@ ClassModel::ClassModel( CodeModel* model ) { } -QStringList ClassModel::baseClassList( ) const +TQStringList ClassModel::baseClassList( ) const { return m_baseClassList; } -bool ClassModel::addBaseClass( const QString & baseClass ) +bool ClassModel::addBaseClass( const TQString & baseClass ) { m_baseClassList.push_back( baseClass ); return true; } -void ClassModel::removeBaseClass( const QString & baseClass ) +void ClassModel::removeBaseClass( const TQString & baseClass ) { m_baseClassList.remove( baseClass ); } @@ -737,7 +737,7 @@ void ClassModel::removeBaseClass( const QString & baseClass ) ClassList ClassModel::classList( ) { ClassList l; - QMap<QString, ClassList>::Iterator it = m_classes.begin(); + TQMap<TQString, ClassList>::Iterator it = m_classes.begin(); while( it != m_classes.end() ){ l += *it; ++it; @@ -749,7 +749,7 @@ ClassList ClassModel::classList( ) const ClassList ClassModel::classList( ) const { ClassList l; - QMap<QString, ClassList>::ConstIterator it = m_classes.begin(); + TQMap<TQString, ClassList>::ConstIterator it = m_classes.begin(); while( it != m_classes.end() ){ l += *it; ++it; @@ -758,17 +758,17 @@ const ClassList ClassModel::classList( ) const return l; } -bool ClassModel::hasClass( const QString & name ) const +bool ClassModel::hasClass( const TQString & name ) const { return m_classes.contains( name ); } -ClassList ClassModel::classByName( const QString & name ) +ClassList ClassModel::classByName( const TQString & name ) { return m_classes.contains( name ) ? m_classes[ name ] : ClassList(); } -const ClassList ClassModel::classByName( const QString & name ) const +const ClassList ClassModel::classByName( const TQString & name ) const { return m_classes.contains( name ) ? m_classes[ name ] : ClassList(); } @@ -793,7 +793,7 @@ void ClassModel::removeClass( ClassDom klass ) FunctionList ClassModel::functionList( ) { FunctionList l; - QMap<QString, FunctionList>::Iterator it = m_functions.begin(); + TQMap<TQString, FunctionList>::Iterator it = m_functions.begin(); while( it != m_functions.end() ){ l += *it; ++it; @@ -805,7 +805,7 @@ FunctionList ClassModel::functionList( ) const FunctionList ClassModel::functionList( ) const { FunctionList l; - QMap<QString, FunctionList>::ConstIterator it = m_functions.begin(); + TQMap<TQString, FunctionList>::ConstIterator it = m_functions.begin(); while( it != m_functions.end() ){ l += *it; ++it; @@ -814,17 +814,17 @@ const FunctionList ClassModel::functionList( ) const return l; } -bool ClassModel::hasFunction( const QString & name ) const +bool ClassModel::hasFunction( const TQString & name ) const { return m_functions.contains( name ); } -FunctionList ClassModel::functionByName( const QString & name ) +FunctionList ClassModel::functionByName( const TQString & name ) { return m_functions.contains( name ) ? m_functions[ name ] : FunctionList(); } -const FunctionList ClassModel::functionByName( const QString & name ) const +const FunctionList ClassModel::functionByName( const TQString & name ) const { return m_functions.contains( name ) ? m_functions[ name ] : FunctionList(); } @@ -849,7 +849,7 @@ void ClassModel::removeFunction( FunctionDom fun ) FunctionDefinitionList ClassModel::functionDefinitionList( ) { FunctionDefinitionList l; - QMap<QString, FunctionDefinitionList>::Iterator it = m_functionDefinitions.begin(); + TQMap<TQString, FunctionDefinitionList>::Iterator it = m_functionDefinitions.begin(); while( it != m_functionDefinitions.end() ){ l += *it; ++it; @@ -861,7 +861,7 @@ FunctionDefinitionList ClassModel::functionDefinitionList( ) const FunctionDefinitionList ClassModel::functionDefinitionList( ) const { FunctionDefinitionList l; - QMap<QString, FunctionDefinitionList>::ConstIterator it = m_functionDefinitions.begin(); + TQMap<TQString, FunctionDefinitionList>::ConstIterator it = m_functionDefinitions.begin(); while( it != m_functionDefinitions.end() ){ l += *it; ++it; @@ -870,17 +870,17 @@ const FunctionDefinitionList ClassModel::functionDefinitionList( ) const return l; } -bool ClassModel::hasFunctionDefinition( const QString & name ) const +bool ClassModel::hasFunctionDefinition( const TQString & name ) const { return m_functionDefinitions.contains( name ); } -FunctionDefinitionList ClassModel::functionDefinitionByName( const QString & name ) +FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) { return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); } -const FunctionDefinitionList ClassModel::functionDefinitionByName( const QString & name ) const +const FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) const { return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); } @@ -912,17 +912,17 @@ const VariableList ClassModel::variableList( ) const return m_variables.values(); } -VariableDom ClassModel::variableByName( const QString & name ) +VariableDom ClassModel::variableByName( const TQString & name ) { return m_variables.contains( name ) ? m_variables[ name ] : VariableDom(); } -const VariableDom ClassModel::variableByName( const QString & name ) const +const VariableDom ClassModel::variableByName( const TQString & name ) const { return m_variables.contains( name ) ? m_variables[ name ] : VariableDom(); } -bool ClassModel::hasVariable( const QString & name ) const +bool ClassModel::hasVariable( const TQString & name ) const { return m_variables.contains( name ); } @@ -951,17 +951,17 @@ const EnumList ClassModel::enumList( ) const return m_enumerators.values(); } -EnumDom ClassModel::enumByName( const QString & name ) +EnumDom ClassModel::enumByName( const TQString & name ) { return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom(); } -const EnumDom ClassModel::enumByName( const QString & name ) const +const EnumDom ClassModel::enumByName( const TQString & name ) const { return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom(); } -bool ClassModel::hasEnum( const QString & name ) const +bool ClassModel::hasEnum( const TQString & name ) const { return m_enumerators.contains( name ); } @@ -1005,7 +1005,7 @@ void ClassModel::removeEnum( EnumDom e ) TypeAliasList ClassModel::typeAliasList( ) { TypeAliasList l; - QMap<QString, TypeAliasList>::Iterator it = m_typeAliases.begin(); + TQMap<TQString, TypeAliasList>::Iterator it = m_typeAliases.begin(); while( it != m_typeAliases.end() ){ l += *it; ++it; @@ -1017,7 +1017,7 @@ TypeAliasList ClassModel::typeAliasList( ) const TypeAliasList ClassModel::typeAliasList( ) const { TypeAliasList l; - QMap<QString, TypeAliasList>::ConstIterator it = m_typeAliases.begin(); + TQMap<TQString, TypeAliasList>::ConstIterator it = m_typeAliases.begin(); while( it != m_typeAliases.end() ){ l += *it; ++it; @@ -1026,17 +1026,17 @@ const TypeAliasList ClassModel::typeAliasList( ) const return l; } -bool ClassModel::hasTypeAlias( const QString & name ) const +bool ClassModel::hasTypeAlias( const TQString & name ) const { return m_typeAliases.contains( name ); } -TypeAliasList ClassModel::typeAliasByName( const QString & name ) +TypeAliasList ClassModel::typeAliasByName( const TQString & name ) { return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList(); } -const TypeAliasList ClassModel::typeAliasByName( const QString & name ) const +const TypeAliasList ClassModel::typeAliasByName( const TQString & name ) const { return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList(); } @@ -1066,22 +1066,22 @@ ArgumentModel::ArgumentModel( CodeModel* model ) { } -QString ArgumentModel::type( ) const +TQString ArgumentModel::type( ) const { return m_type; } -void ArgumentModel::setType( const QString& type ) +void ArgumentModel::setType( const TQString& type ) { m_type = type; } -QString ArgumentModel::defaultValue( ) const +TQString ArgumentModel::defaultValue( ) const { return m_defaultValue; } -void ArgumentModel::setDefaultValue( const QString & defaultValue ) +void ArgumentModel::setDefaultValue( const TQString & defaultValue ) { m_defaultValue = defaultValue; } @@ -1150,12 +1150,12 @@ void FunctionModel::setAbstract( bool isAbstract ) d.v.m_abstract = isAbstract; } -QString FunctionModel::resultType( ) const +TQString FunctionModel::resultType( ) const { return m_resultType; } -void FunctionModel::setResultType( const QString& type ) +void FunctionModel::setResultType( const TQString& type ) { m_resultType = type; } @@ -1214,12 +1214,12 @@ void VariableModel::setStatic( bool isStatic ) m_static = isStatic; } -QString VariableModel::type( ) const +TQString VariableModel::type( ) const { return m_type; } -void VariableModel::setType( const QString& type ) +void VariableModel::setType( const TQString& type ) { m_type = type; } @@ -1282,7 +1282,7 @@ const NamespaceDom CodeModel::globalNamespace( ) const return m_globalNamespace; } -void CodeModelItem::read( QDataStream & stream ) +void CodeModelItem::read( TQDataStream & stream ) { stream >> m_kind @@ -1301,7 +1301,7 @@ void CodeModelItem::read( QDataStream & stream ) } } -void CodeModelItem::write( QDataStream & stream ) const +void CodeModelItem::write( TQDataStream & stream ) const { stream << m_kind @@ -1319,7 +1319,7 @@ void CodeModelItem::write( QDataStream & stream ) const } } -void ClassModel::read( QDataStream & stream ) +void ClassModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); @@ -1378,7 +1378,7 @@ void ClassModel::read( QDataStream & stream ) } } -void ClassModel::write( QDataStream & stream ) const +void ClassModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); @@ -1418,7 +1418,7 @@ void ClassModel::write( QDataStream & stream ) const } -void NamespaceModel::read( QDataStream & stream ) +void NamespaceModel::read( TQDataStream & stream ) { ClassModel::read( stream ); @@ -1462,7 +1462,7 @@ void NamespaceModel::removeNamespaceAlias( const NamespaceAliasModel& alias ) { m_namespaceAliases.erase( alias ); } -void NamespaceModel::write( QDataStream & stream ) const +void NamespaceModel::write( TQDataStream & stream ) const { ClassModel::write( stream ); @@ -1523,7 +1523,7 @@ void NamespaceModel::update( const NamespaceModel* ns ) eachUpdateSingle( m_namespaces, ns->m_namespaces ); } -void FileModel::read( QDataStream & stream ) +void FileModel::read( TQDataStream & stream ) { stream >> m_groupId; bool b; @@ -1542,7 +1542,7 @@ void FileModel::read( QDataStream & stream ) NamespaceModel::read( stream ); } -void FileModel::write( QDataStream & stream ) const +void FileModel::write( TQDataStream & stream ) const { stream << m_groupId; bool b = m_parseResult; @@ -1556,7 +1556,7 @@ void FileModel::write( QDataStream & stream ) const NamespaceModel::write( stream ); } -void ArgumentModel::read( QDataStream & stream ) +void ArgumentModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); @@ -1564,14 +1564,14 @@ void ArgumentModel::read( QDataStream & stream ) stream >> m_type >> m_defaultValue; } -void ArgumentModel::write( QDataStream & stream ) const +void ArgumentModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); stream << m_type << m_defaultValue; } -void FunctionModel::read( QDataStream & stream ) +void FunctionModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); TemplateModelItem::read( stream ); @@ -1593,7 +1593,7 @@ void FunctionModel::read( QDataStream & stream ) >> m_resultType; } -void FunctionModel::write( QDataStream & stream ) const +void FunctionModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); TemplateModelItem::write( stream ); @@ -1610,7 +1610,7 @@ void FunctionModel::write( QDataStream & stream ) const << m_resultType; } -void CodeModel::read( QDataStream & stream ) +void CodeModel::read( TQDataStream & stream ) { int n; @@ -1624,7 +1624,7 @@ void CodeModel::read( QDataStream & stream ) } } -void CodeModel::write( QDataStream & stream ) const +void CodeModel::write( TQDataStream & stream ) const { const FileList file_list = fileList(); stream << int( file_list.size() ); @@ -1632,13 +1632,13 @@ void CodeModel::write( QDataStream & stream ) const (*it)->write( stream ); } -void VariableModel::read( QDataStream & stream ) +void VariableModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); stream >> m_access >> m_static >> m_type >> m_isEnumeratorVariable; } -void VariableModel::write( QDataStream & stream ) const +void VariableModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); stream << m_access << m_static << m_type << m_isEnumeratorVariable; @@ -1688,7 +1688,7 @@ void EnumModel::addEnumerator( EnumeratorDom enumerator ) m_enumerators.insert( enumerator->name(), enumerator ); } -void EnumModel::read( QDataStream & stream ) +void EnumModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); stream >> m_access; @@ -1702,7 +1702,7 @@ void EnumModel::read( QDataStream & stream ) } } -void EnumModel::write( QDataStream & stream ) const +void EnumModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); @@ -1718,23 +1718,23 @@ EnumeratorModel::EnumeratorModel( CodeModel * model ) { } -QString EnumeratorModel::value( ) const +TQString EnumeratorModel::value( ) const { return m_value; } -void EnumeratorModel::setValue( const QString & value ) +void EnumeratorModel::setValue( const TQString & value ) { m_value = value; } -void EnumeratorModel::read( QDataStream & stream ) +void EnumeratorModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); stream >> m_value; } -void EnumeratorModel::write( QDataStream & stream ) const +void EnumeratorModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); stream << m_value; @@ -1765,26 +1765,26 @@ TypeAliasModel::TypeAliasModel( CodeModel * model ) { } -void TypeAliasModel::read( QDataStream & stream ) +void TypeAliasModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); stream >> m_type; } -void TypeAliasModel::write( QDataStream & stream ) const +void TypeAliasModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); stream << m_type; } -QString TypeAliasModel::type( ) const +TQString TypeAliasModel::type( ) const { return m_type; } -void TypeAliasModel::setType( const QString & type ) +void TypeAliasModel::setType( const TQString & type ) { m_type = type; } @@ -1809,8 +1809,8 @@ FileList FileModel::wholeGroup() { return codeModel()->getGroup( m_groupId ); } -QStringList FileModel::wholeGroupStrings() const { - if( isSingleGroup( m_groupId ) ) return (QStringList() << name() ); +TQStringList FileModel::wholeGroupStrings() const { + if( isSingleGroup( m_groupId ) ) return (TQStringList() << name() ); return codeModel()->getGroupStrings( m_groupId ); } diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h index 5fb42c44..882420b8 100644 --- a/lib/interfaces/codemodel.h +++ b/lib/interfaces/codemodel.h @@ -27,10 +27,10 @@ Code Model - a memory symbol store. */ -#include <qmap.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqstringlist.h> #include <ksharedptr.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> #include "hashedstring.h" #include <iostream> @@ -45,9 +45,9 @@ enum ParsedFileType { class AbstractParseResult : public KShared { public: - virtual void read( QDataStream& stream ) = 0; + virtual void read( TQDataStream& stream ) = 0; - virtual void write( QDataStream& stream ) const = 0; + virtual void write( TQDataStream& stream ) const = 0; virtual ParsedFileType type() const = 0; }; @@ -160,104 +160,104 @@ typedef KSharedPtr<EnumeratorModel> EnumeratorDom; /** @class ItemList The list of code model items. -This is a type definition: @code typedef QValueList<ItemDom> ItemList; @endcode +This is a type definition: @code typedef TQValueList<ItemDom> ItemList; @endcode @sa QValueList */ -typedef QValueList<ItemDom> ItemList; +typedef TQValueList<ItemDom> ItemList; /** @class FileList The list of code model files. -This is a type definition: @code typedef QValueList<FileDom> FileList; @endcode +This is a type definition: @code typedef TQValueList<FileDom> FileList; @endcode @sa QValueList */ -typedef QValueList<FileDom> FileList; +typedef TQValueList<FileDom> FileList; /** @class NamespaceList The list of code model namespaces. -This is a type definition: @code typedef QValueList<NamespaceDom> NamespaceList; @endcode +This is a type definition: @code typedef TQValueList<NamespaceDom> NamespaceList; @endcode @sa QValueList */ -typedef QValueList<NamespaceDom> NamespaceList; +typedef TQValueList<NamespaceDom> NamespaceList; /** @class ClassList The list of code model classes. -This is a type definition: @code typedef QValueList<ClassDom> ClassList; @endcode +This is a type definition: @code typedef TQValueList<ClassDom> ClassList; @endcode @sa QValueList */ -typedef QValueList<ClassDom> ClassList; +typedef TQValueList<ClassDom> ClassList; /** @class FunctionList The list of code model functions. -This is a type definition: @code typedef QValueList<FunctionDom> FunctionList; @endcode +This is a type definition: @code typedef TQValueList<FunctionDom> FunctionList; @endcode @sa QValueList */ -typedef QValueList<FunctionDom> FunctionList; +typedef TQValueList<FunctionDom> FunctionList; /** @class FunctionDefinitionList The list of code model function definitions. -This is a type definition: @code typedef QValueList<FunctionDefinitionDom> FunctionDefinitionList; @endcode +This is a type definition: @code typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList; @endcode @sa QValueList */ -typedef QValueList<FunctionDefinitionDom> FunctionDefinitionList; +typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList; /** @class VariableList The list of code model variables. -This is a type definition: @code typedef QValueList<VariableDom> VariableList; @endcode +This is a type definition: @code typedef TQValueList<VariableDom> VariableList; @endcode @sa QValueList */ -typedef QValueList<VariableDom> VariableList; +typedef TQValueList<VariableDom> VariableList; /** @class ArgumentList The list of code model arguments. -This is a type definition: @code typedef QValueList<ArgumentDom> ArgumentList; @endcode +This is a type definition: @code typedef TQValueList<ArgumentDom> ArgumentList; @endcode @sa QValueList */ -typedef QValueList<ArgumentDom> ArgumentList; +typedef TQValueList<ArgumentDom> ArgumentList; /** @class EnumList The list of code model enums. -This is a type definition: @code typedef QValueList<EnumDom> EnumList; @endcode +This is a type definition: @code typedef TQValueList<EnumDom> EnumList; @endcode @sa QValueList */ -typedef QValueList<EnumDom> EnumList; +typedef TQValueList<EnumDom> EnumList; /** @class TypeAliasList The list of code model type aliases. -This is a type definition: @code typedef QValueList<TypeAliasDom> TypeAliasList; @endcode +This is a type definition: @code typedef TQValueList<TypeAliasDom> TypeAliasList; @endcode @sa QValueList */ -typedef QValueList<TypeAliasDom> TypeAliasList; +typedef TQValueList<TypeAliasDom> TypeAliasList; /** @class EnumeratorList The list of code model enumerators. -This is a type definition: @code typedef QValueList<EnumeratorDom> EnumeratorList; @endcode +This is a type definition: @code typedef TQValueList<EnumeratorDom> EnumeratorList; @endcode @sa QValueList */ -typedef QValueList<EnumeratorDom> EnumeratorList; +typedef TQValueList<EnumeratorDom> EnumeratorList; /** Iterates through @p lst and creates sorted list of code model item names. Can be used, for example, to get the list of classes in the store: @code -QStringList classList = sortedNameList(codeModel()->globalNamespace()->classList()); +TQStringList classList = sortedNameList(codeModel()->globalNamespace()->classList()); @endcode @param lst The list to iterate. @return Sorted list of code model item names. */ template <class ItemList> -QStringList sortedNameList( const ItemList& lst ) +TQStringList sortedNameList( const ItemList& lst ) { - QStringList nameList; + TQStringList nameList; typename ItemList::ConstIterator it = lst.begin(); while( it != lst.end() ){ @@ -360,16 +360,16 @@ public: /**Checks to see if a file is in the store. @return true if @p name is in the file list.*/ - bool hasFile( const QString& name ) const; + bool hasFile( const TQString& name ) const; /**Gets the FileDom object for a file. @param name The name of the file to get the FileDom object for.*/ - FileDom fileByName( const QString& name ); + FileDom fileByName( const TQString& name ); /**Gets the FileDom object for a file. This is a const version provided for convenience. @param name the name of the file to get the FileDom object for.*/ - const FileDom fileByName( const QString& name ) const; + const FileDom fileByName( const TQString& name ) const; /**Adds a file to the store. @param file The FileDom object to add to the store. @@ -391,17 +391,17 @@ public: closed to avoid reparsing when the project is opened next time. @param stream Stream to read from. @return whether the read succeeded(may fail when the store-format is deprecated).*/ - virtual void read( QDataStream& stream ); + virtual void read( TQDataStream& stream ); /**Writes the model to a stream. Use this to restore the memory symbol store to a file. Language support plugins usually save symbols from projects before the project is closed to avoid reparsing when the project is opened next time. @param stream Stream to write to.*/ - virtual void write( QDataStream& stream ) const; + virtual void write( TQDataStream& stream ) const; /** this will dump the whole tree into dot-file-format so it can be inspected, not ready yet*/ - virtual void dump( std::ostream& file, QString Info="" ); + virtual void dump( std::ostream& file, TQString Info="" ); /** Merges two groups, by changing the group-ids of the files. Returns the id of the new group, or 0 on fail. @@ -418,7 +418,7 @@ public: FileList getGroup( const FileDom& file) const; /** Same as above, but returns the names instead of the objects */ - virtual QStringList getGroupStrings( int gid ) const; + virtual TQStringList getGroupStrings( int gid ) const; private: /**Adds a namespace to the store. @@ -432,7 +432,7 @@ private: void removeNamespace( NamespaceDom target, NamespaceDom source ); private: - QMap<QString, FileDom> m_files; + TQMap<TQString, FileDom> m_files; NamespaceDom m_globalNamespace; virtual int newGroupId(); @@ -510,19 +510,19 @@ public: void setKind( int kind ) { m_kind = kind; } /**@return The name of the item.*/ - QString name() const; + TQString name() const; - QString comment() const { + TQString comment() const { return m_comment; } - void setComment( QString comment ) { + void setComment( TQString comment ) { m_comment = comment; } /**Sets the name of the item. @param name The name.*/ - void setName( const QString& name ); + void setName( const TQString& name ); /**Gets the file of the item. @return The FileDom object for the item.*/ @@ -534,11 +534,11 @@ public: const FileDom file() const; /**@return The filename of the item.*/ - QString fileName() const; + TQString fileName() const; /**Sets the filename of the item. @param fileName The file name.*/ - void setFileName( const QString& fileName ); + void setFileName( const TQString& fileName ); /**Gets the start position of the item. @param line Will be set to the line number of the items start position. Pass 0 if line number is not necessary. @@ -587,12 +587,12 @@ public: /**Reads an item from the stream. @param stream The stream to read from.*/ - virtual void read( QDataStream& stream ); + virtual void read( TQDataStream& stream ); /**Writes an item to the stream. @param stream The stream to write to.*/ - virtual void write( QDataStream& stream ) const; + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); /**@return The code model for this item.*/ CodeModel* codeModel() { return m_model; } @@ -604,9 +604,9 @@ public: private: int m_kind; CodeModel* m_model; - QString m_name; - QString m_fileName; - QString m_comment; ///not stored yet + TQString m_name; + TQString m_fileName; + TQString m_comment; ///not stored yet int m_startLine, m_startColumn; int m_endLine, m_endColumn; @@ -619,14 +619,14 @@ private: class TemplateModelItem { public: - typedef QPair< QString, QString > ParamPair; - typedef QValueVector< ParamPair > ParamMap; ///The first is the name, and the second the default-parameter, or "" if there is none. + typedef QPair< 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() { return m_params; } - virtual void addTemplateParam( QString name, QString def = "" ) { + virtual void addTemplateParam( TQString name, TQString def = "" ) { m_params.push_back( ParamPair( name, def ) ); } @@ -638,16 +638,16 @@ class TemplateModelItem { return !m_specialization.isEmpty(); } - virtual QString getSpecializationDeclaration() const { + virtual TQString getSpecializationDeclaration() const { return m_specialization; } - void setSpecializationDeclaration( const QString& str ) { + void setSpecializationDeclaration( const TQString& str ) { m_specialization = str; } ///returns -1 if the parameter does not exist - virtual int findTemplateParam( const QString& name ) const { + virtual int findTemplateParam( const TQString& name ) const { for( unsigned int a = 0; a< m_params.size(); a++) if( m_params[a].first == name ) return a; return -1; @@ -659,7 +659,7 @@ class TemplateModelItem { virtual bool isTemplateable() const { return true; } - void write( QDataStream & stream ) const { + void write( TQDataStream & stream ) const { stream << m_specialization; stream << (int)m_params.size(); for( ParamMap::const_iterator it = m_params.begin(); it != m_params.end(); ++it ) { @@ -668,7 +668,7 @@ class TemplateModelItem { } } - void read( QDataStream & stream ) { + void read( TQDataStream & stream ) { int count; stream >> m_specialization; stream >> count; @@ -682,7 +682,7 @@ class TemplateModelItem { protected: ParamMap m_params; - QString m_specialization; + TQString m_specialization; }; @@ -707,21 +707,21 @@ 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.*/ - QStringList scope() const { return m_scope; } + TQStringList scope() const { return m_scope; } /**Sets the scope of this class. @param scope The scope - a list of parent classes and namespaces.*/ - void setScope( const QStringList& scope ) { m_scope = scope; } + void setScope( const TQStringList& scope ) { m_scope = scope; } /**@return The list of base class names.*/ - QStringList baseClassList() const; + TQStringList baseClassList() const; /**Adds a base class to the list of base classes. @param baseClass The base class name.*/ - bool addBaseClass( const QString& baseClass ); + bool addBaseClass( const TQString& baseClass ); /**Removes a base class from the list of base classes. @param baseClass The base class name.*/ - void removeBaseClass( const QString& baseClass ); + void removeBaseClass( const TQString& baseClass ); /**@return The list of (sub)classes in this model.*/ ClassList classList(); @@ -733,16 +733,16 @@ public: /**Checks if the class specified by @p name is in this model. @param name The name of a class to look for. @return true if the model has a class.*/ - bool hasClass( const QString& name ) const; + bool hasClass( const TQString& name ) const; /**@param name The name of a class. @return A list of classes that match the name given by @p name.*/ - ClassList classByName( const QString& name ); + ClassList classByName( const TQString& name ); /**@param name The name of a class. @return A list of classes that match the name given by @p name. @note This is a const version provided for convenience.*/ - const ClassList classByName( const QString& name ) const; + const ClassList classByName( const TQString& name ) const; /**Adds a class to the model. @param klass The class model to add. @@ -763,16 +763,16 @@ public: /**Check if the function specified by @p name is in the model. @param name The name of a function to look for. @return true if the model has a class.*/ - bool hasFunction( const QString& name ) const; + bool hasFunction( const TQString& name ) const; /**@param name The name of a function to look for. @return A list of functions that match the name given by @p name.*/ - FunctionList functionByName( const QString& name ); + FunctionList functionByName( const TQString& name ); /**@param name The name of a function to look for. @return A list of functions that match the name given by @p name. @note This is a const version provided for convenience.*/ - const FunctionList functionByName( const QString& name ) const; + const FunctionList functionByName( const TQString& name ) const; /**Adds a function to the class model. @param fun The function model to add. @@ -793,20 +793,20 @@ public: /**Checks if the function definition specified by \p name is in the model. @param name The name of a function definition to look for. @return true if the function definition was found.*/ - bool hasFunctionDefinition( const QString& name ) const; + bool hasFunctionDefinition( const TQString& name ) const; /**Gets the list of functions that match the name given by \p name. If there are no matches, then the list returned is empty. @param name The name of a function definition to look for. @return The FunctionDefinitionList object containing the definitions that match.*/ - FunctionDefinitionList functionDefinitionByName( const QString& name ); + FunctionDefinitionList functionDefinitionByName( const TQString& name ); /**Gets the list of functions that match the name given by \p name. If there are no matches, then the list returned is empty. @param name The name of a function definition to look for. @return The FunctionDefinitionList object containing the definitions that match. @note This is a const version provided for convenience.*/ - const FunctionDefinitionList functionDefinitionByName( const QString& name ) const; + const FunctionDefinitionList functionDefinitionByName( const TQString& name ) const; /**Adds a function definition to the model. @param fun The function fefinition model to add to the model. @@ -827,20 +827,20 @@ public: /**Checks if the variable specified by @p name is in the model. @param name The name of a variable. @return true if the variable was found.*/ - bool hasVariable( const QString& name ) const; + bool hasVariable( const TQString& name ) const; /**Gets the variable specified by @p name. If there are no matches, then the VariableDom object returned is empty. @param name The name of a variable. @return A VariableDom object that matches the name specified.*/ - VariableDom variableByName( const QString& name ); + VariableDom variableByName( const TQString& name ); /**Gets the variable specified by @p name. If there are no matches, then the VariableDom object returned is empty. @param name The name of a variable. @return A VariableDom object that matches the name specified. @note This is a const version provided for convenience.*/ - const VariableDom variableByName( const QString& name ) const; + const VariableDom variableByName( const TQString& name ) const; /**Adds a variable to the model. @param var The variable model to add to the model. @@ -861,20 +861,20 @@ public: /**Checks if the type alias specified by @p name is in the model. @param name The name of a type alias. @return true if the type alias was found.*/ - bool hasTypeAlias( const QString& name ) const; + bool hasTypeAlias( const TQString& name ) const; /**Gets the list of type aliases that match @p name. If there are no matches, the TypeAliasList object is empty. @param name The name of a type alias. @return A TypeAliasList object that contains the matches.*/ - TypeAliasList typeAliasByName( const QString& name ); + TypeAliasList typeAliasByName( const TQString& name ); /**Gets the list of type aliases that match @p name. If there are no matches, the TypeAliasList object is empty. @param name The name of a type alias. @return A TypeAliasList object that contains the matches. @note This is a const version provided for convenience.*/ - const TypeAliasList typeAliasByName( const QString& name ) const; + const TypeAliasList typeAliasByName( const TQString& name ) const; /**Adds a type alias to the model. @param typeAlias The type alias model to add to the model. @@ -895,19 +895,19 @@ public: /**Checks if the enum specified by @p name is in the model. @param name The name of an enum. @return true if the enum was found.*/ - bool hasEnum( const QString& name ) const; + bool hasEnum( const TQString& name ) const; /**Gets the enum specified by @p name. The EnumDom object returned will be empty if no match is found. @param name The name of an enum. @return The EnumDom object that contains the match.*/ - EnumDom enumByName( const QString& name ); + EnumDom enumByName( const TQString& name ); /**Gets the enum specified by @p name. The EnumDom object returned will be empty if no match is found. @param name The name of an enum. @return The EnumDom object that contains the match.*/ - const EnumDom enumByName( const QString& name ) const; + const EnumDom enumByName( const TQString& name ) const; /**Adds an enum to the model. @param e The enum model to add to the model. @@ -921,20 +921,20 @@ public: void update( const ClassModel* i ); bool canUpdate( const ClassModel* i ) const; - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); private: - QStringList m_scope; - QStringList m_baseClassList; - QMap<QString, ClassList> m_classes; - QMap<QString, FunctionList> m_functions; - QMap<QString, FunctionDefinitionList> m_functionDefinitions; - QMap<QString, VariableDom> m_variables; - QMap<QString, TypeAliasList> m_typeAliases; - QMap<QString, EnumDom> m_enumerators; + TQStringList m_scope; + TQStringList m_baseClassList; + TQMap<TQString, ClassList> m_classes; + TQMap<TQString, FunctionList> m_functions; + TQMap<TQString, FunctionDefinitionList> m_functionDefinitions; + TQMap<TQString, VariableDom> m_variables; + TQMap<TQString, TypeAliasList> m_typeAliases; + TQMap<TQString, EnumDom> m_enumerators; private: ClassModel( const ClassModel& source ); @@ -944,22 +944,22 @@ private: class NamespaceAliasModel { public: - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - QString name() const { + TQString name() const { return m_name; } - void setName( const QString& name ) { + void setName( const TQString& name ) { m_name = name; } - void setAliasName( const QString& theValue ) { + void setAliasName( const TQString& theValue ) { m_aliasName = theValue; } - QString aliasName() const { + TQString aliasName() const { return m_aliasName; } @@ -985,17 +985,17 @@ public: } private: - QString m_name; - QString m_aliasName; + TQString m_name; + TQString m_aliasName; HashedString m_fileName; }; class NamespaceImportModel { public: - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - QString name() const { + TQString name() const { return m_name; } @@ -1003,7 +1003,7 @@ public: return m_fileName; } - void setName( const QString& name ) { + void setName( const TQString& name ) { m_name = name; } @@ -1024,7 +1024,7 @@ public: } private: - QString m_name; + TQString m_name; HashedString m_fileName; }; @@ -1063,20 +1063,20 @@ public: /**Checks if the namespace referenced by @p name is in the model. @param name The name of a namespace. @return true if the namespace was found.*/ - bool hasNamespace( const QString& name ) const; + bool hasNamespace( const TQString& name ) const; /**Gets the namespace specified by @p name. If there are no matches, then the NamespaceDom object returned is empty. @param name The name of a namespace. @return The NamespaceDom object that contains the match.*/ - NamespaceDom namespaceByName( const QString& name ); + NamespaceDom namespaceByName( const TQString& name ); /**Gets the namespace specified by @p name. If there are no matches, then the NamespaceDom object returned is empty. @param name The name of a namespace. @return The NamespaceDom object that contains the match. @note This is a const version provided for convenience.*/ - const NamespaceDom namespaceByName( const QString& name ) const; + const NamespaceDom namespaceByName( const TQString& name ) const; /**Adds a namespace to the model. @param ns The namespace model to add to the model. @@ -1093,10 +1093,10 @@ public: void update( const NamespaceModel* ns ); bool canUpdate( const NamespaceModel* ns ) const; - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void addNamespaceImport( const NamespaceImportModel& import ); void addNamespaceAlias( const NamespaceAliasModel& alias ); @@ -1113,7 +1113,7 @@ public: return m_namespaceImports; } private: - QMap<QString, NamespaceDom> m_namespaces; + TQMap<TQString, NamespaceDom> m_namespaces; NamespaceAliasModelList m_namespaceAliases; NamespaceImportModelList m_namespaceImports; @@ -1161,13 +1161,13 @@ public: from outside. @return whether the read was successful */ - virtual void write( QDataStream& stream ) const; + virtual void write( TQDataStream& stream ) const; FileList wholeGroup() ; - QStringList wholeGroupStrings() const; + TQStringList wholeGroupStrings() const; - virtual void read( QDataStream& stream ); + virtual void read( TQDataStream& stream ); ParseResultPointer parseResult() const; void setParseResult( const ParseResultPointer& result ); @@ -1200,27 +1200,27 @@ public: virtual bool isArgument() const { return true; } /**@return The type of this argument.*/ - QString type() const; + TQString type() const; /**Sets the type of this argument. @param type The type to set.*/ - void setType( const QString& type ); + void setType( const TQString& type ); /**@return The default value of this argument.*/ - QString defaultValue() const; + TQString defaultValue() const; /**Sets the default value of this argument. @param defaultValue The default value to set.*/ - void setDefaultValue( const QString& defaultValue ); + void setDefaultValue( const TQString& defaultValue ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); private: - QString m_type; - QString m_defaultValue; + TQString m_type; + TQString m_defaultValue; private: ArgumentModel( const ArgumentModel& source ); @@ -1257,11 +1257,11 @@ public: /**@return The scope of the function. Scope is a string list composed from names of parent functions, classes and namespaces.*/ - QStringList scope() const { return m_scope; } + TQStringList scope() const { return m_scope; } /**Sets the scope of the function. @param scope The scope to set.*/ - void setScope( const QStringList& scope ) { m_scope = scope; } + void setScope( const TQStringList& scope ) { m_scope = scope; } /**@return The access level of the function. Can return either values of type @ref CodeModelItem::Access or other integers if the function has other access level (for example pascal methods can have "published" @@ -1315,10 +1315,10 @@ public: void setAbstract( bool isAbstract ); /**@return The result type of a function.*/ - QString resultType() const; + TQString resultType() const; /**Sets the result type of a function. @param type The type of a function result.*/ - void setResultType( const QString& type ); + void setResultType( const TQString& type ); /**Gets the list of arguments being passed to the function. If there are no arguments, then the list is empty. @@ -1340,16 +1340,16 @@ public: @param arg The argument model to remove from the function.*/ void removeArgument( ArgumentDom arg ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void update( const FunctionModel* i ); bool canUpdate( const FunctionModel* i ) const; private: - QStringList m_scope; + TQStringList m_scope; int m_access; union { @@ -1365,7 +1365,7 @@ private: int flags; } d; - QString m_resultType; + TQString m_resultType; ArgumentList m_arguments; private: @@ -1434,20 +1434,20 @@ public: void setStatic( bool isStatic ); /**@return A type of the variable.*/ - QString type() const; + TQString type() const; /**Sets the type of the variable. @param type The type name.*/ - void setType( const QString& type ); + void setType( const TQString& type ); /**@return If this is an enumerator, the enum it is part of, else an empty string. This is just a hack, necessary because EnumeratorModel is not used at all by the cpp-code-model. */ bool isEnumeratorVariable() const; void setEnumeratorVariable( bool b ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void update( const VariableModel* i ); bool canUpdate( const VariableModel* i ) const; @@ -1455,7 +1455,7 @@ public: private: int m_access; int m_static; - QString m_type; + TQString m_type; int m_isEnumeratorVariable; private: @@ -1503,18 +1503,18 @@ public: @param e The enumerator model to remove.*/ void removeEnumerator( EnumeratorDom e ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; ///The dump-function is not ready yet - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void update( const EnumModel* i ); bool canUpdate( const EnumModel* i ) const; private: int m_access; - QMap<QString, EnumeratorDom> m_enumerators; + TQMap<TQString, EnumeratorDom> m_enumerators; private: EnumModel( const EnumModel& source ); @@ -1548,18 +1548,18 @@ public: virtual bool isEnumerator() const { return true; } /**@return The value of an enumerator.*/ - QString value() const; + TQString value() const; /**Sets the value of an enumerator. @param value The value.*/ - void setValue( const QString& value ); + void setValue( const TQString& value ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); private: - QString m_value; + TQString m_value; private: EnumeratorModel( const EnumeratorModel& source ); @@ -1586,22 +1586,22 @@ public: virtual bool isTypeAlias() const { return true; } /**@return The actual type of an alias.*/ - QString type() const; + TQString type() const; /**Sets the type of an alias. @param type The type name.*/ - void setType( const QString& type ); + void setType( const TQString& type ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void update( const TypeAliasModel* i ); bool canUpdate( const TypeAliasModel* i ) const; private: - QString m_type; + TQString m_type; private: TypeAliasModel( const TypeAliasModel& source ); diff --git a/lib/interfaces/codemodel_utils.cpp b/lib/interfaces/codemodel_utils.cpp index 2bdffd53..afb946bd 100644 --- a/lib/interfaces/codemodel_utils.cpp +++ b/lib/interfaces/codemodel_utils.cpp @@ -62,7 +62,7 @@ void processNamespaces(FunctionList &list, const NamespaceDom dom) } } -void processNamespaces( FunctionList & list, const NamespaceDom dom, QMap< FunctionDom, Scope > & relations ) +void processNamespaces( FunctionList & list, const NamespaceDom dom, TQMap< FunctionDom, Scope > & relations ) { const NamespaceList nslist = dom->namespaceList(); for (NamespaceList::ConstIterator it = nslist.begin(); it != nslist.end(); ++it) @@ -83,7 +83,7 @@ void processNamespaces( FunctionList & list, const NamespaceDom dom, QMap< Funct } } -void processClasses( FunctionList & list, const ClassDom dom, QMap< FunctionDom, Scope > & relations ) +void processClasses( FunctionList & list, const ClassDom dom, TQMap< FunctionDom, Scope > & relations ) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) @@ -99,7 +99,7 @@ void processClasses( FunctionList & list, const ClassDom dom, QMap< FunctionDom, } } -void processClasses( FunctionList & list, const ClassDom dom, QMap< FunctionDom, Scope > & relations, const NamespaceDom & nsdom ) +void processClasses( FunctionList & list, const ClassDom dom, TQMap< FunctionDom, Scope > & relations, const NamespaceDom & nsdom ) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) @@ -158,7 +158,7 @@ void processNamespaces(FunctionDefinitionList &list, const NamespaceDom dom) } } -void processNamespaces( FunctionDefinitionList & list, const NamespaceDom dom, QMap< FunctionDefinitionDom, Scope > & relations ) +void processNamespaces( FunctionDefinitionList & list, const NamespaceDom dom, TQMap< FunctionDefinitionDom, Scope > & relations ) { const NamespaceList nslist = dom->namespaceList(); for (NamespaceList::ConstIterator it = nslist.begin(); it != nslist.end(); ++it) @@ -179,7 +179,7 @@ void processNamespaces( FunctionDefinitionList & list, const NamespaceDom dom, Q } } -void processClasses( FunctionDefinitionList & list, const ClassDom dom, QMap< FunctionDefinitionDom, Scope > & relations ) +void processClasses( FunctionDefinitionList & list, const ClassDom dom, TQMap< FunctionDefinitionDom, Scope > & relations ) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) @@ -195,7 +195,7 @@ void processClasses( FunctionDefinitionList & list, const ClassDom dom, QMap< Fu } } -void processClasses( FunctionDefinitionList & list, const ClassDom dom, QMap< FunctionDefinitionDom, Scope > & relations, const NamespaceDom & nsdom ) +void processClasses( FunctionDefinitionList & list, const ClassDom dom, TQMap< FunctionDefinitionDom, Scope > & relations, const NamespaceDom & nsdom ) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) @@ -297,8 +297,8 @@ AllFunctionDefinitions allFunctionDefinitionsDetailed( const FileDom & dom ) bool resultTypesFit( const FunctionDom & dec, const FunctionDefinitionDom & def ) { if( !def->resultType().contains("::") ) return dec->resultType() == def->resultType(); - QStringList l1 = dec->scope() + QStringList::split("::", dec->resultType() ); - QStringList l2 = QStringList::split("::", def->resultType() ); + TQStringList l1 = dec->scope() + TQStringList::split("::", dec->resultType() ); + TQStringList l2 = TQStringList::split("::", def->resultType() ); if( l1.isEmpty() || l2.isEmpty() || l1.back() != l2.back() ) return false; @@ -349,7 +349,7 @@ bool compareDeclarationToDefinition( const FunctionDom & dec, const FunctionDefi if (defList[i]->type() != decList[i]->type()) return false; - const QStringList &defScope = def->scope(), &decScope = dec->scope(); + const TQStringList &defScope = def->scope(), &decScope = dec->scope(); if (defScope != decScope) { if (defScope.size() >= decScope.size()) @@ -486,7 +486,7 @@ int findLastVariableLine( ClassDom aClass, CodeModelItem::Access access ) return point; } -QString accessSpecifierToString( CodeModelItem::Access access ) +TQString accessSpecifierToString( CodeModelItem::Access access ) { switch(access) { diff --git a/lib/interfaces/codemodel_utils.h b/lib/interfaces/codemodel_utils.h index 8836e058..2879a424 100644 --- a/lib/interfaces/codemodel_utils.h +++ b/lib/interfaces/codemodel_utils.h @@ -45,7 +45,7 @@ This can be done with following code: @code class MyPred{ public: - MyPred(const QString &name): m_name(name) {} + MyPred(const TQString &name): m_name(name) {} bool operator() (const FunctionDefinitionDom &def) const { @@ -53,7 +53,7 @@ public: } private: - QString m_name; + TQString m_name; }; @endcode */ @@ -333,14 +333,14 @@ struct Scope{ /**Information about functions.*/ struct AllFunctions{ /**Scope of functions.*/ - QMap<FunctionDom, Scope> relations; + TQMap<FunctionDom, Scope> relations; /**List of functions.*/ FunctionList functionList; }; /**Information about function definitions.*/ struct AllFunctionDefinitions{ /**Scope of function definitions.*/ - QMap<FunctionDefinitionDom, Scope> relations; + TQMap<FunctionDefinitionDom, Scope> relations; /**List of function definitions.*/ FunctionDefinitionList functionList; }; @@ -361,7 +361,7 @@ void processNamespaces(FunctionList &list, const NamespaceDom dom); @param list The list of functions found by this routine. @param dom The class to look for functions. @param relations The scope information.*/ -void processClasses(FunctionList &list, const ClassDom dom, QMap<FunctionDom, Scope> &relations); +void processClasses(FunctionList &list, const ClassDom dom, TQMap<FunctionDom, Scope> &relations); /**Looks for functions in the class and also saves their scope. Used for classes withing a namespace. @@ -369,13 +369,13 @@ Used for classes withing a namespace. @param dom The class to look for functions. @param relations The scope information. @param nsdom The namespace which contains a class.*/ -void processClasses(FunctionList &list, const ClassDom dom, QMap<FunctionDom, Scope> &relations, const NamespaceDom &nsdom); +void processClasses(FunctionList &list, const ClassDom dom, TQMap<FunctionDom, Scope> &relations, const NamespaceDom &nsdom); /**Looks for functions in the namespace and also saves their scope. @param list The list of functions found by this routine. @param dom The namespace to look for functions. @param relations The scope information.*/ -void processNamespaces(FunctionList &list, const NamespaceDom dom, QMap<FunctionDom, Scope> &relations); +void processNamespaces(FunctionList &list, const NamespaceDom dom, TQMap<FunctionDom, Scope> &relations); } /**Namespace with utilities to find function definitions in the @ref CodeModel.*/ @@ -394,7 +394,7 @@ void processNamespaces(FunctionDefinitionList &list, const NamespaceDom dom); @param list The list of function definitions found by this routine. @param dom The class to look for function definitions. @param relations The scope information.*/ -void processClasses(FunctionDefinitionList &list, const ClassDom dom, QMap<FunctionDefinitionDom, Scope> &relations); +void processClasses(FunctionDefinitionList &list, const ClassDom dom, TQMap<FunctionDefinitionDom, Scope> &relations); /**Looks for function definitions in the class and also saves their scope. Used for classes withing a namespace. @@ -402,13 +402,13 @@ Used for classes withing a namespace. @param dom The class to look for function definitions . @param relations The scope information. @param nsdom The namespace which contains a class.*/ -void processClasses(FunctionDefinitionList &list, const ClassDom dom, QMap<FunctionDefinitionDom, Scope> &relations, const NamespaceDom &nsdom); +void processClasses(FunctionDefinitionList &list, const ClassDom dom, TQMap<FunctionDefinitionDom, Scope> &relations, const NamespaceDom &nsdom); /**Looks for function definitions in the namespace and also saves their scope. @param list The list of function definitions found by this routine. @param dom The namespace to look for function definitions. @param relations The scope information.*/ -void processNamespaces(FunctionDefinitionList &list, const NamespaceDom dom, QMap<FunctionDefinitionDom, Scope> &relations); +void processNamespaces(FunctionDefinitionList &list, const NamespaceDom dom, TQMap<FunctionDefinitionDom, Scope> &relations); } /** @@ -527,14 +527,14 @@ int findLastVariableLine( ClassDom aClass, CodeModelItem::Access access ); * @return string The representation of an access (e.g. "public"). * @author Jonas Jacobi <j.jacobi@gmx.de> */ -QString accessSpecifierToString( CodeModelItem::Access access ); +TQString accessSpecifierToString( CodeModelItem::Access access ); class CodeModelHelper { private: CodeModel* m_model; FileList m_files; - QString m_fileName; + TQString m_fileName; FunctionDefinitionDom functionDefinitionAt(NamespaceDom ns, int line, int column); diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 9a1d6e0d..52dd5a1e 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -29,7 +29,7 @@ class KDevCodeBrowserFrontend : public KDevPlugin { Q_OBJECT public: - KDevCodeBrowserFrontend(const KDevPluginInfo *info, QObject *parent=0, const char *name=0 ) + KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {} ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item diff --git a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp index dd71b2d9..1eca4bfc 100644 --- a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp +++ b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp @@ -35,7 +35,7 @@ KDevAppFrontendIface::~KDevAppFrontendIface() {} -void KDevAppFrontendIface::startAppCommand(const QString &directory, const QString &command, bool inTerminal) +void KDevAppFrontendIface::startAppCommand(const TQString &directory, const TQString &command, bool inTerminal) { m_appFrontend->startAppCommand(directory, command, inTerminal); } @@ -55,22 +55,22 @@ void KDevAppFrontendIface::clearView( ) m_appFrontend->clearView(); } -void KDevAppFrontendIface::insertStderrLine( const QCString & line ) +void KDevAppFrontendIface::insertStderrLine( const TQCString & line ) { m_appFrontend->insertStderrLine(line); } -void KDevAppFrontendIface::insertStdoutLine( const QCString & line ) +void KDevAppFrontendIface::insertStdoutLine( const TQCString & line ) { m_appFrontend->insertStdoutLine(line); } -void KDevAppFrontendIface::addPartialStderrLine( const QCString& line ) +void KDevAppFrontendIface::addPartialStderrLine( const TQCString& line ) { m_appFrontend->addPartialStderrLine(line); } -void KDevAppFrontendIface::addPartialStdoutLine( const QCString& line ) +void KDevAppFrontendIface::addPartialStdoutLine( const TQCString& line ) { m_appFrontend->addPartialStdoutLine(line); } diff --git a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h index 636fc140..3903e897 100644 --- a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h +++ b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h @@ -36,14 +36,14 @@ public: ~KDevAppFrontendIface(); k_dcop: - void startAppCommand(const QString &directory, const QString &command, bool inTerminal); + void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal); void stopApplication(); bool isRunning(); void clearView(); - void insertStderrLine(const QCString &line); - void insertStdoutLine(const QCString &line); - void addPartialStderrLine(const QCString &line); - void addPartialStdoutLine(const QCString &line); + void insertStderrLine(const TQCString &line); + void insertStdoutLine(const TQCString &line); + void addPartialStderrLine(const TQCString &line); + void addPartialStdoutLine(const TQCString &line); private: KDevAppFrontend *m_appFrontend; diff --git a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp index a0e0f32c..73305e4a 100644 --- a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp +++ b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp @@ -35,7 +35,7 @@ KDevMakeFrontendIface::~KDevMakeFrontendIface() {} -void KDevMakeFrontendIface::queueCommand(const QString &dir, const QString &command) +void KDevMakeFrontendIface::queueCommand(const TQString &dir, const TQString &command) { m_makeFrontend->queueCommand(dir, command); } diff --git a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h index cde64454..53217359 100644 --- a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h +++ b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h @@ -35,7 +35,7 @@ public: ~KDevMakeFrontendIface(); k_dcop: - void queueCommand(const QString &dir, const QString &command); + void queueCommand(const TQString &dir, const TQString &command); bool isRunning(); private: diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h index 2a762266..4f17154d 100644 --- a/lib/interfaces/extensions/kdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -26,7 +26,7 @@ #ifndef KDEVAPPFRONTEND_H #define KDEVAPPFRONTEND_H -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdevplugin.h> /** @@ -68,7 +68,7 @@ public: @param parent The parent 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, QObject *parent=0, const char *name=0 ) + KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {} /**@return Whether the application is currently running.*/ @@ -83,7 +83,7 @@ public slots: * @param program A program to start. * @param inTerminal If true then the program is started in an external konsole. */ - virtual void startAppCommand(const QString &directory, const QString &program, bool inTerminal) = 0; + virtual void startAppCommand(const TQString &directory, const TQString &program, bool inTerminal) = 0; /** * Stops the currently running application. @@ -94,17 +94,17 @@ public slots: * Inserts a string into the application output view. * @param line A string to insert. */ - virtual void insertStdoutLine(const QCString &line) = 0; + virtual void insertStdoutLine(const TQCString &line) = 0; /** * Inserts a string into the application output view marked as stderr output * (usually colored). * @param line An error string to insert. */ - virtual void insertStderrLine(const QCString &line) = 0; + virtual void insertStderrLine(const TQCString &line) = 0; - virtual void addPartialStderrLine( const QCString& line ) = 0; - virtual void addPartialStdoutLine( const QCString& line ) = 0; + virtual void addPartialStderrLine( const TQCString& line ) = 0; + virtual void addPartialStdoutLine( const TQCString& line ) = 0; /** * Clears the output view. diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h index 4a84410c..b3f5e080 100644 --- a/lib/interfaces/extensions/kdevcreatefile.h +++ b/lib/interfaces/extensions/kdevcreatefile.h @@ -20,7 +20,7 @@ #ifndef KDEVCREATEFILE_H #define KDEVCREATEFILE_H -#include <qstring.h> +#include <tqstring.h> #include <kdevplugin.h> @@ -95,15 +95,15 @@ public: // this should be private /**The directory.*/ - QString dir; + TQString dir; /**The name (without directory path).*/ - QString filename; + TQString filename; /**The extension of a file. Extension defines a "type" of the file template to use during file creation.*/ - QString ext; + TQString ext; /**The subtype of a file. "Subtype" defines a file template to use when there are several file templates for each extension.*/ - QString subtype; + TQString subtype; /**Current status.*/ Status status; /**true if the file should be added to a project.*/ @@ -122,11 +122,11 @@ public: @param parent The parent 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, QObject * parent = 0, const char * name = 0) + KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0) :KDevPlugin(info, parent, name) {} /**Creates a new file, within or without the project. - Supply as much information as you know. Leave what you don't know as QString::null. + Supply as much information as you know. Leave what you don't know as TQString::null. 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(QString ext = QString::null, - QString dir = QString::null, - QString name = QString::null, - QString subtype = QString::null) = 0; + virtual CreatedFile createNewFile(TQString ext = TQString::null, + TQString dir = TQString::null, + TQString name = TQString::null, + TQString subtype = TQString::null) = 0; }; diff --git a/lib/interfaces/extensions/kdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp index 148c8f8c..745703e4 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.cpp +++ b/lib/interfaces/extensions/kdevdifffrontend.cpp @@ -21,7 +21,7 @@ #include "kdevdifffrontend.h" -KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, QObject *parent, const char *name) +KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") { } diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h index 34dfd50e..ecf360ad 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.h +++ b/lib/interfaces/extensions/kdevdifffrontend.h @@ -58,12 +58,12 @@ public: @param parent The parent 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, QObject *parent=0, const char *name=0 ) + KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {} /**Displays the patch. @param diff A string which contains a patch in unified format.*/ - virtual void showDiff( const QString& diff ) = 0; + virtual void showDiff( const TQString& diff ) = 0; /**Displays a patch file. @param url An url of the patch file.*/ diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h index 3279cfc6..96749bd2 100644 --- a/lib/interfaces/extensions/kdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -26,7 +26,7 @@ #ifndef KDEVMAKEFRONTEND_H #define KDEVMAKEFRONTEND_H -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdevplugin.h> /** @@ -65,11 +65,11 @@ public: @param parent The parent 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, QObject *parent=0, const char *name=0 ) + KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {} /**@return The widget where the make output is shown.*/ - virtual QWidget* widget() { return 0L; } + virtual TQWidget* widget() { return 0L; } /**The component shall start to execute a make-like command. * Commands are always asynchronous. You can submit several jobs @@ -83,7 +83,7 @@ public: * messages. * @param command A shell command to execute. */ - virtual void queueCommand(const QString &dir, const QString &command) = 0; + virtual void queueCommand(const TQString &dir, const TQString &command) = 0; /**@return Whether the application is currently running.*/ virtual bool isRunning() = 0; @@ -95,12 +95,12 @@ signals: /** * Only emitted if the command was succesfully finished. */ - void commandFinished(const QString &command); + void commandFinished(const TQString &command); /** * Emitted if a command failed. */ - void commandFailed(const QString &command); + void commandFailed(const TQString &command); }; #endif diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h index 63fdd34b..09c7bb1b 100644 --- a/lib/interfaces/extensions/kdevquickopen.h +++ b/lib/interfaces/extensions/kdevquickopen.h @@ -54,7 +54,7 @@ public: @param parent The parent 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, QObject* parent, const char* name) + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. @@ -119,7 +119,7 @@ public: @param parent The parent 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, QObject* parent, const char* name) + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h index d15dfbae..5ca33079 100644 --- a/lib/interfaces/extensions/kdevsourceformatter.h +++ b/lib/interfaces/extensions/kdevsourceformatter.h @@ -54,16 +54,16 @@ public: @param parent The parent 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, QObject* parent, const char* name) + KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name) :KDevPlugin(info, parent, name) {} /**Formats the source. @param text A string with a code. @return The formatted string.*/ - virtual QString formatSource(const QString text) = 0; + virtual TQString formatSource(const TQString text) = 0; /**@return The indentation string. For example, tab or four spaces can be returned.*/ - virtual QString indentString() const = 0; + virtual TQString indentString() const = 0; }; #endif diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index 697b5167..9b0571b8 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -23,11 +23,11 @@ #ifndef KDEVVERSIONCONTROL_H #define KDEVVERSIONCONTROL_H -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qmap.h> -#include <qvaluelist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqmap.h> +#include <tqvaluelist.h> #include <kdevplugin.h> @@ -65,26 +65,26 @@ struct VCSFileInfo @param workRev The current working revision of a file. @param repoRev The last revision of a file in the repository. @param aState The state of a file.*/ - VCSFileInfo( QString fn, QString workRev, QString repoRev, FileState aState ) + VCSFileInfo( TQString fn, TQString workRev, TQString repoRev, FileState aState ) : fileName(fn), workRevision(workRev), repoRevision(repoRev), state(aState) {} /**The file name.*/ - QString fileName; // Yeah, _just_ the file name ;-) + TQString fileName; // Yeah, _just_ the file name ;-) /**The working revision number.*/ - QString workRevision; + TQString workRevision; /**The repository revision number.*/ - QString repoRevision; + TQString repoRevision; /**The state of a file.*/ FileState state; /**@return A descriptive string with all VCS related info about the file.*/ - QString toString() const + TQString toString() const { return "(" + fileName + ", " + workRevision + ", " + repoRevision + ", " + state2String( state ) + ")"; } /**@return A textual VCS state description.*/ - static QString state2String( FileState state ) + static TQString state2String( FileState state ) { switch (state) { @@ -108,9 +108,9 @@ struct VCSFileInfo /**@class FileDom Info for a bunch of files that got modified. -This is a type definition: @code QMap<QString,VCSFileInfo> VCSFileInfoMap; @endcode +This is a type definition: @code TQMap<TQString,VCSFileInfo> VCSFileInfoMap; @endcode */ -typedef QMap<QString,VCSFileInfo> VCSFileInfoMap; +typedef TQMap<TQString,VCSFileInfo> VCSFileInfoMap; class KDevVCSFileInfoProvider; @@ -146,14 +146,14 @@ public: @param parent The parent 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, QObject *parent, const char *name ) + KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name ) :KDevPlugin(info, parent, 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. @param dir The absolute path to the directory where VCS infrastructure should be created.*/ - virtual void createNewProject(const QString& dir) = 0; + virtual void createNewProject(const TQString& dir) = 0; /**Fetches a module from remote repository, so it can be used for importing. @return true in case of success.*/ @@ -167,14 +167,14 @@ public: @param dirPath The absolute path of the directory. @return true if the directory is valid for this version control <b>warning</b>: this returns false by default.*/ - virtual bool isValidDirectory(const QString &dirPath) const = 0; + virtual bool isValidDirectory(const TQString &dirPath) const = 0; signals: /**Emitted when the Version Control has finished importing a module from remote repository @param destinationDir The directory where the module has been fetched.*/ - void finishedFetching(QString destinationDir); + void finishedFetching(TQString destinationDir); }; @@ -189,7 +189,7 @@ public: @param parent The parent VCS plugin. @param name The name of a provider object.*/ KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name) - : QObject( parent, name ), m_owner(parent) {} + : TQObject( parent, name ), m_owner(parent) {} /**Gets the status for local files in the specified directory: the info are collected locally so they are necessarily in sync with the repository @@ -197,7 +197,7 @@ public: 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.*/ - virtual const VCSFileInfoMap *status(const QString &dirPath) = 0; + virtual const VCSFileInfoMap *status(const TQString &dirPath) = 0; /**Starts a request for directory status to the remote repository. Requests and answers are asynchronous. @@ -212,7 +212,7 @@ public: @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 QString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0; + virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0; signals: /**Emitted when the status request to remote repository has finished. diff --git a/lib/interfaces/external/designer.cpp b/lib/interfaces/external/designer.cpp index c66fbe31..606fd2b4 100644 --- a/lib/interfaces/external/designer.cpp +++ b/lib/interfaces/external/designer.cpp @@ -20,7 +20,7 @@ namespace KInterfaceDesigner{ -Designer::Designer(QObject *parent, const char *name) +Designer::Designer(TQObject *parent, const char *name) :KParts::ReadWritePart(parent, name) { } diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index d0fdebd6..c254ab07 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -39,13 +39,13 @@ enum FunctionType { /**Function.*/ struct Function{ /**Return type.*/ - QString returnType; + TQString returnType; /**Function name.*/ - QString function; + TQString function; /**Specifier, e.g. virtual, static, etc.*/ - QString specifier; + TQString specifier; /**Access, e.g. private, protected, public, etc.*/ - QString access; + TQString access; /**Function type.*/ FunctionType type; }; @@ -66,31 +66,31 @@ mimetype then it becomes automatically integrated into KDevelop IDE. class Designer: public KParts::ReadWritePart{ Q_OBJECT public: - Designer(QObject *parent, const char *name); + Designer(TQObject *parent, const char *name); /**Reimplement this to be able to open projects.*/ - virtual void openProject(const QString &projectFile) = 0; + virtual void openProject(const TQString &projectFile) = 0; /**Reimplement this return the type of this designer.*/ virtual DesignerType designerType() = 0; signals: /**Emit this signal when a function was added by a designer. For example, when a slot or a callback function was defined.*/ - void addedFunction(DesignerType type, const QString &formName, Function function); + void addedFunction(DesignerType type, const TQString &formName, Function function); /**Emit this signal when a function was removed by a designer.*/ - void removedFunction(DesignerType type, const QString &formName, Function function); + void removedFunction(DesignerType type, const TQString &formName, Function function); /**Emit this signal when a function signature was edited by a designer.*/ - void editedFunction(DesignerType type, const QString &formName, Function oldFunction, Function function); + void editedFunction(DesignerType type, const TQString &formName, Function oldFunction, Function function); /**Emit this signal when a designer wants to open the editor with function definition.*/ - void editFunction(DesignerType type, const QString &formName, const QString &functionName); + void editFunction(DesignerType type, const TQString &formName, const TQString &functionName); /**Emit this signal when a designer wants to open the editor for a form sources.*/ - void editSource(DesignerType type, const QString &formName); + void editSource(DesignerType type, const TQString &formName); /**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 QString &formName, int status); + void newStatus(const TQString &formName, int status); }; } diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp index 5d87eec7..d62130f9 100644 --- a/lib/interfaces/extras/kdevcompileroptions.cpp +++ b/lib/interfaces/extras/kdevcompileroptions.cpp @@ -1,6 +1,6 @@ #include "kdevcompileroptions.h" -KDevCompilerOptions::KDevCompilerOptions( QObject * parent, const char * name ) - :QObject(parent, name) +KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name ) + :TQObject(parent, name) { } diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h index 18e0fd2e..bac7e16e 100644 --- a/lib/interfaces/extras/kdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -26,7 +26,7 @@ The interface to compiler options configuration. #ifndef _KDEVCOMPILEROPTIONS_H_ #define _KDEVCOMPILEROPTIONS_H_ -#include <qobject.h> +#include <tqobject.h> /** The interface to compiler options configuration. @@ -34,22 +34,22 @@ Used by build systems to give users a compiler options configuration dialog. Common use case: @code -static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) return 0; - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) return 0; - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(parent, service->name().latin1(), + TQObject *obj = factory->create(parent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) @@ -61,7 +61,7 @@ static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject ... KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent); -QString flags = ""; //old compiler flags +TQString flags = ""; //old compiler flags if ( plugin ) { flags = plugin->exec( parent, flags ); //new compiler flags are returned @@ -74,7 +74,7 @@ class KDevCompilerOptions : public QObject Q_OBJECT public: - KDevCompilerOptions( QObject *parent=0, const char *name=0 ); + KDevCompilerOptions( TQObject *parent=0, const char *name=0 ); /** * Opens a dialog which allows the user to configure the @@ -82,9 +82,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, - * QString::null is returned. + * TQString::null is returned. */ - virtual QString exec(QWidget *parent, const QString &flags) = 0; + virtual TQString exec(TQWidget *parent, const TQString &flags) = 0; }; #endif diff --git a/lib/interfaces/extras/kdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp index 88dce474..5a6ab429 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.cpp +++ b/lib/interfaces/extras/kdevvcsintegrator.cpp @@ -18,8 +18,8 @@ */ #include "kdevvcsintegrator.h" -KDevVCSIntegrator::KDevVCSIntegrator(QObject *parent, const char *name) - :QObject(parent, name) +KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name) + :TQObject(parent, name) { } diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h index 62928cae..0efc71b5 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -19,7 +19,7 @@ #ifndef KDEVVCSINTEGRATOR_H #define KDEVVCSINTEGRATOR_H -#include <qobject.h> +#include <tqobject.h> /** @file kdevvcsintegrator.h @@ -34,11 +34,11 @@ VCS Integration Dialog. Usually it is created as: @code -class MyVCSDialog: public QWidget, public VCSDialog { - MyVCSDialog(QWidget *parent = 0, const char *name = 0); +class MyVCSDialog: public TQWidget, public VCSDialog { + MyVCSDialog(TQWidget *parent = 0, const char *name = 0); virtual void accept() { ... } - virtual void init(const QString &projectName, const QString &projectLocation) { ... } - virtual QWidget *self() { + virtual void init(const TQString &projectName, const TQString &projectLocation) { ... } + virtual TQWidget *self() { return const_cast<MyVCSDialog*>(this); } } @@ -47,14 +47,14 @@ class MyVCSDialog: public QWidget, public VCSDialog { class VCSDialog { public: VCSDialog() { } - /**Implement all integration actions here. Do not use QDialog::accept method + /**Implement all integration actions here. Do not use TQDialog::accept method to perform integration actions.*/ virtual void accept() = 0; /**Init integration dialog with the project name and location.*/ - virtual void init(const QString &projectName, const QString &projectLocation) = 0; + 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.*/ - virtual QWidget *self() = 0; + virtual TQWidget *self() = 0; }; /** @@ -62,15 +62,15 @@ The interface to VCS integrators. VCS integrator takes care about setting up VCS for new and existing projects. It can, for example, perform checkout or import operations. */ -class KDevVCSIntegrator: public QObject { +class KDevVCSIntegrator: public TQObject { Q_OBJECT public: - KDevVCSIntegrator(QObject *parent = 0, const char *name = 0); + KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); /**Reimplement to return a dialog to fetch the project from VCS.*/ - virtual VCSDialog *fetcher(QWidget *parent) = 0; + virtual VCSDialog *fetcher(TQWidget *parent) = 0; /**Reimplement to return a dialog to integrate the project into VCS.*/ - virtual VCSDialog *integrator(QWidget *parent) = 0; + virtual VCSDialog *integrator(TQWidget *parent) = 0; }; #endif diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp index 38fdf4a9..aae068a3 100644 --- a/lib/interfaces/hashedstring.cpp +++ b/lib/interfaces/hashedstring.cpp @@ -24,9 +24,9 @@ //It needs to be measured whether this flag should be turned on or off. It seems just to move the complexity from one position to the other, without any variant being really better. #define USE_HASHMAP -size_t fastHashString( const QString& str ); +size_t fastHashString( const TQString& str ); -size_t hashStringSafe( const QString& str ) { +size_t hashStringSafe( const TQString& str ) { size_t hash = 0; int len = str.length(); for( int a = 0; a < len; a++ ) { @@ -35,17 +35,17 @@ size_t hashStringSafe( const QString& str ) { return hash; } -size_t HashedString::hashString( const QString& str ) +size_t HashedString::hashString( const TQString& str ) { return fastHashString( str ); } -size_t fastHashString( const QString& str ) { +size_t fastHashString( const TQString& str ) { size_t hash = 0; if( !str.isEmpty() ) { - const QChar* curr = str.unicode(); - const QChar* end = curr + str.length(); - QChar c; + const TQChar* curr = str.unicode(); + const TQChar* end = curr + str.length(); + TQChar c; for(; curr < end ;) { c = *curr; hash = c.unicode() + ( hash * 17 ); @@ -233,7 +233,7 @@ size_t HashedStringSet::hash() const { return m_data->m_hash; } -void HashedStringSet::read( QDataStream& stream ) { +void HashedStringSet::read( TQDataStream& stream ) { bool b; stream >> b; if( b ) { @@ -250,7 +250,7 @@ void HashedStringSet::read( QDataStream& stream ) { } } -void HashedStringSet::write( QDataStream& stream ) const { +void HashedStringSet::write( TQDataStream& stream ) const { bool b = m_data; stream << b; if( b ) { @@ -272,13 +272,13 @@ std::string HashedStringSet::print() const { return s.str(); } -QDataStream& operator << ( QDataStream& stream, const HashedString& str ) { +TQDataStream& operator << ( TQDataStream& stream, const HashedString& str ) { stream << str.m_str; stream << str.m_hash; return stream; } -QDataStream& operator >> ( QDataStream& stream, HashedString& str ) { +TQDataStream& operator >> ( TQDataStream& stream, HashedString& str ) { stream >> str.m_str; stream >> str.m_hash; return stream; diff --git a/lib/interfaces/hashedstring.h b/lib/interfaces/hashedstring.h index e62ab2e3..ac0d2e67 100644 --- a/lib/interfaces/hashedstring.h +++ b/lib/interfaces/hashedstring.h @@ -15,8 +15,8 @@ #ifndef HASHED_STRING_H #define HASHED_STRING_H -#include<qstring.h> -#include<qdatastream.h> +#include<tqstring.h> +#include<tqdatastream.h> #include<ksharedptr.h> #include<set> #include <ext/hash_map> @@ -27,7 +27,7 @@ class HashedString { public: HashedString() : m_hash( 0 ) {} - HashedString( const QString& str ) : m_str( str ) { + HashedString( const TQString& str ) : m_str( str ) { initHash(); } @@ -39,7 +39,7 @@ class HashedString { return m_hash; } - QString str() const { + TQString str() const { return m_str; } @@ -58,21 +58,21 @@ class HashedString { return false; } - static size_t hashString( const QString& str ); + static size_t hashString( const TQString& str ); private: void initHash(); - QString m_str; + TQString m_str; size_t m_hash; - friend QDataStream& operator << ( QDataStream& stream, const HashedString& str ); - friend QDataStream& operator >> ( QDataStream& stream, HashedString& str ); + friend TQDataStream& operator << ( TQDataStream& stream, const HashedString& str ); + friend TQDataStream& operator >> ( TQDataStream& stream, HashedString& str ); }; -QDataStream& operator << ( QDataStream& stream, const HashedString& str ); +TQDataStream& operator << ( TQDataStream& stream, const HashedString& str ); -QDataStream& operator >> ( QDataStream& stream, HashedString& str ); +TQDataStream& operator >> ( TQDataStream& stream, HashedString& str ); class HashedStringSetData; class HashedStringSetGroup; @@ -107,8 +107,8 @@ class HashedStringSet { bool operator == ( const HashedStringSet& rhs ) const; - void read( QDataStream& stream ); - void write( QDataStream& stream ) const; + void read( TQDataStream& stream ); + void write( TQDataStream& stream ) const; std::string print() const; diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp index b39fdb4f..fa2b0c3d 100644 --- a/lib/interfaces/katedocumentmanagerinterface.cpp +++ b/lib/interfaces/katedocumentmanagerinterface.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> KateDocumentManagerInterface::KateDocumentManagerInterface( KDevPartController *pc) - : QObject(pc), DCOPObject("KateDocumentManager"), m_controller(pc) + : TQObject(pc), DCOPObject("KateDocumentManager"), m_controller(pc) { } @@ -49,11 +49,11 @@ DCOPRef KateDocumentManagerInterface::document( uint n ) DCOPRef KateDocumentManagerInterface::documentWithID( uint id ) { - QString dcopobj = "KateDocument#" + QString::number(id); + TQString dcopobj = "KateDocument#" + TQString::number(id); return DCOPRef(kapp->dcopClient()->appId(), dcopobj.latin1() ); } -DCOPRef KateDocumentManagerInterface::openURL( const KURL &url, const QString &encoding ) +DCOPRef KateDocumentManagerInterface::openURL( const KURL &url, const TQString &encoding ) { m_controller->editDocument(url); m_controller->setEncoding(encoding); diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h index 41c1bd60..f4264d2e 100644 --- a/lib/interfaces/katedocumentmanagerinterface.h +++ b/lib/interfaces/katedocumentmanagerinterface.h @@ -19,7 +19,7 @@ #ifndef KATEDOCUMENTMANAGERINTERFACE_H #define KATEDOCUMENTMANAGERINTERFACE_H -#include <qobject.h> +#include <tqobject.h> #include <dcopobject.h> #include <dcopref.h> #include <kurl.h> @@ -30,7 +30,7 @@ This is an emulated interface to provide compatibility with Kate scripts. @author KDevelop Authors */ -class KateDocumentManagerInterface : public QObject, public DCOPObject { +class KateDocumentManagerInterface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -43,7 +43,7 @@ k_dcop: DCOPRef activeDocument(); DCOPRef document( uint n ); DCOPRef documentWithID( uint id ); - DCOPRef openURL( const KURL &url, const QString &encoding ); + DCOPRef openURL( const KURL &url, const TQString &encoding ); bool closeAllDocuments(); bool closeDocument( uint n ); bool isOpen( const KURL &url ); diff --git a/lib/interfaces/kdevapi.cpp b/lib/interfaces/kdevapi.cpp index d4dd1749..04cf078d 100644 --- a/lib/interfaces/kdevapi.cpp +++ b/lib/interfaces/kdevapi.cpp @@ -33,7 +33,7 @@ public: m_codeRepository(0) {} - QDomDocument *m_projectDom; + TQDomDocument *m_projectDom; KDevProject *m_project; KDevLanguageSupport *m_languageSupport; KDevCodeRepository* m_codeRepository; @@ -75,12 +75,12 @@ void KDevApi::setLanguageSupport(KDevLanguageSupport *languageSupport) d->m_languageSupport = languageSupport; } -QDomDocument *KDevApi::projectDom() const +TQDomDocument *KDevApi::projectDom() const { return d->m_projectDom; } -void KDevApi::setProjectDom(QDomDocument *dom) +void KDevApi::setProjectDom(TQDomDocument *dom) { d->m_projectDom = dom; } diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/kdevapi.h index c1101b17..84337183 100644 --- a/lib/interfaces/kdevapi.h +++ b/lib/interfaces/kdevapi.h @@ -20,7 +20,7 @@ #ifndef KDEVAPI_H #define KDEVAPI_H -#include <qobject.h> +#include <tqobject.h> class QStringList; class QDomDocument; @@ -71,11 +71,11 @@ public: virtual CodeModel *codeModel() const = 0; /**@return A reference to the DOM tree that represents the project file or 0 if no project is loaded.*/ - QDomDocument *projectDom() const; + TQDomDocument *projectDom() const; /**Sets the Document Object Model for the current project. @param dom The project DOM.*/ - void setProjectDom(QDomDocument *dom); + void setProjectDom(TQDomDocument *dom); /**@return A reference to the current project component or 0 if no project is loaded.*/ KDevProject *project() const; diff --git a/lib/interfaces/kdevcoderepository.cpp b/lib/interfaces/kdevcoderepository.cpp index 76f7d0e7..26249544 100644 --- a/lib/interfaces/kdevcoderepository.cpp +++ b/lib/interfaces/kdevcoderepository.cpp @@ -21,7 +21,7 @@ struct KDevCodeRepositoryData { Catalog* mainCatalog; - QValueList<Catalog*> catalogs; + TQValueList<Catalog*> catalogs; KDevCodeRepositoryData(): mainCatalog( 0 ) {} }; @@ -63,7 +63,7 @@ void KDevCodeRepository::touchCatalog( Catalog * catalog ) emit catalogChanged( catalog ); } -QValueList< Catalog * > KDevCodeRepository::registeredCatalogs( ) +TQValueList< Catalog * > KDevCodeRepository::registeredCatalogs( ) { return d->catalogs; } diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/kdevcoderepository.h index 8513e00e..8b862f6b 100644 --- a/lib/interfaces/kdevcoderepository.h +++ b/lib/interfaces/kdevcoderepository.h @@ -19,8 +19,8 @@ #ifndef KDEVCODEREPOSITORY_H #define KDEVCODEREPOSITORY_H -#include <qobject.h> -#include <qvaluelist.h> +#include <tqobject.h> +#include <tqvaluelist.h> /** @file kdevcoderepository.h @@ -62,7 +62,7 @@ public: void setMainCatalog( Catalog* mainCatalog ); /**@return The list of registered catalogs.*/ - QValueList<Catalog*> registeredCatalogs(); + TQValueList<Catalog*> registeredCatalogs(); /**Registers catalog in the repository. @param catalog The catalog to register.*/ diff --git a/lib/interfaces/kdevcore.cpp b/lib/interfaces/kdevcore.cpp index 6a7e5c01..dda66cbf 100644 --- a/lib/interfaces/kdevcore.cpp +++ b/lib/interfaces/kdevcore.cpp @@ -50,8 +50,8 @@ bool Context::hasType( int aType ) const class EditorContext::Private { public: - Private( const KURL &url, int line, int col, const QString &linestr, - const QString &wordstr ) + Private( const KURL &url, int line, int col, const TQString &linestr, + const TQString &wordstr ) : m_url(url), m_line(line), m_col(col), m_linestr(linestr), m_wordstr(wordstr) { @@ -59,11 +59,11 @@ public: KURL m_url; int m_line, m_col; - QString m_linestr, m_wordstr; + TQString m_linestr, m_wordstr; }; EditorContext::EditorContext( const KURL &url, int line, int col, - const QString &linestr, const QString &wordstr ) + const TQString &linestr, const TQString &wordstr ) : Context(), d( new Private(url, line, col, linestr, wordstr) ) { } @@ -94,12 +94,12 @@ int EditorContext::col() const return d->m_col; } -QString EditorContext::currentLine() const +TQString EditorContext::currentLine() const { return d->m_linestr; } -QString EditorContext::currentWord() const +TQString EditorContext::currentWord() const { return d->m_wordstr; } @@ -124,7 +124,7 @@ public: m_isDirectory = URLUtil::isDirectory( m_urls[0] ); } } - Private( const QString &fileName, bool isDirectory ) + Private( const TQString &fileName, bool isDirectory ) : m_fileName(fileName), m_isDirectory(isDirectory) { } @@ -132,7 +132,7 @@ public: KURL::List m_urls; /// \FIXME the following data members should be removed, but first other // parts should be modified to comply with this change. - QString m_fileName; + TQString m_fileName; bool m_isDirectory; }; @@ -164,16 +164,16 @@ const KURL::List &FileContext::urls() const class DocumentationContext::Private { public: - Private( const QString &url, const QString &selection ) + Private( const TQString &url, const TQString &selection ) : m_url(url), m_selection(selection) { } - QString m_url; - QString m_selection; + TQString m_url; + TQString m_selection; }; -DocumentationContext::DocumentationContext( const QString &url, const QString &selection ) +DocumentationContext::DocumentationContext( const TQString &url, const TQString &selection ) : Context(), d( new Private(url, selection) ) { } @@ -204,12 +204,12 @@ int DocumentationContext::type() const return Context::DocumentationContext; } -QString DocumentationContext::url() const +TQString DocumentationContext::url() const { return d->m_url; } -QString DocumentationContext::selection() const +TQString DocumentationContext::selection() const { return d->m_selection; } @@ -285,8 +285,8 @@ const ProjectModelItem* ProjectModelItemContext::item() const // class KDevCore /////////////////////////////////////////////////////////////////////////////// -KDevCore::KDevCore( QObject *parent, const char *name ) - : QObject( parent, name ) +KDevCore::KDevCore( TQObject *parent, const char *name ) + : TQObject( parent, name ) { new KDevCoreIface(this); } diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index a196392f..456e5e39 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -33,9 +33,9 @@ The interface to the application core and context menu classes. */ -#include <qstringlist.h> -#include <qdict.h> -#include <qobject.h> +#include <tqstringlist.h> +#include <tqdict.h> +#include <tqobject.h> #include <kurl.h> @@ -70,23 +70,23 @@ add "commit" and "update" menu items to the context menu of a file. -# Fill a context menu: @code core()->fillContextMenu(&menu, &context); @endcode -# Show the popup menu: @code menu.exec(event->globalPos()); @endcode . -In this example @em event is an object of QContextMenuEvent class which you have access -to if you reimplement QWidget::contextMenuEvent method. +In this example @em event is an object of TQContextMenuEvent class which you have access +to if you reimplement TQWidget::contextMenuEvent method. <b>How to fill context menu from a plugin:</b> --# Create a @code contextMenu(QPopupMenu *, const Context *) @endcode slot in your plugin class. --# Connect KDevCore::contextMenu(QPopupMenu *, const Context *) signal to that slot in +-# Create a @code contextMenu(TQPopupMenu *, const Context *) @endcode slot in your plugin class. +-# Connect KDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in the constructor of your plugin:\n @code -connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); +connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); @endcode -# Fill the menu in the slot you created, for example:\n @code if (context->hasType(Context::EditorContext)) { const EditorContext *econtext = static_cast<const EditorContext*>(context); - int id = popup->insertItem(i18n("My Menu Item 1"), this, SLOT(myMenuAction1())); + int id = popup->insertItem(i18n("My Menu Item 1"), this, TQT_SLOT(myMenuAction1())); popup->setWhatsThis(id, i18n("What's this for my menu item 1")); } else if context->hasType(MyContext)) @@ -138,7 +138,7 @@ public: @param linestr The content of the line where the cursor is. @param wordstr The current word under the cursor.*/ EditorContext(const KURL &url, int line, int col, - const QString &linestr, const QString &wordstr); + const TQString &linestr, const TQString &wordstr); /**Destructor.*/ virtual ~EditorContext(); @@ -154,13 +154,13 @@ public: /**@return The column number for the cursor position.*/ int col() const; - /**@return A QString with the content of the line which this context was + /**@return A TQString with the content of the line which this context was invoked for.*/ - QString currentLine() const; + TQString currentLine() const; - /**@return A QString containing the word near to the cursor when this + /**@return A TQString containing the word near to the cursor when this context object was created.*/ - QString currentWord() const; + TQString currentWord() const; private: class Private; @@ -181,7 +181,7 @@ public: /**Builds a DocumentationContext. @param url The URL that the context will be for. @param selection Selected text.*/ - DocumentationContext(const QString &url, const QString &selection ); + DocumentationContext(const TQString &url, const TQString &selection ); /**Copy constructor.*/ DocumentationContext(const DocumentationContext &); @@ -193,10 +193,10 @@ public: virtual int type() const; /**@return The url of the document this context was invoked for.*/ - QString url() const; + TQString url() const; /**@return The selected text in the document.*/ - QString selection() const; + TQString selection() const; private: class Private; @@ -302,9 +302,9 @@ class KDevCore: public QObject Q_OBJECT public: /**Constructor - @param parent The QObject that's the parent of this class. + @param parent The TQObject that's the parent of this class. @param name The name of the class.*/ - KDevCore(QObject *parent=0, const char *name=0); + KDevCore(TQObject *parent=0, const char *name=0); /**Destructor.*/ virtual ~KDevCore(); @@ -319,7 +319,7 @@ public: @sa Context for a detailed explanation of context menu initializations and usage. @param popup The popup menu to fill. @param context The pointer to a Context object of this popup menu.*/ - virtual void fillContextMenu(QPopupMenu *popup, const Context *context) = 0; + virtual void fillContextMenu(TQPopupMenu *popup, const Context *context) = 0; /**Closes the current project and open the new one. You cannot use the @ref KDevPlugin::project() * method right after opening a new project, as it will return a null pointer. @@ -327,7 +327,7 @@ public: *to do the job needed after the project is opened or connect a slot to the *@ref projectOpened signal. * @param projectFileName The file name of the project to open.*/ - virtual void openProject(const QString& projectFileName) = 0; + virtual void openProject(const TQString& projectFileName) = 0; /**Marks the component as running (or not running). As long as at least one component is running, the stop button is enabled. When it is pressed, @@ -365,7 +365,7 @@ signals: @sa Context for a detailed explanation of context menu initializations and usage. @param popupMenu The popup menu to fill. @param context The Context of this popup menu.*/ - void contextMenu(QPopupMenu *popupMenu, const Context *context); + void contextMenu(TQPopupMenu *popupMenu, const Context *context); /**Expects that a configuration page for use in the KDevelop settings dialog is created by the component. diff --git a/lib/interfaces/kdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp index 365e6848..0ba325ab 100644 --- a/lib/interfaces/kdevdesignerintegration.cpp +++ b/lib/interfaces/kdevdesignerintegration.cpp @@ -24,8 +24,8 @@ public: KDevDesignerIntegrationIface *m_iface; }; -KDevDesignerIntegration::KDevDesignerIntegration(QObject *parent, const char *name) - : QObject(parent, name) +KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name) + : TQObject(parent, name) { dptr = new KDevDesignerIntegrationPrivate(); diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h index cb20fc04..c1604a4a 100644 --- a/lib/interfaces/kdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -20,8 +20,8 @@ #define KDEVDESIGNERINTEGRATION_H #include <designer.h> -#include <qobject.h> -#include <qdom.h> +#include <tqobject.h> +#include <tqdom.h> /** @file kdevdesignerintegration.h @@ -55,40 +55,40 @@ public: /**Constructor. @param parent Parent object. @param name Internal name.*/ - KDevDesignerIntegration(QObject *parent = 0, const char *name = 0); + KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0); /**Destructor.*/ ~KDevDesignerIntegration(); /**Saves designer integration settings.*/ - virtual void saveSettings(QDomDocument dom, QString path) = 0; + virtual void saveSettings(TQDomDocument dom, TQString path) = 0; /**Loads designer integration settings.*/ - virtual void loadSettings(QDomDocument dom, QString path) = 0; + virtual void loadSettings(TQDomDocument dom, TQString path) = 0; public slots: /**Adds the implementation for a function. @param formName The name of a GUI form. @param function The function which needs to be implemented in the source.*/ - virtual void addFunction(const QString &formName, KInterfaceDesigner::Function function) = 0; + virtual void addFunction(const TQString &formName, KInterfaceDesigner::Function function) = 0; /**Removes the implementation of a function. @param formName The name of a GUI form. @param function The function which needs to be removed from the source.*/ - virtual void removeFunction(const QString &formName, KInterfaceDesigner::Function function) = 0; + virtual void removeFunction(const TQString &formName, KInterfaceDesigner::Function function) = 0; /**Edites the implementation of a function. @param formName The name of a GUI form. @param oldFunction The function which needs to be edited from the source. @param function The new function declaration.*/ - virtual void editFunction(const QString &formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function) = 0; + virtual void editFunction(const TQString &formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function) = 0; /**Opens the function and jumps to the line number of its definition (declaration). @param formName The name of a GUI form. @param functionName The name of a function to find in the source.*/ - virtual void openFunction(const QString &formName, const QString &functionName) = 0; + virtual void openFunction(const TQString &formName, const TQString &functionName) = 0; /**Opens the form source. @param formName The name of a GUI form.*/ - virtual void openSource(const QString &formName) = 0; + virtual void openSource(const TQString &formName) = 0; private: class KDevDesignerIntegrationPrivate; KDevDesignerIntegrationPrivate *dptr; diff --git a/lib/interfaces/kdevdesignerintegrationiface.cpp b/lib/interfaces/kdevdesignerintegrationiface.cpp index 3ffc0c27..964ca340 100644 --- a/lib/interfaces/kdevdesignerintegrationiface.cpp +++ b/lib/interfaces/kdevdesignerintegrationiface.cpp @@ -31,31 +31,31 @@ KDevDesignerIntegrationIface::~KDevDesignerIntegrationIface() { } -void KDevDesignerIntegrationIface::addFunction( const QString & formName, QString returnType, QString function, QString specifier, QString access, uint type ) +void KDevDesignerIntegrationIface::addFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function f = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->addFunction(formName, f); } -void KDevDesignerIntegrationIface::removeFunction( const QString & formName, QString returnType, QString function, QString specifier, QString access, uint type ) +void KDevDesignerIntegrationIface::removeFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function f = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->addFunction(formName, f); } -void KDevDesignerIntegrationIface::editFunction( const QString & formName, QString oldReturnType, QString oldFunction, QString oldSpecifier, QString oldAccess, uint oldType, QString returnType, QString function, QString specifier, QString access, uint type ) +void KDevDesignerIntegrationIface::editFunction( const TQString & formName, TQString oldReturnType, TQString oldFunction, TQString oldSpecifier, TQString oldAccess, uint oldType, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function fold = {oldReturnType, oldFunction, oldSpecifier, oldAccess, (KInterfaceDesigner::FunctionType)oldType }; KInterfaceDesigner::Function fnew = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->editFunction(formName,fold,fnew); } -void KDevDesignerIntegrationIface::openFunction( const QString & formName, const QString & functionName ) +void KDevDesignerIntegrationIface::openFunction( const TQString & formName, const TQString & functionName ) { m_designer->openFunction(formName,functionName); } -void KDevDesignerIntegrationIface::openSource( const QString & formName ) +void KDevDesignerIntegrationIface::openSource( const TQString & formName ) { m_designer->openSource(formName); } diff --git a/lib/interfaces/kdevdesignerintegrationiface.h b/lib/interfaces/kdevdesignerintegrationiface.h index f6de264e..c6c8988a 100644 --- a/lib/interfaces/kdevdesignerintegrationiface.h +++ b/lib/interfaces/kdevdesignerintegrationiface.h @@ -34,13 +34,13 @@ public: ~KDevDesignerIntegrationIface(); k_dcop: - void addFunction(const QString &formName, QString returnType, QString function,QString specifier,QString access,uint type); - void removeFunction(const QString &formName, QString returnType, QString function,QString specifier,QString access,uint type); - void editFunction(const QString &formName, QString oldReturnType, QString oldFunction, - QString oldSpecifier,QString oldAccess,uint oldType, - QString returnType, QString function,QString specifier,QString access,uint type); - void openFunction(const QString &formName, const QString &functionName); - void openSource(const QString &formName); + void addFunction(const TQString &formName, TQString returnType, TQString function,TQString specifier,TQString access,uint type); + void removeFunction(const TQString &formName, TQString returnType, TQString function,TQString specifier,TQString access,uint type); + void editFunction(const TQString &formName, TQString oldReturnType, TQString oldFunction, + TQString oldSpecifier,TQString oldAccess,uint oldType, + TQString returnType, TQString function,TQString specifier,TQString access,uint type); + void openFunction(const TQString &formName, const TQString &functionName); + void openSource(const TQString &formName); private: KDevDesignerIntegration *m_designer; diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h index e5dfa25a..f928d815 100644 --- a/lib/interfaces/kdevgenericfactory.h +++ b/lib/interfaces/kdevgenericfactory.h @@ -51,7 +51,7 @@ static const KDevPluginInfo data("KDevDummyPlugin"); typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory; K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) -DummyPlugin::DummyPlugin(QObject *parent, const char *name, const QStringList & ) +DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & ) :KDevPlugin(&data, parent, name) { } @@ -61,7 +61,7 @@ In the example above the duplication of information is avoided as same @ref KDev objects are used for plugin and for plugin factory. This is possible because @ref KDevPluginInfo class has an operator to cast @ref KDevPluginInfo to @ref KAboutData. */ -template <class T, class ParentType = QObject> +template <class T, class ParentType = TQObject> class KDevGenericFactory: public KGenericFactory<T, ParentType> { public: diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp index ab171bb1..9b3cc40b 100644 --- a/lib/interfaces/kdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -29,7 +29,7 @@ #include "kdevdesignerintegration.h" #include "kdevlanguagesupport.h" -KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, QObject *parent, const char *name) +KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" ) { } @@ -48,17 +48,17 @@ KMimeType::List KDevLanguageSupport::mimeTypes() return KMimeType::List(); } -QString KDevLanguageSupport::formatTag( const Tag& /*tag*/ ) +TQString KDevLanguageSupport::formatTag( const Tag& /*tag*/ ) { - return QString::null; + return TQString::null; } -QString KDevLanguageSupport::formatClassName(const QString &name) +TQString KDevLanguageSupport::formatClassName(const TQString &name) { return name; } -QString KDevLanguageSupport::unformatClassName(const QString &name) +TQString KDevLanguageSupport::unformatClassName(const TQString &name) { return name; } @@ -89,22 +89,22 @@ void KDevLanguageSupport::addAttribute( ClassDom /*klass*/ ) { } -QStringList KDevLanguageSupport::subclassWidget(const QString& /*formName*/) +TQStringList KDevLanguageSupport::subclassWidget(const TQString& /*formName*/) { - return QStringList(); + return TQStringList(); } -QStringList KDevLanguageSupport::updateWidget(const QString& /*formName*/, const QString& /*fileName*/) +TQStringList KDevLanguageSupport::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/) { - return QStringList(); + return TQStringList(); } -QString KDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ ) +TQString KDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ ) { return item->name(); } -void KDevLanguageSupport::addFunction( DesignerType type, const QString & formName, Function function ) +void KDevLanguageSupport::addFunction( DesignerType type, const TQString & formName, Function function ) { // kdDebug() << "KDevLanguageSupport::addFunction: 1" << endl; KDevDesignerIntegration *designerIntegration = designer(type); @@ -119,7 +119,7 @@ void KDevLanguageSupport::addFunction( DesignerType type, const QString & formNa // kdDebug() << "KDevLanguageSupport::addFunction: 4" << endl; } -void KDevLanguageSupport::editFunction( DesignerType type, const QString & formName, Function oldFunction, Function function ) +void KDevLanguageSupport::editFunction( DesignerType type, const TQString & formName, Function oldFunction, Function function ) { KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) @@ -127,7 +127,7 @@ void KDevLanguageSupport::editFunction( DesignerType type, const QString & formN designerIntegration->editFunction(formName, oldFunction, function); } -void KDevLanguageSupport::removeFunction( DesignerType type, const QString & formName, Function function ) +void KDevLanguageSupport::removeFunction( DesignerType type, const TQString & formName, Function function ) { KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) @@ -141,7 +141,7 @@ KDevDesignerIntegration * KDevLanguageSupport::designer( DesignerType // type return 0; } -void KDevLanguageSupport::openFunction( DesignerType type, const QString & formName, const QString & functionName ) +void KDevLanguageSupport::openFunction( DesignerType type, const TQString & formName, const TQString & functionName ) { KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) @@ -155,7 +155,7 @@ void KDevLanguageSupport::createAccessMethods( ClassDom // theClass { } -void KDevLanguageSupport::openSource( DesignerType type, const QString & formName) +void KDevLanguageSupport::openSource( DesignerType type, const TQString & formName) { KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index d0de80e2..78694193 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -25,8 +25,8 @@ #ifndef KDEVLANGUAGESUPPORT_H #define KDEVLANGUAGESUPPORT_H -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kmimetype.h> #include "kdevplugin.h" #include "codemodel.h" @@ -93,7 +93,7 @@ public: @param parent The parent 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, QObject *parent, const char *name); + KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name); /**Destructor.*/ ~KDevLanguageSupport(); @@ -107,24 +107,24 @@ public: /**Formats a Tag as used by the persistent symbol store to the human-readable convention. @param tag Tag to format.*/ - virtual QString formatTag(const Tag& tag); + virtual TQString formatTag(const Tag& tag); /**Formats a CodeModelItem as used by the CodeModel to the human-readable convention. @param item Symbol to format. @param shortDescription Show short description of a symbol. For example, when formatting functions short description could be a function signature without the return type and argument default values.*/ - virtual QString formatModelItem(const CodeModelItem *item, bool shortDescription=false); + virtual TQString formatModelItem(const CodeModelItem *item, bool shortDescription=false); /**Formats a canonicalized class path as used by the symbol store to the human-readable convention. For example, the C++ support part formats the string "KParts.Part" into "KParts::Part". @param name Class name.*/ - virtual QString formatClassName(const QString &name); + virtual TQString formatClassName(const TQString &name); /**The opposite of @ref formatClassName. Reverts formatting. @param name Class name.*/ - virtual QString unformatClassName(const QString &name); + virtual TQString unformatClassName(const TQString &name); /**Determines whether the document should be opened in a split view. The language part can determine this internally and then set the active document @@ -168,7 +168,7 @@ public: and propmts to implement it's slots. @param formName The name of a form to subclass. @return A list of newly created files.*/ - virtual QStringList subclassWidget(const QString& formName); + virtual TQStringList subclassWidget(const TQString& formName); /**Opens an "Update Widget" dialog for given Qt .ui file (formName) and prompts to add missing slot implementations @@ -177,7 +177,7 @@ public: @param fileName The name of a file with a subclass. @return A list of updated files. Can be empty because usually no additional actions are required on updated files.*/ - virtual QStringList updateWidget(const QString& formName, const QString& fileName); + virtual TQStringList updateWidget(const TQString& formName, const TQString& fileName); /**Reimplement this method if you want to use integrated GUI designer for the language. Implementation could look like (in pseudo code): @@ -210,14 +210,14 @@ public slots: @param type The type of integrated designer. @param formName The name of a GUI form. @param function The function to implement (add).*/ - void addFunction(DesignerType type, const QString &formName, Function function); + void addFunction(DesignerType type, const TQString &formName, Function function); /**Removes a function requested by a GUI designer. No need to reimplement this slot unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form. @param function The function to remove.*/ - void removeFunction(DesignerType type, const QString &formName, Function function); + void removeFunction(DesignerType type, const TQString &formName, Function function); /**Edits a function requested by a GUI designer. No need to reimplement this slot unless you want to use specific implementation of KDevDesignerIntegration interface. @@ -225,33 +225,33 @@ public slots: @param formName The name of a GUI form. @param oldFunction The old function signature before editing. @param function The new function signature after editing.*/ - void editFunction(DesignerType type, const QString &formName, Function oldFunction, Function function); + void editFunction(DesignerType type, const TQString &formName, Function oldFunction, Function function); /**Opens a function requested by a GUI designer. No need to reimplement this slot unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form. @param functionName The name of a function to seek in the code for.*/ - void openFunction(DesignerType type, const QString &formName, const QString &functionName); + void openFunction(DesignerType type, const TQString &formName, const TQString &functionName); /**Opens a form source requested by a GUI designer. No need to reimplement this slot unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form.*/ - void openSource(DesignerType type, const QString &formName); + void openSource(DesignerType type, const TQString &formName); signals: /**Emitted when the content of the memory symbol store has been modified.*/ void updatedSourceInfo(); /**Emitted before removing the file from the memory symbol store.*/ - void aboutToRemoveSourceInfo(const QString& fileName); + void aboutToRemoveSourceInfo(const TQString& fileName); /**Emitted when a file has been removed from the memory symbol store.*/ - void removedSourceInfo(const QString& fileName); + void removedSourceInfo(const TQString& fileName); /**Emitted when a file has been added to the memory symbol store.*/ - void addedSourceInfo( const QString& fileName ); + void addedSourceInfo( const TQString& fileName ); /**Emitted when the language part changes the Split View orientation.*/ void splitOrientationChanged( Qt::Orientation orientation ); diff --git a/lib/interfaces/kdevmainwindow.h b/lib/interfaces/kdevmainwindow.h index 95200f16..7e3e8344 100644 --- a/lib/interfaces/kdevmainwindow.h +++ b/lib/interfaces/kdevmainwindow.h @@ -22,7 +22,7 @@ #ifndef KDEV_MAINWINDOW_H #define KDEV_MAINWINDOW_H -#include <qstring.h> +#include <tqstring.h> class QWidget; class KStatusBar; @@ -47,49 +47,49 @@ 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(QWidget *view, const QString &title, const QString& toolTip = QString::null) = 0; + virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString::null) = 0; /**Embeds a toolview at the left of the main window. @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 embedSelectView(QWidget *view, const QString &title, const QString &toolTip) = 0; + virtual void embedSelectView(TQWidget *view, const TQString &title, const TQString &toolTip) = 0; /**Embeds a toolview at the bottom of the main window. @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 embedOutputView(QWidget *view, const QString &title, const QString &toolTip) = 0; + virtual void embedOutputView(TQWidget *view, const TQString &title, const TQString &toolTip) = 0; /**Embeds a toolview at the right of the main window. @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 embedSelectViewRight(QWidget* view, const QString& title, const QString &toolTip) = 0; + virtual void embedSelectViewRight(TQWidget* view, const TQString& title, const TQString &toolTip) = 0; /**Removes a view from the main window. @param view The view to remove.*/ - virtual void removeView(QWidget *view) = 0; + virtual void removeView(TQWidget *view) = 0; /**Shows or hides a view. @param pView The view to show or hide. @param bEnabled true if view should be shown, false it it is not.*/ - virtual void setViewAvailable(QWidget *pView, bool bEnabled) = 0; + virtual void setViewAvailable(TQWidget *pView, bool bEnabled) = 0; /**Raises a view (shows it if it was minimized). @param view The view to be raised.*/ - virtual void raiseView(QWidget *view) = 0; + virtual void raiseView(TQWidget *view) = 0; /**Minimize a view. @param view The view to be lowered.*/ - virtual void lowerView(QWidget *view) = 0; + virtual void lowerView(TQWidget *view) = 0; /**Loads main window settings.*/ virtual void loadSettings() = 0; /**Sets the current document's caption, if applicable. @param caption the caption to set.*/ - virtual void setCurrentDocumentCaption( const QString &caption ) = 0; + virtual void setCurrentDocumentCaption( const TQString &caption ) = 0; /**@return KMainWindow object which actually represents the main window.*/ virtual KMainWindow *main() = 0; diff --git a/lib/interfaces/kdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp index 8ea95dae..58f1dc2a 100644 --- a/lib/interfaces/kdevpartcontroller.cpp +++ b/lib/interfaces/kdevpartcontroller.cpp @@ -20,7 +20,7 @@ #include "kdevpartcontroller.h" #include "katedocumentmanagerinterface.h" -KDevPartController::KDevPartController(QWidget *parent) +KDevPartController::KDevPartController(TQWidget *parent) : KParts::PartManager(parent) { new KDevPartControllerIface(this); diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index 3b024b45..be7084b9 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -60,12 +60,12 @@ class KDevPartController: public KParts::PartManager public: /**Constructor. @param parent The parent object.*/ - KDevPartController(QWidget *parent); + KDevPartController(TQWidget *parent); /**Call this before a call to @ref editDocument to set the encoding of the document to be opened. @param encoding The encoding to open as.*/ - virtual void setEncoding(const QString &encoding) = 0; + virtual void setEncoding(const TQString &encoding) = 0; /**Opens a new or existing document. @param url The URL of the document to open. @@ -96,7 +96,7 @@ public: @param part The part to embed. @param name The name of the part. @param shortDescription Currently not used.*/ - virtual void showPart(KParts::Part* part, const QString& name, const QString& shortDescription ) = 0; + virtual void showPart(KParts::Part* part, const TQString& name, const TQString& shortDescription ) = 0; /**Finds the embedded part corresponding to a given URL. @param url The URL of the document. @@ -106,7 +106,7 @@ public: /**Finds the embedded part corresponding to a given main widget @param widget The parts main widget. @return The corresponding part, 0 if not found.*/ - virtual KParts::Part *partForWidget(const QWidget *widget) = 0; + virtual KParts::Part *partForWidget(const TQWidget *widget) = 0; /**@return The list of open documents*/ virtual KURL::List openURLs() = 0; diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp index d110049f..5b4de199 100644 --- a/lib/interfaces/kdevplugin.cpp +++ b/lib/interfaces/kdevplugin.cpp @@ -36,8 +36,8 @@ #include <kglobal.h> #include <kiconloader.h> -#include <qdom.h> -#include <qmap.h> +#include <tqdom.h> +#include <tqmap.h> #include <assert.h> @@ -54,8 +54,8 @@ struct KDevPlugin::Private // class KDevPlugin /////////////////////////////////////////////////////////////////////////////// -KDevPlugin::KDevPlugin(const KDevPluginInfo *info, QObject *parent, const char *name) - :QObject(parent, name), d(new Private) +KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name) + :TQObject(parent, name), d(new Private) { assert(parent->inherits( "KDevApi" )); m_api = static_cast<KDevApi *>( parent ); @@ -91,7 +91,7 @@ CodeModel *KDevPlugin::codeModel() const return m_api->codeModel(); } -QDomDocument *KDevPlugin::projectDom() const +TQDomDocument *KDevPlugin::projectDom() const { return m_api->projectDom(); } @@ -111,12 +111,12 @@ KDevPluginController *KDevPlugin::pluginController() const return m_api->pluginController(); } -void KDevPlugin::restorePartialProjectSession(const QDomElement* /*el*/) +void KDevPlugin::restorePartialProjectSession(const TQDomElement* /*el*/) { // there's still nothing to do in the base class } -void KDevPlugin::savePartialProjectSession(QDomElement* /*el*/) +void KDevPlugin::savePartialProjectSession(TQDomElement* /*el*/) { // there's still nothing to do in the base class } @@ -126,7 +126,7 @@ KDevCodeRepository * KDevPlugin::codeRepository() const return m_api->codeRepository(); } -KDevPlugin * KDevPlugin::extension_internal(const QString &serviceType, const QString &constraint) +KDevPlugin * KDevPlugin::extension_internal(const TQString &serviceType, const TQString &constraint) { return m_api->pluginController()->extension(serviceType, constraint); } diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index 6e172358..609ac858 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -20,7 +20,7 @@ #ifndef KDEVPLUGIN_H #define KDEVPLUGIN_H -#include <qobject.h> +#include <tqobject.h> #include <kxmlguiclient.h> #include "kdevapi.h" @@ -104,7 +104,7 @@ and writing factories for plugins. @sa KDevCore class documentation for an information about features which are available to plugins from shell applications. */ -class KDevPlugin: public QObject, public KXMLGUIClient +class KDevPlugin: public TQObject, public KXMLGUIClient { Q_OBJECT @@ -118,7 +118,7 @@ public: @param parent The parent 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, QObject *parent, const char *name = 0); + KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0); /**Destructs a plugin.*/ virtual ~KDevPlugin(); @@ -144,7 +144,7 @@ public: CodeModel *codeModel() const; /**@return A reference to the DOM tree that represents the project file or 0 if no project is loaded.*/ - QDomDocument *projectDom() const; + TQDomDocument *projectDom() const; /**@return A reference to the part controller which is used to manipulate loaded KParts.*/ KDevPartController *partController() const; @@ -167,7 +167,7 @@ public: constraint is a usual KTrader constraint statement (like "[X-KDevelop-Foo]=='MyFoo'"). @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/ template <class Extension> - Extension *extension(const QString &serviceType, const QString &constraint = "") + Extension *extension(const TQString &serviceType, const TQString &constraint = "") { return static_cast<Extension*>(extension_internal(serviceType, constraint)); } @@ -183,14 +183,14 @@ public: @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.*/ - virtual void restorePartialProjectSession(const QDomElement* el); + virtual void restorePartialProjectSession(const TQDomElement* el); /**Saves session settings. @sa restorePartialProjectSession - this is the other way round, the same just for saving.*/ - virtual void savePartialProjectSession(QDomElement* el); + virtual void savePartialProjectSession(TQDomElement* el); private: - KDevPlugin *extension_internal(const QString &serviceType, const QString &constraint = ""); + KDevPlugin *extension_internal(const TQString &serviceType, const TQString &constraint = ""); KDevApi *m_api; class Private; diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index 84e8fdf6..686fd1ce 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -24,24 +24,24 @@ KDevPluginController::KDevPluginController() { } -KTrader::OfferList KDevPluginController::query(const QString &serviceType, - const QString &constraint) +KTrader::OfferList KDevPluginController::query(const TQString &serviceType, + const TQString &constraint) { return KTrader::self()->query(serviceType, - QString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION)); + TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION)); } -KTrader::OfferList KDevPluginController::queryPlugins(const QString &constraint) +KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) { return query("KDevelop/Plugin", constraint); } -KURL::List KDevPluginController::profileResources(const QString &/*nameFilter*/) +KURL::List KDevPluginController::profileResources(const TQString &/*nameFilter*/) { return KURL::List(); } -KURL::List KDevPluginController::profileResourcesRecursive(const QString &/*nameFilter*/) +KURL::List KDevPluginController::profileResourcesRecursive(const TQString &/*nameFilter*/) { return KURL::List(); } diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h index e4579ab3..2ffba0ba 100644 --- a/lib/interfaces/kdevplugincontroller.h +++ b/lib/interfaces/kdevplugincontroller.h @@ -19,7 +19,7 @@ #ifndef KDEVPLUGINCONTROLLER_H #define KDEVPLUGINCONTROLLER_H -#include <qobject.h> +#include <tqobject.h> #include <kurl.h> #include <ktrader.h> @@ -45,21 +45,21 @@ public: * Returns a uniquely specified plugin. If it isn't already loaded, it will be. * Use with caution! See extension for parameter details. */ - virtual KDevPlugin * loadPlugin( const QString & serviceType, const QString & constraint ) = 0; + virtual KDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ) = 0; /** * Unloads the plugin specified by @p plugin * @param plugin The plugin desktopEntryName of the plugin to unload */ - virtual void unloadPlugin( const QString & plugin ) = 0; + virtual void unloadPlugin( const TQString & plugin ) = 0; /**Unloads plugins specified by @p list. @param list The list of plugin names to unload. plugin name corresponds to the "Name" property in plugin .desktop file.*/ - virtual void unloadPlugins(QStringList const &list) = 0; + virtual void unloadPlugins(TQStringList const &list) = 0; /**@return The list of currently loaded plugins.*/ - virtual const QValueList<KDevPlugin*> loadedPlugins() = 0; + virtual const TQValueList<KDevPlugin*> loadedPlugins() = 0; /**Queries for the plugin which supports given service type. All already loaded plugins will be queried and the first one to support the service type @@ -69,7 +69,7 @@ public: @param constraint The constraint which is applied when quering for the service. This constraint is a usual KTrader constraint statement (like "[X-KDevelop-Foo]=='MyFoo'"). @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/ - virtual KDevPlugin *extension(const QString &serviceType, const QString &constraint = "") = 0; + virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0; /**Queries KDevelop services. Version is checked automatically by adding proper X-KDevelop-Version=N statement into the query. @@ -78,28 +78,28 @@ public: @param constraint A constraint for the service. Do not include plugin version number - it is done automatically. @return The list of plugin offers.*/ - static KTrader::OfferList query(const QString &serviceType, const QString &constraint); + static KTrader::OfferList query(const TQString &serviceType, const TQString &constraint); /**Queries KDevelop plugins. Works like KDevPluginController::query with serviceType set to "KDevelop/Plugin". @param constraint A constraint for the service. Do not include plugin version number - it is done automatically. @return The list of plugin offers.*/ - static KTrader::OfferList queryPlugins(const QString &constraint); + static KTrader::OfferList queryPlugins(const TQString &constraint); /**Reimplement this function only if your shell supports plugin profiles. @return The list of URLs to the profile resources (files) with given @p extension. - @param nameFilter Name filter for files. @see QDir::setNameFilter documentation + @param nameFilter Name filter for files. @see TQDir::setNameFilter documentation for name filters syntax.*/ - virtual KURL::List profileResources(const QString &nameFilter); + virtual KURL::List profileResources(const TQString &nameFilter); /**Reimplement this function only if your shell supports plugin profiles. @return The list of URLs to the resources (files) with given @p extension. This list is obtained by a recursive search that process given profile and all it's subprofiles. - @param nameFilter Name filter for files. @see QDir::setNameFilter documentation + @param nameFilter Name filter for files. @see TQDir::setNameFilter documentation for name filters syntax.*/ - virtual KURL::List profileResourcesRecursive(const QString &nameFilter); + virtual KURL::List profileResourcesRecursive(const TQString &nameFilter); /** @return The current Profile Engine */ virtual ProfileEngine &engine() = 0; diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index c5572ccd..daa64c2b 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -18,7 +18,7 @@ */ #include "kdevplugininfo.h" -#include <qvariant.h> +#include <tqvariant.h> #include <kservice.h> #include <kdebug.h> @@ -26,27 +26,27 @@ #include "kdevplugincontroller.h" struct KDevPluginInfo::Private { - QString m_pluginName; - QString m_rawGenericName; + TQString m_pluginName; + TQString m_rawGenericName; - QString m_genericName; - QString m_description; - QString m_icon; + TQString m_genericName; + TQString m_description; + TQString m_icon; - QString m_version; + TQString m_version; int m_licenseType; - QString m_copyrightStatement; - QString m_homePageAddress; - QString m_bugsEmailAddress; + TQString m_copyrightStatement; + TQString m_homePageAddress; + TQString m_bugsEmailAddress; - QValueList<KAboutPerson> m_authors; - QValueList<KAboutPerson> m_credits; + TQValueList<KAboutPerson> m_authors; + TQValueList<KAboutPerson> m_credits; KAboutData *m_data; }; -KDevPluginInfo::KDevPluginInfo(const QString &pluginName) +KDevPluginInfo::KDevPluginInfo(const TQString &pluginName) :d(new Private()) { d->m_pluginName = pluginName; @@ -65,7 +65,7 @@ KDevPluginInfo::KDevPluginInfo(const QString &pluginName) d->m_bugsEmailAddress = offer->property("X-KDevelop-Plugin-BugsEmailAddress").toString(); d->m_copyrightStatement = offer->property("X-KDevelop-Plugin-Copyright").toString(); - QString lic = offer->property("X-KDevelop-Plugin-License").toString(); + TQString lic = offer->property("X-KDevelop-Plugin-License").toString(); if (lic == "GPL") d->m_licenseType = KAboutData::License_GPL; else if (lic == "LGPL") @@ -94,27 +94,27 @@ KDevPluginInfo::operator KAboutData *() const return d->m_data; } -QString KDevPluginInfo::pluginName() const +TQString KDevPluginInfo::pluginName() const { return d->m_pluginName; } -QString KDevPluginInfo::genericName() const +TQString KDevPluginInfo::genericName() const { return d->m_genericName; } -QString KDevPluginInfo::icon() const +TQString KDevPluginInfo::icon() const { return d->m_icon; } -QString KDevPluginInfo::description() const +TQString KDevPluginInfo::description() const { return d->m_description; } -QString KDevPluginInfo::version() const +TQString KDevPluginInfo::version() const { return d->m_version; } @@ -124,7 +124,7 @@ int KDevPluginInfo::licenseType() const return d->m_licenseType; } -QString KDevPluginInfo::license() const +TQString KDevPluginInfo::license() const { KDevPluginInfo &info = *const_cast<KDevPluginInfo*>(this); // return KAboutData(info).license(); @@ -132,40 +132,40 @@ QString KDevPluginInfo::license() const return data->license(); } -QString KDevPluginInfo::copyrightStatement() const +TQString KDevPluginInfo::copyrightStatement() const { return d->m_copyrightStatement; } -QString KDevPluginInfo::homePageAddress() const +TQString KDevPluginInfo::homePageAddress() const { return d->m_homePageAddress; } -QString KDevPluginInfo::bugsEmailAddress() const +TQString KDevPluginInfo::bugsEmailAddress() const { return d->m_bugsEmailAddress; } -QVariant KDevPluginInfo::property(const QString &name) const +TQVariant KDevPluginInfo::property(const TQString &name) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(QString("Name='%1'").arg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->property(name); - return QVariant(); + return TQVariant(); } -QVariant KDevPluginInfo::operator [](const QString &name) const +TQVariant KDevPluginInfo::operator [](const TQString &name) const { return property(name); } -QStringList KDevPluginInfo::propertyNames( ) const +TQStringList KDevPluginInfo::propertyNames( ) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(QString("Name='%1'").arg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->propertyNames(); - return QStringList(); + return TQStringList(); } void KDevPluginInfo::addAuthor(const char *name, const char *task, diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/kdevplugininfo.h index 9e133912..50fe4601 100644 --- a/lib/interfaces/kdevplugininfo.h +++ b/lib/interfaces/kdevplugininfo.h @@ -19,7 +19,7 @@ #ifndef KDEVPLUGININFO_H #define KDEVPLUGININFO_H -#include <qvariant.h> +#include <tqvariant.h> #include <kaboutdata.h> @@ -42,46 +42,46 @@ public: /**Constructor. @param pluginName A name of a plugin. Must be the same as the name of a .desktop file and the same as the location of plugin resource files.*/ - KDevPluginInfo(const QString &pluginName); + KDevPluginInfo(const TQString &pluginName); /**Casts KDevPluginInfo to KAboutData. Uses KDevPluginInfo::pluginName as KAboutData::appName, KDevPluginInfo::rawGenericName as KAboutData::programName KDevPluginInfo::licenseType as KAboutData::licenseType. Other parameters are ignored.*/ operator KAboutData*() const; /**@return A name of a plugin (always untranslated).*/ - QString pluginName() const; + TQString pluginName() const; /**@return A generic name of a plugin (translated). Use this in GUI. Information is taken from .desktop file.*/ - QString genericName() const; + TQString genericName() const; /**@return An icon name of a plugin. Information is taken from .desktop file.*/ - QString icon() const; + TQString icon() const; /**@return A description of a plugin. Information is taken from .desktop file.*/ - QString description() const; + TQString description() const; /**@return A version of a plugin. Information is taken from .desktop file.*/ - QString version() const; + 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).*/ - QString license() const; + TQString license() const; /**@return A copyright statement of a plugin. Information is taken from .desktop file.*/ - QString copyrightStatement() const; + TQString copyrightStatement() const; /**@return A home page of a plugin. Information is taken from .desktop file.*/ - QString homePageAddress() const; + TQString homePageAddress() const; /**@return A email address for bugs of a plugin. Information is taken from .desktop file.*/ - QString bugsEmailAddress() const; + TQString bugsEmailAddress() const; /**@param name The name of a property. @return Any property value which exists in .desktop file.*/ - QVariant property(const QString &name) const; + TQVariant property(const TQString &name) const; /**@param name The name of a property. @return Any property value which exists in .desktop file.*/ - QVariant operator [] (const QString &name) const; + TQVariant operator [] (const TQString &name) const; /**@return A list of property names set in .desktop file.*/ - QStringList propertyNames() const; + TQStringList propertyNames() const; /**@return A list of plugin authors.*/ - const QValueList<KAboutPerson> authors() const; + const TQValueList<KAboutPerson> authors() const; /**@return A list of other plugin contributors.*/ - const QValueList<KAboutPerson> credits() const; + const TQValueList<KAboutPerson> credits() const; /**Adds an author to the list of authors. You can call this function as many times you need. Each entry is appended to a list. diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index b98ecffb..f558cc48 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -26,28 +26,28 @@ #include "kdevproject.h" #include <urlutil.h> -#include <qfileinfo.h> -#include <qtimer.h> +#include <tqfileinfo.h> +#include <tqtimer.h> #include "kdevprojectiface.h" struct KDevProject::Private { - QMap<QString, QString> m_absToRel; - QStringList m_symlinkList; - QTimer *m_timer; + TQMap<TQString, TQString> m_absToRel; + TQStringList m_symlinkList; + TQTimer *m_timer; KDevProjectIface *m_iface; }; -KDevProject::KDevProject(const KDevPluginInfo *info, QObject *parent, const char *name) +KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name), d(new KDevProject::Private()) { - connect( this, SIGNAL(addedFilesToProject(const QStringList& )), this, SLOT(buildFileMap()) ); - connect( this, SIGNAL(removedFilesFromProject(const QStringList& )), this, SLOT(buildFileMap()) ); + connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); + connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); - connect( this, SIGNAL(addedFilesToProject(const QStringList& )), this, SLOT(slotAddFilesToFileMap(const QStringList& )) ); - connect( this, SIGNAL(removedFilesFromProject(const QStringList& )), this, SLOT(slotRemoveFilesFromFileMap(const QStringList& )) ); + connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(slotAddFilesToFileMap(const TQStringList& )) ); + connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) ); - d->m_timer = new QTimer(this); - connect(d->m_timer, SIGNAL(timeout()), this, SLOT(slotBuildFileMap())); + d->m_timer = new TQTimer(this); + connect(d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBuildFileMap())); d->m_iface = new KDevProjectIface(this); } @@ -59,16 +59,16 @@ KDevProject::~KDevProject() delete d; } -void KDevProject::changedFile( const QString & fileName ) +void KDevProject::changedFile( const TQString & fileName ) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); emit changedFilesInProject( fileList ); } -void KDevProject::changedFiles( const QStringList & fileList ) +void KDevProject::changedFiles( const TQStringList & fileList ) { emit changedFilesInProject( fileList ); } @@ -78,16 +78,16 @@ KDevProject::Options KDevProject::options() const return (KDevProject::Options)0; } -bool KDevProject::isProjectFile( const QString & absFileName ) +bool KDevProject::isProjectFile( const TQString & absFileName ) { return d->m_absToRel.contains( absFileName ); } -QString KDevProject::relativeProjectFile( const QString & absFileName ) +TQString KDevProject::relativeProjectFile( const TQString & absFileName ) { if( isProjectFile(absFileName) ) return d->m_absToRel[ absFileName ]; - return QString::null; + return TQString::null; } void KDevProject::buildFileMap() @@ -102,10 +102,10 @@ void KDevProject::slotBuildFileMap() d->m_absToRel.clear(); d->m_symlinkList.clear(); - const QStringList fileList = allFiles(); - for( QStringList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) + const TQStringList fileList = allFiles(); + for( TQStringList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) { - QFileInfo fileInfo( projectDirectory() + "/" + *it ); + TQFileInfo fileInfo( projectDirectory() + "/" + *it ); d->m_absToRel[ URLUtil::canonicalPath(fileInfo.absFilePath()) ] = *it; if ( URLUtil::canonicalPath( fileInfo.absFilePath() ) != fileInfo.absFilePath() ) @@ -115,27 +115,27 @@ void KDevProject::slotBuildFileMap() } } -void KDevProject::openProject( const QString & /*dirName*/, const QString & /*projectName*/ ) +void KDevProject::openProject( const TQString & /*dirName*/, const TQString & /*projectName*/ ) { buildFileMap(); } -QStringList KDevProject::symlinkProjectFiles( ) +TQStringList KDevProject::symlinkProjectFiles( ) { return d->m_symlinkList; } -QString KDevProject::defaultRunDirectory(const QString& projectPluginName) const +TQString KDevProject::defaultRunDirectory(const TQString& projectPluginName) const { return DomUtil::readEntry(*projectDom(), "/" + projectPluginName + "/run/globalcwd"); } -void KDevProject::slotAddFilesToFileMap( const QStringList & fileList ) +void KDevProject::slotAddFilesToFileMap( const TQStringList & fileList ) { - QStringList::ConstIterator it = fileList.begin(); + TQStringList::ConstIterator it = fileList.begin(); while( it != fileList.end() ) { - QFileInfo fileInfo( projectDirectory() + "/" + *it ); + TQFileInfo fileInfo( projectDirectory() + "/" + *it ); d->m_absToRel[ URLUtil::canonicalPath(fileInfo.absFilePath()) ] = *it; if ( URLUtil::canonicalPath( fileInfo.absFilePath() ) != fileInfo.absFilePath() ) @@ -147,12 +147,12 @@ void KDevProject::slotAddFilesToFileMap( const QStringList & fileList ) } } -void KDevProject::slotRemoveFilesFromFileMap( const QStringList & fileList ) +void KDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList ) { - QStringList::ConstIterator it = fileList.begin(); + TQStringList::ConstIterator it = fileList.begin(); while( it != fileList.end() ) { - QFileInfo fileInfo( projectDirectory() + "/" + *it ); + TQFileInfo fileInfo( projectDirectory() + "/" + *it ); d->m_absToRel.remove( URLUtil::canonicalPath(fileInfo.absFilePath()) ); d->m_symlinkList.remove( *it ); diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h index 1827a1d0..a14c04b0 100644 --- a/lib/interfaces/kdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -28,8 +28,8 @@ #include "kdevplugin.h" #include "domutil.h" -#include <qstringlist.h> -#include <qmap.h> +#include <tqstringlist.h> +#include <tqmap.h> /** @file kdevproject.h @@ -58,7 +58,7 @@ public: @param parent The parent 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, QObject *parent=0, const char *name=0); + KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0); /**Destructor.*/ virtual ~KDevProject(); @@ -76,7 +76,7 @@ public: the projectDirectory() method. @param projectName The project name, which is equivalent to the project file name without the suffix.*/ - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); /**This method is invoked when the project is about to be closed.*/ virtual void closeProject() = 0; @@ -87,81 +87,81 @@ public: /**@return The canonical absolute directory of the project. Canonical means that a path does not contain symbolic links or redundant "." or ".." elements.*/ - virtual QString projectDirectory() const = 0; + virtual TQString projectDirectory() const = 0; /**Returns the name of the project.*/ - virtual QString projectName() const = 0; + virtual TQString projectName() const = 0; /**@return The environment variables that sould be set before running mainProgram().*/ virtual DomUtil::PairList runEnvironmentVars() const = 0; /**@return The path to main binary program of the project. @param relative if true then the path returned is relative to the project directory.*/ - virtual QString mainProgram() const = 0; + virtual TQString mainProgram() const = 0; /**Absolute path (directory) from where the mainProgram() should be run.*/ - virtual QString runDirectory() const = 0; + virtual TQString runDirectory() const = 0; /**The command line arguments that the mainProgram() should be run with.*/ - virtual QString runArguments() const = 0; + virtual TQString runArguments() const = 0; /**The command line arguments that the mainProgram() should be debugged with.*/ - virtual QString debugArguments() const = 0; + virtual TQString debugArguments() const = 0; /**Returns the path (relative to the project directory) of the active directory. All newly automatically generated classes and files are usually added here.*/ - virtual QString activeDirectory() const = 0; + virtual TQString activeDirectory() const = 0; /**@return The canonical build directory of the project. If the separate build directory is not supported, this should return the same as projectDiretory(). Canonical means that a path does not contain symbolic links or redundant "." or ".." elements.*/ - virtual QString buildDirectory() const = 0; + virtual TQString buildDirectory() const = 0; /**@return The list of all files in the project. The names are relative to the project directory.*/ - virtual QStringList allFiles() const = 0; + virtual TQStringList allFiles() const = 0; /**@return The list of files that are part of the distribution but not under project control. Used mainly to package and publish extra files among with the project.*/ - virtual QStringList distFiles() const = 0; + virtual TQStringList distFiles() const = 0; /**Adds a list of files to the project. Provided for convenience when adding many files. @param fileList The list of file names relative to the project directory.*/ - virtual void addFiles(const QStringList &fileList) = 0; + virtual void addFiles(const TQStringList &fileList) = 0; /**Adds a file to the project. @param fileName The file name relative to the project directory.*/ - virtual void addFile(const QString &fileName)= 0; + virtual void addFile(const TQString &fileName)= 0; /**Removes a list of files from the project. Provided for convenience when removing many files. @param fileList The list of file names relative to the project directory.*/ - virtual void removeFiles(const QStringList& fileList)= 0; + virtual void removeFiles(const TQStringList& fileList)= 0; /**Removes a file from the project. @param fileName The file name relative to the project directory.*/ - virtual void removeFile(const QString &fileName) = 0; + virtual void removeFile(const TQString &fileName) = 0; /**Notifies the project about changes to the files. Provided for convenience when changing many files. @param fileList The list of file names relative to the project directory..*/ - virtual void changedFiles(const QStringList &fileList); + virtual void changedFiles(const TQStringList &fileList); /**Notifies the project of a change to one of the files. @param fileName The file name relative to the project directory.*/ - virtual void changedFile(const QString &fileName); + virtual void changedFile(const TQString &fileName); /**@return true if the file @p absFileName is a part of the project. @param absFileName Absolute name of a file to check.*/ - virtual bool isProjectFile(const QString &absFileName); + virtual bool isProjectFile(const TQString &absFileName); /**@return The path (relative to the project directory) of the file @p absFileName. @param absFileName Absolute name of a file.*/ - virtual QString relativeProjectFile(const QString &absFileName); + virtual TQString relativeProjectFile(const TQString &absFileName); /**@return The list of files known to the project through symlinks.*/ - virtual QStringList symlinkProjectFiles(); + virtual TQStringList symlinkProjectFiles(); protected: @@ -177,28 +177,28 @@ protected: * The custom directory absolute path. * Derived classes are supposed to explicitly call this implementation */ - QString defaultRunDirectory(const QString& projectPluginName) const; + TQString defaultRunDirectory(const TQString& projectPluginName) const; private slots: void buildFileMap(); void slotBuildFileMap(); - void slotAddFilesToFileMap(const QStringList & fileList ); - void slotRemoveFilesFromFileMap(const QStringList & fileList ); + void slotAddFilesToFileMap(const TQStringList & fileList ); + void slotRemoveFilesFromFileMap(const TQStringList & fileList ); signals: /**Emitted when a new list of files has been added to the project. Provided for convenience when many files were added. @param fileList The file names relative to the project directory.*/ - void addedFilesToProject(const QStringList& fileList); + void addedFilesToProject(const TQStringList& fileList); /**Emitted when a list of files has been removed from the project. Provided for convenience when many files were removed. @param fileList The file names relative to the project directory.*/ - void removedFilesFromProject(const QStringList& fileList); + void removedFilesFromProject(const TQStringList& fileList); /**Emitted when a list of files has changed in the project. @param fileList The file names relative to the project directory.*/ - void changedFilesInProject(const QStringList& fileList); + void changedFilesInProject(const TQStringList& fileList); /**Emitted when one compile related command (make, make install, make ...) ends sucessfuly. Used to reparse the files after a sucessful compilation.*/ @@ -208,7 +208,7 @@ signals: * @param olddir The old active directory * @param newdir The new active directory */ - void activeDirectoryChanged( const QString& olddir, const QString& newdir ); + void activeDirectoryChanged( const TQString& olddir, const TQString& newdir ); private: class Private; diff --git a/lib/interfaces/kdevprojectiface.cpp b/lib/interfaces/kdevprojectiface.cpp index 5fbd2261..28d4501c 100644 --- a/lib/interfaces/kdevprojectiface.cpp +++ b/lib/interfaces/kdevprojectiface.cpp @@ -24,7 +24,7 @@ #include "domutil.h" KDevProjectIface::KDevProjectIface(KDevProject *prj) - : QObject(prj), DCOPObject("KDevProject"), m_prj(prj) + : TQObject(prj), DCOPObject("KDevProject"), m_prj(prj) { } @@ -33,7 +33,7 @@ KDevProjectIface::~KDevProjectIface() { } -void KDevProjectIface::openProject( const QString & dirName, const QString & projectName ) +void KDevProjectIface::openProject( const TQString & dirName, const TQString & projectName ) { m_prj->openProject(dirName,projectName); } @@ -48,137 +48,137 @@ uint KDevProjectIface::options( ) const return (uint)m_prj->options(); } -QString KDevProjectIface::projectDirectory( ) const +TQString KDevProjectIface::projectDirectory( ) const { return m_prj->projectDirectory(); } -QString KDevProjectIface::projectName( ) const +TQString KDevProjectIface::projectName( ) const { return m_prj->projectName(); } -QString KDevProjectIface::mainProgram() const +TQString KDevProjectIface::mainProgram() const { return m_prj->mainProgram(); } -QString KDevProjectIface::runDirectory( ) const +TQString KDevProjectIface::runDirectory( ) const { return m_prj->runDirectory(); } -QString KDevProjectIface::activeDirectory( ) const +TQString KDevProjectIface::activeDirectory( ) const { return m_prj->activeDirectory(); } -QString KDevProjectIface::buildDirectory( ) const +TQString KDevProjectIface::buildDirectory( ) const { return m_prj->buildDirectory(); } -QStringList KDevProjectIface::allFiles( ) const +TQStringList KDevProjectIface::allFiles( ) const { return m_prj->allFiles(); } -QStringList KDevProjectIface::distFiles( ) const +TQStringList KDevProjectIface::distFiles( ) const { return m_prj->distFiles(); } -void KDevProjectIface::addFiles( const QStringList & fileList ) +void KDevProjectIface::addFiles( const TQStringList & fileList ) { m_prj->addFiles(fileList); } -void KDevProjectIface::addFile( const QString & fileName ) +void KDevProjectIface::addFile( const TQString & fileName ) { m_prj->addFile(fileName); } -void KDevProjectIface::removeFiles( const QStringList & fileList ) +void KDevProjectIface::removeFiles( const TQStringList & fileList ) { m_prj->removeFiles(fileList); } -void KDevProjectIface::removeFile( const QString & fileName ) +void KDevProjectIface::removeFile( const TQString & fileName ) { m_prj->removeFile(fileName); } -void KDevProjectIface::changedFiles( const QStringList & fileList ) +void KDevProjectIface::changedFiles( const TQStringList & fileList ) { m_prj->changedFiles(fileList); } -void KDevProjectIface::changedFile( const QString & fileName ) +void KDevProjectIface::changedFile( const TQString & fileName ) { m_prj->changedFile(fileName); } -bool KDevProjectIface::isProjectFile( const QString & absFileName ) +bool KDevProjectIface::isProjectFile( const TQString & absFileName ) { return m_prj->isProjectFile(absFileName); } -QString KDevProjectIface::relativeProjectFile( const QString & absFileName ) +TQString KDevProjectIface::relativeProjectFile( const TQString & absFileName ) { return m_prj->relativeProjectFile(absFileName); } -QStringList KDevProjectIface::symlinkProjectFiles( ) +TQStringList KDevProjectIface::symlinkProjectFiles( ) { return m_prj->symlinkProjectFiles(); } -QString KDevProjectIface::readEntry( const QString & path, const QString & defaultEntry ) +TQString KDevProjectIface::readEntry( const TQString & path, const TQString & defaultEntry ) { return DomUtil::readEntry( *m_prj->projectDom(), path, defaultEntry); } -int KDevProjectIface::readIntEntry( const QString & path, int defaultEntry ) +int KDevProjectIface::readIntEntry( const TQString & path, int defaultEntry ) { return DomUtil::readIntEntry(*m_prj->projectDom(), path,defaultEntry); } -bool KDevProjectIface::readBoolEntry( const QString & path, bool defaultEntry ) +bool KDevProjectIface::readBoolEntry( const TQString & path, bool defaultEntry ) { return DomUtil::readBoolEntry(*m_prj->projectDom(), path, defaultEntry); } -QStringList KDevProjectIface::readListEntry( const QString & path, const QString & tag ) +TQStringList KDevProjectIface::readListEntry( const TQString & path, const TQString & tag ) { return DomUtil::readListEntry(*m_prj->projectDom(), path, tag); } -QMap< QString, QString > KDevProjectIface::readMapEntry( const QString & path ) +TQMap< TQString, TQString > KDevProjectIface::readMapEntry( const TQString & path ) { return DomUtil::readMapEntry(*m_prj->projectDom(), path); } -void KDevProjectIface::writeEntry( const QString & path, const QString & value ) +void KDevProjectIface::writeEntry( const TQString & path, const TQString & value ) { DomUtil::writeEntry(*m_prj->projectDom(), path, value); } -void KDevProjectIface::writeIntEntry( const QString & path, int value ) +void KDevProjectIface::writeIntEntry( const TQString & path, int value ) { DomUtil::writeIntEntry(*m_prj->projectDom(), path, value); } -void KDevProjectIface::writeBoolEntry( const QString & path, bool value ) +void KDevProjectIface::writeBoolEntry( const TQString & path, bool value ) { DomUtil::writeBoolEntry(*m_prj->projectDom(), path, value); } -void KDevProjectIface::writeListEntry( const QString & path, const QString & tag, const QStringList & value ) +void KDevProjectIface::writeListEntry( const TQString & path, const TQString & tag, const TQStringList & value ) { DomUtil::writeListEntry(*m_prj->projectDom(), path, tag, value); } -void KDevProjectIface::writeMapEntry( const QString & path, const QMap< QString, QString > & map ) +void KDevProjectIface::writeMapEntry( const TQString & path, const TQMap< TQString, TQString > & map ) { DomUtil::writeMapEntry(*m_prj->projectDom(), path, map); } diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/kdevprojectiface.h index c6d92e27..eb2a0f32 100644 --- a/lib/interfaces/kdevprojectiface.h +++ b/lib/interfaces/kdevprojectiface.h @@ -21,8 +21,8 @@ #define KDEVPROJECTIFACE_H #include <dcopobject.h> -#include <qstringlist.h> -#include <qmap.h> +#include <tqstringlist.h> +#include <tqmap.h> class KDevProject; @@ -31,7 +31,7 @@ DCOP Interface for the @ref KDevProject object. @author KDevelop Authors */ -class KDevProjectIface : public QObject, public DCOPObject +class KDevProjectIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -40,39 +40,39 @@ public: ~KDevProjectIface(); k_dcop: - void openProject(const QString &dirName, const QString &projectName); + void openProject(const TQString &dirName, const TQString &projectName); void closeProject(); uint options() const; - QString projectDirectory() const; - QString projectName() const; - QString mainProgram() const; - QString runDirectory() const; - QString activeDirectory() const; - QString buildDirectory() const; - QStringList allFiles() const; - QStringList distFiles() const; - void addFiles(const QStringList &fileList); - void addFile(const QString &fileName); - void removeFiles(const QStringList& fileList); - void removeFile(const QString &fileName); - void changedFiles(const QStringList &fileList); - void changedFile(const QString &fileName); - bool isProjectFile(const QString &absFileName); - QString relativeProjectFile(const QString &absFileName); - QStringList symlinkProjectFiles(); + TQString projectDirectory() const; + TQString projectName() const; + TQString mainProgram() const; + TQString runDirectory() const; + TQString activeDirectory() const; + TQString buildDirectory() const; + TQStringList allFiles() const; + TQStringList distFiles() const; + void addFiles(const TQStringList &fileList); + void addFile(const TQString &fileName); + void removeFiles(const TQStringList& fileList); + void removeFile(const TQString &fileName); + void changedFiles(const TQStringList &fileList); + void changedFile(const TQString &fileName); + bool isProjectFile(const TQString &absFileName); + TQString relativeProjectFile(const TQString &absFileName); + TQStringList symlinkProjectFiles(); // Project DOM access - QString readEntry(const QString &path, const QString &defaultEntry = QString::null); - int readIntEntry(const QString &path, int defaultEntry = 0); - bool readBoolEntry(const QString &path, bool defaultEntry = false); - QStringList readListEntry(const QString &path, const QString &tag); - QMap<QString, QString> readMapEntry(const QString &path); + TQString readEntry(const TQString &path, const TQString &defaultEntry = TQString::null); + int readIntEntry(const TQString &path, int defaultEntry = 0); + bool readBoolEntry(const TQString &path, bool defaultEntry = false); + TQStringList readListEntry(const TQString &path, const TQString &tag); + TQMap<TQString, TQString> readMapEntry(const TQString &path); - void writeEntry(const QString &path, const QString &value); - void writeIntEntry(const QString &path, int value); - void writeBoolEntry( const QString &path, bool value); - void writeListEntry(const QString &path, const QString &tag, const QStringList &value); - void writeMapEntry(const QString& path, const QMap<QString,QString> &map); + void writeEntry(const TQString &path, const TQString &value); + void writeIntEntry(const TQString &path, int value); + void writeBoolEntry( const TQString &path, bool value); + void writeListEntry(const TQString &path, const TQString &tag, const TQStringList &value); + void writeMapEntry(const TQString& path, const TQMap<TQString,TQString> &map); private: KDevProject *m_prj; diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index f0d6e6c3..9c9d9130 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -11,10 +11,10 @@ #include "blockingkprocess.h" -#include <qapplication.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqtimer.h> -BlockingKProcess::BlockingKProcess(QObject *parent, const char *name) +BlockingKProcess::BlockingKProcess(TQObject *parent, const char *name) : KProcess(parent, name) { m_stdOut = ""; @@ -22,12 +22,12 @@ BlockingKProcess::BlockingKProcess(QObject *parent, const char *name) m_timeoutValue = 60; m_timer = 0L; - connect(this, SIGNAL(receivedStdout(KProcess *, char *, int)), - this, SLOT(slotReceivedStdOut(KProcess *, char *, int))); - connect(this, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(slotReceivedStdErr(KProcess *, char *, int))); - connect(this, SIGNAL(processExited(KProcess *)), - this, SLOT(slotProcessExited(KProcess *))); + connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdOut(KProcess *, char *, int))); + connect(this, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdErr(KProcess *, char *, int))); + connect(this, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotProcessExited(KProcess *))); } BlockingKProcess::BlockingKProcess() @@ -37,12 +37,12 @@ BlockingKProcess::BlockingKProcess() m_stdErr = ""; m_timeoutValue = 60; m_timer = 0L; - connect(this, SIGNAL(receivedStdout(KProcess *, char *, int)), - this, SLOT(slotReceivedStdOut(KProcess *, char *, int))); - connect(this, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(slotReceivedStdErr(KProcess *, char *, int))); - connect(this, SIGNAL(processExited(KProcess *)), - this, SLOT(slotProcessExited(KProcess *))); + connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdOut(KProcess *, char *, int))); + connect(this, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdErr(KProcess *, char *, int))); + connect(this, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotProcessExited(KProcess *))); } @@ -54,8 +54,8 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm) if (KProcess::start(runmode, comm)) { m_timeout = false; - m_timer = new QTimer(); - connect(m_timer, SIGNAL(timeout()), this, SLOT(slotTimeOut())); + m_timer = new TQTimer(); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOut())); m_timer->start(m_timeoutValue*1000, true); enter_loop(); delete m_timer; @@ -68,12 +68,12 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm) void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen) { - m_stdOut += QString::fromLatin1(buffer, buflen); + m_stdOut += TQString::fromLatin1(buffer, buflen); } void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen) { - m_stdErr += QString::fromLatin1(buffer, buflen); + m_stdErr += TQString::fromLatin1(buffer, buflen); } void BlockingKProcess::slotProcessExited(KProcess *) @@ -89,13 +89,13 @@ void BlockingKProcess::slotTimeOut() } -void qt_enter_modal( QWidget *widget ); -void qt_leave_modal( QWidget *widget ); +void qt_enter_modal( TQWidget *widget ); +void qt_leave_modal( TQWidget *widget ); void BlockingKProcess::enter_loop() { - QWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( QWidget::NoFocus ); + TQWidget dummy(0,0,WType_Dialog | WShowModal); + dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); qApp->enter_loop(); qt_leave_modal(&dummy); diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h index c5c8f5d9..b280b81b 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingkprocess.h @@ -33,7 +33,7 @@ class BlockingKProcess : public KProcess Q_OBJECT public: - BlockingKProcess(QObject *parent, const char *name=0); + BlockingKProcess(TQObject *parent, const char *name=0); BlockingKProcess(); virtual ~BlockingKProcess(); @@ -52,7 +52,7 @@ public: * Get the output of the run process * @return the output */ - QString stdOut() { return m_stdOut;} + TQString stdOut() { return m_stdOut;} /** * Clear the internal stdout buffer. Useful in case the class is reused. */ @@ -61,7 +61,7 @@ public: * Get the error output of the run process * @return the output */ - QString stdErr() { return m_stdErr;} + TQString stdErr() { return m_stdErr;} /** * Clear the internal stderr buffer. Useful in case the class is reused. */ @@ -82,11 +82,11 @@ private slots: private: void enter_loop(); - QString m_stdOut; - QString m_stdErr; + TQString m_stdOut; + TQString m_stdErr; bool m_timeout; int m_timeoutValue; - QTimer *m_timer; + TQTimer *m_timer; }; #endif diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index 70c79fb4..66f267b7 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -19,8 +19,8 @@ -#include <qstring.h> -#include <qvbox.h> +#include <tqstring.h> +#include <tqvbox.h> #include <kdebug.h> #include <kdialogbase.h> @@ -34,19 +34,19 @@ ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core ) { - connect( core, SIGNAL(configWidget(KDialogBase*)), this, SLOT(slotConfigWidget( KDialogBase*)) ); - connect( core, SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(slotProjectConfigWidget( KDialogBase*)) ); + connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) ); + connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) ); } ConfigWidgetProxy::~ConfigWidgetProxy() {} -void ConfigWidgetProxy::createGlobalConfigPage( QString const & title, unsigned int pagenumber, QString const & icon ) +void ConfigWidgetProxy::createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) { _globalTitleMap.insert( pagenumber, qMakePair( title, icon ) ); } -void ConfigWidgetProxy::createProjectConfigPage( QString const & title, unsigned int pagenumber, QString const & icon ) +void ConfigWidgetProxy::createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) { _projectTitleMap.insert( pagenumber, qMakePair( title, icon ) ); } @@ -66,8 +66,8 @@ void ConfigWidgetProxy::slotConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT( slotAboutToShowPage(QWidget*)) ); - connect( dlg, SIGNAL(destroyed()), this, SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) @@ -79,8 +79,8 @@ void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT( slotAboutToShowPage(QWidget*)) ); - connect( dlg, SIGNAL(destroyed()), this, SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotConfigWidgetDestroyed( ) @@ -88,14 +88,14 @@ void ConfigWidgetProxy::slotConfigWidgetDestroyed( ) _pageMap.clear(); } -void ConfigWidgetProxy::slotAboutToShowPage( QWidget * page ) +void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page ) { if ( !page ) return; PageMap::Iterator it = _pageMap.find( page ); if ( it != _pageMap.end() ) { - emit insertConfigWidget( static_cast<KDialogBase*>(const_cast<QObject*>(sender())), page, it.data() ); + emit insertConfigWidget( static_cast<KDialogBase*>(const_cast<TQObject*>(sender())), page, it.data() ); _pageMap.remove( it ); } } diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index 84e1d18c..1ba7e5c5 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -20,9 +20,9 @@ #ifndef _CONFIGWIDGETPROXY_H #define _CONFIGWIDGETPROXY_H -#include <qobject.h> -#include <qstring.h> -#include <qmap.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqmap.h> class KDevCore; class KDialogBase; @@ -47,20 +47,20 @@ A typical case looks like this: _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("My Part"), GLOBALDOC_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("My Part"), PROJECTDOC_OPTIONS, info()->icon() ); -connect( _configProxy, SIGNAL(insertConfigWidget(const QObject*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const QObject*, QWidget*, unsigned int )) ); +connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) ); ... ... -void MyPart::insertConfigWidget( QObject const * dlg, QWidget * page, unsigned int pagenumber ) +void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned int pagenumber ) { if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartGlobalSettings * w = new MyPartGlobalSettings( this, page ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); } else if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartProjectSettings * w = new MyPartProjectSettings( this, page ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); } } @endcode @@ -84,7 +84,7 @@ public: * @param pagenumber A per-proxy unique identifier, used when responding to insertConfigWidget() signal. * @param icon The name of the icon to use. */ - void createGlobalConfigPage( QString const & title, unsigned int pagenumber, QString const & icon = "kdevelop" ); + void createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon = "kdevelop" ); /** * Tells the proxy you want a page in the Project Settings. @@ -92,7 +92,7 @@ public: * @param pagenumber A per-proxy unique identifier, used when responding to insertConfigWidget() signal. * @param icon The name of the icon to use. */ - void createProjectConfigPage( QString const & title, unsigned int pagenumber, QString const & icon = "kdevelop" ); + void createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon = "kdevelop" ); /** * Removes a config page from the proxy. Next time the settings dialog opens, this page will not be available. @@ -107,17 +107,17 @@ signals: * @param page The setting page. The client should use this as parent to the config widget. * @param pagenumber The identifier set in createGlobalConfigPage() or createProjectConfigPage(). Identifies the requested config page. */ - void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ); + void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ); private slots: void slotConfigWidget( KDialogBase * ); void slotProjectConfigWidget( KDialogBase * ); void slotConfigWidgetDestroyed(); - void slotAboutToShowPage( QWidget * page ); + void slotAboutToShowPage( TQWidget * page ); private: - typedef QMap<unsigned int, QPair<QString,QString> > TitleMap; - typedef QMap<QWidget*, int> PageMap; + typedef TQMap<unsigned int, QPair<TQString,TQString> > TitleMap; + typedef TQMap<TQWidget*, int> PageMap; TitleMap _globalTitleMap; TitleMap _projectTitleMap; diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp index b183717f..9f5d40c9 100644 --- a/lib/util/domutil.cpp +++ b/lib/util/domutil.cpp @@ -15,23 +15,23 @@ #include "domutil.h" #include <kdebug.h> -#include <qstringlist.h> -#include <qfile.h> +#include <tqstringlist.h> +#include <tqfile.h> -void DomUtil::makeEmpty( QDomElement& e ) +void DomUtil::makeEmpty( TQDomElement& e ) { while( !e.firstChild().isNull() ) e.removeChild( e.firstChild() ); } -QDomElement DomUtil::elementByPath(const QDomDocument &doc, const QString &path) +TQDomElement DomUtil::elementByPath(const TQDomDocument &doc, const TQString &path) { - QStringList l = QStringList::split('/', path); + TQStringList l = TQStringList::split('/', path); - QDomElement el; + TQDomElement el; if(&doc) el = doc.documentElement(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) { el = el.namedItem(*it).toElement(); } @@ -40,9 +40,9 @@ QDomElement DomUtil::elementByPath(const QDomDocument &doc, const QString &path) } -QString DomUtil::readEntry(const QDomDocument &doc, const QString &path, const QString &defaultEntry) +TQString DomUtil::readEntry(const TQDomDocument &doc, const TQString &path, const TQString &defaultEntry) { - QDomElement el = elementByPath(doc, path); + TQDomElement el = elementByPath(doc, path); if (el.isNull()) return defaultEntry; else @@ -51,20 +51,20 @@ QString DomUtil::readEntry(const QDomDocument &doc, const QString &path, const Q /// @todo consider whether it's okay to accept empty string == default value /// if not use the below type -///typedef pair<bool,QString> EltInfo; +///typedef pair<bool,TQString> EltInfo; -QString DomUtil::readEntryAux(const QDomDocument &doc, const QString &path) +TQString DomUtil::readEntryAux(const TQDomDocument &doc, const TQString &path) { - QDomElement el = elementByPath(doc, path); + TQDomElement el = elementByPath(doc, path); if (el.isNull()) - return QString::null; + return TQString::null; else return el.firstChild().toText().data(); } -int DomUtil::readIntEntry(const QDomDocument &doc, const QString &path, int defaultEntry) +int DomUtil::readIntEntry(const TQDomDocument &doc, const TQString &path, int defaultEntry) { - QString entry = readEntryAux(doc, path); + TQString entry = readEntryAux(doc, path); if (entry.isNull()) return defaultEntry; else @@ -72,9 +72,9 @@ int DomUtil::readIntEntry(const QDomDocument &doc, const QString &path, int defa } -bool DomUtil::readBoolEntry(const QDomDocument &doc, const QString &path, bool defaultEntry) +bool DomUtil::readBoolEntry(const TQDomDocument &doc, const TQString &path, bool defaultEntry) { - QString entry = readEntryAux(doc, path); + TQString entry = readEntryAux(doc, path); if (entry.isNull()) return defaultEntry; else @@ -82,12 +82,12 @@ bool DomUtil::readBoolEntry(const QDomDocument &doc, const QString &path, bool d } -QStringList DomUtil::readListEntry(const QDomDocument &doc, const QString &path, const QString &tag) +TQStringList DomUtil::readListEntry(const TQDomDocument &doc, const TQString &path, const TQString &tag) { - QStringList list; + TQStringList list; - QDomElement el = elementByPath(doc, path); - QDomElement subEl = el.firstChild().toElement(); + TQDomElement el = elementByPath(doc, path); + TQDomElement subEl = el.firstChild().toElement(); while (!subEl.isNull()) { if (subEl.tagName() == tag) list << subEl.firstChild().toText().data(); @@ -98,17 +98,17 @@ QStringList DomUtil::readListEntry(const QDomDocument &doc, const QString &path, } -DomUtil::PairList DomUtil::readPairListEntry(const QDomDocument &doc, const QString &path, const QString &tag, - const QString &firstAttr, const QString &secondAttr) +DomUtil::PairList DomUtil::readPairListEntry(const TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQString &firstAttr, const TQString &secondAttr) { PairList list; - QDomElement el = elementByPath(doc, path); - QDomElement subEl = el.firstChild().toElement(); + TQDomElement el = elementByPath(doc, path); + TQDomElement subEl = el.firstChild().toElement(); while (!subEl.isNull()) { if (subEl.tagName() == tag) { - QString first = subEl.attribute(firstAttr); - QString second = subEl.attribute(secondAttr); + TQString first = subEl.attribute(firstAttr); + TQString second = subEl.attribute(secondAttr); list << Pair(first, second); } subEl = subEl.nextSibling().toElement(); @@ -117,12 +117,12 @@ DomUtil::PairList DomUtil::readPairListEntry(const QDomDocument &doc, const QStr return list; } -QMap<QString, QString> DomUtil::readMapEntry(const QDomDocument &doc, const QString& path) +TQMap<TQString, TQString> DomUtil::readMapEntry(const TQDomDocument &doc, const TQString& path) { - QMap<QString, QString> map; + TQMap<TQString, TQString> map; - QDomElement el = elementByPath(doc, path); - QDomElement subEl = el.firstChild().toElement(); + TQDomElement el = elementByPath(doc, path); + TQDomElement subEl = el.firstChild().toElement(); while (!subEl.isNull()) { map[subEl.tagName()] = subEl.firstChild().toText().data(); subEl = subEl.nextSibling().toElement(); @@ -131,9 +131,9 @@ QMap<QString, QString> DomUtil::readMapEntry(const QDomDocument &doc, const QStr return map; } -QDomElement DomUtil::namedChildElement( QDomElement& el, const QString& name ) +TQDomElement DomUtil::namedChildElement( TQDomElement& el, const TQString& name ) { - QDomElement child = el.namedItem( name ).toElement(); + TQDomElement child = el.namedItem( name ).toElement(); if (child.isNull()) { child = el.ownerDocument().createElement( name ); el.appendChild(child); @@ -142,13 +142,13 @@ QDomElement DomUtil::namedChildElement( QDomElement& el, const QString& name ) } -QDomElement DomUtil::createElementByPath(QDomDocument &doc, const QString &path) +TQDomElement DomUtil::createElementByPath(TQDomDocument &doc, const TQString &path) { - QStringList l = QStringList::split('/', path); + TQStringList l = TQStringList::split('/', path); - QDomElement el; + TQDomElement el; if(&doc) el = doc.documentElement(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) el = DomUtil::namedChildElement( el, *it ); @@ -159,16 +159,16 @@ QDomElement DomUtil::createElementByPath(QDomDocument &doc, const QString &path) } -void DomUtil::writeEntry(QDomDocument &doc, const QString &path, const QString &value) +void DomUtil::writeEntry(TQDomDocument &doc, const TQString &path, const TQString &value) { - QDomElement el = createElementByPath(doc, path); + TQDomElement el = createElementByPath(doc, path); el.appendChild(doc.createTextNode(value)); } -void DomUtil::writeMapEntry(QDomDocument &doc, const QString &path, const QMap<QString, QString> &map) +void DomUtil::writeMapEntry(TQDomDocument &doc, const TQString &path, const TQMap<TQString, TQString> &map) { - QString basePath( path + "/" ); - QMap<QString,QString>::ConstIterator it; + TQString basePath( path + "/" ); + TQMap<TQString,TQString>::ConstIterator it; for (it = map.begin(); it != map.end(); ++it) { kdDebug( 9010 ) << "writing " << basePath << ";" << it.key() << ";" << it.data() << endl; @@ -177,65 +177,65 @@ void DomUtil::writeMapEntry(QDomDocument &doc, const QString &path, const QMap<Q } } -void DomUtil::writeIntEntry(QDomDocument &doc, const QString &path, int value) +void DomUtil::writeIntEntry(TQDomDocument &doc, const TQString &path, int value) { - writeEntry(doc, path, QString::number(value)); + writeEntry(doc, path, TQString::number(value)); } -void DomUtil::writeBoolEntry(QDomDocument &doc, const QString &path, bool value) +void DomUtil::writeBoolEntry(TQDomDocument &doc, const TQString &path, bool value) { writeEntry(doc, path, value? "true" : "false"); } -void DomUtil::writeListEntry(QDomDocument &doc, const QString &path, const QString &tag, - const QStringList &value) +void DomUtil::writeListEntry(TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQStringList &value) { - QDomElement el = createElementByPath(doc, path); + TQDomElement el = createElementByPath(doc, path); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = value.begin(); it != value.end(); ++it) { - QDomElement subEl = doc.createElement(tag); + TQDomElement subEl = doc.createElement(tag); subEl.appendChild(doc.createTextNode(*it)); el.appendChild(subEl); } } -void DomUtil::writePairListEntry(QDomDocument &doc, const QString &path, const QString &tag, - const QString &firstAttr, const QString &secondAttr, +void DomUtil::writePairListEntry(TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQString &firstAttr, const TQString &secondAttr, const PairList &value) { - QDomElement el = createElementByPath(doc, path); + TQDomElement el = createElementByPath(doc, path); PairList::ConstIterator it; for (it = value.begin(); it != value.end(); ++it) { - QDomElement subEl = doc.createElement(tag); + TQDomElement subEl = doc.createElement(tag); subEl.setAttribute(firstAttr, (*it).first); subEl.setAttribute(secondAttr, (*it).second); el.appendChild(subEl); } } -DomPath DomUtil::resolvPathStringExt(const QString pathstring) +DomPath DomUtil::resolvPathStringExt(const TQString pathstring) { // parse path unsigned int i; - QStringList pathParts = QStringList::split('/',pathstring); + TQStringList pathParts = TQStringList::split('/',pathstring); DomPath dompath; for (i=0; i<pathParts.count(); i++) { - QStringList pathElemParts = QStringList::split('|',pathParts[i],TRUE); + TQStringList pathElemParts = TQStringList::split('|',pathParts[i],TRUE); DomPathElement dompathelem; dompathelem.tagName = pathElemParts[0].simplifyWhiteSpace(); if (pathElemParts.count()>1) { // handle attributes - QStringList attrParts = QStringList::split(';',pathElemParts[1]); + TQStringList attrParts = TQStringList::split(';',pathElemParts[1]); for (unsigned int j=0; j<attrParts.count(); j++) { - QStringList attribSet = QStringList::split('=',attrParts[j]); + TQStringList attribSet = TQStringList::split('=',attrParts[j]); if (attribSet.count()<2) continue; DomAttribute domattribute; @@ -256,12 +256,12 @@ DomPath DomUtil::resolvPathStringExt(const QString pathstring) #define rightchild !wrongchild -QDomElement DomUtil::elementByPathExt(QDomDocument &doc, const QString &pathstring) +TQDomElement DomUtil::elementByPathExt(TQDomDocument &doc, const TQString &pathstring) { DomPath dompath = resolvPathStringExt(pathstring); - QDomElement elem = doc.documentElement(); - QDomNodeList children; - QDomElement nextElem = elem; + TQDomElement elem = doc.documentElement(); + TQDomNodeList children; + TQDomElement nextElem = elem; for (unsigned int j=0; j<dompath.count(); j++) { children = nextElem.childNodes(); @@ -271,15 +271,15 @@ QDomElement DomUtil::elementByPathExt(QDomDocument &doc, const QString &pathstri for (unsigned int i=0; i<children.count(); i++) { wrongchild = false; - QDomElement child = children.item(i).toElement(); - QString tag = child.tagName(); + TQDomElement child = children.item(i).toElement(); + TQString tag = child.tagName(); tag = dompathelement.tagName; if (child.tagName() == dompathelement.tagName) { for (unsigned int k=0; k<dompathelement.attribute.count(); k++) { DomAttribute domattribute = dompathelement.attribute[k]; - QDomAttr domattr = child.attributeNode(domattribute.name); + TQDomAttr domattr = child.attributeNode(domattribute.name); if (domattr.isNull() || domattr.value() != domattribute.value) { @@ -301,7 +301,7 @@ QDomElement DomUtil::elementByPathExt(QDomDocument &doc, const QString &pathstri } if (wrongchild) { - QDomElement nullDummy; + TQDomElement nullDummy; nullDummy.clear(); return nullDummy; } @@ -310,9 +310,9 @@ QDomElement DomUtil::elementByPathExt(QDomDocument &doc, const QString &pathstri } -bool DomUtil::openDOMFile(QDomDocument &doc, QString filename) +bool DomUtil::openDOMFile(TQDomDocument &doc, TQString filename) { - QFile file( filename ); + TQFile file( filename ); if ( !file.open( IO_ReadOnly ) ) return false; if ( !doc.setContent( &file ) ) { @@ -323,23 +323,23 @@ bool DomUtil::openDOMFile(QDomDocument &doc, QString filename) return true; } -bool DomUtil::saveDOMFile(QDomDocument &doc, QString filename) +bool DomUtil::saveDOMFile(TQDomDocument &doc, TQString filename) { - QFile file( filename ); + TQFile file( filename ); if ( !file.open( IO_ReadWrite | IO_Truncate ) ) return false; - QTextStream t( &file ); + TQTextStream t( &file ); t << doc.toString(); file.close(); return true; } -bool DomUtil::removeTextNodes(QDomDocument doc,QString pathExt) +bool DomUtil::removeTextNodes(TQDomDocument doc,TQString pathExt) { - QDomElement elem = elementByPathExt(doc,pathExt); + TQDomElement elem = elementByPathExt(doc,pathExt); if (elem.isNull()) return false; - QDomNodeList children = elem.childNodes(); + TQDomNodeList children = elem.childNodes(); for (unsigned int i=0;i<children.count();i++) if (children.item(i).isText()) elem.removeChild(children.item(i)); @@ -347,9 +347,9 @@ bool DomUtil::removeTextNodes(QDomDocument doc,QString pathExt) } -bool DomUtil::appendText(QDomDocument doc, QString pathExt, QString text) +bool DomUtil::appendText(TQDomDocument doc, TQString pathExt, TQString text) { - QDomElement elem = elementByPathExt(doc,pathExt); + TQDomElement elem = elementByPathExt(doc,pathExt); if (elem.isNull()) return false; elem.appendChild(doc.createTextNode(text)); @@ -357,7 +357,7 @@ bool DomUtil::appendText(QDomDocument doc, QString pathExt, QString text) } -bool DomUtil::replaceText(QDomDocument doc, QString pathExt, QString text) +bool DomUtil::replaceText(TQDomDocument doc, TQString pathExt, TQString text) { if (removeTextNodes(doc,pathExt) && appendText(doc,pathExt,text)) diff --git a/lib/util/domutil.h b/lib/util/domutil.h index a301ef00..08d2571a 100644 --- a/lib/util/domutil.h +++ b/lib/util/domutil.h @@ -13,11 +13,11 @@ #ifndef _DOMUTIL_H_ #define _DOMUTIL_H_ -#include <qdom.h> -#include <qpair.h> -#include <qstringlist.h> -#include <qvaluelist.h> -#include <qmap.h> +#include <tqdom.h> +#include <tqpair.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> +#include <tqmap.h> /** @file domutil.h @@ -26,18 +26,18 @@ Utility functions to operate on %DOM. struct DomAttribute { - QString name; - QString value; + TQString name; + TQString value; }; struct DomPathElement { - QString tagName; - QValueList<DomAttribute> attribute; + TQString tagName; + TQValueList<DomAttribute> attribute; int matchNumber; // for use when more than one element matches the path }; -typedef QValueList<DomPathElement> DomPath; +typedef TQValueList<DomPathElement> DomPath; /** * Utility class for conveniently accessing data in a %DOM tree. @@ -45,52 +45,52 @@ typedef QValueList<DomPathElement> DomPath; class DomUtil { public: - typedef QPair<QString, QString> Pair; - typedef QValueList<Pair> PairList; + typedef QPair<TQString, TQString> Pair; + typedef TQValueList<Pair> PairList; /** * Remove all child elements from a given element. */ - static void makeEmpty( QDomElement& ); + static void makeEmpty( TQDomElement& ); /** * Reads a string entry. */ - static QString readEntry(const QDomDocument &doc, const QString &path, const QString &defaultEntry = QString::null); + static TQString readEntry(const TQDomDocument &doc, const TQString &path, const TQString &defaultEntry = TQString::null); /** * Reads a number entry. */ - static int readIntEntry(const QDomDocument &doc, const QString &path, int defaultEntry = 0); + static int readIntEntry(const TQDomDocument &doc, const TQString &path, int defaultEntry = 0); /** * Reads a boolean entry. The strings "true" and "TRUE" are interpreted * as true, all other as false. */ - static bool readBoolEntry(const QDomDocument &doc, const QString &path, bool defaultEntry = false); + static bool readBoolEntry(const TQDomDocument &doc, const TQString &path, bool defaultEntry = false); /** * Reads a list entry. See writeListEntry(). */ - static QStringList readListEntry(const QDomDocument &doc, const QString &path, const QString &tag); + static TQStringList readListEntry(const TQDomDocument &doc, const TQString &path, const TQString &tag); /** * Reads a list of string pairs. See writePairListEntry(). */ - static PairList readPairListEntry(const QDomDocument &doc, const QString &path, const QString &tag, - const QString &firstAttr, const QString &secondAttr); + static PairList readPairListEntry(const TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQString &firstAttr, const TQString &secondAttr); /** * Reads a string to string map. See writeMapEntry() */ - static QMap<QString, QString> readMapEntry(const QDomDocument &doc, const QString &path); + static TQMap<TQString, TQString> readMapEntry(const TQDomDocument &doc, const TQString &path); /** * Retrieves an element by path, return null if any item along * the path does not exist. */ - static QDomElement elementByPath( const QDomDocument& doc, const QString& path ); + static TQDomElement elementByPath( const TQDomDocument& doc, const TQString& path ); /** * Retrieves an element by path, creating the necessary nodes. */ - static QDomElement createElementByPath( QDomDocument& doc, const QString& path ); + static TQDomElement createElementByPath( TQDomDocument& doc, const TQString& path ); /** * Retrieves a child element, creating it if it does not exist. * The return value is guaranteed to be non isNull() */ - static QDomElement namedChildElement( QDomElement& el, const QString& name ); + static TQDomElement namedChildElement( TQDomElement& el, const TQString& name ); /** Writes a string entry. For example, \verbatim @@ -103,20 +103,20 @@ public: </code> \endverbatim */ - static void writeEntry(QDomDocument &doc, const QString &path, const QString &value); + static void writeEntry(TQDomDocument &doc, const TQString &path, const TQString &value); /** * Writes a number entry. */ - static void writeIntEntry(QDomDocument &doc, const QString &path, int value); + static void writeIntEntry(TQDomDocument &doc, const TQString &path, int value); /** * Writes a boolean entry. Booleans are stored as "true", "false" resp. */ - static void writeBoolEntry(QDomDocument &doc, const QString &path, bool value); + static void writeBoolEntry(TQDomDocument &doc, const TQString &path, bool value); /** Writes a string list element. The list elements are separated by tag. For example, \verbatim <code> - QStringList l; l << "one" << "two"; + TQStringList l; l << "one" << "two"; writeListEntry(doc, "/general/special", "el", l); </code> \endverbatim creates the %DOM fragment: \verbatim @@ -125,8 +125,8 @@ public: </code> \endverbatim */ - static void writeListEntry(QDomDocument &doc, const QString &path, const QString &tag, - const QStringList &value); + static void writeListEntry(TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQStringList &value); /** Writes a list of string pairs. The list elements are stored in the attributes firstAttr and secondAttr of elements named tag. For example, @@ -146,14 +146,14 @@ public: </code> \endverbatim */ - static void writePairListEntry(QDomDocument &doc, const QString &path, const QString &tag, - const QString &firstAttr, const QString &secondAttr, + static void writePairListEntry(TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQString &firstAttr, const TQString &secondAttr, const PairList &value); /** * Writes a string to string map. This map is stored in a way, that it can be read with * readMapEntry() and readEntry() */ - static void writeMapEntry(QDomDocument &doc, const QString& path, const QMap<QString,QString> &map); + static void writeMapEntry(TQDomDocument &doc, const TQString& path, const TQMap<TQString,TQString> &map); /** * Resolves an extended path @@ -162,7 +162,7 @@ public: * where matchNumber is zero-based * path: pathpart[/pathpart/..] */ - static DomPath resolvPathStringExt(const QString pathstring); + static DomPath resolvPathStringExt(const TQString pathstring); /** Retrieve an element specified with extended path @@ -174,7 +174,7 @@ public: or "widget/property||2/string" . \verbatim - <widget class="QDialog"> + <widget class="TQDialog"> <property name="name"> <cstring>KdevFormName</cstring> </property> @@ -192,35 +192,35 @@ public: </widget> \endverbatim */ - static QDomElement elementByPathExt(QDomDocument &doc, const QString &pathstring); + static TQDomElement elementByPathExt(TQDomDocument &doc, const TQString &pathstring); /** * Open file - filename - and set setContents of doc */ - static bool openDOMFile(QDomDocument &doc, QString filename); + static bool openDOMFile(TQDomDocument &doc, TQString filename); /** * Store contents of doc in file - filename. Existing file will be truncated! */ - static bool saveDOMFile(QDomDocument &doc, QString filename); + static bool saveDOMFile(TQDomDocument &doc, TQString filename); /** * Remove all child text nodes of parent described in pathExt */ - static bool removeTextNodes(QDomDocument doc,QString pathExt); + static bool removeTextNodes(TQDomDocument doc,TQString pathExt); /** * Add child text node to parent described in pathExt */ - static bool appendText(QDomDocument doc, QString pathExt, QString text); + static bool appendText(TQDomDocument doc, TQString pathExt, TQString text); /** * Replace all chilt text nodes of parent described in pathExt with one new. */ - static bool replaceText(QDomDocument doc, QString pathExt, QString text); + static bool replaceText(TQDomDocument doc, TQString pathExt, TQString text); private: - static QString readEntryAux(const QDomDocument &doc, const QString &path); + static TQString readEntryAux(const TQDomDocument &doc, const TQString &path); }; #endif diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 7618bd6e..7c4fea89 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -24,27 +24,27 @@ #include <klocale.h> #include <kmessagebox.h> -ExecCommand::ExecCommand( const QString& executable, const QStringList& args, - const QString& workingDir, const QStringList& env, - QObject* parent, const char* name ): - QObject( parent, name ), out( "" ) /* make sure out is not QString::null since that would mean "error" */ +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" */ { progressDlg = 0; proc = new KProcess(); proc->setWorkingDirectory( workingDir ); - for ( QStringList::ConstIterator it = env.begin(); it != env.end(); ++it ) + for ( TQStringList::ConstIterator it = env.begin(); it != env.end(); ++it ) proc->setEnvironment( (*it).section( '=', 0, 0 ), (*it).section( '=', 1, 1 ) ); *proc << executable; *proc << args; - connect( proc, SIGNAL(processExited(KProcess*)), - this, SLOT(processExited()) ); - connect( proc, SIGNAL(receivedStdout(KProcess*,char*,int)), - this, SLOT(receivedStdout(KProcess*,char*,int)) ); - connect( proc, SIGNAL(receivedStderr(KProcess*,char*,int)), - this, SLOT(receivedStderr(KProcess*,char*,int)) ); + connect( proc, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(processExited()) ); + connect( proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), + this, TQT_SLOT(receivedStdout(KProcess*,char*,int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), + this, TQT_SLOT(receivedStderr(KProcess*,char*,int)) ); bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); @@ -52,25 +52,25 @@ ExecCommand::ExecCommand( const QString& executable, const QStringList& args, KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ), i18n("Error Invoking Command") ); - emit finished( QString::null, QString::null ); + emit finished( TQString::null, TQString::null ); deleteLater(); } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); - connect( progressDlg, SIGNAL(cancelClicked()), - this, SLOT(cancelClicked()) ); + connect( progressDlg, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(cancelClicked()) ); } } void ExecCommand::receivedStdout (KProcess*, char *buffer, int buflen) { - out += QString::fromUtf8( buffer, buflen ); + out += TQString::fromUtf8( buffer, buflen ); } void ExecCommand::receivedStderr (KProcess*, char *buffer, int buflen) { - err += QString::fromUtf8( buffer, buflen ); + err += TQString::fromUtf8( buffer, buflen ); } void ExecCommand::processExited() @@ -88,7 +88,7 @@ void ExecCommand::cancelClicked() progressDlg = 0; proc->kill(); - emit finished( QString::null, QString::null ); + emit finished( TQString::null, TQString::null ); deleteLater(); } diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h index c00085c6..c3e20d47 100644 --- a/lib/util/execcommand.h +++ b/lib/util/execcommand.h @@ -20,8 +20,8 @@ #ifndef _EXECCOMMAND_H_ #define _EXECCOMMAND_H_ -#include <qobject.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstringlist.h> class KProcess; class KProgressDialog; @@ -37,22 +37,22 @@ 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 QString::null, otherwise QStrings containing the stdout/stderr. + * will emit a TQString::null, otherwise QStrings containing the stdout/stderr. * * The object will delete itself after the finished signal has been emitted. - * Additional environment can be set in the QStringList env via QStrings with the format "foo=blah" + * Additional environment can be set in the TQStringList env via QStrings with the format "foo=blah" */ class ExecCommand : public QObject { Q_OBJECT public: - ExecCommand( const QString& executable, const QStringList& args, - const QString& workingDir = QString::null, - const QStringList& env = QStringList(), QObject* parent = 0, const char* name = 0 ); + ExecCommand( const TQString& executable, const TQStringList& args, + const TQString& workingDir = TQString::null, + const TQStringList& env = TQStringList(), TQObject* parent = 0, const char* name = 0 ); ~ExecCommand(); signals: - void finished( const QString& output, const QString& errorOutput ); + void finished( const TQString& output, const TQString& errorOutput ); private slots: void receivedStdout (KProcess *, char *buffer, int buflen); @@ -63,8 +63,8 @@ private slots: private: KProcess* proc; KProgressDialog* progressDlg; - QString out; - QString err; + TQString out; + TQString err; }; #endif diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp index 78abf384..cbf4f8bb 100644 --- a/lib/util/filetemplate.cpp +++ b/lib/util/filetemplate.cpp @@ -19,11 +19,11 @@ #include "filetemplate.h" -#include <qdatetime.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> -#include <qtextstream.h> +#include <tqdatetime.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> +#include <tqtextstream.h> #include <kstandarddirs.h> @@ -32,97 +32,97 @@ #include "domutil.h" -bool FileTemplate::exists(KDevPlugin *part, const QString &name, Policy p) +bool FileTemplate::exists(KDevPlugin *part, const TQString &name, Policy p) { - //QString fileName = (p == Default) ? + //TQString fileName = (p == Default) ? // (part->project()->projectDirectory() + "/templates/" + name) : name; - return QFile::exists( fullPathForName(part,name,p) ); + return TQFile::exists( fullPathForName(part,name,p) ); } -QString FileTemplate::read(KDevPlugin *part, const QString &name, Policy p) +TQString FileTemplate::read(KDevPlugin *part, const TQString &name, Policy p) { //KDevProject *project = part->project(); - //QString fileName = (p == Default) ? (project->projectDirectory() + + //TQString fileName = (p == Default) ? (project->projectDirectory() + // "/templates/" + name) : name; return readFile(part, fullPathForName(part, name, p) ); } -QString FileTemplate::readFile(KDevPlugin *part, const QString &fileName) +TQString FileTemplate::readFile(KDevPlugin *part, const TQString &fileName) { - QDomDocument &dom = *part->projectDom(); + TQDomDocument &dom = *part->projectDom(); - QFile f(fileName); + TQFile f(fileName); if (!f.open(IO_ReadOnly)) - return QString::null; - QTextStream stream(&f); - QString str = stream.read(); + return TQString::null; + TQTextStream stream(&f); + TQString str = stream.read(); return makeSubstitutions( dom, str ); } -QString FileTemplate::makeSubstitutions( QDomDocument & dom, const QString & text ) +TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString & text ) { - QString author = DomUtil::readEntry(dom, "/general/author"); - QString email = DomUtil::readEntry(dom, "/general/email"); - QString version = DomUtil::readEntry(dom, "/general/version"); - QString appname = DomUtil::readEntry(dom, "/general/projectname"); - QString date = QDate::currentDate().toString(); - QString year = QString::number(QDate::currentDate().year()); - - QString str = text; - str.replace(QRegExp("\\$EMAIL\\$"),email); - str.replace(QRegExp("\\$AUTHOR\\$"),author); - str.replace(QRegExp("\\$VERSION\\$"),version); - str.replace(QRegExp("\\$DATE\\$"),date); - str.replace(QRegExp("\\$YEAR\\$"),year); - str.replace(QRegExp("\\$APPNAME\\$"),appname); - str.replace(QRegExp("\\$APPNAME\\$"),appname); - str.replace(QRegExp("\\$APPNAMEUC\\$"),appname.upper()); - str.replace(QRegExp("\\$APPNAMELC\\$"),appname.lower()); + TQString author = DomUtil::readEntry(dom, "/general/author"); + 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 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()); return str; } -bool FileTemplate::copy(KDevPlugin *part, const QString &name, - const QString &dest, Policy p) +bool FileTemplate::copy(KDevPlugin *part, const TQString &name, + const TQString &dest, Policy p) { - QString text = read(part, name, p); + TQString text = read(part, name, p); - QFile f(dest); + TQFile f(dest); if (!f.open(IO_WriteOnly)) return false; - QFileInfo fi(f); - QString module = fi.baseName(); - QString basefilename = fi.baseName(true); - text.replace(QRegExp("\\$MODULE\\$"),module); - text.replace(QRegExp("\\$FILENAME\\$"),basefilename); + TQFileInfo fi(f); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName(true); + text.replace(TQRegExp("\\$MODULE\\$"),module); + text.replace(TQRegExp("\\$FILENAME\\$"),basefilename); - QTextStream stream(&f); + TQTextStream stream(&f); stream << text; f.close(); return true; } -QString FileTemplate::fullPathForName(KDevPlugin *part, const QString &name, +TQString FileTemplate::fullPathForName(KDevPlugin *part, const TQString &name, Policy p) { // if Policy is not default, full path is just the name if (p!=Default) return name; - QString fileName; + TQString fileName; // first try project-specific if (part->project()) { fileName = (part->project()->projectDirectory() + "/templates/" + name); - if (QFile::exists(fileName)) return fileName; + if (TQFile::exists(fileName)) return fileName; } // next try global - QString globalName = ::locate("data", "kdevfilecreate/file-templates/" + name); + TQString globalName = ::locate("data", "kdevfilecreate/file-templates/" + name); return globalName.isNull() ? fileName : globalName; } diff --git a/lib/util/filetemplate.h b/lib/util/filetemplate.h index f179f5be..b1ba2cdc 100644 --- a/lib/util/filetemplate.h +++ b/lib/util/filetemplate.h @@ -20,7 +20,7 @@ #ifndef _FILETEMPLATE_H_ #define _FILETEMPLATE_H_ -#include <qstring.h> +#include <tqstring.h> class KDevPlugin; class QDomDocument; @@ -49,40 +49,40 @@ public: * exists in the current project. File templates * are stored in the "templates" subdirectory of a project or in application shared dirs. */ - static bool exists(KDevPlugin *part, const QString &name, Policy p = Default); + static bool exists(KDevPlugin *part, const TQString &name, Policy p = Default); /** * Reads a template with the given name (e.g. "cpp") * and makes variable substitutions (like $AUTHOR$ etc.) * in it. The resulting string is returned. */ - static QString read(KDevPlugin *part, const QString &name, Policy p = Default); + static TQString read(KDevPlugin *part, const TQString &name, Policy p = Default); /** * Reads a template with the given URL * and makes variable substitutions (like $AUTHOR$ etc.) * in it. The resulting string is returned. */ - static QString readFile(KDevPlugin *part, const QString &fileName); + static TQString readFile(KDevPlugin *part, const TQString &fileName); /** - * Makes variable substitutions on a text, based on a specified QDomDocument + * Makes variable substitutions on a text, based on a specified TQDomDocument * describing a KDevelop project file. The resulting string is returned. */ - static QString makeSubstitutions(QDomDocument &dom, const QString &text); + static TQString makeSubstitutions(TQDomDocument &dom, const TQString &text); /** * Copies a file template with the given name to the * file with the name dest and - while copying - * performs variable substitutions. */ - static bool copy(KDevPlugin *part, const QString &name, - const QString &dest, Policy p = Default); + static bool copy(KDevPlugin *part, const TQString &name, + const TQString &dest, Policy p = Default); /** * Translates a template name into a full path, or suggests a full path * for the template in the project directory if it doesn't exist. */ - static QString fullPathForName(KDevPlugin *part, const QString &name, Policy p = Default); + static TQString fullPathForName(KDevPlugin *part, const TQString &name, Policy p = Default); }; #endif diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp index fdf044d5..ca946ce6 100644 --- a/lib/util/kdeveditorutil.cpp +++ b/lib/util/kdeveditorutil.cpp @@ -33,15 +33,15 @@ bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * co return true; } -QString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view ) +TQString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view ) { KTextEditor::EditInterface * editIface = dynamic_cast<KTextEditor::EditInterface*>( doc ); - if ( !editIface ) return QString(); + if ( !editIface ) return TQString(); view = view ? view : dynamic_cast<KTextEditor::View*>( doc->widget() ); KTextEditor::ViewCursorInterface * cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>( view ); - if ( !cursorIface ) return QString(); + if ( !cursorIface ) return TQString(); uint line = 0; uint col = 0; @@ -50,21 +50,21 @@ QString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::V return editIface->textLine(line); } -QString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view ) +TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view ) { KTextEditor::EditInterface * editIface = dynamic_cast<KTextEditor::EditInterface*>( doc ); - if ( !editIface ) return QString(); + if ( !editIface ) return TQString(); view = view ? view : dynamic_cast<KTextEditor::View*>( doc->widget() ); KTextEditor::ViewCursorInterface * cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>( view ); - if ( !cursorIface ) return QString(); + if ( !cursorIface ) return TQString(); uint line = 0; uint col = 0; cursorIface->cursorPositionReal(&line, &col); - QString linestr = editIface->textLine(line); + TQString linestr = editIface->textLine(line); int startPos = QMAX( QMIN( (int)col, (int)linestr.length()-1 ), 0 ); int endPos = startPos; @@ -74,14 +74,14 @@ QString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::V while (endPos < (int)linestr.length() && ( linestr[endPos].isLetterOrNumber() || linestr[endPos] == '_' ) ) endPos++; - return ( ( startPos == endPos ) ? QString::null : linestr.mid( startPos+1, endPos-startPos-1 ) ); + return ( ( startPos == endPos ) ? TQString::null : linestr.mid( startPos+1, endPos-startPos-1 ) ); } -QString KDevEditorUtil::currentSelection( KTextEditor::Document * doc ) +TQString KDevEditorUtil::currentSelection( KTextEditor::Document * doc ) { KTextEditor::SelectionInterface * selectIface = dynamic_cast<KTextEditor::SelectionInterface*>( doc ); - return selectIface ? selectIface->selection() : QString(); + return selectIface ? selectIface->selection() : TQString(); } diff --git a/lib/util/kdeveditorutil.h b/lib/util/kdeveditorutil.h index 7b788fc3..79a64fe1 100644 --- a/lib/util/kdeveditorutil.h +++ b/lib/util/kdeveditorutil.h @@ -18,7 +18,7 @@ class Document; class View; } -#include <qstring.h> +#include <tqstring.h> /** Class with some common utility operations not currently supported by KTE @@ -46,19 +46,19 @@ public: * @param view * @return */ - static QString currentLine( KTextEditor::Document * doc, KTextEditor::View * view = 0 ); + static TQString currentLine( KTextEditor::Document * doc, KTextEditor::View * view = 0 ); /** * Call to get the text under the cursor of the currently active view. * @return the text under the cursor of the currently active view */ - static QString currentWord( KTextEditor::Document * doc, KTextEditor::View * view = 0 ); + static TQString currentWord( KTextEditor::Document * doc, KTextEditor::View * view = 0 ); /** * Call to get the selection in the currently active view * @return the selection in the currently active view */ - static QString currentSelection( KTextEditor::Document * doc ); + static TQString currentSelection( KTextEditor::Document * doc ); }; #endif diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp index b7f9e2ae..b0b78250 100644 --- a/lib/util/kdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -11,22 +11,22 @@ #include "kdevjobtimer.h" -KDevJobTimer::KDevJobTimer( void * payload, QObject *parent, const char *name) - : QTimer(parent, name) +KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) + : TQTimer(parent, name) { m_payload = payload; - connect( this, SIGNAL(timeout()), this, SLOT(slotTimeout()) ); + connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); } KDevJobTimer::~KDevJobTimer() { } -void KDevJobTimer::singleShot(int msec, QObject * receiver, const char * member, void * payload) +void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload) { KDevJobTimer * p = new KDevJobTimer( payload ); p->start( msec, true ); - connect( p, SIGNAL(timeout(void*)), receiver, member ); + connect( p, TQT_SIGNAL(timeout(void*)), receiver, member ); } void KDevJobTimer::slotTimeout() diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h index 972a654a..19915d06 100644 --- a/lib/util/kdevjobtimer.h +++ b/lib/util/kdevjobtimer.h @@ -12,19 +12,19 @@ #ifndef KDEVJOBTIMER_H #define KDEVJOBTIMER_H -#include <qtimer.h> +#include <tqtimer.h> class KDevJobTimer : public QTimer { Q_OBJECT public: - static void singleShot( int msec, QObject * receiver, const char * member, void * payload ); + static void singleShot( int msec, TQObject * receiver, const char * member, void * payload ); signals: void timeout(void*); private: - KDevJobTimer( void * payload, QObject *parent = 0, const char *name = 0); + KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0); ~KDevJobTimer(); private slots: diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index f9a61fea..546360c6 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <qtimer.h> -#include <qframe.h> +#include <tqtimer.h> +#include <tqframe.h> #include <kdebug.h> #include <kparts/part.h> @@ -20,8 +20,8 @@ #include "kdevshellwidget.h" -KDevShellWidget::KDevShellWidget(QWidget *parent, const char *name) - : QVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false ) +KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name) + : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false ) { } @@ -30,7 +30,7 @@ KDevShellWidget::~KDevShellWidget() { } -void KDevShellWidget::setShell( const QString & shell, const QStrList & arguments ) +void KDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments ) { m_shellName = shell; m_shellArguments = arguments; @@ -44,16 +44,16 @@ void KDevShellWidget::activate( ) m_konsolePart = (KParts::ReadOnlyPart *) factory->create( this, "libkonsolepart", "KParts::ReadOnlyPart" ); if ( !m_konsolePart ) return; - connect( m_konsolePart, SIGNAL( processExited(KProcess *) ), this, SLOT( processExited(KProcess *) ) ); - connect( m_konsolePart, SIGNAL( receivedData( const QString& ) ), this, SIGNAL( receivedData( const QString& ) ) ); - connect( m_konsolePart, SIGNAL(destroyed()), this, SLOT(partDestroyed()) ); + 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( QWidget::WheelFocus ); + m_konsolePart->widget()->setFocusPolicy( TQWidget::WheelFocus ); setFocusProxy( m_konsolePart->widget() ); m_konsolePart->widget()->setFocus(); - if ( m_konsolePart->widget()->inherits("QFrame") ) - ((QFrame*)m_konsolePart->widget())->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + if ( m_konsolePart->widget()->inherits("TQFrame") ) + ((TQFrame*)m_konsolePart->widget())->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); m_konsolePart->widget()->show(); @@ -89,7 +89,7 @@ void KDevShellWidget::processExited( KProcess * proc ) emit shellSignalled( proc->exitSignal() ); } -void KDevShellWidget::sendInput( const QString & text ) +void KDevShellWidget::sendInput( const TQString & text ) { if ( !m_konsolePart ) return; TerminalInterface* ti = static_cast<TerminalInterface*>( m_konsolePart->qt_cast( "TerminalInterface" ) ); @@ -109,7 +109,7 @@ void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate ) // reactivating with a non-working setting (the partDestroyed() // slot will have ran before m_doAutoActivate is set) if ( doAutoActivate ) - QTimer::singleShot( 3000, this, SLOT(setAutoReactivateOnCloseDelayed()) ); + TQTimer::singleShot( 3000, this, TQT_SLOT(setAutoReactivateOnCloseDelayed()) ); else m_doAutoActivate = false; } diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 3f1500aa..69198a7a 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -13,9 +13,9 @@ #ifndef KDEVSHELLWIDGET_H #define KDEVSHELLWIDGET_H -#include <qstrlist.h> -#include <qvbox.h> -#include <qguardedptr.h> +#include <tqstrlist.h> +#include <tqvbox.h> +#include <tqguardedptr.h> class KProcess; namespace KParts @@ -29,7 +29,7 @@ class KDevShellWidget : public QVBox Q_OBJECT public: - KDevShellWidget(QWidget *parent = 0, const char *name = 0); + KDevShellWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KDevShellWidget(); /** @@ -37,7 +37,7 @@ public: * @param shell The shell name, for example 'irb' or '/bin/bash' * @param arguments Any optional arguments */ - void setShell( const QString & shell, const QStrList & arguments = QStrList() ); + void setShell( const TQString & shell, const TQStrList & arguments = TQStrList() ); /** * Executes the previously set shell. If @ref setShell wasn't called before @@ -55,7 +55,7 @@ public: * Send text to the running shell * @param text The text to send to the shell */ - void sendInput( const QString & text ); + void sendInput( const TQString & text ); /** * Call to check if the shell is currently running @@ -80,7 +80,7 @@ signals: * This signal will be emitted when the process receives data * @param text received data */ - void receivedData( const QString & ); + void receivedData( const TQString & ); private slots: void partDestroyed(); @@ -88,9 +88,9 @@ private slots: void setAutoReactivateOnCloseDelayed( ); private: - QGuardedPtr<KParts::ReadOnlyPart> m_konsolePart; - QString m_shellName; - QStrList m_shellArguments; + TQGuardedPtr<KParts::ReadOnlyPart> m_konsolePart; + TQString m_shellName; + TQStrList m_shellArguments; bool m_doAutoActivate; bool m_isRunning; }; diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index b06a9edf..ffc3a536 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -29,11 +29,11 @@ #include <kdebug.h> #include <scriptinterface.h> #include <kaction.h> -#include <qfileinfo.h> -#include <qtimer.h> +#include <tqfileinfo.h> +#include <tqtimer.h> -KScriptAction::KScriptAction( const QString &scriptDesktopFile, QObject *interface, KActionCollection *ac ) - : QObject(interface), KScriptClientInterface( ) +KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ) + : TQObject(interface), KScriptClientInterface( ) { m_interface = 0L; m_action = 0L; @@ -43,24 +43,24 @@ KScriptAction::KScriptAction( const QString &scriptDesktopFile, QObject *interfa if(KDesktopFile::isDesktopFile(scriptDesktopFile)) { KDesktopFile desktop(scriptDesktopFile, true); - QFileInfo scriptPath(scriptDesktopFile); + TQFileInfo scriptPath(scriptDesktopFile); m_scriptFile = scriptPath.dirPath(true) + "/" + desktop.readEntry("X-KDE-ScriptName", ""); m_scriptName = desktop.readName(); m_scriptType = desktop.readType(); - QString scriptTypeQuery = "([X-KDE-Script-Runner] == '" + m_scriptType + "')"; + TQString scriptTypeQuery = "([X-KDE-Script-Runner] == '" + m_scriptType + "')"; KTrader::OfferList offers = KTrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); if ( !offers.isEmpty() ) { - m_action = new KAction(m_scriptName, KShortcut(), this, SLOT(activate()), ac, "script"); + m_action = new KAction(m_scriptName, KShortcut(), this, TQT_SLOT(activate()), ac, "script"); m_isValid = true; - m_timeout = new QTimer(this); - QString icon = desktop.readIcon(); + m_timeout = new TQTimer(this); + TQString icon = desktop.readIcon(); m_action->setStatusText(desktop.readComment()); if( !icon.isEmpty() ) m_action->setIcon(icon); m_action->setShortcutConfigurable(true); - connect( m_timeout, SIGNAL(timeout()), SLOT(cleanup()) ); + connect( m_timeout, TQT_SIGNAL(timeout()), TQT_SLOT(cleanup()) ); } } } @@ -82,7 +82,7 @@ void KScriptAction::activate( ) { if( m_interface == 0L) { - QString scriptTypeQuery = "([X-KDE-Script-Runner] == '" + m_scriptType + "')"; + TQString scriptTypeQuery = "([X-KDE-Script-Runner] == '" + m_scriptType + "')"; m_interface= KParts::ComponentFactory::createInstanceFromQuery<KScriptInterface>( "KScriptRunner/KScriptRunner", scriptTypeQuery, this ); if ( m_interface != 0L) { @@ -91,7 +91,7 @@ void KScriptAction::activate( ) m_interface->setScript(m_scriptFile); else m_interface->setScript(m_scriptFile, m_scriptMethod); - connect(this, SIGNAL(done(KScriptClientInterface::Result, const QVariant &)), this, SLOT(scriptFinished())); + connect(this, TQT_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQT_SLOT(scriptFinished())); } else { @@ -100,7 +100,7 @@ void KScriptAction::activate( ) return; } } - m_interface->run(parent(), QVariant()); + m_interface->run(parent(), TQVariant()); m_timeout->start(60000,FALSE); // after 1 minute unload m_refs++; } @@ -119,7 +119,7 @@ void KScriptAction::scriptFinished() m_refs--; } -KScriptActionManager::KScriptActionManager( QObject *parent, KActionCollection * ac ) : QObject(parent), m_ac(ac) +KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac) { m_actions.setAutoDelete(true); } @@ -129,22 +129,22 @@ KScriptActionManager::~ KScriptActionManager( ) m_actions.clear(); } -QPtrList< KAction > KScriptActionManager::scripts( QObject * interface , const QStringList &dirs) const +TQPtrList< KAction > KScriptActionManager::scripts( TQObject * interface , const TQStringList &dirs) const { m_actions.clear(); - QPtrList<KAction> actions; - QStringList scripts; + TQPtrList<KAction> actions; + TQStringList scripts; scripts += KGlobal::dirs()->findAllResources("data", - QString(kapp->name())+"/scripts/*.desktop", false, true ); + TQString(kapp->name())+"/scripts/*.desktop", false, true ); - for( QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) + for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { scripts += KGlobal::dirs()->findAllResources("data", (*it)+"/*.desktop", false, true ); } - for (QStringList::Iterator it = scripts.begin(); it != scripts.end(); ++it ) + for (TQStringList::Iterator it = scripts.begin(); it != scripts.end(); ++it ) { kdDebug() << "Loading " << *it << endl; KScriptAction *script = new KScriptAction(*it, interface, m_ac); @@ -152,16 +152,16 @@ QPtrList< KAction > KScriptActionManager::scripts( QObject * interface , const Q { actions.append(script->action()); m_actions.append(script); - connect(script, SIGNAL(error( const QString&)), this, - SIGNAL(scriptError( const QString&))); - connect(script, SIGNAL(warning( const QString&)), this, - SIGNAL(scriptWarning( const QString&))); - connect(script, SIGNAL(output( const QString&)), this, - SIGNAL(scriptOutput( const QString&))); - connect(script, SIGNAL(progress( int )), this, - SIGNAL(scriptProgress(int))); - connect(script, SIGNAL(done( KScriptClientInterface::Result, const QVariant &)),this, - SIGNAL(scriptDone( KScriptClientInterface::Result, const QVariant &))); + connect(script, TQT_SIGNAL(error( const TQString&)), this, + TQT_SIGNAL(scriptError( const TQString&))); + connect(script, TQT_SIGNAL(warning( const TQString&)), this, + TQT_SIGNAL(scriptWarning( const TQString&))); + connect(script, TQT_SIGNAL(output( const TQString&)), this, + TQT_SIGNAL(scriptOutput( const TQString&))); + connect(script, TQT_SIGNAL(progress( int )), this, + TQT_SIGNAL(scriptProgress(int))); + connect(script, TQT_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, + TQT_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); } else delete script; diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h index 78833d2b..47d1a04e 100644 --- a/lib/util/kscriptactionmanager.h +++ b/lib/util/kscriptactionmanager.h @@ -21,8 +21,8 @@ #define KScriptAction_H #include <scriptclientinterface.h> -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> class KAction; class KActionCollection; @@ -35,11 +35,11 @@ class QTimer; * * @author ian geiser geiseri@sourcextreme.com */ -class KScriptAction : public QObject, public KScriptClientInterface { +class KScriptAction : public TQObject, public KScriptClientInterface { Q_OBJECT public: - KScriptAction( const QString &scriptDesktopFile, QObject *interface, KActionCollection *ac ); + KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ); virtual ~KScriptAction(); @@ -55,18 +55,18 @@ public: signals: // Reimplemented from KScript - void error ( const QString &msg ); - void warning ( const QString &msg ); - void output ( const QString &msg ); + void error ( const TQString &msg ); + void warning ( const TQString &msg ); + void output ( const TQString &msg ); void progress ( int percent ); - void done ( KScriptClientInterface::Result result, const QVariant &returned ); + void done ( KScriptClientInterface::Result result, const TQVariant &returned ); signals: - void scriptError ( const QString &msg ); - void scriptWarning ( const QString &msg ); - void scriptOutput ( const QString &msg ); + void scriptError ( const TQString &msg ); + void scriptWarning ( const TQString &msg ); + void scriptOutput ( const TQString &msg ); void scriptProgress ( int percent ); - void scriptDone ( KScriptClientInterface::Result result, const QVariant &returned ); + void scriptDone ( KScriptClientInterface::Result result, const TQVariant &returned ); private slots: void activate(); @@ -75,13 +75,13 @@ private slots: private: KAction *m_action; - QString m_scriptName; - QString m_scriptType; - QString m_scriptFile; - QString m_scriptMethod; + TQString m_scriptName; + TQString m_scriptType; + TQString m_scriptFile; + TQString m_scriptMethod; KScriptInterface *m_interface; bool m_isValid; - QTimer *m_timeout; + TQTimer *m_timeout; uint m_refs; }; @@ -90,39 +90,39 @@ private: * Scripts are not actually loaded until they are actually executed. * @author ian geiser <geiseri@sourcextreme.com> */ -class KScriptActionManager : public QObject { +class KScriptActionManager : public TQObject { Q_OBJECT public: /** * Create a script manager that is attached to an action collection. */ - KScriptActionManager( QObject *parent, KActionCollection *ac ); + KScriptActionManager( TQObject *parent, KActionCollection *ac ); ~KScriptActionManager(); /** * Return all currently loaded scripts in a direcotry and attaches them - * to a QObject interface. If the dirs are empty the current applications + * to a TQObject interface. If the dirs are empty the current applications * scripts directory is used. The dirs are actual directories to search * in the $KDEPATH/data/ direcories. So if you add "coolapp/data" then * the manager will search in $KDEPATH/data/coolapp/data for all desktop * files that are scripts. */ - QPtrList<KAction> scripts( QObject *interface, const QStringList &dirs = QStringList() ) const; + TQPtrList<KAction> scripts( TQObject *interface, const TQStringList &dirs = TQStringList() ) const; signals: /** * Returns an error message from a script. */ - void scriptError ( const QString &msg ); + void scriptError ( const TQString &msg ); /** * Returns a warning message from a script. */ - void scriptWarning ( const QString &msg ); + void scriptWarning ( const TQString &msg ); /** * Returns a standard out message from a script. */ - void scriptOutput ( const QString &msg ); + void scriptOutput ( const TQString &msg ); /** * Returns the percentage complete of an operation in the script. */ @@ -130,10 +130,10 @@ signals: /** * Notifies that the script has finished. */ - void scriptDone( KScriptClientInterface::Result result, const QVariant &returned ); + void scriptDone( KScriptClientInterface::Result result, const TQVariant &returned ); private: - mutable QPtrList<KScriptAction> m_actions; + mutable TQPtrList<KScriptAction> m_actions; KActionCollection *m_ac; }; #endif diff --git a/lib/util/rurl.cpp b/lib/util/rurl.cpp index 1ec23434..0d631bda 100644 --- a/lib/util/rurl.cpp +++ b/lib/util/rurl.cpp @@ -1,4 +1,4 @@ -#include <qstringlist.h> +#include <tqstringlist.h> #include "rurl.h" @@ -7,7 +7,7 @@ namespace Relative{ //class Name -Name::Name( const QString & rurl, const Type type ) +Name::Name( const TQString & rurl, const Type type ) :m_rurl(rurl), m_type(type) { correct(); @@ -43,9 +43,9 @@ void Name::correct() } } -QString Name::correctName( const QString & rurl, const Type type ) +TQString Name::correctName( const TQString & rurl, const Type type ) { - QString temp = rurl; + TQString temp = rurl; temp = Name::cleanName(temp); if (temp[0] == '/') temp = temp.mid(1); @@ -65,21 +65,21 @@ QString Name::correctName( const QString & rurl, const Type type ) return temp; } -void Name::setRURL( const QString & rurl, const Type type ) +void Name::setRURL( const TQString & rurl, const Type type ) { m_rurl = rurl; m_type = type; correct(); } -QString Name::rurl( ) const +TQString Name::rurl( ) const { return m_rurl; } -void Name::addPath( const QString & addendum ) +void Name::addPath( const TQString & addendum ) { - QString temp = correctName(addendum, Directory); + TQString temp = correctName(addendum, Directory); m_rurl = directory() + temp + fileName(); } @@ -88,9 +88,9 @@ void Name::cleanRURL( ) m_rurl = cleanName(m_rurl); } -QString Name::cleanName( const QString & rurl ) +TQString Name::cleanName( const TQString & rurl ) { - QString temp; + TQString temp; bool wasSlash = false; for (unsigned int i = 0; i < rurl.length(); ++i) { @@ -107,30 +107,30 @@ QString Name::cleanName( const QString & rurl ) return temp; } -QString Name::extension( bool complete ) const +TQString Name::extension( bool complete ) const { if (m_type == File) { - QString temp = fileName(); + TQString temp = fileName(); if (complete) return temp.mid(temp.find('.')+1); else return temp.mid(temp.findRev('.')+1); } - return QString::null; + return TQString::null; } -QString Name::fileName( ) const +TQString Name::fileName( ) const { if (m_type == File) return m_rurl.section('/', -1); - return QString::null; + return TQString::null; } -QString Name::directory( ) const +TQString Name::directory( ) const { if ( (m_type == File) && (m_rurl.findRev('/') == -1) ) - return QString::null; + return TQString::null; return m_rurl.mid(0, m_rurl.findRev('/')+1); } @@ -181,18 +181,18 @@ void Name::setType( const Type type ) m_type = type; } -Name Name::relativeName( const QString &base, const QString &url ) +Name Name::relativeName( const TQString &base, const TQString &url ) { - QString dirUrl = base; - QString fileUrl = url; + TQString dirUrl = base; + TQString fileUrl = url; if (dirUrl.isEmpty() || (dirUrl == "/")) return Name(fileUrl); - QStringList dir = QStringList::split("/", dirUrl, false); - QStringList file = QStringList::split("/", fileUrl, false); + TQStringList dir = TQStringList::split("/", dirUrl, false); + TQStringList file = TQStringList::split("/", fileUrl, false); - QString resFileName = file.last(); + TQString resFileName = file.last(); if (url.endsWith("/")) resFileName += "/"; file.remove(file.last()); @@ -201,10 +201,10 @@ Name Name::relativeName( const QString &base, const QString &url ) while ( (i < dir.count()) && (i < (file.count())) && (dir[i] == file[i]) ) i++; - QString result_up; - QString result_down; - QString currDir; - QString currFile; + TQString result_up; + TQString result_down; + TQString currDir; + TQString currFile; do { i >= dir.count() ? currDir = "" : currDir = dir[i]; @@ -237,7 +237,7 @@ URL::URL( KURL base, KURL url, Type type ) { } -URL::URL( KURL base, QString url, bool isUrlRelative, Type type ) +URL::URL( KURL base, TQString url, bool isUrlRelative, Type type ) :Name(isUrlRelative ? url : Name::relativeName(base.path(), url).rurl(), type), m_base(base) { } @@ -247,7 +247,7 @@ void URL::setBase( const KURL & base ) m_base = base; } -void URL::setBase( const QString & base ) +void URL::setBase( const TQString & base ) { KURL url; url.setPath(base); @@ -259,7 +259,7 @@ KURL URL::base( ) const return m_base; } -QString URL::basePath( ) const +TQString URL::basePath( ) const { return m_base.path(1); } @@ -272,7 +272,7 @@ KURL URL::url( ) const return url; } -QString URL::urlPath( ) const +TQString URL::urlPath( ) const { KURL url = m_base; url.addPath(rurl()); @@ -285,7 +285,7 @@ QString URL::urlPath( ) const return url.path(mod); } -QString URL::urlDirectory( ) const +TQString URL::urlDirectory( ) const { KURL url = m_base; url.addPath(rurl()); @@ -303,7 +303,7 @@ URL URL::relativeURL( KURL base, KURL url ) return URL(base, url); } -URL URL::relativeURL( KURL base, QString url, bool isUrlRelative ) +URL URL::relativeURL( KURL base, TQString url, bool isUrlRelative ) { return URL(base, url, isUrlRelative); } @@ -327,17 +327,17 @@ Directory::Directory( KURL base, KURL url ) { } -Directory::Directory( KURL base, QString url, bool isRelativeUrl ) +Directory::Directory( KURL base, TQString url, bool isRelativeUrl ) :URL(base, url, isRelativeUrl, Name::Directory) { } -void Directory::setRURL( QString rurl ) +void Directory::setRURL( TQString rurl ) { URL::setRURL(rurl, Name::Directory); } -void Directory::setRURL( QString rurl, Type type ) +void Directory::setRURL( TQString rurl, Type type ) { URL::setRURL(rurl, type); } @@ -351,17 +351,17 @@ File::File( KURL base, KURL url ) { } -File::File( KURL base, QString url, bool isRelativeUrl ) +File::File( KURL base, TQString url, bool isRelativeUrl ) :URL(base, url, isRelativeUrl, Name::File) { } -void File::setRURL( QString rurl, Type type ) +void File::setRURL( TQString rurl, Type type ) { URL::setRURL(rurl, type); } -void File::setRURL( QString rurl ) +void File::setRURL( TQString rurl ) { URL::setRURL(rurl, Name::File); } diff --git a/lib/util/rurl.h b/lib/util/rurl.h index 342b3e3d..5ab2ec73 100644 --- a/lib/util/rurl.h +++ b/lib/util/rurl.h @@ -23,33 +23,33 @@ public: name/name/ are directories name/name are files. Trailing slash will be deleted for files (type == File).*/ - Name(const QString &rurl, const Type type = Auto); + Name(const TQString &rurl, const Type type = Auto); Name(const char *rurl, const Type type = Auto); /**Sets the relative name.*/ - void setRURL(const QString &rurl, const Type type); + void setRURL(const TQString &rurl, const Type type); /**Gets the relative name in form dir/dir/ -> directory or dir/dir/file -> file.*/ - QString rurl() const; + TQString rurl() const; /**Adds addendum to the directory path. This honors file names so if RName represents /dir1/dir2/fname.ext addPath(dir3) will change RName to /dir1/dir2/dir3/fname.ext*/ - void addPath(const QString &addendum); + void addPath(const TQString &addendum); /**Removes "//" from the name.*/ void cleanRURL(); - /**Returns the extension of a file or QString::null for directories. + /**Returns the extension of a file or TQString::null for directories. If complete is true then returns extensions like "tar.gz". Else returns "gz".*/ - QString extension(bool complete = true) const; - /**Returns the name of the file without the path or QString::null + TQString extension(bool complete = true) const; + /**Returns the name of the file without the path or TQString::null for directories.*/ - QString fileName() const; - /**Returns the name of the directory or QString::null if there are no dirs in path.*/ - QString directory() const; + TQString fileName() const; + /**Returns the name of the directory or TQString::null if there are no dirs in path.*/ + TQString directory() const; /**Returns true if the type of RName is file.*/ bool isFile() const; @@ -66,12 +66,12 @@ public: /**Creates and returns relative name between base and url. Base and url should be absolute. Base is considered to be a directory.*/ - static Name relativeName(const QString &base, const QString &url); + static Name relativeName(const TQString &base, const TQString &url); /**Cleans rurl by removing extra slashes.*/ - static QString cleanName(const QString &rurl); + static TQString cleanName(const TQString &rurl); /**Corrects rurl according to the given type and returns corrected url. Also cleans url (see @ref cleanRURL).*/ - static QString correctName(const QString &rurl, const Type type = Auto); + static TQString correctName(const TQString &rurl, const Type type = Auto); bool operator == (const Name &rname); bool operator != (const Name &rname); @@ -83,7 +83,7 @@ protected: void correct(); private: - QString m_rurl; + TQString m_rurl; Type m_type; }; @@ -97,17 +97,17 @@ public: URL(KURL base, KURL url, Type type = Auto); /**Creates RURL object with given base and relative or full url (according to the isUrlRelative value).*/ - URL(KURL base, QString url, bool isUrlRelative, Type type = Auto); + URL(KURL base, TQString url, bool isUrlRelative, Type type = Auto); /**Sets a new base for a RURL.*/ void setBase(const KURL &base); /**Sets a new base for a RURL. Base is is considered to be a directory and converted to KURL using KURL::setPath().*/ - void setBase(const QString &base); + void setBase(const TQString &base); /**Returns RURL base.*/ KURL base() const; /**Returns a path of a base KURL (using KURL::path()). Trailing slash is guaranteed.*/ - QString basePath() const; + TQString basePath() const; /**Returns a complete url to the RURL location. This is basically base + rurl. This also resolves ".." components in path. @@ -120,13 +120,13 @@ public: This method only returns a path part of the KURL (using KURL::path()). Trailing slash is guaranteed for directories and no trailing slash - for files. This also resolves ".." components in path.*/ - QString urlPath() const; + TQString urlPath() const; /**Returns a directory of a complete url to the location. The url is constructed as base + rurl. Returns the same as urlPath() for directories. This method uses KURL::directory to determine the directory. Trailing slash is guaranteed. This also resolves ".." components in path.*/ - QString urlDirectory() const; + TQString urlDirectory() const; /**Returns a new URL that is relative to given base. Relative part is taken from current URL object.*/ @@ -136,7 +136,7 @@ public: static URL relativeURL(KURL base, KURL url); /**Returns a new relative URL constructed from base and given url. url parameter is either relative or full (depends on isUrlRelative value).*/ - static URL relativeURL(KURL base, QString url, bool isUrlRelative); + static URL relativeURL(KURL base, TQString url, bool isUrlRelative); bool operator == (const URL &url); bool operator != (const URL &url); @@ -150,14 +150,14 @@ class Directory: public URL{ public: /**Works as URL::URL(KURL, KURL), only implies Name::Directory mode.*/ Directory(KURL base, KURL url); - /**Works as URL::URL(KURL, QString, bool), only implies Name::Directory mode.*/ - Directory(KURL base, QString url, bool isRelativeUrl); + /**Works as URL::URL(KURL, TQString, bool), only implies Name::Directory mode.*/ + Directory(KURL base, TQString url, bool isRelativeUrl); - /**Works as URL::setRURL(QString), only implies Name::Directory mode.*/ - void setRURL(QString rurl); + /**Works as URL::setRURL(TQString), only implies Name::Directory mode.*/ + void setRURL(TQString rurl); private: - void setRURL(QString rurl, Type type); + void setRURL(TQString rurl, Type type); }; @@ -167,13 +167,13 @@ public: /**Works as URL::URL(KURL, KURL), only implies Name::File mode.*/ File(KURL base, KURL url); /**Works as URL::URL(KURL, KURL), only implies Name::File mode.*/ - File(KURL base, QString url, bool isRelativeUrl); + File(KURL base, TQString url, bool isRelativeUrl); - /**Works as URL::setRURL(QString), only implies Name::File mode.*/ - void setRURL(QString rurl); + /**Works as URL::setRURL(TQString), only implies Name::File mode.*/ + void setRURL(TQString rurl); private: - void setRURL(QString rurl, Type type); + void setRURL(TQString rurl, Type type); }; diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index 4e246e5b..129cdd66 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -15,35 +15,35 @@ #include "settings.h" -QString Settings::terminalEmulatorName( KConfig & config ) +TQString Settings::terminalEmulatorName( KConfig & config ) { config.setGroup("TerminalEmulator"); bool useKDESetting = config.readBoolEntry( "UseKDESetting", true ); - QString terminal; + TQString terminal; if ( useKDESetting ) { - KConfigGroup confGroup( KGlobal::config(), QString::fromLatin1("General") ); - terminal = confGroup.readEntry("TerminalApplication", QString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole")); } else { - terminal = config.readEntry( "TerminalApplication", QString::fromLatin1("konsole")); + terminal = config.readEntry( "TerminalApplication", TQString::fromLatin1("konsole")); } return terminal; } -QString Settings::profileByAttributes(const QString &language, const QStringList &keywords) +TQString Settings::profileByAttributes(const TQString &language, const TQStringList &keywords) { KConfig config(locate("data", "kdevelop/profiles/projectprofiles")); config.setGroup(language); - QStringList profileKeywords = QStringList::split("/", "Empty"); + TQStringList profileKeywords = TQStringList::split("/", "Empty"); if (config.hasKey("Keywords")) profileKeywords = config.readListEntry("Keywords"); int idx = 0; - for (QStringList::const_iterator it = profileKeywords.constBegin(); + for (TQStringList::const_iterator it = profileKeywords.constBegin(); it != profileKeywords.constEnd(); ++it) { if (keywords.contains(*it)) @@ -53,7 +53,7 @@ QString Settings::profileByAttributes(const QString &language, const QStringList } } - QStringList profiles; + TQStringList profiles; if (config.hasKey("Profiles")) { profiles = config.readListEntry("Profiles"); diff --git a/lib/util/settings.h b/lib/util/settings.h index cd241cad..ad92805d 100644 --- a/lib/util/settings.h +++ b/lib/util/settings.h @@ -18,8 +18,8 @@ class KConfig; class Settings { public: - static QString terminalEmulatorName( KConfig & config ); - static QString profileByAttributes(const QString &language, const QStringList &keywords); + static TQString terminalEmulatorName( KConfig & config ); + static TQString profileByAttributes(const TQString &language, const TQStringList &keywords); }; diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp index fb451769..849cc555 100644 --- a/lib/util/urlutil.cpp +++ b/lib/util/urlutil.cpp @@ -18,10 +18,10 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qstringlist.h> +#include <tqstringlist.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include <kdebug.h> #include <unistd.h> @@ -36,28 +36,28 @@ // Namespace URLUtil /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::filename(const QString & name) { +TQString URLUtil::filename(const TQString & name) { int slashPos = name.findRev("/"); return slashPos<0 ? name : name.mid(slashPos+1); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::directory(const QString & name) { +TQString URLUtil::directory(const TQString & name) { int slashPos = name.findRev("/"); - return slashPos<0 ? QString("") : name.left(slashPos); + return slashPos<0 ? TQString("") : name.left(slashPos); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::getRelativePath(const QString& basepath, const QString& destpath) +TQString URLUtil::getRelativePath(const TQString& basepath, const TQString& destpath) { - QString relpath = "."; - if (!QFile::exists(basepath) || - !QFile::exists(destpath)) + TQString relpath = "."; + if (!TQFile::exists(basepath) || + !TQFile::exists(destpath)) return ""; - QStringList basedirs = QStringList::split(QString( QChar( QDir::separator() ) ),basepath); - QStringList destdirs = QStringList::split(QString( QChar( QDir::separator() ) ),destpath); + TQStringList basedirs = TQStringList::split(TQString( TQChar( TQDir::separator() ) ),basepath); + TQStringList destdirs = TQStringList::split(TQString( TQChar( TQDir::separator() ) ),destpath); int maxCompare=0; if (basedirs.count()>=destdirs.count()) @@ -72,23 +72,23 @@ QString URLUtil::getRelativePath(const QString& basepath, const QString& destpat lastCommonDir=i; } for (uint i=0;i<basedirs.count()-(lastCommonDir+1); i++) - relpath += QString( QChar( QDir::separator() ) )+QString(".."); + relpath += TQString( TQChar( TQDir::separator() ) )+TQString(".."); for (int i=0; i<lastCommonDir+1; i++) destdirs.pop_front(); if (destdirs.count()) - relpath += QString( QChar( QDir::separator() ) )+destdirs.join( QChar( QDir::separator() ) ); - return QDir::cleanDirPath(relpath); + relpath += TQString( TQChar( TQDir::separator() ) )+destdirs.join( TQChar( TQDir::separator() ) ); + return TQDir::cleanDirPath(relpath); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) { +TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) { bool slashPrefix = slashPolicy & SLASH_PREFIX; bool slashSuffix = slashPolicy & SLASH_SUFFIX; if (parent.equals(child,true)) - return slashPrefix ? QString("/") : QString(""); + return slashPrefix ? TQString("/") : TQString(""); - if (!parent.isParentOf(child)) return QString(); + if (!parent.isParentOf(child)) return TQString(); int a=slashPrefix ? -1 : 1; int b=slashSuffix ? 1 : -1; return child.path(b).mid(parent.path(a).length()); @@ -96,15 +96,15 @@ QString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slas /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::relativePath(const QString & parent, const QString & child, uint slashPolicy) { +TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) { return relativePath(KURL(parent), KURL(child), slashPolicy); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::upDir(const QString & path, bool slashSuffix) { +TQString URLUtil::upDir(const TQString & path, bool slashSuffix) { int slashPos = path.findRev("/"); - if (slashPos<1) return QString::null; + if (slashPos<1) return TQString::null; return path.mid(0,slashPos+ (slashSuffix ? 1 : 0) ); } @@ -122,41 +122,41 @@ KURL URLUtil::mergeURL(const KURL & source, const KURL & dest, const KURL & chil if (dest.equals(child,true)) return source; // calculate - QString childUrlStr = child.url(-1); - QString destStemStr = dest.url(1); - QString sourceStemStr = source.url(1); + TQString childUrlStr = child.url(-1); + TQString destStemStr = dest.url(1); + TQString sourceStemStr = source.url(1); return KURL(sourceStemStr.append( childUrlStr.mid( destStemStr.length() ) ) ); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::getExtension(const QString & path) { +TQString URLUtil::getExtension(const TQString & path) { int dotPos = path.findRev('.'); - if (dotPos<0) return QString(""); + if (dotPos<0) return TQString(""); return path.mid(dotPos+1); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &url ) +TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &url ) { - QString absBase = extractPathNameAbsolute( baseDirUrl ), + TQString absBase = extractPathNameAbsolute( baseDirUrl ), absRef = extractPathNameAbsolute( url ); int i = absRef.find( absBase, 0, true ); if (i == -1) - return QString(); + return TQString(); if (absRef == absBase) - return QString( "." ); + return TQString( "." ); else - return absRef.replace( 0, absBase.length(), QString() ); + return absRef.replace( 0, absBase.length(), TQString() ); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::extractPathNameRelative(const QString &basePath, const KURL &url ) +TQString URLUtil::extractPathNameRelative(const TQString &basePath, const KURL &url ) { KURL baseDirUrl = KURL::fromPathOrURL( basePath ); return extractPathNameRelative( baseDirUrl, url ); @@ -164,7 +164,7 @@ QString URLUtil::extractPathNameRelative(const QString &basePath, const KURL &ur /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::extractPathNameRelative(const QString &basePath, const QString &absFilePath ) +TQString URLUtil::extractPathNameRelative(const TQString &basePath, const TQString &absFilePath ) { KURL baseDirUrl = KURL::fromPathOrURL( basePath ), fileUrl = KURL::fromPathOrURL( absFilePath ); @@ -173,7 +173,7 @@ QString URLUtil::extractPathNameRelative(const QString &basePath, const QString /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::extractPathNameAbsolute( const KURL &url ) +TQString URLUtil::extractPathNameAbsolute( const KURL &url ) { if (isDirectory( url )) return url.path( +1 ); // with trailing "/" if none is present @@ -182,9 +182,9 @@ QString URLUtil::extractPathNameAbsolute( const KURL &url ) // Ok, this is an over-tight pre-condition on "url" since I hope nobody will never // stress this function with absurd cases ... but who knows? /* - QString path = url.path(); - QFileInfo fi( path ); // Argh: QFileInfo is back ;)) - return ( fi.exists()? path : QString() ); + TQString path = url.path(); + TQFileInfo fi( path ); // Argh: TQFileInfo is back ;)) + return ( fi.exists()? path : TQString() ); */ return url.path(); } @@ -199,14 +199,14 @@ bool URLUtil::isDirectory( const KURL &url ) /////////////////////////////////////////////////////////////////////////////// -bool URLUtil::isDirectory( const QString &absFilePath ) +bool URLUtil::isDirectory( const TQString &absFilePath ) { - return QDir( absFilePath ).exists(); + return TQDir( absFilePath ).exists(); } /////////////////////////////////////////////////////////////////////////////// -void URLUtil::dump( const KURL::List &urls, const QString &aMessage ) +void URLUtil::dump( const KURL::List &urls, const TQString &aMessage ) { if (!aMessage.isNull()) { @@ -223,9 +223,9 @@ void URLUtil::dump( const KURL::List &urls, const QString &aMessage ) /////////////////////////////////////////////////////////////////////////////// -QStringList URLUtil::toRelativePaths( const QString &baseDir, const KURL::List &urls) +TQStringList URLUtil::toRelativePaths( const TQString &baseDir, const KURL::List &urls) { - QStringList paths; + TQStringList paths; for (size_t i=0; i<urls.count(); ++i) { @@ -237,25 +237,25 @@ QStringList URLUtil::toRelativePaths( const QString &baseDir, const KURL::List & /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::relativePathToFile( const QString & dirUrl, const QString & fileUrl ) +TQString URLUtil::relativePathToFile( const TQString & dirUrl, const TQString & fileUrl ) { if (dirUrl.isEmpty() || (dirUrl == "/")) return fileUrl; - QStringList dir = QStringList::split("/", dirUrl, false); - QStringList file = QStringList::split("/", fileUrl, false); + TQStringList dir = TQStringList::split("/", dirUrl, false); + TQStringList file = TQStringList::split("/", fileUrl, false); - QString resFileName = file.last(); + TQString resFileName = file.last(); file.remove(file.last()); uint i = 0; while ( (i < dir.count()) && (i < (file.count())) && (dir[i] == file[i]) ) i++; - QString result_up; - QString result_down; - QString currDir; - QString currFile; + TQString result_up; + TQString result_down; + TQString currDir; + TQString currFile; do { i >= dir.count() ? currDir = "" : currDir = dir[i]; @@ -282,9 +282,9 @@ QString URLUtil::relativePathToFile( const QString & dirUrl, const QString & fil /////////////////////////////////////////////////////////////////////////////// //TODO: remove for KDE4 -QString URLUtil::canonicalPath( const QString & path ) +TQString URLUtil::canonicalPath( const TQString & path ) { - QDir dir(path); + TQDir dir(path); return dir.canonicalPath(); } @@ -292,7 +292,7 @@ QString URLUtil::canonicalPath( const QString & path ) //written by "Dawit A." <adawit@kde.org> //borrowed from his patch to KShell -QString URLUtil::envExpand ( const QString& str ) +TQString URLUtil::envExpand ( const TQString& str ) { uint len = str.length(); @@ -303,11 +303,11 @@ QString URLUtil::envExpand ( const QString& str ) if (pos < 0) pos = len; - char* ret = getenv( QConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); + char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); if (ret) { - QString expandedStr ( QFile::decodeName( ret ) ); + TQString expandedStr ( TQFile::decodeName( ret ) ); if (pos < (int)len) expandedStr += str.mid(pos); return expandedStr; diff --git a/lib/util/urlutil.h b/lib/util/urlutil.h index 65e96a56..e8c84607 100644 --- a/lib/util/urlutil.h +++ b/lib/util/urlutil.h @@ -21,8 +21,8 @@ #ifndef _URLUTIL_H_ #define _URLUTIL_H_ -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <kurl.h> /** @@ -43,12 +43,12 @@ namespace URLUtil * @return The filename part of a pathname (i.e. everything past the last slash). * @param pathName The absolute path to a file. */ - QString filename(const QString & pathName); + TQString filename(const TQString & pathName); /** * @return The directory part of a path (i.e. everything up to but not including the last slash) * @param pathName The absolute path to a directory. */ - QString directory(const QString & pathName); + 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. @@ -59,7 +59,7 @@ namespace URLUtil * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - QString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const KURL & parent, 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. @@ -70,13 +70,13 @@ namespace URLUtil * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - QString relativePath(const QString & parent, const QString & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX); /** * @return The relative path between a base path and destination path or. * @param base The base Path. * @param dest The destination path. */ - QString getRelativePath( const QString& base, const QString& dest ); + TQString getRelativePath( const TQString& base, const TQString& dest ); /** * @param dirUrl An URL of a directory. * @param fileUrl An URL of a file. @@ -86,13 +86,13 @@ namespace URLUtil * fileUrl: /home/test/lib/mylib.cpp * returns: ../lib/mylib.cpp</pre> */ - QString relativePathToFile( const QString & dirUrl, const QString & fileUrl ); + TQString relativePathToFile( const TQString & dirUrl, const TQString & fileUrl ); /** *@param path A path (absolute or relative). *@param slashSuffix if true then "/" is appended to a path. *@returns The path 'up one level' - the opposite of what filename returns. */ - QString upDir(const QString & path, bool slashSuffix = false); + TQString upDir(const TQString & path, bool slashSuffix = false); /** * 'Merges' URLs - changes a URL that starts with dest to start with source instead.\n * <pre>Example: @@ -110,7 +110,7 @@ namespace URLUtil * @return The file extension for a filename or path. * @param path Absolute or relative path. */ - QString getExtension(const QString & path); + TQString getExtension(const TQString & path); /** * Given a base directory url in @p baseDirUrl and the url referring to the @@ -120,8 +120,8 @@ namespace URLUtil * KURL baseUrl, dirUrl; * baseUrl.setPath( "/home/mario/src/kdevelop/" ); * dirUrl.setPath( "/home/mario/src/kdevelop/parts/cvs/" ); - * QString relPathName = extractDirPathRelative( baseUrl, url ); // == "parts/cvs/" - * QString absPathName = extractDirPathAbsolute( url ); // == "/home/mario/src/kdevelop/parts/cvs/" + * TQString relPathName = extractDirPathRelative( baseUrl, url ); // == "parts/cvs/" + * TQString absPathName = extractDirPathAbsolute( url ); // == "/home/mario/src/kdevelop/parts/cvs/" * @endcode * Note that if you pass a file name in @p url (instead of a directory) or the * @p baseUrl is not contained in @p url then the function will return "" (void string). @@ -130,25 +130,25 @@ namespace URLUtil * @param url Base directory URL. * @return The relative path between @p url and @p baseDirUrl. */ - QString extractPathNameRelative(const KURL &baseDirUrl, const KURL &url ); - /**Same as above. @p basePath is QString.*/ - QString extractPathNameRelative(const QString &basePath, const KURL &url ); + 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.*/ - QString extractPathNameRelative(const QString &basePath, const QString &absFilePath ); + TQString extractPathNameRelative(const TQString &basePath, const TQString &absFilePath ); /** * @param url The url to extract the absolute path from. * @return The absolute path name referred in @p url. * Look at @ref extractPathNameRelative documentation for an example. */ - QString extractPathNameAbsolute( const KURL &url ); + TQString extractPathNameAbsolute( const KURL &url ); /** * @param baseDir Base directory for relative URLs. * @param urls The list of urls to extract the relative paths from. - * @return A QStringList of relative (to @p baseDir) paths from a list of KURLs in @p urls. + * @return A TQStringList of relative (to @p baseDir) paths from a list of KURLs in @p urls. */ - QStringList toRelativePaths( const QString &baseDir, const KURL::List &urls); + TQStringList toRelativePaths( const TQString &baseDir, const KURL::List &urls); /** * @param url The absolute URL. @@ -159,7 +159,7 @@ namespace URLUtil * @param absFilePath The absolute path. * @return true if @p url is a directory, false otherwise. */ - bool isDirectory( const QString &absFilePath ); + bool isDirectory( const TQString &absFilePath ); /** * Dumps the list of KURL @p urls on standard output, eventually printing @p aMessage if it @@ -167,14 +167,14 @@ namespace URLUtil * @param urls URLs to dump. * @param aMessage Message to be written onto a stdout. */ - void dump( const KURL::List &urls, const QString &aMessage = QString::null ); + void dump( const KURL::List &urls, const TQString &aMessage = TQString::null ); /** - * Same as QDir::canonicalPath in later versions of Qt. Earlier versions of Qt + * Same as TQDir::canonicalPath in later versions of Qt. Earlier versions of Qt * had this broken, so it's reproduced here. - * Deprecated, use QDir::canonicalPath instead. + * Deprecated, use TQDir::canonicalPath instead. */ - QString canonicalPath( const QString & path ); + TQString canonicalPath( const TQString & path ); /** * Performs environment variable expansion on @p variable. @@ -183,7 +183,7 @@ namespace URLUtil * @return The expanded environment variable value. if the variable * cannot be expanded, @p variable itself is returned. */ - QString envExpand ( const QString &variable ); + TQString envExpand ( const TQString &variable ); } diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp index a327ac04..6e60f1a4 100644 --- a/lib/widgets/fancylistviewitem.cpp +++ b/lib/widgets/fancylistviewitem.cpp @@ -17,15 +17,15 @@ Boston, MA 02110-1301, USA. */ -#include <qpixmap.h> -#include <qapplication.h> -#include <qnamespace.h> +#include <tqpixmap.h> +#include <tqapplication.h> +#include <tqnamespace.h> #include <kdeversion.h> #include "fancylistviewitem.h" -void FancyListViewItem::init(const QString& label1, const QString& /*label2*/) { +void FancyListViewItem::init(const TQString& label1, const TQString& /*label2*/) { if( !label1.isEmpty() ) { setText(0, label1); } @@ -41,7 +41,7 @@ void FancyListViewItem::setItem(int column, TextPaintItem item) { } -void FancyListViewItem::setText ( int column, const QString & text ) { +void FancyListViewItem::setText ( int column, const TQString & text ) { if( column >= int(m_items.size()) ) { m_items.append( TextPaintItem(text) ); }else{ @@ -50,60 +50,60 @@ void FancyListViewItem::setText ( int column, const QString & text ) { } -QString FancyListViewItem::text(int column) const { +TQString FancyListViewItem::text(int column) const { if( m_items.isEmpty() ) return ""; - return (QString)m_items[column]; + return (TQString)m_items[column]; } -QColor FancyListViewItem::backgroundColor(int col) { +TQColor FancyListViewItem::backgroundColor(int col) { return KListViewItem::backgroundColor(col); } -///this is a modified version of the original QListViewItem::paintCell from the qt source +///this is a modified version of the original TQListViewItem::paintCell from the qt source ///multiline is not supported! -void FancyListViewItem::paintCell( QPainter *painter, const QColorGroup &cg, +void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int column, int width, int align) { if(column < 0 || column >= int(m_items.size()) || m_items[column].items().isEmpty()) { - QListViewItem::paintCell(painter, cg, column, width, align); + TQListViewItem::paintCell(painter, cg, column, width, align); return; } painter->save(); - QColorGroup grp(cg); + TQColorGroup grp(cg); int styleNum = m_items[column].items()[0].style; TextPaintStyleStore::Item& style = m_styles.getStyle( styleNum ); ///currently only the first background-color is used if( style.bgValid() ) { - grp.setColor( QColorGroup::Base, style.background ); + grp.setColor( TQColorGroup::Base, style.background ); }else{ if(backgroundColor(column).isValid()) - grp.setColor( QColorGroup::Base, backgroundColor(column) ); ///use the nice kde background-color + grp.setColor( TQColorGroup::Base, backgroundColor(column) ); ///use the nice kde background-color } - QListView *lv = listView(); + TQListView *lv = listView(); if ( !lv ) return; - QPainter* p = painter; - QFontMetrics fm( p->fontMetrics() ); + TQPainter* p = painter; + TQFontMetrics fm( p->fontMetrics() ); - QString t = text( column ); + TQString t = text( column ); int marg = lv->itemMargin(); int r = marg; - const QPixmap * icon = pixmap( column ); + const TQPixmap * icon = pixmap( column ); const BackgroundMode bgmode = lv->viewport()->backgroundMode(); - const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode( bgmode ); + const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); p->fillRect( 0, 0, width, height(), grp.brush( crole ) ); if ( isSelected() && (column == 0 || lv->allColumnsShowFocus()) ) { - p->fillRect( r - marg, 0, width - r + marg, height(), cg.brush( QColorGroup::Highlight ) ); + p->fillRect( r - marg, 0, width - r + marg, height(), cg.brush( TQColorGroup::Highlight ) ); if ( isEnabled() || !lv ) p->setPen( cg.highlightedText() ); @@ -164,9 +164,9 @@ void FancyListViewItem::paintCell( QPainter *painter, const QColorGroup &cg, } -int FancyListViewItem::textWidth(const QFont& font, const QString& text) +int FancyListViewItem::textWidth(const TQFont& font, const TQString& text) { - QFontMetrics fm( font ); + TQFontMetrics fm( font ); if ( multiLinesEnabled() ) return fm.size( AlignVCenter, text ).width(); else @@ -175,7 +175,7 @@ int FancyListViewItem::textWidth(const QFont& font, const QString& text) } -int FancyListViewItem::width(const QFontMetrics &fm, const QListView *lv, int column) +int FancyListViewItem::width(const TQFontMetrics &fm, const TQListView *lv, int column) { int width = 0; if (column >= 0 && column < (int)m_items.size() && !multiLinesEnabled()) { @@ -189,14 +189,14 @@ int FancyListViewItem::width(const QFontMetrics &fm, const QListView *lv, int co } width += lv->itemMargin() * 2;// - lv->d->minLeftBearing - lv->d->minRightBearing; - const QPixmap * pm = pixmap( column ); + const TQPixmap * pm = pixmap( column ); if ( pm ) width += pm->width() + lv->itemMargin(); - width = QMAX( width, QApplication::globalStrut().width() ); + width = QMAX( width, TQApplication::globalStrut().width() ); } else - width = QListViewItem::width(fm, lv, column); + width = TQListViewItem::width(fm, lv, column); return width; } diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h index 55ac11e4..ab8b3310 100644 --- a/lib/widgets/fancylistviewitem.h +++ b/lib/widgets/fancylistviewitem.h @@ -20,21 +20,21 @@ #ifndef FANCYLISTVIEWITEM #define FANCYLISTVIEWITEM -#include <qvaluevector.h> -#include <qpainter.h> -#include <qfont.h> -#include <qlistview.h> +#include <tqvaluevector.h> +#include <tqpainter.h> +#include <tqfont.h> +#include <tqlistview.h> #include <klistview.h> class TextPaintStyleStore { public: class Item { public: - QFont font; - QColor color; - QColor background; + TQFont font; + TQColor color; + TQColor background; - Item(const QFont& f = QFont(), const QColor& c = QColor(), const QColor b = QColor() ) : font(f), color(c), background(b) { + Item(const TQFont& f = TQFont(), const TQColor& c = TQColor(), const TQColor b = TQColor() ) : font(f), color(c), background(b) { } bool bgValid() { @@ -46,9 +46,9 @@ class TextPaintStyleStore { } }; - typedef QMap<int, Item> Store ; + typedef TQMap<int, Item> Store ; - TextPaintStyleStore( QFont defaultFont=QFont() ) { + TextPaintStyleStore( TQFont defaultFont=TQFont() ) { m_styles.insert( 0, Item( defaultFont ) ); } @@ -62,7 +62,7 @@ class TextPaintStyleStore { m_styles[num] = style; } - void addStyle( int num, const QFont& font ) { + void addStyle( int num, const TQFont& font ) { m_styles[num] = Item( font ); } @@ -78,24 +78,24 @@ class TextPaintStyleStore { class TextPaintItem { public: struct Item { - QString text; + TQString text; int style; - Item( const QString& t = "", int st = 0 ) : text(t), style(st) { + Item( const TQString& t = "", int st = 0 ) : text(t), style(st) { } }; - typedef QValueList<Item> Chain; + typedef TQValueList<Item> Chain; Chain& items() { return m_chain; } - TextPaintItem(const QString& text="") { + TextPaintItem(const TQString& text="") { addItem( text ); } - Item& addItem(const QString& item, int style = 0) { + Item& addItem(const TQString& item, int style = 0) { m_chain.append( Item(item, style) ); return m_chain.back(); } @@ -104,8 +104,8 @@ class TextPaintItem { m_chain.clear(); } - operator QString () const { - QString ret; + operator TQString () const { + TQString ret; Chain::const_iterator it = m_chain.begin(); while(it != m_chain.end()) { ret += (*it).text; @@ -124,18 +124,18 @@ class TextPaintItem { class FancyListViewItem : public KListViewItem { public: - FancyListViewItem(TextPaintStyleStore& styles, QListView *parent, const QString &label1, const QString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListView *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { init(label1, label2); } - FancyListViewItem(TextPaintStyleStore& styles, QListViewItem *parent, const QString &label1, const QString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { init(label1, label2); } - virtual void paintCell(QPainter *painter, const QColorGroup &cg, int column, int width, int align); - virtual int width(const QFontMetrics &fm, const QListView *lv, int column); - virtual void setText ( int column, const QString & text ); - virtual QString text(int column) const; + virtual void paintCell(TQPainter *painter, const TQColorGroup &cg, int column, int width, int align); + virtual int width(const TQFontMetrics &fm, const TQListView *lv, int column); + virtual void setText ( int column, const TQString & text ); + virtual TQString text(int column) const; inline void clear() { m_items.clear(); @@ -151,10 +151,10 @@ class FancyListViewItem : public KListViewItem void setItem(int column, TextPaintItem item); private: - virtual QColor backgroundColor(int col); - void init(const QString& label1, const QString& label2); - int textWidth(const QFont& font, const QString& text); - QValueVector<TextPaintItem> m_items; + virtual TQColor backgroundColor(int col); + void init(const TQString& label1, const TQString& label2); + int textWidth(const TQFont& font, const TQString& text); + TQValueVector<TextPaintItem> m_items; protected: TextPaintStyleStore& m_styles; }; diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 92303b3f..e109a36d 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -24,22 +24,22 @@ #include <kdialogbase.h> #include <kdeversion.h> -#include <qapplication.h> -#include <qtooltip.h> -#include <qheader.h> -#include <qstringlist.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qregexp.h> -#include <qspinbox.h> +#include <tqapplication.h> +#include <tqtooltip.h> +#include <tqheader.h> +#include <tqstringlist.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqregexp.h> +#include <tqspinbox.h> #include "flagboxes.h" // partial copy of Qt-3.1 for back-compatibility to KDE-3.0 -QString QRegExp_escape( const QString& str ) +TQString QRegExp_escape( const TQString& str ) { static const char meta[] = "$()*+.?[\\]^{|}"; - QString quoted = str; + TQString quoted = str; int i = 0; while ( i < (int) quoted.length() ) { @@ -54,21 +54,21 @@ QString QRegExp_escape( const QString& str ) class FlagListToolTip : public QToolTip { public: - FlagListToolTip(QWidget *parent); + FlagListToolTip(TQWidget *parent); protected: - void maybeTip(const QPoint &p); + void maybeTip(const TQPoint &p); }; -FlagListToolTip::FlagListToolTip(QWidget *parent) - : QToolTip(parent) +FlagListToolTip::FlagListToolTip(TQWidget *parent) + : TQToolTip(parent) {} -void FlagListToolTip::maybeTip(const QPoint &pos) +void FlagListToolTip::maybeTip(const TQPoint &pos) { FlagListBox *listbox = static_cast<FlagListBox*>(parentWidget()); - QListViewItem *item = listbox->itemAt(pos); + TQListViewItem *item = listbox->itemAt(pos); FlagListItem *flitem = static_cast<FlagListItem*>(item); if (item) @@ -76,22 +76,22 @@ void FlagListToolTip::maybeTip(const QPoint &pos) } -FlagListItem::FlagListItem(FlagListBox *parent, const QString &flagstr, - const QString &description) - : QCheckListItem(parent, flagstr, QCheckListItem::CheckBox), +FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr, + const TQString &description) + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), desc(description) {} -FlagListItem::FlagListItem(FlagListBox *parent, const QString &flagstr, - const QString &description, const QString &offstr) - : QCheckListItem(parent, flagstr, QCheckListItem::CheckBox), +FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr, + const TQString &description, const TQString &offstr) + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), off(offstr), desc(description) {} -FlagListBox::FlagListBox(QWidget *parent, const char *name) - : QListView(parent, name) +FlagListBox::FlagListBox(TQWidget *parent, const char *name) + : TQListView(parent, name) { setResizeMode(LastColumn); header()->hide(); @@ -100,12 +100,12 @@ FlagListBox::FlagListBox(QWidget *parent, const char *name) } -void FlagListBox::readFlags(QStringList *list) +void FlagListBox::readFlags(TQStringList *list) { - QListViewItem *item = firstChild(); + TQListViewItem *item = firstChild(); for (; item; item = item->nextSibling()) { FlagListItem *flitem = static_cast<FlagListItem*>(item); - QStringList::Iterator sli = list->find(flitem->flag); + TQStringList::Iterator sli = list->find(flitem->flag); if (sli != list->end()) { flitem->setOn(true); list->remove(sli); @@ -119,9 +119,9 @@ void FlagListBox::readFlags(QStringList *list) } -void FlagListBox::writeFlags(QStringList *list) +void FlagListBox::writeFlags(TQStringList *list) { - QListViewItem *item = firstChild(); + TQListViewItem *item = firstChild(); for (; item; item = item->nextSibling()) { FlagListItem *flitem = static_cast<FlagListItem*>(item); if (flitem->isOn()) @@ -130,34 +130,34 @@ void FlagListBox::writeFlags(QStringList *list) } -FlagCheckBox::FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller, - const QString &flagstr, const QString &description) - : QCheckBox(description, parent), flag(flagstr), includeOff(false), useDef(false), defSet(false) +FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, + const TQString &flagstr, const TQString &description) + : TQCheckBox(description, parent), flag(flagstr), includeOff(false), useDef(false), defSet(false) { - QToolTip::add(this, flagstr); + TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBox::FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller, - const QString &flagstr, const QString &description, - const QString &offstr) - : QCheckBox(description, parent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false) +FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, + const TQString &flagstr, const TQString &description, + const TQString &offstr) + : TQCheckBox(description, parent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false) { - QToolTip::add(this, flagstr); + TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBox::FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller, - const QString &flagstr, const QString &description, - const QString &offstr, const QString &defstr) - : QCheckBox(description, parent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false) +FlagCheckBox::FlagCheckBox(TQWidget *parent, 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) { - QToolTip::add(this, flagstr); + TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBoxController::FlagCheckBoxController(QStringList multiKeys) +FlagCheckBoxController::FlagCheckBoxController(TQStringList multiKeys) :m_multiKeys(multiKeys) { } @@ -169,17 +169,17 @@ void FlagCheckBoxController::addCheckBox(FlagCheckBox *item) } -void FlagCheckBoxController::readFlags(QStringList *list) +void FlagCheckBoxController::readFlags(TQStringList *list) { //handle keys like -vxyz -> transform they into -vx -vy -vz //very "effective" algo :( -/* QStringList addons; - for (QStringList::Iterator mk = m_multiKeys.begin(); mk != m_multiKeys.end(); ++ mk) +/* TQStringList addons; + for (TQStringList::Iterator mk = m_multiKeys.begin(); mk != m_multiKeys.end(); ++ mk) { kdDebug() << "multikey " << *mk << endl; - for (QStringList::Iterator sli = list->begin(); sli != list->end(); ++sli) + for (TQStringList::Iterator sli = list->begin(); sli != list->end(); ++sli) { - QString key = *sli; + TQString key = *sli; kdDebug() << "current key: " << key << endl; if ( (key.length() > 3) && (key.startsWith(*mk)) ) { @@ -197,15 +197,15 @@ void FlagCheckBoxController::readFlags(QStringList *list) kdDebug() << "good" << endl; *list += addons; - for (QStringList::Iterator sli = list->begin(); sli != list->end(); ++sli) + for (TQStringList::Iterator sli = list->begin(); sli != list->end(); ++sli) { kdDebug() << "KEYS: " << *sli << endl; } */ - QPtrListIterator<FlagCheckBox> it(cblist); + TQPtrListIterator<FlagCheckBox> it(cblist); for (; it.current(); ++it) { FlagCheckBox *fitem = it.current(); - QStringList::Iterator sli = list->find(fitem->flag); + TQStringList::Iterator sli = list->find(fitem->flag); if (sli != list->end()) { fitem->setChecked(true); fitem->useDef = false; @@ -230,9 +230,9 @@ void FlagCheckBoxController::readFlags(QStringList *list) } -void FlagCheckBoxController::writeFlags(QStringList *list) +void FlagCheckBoxController::writeFlags(TQStringList *list) { - QPtrListIterator<FlagCheckBox> it(cblist); + TQPtrListIterator<FlagCheckBox> it(cblist); for (; it.current(); ++it) { FlagCheckBox *fitem = it.current(); if (fitem->isChecked() && (!fitem->useDef)) @@ -256,27 +256,27 @@ void FlagCheckBoxController::writeFlags(QStringList *list) { } -void FlagPathEditController::readFlags( QStringList * list ) +void FlagPathEditController::readFlags( TQStringList * list ) { // kdDebug() << "read path flags" << endl; - QPtrListIterator<FlagPathEdit> it(plist); + TQPtrListIterator<FlagPathEdit> it(plist); for (; it.current(); ++it) { FlagPathEdit *peitem = it.current(); - QStringList::Iterator sli = list->begin(); + TQStringList::Iterator sli = list->begin(); while ( sli != list->end() ) { // kdDebug() << "option: " << (*sli) << " flag is: " << peitem->flag << endl; if ((*sli).startsWith(peitem->flag)) { // kdDebug() << "Processing.." << endl; - peitem->setText((*sli).replace(QRegExp(QRegExp_escape(peitem->flag)),"")); + peitem->setText((*sli).replace(TQRegExp(QRegExp_escape(peitem->flag)),"")); sli = list->remove(sli); continue; } ++sli; } -/* QStringList::Iterator sli = list->find(peitem->flag); +/* TQStringList::Iterator sli = list->find(peitem->flag); if (sli != list->end()) { peitem->setText((*sli).remove(peitem->flag)); list->remove(sli); @@ -284,9 +284,9 @@ void FlagPathEditController::readFlags( QStringList * list ) } } -void FlagPathEditController::writeFlags( QStringList * list ) +void FlagPathEditController::writeFlags( TQStringList * list ) { - QPtrListIterator<FlagPathEdit> it(plist); + TQPtrListIterator<FlagPathEdit> it(plist); for (; it.current(); ++it) { FlagPathEdit *pitem = it.current(); if (!pitem->isEmpty()) @@ -299,14 +299,14 @@ void FlagPathEditController::addPathEdit( FlagPathEdit * item ) plist.append(item); } -FlagPathEdit::FlagPathEdit( QWidget * parent, QString pathDelimiter, - FlagPathEditController * controller, const QString & flagstr, const QString & description, +FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, + FlagPathEditController * controller, const TQString & flagstr, const TQString & description, KFile::Mode mode ) - : QWidget(parent), delimiter(pathDelimiter), flag(flagstr), m_description(description) + : TQWidget(parent), delimiter(pathDelimiter), flag(flagstr), m_description(description) { - QBoxLayout *topLayout = new QVBoxLayout(this, 0, 1); - topLayout->addWidget(new QLabel(description, this)); - QBoxLayout *layout = new QHBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); + topLayout->addWidget(new TQLabel(description, this)); + TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); if (delimiter.isEmpty()) { @@ -318,15 +318,15 @@ FlagPathEdit::FlagPathEdit( QWidget * parent, QString pathDelimiter, { edit = new KLineEdit(this); layout->addWidget(edit); - details = new QPushButton("...", this); + details = new TQPushButton("...", this); details->setMaximumWidth(30); - connect(details, SIGNAL(clicked()), this, SLOT(showPathDetails())); + connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails())); layout->addWidget(details); } - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - QToolTip::add(this, flagstr); + TQToolTip::add(this, flagstr); controller->addPathEdit(this); } @@ -335,7 +335,7 @@ void FlagPathEdit::showPathDetails( ) KDialogBase *dia = new KDialogBase(0, "flag_path_edit_dia", true, m_description, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true); - QBoxLayout *diaLayout = new QVBoxLayout(dia, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *diaLayout = new TQVBoxLayout(dia, KDialog::marginHint(), KDialog::spacingHint()); diaLayout->setAutoAdd(true); KURLRequester *req = new KURLRequester( dia ); @@ -345,9 +345,9 @@ void FlagPathEdit::showPathDetails( ) KEditListBox *elb = new KEditListBox( "", pCustomEditor, dia ); dia->setMainWidget(elb); - elb->insertStringList(QStringList::split(delimiter, text())); + elb->insertStringList(TQStringList::split(delimiter, text())); - if (dia->exec() == QDialog::Accepted) + if (dia->exec() == TQDialog::Accepted) { setText(elb->items().join(delimiter)); } @@ -355,7 +355,7 @@ void FlagPathEdit::showPathDetails( ) delete dia; } -void FlagPathEdit::setText( const QString text ) +void FlagPathEdit::setText( const TQString text ) { if (delimiter.isEmpty()) url->setURL(text); @@ -363,7 +363,7 @@ void FlagPathEdit::setText( const QString text ) edit->setText(text); } -QString FlagPathEdit::text( ) +TQString FlagPathEdit::text( ) { if (delimiter.isEmpty()) return url->url(); @@ -379,14 +379,14 @@ bool FlagPathEdit::isEmpty( ) return edit->text().isEmpty(); } -FlagRadioButton::FlagRadioButton( QWidget * parent, FlagRadioButtonController * controller, const QString & flagstr, const QString & description ) - : QRadioButton(description, parent), flag(flagstr) +FlagRadioButton::FlagRadioButton( TQWidget * parent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description ) + : TQRadioButton(description, parent), flag(flagstr) { - QToolTip::add(this, flagstr); + TQToolTip::add(this, flagstr); controller->addRadioButton(this); } -FlagRadioButtonController::FlagRadioButtonController(QStringList multiKeys) +FlagRadioButtonController::FlagRadioButtonController(TQStringList multiKeys) :m_multiKeys(multiKeys) { } @@ -397,17 +397,17 @@ void FlagRadioButtonController::addRadioButton(FlagRadioButton *item) } -void FlagRadioButtonController::readFlags(QStringList *list) +void FlagRadioButtonController::readFlags(TQStringList *list) { //handle keys like -vxyz -> transform they into -vx -vy -vz //very "effective" algo :( -/* QStringList addons; - for (QStringList::Iterator mk = m_multiKeys.begin(); mk != m_multiKeys.end(); ++ mk) +/* TQStringList addons; + for (TQStringList::Iterator mk = m_multiKeys.begin(); mk != m_multiKeys.end(); ++ mk) { kdDebug() << "multikey " << *mk << endl; - for (QStringList::Iterator sli = list->begin(); sli != list->end(); ++sli) + for (TQStringList::Iterator sli = list->begin(); sli != list->end(); ++sli) { - QString key = *sli; + TQString key = *sli; kdDebug() << "current key: " << key << endl; if ( (key.length() > 3) && (key.startsWith(*mk)) ) { @@ -425,15 +425,15 @@ void FlagRadioButtonController::readFlags(QStringList *list) kdDebug() << "good" << endl; *list += addons; - for (QStringList::Iterator sli = list->begin(); sli != list->end(); ++sli) + for (TQStringList::Iterator sli = list->begin(); sli != list->end(); ++sli) { kdDebug() << "KEYS: " << *sli << endl; } */ - QPtrListIterator<FlagRadioButton> it(cblist); + TQPtrListIterator<FlagRadioButton> it(cblist); for (; it.current(); ++it) { FlagRadioButton *fitem = it.current(); - QStringList::Iterator sli = list->find(fitem->flag); + TQStringList::Iterator sli = list->find(fitem->flag); if (sli != list->end()) { fitem->setChecked(true); list->remove(sli); @@ -442,9 +442,9 @@ void FlagRadioButtonController::readFlags(QStringList *list) } -void FlagRadioButtonController::writeFlags(QStringList *list) +void FlagRadioButtonController::writeFlags(TQStringList *list) { - QPtrListIterator<FlagRadioButton> it(cblist); + TQPtrListIterator<FlagRadioButton> it(cblist); for (; it.current(); ++it) { FlagRadioButton *fitem = it.current(); if (fitem->isChecked()) @@ -460,18 +460,18 @@ void FlagRadioButtonController::writeFlags(QStringList *list) { } -void FlagEditController::readFlags( QStringList * list ) +void FlagEditController::readFlags( TQStringList * list ) { - QPtrListIterator<FlagListEdit> it(plist); + TQPtrListIterator<FlagListEdit> it(plist); for (; it.current(); ++it) { FlagListEdit *peitem = it.current(); - QStringList::Iterator sli = list->begin(); + TQStringList::Iterator sli = list->begin(); while (sli != list->end()) { if ((*sli).startsWith(peitem->flag)) { - peitem->appendText((*sli).replace(QRegExp(QRegExp_escape(peitem->flag)),"")); + peitem->appendText((*sli).replace(TQRegExp(QRegExp_escape(peitem->flag)),"")); sli = list->remove(sli); continue; } @@ -480,16 +480,16 @@ void FlagEditController::readFlags( QStringList * list ) } - QPtrListIterator<FlagSpinEdit> it2(slist); + TQPtrListIterator<FlagSpinEdit> it2(slist); for (; it2.current(); ++it2) { FlagSpinEdit *sitem = it2.current(); - QStringList::Iterator sli = list->begin(); + TQStringList::Iterator sli = list->begin(); while ( sli != list->end() ) { if ((*sli).startsWith(sitem->flag)) { - sitem->setText((*sli).replace(QRegExp(QRegExp_escape(sitem->flag)),"")); + sitem->setText((*sli).replace(TQRegExp(QRegExp_escape(sitem->flag)),"")); sli = list->remove(sli); continue; } @@ -498,16 +498,16 @@ void FlagEditController::readFlags( QStringList * list ) } } -void FlagEditController::writeFlags( QStringList * list ) +void FlagEditController::writeFlags( TQStringList * list ) { - QPtrListIterator<FlagListEdit> it(plist); + TQPtrListIterator<FlagListEdit> it(plist); for (; it.current(); ++it) { FlagListEdit *pitem = it.current(); if (!pitem->isEmpty()) (*list) += pitem->flags(); } - QPtrListIterator<FlagSpinEdit> it2(slist); + TQPtrListIterator<FlagSpinEdit> it2(slist); for (; it2.current(); ++it2) { FlagSpinEdit *sitem = it2.current(); if (!sitem->isDefault()) @@ -526,31 +526,31 @@ void FlagEditController::addSpinBox(FlagSpinEdit *item) } -FlagListEdit::FlagListEdit( QWidget * parent, QString listDelimiter, FlagEditController * controller, - const QString & flagstr, const QString & description) - : QWidget(parent), delimiter(listDelimiter), flag(flagstr), m_description(description) +FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditController * controller, + const TQString & flagstr, const TQString & description) + : TQWidget(parent), delimiter(listDelimiter), flag(flagstr), m_description(description) { - QBoxLayout *topLayout = new QVBoxLayout(this, 0, 1); - topLayout->addWidget(new QLabel(description, this)); - QBoxLayout *layout = new QHBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); + topLayout->addWidget(new TQLabel(description, this)); + TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); edit = new KLineEdit(this); layout->addWidget(edit); if (! listDelimiter.isEmpty()) { - details = new QPushButton("...", this); + details = new TQPushButton("...", this); details->setMaximumWidth(30); - connect(details, SIGNAL(clicked()), this, SLOT(showListDetails())); + connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails())); layout->addWidget(details); } - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - QToolTip::add(this, flagstr); + TQToolTip::add(this, flagstr); controller->addListEdit(this); } -void FlagListEdit::setText( const QString text ) +void FlagListEdit::setText( const TQString text ) { edit->setText(text); } @@ -560,7 +560,7 @@ bool FlagListEdit::isEmpty( ) return edit->text().isEmpty(); } -QString FlagListEdit::text( ) +TQString FlagListEdit::text( ) { return edit->text(); } @@ -570,15 +570,15 @@ void FlagListEdit::showListDetails( ) KDialogBase *dia = new KDialogBase(0, "flag_list_edit_dia", true, m_description, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true); - QBoxLayout *diaLayout = new QVBoxLayout(dia, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *diaLayout = new TQVBoxLayout(dia, KDialog::marginHint(), KDialog::spacingHint()); diaLayout->setAutoAdd(true); KEditListBox *elb = new KEditListBox( "", dia ); dia->setMainWidget(elb); - elb->insertStringList(QStringList::split(delimiter, text())); + elb->insertStringList(TQStringList::split(delimiter, text())); - if (dia->exec() == QDialog::Accepted) + if (dia->exec() == TQDialog::Accepted) { setText(elb->items().join(delimiter)); } @@ -586,48 +586,48 @@ void FlagListEdit::showListDetails( ) delete dia; } -void FlagListEdit::appendText( const QString text ) +void FlagListEdit::appendText( const TQString text ) { - edit->setText(edit->text() + (edit->text().isEmpty()?QString(""):delimiter) + text); + edit->setText(edit->text() + (edit->text().isEmpty()?TQString(""):delimiter) + text); } -QStringList FlagListEdit::flags( ) +TQStringList FlagListEdit::flags( ) { - QStringList fl = QStringList::split(delimiter, text()); - for (QStringList::iterator it = fl.begin(); it != fl.end(); ++it) + TQStringList fl = TQStringList::split(delimiter, text()); + for (TQStringList::iterator it = fl.begin(); it != fl.end(); ++it) { (*it).prepend(flag); } return fl; } -FlagSpinEdit::FlagSpinEdit( QWidget * parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const QString & flagstr, const QString & description ) - :QWidget(parent), m_defaultVal(defaultVal), flag(flagstr) +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) { - QBoxLayout *topLayout = new QVBoxLayout(this, 0, 1); - topLayout->addWidget(new QLabel(description, this)); + TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); + topLayout->addWidget(new TQLabel(description, this)); - spb = new QSpinBox(minVal, maxVal, incr, this); + spb = new TQSpinBox(minVal, maxVal, incr, this); spb->setValue(defaultVal); topLayout->addWidget(spb); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - QToolTip::add(this, flagstr); + TQToolTip::add(this, flagstr); controller->addSpinBox(this); } -void FlagSpinEdit::setText( const QString text ) +void FlagSpinEdit::setText( const TQString text ) { spb->setValue(text.toInt()); } -QString FlagSpinEdit::text( ) +TQString FlagSpinEdit::text( ) { - return QString("%1").arg(spb->value()); + return TQString("%1").arg(spb->value()); } -QString FlagSpinEdit::flags( ) +TQString FlagSpinEdit::flags( ) { return flag + text(); } diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h index dc64f296..234cf3a5 100644 --- a/lib/widgets/flagboxes.h +++ b/lib/widgets/flagboxes.h @@ -28,11 +28,11 @@ Support classes for compiler plugins. */ -#include <qlistview.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqlistview.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqptrlist.h> +#include <tqstringlist.h> class QSpinBox; class FlagListBox; @@ -49,16 +49,16 @@ class KURLRequester; class FlagListItem : public QCheckListItem { public: - FlagListItem(FlagListBox *parent, const QString &flagstr, - const QString &description); - FlagListItem(FlagListBox *parent, const QString &flagstr, - const QString &description, const QString &offstr); + FlagListItem(FlagListBox *parent, const TQString &flagstr, + const TQString &description); + FlagListItem(FlagListBox *parent, const TQString &flagstr, + const TQString &description, const TQString &offstr); ~FlagListItem() {} private: - QString flag; - QString off; - QString desc; + TQString flag; + TQString off; + TQString desc; friend class FlagListToolTip; friend class FlagListBox; }; @@ -69,12 +69,12 @@ class FlagListBox : public QListView { Q_OBJECT public: - FlagListBox( QWidget *parent=0, const char *name=0 ); + FlagListBox( TQWidget *parent=0, const char *name=0 ); ~FlagListBox() {} - void readFlags(QStringList *list); - void writeFlags(QStringList *list); + void readFlags(TQStringList *list); + void writeFlags(TQStringList *list); }; @@ -83,21 +83,21 @@ class FlagCheckBox : public QCheckBox { Q_OBJECT public: - FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller, - const QString &flagstr, const QString &description); - FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller, - const QString &flagstr, const QString &description, - const QString &offstr); - FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller, - const QString &flagstr, const QString &description, - const QString &offstr, const QString &defstr); + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, + const TQString &flagstr, const TQString &description); + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, + const TQString &flagstr, const TQString &description, + const TQString &offstr); + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, + const TQString &flagstr, const TQString &description, + const TQString &offstr, const TQString &defstr); ~FlagCheckBox() {} private: - QString flag; - QString off; - QString def; + TQString flag; + TQString off; + TQString def; bool includeOff; bool useDef; bool defSet; @@ -109,13 +109,13 @@ class FlagRadioButton : public QRadioButton { Q_OBJECT public: - FlagRadioButton(QWidget *parent, FlagRadioButtonController *controller, - const QString &flagstr, const QString &description); + FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller, + const TQString &flagstr, const TQString &description); ~FlagRadioButton() {} private: - QString flag; + TQString flag; friend class FlagRadioButtonController; }; @@ -125,26 +125,26 @@ class FlagPathEdit: public QWidget Q_OBJECT public: /**If the pathDelimiter is not empty then path edit can contain a list of paths*/ - FlagPathEdit(QWidget *parent, QString pathDelimiter, FlagPathEditController *controller, - const QString &flagstr, const QString &description, KFile::Mode mode = KFile::Directory); + FlagPathEdit(TQWidget *parent, TQString pathDelimiter, FlagPathEditController *controller, + const TQString &flagstr, const TQString &description, KFile::Mode mode = KFile::Directory); ~FlagPathEdit() {} - void setText(const QString text); + void setText(const TQString text); bool isEmpty(); - QString text(); + TQString text(); private slots: void showPathDetails(); private: KLineEdit *edit; - QPushButton *details; + TQPushButton *details; KURLRequester *url; - QString delimiter; - QString flag; - QString m_description; + TQString delimiter; + TQString flag; + TQString m_description; friend class FlagPathEditController; }; @@ -154,27 +154,27 @@ class FlagListEdit: public QWidget Q_OBJECT public: /**If the listDelimiter is not empty then list edit can contain a list of entries*/ - FlagListEdit(QWidget *parent, QString listDelimiter, FlagEditController *controller, - const QString &flagstr, const QString &description); + FlagListEdit(TQWidget *parent, TQString listDelimiter, FlagEditController *controller, + const TQString &flagstr, const TQString &description); ~FlagListEdit() {} - void setText(const QString text); - void appendText(const QString text); + void setText(const TQString text); + void appendText(const TQString text); bool isEmpty(); - QString text(); - QStringList flags(); + TQString text(); + TQStringList flags(); private slots: void showListDetails(); private: KLineEdit *edit; - QPushButton *details; + TQPushButton *details; - QString delimiter; - QString flag; - QString m_description; + TQString delimiter; + TQString flag; + TQString m_description; friend class FlagEditController; }; @@ -182,21 +182,21 @@ private: class FlagSpinEdit: public QWidget { public: - FlagSpinEdit(QWidget *parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller, - const QString &flagstr, const QString &description); + FlagSpinEdit(TQWidget *parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller, + const TQString &flagstr, const TQString &description); ~FlagSpinEdit() {} - void setText(const QString text); - QString text(); + void setText(const TQString text); + TQString text(); bool isDefault(); - QString flags(); + TQString flags(); private: int m_defaultVal; - QString flag; + TQString flag; - QSpinBox *spb; + TQSpinBox *spb; friend class FlagEditController; }; @@ -208,12 +208,12 @@ public: FlagPathEditController(); ~FlagPathEditController(); - void readFlags(QStringList *list); - void writeFlags(QStringList *list); + void readFlags(TQStringList *list); + void writeFlags(TQStringList *list); private: void addPathEdit(FlagPathEdit *item); - QPtrList<FlagPathEdit> plist; + TQPtrList<FlagPathEdit> plist; friend class FlagPathEdit; }; @@ -224,14 +224,14 @@ public: FlagEditController(); ~FlagEditController(); - void readFlags(QStringList *list); - void writeFlags(QStringList *list); + void readFlags(TQStringList *list); + void writeFlags(TQStringList *list); private: void addListEdit(FlagListEdit *item); void addSpinBox(FlagSpinEdit *item); - QPtrList<FlagListEdit> plist; - QPtrList<FlagSpinEdit> slist; + TQPtrList<FlagListEdit> plist; + TQPtrList<FlagSpinEdit> slist; friend class FlagListEdit; friend class FlagSpinEdit; }; @@ -244,18 +244,18 @@ public: multiKeys must contain a list of option names like {-v} in the above example. */ - FlagCheckBoxController(QStringList multiKeys = QStringList()); + FlagCheckBoxController(TQStringList multiKeys = TQStringList()); ~FlagCheckBoxController() {} - void readFlags(QStringList *list); - void writeFlags(QStringList *list); + void readFlags(TQStringList *list); + void writeFlags(TQStringList *list); void addCheckBox(FlagCheckBox *item); private: - QPtrList<FlagCheckBox> cblist; + TQPtrList<FlagCheckBox> cblist; - QStringList m_multiKeys; + TQStringList m_multiKeys; }; /**Controller for radiobutton editors.*/ @@ -266,18 +266,18 @@ public: multiKeys must contain a list of option names like {-v} in the above example. */ - FlagRadioButtonController(QStringList multiKeys = QStringList()); + FlagRadioButtonController(TQStringList multiKeys = TQStringList()); ~FlagRadioButtonController() {} - void readFlags(QStringList *list); - void writeFlags(QStringList *list); + void readFlags(TQStringList *list); + void writeFlags(TQStringList *list); void addRadioButton(FlagRadioButton *item); private: - QPtrList<FlagRadioButton> cblist; + TQPtrList<FlagRadioButton> cblist; - QStringList m_multiKeys; + TQStringList m_multiKeys; }; #endif diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp index ddb3123c..2576ed0c 100644 --- a/lib/widgets/kcomboview.cpp +++ b/lib/widgets/kcomboview.cpp @@ -19,13 +19,13 @@ #include <klineedit.h> #include <klistview.h> #include <kcompletionbox.h> -#include <qheader.h> -#include <qmap.h> +#include <tqheader.h> +#include <tqmap.h> #include "kcomboview.h" -KComboView::KComboView( bool rw, int defaultWidth, QWidget* parent, const char* name , CustomCompleter* comp) +KComboView::KComboView( bool rw, int defaultWidth, TQWidget* parent, const char* name , CustomCompleter* comp) :QComboView(rw, parent, name), m_comp( comp ), m_defaultWidth(defaultWidth) { if (rw) @@ -33,7 +33,7 @@ KComboView::KComboView( bool rw, int defaultWidth, QWidget* parent, const char* KLineEdit *ed = new KLineEdit(this, "combo edit"); ed->setCompletionMode(KGlobalSettings::CompletionPopup); ed->setCompletionObject(m_comp); - ed->completionBox()->setHScrollBarMode(QListBox::Auto); + ed->completionBox()->setHScrollBarMode(TQListBox::Auto); setLineEdit(ed); } setMinimumWidth(defaultWidth); @@ -43,12 +43,12 @@ KComboView::~KComboView() { delete m_comp; } -void KComboView::addItem(QListViewItem *it) +void KComboView::addItem(TQListViewItem *it) { m_comp->addItem(it->text(0)); } -void KComboView::removeItem(QListViewItem *it) +void KComboView::removeItem(TQListViewItem *it) { if (it == currentItem()) { @@ -59,7 +59,7 @@ void KComboView::removeItem(QListViewItem *it) delete it; } -void KComboView::renameItem(QListViewItem *it, const QString &newName) +void KComboView::renameItem(TQListViewItem *it, const TQString &newName) { m_comp->removeItem(it->text(0)); it->setText(0, newName); @@ -79,7 +79,7 @@ int KComboView::defaultWidth( ) return m_defaultWidth; } -void KComboView::setDefaultText( const QString & text ) +void KComboView::setDefaultText( const TQString & text ) { m_defaultText = text; } @@ -90,7 +90,7 @@ void KComboView::setUpListView() listView->setRootIsDecorated( false ); listView->setAllColumnsShowFocus(true); listView->addColumn(""); - listView->setResizeMode(QListView::LastColumn); + listView->setResizeMode(TQListView::LastColumn); listView->header()->hide(); diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h index cb08e158..e0230b52 100644 --- a/lib/widgets/kcomboview.h +++ b/lib/widgets/kcomboview.h @@ -29,7 +29,7 @@ KComboView class. */ /** -KComboView - a combo with a QListView as a popup widget. +KComboView - a combo with a TQListView as a popup widget. KComboView provides text completion. @sa QComboView for a description. */ @@ -38,11 +38,11 @@ KComboView provides text completion. ///This can be used to insert own KCompletion-implementations class CustomCompleter : public KCompletion { public: - virtual void addItem (const QString &item) { + virtual void addItem (const TQString &item) { KCompletion::addItem( item ); } - virtual void removeItem (const QString &item) { + virtual void removeItem (const TQString &item) { KCompletion::removeItem( item ); } @@ -57,14 +57,14 @@ class KComboView: public QComboView Q_OBJECT public: ///The combo-view takes the ownership of the completer and deletes it on destruction - KComboView( bool rw, int defaultWidth = 100, QWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); + KComboView( bool rw, int defaultWidth = 100, TQWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); virtual ~KComboView(); - virtual void addItem(QListViewItem *it); - virtual void removeItem(QListViewItem *it); - virtual void renameItem(QListViewItem *it, const QString &newName); + virtual void addItem(TQListViewItem *it); + virtual void removeItem(TQListViewItem *it); + virtual void renameItem(TQListViewItem *it, const TQString &newName); - virtual void setDefaultText(const QString &text); + virtual void setDefaultText(const TQString &text); virtual void clear(); @@ -74,7 +74,7 @@ private: CustomCompleter* m_comp; int m_defaultWidth; - QString m_defaultText; + TQString m_defaultText; }; #endif diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index 688e373a..c99dcf36 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -1,6 +1,6 @@ -#include <qfile.h> -#include <qclipboard.h> -#include <qapplication.h> +#include <tqfile.h> +#include <tqclipboard.h> +#include <tqapplication.h> #include <kxmlguiclient.h> #include <kaction.h> @@ -24,54 +24,54 @@ KDevHTMLPart::KDevHTMLPart() { setXMLFile(locate("data", "kdevelop/kdevhtml_partui.rc"), true); - connect(browserExtension(), SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), - this, SLOT(openURLRequest(const KURL &)) ); + connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), + this, TQT_SLOT(openURLRequest(const KURL &)) ); - connect(this, SIGNAL(started(KIO::Job *)), this, SLOT(slotStarted(KIO::Job* ))); - connect(this, SIGNAL(completed()), this, SLOT(slotCompleted())); - connect(this, SIGNAL(canceled(const QString &)), this, SLOT(slotCancelled(const QString &))); + connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* ))); + connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); + connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); KActionCollection * actions = actionCollection();// new KActionCollection( this ); reloadAction = new KAction( i18n( "Reload" ), "reload", 0, - this, SLOT( slotReload() ), actions, "doc_reload" ); + this, TQT_SLOT( slotReload() ), actions, "doc_reload" ); reloadAction->setWhatsThis(i18n("<b>Reload</b><p>Reloads the current document.")); stopAction = new KAction( i18n( "Stop" ), "stop", 0, - this, SLOT( slotStop() ), actions, "doc_stop" ); + this, TQT_SLOT( slotStop() ), actions, "doc_stop" ); stopAction->setWhatsThis(i18n("<b>Stop</b><p>Stops the loading of current document.")); duplicateAction = new KAction( i18n( "Duplicate Tab" ), "window_new", 0, - this, SLOT( slotDuplicate() ), actions, "doc_dup" ); + this, TQT_SLOT( slotDuplicate() ), actions, "doc_dup" ); duplicateAction->setWhatsThis(i18n("<b>Duplicate window</b><p>Opens current document in a new window.")); - printAction = KStdAction::print(this, SLOT(slotPrint()), actions, "print_doc"); - copyAction = KStdAction::copy(this, SLOT(slotCopy()), actions, "copy_doc_selection"); + printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actions, "print_doc"); + copyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), actions, "copy_doc_selection"); - connect( this, SIGNAL(popupMenu(const QString &, const QPoint &)), this, SLOT(popup(const QString &, const QPoint &))); - connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged())); + connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(popup(const TQString &, const TQPoint &))); + connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); //BEGIN documentation history stuff m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, - this, SLOT(slotBack()), + this, TQT_SLOT(slotBack()), actions, "browser_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the <b>documentation</b> browsing history.")); - connect(m_backAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), SIGNAL(activated(int)), - this, SLOT(slotPopupActivated(int))); + connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotPopupActivated(int))); m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, - this, SLOT(slotForward()), + this, TQT_SLOT(slotForward()), actions, "browser_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the <b>documentation</b> browsing history.")); - connect(m_forwardAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), SIGNAL(activated(int)), - this, SLOT(slotPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotPopupActivated(int))); m_restoring = false; m_Current = m_history.end(); @@ -87,7 +87,7 @@ KDevHTMLPart::KDevHTMLPart() setZoomFactor(appConfig->readEntry("Zoom", "100").toInt()); } -void KDevHTMLPart::popup( const QString & url, const QPoint & p ) +void KDevHTMLPart::popup( const TQString & url, const TQPoint & p ) { // KPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() ); KPopupMenu popup(this->widget()); @@ -157,13 +157,13 @@ void KDevHTMLPart::popup( const QString & url, const QPoint & p ) } } -void KDevHTMLPart::setContext(const QString &context) +void KDevHTMLPart::setContext(const TQString &context) { m_context = context; } -QString KDevHTMLPart::context() const +TQString KDevHTMLPart::context() const { return m_context; } @@ -250,10 +250,10 @@ done: #undef I #undef X -QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url) +TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) { // check for environment variables and make necessary translations - QString path = url; + TQString path = url; int nDollarPos = path.find( '$' ); // Note: the while loop below is a copy of code in kdecore/kconfigbase.cpp ;) @@ -265,13 +265,13 @@ QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url) while ( (nEndPos <= path.length()) && (path[nEndPos]!=')') ) nEndPos++; nEndPos++; - QString cmd = path.mid( nDollarPos+2, nEndPos-nDollarPos-3 ); + TQString cmd = path.mid( nDollarPos+2, nEndPos-nDollarPos-3 ); - QString result; - FILE *fs = popen(QFile::encodeName(cmd).data(), "r"); + TQString result; + FILE *fs = popen(TQFile::encodeName(cmd).data(), "r"); if (fs) { - QTextStream ts(fs, IO_ReadOnly); + TQTextStream ts(fs, IO_ReadOnly); result = ts.read().stripWhiteSpace(); pclose(fs); } @@ -279,7 +279,7 @@ QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url) } else if( (path)[nDollarPos+1] != '$' ) { uint nEndPos = nDollarPos+1; // the next character is no $ - QString aVarName; + TQString aVarName; if (path[nEndPos]=='{') { while ( (nEndPos <= path.length()) && (path[nEndPos]!='}') ) @@ -302,9 +302,9 @@ QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url) // A environment variables may contain values in 8bit // locale cpecified encoding or in UTF8 encoding. if (isUtf8( pEnv )) - path.replace( nDollarPos, nEndPos-nDollarPos, QString::fromUtf8(pEnv) ); + path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) ); else - path.replace( nDollarPos, nEndPos-nDollarPos, QString::fromLocal8Bit(pEnv) ); + path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) ); } else path.remove( nDollarPos, nEndPos-nDollarPos ); } else { @@ -320,7 +320,7 @@ QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url) bool KDevHTMLPart::openURL(const KURL &url) { - QString path = resolveEnvVarsInURL(url.url()); + TQString path = resolveEnvVarsInURL(url.url()); KURL newUrl(path); bool retval = KHTMLPart::openURL(newUrl); @@ -364,7 +364,7 @@ void KDevHTMLPart::slotCompleted( ) stopAction->setEnabled(false); } -void KDevHTMLPart::slotCancelled( const QString & /*errMsg*/ ) +void KDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ ) { stopAction->setEnabled(false); } @@ -408,7 +408,7 @@ void KDevHTMLPart::slotBackAboutToShow() if ( m_Current == m_history.begin() ) return; - QValueList<DocumentationHistoryEntry>::Iterator it = m_Current; + TQValueList<DocumentationHistoryEntry>::Iterator it = m_Current; --it; int i = 0; @@ -433,7 +433,7 @@ void KDevHTMLPart::slotForwardAboutToShow() if ( m_Current == m_history.fromLast() ) return; - QValueList<DocumentationHistoryEntry>::Iterator it = m_Current; + TQValueList<DocumentationHistoryEntry>::Iterator it = m_Current; ++it; int i = 0; @@ -455,7 +455,7 @@ void KDevHTMLPart::slotPopupActivated( int id ) { kdDebug(9000) << "id: " << id << endl; - QValueList<DocumentationHistoryEntry>::Iterator it = m_history.begin(); + TQValueList<DocumentationHistoryEntry>::Iterator it = m_history.begin(); while( it != m_history.end() ) { kdDebug(9000) << "(*it).id: " << (*it).id << endl; @@ -473,7 +473,7 @@ void KDevHTMLPart::slotPopupActivated( int id ) void KDevHTMLPart::addHistoryEntry() { - QValueList<DocumentationHistoryEntry>::Iterator it = m_Current; + TQValueList<DocumentationHistoryEntry>::Iterator it = m_Current; // if We're not already the last entry, we truncate the list here before adding an entry if ( it != m_history.end() && it != m_history.fromLast() ) @@ -493,12 +493,12 @@ void KDevHTMLPart::addHistoryEntry() void KDevHTMLPart::slotCopy( ) { - QString text = selectedText(); - text.replace( QChar( 0xa0 ), ' ' ); - QClipboard *cb = QApplication::clipboard(); - disconnect( cb, SIGNAL( selectionChanged() ), this, SLOT( slotClearSelection() ) ); + TQString text = selectedText(); + text.replace( TQChar( 0xa0 ), ' ' ); + QClipboard *cb = TQApplication::clipboard(); + disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); - connect( cb, SIGNAL( selectionChanged() ), this, SLOT( slotClearSelection() ) ); + connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); } void KDevHTMLPart::slotSelectionChanged( ) diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index 944f1e9b..465fb0a3 100644 --- a/lib/widgets/kdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -3,7 +3,7 @@ #include <stdlib.h> -#include <qdatetime.h> +#include <tqdatetime.h> #include <khtml_part.h> @@ -23,7 +23,7 @@ struct DocumentationHistoryEntry { DocumentationHistoryEntry() {} DocumentationHistoryEntry( const KURL& u ): url( u ) { - id = abs( QTime::currentTime().msecsTo( QTime() ) ); // nasty, but should provide a reasonably unique number + id = abs( TQTime::currentTime().msecsTo( TQTime() ) ); // nasty, but should provide a reasonably unique number } }; @@ -52,10 +52,10 @@ public: KDevHTMLPart(); - void setContext(const QString &context); - QString context() const; + void setContext(const TQString &context); + TQString context() const; virtual bool openURL(const KURL &url); - static QString resolveEnvVarsInURL(const QString& url); + static TQString resolveEnvVarsInURL(const TQString& url); void setOptions(int options) { m_options = options; } @@ -66,10 +66,10 @@ protected slots: void slotStarted(KIO::Job *); void slotCompleted(); - void slotCancelled(const QString &errMsg); + void slotCancelled(const TQString &errMsg); void openURLRequest(const KURL &url); - void popup( const QString & url, const QPoint & p ); + void popup( const TQString & url, const TQPoint & p ); void slotReload(); void slotStop(); @@ -90,15 +90,15 @@ protected slots: private: - QValueList< DocumentationHistoryEntry > m_history; - QValueList< DocumentationHistoryEntry >::Iterator m_Current; + TQValueList< DocumentationHistoryEntry > m_history; + TQValueList< DocumentationHistoryEntry >::Iterator m_Current; KToolBarPopupAction* m_backAction; KToolBarPopupAction* m_forwardAction; bool m_restoring; - QString m_context; + TQString m_context; KAction *stopAction; KAction *reloadAction; KAction *duplicateAction; diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index 49925115..a7d12348 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kglobal.h> #include <klocale.h> @@ -18,24 +18,24 @@ #include "kdevtabwidget.h" -KDevTabWidget::KDevTabWidget(QWidget *parent, const char *name) : QTabWidget(parent,name) +KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name) { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); - connect(m_pTabBar, SIGNAL(closeWindow(const QWidget*)), this, SIGNAL(closeWindow(const QWidget*))); - connect(m_pTabBar, SIGNAL(closeOthers(QWidget*)), this, SIGNAL(closeOthers(QWidget*))); + connect(m_pTabBar, TQT_SIGNAL(closeWindow(const TQWidget*)), this, TQT_SIGNAL(closeWindow(const TQWidget*))); + connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*))); } -KTabBar::KTabBar(QWidget *parent, const char *name) : QTabBar(parent,name) +KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) { - m_pPopupMenu = new QPopupMenu(this); + m_pPopupMenu = new TQPopupMenu(this); - QPixmap closePixmap = KGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); + TQPixmap closePixmap = KGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); if (closePixmap.isNull()) closePixmap = SmallIcon("fileclose"); - m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, SLOT(closeWindowSlot())); - m_pPopupMenu->insertItem(i18n("Close &Others"), this, SLOT(closeOthersSlot())); + m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQT_SLOT(closeWindowSlot())); + m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQT_SLOT(closeOthersSlot())); } void KTabBar::closeWindowSlot() @@ -48,11 +48,11 @@ void KTabBar::closeOthersSlot() emit closeOthers(m_pPage); } -void KTabBar::mousePressEvent(QMouseEvent *e) +void KTabBar::mousePressEvent(TQMouseEvent *e) { if(e->button() == Qt::RightButton) { - QTab *tab = selectTab(e->pos() ); + TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) ); @@ -60,7 +60,7 @@ void KTabBar::mousePressEvent(QMouseEvent *e) m_pPopupMenu->exec(mapToGlobal(e->pos())); } - QTabBar::mousePressEvent(e); + TQTabBar::mousePressEvent(e); } #include "kdevtabwidget.moc" diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp index 23bc653b..0a219da5 100644 --- a/lib/widgets/klistviewaction.cpp +++ b/lib/widgets/klistviewaction.cpp @@ -20,8 +20,8 @@ #include "kcomboview.h" #include "resizablecombo.h" -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <kconfig.h> #include <kglobal.h> @@ -37,8 +37,8 @@ KListViewAction::~KListViewAction() delete m_view; } -KListViewAction::KListViewAction(KComboView *view, const QString & text, const KShortcut & cut, - const QObject * receiver, const char * slot, KActionCollection * parent, const char * name ): +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) { m_view->setDuplicatesEnabled(false); @@ -47,8 +47,8 @@ KListViewAction::KListViewAction(KComboView *view, const QString & text, const K loadComboWidth(); } -KListViewAction::KListViewAction( KComboView * view, const QString & text, const KShortcut & cut, - const QObject * receiver, const char * slot, KActionCollection * parent, const char * name, const bool /*dummy*/ ): +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) { m_view->setDuplicatesEnabled(false); @@ -62,16 +62,16 @@ KComboView * KListViewAction::view( ) const return m_view; } -void KListViewAction::setToolTip( const QString & str ) +void KListViewAction::setToolTip( const TQString & str ) { - QToolTip::remove(m_view); - QToolTip::add(m_view, str); + TQToolTip::remove(m_view); + TQToolTip::add(m_view, str); } -void KListViewAction::setWhatsThis( const QString & str ) +void KListViewAction::setWhatsThis( const TQString & str ) { - QWhatsThis::remove(m_view); - QWhatsThis::add(m_view, str); + TQWhatsThis::remove(m_view); + TQWhatsThis::add(m_view, str); } void KListViewAction::loadComboWidth( ) diff --git a/lib/widgets/klistviewaction.h b/lib/widgets/klistviewaction.h index 72a78dd0..d8f53eb8 100644 --- a/lib/widgets/klistviewaction.h +++ b/lib/widgets/klistviewaction.h @@ -38,14 +38,14 @@ Can be used on toolbars. It appears as @ref ResizableCombo. class KListViewAction: public KWidgetAction { public: - KListViewAction(KComboView *view, const QString &text, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name); - KListViewAction(KComboView *view, const QString &text, const KShortcut &cut, const QObject *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 *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; - void setToolTip(const QString & str); - void setWhatsThis(const QString &str); + void setToolTip(const TQString & str); + void setWhatsThis(const TQString &str); private: void loadComboWidth(); diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index 81d9ed38..8ddb5c89 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include <qvbox.h> -#include <qlabel.h> -#include <qheader.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqheader.h> #include <klocale.h> #include <kpushbutton.h> @@ -35,8 +35,8 @@ namespace class CheckURL : public QCheckListItem { public: - CheckURL( QListView * lv, KURL const & url ) - : QCheckListItem( lv, url.path(), QCheckListItem::CheckBox), + CheckURL( TQListView * lv, KURL const & url ) + : TQCheckListItem( lv, url.path(), TQCheckListItem::CheckBox), _url( url ) {} @@ -49,20 +49,20 @@ private: } -KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, QWidget * parent ) : +KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ) : KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { - QVBox *top = makeVBoxMainWidget(); + TQVBox *top = makeVBoxMainWidget(); - (void)new QLabel( i18n("The following files have been modified. Save them?"), top ); + (void)new TQLabel( i18n("The following files have been modified. Save them?"), top ); _listview = new KListView( top ); _listview->addColumn( "" ); _listview->header()->hide(); - _listview->setResizeMode( QListView::LastColumn ); + _listview->setResizeMode( TQListView::LastColumn ); - setButtonOK( KGuiItem(i18n("Save &Selected"), QString::null, i18n("Saves all selected files")) ); + setButtonOK( KGuiItem(i18n("Save &Selected"), TQString::null, i18n("Saves all selected files")) ); setButtonText( User1, i18n("Save &None") ); setButtonText( Close, KStdGuiItem::cancel().text() ); setButtonTip( User1, i18n("Lose all modifications") ); @@ -73,15 +73,15 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co { if ( !ignorelist.contains( *it ) ) { - QCheckListItem * x = new CheckURL( _listview, *it ); + TQCheckListItem * x = new CheckURL( _listview, *it ); x->setOn( true ); } ++it; } - connect( this, SIGNAL(closeClicked()), this, SLOT(cancel()) ); - connect( this, SIGNAL(okClicked()), this, SLOT(save()) ); - connect( this, SIGNAL(user1Clicked()), this, SLOT(saveNone()) ); + connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); + connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) ); + connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) ); } KSaveSelectDialog::~KSaveSelectDialog() {} @@ -96,17 +96,17 @@ void KSaveSelectDialog::saveNone( ) item = static_cast<CheckURL*>( item->nextSibling() ); } - QDialog::accept(); + TQDialog::accept(); } void KSaveSelectDialog::save( ) { - QDialog::accept(); + TQDialog::accept(); } void KSaveSelectDialog::cancel( ) { - QDialog::reject(); + TQDialog::reject(); } KURL::List KSaveSelectDialog::filesToSave( ) @@ -140,28 +140,28 @@ KURL::List KSaveSelectDialog::filesNotToSave( ) } -KSaveAllDialog::KSaveAllDialog( const QStringList& filenames, QWidget* parent ) : +KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ) : KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { m_result = Cancel; - QVBox *top = makeVBoxMainWidget(); + TQVBox *top = makeVBoxMainWidget(); - (void)new QLabel( i18n("The following files have been modified. Save them?"), top ); + (void)new TQLabel( i18n("The following files have been modified. Save them?"), top ); KListBox* lb = new KListBox( top ); lb->setMinimumHeight( lb->fontMetrics().height() * 5 ); lb->insertStringList( filenames ); - setButtonOK( KGuiItem(i18n("Save &All"), QString::null, i18n("Saves all modified files")) ); + setButtonOK( KGuiItem(i18n("Save &All"), TQString::null, i18n("Saves all modified files")) ); setButtonText( User1, i18n("Save &None") ); setButtonText( Close, KStdGuiItem::cancel().text() ); setButtonTip( User1, i18n("Lose all modifications") ); setButtonTip( Close, i18n("Cancels the action") ); - connect( this, SIGNAL(closeClicked()), this, SLOT(cancel()) ); - connect( this, SIGNAL(okClicked()), this, SLOT(saveAll()) ); - connect( this, SIGNAL(user1Clicked()), this, SLOT(revert()) ); + connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); + connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) ); + connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) ); } KSaveAllDialog::~KSaveAllDialog() @@ -171,19 +171,19 @@ KSaveAllDialog::~KSaveAllDialog() void KSaveAllDialog::revert() { m_result = Revert; - QDialog::accept(); + TQDialog::accept(); } void KSaveAllDialog::saveAll() { m_result = SaveAll; - QDialog::accept(); + TQDialog::accept(); } void KSaveAllDialog::cancel() { m_result = Cancel; - QDialog::reject(); + TQDialog::reject(); } #include "ksavealldialog.moc" diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h index 9d7860cf..c6592b4a 100644 --- a/lib/widgets/ksavealldialog.h +++ b/lib/widgets/ksavealldialog.h @@ -20,7 +20,7 @@ #ifndef SAVEALLDIALOG_H #define SAVEALLDIALOG_H -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdialogbase.h> #include <kurl.h> @@ -38,7 +38,7 @@ class KSaveSelectDialog : public KDialogBase Q_OBJECT public: - KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, QWidget * parent ); + KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ); virtual ~KSaveSelectDialog(); KURL::List filesToSave(); @@ -65,7 +65,7 @@ class KSaveAllDialog : public KDialogBase public: enum SaveAllResult{ SaveAll, Cancel, Revert }; - KSaveAllDialog( const QStringList& filenames, QWidget* parent ); + KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ); virtual ~KSaveAllDialog(); SaveAllResult result() const { return m_result; } diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp index e4f7e08d..8fdbc5d2 100644 --- a/lib/widgets/processlinemaker.cpp +++ b/lib/widgets/processlinemaker.cpp @@ -28,11 +28,11 @@ ProcessLineMaker::ProcessLineMaker() ProcessLineMaker::ProcessLineMaker( const KProcess* proc ) { - connect(proc, SIGNAL(receivedStdout(KProcess*,char*,int)), - this, SLOT(slotReceivedStdout(KProcess*,char*,int)) ); + connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), + this, TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)) ); - connect(proc, SIGNAL(receivedStderr(KProcess*,char*,int)), - this, SLOT(slotReceivedStderr(KProcess*,char*,int)) ); + connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), + this, TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)) ); } void ProcessLineMaker::slotReceivedStdout( const char *buffer ) @@ -40,7 +40,7 @@ void ProcessLineMaker::slotReceivedStdout( const char *buffer ) stdoutbuf += buffer; int pos; while ( (pos = stdoutbuf.find('\n')) != -1) { - QCString line = stdoutbuf.left( pos ); + TQCString line = stdoutbuf.left( pos ); emit receivedStdoutLine(line); stdoutbuf.remove(0, pos+1); } @@ -61,7 +61,7 @@ void ProcessLineMaker::slotReceivedStderr( const char *buffer ) stderrbuf += buffer; int pos; while ( (pos = stderrbuf.find('\n')) != -1) { - QCString line = stderrbuf.left( pos ); + 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 7efa508a..d124e2ed 100644 --- a/lib/widgets/processlinemaker.h +++ b/lib/widgets/processlinemaker.h @@ -20,7 +20,7 @@ #ifndef _PROCESSLINEMAKER_H_ #define _PROCESSLINEMAKER_H_ -#include <qobject.h> +#include <tqobject.h> /** @file processlinemaker.h @@ -52,14 +52,14 @@ protected slots: void slotReceivedStderr(KProcess *, char *buffer, int buflen); signals: - void receivedStdoutLine( const QCString& line ); - void receivedStderrLine( const QCString& line ); - void receivedPartialStdoutLine( const QCString& line ); - void receivedPartialStderrLine( const QCString& line ); + void receivedStdoutLine( const TQCString& line ); + void receivedStderrLine( const TQCString& line ); + void receivedPartialStdoutLine( const TQCString& line ); + void receivedPartialStderrLine( const TQCString& line ); private: - QCString stdoutbuf; - QCString stderrbuf; + TQCString stdoutbuf; + TQCString stderrbuf; }; #endif diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index 3edbf161..a49a1078 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -21,21 +21,21 @@ #include "processlinemaker.h" #include <kdeversion.h> -#include <qdir.h> +#include <tqdir.h> #include <kdebug.h> #include <klocale.h> #include <kprocess.h> -#include <qpainter.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqapplication.h> -ProcessListBoxItem::ProcessListBoxItem(const QString &s, Type type) - : QListBoxText(s), t(type) +ProcessListBoxItem::ProcessListBoxItem(const TQString &s, Type type) + : TQListBoxText(s), t(type) { - QString clean = s; - clean.replace( QChar('\t'), QString(" ") ); - clean.replace( QChar('\n'), QString() ); - clean.replace( QChar('\r'), QString() ); + TQString clean = s; + clean.replace( TQChar('\t'), TQString(" ") ); + clean.replace( TQChar('\n'), TQString() ); + clean.replace( TQChar('\r'), TQString() ); setText( clean ); setCustomHighlighting(true); @@ -57,7 +57,7 @@ static inline double blend1(double a, double b, double k) return a + (b - a) * k; } -QColor ProcessListBoxItem::blend(const QColor &c1, const QColor &c2, double k) const +TQColor ProcessListBoxItem::blend(const TQColor &c1, const TQColor &c2, double k) const { if (k < 0.0) return c1; if (k > 1.0) return c2; @@ -66,14 +66,14 @@ QColor ProcessListBoxItem::blend(const QColor &c1, const QColor &c2, double k) c 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 QColor(qRgb(r, g, b)); + return TQColor(qRgb(r, g, b)); } -void ProcessListBoxItem::paint(QPainter *p) +void ProcessListBoxItem::paint(TQPainter *p) { - QColor dim, warn, err, back; + TQColor dim, warn, err, back; if (listBox()) { - const QColorGroup& group = listBox()->palette().active(); + const TQColorGroup& group = listBox()->palette().active(); if (isSelected()) { back = group.button(); warn = group.buttonText(); @@ -96,17 +96,17 @@ void ProcessListBoxItem::paint(QPainter *p) else back = Qt::white; } - p->fillRect(p->window(), QBrush(back)); + p->fillRect(p->window(), TQBrush(back)); p->setPen((t==Error)? err : (t==Diagnostic)? warn : dim); - QListBoxText::paint(p); + TQListBoxText::paint(p); } -ProcessWidget::ProcessWidget(QWidget *parent, const char *name) +ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) : KListBox(parent, name) { - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQWidget::NoFocus); // Don't override the palette, as that can mess up styles. Instead, draw // the background ourselves (see ProcessListBoxItem::paint). @@ -117,17 +117,17 @@ ProcessWidget::ProcessWidget(QWidget *parent, const char *name) procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, SIGNAL(receivedStdoutLine(const QCString&)), - this, SLOT(insertStdoutLine(const QCString&) )); - connect( procLineMaker, SIGNAL(receivedStderrLine(const QCString&)), - this, SLOT(insertStderrLine(const QCString&) )); - connect( procLineMaker, SIGNAL(receivedPartialStdoutLine(const QCString&)), - this, SLOT(addPartialStdoutLine(const QCString&) )); - connect( procLineMaker, SIGNAL(receivedPartialStderrLine(const QCString&)), - this, SLOT(addPartialStderrLine(const QCString&) )); - - connect(childproc, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*) )) ; + connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQT_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQT_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQT_SLOT(addPartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQT_SLOT(addPartialStderrLine(const TQCString&) )); + + connect(childproc, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*) )) ; } @@ -138,7 +138,7 @@ ProcessWidget::~ProcessWidget() } -void ProcessWidget::startJob(const QString &dir, const QString &command) +void ProcessWidget::startJob(const TQString &dir, const TQString &command) { procLineMaker->clearBuffers(); procLineMaker->blockSignals( false ); @@ -182,18 +182,18 @@ void ProcessWidget::slotProcessExited(KProcess *) } -void ProcessWidget::insertStdoutLine(const QCString &line) +void ProcessWidget::insertStdoutLine(const TQCString &line) { if( !stdoutbuf.isEmpty() ) { stdoutbuf += line; - insertItem( new ProcessListBoxItem( QString::fromLocal8Bit(stdoutbuf), + insertItem( new ProcessListBoxItem( TQString::fromLocal8Bit(stdoutbuf), ProcessListBoxItem::Normal ), lastRowStdout+1 ); stdoutbuf.truncate( 0 ); }else { - insertItem( new ProcessListBoxItem( QString::fromLocal8Bit( line ), + insertItem( new ProcessListBoxItem( TQString::fromLocal8Bit( line ), ProcessListBoxItem::Normal) ); } lastRowStdout = count() - 1; @@ -201,18 +201,18 @@ void ProcessWidget::insertStdoutLine(const QCString &line) } -void ProcessWidget::insertStderrLine(const QCString &line) +void ProcessWidget::insertStderrLine(const TQCString &line) { if( !stderrbuf.isEmpty() ) { stderrbuf += line; - insertItem( new ProcessListBoxItem( QString::fromLocal8Bit( stderrbuf ), + insertItem( new ProcessListBoxItem( TQString::fromLocal8Bit( stderrbuf ), ProcessListBoxItem::Error ), lastRowStderr+1 ); stderrbuf.truncate( 0 ); } else { - insertItem( new ProcessListBoxItem( QString::fromLocal8Bit( line ), + insertItem( new ProcessListBoxItem( TQString::fromLocal8Bit( line ), ProcessListBoxItem::Error) ); } lastRowStderr = count() - 1; @@ -222,7 +222,7 @@ void ProcessWidget::insertStderrLine(const QCString &line) void ProcessWidget::childFinished(bool normal, int status) { - QString s; + TQString s; ProcessListBoxItem::Type t; if (normal) { @@ -249,12 +249,12 @@ void ProcessWidget::childFinished(bool normal, int status) } -QSize ProcessWidget::minimumSizeHint() const +TQSize ProcessWidget::minimumSizeHint() const { // I'm not sure about this, but when I don't use override minimumSizeHint(), // the initial size in clearly too small - return QSize( QListBox::sizeHint().width(), + return TQSize( TQListBox::sizeHint().width(), (fontMetrics().lineSpacing()+2)*4 ); } @@ -270,12 +270,12 @@ void ProcessWidget::maybeScrollToBottom() } } -void ProcessWidget::addPartialStderrLine(const QCString& linepart) +void ProcessWidget::addPartialStderrLine(const TQCString& linepart) { stderrbuf += linepart; } -void ProcessWidget::addPartialStdoutLine(const QCString& linepart) +void ProcessWidget::addPartialStdoutLine(const TQCString& linepart) { stdoutbuf += linepart; } diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index f1e28a57..ee1a6012 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -38,15 +38,15 @@ class ProcessListBoxItem : public QListBoxText public: enum Type { Diagnostic, Normal, Error }; - ProcessListBoxItem(const QString &s, Type type); + ProcessListBoxItem(const TQString &s, Type type); virtual bool isCustomItem(); protected: - QColor blend(const QColor &c1, const QColor &c2, double k = 0.25) const; + TQColor blend(const TQColor &c1, const TQColor &c2, double k = 0.25) const; private: - virtual void paint(QPainter *p); + virtual void paint(TQPainter *p); Type t; }; @@ -60,7 +60,7 @@ class ProcessWidget : public KListBox Q_OBJECT public: - ProcessWidget(QWidget *parent, const char *name=0); + ProcessWidget(TQWidget *parent, const char *name=0); ~ProcessWidget(); /** @@ -72,7 +72,7 @@ public slots: /** * Starts the child process. */ - void startJob(const QString &dir, const QString &command); + void startJob(const TQString &dir, const TQString &command); /** * Kills the child processss. */ @@ -82,17 +82,17 @@ public slots: * be overridden by subclasses to implement * syntax highlighting. */ - virtual void insertStdoutLine(const QCString &line); + virtual void insertStdoutLine(const TQCString &line); /** * Inserts one line from stderr into the listbox. This can * be overridden by subclasses to implement * syntax highlighting. By default, a ProcessListBoxItem * is used. */ - virtual void insertStderrLine(const QCString &line); + virtual void insertStderrLine(const TQCString &line); - virtual void addPartialStdoutLine(const QCString&); - virtual void addPartialStderrLine(const QCString&); + virtual void addPartialStdoutLine(const TQCString&); + virtual void addPartialStderrLine(const TQCString&); protected: /** @@ -108,7 +108,7 @@ signals: void rowSelected(int row); protected: - virtual QSize minimumSizeHint() const; + virtual TQSize minimumSizeHint() const; void maybeScrollToBottom(); protected slots: @@ -117,8 +117,8 @@ protected slots: private: KProcess *childproc; ProcessLineMaker* procLineMaker; - QCString stderrbuf; - QCString stdoutbuf; + TQCString stderrbuf; + TQCString stdoutbuf; int lastRowStdout; int lastRowStderr; }; diff --git a/lib/widgets/propeditor/childproperty.cpp b/lib/widgets/propeditor/childproperty.cpp index 12b7f4d9..ac53936a 100644 --- a/lib/widgets/propeditor/childproperty.cpp +++ b/lib/widgets/propeditor/childproperty.cpp @@ -19,29 +19,29 @@ ***************************************************************************/ #include "childproperty.h" -#include <qsize.h> -#include <qpoint.h> -#include <qrect.h> -#include <qsizepolicy.h> +#include <tqsize.h> +#include <tqpoint.h> +#include <tqrect.h> +#include <tqsizepolicy.h> #include "multiproperty.h" namespace PropertyLib{ -ChildProperty::ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const QString &name, - const QString &description, const QVariant &value, bool save, bool readOnly) +ChildProperty::ChildProperty(MultiProperty *parent, 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) { } -ChildProperty::ChildProperty(MultiProperty *parent, const QString & name, ChildPropertyType childType, - const QMap<QString, QVariant> &v_valueList, const QString &description, - const QVariant &value, bool save, bool readOnly) +ChildProperty::ChildProperty(MultiProperty *parent, 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) { } -void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue +void ChildProperty::setValue(const TQVariant &value, bool // rememberOldValue ) { qWarning("ChildProperty::setValue"); @@ -51,8 +51,8 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue { case Size: { - qWarning("ChildProperty::setValue for QSize"); - QSize v = m_parent->value().toSize(); + qWarning("ChildProperty::setValue for TQSize"); + TQSize v = m_parent->value().toSize(); if (m_childType == Size_Height) v.setHeight(value.toInt()); else if (m_childType == Size_Width) @@ -62,8 +62,8 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue } case Point: { - qWarning("ChildProperty::setValue for QPoint"); - QPoint v = m_parent->value().toPoint(); + qWarning("ChildProperty::setValue for TQPoint"); + TQPoint v = m_parent->value().toPoint(); if (m_childType == Point_X) v.setX(value.toInt()); else if (m_childType == Point_Y) @@ -73,8 +73,8 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue } case Rect: { - qWarning("ChildProperty::setValue for QRect"); - QRect v = m_parent->value().toRect(); + qWarning("ChildProperty::setValue for TQRect"); + TQRect v = m_parent->value().toRect(); if (m_childType == Rect_X) v.setX(value.toInt()); else if (m_childType == Rect_Y) @@ -88,12 +88,12 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue } case SizePolicy: { - qWarning("ChildProperty::setValue for QSizePolicy"); - QSizePolicy v = m_parent->value().toSizePolicy(); + qWarning("ChildProperty::setValue for TQSizePolicy"); + TQSizePolicy v = m_parent->value().toSizePolicy(); if (m_childType == SizePolicy_HorData) - v.setHorData(QSizePolicy::SizeType(value.toInt())); + v.setHorData(TQSizePolicy::SizeType(value.toInt())); else if (m_childType == SizePolicy_VerData) - v.setVerData(QSizePolicy::SizeType(value.toInt())); + v.setVerData(TQSizePolicy::SizeType(value.toInt())); else if (m_childType == SizePolicy_HorStretch) v.setHorStretch(value.toInt()); else if (m_childType == SizePolicy_VerStretch) @@ -104,10 +104,10 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue } } -QVariant ChildProperty::value( ) const +TQVariant ChildProperty::value( ) const { if (!m_parent->valid()) - return QVariant(); + return TQVariant(); switch (m_parent->type()) { case Size: @@ -139,7 +139,7 @@ QVariant ChildProperty::value( ) const else if (m_childType == SizePolicy_VerStretch) return m_parent->value().toSizePolicy().verStretch(); } - return QVariant(); + return TQVariant(); } } diff --git a/lib/widgets/propeditor/childproperty.h b/lib/widgets/propeditor/childproperty.h index fc43553a..6e247fd3 100644 --- a/lib/widgets/propeditor/childproperty.h +++ b/lib/widgets/propeditor/childproperty.h @@ -60,18 +60,18 @@ public: /**Constructs empty property.*/ ChildProperty() {} /**Constructs property.*/ - ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const QString &name, - const QString &description, const QVariant &value = QVariant(), + ChildProperty(MultiProperty *parent, 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 QString &name, ChildPropertyType childType, - const QMap<QString, QVariant> &v_valueList, const QString &description, - const QVariant &value = QVariant(), bool save = true, bool readOnly = false); + ChildProperty(MultiProperty *parent, const TQString &name, ChildPropertyType childType, + const TQMap<TQString, TQVariant> &v_valueList, const TQString &description, + const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); /**@return the value of the property.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value of the property.*/ - virtual void setValue(const QVariant &value, bool rememberOldValue = true); + virtual void setValue(const TQVariant &value, bool rememberOldValue = true); private: MultiProperty *m_parent; diff --git a/lib/widgets/propeditor/compat_tools.h b/lib/widgets/propeditor/compat_tools.h index 1a1a8735..a932b24a 100644 --- a/lib/widgets/propeditor/compat_tools.h +++ b/lib/widgets/propeditor/compat_tools.h @@ -1,6 +1,6 @@ #ifndef COMPAT_TOOLS_H #define COMPAT_TOOLS_H -#define i18n QObject::tr +#define i18n TQObject::tr #endif diff --git a/lib/widgets/propeditor/multiproperty.cpp b/lib/widgets/propeditor/multiproperty.cpp index 17b05797..9c3b04c4 100644 --- a/lib/widgets/propeditor/multiproperty.cpp +++ b/lib/widgets/propeditor/multiproperty.cpp @@ -43,50 +43,50 @@ MultiProperty::~MultiProperty() { } -QString MultiProperty::name() const +TQString MultiProperty::name() const { if (list.count() >= 1) return list.getFirst()->name(); - return QString::null; + return TQString::null; } int MultiProperty::type() const { if (list.count() >= 1) return list.getFirst()->type(); - return QVariant::Invalid; + return TQVariant::Invalid; } -QVariant MultiProperty::value() const +TQVariant MultiProperty::value() const { - QVariant value; + TQVariant value; if (list.count() >= 1) value = list.getFirst()->value(); - QPtrListIterator<Property> it(list); + TQPtrListIterator<Property> it(list); Property *property; while ((property = it.current()) != 0) { if (property->value() != value) - return QVariant::Invalid; + return TQVariant::Invalid; ++it; } return value; } -QString MultiProperty::description() const +TQString MultiProperty::description() const { - QString description; + TQString description; if (list.count() >= 1) description = list.getFirst()->description(); - QPtrListIterator<Property> it(list); + TQPtrListIterator<Property> it(list); Property *property; while ((property = it.current()) != 0) { if (property->description() != description) - return QString::null; + return TQString::null; ++it; } @@ -99,7 +99,7 @@ bool MultiProperty::readOnly() const if (list.count() >= 1) v = list.getFirst()->readOnly(); - QPtrListIterator<Property> it(list); + TQPtrListIterator<Property> it(list); Property *property; while ((property = it.current()) != 0) { @@ -117,7 +117,7 @@ bool MultiProperty::visible() const if (list.count() >= 1) v = list.getFirst()->readOnly(); - QPtrListIterator<Property> it(list); + TQPtrListIterator<Property> it(list); Property *property; while ((property = it.current()) != 0) { @@ -129,21 +129,21 @@ bool MultiProperty::visible() const return v; } -QMap<QString, QVariant> MultiProperty::valueList() const +TQMap<TQString, TQVariant> MultiProperty::valueList() const { if (list.count() >= 1) return list.getFirst()->valueList; - return QMap<QString, QVariant>(); + return TQMap<TQString, TQVariant>(); } -void MultiProperty::setDescription(const QString &description) +void MultiProperty::setDescription(const TQString &description) { Property *property; for (property = list.first(); property; property = list.next()) property->setDescription(description); } -/*void MultiProperty::setName(const QString &name) +/*void MultiProperty::setName(const TQString &name) { } @@ -151,7 +151,7 @@ void MultiProperty::setType(int type) { } */ -void MultiProperty::setValue(const QVariant &value) +void MultiProperty::setValue(const TQVariant &value) { Property *property; for (property = list.first(); property; property = list.next()) @@ -165,7 +165,7 @@ void MultiProperty::setValue(const QVariant &value) } } -void MultiProperty::setValue(const QVariant &value, bool emitChange) +void MultiProperty::setValue(const TQVariant &value, bool emitChange) { Property *property; for (property = list.first(); property; property = list.next()) @@ -176,7 +176,7 @@ void MultiProperty::setValue(const QVariant &value, bool emitChange) } } -void MultiProperty::setValueList(const QMap<QString, QVariant> &valueList) +void MultiProperty::setValueList(const TQMap<TQString, TQVariant> &valueList) { Property *property; for (property = list.first(); property; property = list.next()) @@ -227,13 +227,13 @@ void MultiProperty::removeProperty( MultiProperty *prop) removeProperty(property); } -QVariant MultiProperty::findValueDescription() const +TQVariant MultiProperty::findValueDescription() const { - QVariant val = value(); + TQVariant val = value(); if (type() != Property::ValueFromList) return val; - QMap<QString, QVariant> vl = valueList(); - for (QMap<QString, QVariant>::const_iterator it = vl.begin(); it != vl.end(); ++ it) + TQMap<TQString, TQVariant> vl = valueList(); + for (TQMap<TQString, TQVariant>::const_iterator it = vl.begin(); it != vl.end(); ++ it) { if (it.data() == val) return it.key(); @@ -241,12 +241,12 @@ QVariant MultiProperty::findValueDescription() const return ""; } -QVariant MultiProperty::findValueDescription(QVariant val) const +TQVariant MultiProperty::findValueDescription(TQVariant val) const { if (type() != Property::ValueFromList) return val; - QMap<QString, QVariant> vl = valueList(); - for (QMap<QString, QVariant>::const_iterator it = vl.begin(); it != vl.end(); ++ it) + TQMap<TQString, TQVariant> vl = valueList(); + for (TQMap<TQString, TQVariant>::const_iterator it = vl.begin(); it != vl.end(); ++ it) { if (it.data() == val) return it.key(); diff --git a/lib/widgets/propeditor/multiproperty.h b/lib/widgets/propeditor/multiproperty.h index a0d63c64..49410a04 100644 --- a/lib/widgets/propeditor/multiproperty.h +++ b/lib/widgets/propeditor/multiproperty.h @@ -19,9 +19,9 @@ #ifndef MULTIPROPERTY_H #define MULTIPROPERTY_H -#include <qptrlist.h> -#include <qmap.h> -#include <qvariant.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqvariant.h> #include "property.h" #include "childproperty.h" @@ -72,36 +72,36 @@ public: void removeProperty(MultiProperty *prop); /**Returns the name of a %property.*/ - QString name() const; + TQString name() const; /**Returns the type of a %property.*/ int type() const; /**Returns the value of a %property.*/ - QVariant value() const; + TQVariant value() const; /**Returns the description of a %property.*/ - QString description() const; + TQString description() const; /**Returns the readonly attribute of a %property.*/ bool readOnly() const; /**Returns the visibility attribute of a %property.*/ bool visible() const; /**The string-to-value correspondence list of the %property.*/ - QMap<QString, QVariant> valueList() const; + TQMap<TQString, TQVariant> valueList() const; /**Sets the value of a %property.*/ - void setValue(const QVariant& value); + void setValue(const TQVariant& value); /**Sets the value of a %property. @param value new value of thus %multiproperty @param emitChange if set to true then %property list which owns this %multiproperty emits propertyValueChanged signal.*/ - void setValue(const QVariant& value, bool emitChange); + void setValue(const TQVariant& value, bool emitChange); /**Sets the description of a %property.*/ - void setDescription(const QString &description); + void setDescription(const TQString &description); /**Sets the list of possible values of a %property.*/ - void setValueList(const QMap< QString, QVariant >& valueList); + void setValueList(const TQMap< TQString, TQVariant >& valueList); /**Finds string description for a value.*/ - QVariant findValueDescription() const; + TQVariant findValueDescription() const; /**Finds string description for a value.*/ - QVariant findValueDescription(QVariant val) const; + TQVariant findValueDescription(TQVariant val) const; /**Returns true if the %multiproperty has no properties in the list (i.e. it's invalid).*/ bool valid() const; @@ -110,10 +110,10 @@ public: void undo(); /**The list of child properties.*/ - QValueList<ChildProperty> details; + TQValueList<ChildProperty> details; private: - QPtrList<Property> list; + TQPtrList<Property> list; PropertyList *m_propertyList; diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index 15aacbff..3f406e4d 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "pcheckbox.h" -#include <qlayout.h> -#include <qcheckbox.h> -#include <qpainter.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqpainter.h> #ifndef PURE_QT #include <klocale.h> @@ -31,37 +31,37 @@ namespace PropertyLib{ -PCheckBox::PCheckBox(MultiProperty *property, QWidget *parent, const char *name) +PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); - m_edit = new QCheckBox(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); + m_edit = new TQCheckBox(this); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool))); + connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); } -QVariant PCheckBox::value() const +TQVariant PCheckBox::value() const { - return QVariant(m_edit->isChecked()); + return TQVariant(m_edit->isChecked()); } -void PCheckBox::setValue(const QVariant &value, bool emitChange) +void PCheckBox::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool))); + disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); m_edit->setChecked(value.toBool()); - connect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool))); + connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); if (emitChange) emit propertyChanged(m_property, value); } void PCheckBox::updateProperty(bool val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } -void PCheckBox::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value) +void PCheckBox::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { p->setBrush(cg.background()); p->setPen(Qt::NoPen); diff --git a/lib/widgets/propeditor/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h index 0ea56498..53cefe57 100644 --- a/lib/widgets/propeditor/pcheckbox.h +++ b/lib/widgets/propeditor/pcheckbox.h @@ -32,21 +32,21 @@ namespace PropertyLib{ class PCheckBox: public PropertyWidget{ Q_OBJECT public: - PCheckBox(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); /**Function to draw a property viewer when the editor isn't shown.*/ - virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value); + virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value); private slots: void updateProperty(bool val); private: - QCheckBox *m_edit; + TQCheckBox *m_edit; }; } diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index 84063e8b..9609442f 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -19,46 +19,46 @@ ***************************************************************************/ #include "pcolorbutton.h" -#include <qlayout.h> -#include <qpainter.h> +#include <tqlayout.h> +#include <tqpainter.h> #ifndef PURE_QT #include <kcolorbutton.h> #else -#include <qpushbutton.h> -#include <qpixmap.h> -#include <qiconset.h> +#include <tqpushbutton.h> +#include <tqpixmap.h> +#include <tqiconset.h> #endif -#include <qcolordialog.h> +#include <tqcolordialog.h> namespace PropertyLib { -PColorButton::PColorButton(MultiProperty* property, QWidget* parent, const char* name) +PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char* name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT m_edit = new KColorButton(this); - connect(m_edit, SIGNAL(changed(const QColor&)), this, SLOT(updateProperty(const QColor&))); + connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); #else - m_edit = new QPushButton(this); - connect(m_edit, SIGNAL(clicked()), this, SLOT(changeColor())); + m_edit = new TQPushButton(this); + connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor())); #endif - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); } -QVariant PColorButton::value() const +TQVariant PColorButton::value() const { #ifndef PURE_QT - return QVariant(m_edit->color()); + return TQVariant(m_edit->color()); #else - return QVariant(m_color); + return TQVariant(m_color); #endif } -void PColorButton::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PColorButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { /* p->setBrush(value.toColor()); p->setPen(Qt::NoPen); @@ -69,22 +69,22 @@ void PColorButton::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r p->setBrush(value.toColor()); p->setPen(Qt::SolidLine); - QRect r2(r); - r2.setTopLeft(r.topLeft() + QPoint(5,5)); - r2.setBottomRight(r.bottomRight() - QPoint(5,5)); + TQRect r2(r); + r2.setTopLeft(r.topLeft() + TQPoint(5,5)); + r2.setBottomRight(r.bottomRight() - TQPoint(5,5)); p->drawRect(r2); } -void PColorButton::setValue(const QVariant& value, bool emitChange) +void PColorButton::setValue(const TQVariant& value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, SIGNAL(changed(const QColor&)), this, SLOT(updateProperty(const QColor&))); + disconnect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); m_edit->setColor(value.toColor()); - connect(m_edit, SIGNAL(changed(const QColor&)), this, SLOT(updateProperty(const QColor&))); + connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); #else m_color = value.toColor(); m_edit->setText(m_color.name()); - QPixmap px; + TQPixmap px; px.resize(14,14); px.fill(m_color); m_edit->setIconSet(px); @@ -94,7 +94,7 @@ void PColorButton::setValue(const QVariant& value, bool emitChange) } -void PColorButton::updateProperty(const QColor &// color +void PColorButton::updateProperty(const TQColor &// color ) { emit propertyChanged(m_property, value()); @@ -106,7 +106,7 @@ void PColorButton::changeColor() m_color = QColorDialog::getColor(m_color,this); updateProperty(m_color); m_edit->setText(m_color.name()); - QPixmap px; + TQPixmap px; px.resize(14,14); px.fill(m_color); m_edit->setIconSet(px); diff --git a/lib/widgets/propeditor/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h index 8c2ec49d..04126a50 100644 --- a/lib/widgets/propeditor/pcolorbutton.h +++ b/lib/widgets/propeditor/pcolorbutton.h @@ -26,7 +26,7 @@ class KColorButton; #else class QPushButton; -#include <qcolor.h> +#include <tqcolor.h> #endif namespace PropertyLib{ @@ -37,14 +37,14 @@ class PColorButton: public PropertyWidget { Q_OBJECT public: - PColorButton(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); protected slots: - void updateProperty(const QColor& color); + void updateProperty(const TQColor& color); void changeColor(); @@ -52,8 +52,8 @@ private: #ifndef PURE_QT KColorButton *m_edit; #else - QPushButton *m_edit; - QColor m_color; + TQPushButton *m_edit; + TQColor m_color; #endif }; diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index ecb3e618..eeac7de8 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -19,34 +19,34 @@ ***************************************************************************/ #include "pcolorcombo.h" -#include <qlayout.h> -#include <qpainter.h> +#include <tqlayout.h> +#include <tqpainter.h> #include <kcolorcombo.h> namespace PropertyLib{ -PColorCombo::PColorCombo(MultiProperty *property, QWidget *parent, const char *name) +PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); } -QVariant PColorCombo::value() const +TQVariant PColorCombo::value() const { - return QVariant(m_edit->color()); + return TQVariant(m_edit->color()); } -void PColorCombo::setValue(const QVariant &value, bool emitChange) +void PColorCombo::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); m_edit->setColor(value.toColor()); - connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } @@ -56,7 +56,7 @@ void PColorCombo::updateProperty(int /*val*/) emit propertyChanged(m_property, value()); } -void PColorCombo::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value) +void PColorCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); @@ -64,9 +64,9 @@ void PColorCombo::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, p->setBrush(value.toColor()); p->setPen(Qt::SolidLine); - QRect r2(r); - r2.setTopLeft(r.topLeft() + QPoint(5,5)); - r2.setBottomRight(r.bottomRight() - QPoint(5,5)); + TQRect r2(r); + r2.setTopLeft(r.topLeft() + TQPoint(5,5)); + r2.setBottomRight(r.bottomRight() - TQPoint(5,5)); p->drawRect(r2); } diff --git a/lib/widgets/propeditor/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h index 203058c0..68f19e58 100644 --- a/lib/widgets/propeditor/pcolorcombo.h +++ b/lib/widgets/propeditor/pcolorcombo.h @@ -32,15 +32,15 @@ namespace PropertyLib{ class PColorCombo: public PropertyWidget{ Q_OBJECT public: - PColorCombo(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); /**Function to draw a property viewer when the editor isn't shown.*/ - virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value); + virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value); private slots: void updateProperty(int val); diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index 36296a25..958ba34d 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -19,18 +19,18 @@ ***************************************************************************/ #include "pcombobox.h" -#include <qcombobox.h> -#include <qlayout.h> +#include <tqcombobox.h> +#include <tqlayout.h> namespace PropertyLib{ -PComboBox::PComboBox(MultiProperty *property, const QMap<QString, QVariant> &list, QWidget *parent, const char *name) +PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name), m_valueList(list) { init(false); } -PComboBox::PComboBox(MultiProperty *property, const QMap<QString, QVariant> &list, bool rw, QWidget *parent, const char *name) +PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name), m_valueList(list) { init(rw); @@ -38,43 +38,43 @@ PComboBox::PComboBox(MultiProperty *property, const QMap<QString, QVariant> &lis void PComboBox::init(bool rw) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); - m_edit = new QComboBox(rw, this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); + m_edit = new TQComboBox(rw, this); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); fillBox(); - connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); } void PComboBox::fillBox() { - for (QMap<QString, QVariant>::const_iterator it = m_valueList.begin(); it != m_valueList.end(); it++) + for (TQMap<TQString, TQVariant>::const_iterator it = m_valueList.begin(); it != m_valueList.end(); it++) { m_edit->insertItem(it.key()); } } -QVariant PComboBox::value() const +TQVariant PComboBox::value() const { - QMap<QString, QVariant>::const_iterator it = m_valueList.find(m_edit->currentText()); + TQMap<TQString, TQVariant>::const_iterator it = m_valueList.find(m_edit->currentText()); if (it == m_valueList.end()) - return QVariant(""); - return QVariant(it.data()); + return TQVariant(""); + return TQVariant(it.data()); } -void PComboBox::setValue(const QVariant &value, bool emitChange) +void PComboBox::setValue(const TQVariant &value, bool emitChange) { #if QT_VERSION >= 0x030100 if (!value.isNull()) #else - if (value.canCast(QVariant::String)) + if (value.canCast(TQVariant::String)) #endif { - disconnect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); m_edit->setCurrentText(findDescription(value)); - connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } @@ -85,9 +85,9 @@ void PComboBox::updateProperty(int /*val*/) emit propertyChanged(m_property, value()); } -QString PComboBox::findDescription(const QVariant &value) +TQString PComboBox::findDescription(const TQVariant &value) { - for (QMap<QString, QVariant>::const_iterator it = m_valueList.begin(); it != m_valueList.end(); ++ it) + for (TQMap<TQString, TQVariant>::const_iterator it = m_valueList.begin(); it != m_valueList.end(); ++ it) { if (it.data() == value) return it.key(); @@ -95,7 +95,7 @@ QString PComboBox::findDescription(const QVariant &value) return ""; } -void PComboBox::setValueList(const QMap<QString, QVariant> &valueList) +void PComboBox::setValueList(const TQMap<TQString, TQVariant> &valueList) { m_valueList = valueList; m_edit->clear(); diff --git a/lib/widgets/propeditor/pcombobox.h b/lib/widgets/propeditor/pcombobox.h index c74869f3..71deb388 100644 --- a/lib/widgets/propeditor/pcombobox.h +++ b/lib/widgets/propeditor/pcombobox.h @@ -20,9 +20,9 @@ #ifndef PCOMBOBOX_H #define PCOMBOBOX_H -#include <qmap.h> +#include <tqmap.h> -#include <qcombobox.h> +#include <tqcombobox.h> #include "propertywidget.h" @@ -37,22 +37,22 @@ class PComboBox: public PropertyWidget{ Q_OBJECT public: /**This constructor is used for read-only selection combo. It provides a value from valueList*/ - PComboBox(MultiProperty *property, const QMap<QString, QVariant> &list, QWidget *parent = 0, const char *name = 0); + PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent = 0, const char *name = 0); /**This constructor is used for read-write selection combo. It provides a value from valueList*/ - PComboBox(MultiProperty *property, const QMap<QString, QVariant> &list, bool rw, QWidget *parent = 0, const char *name = 0); + PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); /**Sets the list of possible values shown in the editor widget. This method does not emit propertyChanged signal. Reimplemented because combobox is used to display possible values from valueList.*/ - virtual void setValueList(const QMap<QString, QVariant> &valueList); + virtual void setValueList(const TQMap<TQString, TQVariant> &valueList); protected: - QString findDescription(const QVariant &value); + TQString findDescription(const TQVariant &value); protected slots: void updateProperty(int val); @@ -62,9 +62,9 @@ private: void init(bool rw = false); /** map<description, value>*/ - QMap<QString, QVariant> m_valueList; + TQMap<TQString, TQVariant> m_valueList; - QComboBox *m_edit; + TQComboBox *m_edit; }; } diff --git a/lib/widgets/propeditor/pcursoredit.cpp b/lib/widgets/propeditor/pcursoredit.cpp index 7147d317..85aefd5e 100644 --- a/lib/widgets/propeditor/pcursoredit.cpp +++ b/lib/widgets/propeditor/pcursoredit.cpp @@ -19,17 +19,17 @@ ***************************************************************************/ #include "pcursoredit.h" -#include <qpainter.h> +#include <tqpainter.h> namespace PropertyLib{ -PCursorEdit::PCursorEdit(MultiProperty* property, const QMap<QString, QVariant> &spValues, - QWidget* parent, const char* name) +PCursorEdit::PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, + TQWidget* parent, const char* name) :PComboBox(property, spValues, parent, name) { } -void PCursorEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PCursorEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { PropertyWidget::drawViewer(p, cg, r, findDescription(value)); } diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h index bdd063f4..6149bce7 100644 --- a/lib/widgets/propeditor/pcursoredit.h +++ b/lib/widgets/propeditor/pcursoredit.h @@ -25,16 +25,16 @@ namespace PropertyLib{ /** -@short %Property editor for QCursor values. +@short %Property editor for TQCursor values. */ class PCursorEdit: public PComboBox { Q_OBJECT public: - PCursorEdit(MultiProperty* property, const QMap<QString, QVariant> &spValues, - QWidget* parent = 0, const char* name = 0); + PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, + TQWidget* parent = 0, const char* name = 0); - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); + 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 5aa5231c..141eef20 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -19,29 +19,29 @@ ***************************************************************************/ #include "pdateedit.h" -#include <qdatetimeedit.h> -#include <qpainter.h> -#include <qlayout.h> +#include <tqdatetimeedit.h> +#include <tqpainter.h> +#include <tqlayout.h> namespace PropertyLib{ -PDateEdit::PDateEdit(MultiProperty* property, QWidget* parent, const char* name) +PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new QDateEdit(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, SIGNAL(valueChanged(const QDate&)), this, SLOT(updateProperty(const QDate&))); + connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); } -QVariant PDateEdit::value() const +TQVariant PDateEdit::value() const { - return QVariant(m_edit->date()); + return TQVariant(m_edit->date()); } -void PDateEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); @@ -49,18 +49,18 @@ void PDateEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, c p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toDate().toString(Qt::LocalDate)); } -void PDateEdit::setValue(const QVariant& value, bool emitChange) +void PDateEdit::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, SIGNAL(valueChanged(const QDate&)), this, SLOT(updateProperty(const QDate&))); + disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); m_edit->setDate(value.toDate()); - connect(m_edit, SIGNAL(valueChanged(const QDate&)), this, SLOT(updateProperty(const QDate&))); + connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); if (emitChange) emit propertyChanged(m_property, value); } -void PDateEdit::updateProperty(const QDate &val) +void PDateEdit::updateProperty(const TQDate &val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } } diff --git a/lib/widgets/propeditor/pdateedit.h b/lib/widgets/propeditor/pdateedit.h index dd876557..da458737 100644 --- a/lib/widgets/propeditor/pdateedit.h +++ b/lib/widgets/propeditor/pdateedit.h @@ -27,20 +27,20 @@ class QDateEdit; namespace PropertyLib{ /** -@short %Property editor for QDate values. +@short %Property editor for TQDate values. */ class PDateEdit : public PropertyWidget { Q_OBJECT public: - PDateEdit(MultiProperty* property, QWidget* parent=0, const char* name=0); + PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); private slots: - void updateProperty(const QDate &val); + void updateProperty(const TQDate &val); private: QDateEdit *m_edit; diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 8f561888..5e414c77 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -19,28 +19,28 @@ ***************************************************************************/ #include "pdatetimeedit.h" -#include <qdatetimeedit.h> -#include <qpainter.h> -#include <qlayout.h> +#include <tqdatetimeedit.h> +#include <tqpainter.h> +#include <tqlayout.h> namespace PropertyLib{ -PDateTimeEdit::PDateTimeEdit(MultiProperty* property, QWidget* parent, const char* name): PropertyWidget(property, parent, name) +PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new QDateTimeEdit(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(updateProperty(const QDateTime&))); + connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); } -QVariant PDateTimeEdit::value() const +TQVariant PDateTimeEdit::value() const { - return QVariant(m_edit->dateTime()); + return TQVariant(m_edit->dateTime()); } -void PDateTimeEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); @@ -48,18 +48,18 @@ void PDateTimeEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toDateTime().toString(Qt::LocalDate)); } -void PDateTimeEdit::setValue(const QVariant& value, bool emitChange) +void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(updateProperty(const QDateTime&))); + disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); m_edit->setDateTime(value.toDateTime()); - connect(m_edit, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(updateProperty(const QDateTime&))); + connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); if (emitChange) emit propertyChanged(m_property, value); } -void PDateTimeEdit::updateProperty(const QDateTime &val) +void PDateTimeEdit::updateProperty(const TQDateTime &val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } } diff --git a/lib/widgets/propeditor/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h index 39d9acba..40e8b428 100644 --- a/lib/widgets/propeditor/pdatetimeedit.h +++ b/lib/widgets/propeditor/pdatetimeedit.h @@ -27,20 +27,20 @@ class QDateTimeEdit; namespace PropertyLib{ /** -@short %Property editor for QDateTime values. +@short %Property editor for TQDateTime values. */ class PDateTimeEdit : public PropertyWidget { Q_OBJECT public: - PDateTimeEdit(MultiProperty* property, QWidget* parent=0, const char* name=0); + PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); private slots: - void updateProperty(const QDateTime &val); + void updateProperty(const TQDateTime &val); private: QDateTimeEdit *m_edit; diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index aa4f72aa..df6b3bcb 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -27,23 +27,23 @@ #include <limits.h> #include <math.h> -#include <qlayout.h> +#include <tqlayout.h> namespace PropertyLib{ -PDoubleNumInput::PDoubleNumInput(MultiProperty *property, QWidget *parent, const char *name) +PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + 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(QString::null); - connect(m_edit, SIGNAL(valueChanged(double)), this, SLOT(updateProperty(double))); + m_edit->setLabel(TQString::null); + connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); #else m_edit = new QFloatInput(-999999, 999999, 0.01, 2, this ); - connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); #endif - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); /* m_edit->setMinValue(-999999999); m_edit->setMaxValue(+999999999); m_edit->setPrecision(2);*/ @@ -51,21 +51,21 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, QWidget *parent, const } -QVariant PDoubleNumInput::value() const +TQVariant PDoubleNumInput::value() const { - return QVariant(m_edit->value()); + return TQVariant(m_edit->value()); } -void PDoubleNumInput::setValue(const QVariant &value, bool emitChange) +void PDoubleNumInput::setValue(const TQVariant &value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, SIGNAL(valueChanged(double)), this, SLOT(updateProperty(double))); + disconnect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); m_edit->setValue(value.toDouble()); - connect(m_edit, SIGNAL(valueChanged(double)), this, SLOT(updateProperty(double))); + connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); #else - disconnect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int))); + disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); m_edit->setValue(int(value.toDouble()*pow(m_edit->digits(),10))); - connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); #endif if (emitChange) emit propertyChanged(m_property, value); @@ -73,15 +73,15 @@ void PDoubleNumInput::setValue(const QVariant &value, bool emitChange) void PDoubleNumInput::updateProperty(double val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } void PDoubleNumInput::updateProperty(int val) { #ifdef PURE_QT - QString format = QString("%.%1f").arg( m_edit->digits() ); - QString strVal = QString().sprintf(format.latin1(), + TQString format = TQString("%.%1f").arg( m_edit->digits() ); + TQString strVal = TQString().sprintf(format.latin1(), (val/(float)pow(m_edit->digits(),10)) ); - emit propertyChanged(m_property, QVariant(strVal)); + emit propertyChanged(m_property, TQVariant(strVal)); #else Q_UNUSED(val); #endif diff --git a/lib/widgets/propeditor/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h index a612601a..83849335 100644 --- a/lib/widgets/propeditor/pdoublenuminput.h +++ b/lib/widgets/propeditor/pdoublenuminput.h @@ -37,13 +37,13 @@ class PDoubleNumInput: public PropertyWidget { Q_OBJECT public: - PDoubleNumInput(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); private slots: //because of a bug in moc which doesn't detect conditional slots diff --git a/lib/widgets/propeditor/pdummywidget.cpp b/lib/widgets/propeditor/pdummywidget.cpp index b27f7476..65ec35e3 100644 --- a/lib/widgets/propeditor/pdummywidget.cpp +++ b/lib/widgets/propeditor/pdummywidget.cpp @@ -19,28 +19,28 @@ ***************************************************************************/ #include "pdummywidget.h" -#include <qpainter.h> +#include <tqpainter.h> namespace PropertyLib{ -PDummyWidget::PDummyWidget(MultiProperty *property, QWidget *parent, const char *name) +PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { } -QVariant PDummyWidget::value() const +TQVariant PDummyWidget::value() const { return m_value; } -void PDummyWidget::setValue(const QVariant &value, bool emitChange) +void PDummyWidget::setValue(const TQVariant &value, bool emitChange) { m_value = value; if (emitChange) emit propertyChanged(m_property, value); } -void PDummyWidget::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &/*value*/) +void PDummyWidget::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &/*value*/) { p->setBrush(cg.background()); p->setPen(Qt::NoPen); diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h index 6fcca0a5..7e94428a 100644 --- a/lib/widgets/propeditor/pdummywidget.h +++ b/lib/widgets/propeditor/pdummywidget.h @@ -41,18 +41,18 @@ class PDummyWidget: public PropertyWidget { Q_OBJECT public: - PDummyWidget(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant& value, bool emitChange); + virtual void setValue(const TQVariant& value, bool emitChange); /**Function to draw a property viewer when the editor isn't shown.*/ - virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value); + virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value); private: - QVariant m_value; + TQVariant m_value; }; } diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index e4fdf7eb..dc976b8f 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "pfontbutton.h" -#include <qlayout.h> -#include <qpainter.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpushbutton.h> #include <kfontrequester.h> @@ -33,47 +33,47 @@ namespace PropertyLib{ -PFontButton::PFontButton(MultiProperty* property, QWidget* parent, const char* name) +PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontRequester(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifndef PURE_QT m_edit->button()->setText(i18n("...")); #endif l->addWidget(m_edit); - connect(m_edit, SIGNAL(fontSelected(const QFont& )), this, SLOT(updateProperty(const QFont& ))); + connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& ))); } -QVariant PFontButton::value() const +TQVariant PFontButton::value() const { - return QVariant(m_edit->font()); + return TQVariant(m_edit->font()); } -void PFontButton::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - QFontInfo fi(value.toFont()); + TQFontInfo fi(value.toFont()); p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, - fi.family() + (fi.bold() ? i18n(" Bold") : QString("")) + - (fi.italic() ? i18n(" Italic") : QString("")) + - " " + QString("%1").arg(fi.pointSize()) ); + fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) + + (fi.italic() ? i18n(" Italic") : TQString("")) + + " " + TQString("%1").arg(fi.pointSize()) ); } -void PFontButton::setValue(const QVariant& value, bool emitChange) +void PFontButton::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, SIGNAL(fontSelected(const QFont&)), this, SLOT(updateProperty(const QFont&))); + disconnect(m_edit, TQT_SIGNAL(fontSelected(const TQFont&)), this, TQT_SLOT(updateProperty(const TQFont&))); m_edit->setFont(value.toFont()); - connect(m_edit, SIGNAL(fontSelected(const QFont& )), this, SLOT(updateProperty(const QFont& ))); + connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& ))); if (emitChange) emit propertyChanged(m_property, value); } -void PFontButton::updateProperty(const QFont &// font +void PFontButton::updateProperty(const TQFont &// font ) { emit propertyChanged(m_property, value()); diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h index 54ada141..6538f5ae 100644 --- a/lib/widgets/propeditor/pfontbutton.h +++ b/lib/widgets/propeditor/pfontbutton.h @@ -33,14 +33,14 @@ class PFontButton : public PropertyWidget { Q_OBJECT public: - PFontButton(MultiProperty* property, QWidget* parent = 0, const char* name = 0); + PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); protected slots: - void updateProperty(const QFont& font); + void updateProperty(const TQFont& font); private: KFontRequester *m_edit; diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index 368f18d9..8b0ee7a7 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -22,61 +22,61 @@ #ifndef PURE_QT #include <kfontcombo.h> #else -#include <qcombobox.h> +#include <tqcombobox.h> #endif -#include <qlayout.h> +#include <tqlayout.h> #ifdef PURE_QT -#include <qfontdatabase.h> +#include <tqfontdatabase.h> #endif namespace PropertyLib{ -PFontCombo::PFontCombo(MultiProperty *property, QWidget *parent, const char *name) +PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontCombo(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); /*adymo: KFontCombo seems to have a bug: when it is not editable, the signals - activated(int) and textChanged(const QString &) are not emitted*/ + activated(int) and textChanged(const TQString &) are not emitted*/ #ifdef PURE_QT - QFontDatabase fonts; + TQFontDatabase fonts; m_edit->insertStringList(fonts.families()); - connect(m_edit, SIGNAL(activated(const QString &)), this, SLOT(updateProperty(const QString&))); + connect(m_edit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateProperty(const TQString&))); #else - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); #endif } -QVariant PFontCombo::value() const +TQVariant PFontCombo::value() const { #ifndef PURE_QT - return QVariant(m_edit->currentFont()); + return TQVariant(m_edit->currentFont()); #else - return QVariant(m_edit->currentText()); + return TQVariant(m_edit->currentText()); #endif } -void PFontCombo::setValue(const QVariant &value, bool emitChange) +void PFontCombo::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); #ifndef PURE_QT m_edit->setCurrentFont(value.toString()); #else m_edit->setCurrentText(value.toString()); #endif - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } -void PFontCombo::updateProperty(const QString &val) +void PFontCombo::updateProperty(const TQString &val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } } diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h index c2aa1948..a703c99d 100644 --- a/lib/widgets/propeditor/pfontcombo.h +++ b/lib/widgets/propeditor/pfontcombo.h @@ -36,16 +36,16 @@ namespace PropertyLib{ class PFontCombo: public PropertyWidget{ Q_OBJECT public: - PFontCombo(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); private slots: - void updateProperty(const QString &val); + void updateProperty(const TQString &val); private: KFontCombo *m_edit; diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index ebd8d848..f5e1ecb0 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -20,38 +20,38 @@ #include "plineedit.h" #include <klineedit.h> -#include <qlayout.h> +#include <tqlayout.h> namespace PropertyLib{ -PLineEdit::PLineEdit(MultiProperty *property, QWidget *parent, const char *name) +PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); } -QVariant PLineEdit::value() const +TQVariant PLineEdit::value() const { - return QVariant(m_edit->text()); + return TQVariant(m_edit->text()); } -void PLineEdit::setValue(const QVariant &value, bool emitChange) +void PLineEdit::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); m_edit->setText(value.toString()); - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } -void PLineEdit::updateProperty(const QString& val) +void PLineEdit::updateProperty(const TQString& val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } } diff --git a/lib/widgets/propeditor/plineedit.h b/lib/widgets/propeditor/plineedit.h index f28ba191..6feb2a7b 100644 --- a/lib/widgets/propeditor/plineedit.h +++ b/lib/widgets/propeditor/plineedit.h @@ -32,16 +32,16 @@ namespace PropertyLib{ class PLineEdit: public PropertyWidget{ Q_OBJECT public: - PLineEdit(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); private slots: - void updateProperty(const QString &val); + void updateProperty(const TQString &val); private: KLineEdit *m_edit; diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index 50f55e5d..adee930e 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ #include "plinestyleedit.h" -#include <qpainter.h> -#include <qpixmap.h> -#include <qcombobox.h> -#include <qlayout.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqcombobox.h> +#include <tqlayout.h> namespace PropertyLib { @@ -127,75 +127,75 @@ namespace PropertyLib { "................................................"}; -PLineStyleEdit::PLineStyleEdit(MultiProperty* property, QWidget* parent, const char* name): PropertyWidget(property, parent, name) +PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); - m_edit = new QComboBox(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); + m_edit = new TQComboBox(this); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - m_edit->insertItem(QPixmap(nopen)); - m_edit->insertItem(QPixmap(solid)); - m_edit->insertItem(QPixmap(dash)); - m_edit->insertItem(QPixmap(dashdot)); - m_edit->insertItem(QPixmap(dashdotdot)); + m_edit->insertItem(TQPixmap(nopen)); + m_edit->insertItem(TQPixmap(solid)); + m_edit->insertItem(TQPixmap(dash)); + m_edit->insertItem(TQPixmap(dashdot)); + m_edit->insertItem(TQPixmap(dashdotdot)); - connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); } -QVariant PLineStyleEdit::value() const +TQVariant PLineStyleEdit::value() const { return m_edit->currentItem(); } -void PLineStyleEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PLineStyleEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - if (!value.canCast(QVariant::Int)) + if (!value.canCast(TQVariant::Int)) if ((value.toInt() > 5) || (value.toInt() < 0)) return; switch (value.toInt()) { case 0: - p->drawPixmap(r, QPixmap(nopen)); + p->drawPixmap(r, TQPixmap(nopen)); break; case 1: - p->drawPixmap(r, QPixmap(solid)); + p->drawPixmap(r, TQPixmap(solid)); break; case 2: - p->drawPixmap(r, QPixmap(dash)); + p->drawPixmap(r, TQPixmap(dash)); break; case 3: - p->drawPixmap(r, QPixmap(dashdot)); + p->drawPixmap(r, TQPixmap(dashdot)); break; case 4: - p->drawPixmap(r, QPixmap(dashdot)); + p->drawPixmap(r, TQPixmap(dashdot)); break; case 5: - p->drawPixmap(r, QPixmap(dashdotdot)); + p->drawPixmap(r, TQPixmap(dashdotdot)); break; } } -void PLineStyleEdit::setValue(const QVariant& value, bool emitChange) +void PLineStyleEdit::setValue(const TQVariant& value, bool emitChange) { - if (!value.canCast(QVariant::Int)) + if (!value.canCast(TQVariant::Int)) return; if ((value.toInt() > 5) || (value.toInt() < 0)) return; - disconnect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); m_edit->setCurrentItem(value.toInt()); - connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } void PLineStyleEdit::updateProperty(int val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } } diff --git a/lib/widgets/propeditor/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h index 16441273..00b546c6 100644 --- a/lib/widgets/propeditor/plinestyleedit.h +++ b/lib/widgets/propeditor/plinestyleedit.h @@ -32,17 +32,17 @@ namespace PropertyLib { class PLineStyleEdit : public PropertyWidget { Q_OBJECT public: - PLineStyleEdit(MultiProperty* property, QWidget* parent = 0, const char* name = 0); + PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); private slots: void updateProperty(int val); private: - QComboBox *m_edit; + TQComboBox *m_edit; }; } diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index db6a69d3..a4c18791 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -21,10 +21,10 @@ ***************************************************************************/ #include "ppixmapedit.h" -#include <qlayout.h> -#include <qpainter.h> -#include <qlabel.h> -#include <qcursor.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqlabel.h> +#include <tqcursor.h> #ifndef PURE_QT #include <klocale.h> @@ -35,41 +35,41 @@ #ifndef PURE_QT #include <kfiledialog.h> #else -#include <qfiledialog.h> +#include <tqfiledialog.h> #endif -#include <qpushbutton.h> +#include <tqpushbutton.h> namespace PropertyLib{ -PPixmapEdit::PPixmapEdit(MultiProperty* property, QWidget* parent, const char* name) +PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); - m_edit = new QLabel(this); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); + m_edit = new TQLabel(this); m_edit->setAlignment(Qt::AlignTop); m_edit->resize(width(), height()-1); m_edit->setBackgroundMode(Qt::PaletteBase); m_edit->installEventFilter(this); - m_button = new QPushButton(i18n("..."), 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(QSizePolicy::Maximum, QSizePolicy::Fixed); + m_button->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); l->addWidget(m_edit); l->addWidget(m_button); - m_popup = new QLabel(0, 0, Qt::WStyle_NoBorder|Qt::WX11BypassWM|WStyle_StaysOnTop); + m_popup = new TQLabel(0, 0, Qt::WStyle_NoBorder|Qt::WX11BypassWM|WStyle_StaysOnTop); m_popup->hide(); - connect(m_button, SIGNAL(clicked()), this, SLOT(updateProperty())); + connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateProperty())); } -QVariant PPixmapEdit::value() const +TQVariant PPixmapEdit::value() const { - return QVariant(*(m_edit->pixmap())); + return TQVariant(*(m_edit->pixmap())); } -void PPixmapEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PPixmapEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); @@ -77,7 +77,7 @@ void PPixmapEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, p->drawPixmap(r.topLeft().x(), r.topLeft().y(), value.toPixmap()); } -void PPixmapEdit::setValue(const QVariant& value, bool emitChange) +void PPixmapEdit::setValue(const TQVariant& value, bool emitChange) { m_edit->setPixmap(value.toPixmap()); if (emitChange) @@ -87,51 +87,51 @@ void PPixmapEdit::setValue(const QVariant& value, bool emitChange) void PPixmapEdit::updateProperty() { #ifndef PURE_QT - KURL url = KFileDialog::getImageOpenURL(QString::null, this); + KURL url = KFileDialog::getImageOpenURL(TQString::null, this); if (!url.isEmpty()) { - m_edit->setPixmap(QPixmap(url.path())); + m_edit->setPixmap(TQPixmap(url.path())); emit propertyChanged(m_property, value()); } #else - QString url = QFileDialog::getOpenFileName(); + TQString url = TQFileDialog::getOpenFileName(); if (!url.isEmpty()) { - m_edit->setPixmap(QPixmap(url)); + m_edit->setPixmap(TQPixmap(url)); emit propertyChanged(m_property, value()); } #endif } -void PPixmapEdit::resizeEvent(QResizeEvent *ev) +void PPixmapEdit::resizeEvent(TQResizeEvent *ev) { m_edit->resize(ev->size().width(), ev->size().height()-1); m_button->move(ev->size().width() - m_button->width(), 0); m_edit->setMaximumHeight(m_button->height()); } -bool PPixmapEdit::eventFilter(QObject *o, QEvent *ev) +bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev) { if(o == m_edit) { - if(ev->type() == QEvent::MouseButtonPress) + if(ev->type() == TQEvent::MouseButtonPress) { if(m_edit->pixmap()->size().height() < height()-2 && m_edit->pixmap()->size().width() < width()-20) return false; m_popup->setPixmap(*(m_edit->pixmap())); m_popup->resize(m_edit->pixmap()->size()); - m_popup->move(QCursor::pos()); + m_popup->move(TQCursor::pos()); m_popup->show(); } - if(ev->type() == QEvent::MouseButtonRelease) + if(ev->type() == TQEvent::MouseButtonRelease) { if(m_popup->isVisible()) m_popup->hide(); } - if(ev->type() == QEvent::KeyPress) + if(ev->type() == TQEvent::KeyPress) { - QKeyEvent* e = static_cast<QKeyEvent*>(ev); + TQKeyEvent* e = static_cast<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 bf7b1bfc..aacc0be8 100644 --- a/lib/widgets/propeditor/ppixmapedit.h +++ b/lib/widgets/propeditor/ppixmapedit.h @@ -34,22 +34,22 @@ class PPixmapEdit : public PropertyWidget { Q_OBJECT public: - PPixmapEdit(MultiProperty* property, QWidget* parent = 0, const char* name = 0); + PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); - virtual void resizeEvent(QResizeEvent *ev); - virtual bool eventFilter(QObject *o, QEvent *ev); + virtual void resizeEvent(TQResizeEvent *ev); + virtual bool eventFilter(TQObject *o, TQEvent *ev); protected slots: void updateProperty(); private: - QLabel *m_edit; - QLabel *m_popup; - QPushButton *m_button; + TQLabel *m_edit; + TQLabel *m_popup; + TQPushButton *m_button; }; } diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp index a76f881a..eb1a382e 100644 --- a/lib/widgets/propeditor/ppointedit.cpp +++ b/lib/widgets/propeditor/ppointedit.cpp @@ -20,38 +20,38 @@ #include "ppointedit.h" #include <klineedit.h> -#include <qlayout.h> -#include <qpainter.h> +#include <tqlayout.h> +#include <tqpainter.h> namespace PropertyLib{ -PPointEdit::PPointEdit(MultiProperty* property, QWidget* parent, const char* name): PropertyWidget(property, parent, name) +PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); } -QVariant PPointEdit::value() const +TQVariant PPointEdit::value() const { return m_value; } -void PPointEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); + p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); } -void PPointEdit::setValue(const QVariant& value, bool emitChange) +void PPointEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(QString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); + m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(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 754e1c79..e78f9928 100644 --- a/lib/widgets/propeditor/ppointedit.h +++ b/lib/widgets/propeditor/ppointedit.h @@ -27,21 +27,21 @@ class KLineEdit; namespace PropertyLib{ /** -@short %Property editor for QPoint values. +@short %Property editor for TQPoint values. */ class PPointEdit : public PropertyWidget { Q_OBJECT public: - PPointEdit(MultiProperty* property, QWidget* parent=0, const char* name=0); + PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); private: KLineEdit *m_edit; - QVariant m_value; + TQVariant m_value; }; diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp index 4fd57fc2..6b7de9ce 100644 --- a/lib/widgets/propeditor/prectedit.cpp +++ b/lib/widgets/propeditor/prectedit.cpp @@ -20,38 +20,38 @@ #include "prectedit.h" #include <klineedit.h> -#include <qlayout.h> -#include <qpainter.h> +#include <tqlayout.h> +#include <tqpainter.h> namespace PropertyLib{ -PRectEdit::PRectEdit(MultiProperty* property, QWidget* parent, const char* name): PropertyWidget(property, parent, name) +PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); } -QVariant PRectEdit::value() const +TQVariant PRectEdit::value() const { return m_value; } -void PRectEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); + 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())); } -void PRectEdit::setValue(const QVariant& value, bool emitChange) +void PRectEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(QString("[ %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 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(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 3f8995b1..116ee668 100644 --- a/lib/widgets/propeditor/prectedit.h +++ b/lib/widgets/propeditor/prectedit.h @@ -27,21 +27,21 @@ class KLineEdit; namespace PropertyLib{ /** -@short %Property editor for QRect values. +@short %Property editor for TQRect values. */ class PRectEdit : public PropertyWidget { Q_OBJECT public: - PRectEdit(MultiProperty* property, QWidget* parent=0, const char* name=0); + PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); private: KLineEdit *m_edit; - QVariant m_value; + TQVariant m_value; }; diff --git a/lib/widgets/propeditor/property.cpp b/lib/widgets/propeditor/property.cpp index 621a2cc9..d219b8c3 100644 --- a/lib/widgets/propeditor/property.cpp +++ b/lib/widgets/propeditor/property.cpp @@ -18,19 +18,19 @@ ***************************************************************************/ #include "property.h" -#include <qstring.h> +#include <tqstring.h> namespace PropertyLib{ -Property::Property(int type, const QString &name, const QString &description, - const QVariant &value, bool save, bool readOnly): +Property::Property(int type, const TQString &name, const TQString &description, + const TQVariant &value, bool save, bool readOnly): m_type(type), m_name(name), m_description(description), m_value(value), m_save(save), m_readOnly(readOnly), m_visible(true) { } -Property::Property(const QString &name, const QMap<QString, QVariant> &v_valueList, - const QString &description, const QVariant &value, bool save, bool readOnly): +Property::Property(const TQString &name, const TQMap<TQString, TQVariant> &v_valueList, + const TQString &description, const TQVariant &value, bool save, bool readOnly): valueList(v_valueList), m_type(ValueFromList), m_name(name), m_description(description), m_value(value), m_save(save), m_readOnly(readOnly), m_visible(true) @@ -54,12 +54,12 @@ bool Property::operator<(const Property &prop) const return false; } -QString Property::name() const +TQString Property::name() const { return m_name; } -void Property::setName(const QString &name) +void Property::setName(const TQString &name) { m_name = name; } @@ -74,12 +74,12 @@ void Property::setType(int type) m_type = type; } -QVariant Property::value() const +TQVariant Property::value() const { return m_value; } -void Property::setValue(const QVariant &value, bool rememberOldValue) +void Property::setValue(const TQVariant &value, bool rememberOldValue) { if (rememberOldValue) m_oldValue = m_value; @@ -88,17 +88,17 @@ void Property::setValue(const QVariant &value, bool rememberOldValue) m_value = value; } -QString Property::description() const +TQString Property::description() const { return m_description; } -void Property::setDescription(const QString &description) +void Property::setDescription(const TQString &description) { m_description = description; } -void Property::setValueList(const QMap<QString, QVariant> &v_valueList) +void Property::setValueList(const TQMap<TQString, TQVariant> &v_valueList) { valueList = v_valueList; } @@ -118,7 +118,7 @@ void Property::setVisible( const bool visible ) m_visible = visible; } -QVariant Property::oldValue() const +TQVariant Property::oldValue() const { if (m_oldValue.isNull()) return m_value; diff --git a/lib/widgets/propeditor/property.h b/lib/widgets/propeditor/property.h index 06f39c66..74fcb890 100644 --- a/lib/widgets/propeditor/property.h +++ b/lib/widgets/propeditor/property.h @@ -19,9 +19,9 @@ #ifndef PROPERTY_H #define PROPERTY_H -#include <qvariant.h> +#include <tqvariant.h> -#include <qmap.h> +#include <tqmap.h> class QWidget; class QString; @@ -36,14 +36,14 @@ namespace PropertyLib{ /** @short Property. -It includes support for QStringList properties, an i18n'ed label and stores an old value to allow undo. +It includes support for TQStringList properties, an i18n'ed label and stores an old value to allow undo. Contains name, type and value. -Type can be one of predefined types (including standard @ref QVariant types) by @ref PropertyLib::Property::PropertyType +Type can be one of predefined types (including standard @ref TQVariant types) by @ref PropertyLib::Property::PropertyType enum or custom user type. User defined types should have values more than 3000. -Value is a @ref QVariant. +Value is a @ref TQVariant. Property can optionally have a list of possible values. In that case use @ref ValueFromList type and valueList member. @@ -64,43 +64,43 @@ public: /** PropertyType. Integers that represent the type of the property. */ enum PropertyType { - //standard supported QVariant types - Invalid = QVariant::Invalid /**<invalid property type*/, - Map = QVariant::Map /**<QMap<QString, QVariant>*/, - List = QVariant::List /**<QValueList<QVariant>*/, - String = QVariant::String /**<string*/, - StringList = QVariant::StringList /**<string list*/, - Font = QVariant::Font /**<font*/, - Pixmap = QVariant::Pixmap /**<pixmap*/, - //@todo implement QVariant::Brush - Rect = QVariant::Rect /**<rectangle (x,y, width, height)*/, - Size = QVariant::Size /**<size (width, height)*/, - Color = QVariant::Color /**<color*/, - //@todo implement QVariant::Palette - //@todo implement QVariant::ColorGroup - //@todo implement QVariant::IconSet - Point = QVariant::Point /**<point (x,y)*/, - //@todo implement QVariant::Image - Integer = QVariant::Int /**<integer*/, - //@todo implement QVariant::UInt - Boolean = QVariant::Bool /**<boolean*/, - Double = QVariant::Double /**<double*/, - //@todo implement QVariant::CString - //@todo implement QVariant::PointArray - //@todo implement QVariant::Region - //@todo implement QVariant::Bitmap - Cursor = QVariant::Cursor /**<cursor*/, - SizePolicy = QVariant::SizePolicy /**<size policy (horizontal, vertical)*/, - Date = QVariant::Date /**<date*/, - //@todo implement QVariant::Time - DateTime = QVariant::DateTime /**<date and time*/, - //@todo implement QVariant::ByteArray - //@todo implement QVariant::BitArray - //@todo implement QVariant::KeySequence - //@todo implement QVariant::Pen - //@todo implement QVariant::Long - //@todo implement QVariant::LongLong - //@todo implement QVariant::ULongLong + //standard supported TQVariant types + Invalid = TQVariant::Invalid /**<invalid property type*/, + Map = TQVariant::Map /**<TQMap<TQString, TQVariant>*/, + List = TQVariant::List /**<TQValueList<TQVariant>*/, + String = TQVariant::String /**<string*/, + StringList = TQVariant::StringList /**<string list*/, + Font = TQVariant::Font /**<font*/, + Pixmap = TQVariant::Pixmap /**<pixmap*/, + //@todo implement TQVariant::Brush + Rect = TQVariant::Rect /**<rectangle (x,y, width, height)*/, + Size = TQVariant::Size /**<size (width, height)*/, + Color = TQVariant::Color /**<color*/, + //@todo implement TQVariant::Palette + //@todo implement TQVariant::ColorGroup + //@todo implement TQVariant::IconSet + Point = TQVariant::Point /**<point (x,y)*/, + //@todo implement TQVariant::Image + Integer = TQVariant::Int /**<integer*/, + //@todo implement TQVariant::UInt + Boolean = TQVariant::Bool /**<boolean*/, + Double = TQVariant::Double /**<double*/, + //@todo implement TQVariant::CString + //@todo implement TQVariant::PointArray + //@todo implement TQVariant::Region + //@todo implement TQVariant::Bitmap + Cursor = TQVariant::Cursor /**<cursor*/, + SizePolicy = TQVariant::SizePolicy /**<size policy (horizontal, vertical)*/, + Date = TQVariant::Date /**<date*/, + //@todo implement TQVariant::Time + DateTime = TQVariant::DateTime /**<date and time*/, + //@todo implement TQVariant::ByteArray + //@todo implement TQVariant::BitArray + //@todo implement TQVariant::KeySequence + //@todo implement TQVariant::Pen + //@todo implement TQVariant::Long + //@todo implement TQVariant::LongLong + //@todo implement TQVariant::ULongLong //predefined custom types @@ -117,36 +117,36 @@ public: /**Constructs empty property.*/ Property() {} /**Constructs property.*/ - Property(int type, const QString &name, const QString &description, - const QVariant &value = QVariant(), bool save = true, bool readOnly = false); + Property(int type, const TQString &name, const TQString &description, + const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); /**Constructs property with @ref ValueFromList type.*/ - Property(const QString &name, const QMap<QString, QVariant> &v_valueList, - const QString &description, const QVariant &value = QVariant(), bool save = true, bool readOnly = false); + Property(const TQString &name, const TQMap<TQString, TQVariant> &v_valueList, + const TQString &description, const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); virtual ~Property(); virtual bool operator<(const Property &prop) const; /**@return the name of the property.*/ - virtual QString name() const; + virtual TQString name() const; /**Sets the name of the property.*/ - virtual void setName(const QString &name); + virtual void setName(const TQString &name); /**@return the type of the property.*/ virtual int type() const; /**Sets the type of the property.*/ virtual void setType(int type); /**@return the value of the property.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value of the property.*/ - virtual void setValue(const QVariant &value, bool rememberOldValue = true); + virtual void setValue(const TQVariant &value, bool rememberOldValue = true); /**@return the description of the property.*/ - virtual QString description() const; + virtual TQString description() const; /**Sets the description of the property.*/ - virtual void setDescription(const QString &description); + virtual void setDescription(const TQString &description); /**Sets the string-to-value correspondence list of the property. This is used to create comboboxes-like property editors.*/ - virtual void setValueList(const QMap<QString, QVariant> &list); + virtual void setValueList(const TQMap<TQString, TQVariant> &list); /**The string-to-value correspondence list of the property.*/ - QMap<QString, QVariant> valueList; + TQMap<TQString, TQVariant> valueList; /**Tells if the property can be saved to a stream, xml, etc. There is a possibility to use "GUI" properties that aren't @@ -160,17 +160,17 @@ public: virtual void setVisible(const bool visible); /**Gets the previous property value.*/ - virtual QVariant oldValue() const; + virtual TQVariant oldValue() const; private: // Property(Property &property) {}; // void operator=(Property &property) {}; int m_type; - QString m_name; - QString m_description; - QVariant m_value; - QVariant m_oldValue; + TQString m_name; + TQString m_description; + TQVariant m_value; + TQVariant m_oldValue; bool m_save; bool m_readOnly; bool m_visible; diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index 10f21ac1..c9e6e85d 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -27,12 +27,12 @@ #include "compat_tools.h" #endif -#include <qtable.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qptrlist.h> -#include <qvaluelist.h> -#include <qpushbutton.h> +#include <tqtable.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqptrlist.h> +#include <tqvaluelist.h> +#include <tqpushbutton.h> #include "property.h" #include "multiproperty.h" @@ -59,7 +59,7 @@ public: return m_property->type(); } - QString name() const + TQString name() const { return m_property->name(); } @@ -69,11 +69,11 @@ public: return m_property; } - virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if ((column == 0) && m_changed) { - QFont font; + TQFont font; font.setBold(true); p->setFont(font); p->setBrush(cg.highlight()); @@ -81,18 +81,18 @@ public: } if (column == 1) { - QRect r(0, 0, m_editor->header()->sectionSize(1), height()); + TQRect r(0, 0, m_editor->header()->sectionSize(1), height()); //FIXME: this is ugly, but how else can we deal with ValueFromList properties? - QVariant valueToDraw; + TQVariant valueToDraw; if (m_property->type() == Property::ValueFromList) valueToDraw = m_property->findValueDescription(); else valueToDraw = m_property->value(); - QColorGroup icg(cg); + TQColorGroup icg(cg); #ifndef PURE_QT - icg.setColor(QColorGroup::Background, backgroundColor()); + icg.setColor(TQColorGroup::Background, backgroundColor()); #else - icg.setColor(QColorGroup::Background, white); + icg.setColor(TQColorGroup::Background, white); #endif m_editor->machine(m_property)->propertyEditor->drawViewer(p, icg, r, valueToDraw); return; @@ -120,22 +120,22 @@ private: class PropertyGroupItem: public KListViewItem{ public: - PropertyGroupItem(KListView *parent, const QString &name) + PropertyGroupItem(KListView *parent, const TQString &name) :KListViewItem(parent, name) { init(); } - PropertyGroupItem(KListViewItem *parent, const QString &name) + PropertyGroupItem(KListViewItem *parent, const TQString &name) :KListViewItem(parent, name) { init(); } - virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if (column == 0) { - QFont font; + TQFont font; font.setBold(true); p->setFont(font); p->setBrush(cg.highlight()); @@ -164,7 +164,7 @@ public: setSelectable(false); } }; -PropertyEditor::PropertyEditor(QWidget *parent, const char *name) +PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) :KListView(parent, name) { setSorting(-1); @@ -172,15 +172,15 @@ PropertyEditor::PropertyEditor(QWidget *parent, const char *name) addColumn(i18n("Name")); addColumn(i18n("Value")); setAllColumnsShowFocus(true); - setColumnWidthMode(0, QListView::Maximum); - setResizeMode(QListView::LastColumn); + setColumnWidthMode(0, TQListView::Maximum); + setResizeMode(TQListView::LastColumn); header()->setClickEnabled(false); - connect(header(), SIGNAL(sizeChange(int, int, int)), - this, SLOT(updateEditorSize())); - connect(this, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(slotClicked(QListViewItem*))); + connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), + this, TQT_SLOT(updateEditorSize())); + connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), + this, TQT_SLOT(slotClicked(TQListViewItem*))); m_currentEditItem = 0; m_doubleClickForEdit = true; @@ -188,19 +188,19 @@ PropertyEditor::PropertyEditor(QWidget *parent, const char *name) m_currentEditWidget = 0; m_list = 0; - m_currentEditArea = new QWidget(viewport()); + m_currentEditArea = new TQWidget(viewport()); m_currentEditArea->hide(); - m_undoButton = new QPushButton(m_currentEditArea); + m_undoButton = new TQPushButton(m_currentEditArea); #ifndef PURE_QT m_undoButton->setPixmap(SmallIcon("undo")); #else - m_undoButton->setPixmap( QPixmap("undo.xpm") ); + m_undoButton->setPixmap( TQPixmap("undo.xpm") ); #endif - m_undoButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); + m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_undoButton->resize(m_undoButton->height(), m_undoButton->height()); m_undoButton->hide(); - connect(m_undoButton, SIGNAL(clicked()), this, SLOT(undo())); - m_currentEditLayout = new QGridLayout(m_currentEditArea, 1, 2, 0, 0); + connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); + m_currentEditLayout = new TQGridLayout(m_currentEditArea, 1, 2, 0, 0); // m_currentEditLayout->addWidget(m_undoButton, 0, 1); } @@ -214,17 +214,17 @@ void PropertyEditor::populateProperties(PropertyList *list) if (list == 0) return; m_list = list; - connect(m_list, SIGNAL(propertyValueChanged(Property*)), this, SLOT(propertyValueChanged(Property*))); - const QValueList<QPair<QString, QValueList<QString> > >& groups = m_list->propertiesOfGroup(); - for (QValueList<QPair<QString, QValueList<QString> > >::const_iterator it = groups.begin(); + 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(); it != groups.end(); ++it) { // qWarning("PropertyEditor::populateProperties: adding group %s", (*it).first.ascii()); PropertyGroupItem *group = 0; if ( (!(*it).first.isEmpty()) && ((*it).second.count() > 0) ) group = new PropertyGroupItem(this, (*it).first); - const QValueList<QString> &properties = (*it).second; - for (QValueList<QString>::const_iterator it2 = properties.begin(); it2 != properties.end(); ++it2) + const TQValueList<TQString> &properties = (*it).second; + for (TQValueList<TQString>::const_iterator it2 = properties.begin(); it2 != properties.end(); ++it2) { // qWarning("PropertyEditor::populateProperties: adding property %s", (*it2).ascii()); if (group) @@ -241,7 +241,7 @@ void PropertyEditor::populateProperties(PropertyList *list) } } -void PropertyEditor::addProperty(PropertyGroupItem *group, const QString &name) +void PropertyEditor::addProperty(PropertyGroupItem *group, const TQString &name) { if ((*m_list)[name] == 0) return; @@ -250,7 +250,7 @@ void PropertyEditor::addProperty(PropertyGroupItem *group, const QString &name) addChildProperties(pitem); } -void PropertyEditor::addProperty(const QString &name) +void PropertyEditor::addProperty(const TQString &name) { if ((*m_list)[name] == 0) return; @@ -273,7 +273,7 @@ void PropertyEditor::addChildProperties(PropertyItem *parent) // qWarning("seeking children: count: %d", prop->details.count()); parent->setOpen(true); - for (QValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it) + 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))); @@ -288,7 +288,7 @@ void PropertyEditor::clearProperties() hideEditor(); - disconnect(m_list, SIGNAL(propertyValueChanged(Property*)), this, SLOT(propertyValueChanged(Property*))); + disconnect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*))); clear(); delete m_list; m_list = 0; @@ -302,7 +302,7 @@ void PropertyEditor::propertyValueChanged(Property *property) else { // repaint all items - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { repaintItem(it.current()); @@ -311,7 +311,7 @@ void PropertyEditor::propertyValueChanged(Property *property) } } -void PropertyEditor::propertyChanged(MultiProperty *property, const QVariant &value) +void PropertyEditor::propertyChanged(MultiProperty *property, const TQVariant &value) { if (!property) return; @@ -360,7 +360,7 @@ void PropertyEditor::showEditor(PropertyItem *item) void PropertyEditor::placeEditor(PropertyItem *item) { - QRect r = itemRect(item); + TQRect r = itemRect(item); if (!r.size().isValid()) { ensureItemVisible(item); @@ -374,7 +374,7 @@ void PropertyEditor::placeEditor(PropertyItem *item) if (visibleWidth() < r.right()) r.setRight(visibleWidth()); - r = QRect(viewportToContents(r.topLeft()), r.size()); + r = TQRect(viewportToContents(r.topLeft()), r.size()); if (item->pixmap(1)) { @@ -417,7 +417,7 @@ void PropertyEditor::updateEditorSize() placeEditor(m_currentEditItem); } -void PropertyEditor::slotClicked(QListViewItem *item) +void PropertyEditor::slotClicked(TQListViewItem *item) { if (item == 0) { @@ -440,13 +440,13 @@ void PropertyEditor::slotClicked(QListViewItem *item) Machine *PropertyEditor::machine(MultiProperty *property) { // int type = property->type(); - QString name = property->name(); - QMap<QString, QVariant> values = property->valueList(); + TQString name = property->name(); + TQMap<TQString, TQVariant> values = property->valueList(); if (m_registeredForType[name] == 0) { m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property); - connect(m_registeredForType[name]->propertyEditor, SIGNAL(propertyChanged(MultiProperty*, const QVariant&)), - this, SLOT(propertyChanged(MultiProperty*, const QVariant&))); + 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->hide(); } @@ -455,7 +455,7 @@ Machine *PropertyEditor::machine(MultiProperty *property) void PropertyEditor::clearMachineCache() { - for (QMap<QString, Machine* >::iterator it = m_registeredForType.begin(); it != m_registeredForType.end(); ++it) + for (TQMap<TQString, Machine* >::iterator it = m_registeredForType.begin(); it != m_registeredForType.end(); ++it) { delete it.data(); } diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h index 4091d31a..c6c72237 100644 --- a/lib/widgets/propeditor/propertyeditor.h +++ b/lib/widgets/propeditor/propertyeditor.h @@ -23,7 +23,7 @@ #ifndef PURE_QT #include <klistview.h> #else -#include <qlistview.h> +#include <tqlistview.h> #define KListView QListView #define KListViewItem QListViewItem #endif @@ -59,7 +59,7 @@ class PropertyEditor: public KListView{ Q_OBJECT public: /**Constructs the property editor.*/ - PropertyEditor(QWidget *parent = 0, const char *name = 0); + PropertyEditor(TQWidget *parent = 0, const char *name = 0); ~PropertyEditor(); /**@return @ref Machine for given property. @@ -83,25 +83,25 @@ protected slots: /**Updates property widget in the editor.*/ void propertyValueChanged(Property* property); /**Updates property in the list when new value is selected in the editor.*/ - void propertyChanged(MultiProperty *property, const QVariant &value); + void propertyChanged(MultiProperty *property, const TQVariant &value); /**Shows property editor.*/ - void slotClicked(QListViewItem* item); + void slotClicked(TQListViewItem* item); void updateEditorSize(); /**Undoes the last change in property editor.*/ void undo(); protected: - void editItem(QListViewItem*, int); + void editItem(TQListViewItem*, int); void hideEditor(); void showEditor(PropertyItem *item); void placeEditor(PropertyItem *item); PropertyWidget *prepareEditor(PropertyItem *item); - void addGroup(const QString &name); - void addProperty(PropertyGroupItem *group, const QString &name); - void addProperty(const QString &name); + void addGroup(const TQString &name); + void addProperty(PropertyGroupItem *group, const TQString &name); + void addProperty(const TQString &name); void addChildProperties(PropertyItem *parent); private: @@ -109,17 +109,17 @@ private: PropertyList m_detailedList; //machines cache for property types, machines will be deleted - QMap<QString, Machine* > m_registeredForType; + TQMap<TQString, Machine* > m_registeredForType; PropertyItem *m_currentEditItem; PropertyWidget *m_currentEditWidget; - QWidget *m_currentEditArea; - QGridLayout *m_currentEditLayout; + TQWidget *m_currentEditArea; + TQGridLayout *m_currentEditLayout; bool m_doubleClickForEdit; - QListViewItem* m_lastClickedItem; + TQListViewItem* m_lastClickedItem; - QPushButton *m_undoButton; + TQPushButton *m_undoButton; friend class PropertyItem; }; diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp index e92f28b3..491c2ebb 100644 --- a/lib/widgets/propeditor/propertylist.cpp +++ b/lib/widgets/propeditor/propertylist.cpp @@ -25,12 +25,12 @@ namespace PropertyLib{ PropertyList::PropertyList() - :QObject(0, 0), m_propertyOwner(true) + :TQObject(0, 0), m_propertyOwner(true) { } PropertyList::PropertyList(bool propertyOwner) - :QObject(0, 0), m_propertyOwner(propertyOwner) + :TQObject(0, 0), m_propertyOwner(propertyOwner) { } @@ -39,7 +39,7 @@ PropertyList::~PropertyList() clear(); } -MultiProperty *PropertyList::operator[](const QString &name) +MultiProperty *PropertyList::operator[](const TQString &name) { if (m_list.contains(name)) return m_list[name]; @@ -47,7 +47,7 @@ MultiProperty *PropertyList::operator[](const QString &name) return new MultiProperty(this); } -MultiProperty *PropertyList::property( const QString &name ) +MultiProperty *PropertyList::property( const TQString &name ) { if (m_list.contains(name)) return m_list[name]; @@ -73,7 +73,7 @@ void PropertyList::addProperty(Property *property) } } -void PropertyList::addProperty(const QString &group, Property *property) +void PropertyList::addProperty(const TQString &group, Property *property) { if (property == 0) return; @@ -101,9 +101,9 @@ void PropertyList::removeProperty(Property *property) emit aboutToDeleteProperty(property); MultiProperty *mp = m_list[property->name()]; - QString group = m_groupOfProperty[mp]; + TQString group = m_groupOfProperty[mp]; removeFromGroup(mp); - QString pname = property->name(); + TQString pname = property->name(); mp->removeProperty(property); if (m_propertyOwner) delete property; @@ -117,11 +117,11 @@ void PropertyList::removeProperty(Property *property) addToGroup(group, mp); } -void PropertyList::removeProperty(const QString &name) +void PropertyList::removeProperty(const TQString &name) { if (m_list.contains(name)) { - QString group = m_groupOfProperty[m_list[name]]; + TQString group = m_groupOfProperty[m_list[name]]; removeFromGroup(m_list[name]); Property *property; for (property = m_list[name]->list.first(); property; property = m_list[name]->list.next()) @@ -146,17 +146,17 @@ void PropertyList::removeProperty(const QString &name) } } -const QValueList<QPair<QString, QValueList<QString> > >& PropertyList::propertiesOfGroup() const +const TQValueList<QPair<TQString, TQValueList<TQString> > >& PropertyList::propertiesOfGroup() const { return m_propertiesOfGroup; } -const QMap<MultiProperty*, QString>& PropertyList::groupOfProperty() const +const TQMap<MultiProperty*, TQString>& PropertyList::groupOfProperty() const { return m_groupOfProperty; } -void PropertyList::addToGroup(const QString &group, MultiProperty *property) +void PropertyList::addToGroup(const TQString &group, MultiProperty *property) { if (!property) return; @@ -165,8 +165,8 @@ void PropertyList::addToGroup(const QString &group, MultiProperty *property) if (m_groupOfProperty.contains(property) && (m_groupOfProperty[property] == group)) return; - QPair<QString, QValueList<QString> > *groupPair = 0; - for(QValueList<QPair<QString, QValueList<QString> > >::iterator it = m_propertiesOfGroup.begin(); + QPair<TQString, TQValueList<TQString> > *groupPair = 0; + for(TQValueList<QPair<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 QString &group, MultiProperty *property) } if (groupPair == 0) { - groupPair = new QPair<QString, QValueList<QString> >(); + groupPair = new QPair<TQString, TQValueList<TQString> >(); groupPair->first = group; groupPair->second.append(property->name()); m_propertiesOfGroup.append(*groupPair); @@ -193,10 +193,10 @@ void PropertyList::addToGroup(const QString &group, MultiProperty *property) void PropertyList::removeFromGroup(MultiProperty *property) { - QString group = m_groupOfProperty[property]; + TQString group = m_groupOfProperty[property]; // qWarning("removeFromGroup group=%s", group.ascii()); - for(QValueList<QPair<QString, QValueList<QString> > >::iterator it = m_propertiesOfGroup.begin(); + for(TQValueList<QPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin(); it != m_propertiesOfGroup.end(); ++it) { // qWarning("removeFromGroup checking %s", (*it).first.ascii()); @@ -213,22 +213,22 @@ void PropertyList::removeFromGroup(MultiProperty *property) void PropertyList::clear( ) { - for (QMap<QString, MultiProperty*>::iterator it = m_list.begin(); it != m_list.end(); ++it) + for (TQMap<TQString, MultiProperty*>::iterator it = m_list.begin(); it != m_list.end(); ++it) removeProperty(it.key()); } -bool PropertyList::contains( const QString & name ) +bool PropertyList::contains( const TQString & name ) { if (m_list.contains(name)) return true; return false; } -QPtrList<Property> PropertyList::properties(const QString &name) +TQPtrList<Property> PropertyList::properties(const TQString &name) { if (m_list.contains(name)) return m_list[name]->list; - return QPtrList<Property>(); + return TQPtrList<Property>(); } PropertyList::Iterator PropertyList::begin() @@ -276,7 +276,7 @@ MultiProperty *PropertyList::Iterator::operator *() return data(); } -QString PropertyList::Iterator::key() +TQString PropertyList::Iterator::key() { return current.key(); } @@ -306,7 +306,7 @@ PropertyBuffer::PropertyBuffer( ) void PropertyBuffer::intersect(const PropertyList *list) { qWarning("PropertyBuffer::intersect"); - for (QMap<QString, MultiProperty*>::iterator it = m_list.begin(); it != m_list.end(); ++it) + 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())) @@ -327,13 +327,13 @@ void PropertyBuffer::intersect(const PropertyList *list) // qWarning("intersect:: removing %s from intersection", it.key().ascii()); removeProperty(it.key()); } - connect(list, SIGNAL(propertyValueChanged(Property*)), this, SLOT(intersectedValueChanged(Property*))); + connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*))); } void PropertyBuffer::intersectedValueChanged(Property *property) { // qWarning("PropertyBuffer::intersectedValueChanged"); - QString propertyName = property->name(); + TQString propertyName = property->name(); if (!contains(propertyName)) return; @@ -341,7 +341,7 @@ void PropertyBuffer::intersectedValueChanged(Property *property) if (mp == *m_list[propertyName]) { Property *prop; - QPtrList<Property> props = properties(propertyName); + TQPtrList<Property> props = properties(propertyName); for (prop = props.first(); prop; prop = props.next()) emit propertyValueChanged(prop); } @@ -351,7 +351,7 @@ PropertyBuffer::PropertyBuffer(PropertyList *list) :PropertyList(false) { //deep copy of m_list - for (QMap<QString, MultiProperty*>::const_iterator it = list->m_list.begin(); + for (TQMap<TQString, MultiProperty*>::const_iterator it = list->m_list.begin(); it != list->m_list.end(); ++it) { MultiProperty *mp = new MultiProperty(*it.data()); @@ -359,7 +359,7 @@ PropertyBuffer::PropertyBuffer(PropertyList *list) addToGroup(list->m_groupOfProperty[it.data()], mp); m_list[it.key()] = mp; } - connect(list, SIGNAL(propertyValueChanged(Property*)), this, SLOT(intersectedValueChanged(Property*))); + connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*))); } } diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h index 45071606..96e351fc 100644 --- a/lib/widgets/propeditor/propertylist.h +++ b/lib/widgets/propeditor/propertylist.h @@ -20,11 +20,11 @@ #ifndef PROPERTYLIST_H #define PROPERTYLIST_H -#include <qobject.h> -#include <qmap.h> -#include <qptrlist.h> -#include <qvaluelist.h> -#include <qpair.h> +#include <tqobject.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqvaluelist.h> +#include <tqpair.h> namespace PropertyLib{ @@ -66,7 +66,7 @@ public: bool operator != (Iterator it); - QString key(); + TQString key(); MultiProperty *data(); private: @@ -74,7 +74,7 @@ public: Iterator(PropertyList *list, bool end); void next(); - QMap<QString, MultiProperty*>::iterator current; + TQMap<TQString, MultiProperty*>::iterator current; PropertyList *m_list; friend class PropertyList; @@ -93,34 +93,34 @@ public: list["My Property"]->setValue("My Value"); /endcode @return @ref MultiProperty with given name.*/ - virtual MultiProperty *operator[](const QString &name); + virtual MultiProperty *operator[](const TQString &name); /**Accesses a property by it's name. All property modifications are allowed trough this method. For example, to set a value of a property */ - MultiProperty *property( const QString &name ); + MultiProperty *property( const TQString &name ); /**Adds the property to the list to the "common" group.*/ virtual void addProperty(Property *property); /**Adds the property to the list in group.*/ - virtual void addProperty(const QString &group, Property *property); + virtual void addProperty(const TQString &group, Property *property); /**Removes property from the list. Emits aboutToDeleteProperty before removing.*/ virtual void removeProperty(Property *property); /**Removes property with the given name from the list. Emits @ref aboutToDeleteProperty before removing.*/ - virtual void removeProperty(const QString &name); + virtual void removeProperty(const TQString &name); /**@return the list of grouped properties.*/ - virtual const QValueList<QPair<QString, QValueList<QString> > >& propertiesOfGroup() const; + virtual const TQValueList<QPair<TQString, TQValueList<TQString> > >& propertiesOfGroup() const; /**@return the map: property - group name.*/ - virtual const QMap<MultiProperty*, QString>& groupOfProperty() const; + 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 QString &name); + virtual bool contains(const TQString &name); /**The list of properties with given name.*/ - QPtrList<Property> properties(const QString &name); + TQPtrList<Property> properties(const TQString &name); Iterator begin(); Iterator end(); @@ -136,19 +136,19 @@ protected: PropertyList(bool propertyOwner); /**Adds property to a group.*/ - void addToGroup(const QString &group, MultiProperty *property); + void addToGroup(const TQString &group, MultiProperty *property); /**Removes property from a group.*/ void removeFromGroup(MultiProperty *property); private: //sorted list of properties in form name: property - QMap<QString, MultiProperty*> m_list; + TQMap<TQString, MultiProperty*> m_list; //groups of properties: // list of group name: (list of property names) - QValueList<QPair<QString, QValueList<QString> > > m_propertiesOfGroup; + TQValueList<QPair<TQString, TQValueList<TQString> > > m_propertiesOfGroup; // map of property: group - QMap<MultiProperty*, QString> m_groupOfProperty; + TQMap<MultiProperty*, TQString> m_groupOfProperty; //indicates that this list will delete properties after removeProperty() //and also in destructor diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp index 0ab0945f..613777d6 100644 --- a/lib/widgets/propeditor/propertymachinefactory.cpp +++ b/lib/widgets/propeditor/propertymachinefactory.cpp @@ -22,10 +22,10 @@ #ifndef PURE_QT #include <klocale.h> #else -#define i18n QObject::tr +#define i18n TQObject::tr #endif -#include <qmap.h> +#include <tqmap.h> #include "property.h" #include "childproperty.h" @@ -73,8 +73,8 @@ PropertyMachineFactory::~PropertyMachineFactory() Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property) { int type = property->type(); - QString propertyName = property->name(); - QMap<QString, QVariant> valueList = property->valueList(); + TQString propertyName = property->name(); + TQMap<TQString, TQVariant> valueList = property->valueList(); if (m_registeredForType.contains(propertyName)) return (*m_registeredForType[propertyName])(); @@ -143,14 +143,14 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property) } case Property::SizePolicy: { - QMap<QString, QVariant> spValues; - spValues[i18n("Fixed")] = QSizePolicy::Fixed; - spValues[i18n("Minimum")] = QSizePolicy::Minimum; - spValues[i18n("Maximum")] = QSizePolicy::Maximum; - spValues[i18n("Preferred")] = QSizePolicy::Preferred; - spValues[i18n("Expanding")] = QSizePolicy::Expanding; - spValues[i18n("Minimum Expanding")] = QSizePolicy::MinimumExpanding; - spValues[i18n("Ignored")] = QSizePolicy::Ignored; + TQMap<TQString, TQVariant> spValues; + spValues[i18n("Fixed")] = TQSizePolicy::Fixed; + spValues[i18n("Minimum")] = TQSizePolicy::Minimum; + spValues[i18n("Maximum")] = TQSizePolicy::Maximum; + spValues[i18n("Preferred")] = TQSizePolicy::Preferred; + spValues[i18n("Expanding")] = TQSizePolicy::Expanding; + spValues[i18n("Minimum Expanding")] = TQSizePolicy::MinimumExpanding; + spValues[i18n("Ignored")] = TQSizePolicy::Ignored; Machine *mach = new Machine(new PSizePolicyEdit(property, spValues)); property->details.append(ChildProperty(property, i18n("hSizeType"), ChildProperty::SizePolicy_HorData, spValues, i18n("Horizontal Size Type"))); @@ -161,7 +161,7 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property) } case Property::Cursor: { - QMap<QString, QVariant> spValues; + TQMap<TQString, TQVariant> spValues; spValues[i18n("Arrow")] = Qt::ArrowCursor; spValues[i18n("Up Arrow")] = Qt::UpArrowCursor; spValues[i18n("Cross")] = Qt::CrossCursor; diff --git a/lib/widgets/propeditor/propertymachinefactory.h b/lib/widgets/propeditor/propertymachinefactory.h index a8d1e33f..09ea3bbe 100644 --- a/lib/widgets/propeditor/propertymachinefactory.h +++ b/lib/widgets/propeditor/propertymachinefactory.h @@ -20,7 +20,7 @@ #ifndef PROPERTYMACHINEFACTORY_H #define PROPERTYMACHINEFACTORY_H -#include <qmap.h> +#include <tqmap.h> #include "propertywidget.h" @@ -89,7 +89,7 @@ private: virtual ~PropertyMachineFactory(); //registered machines for property types - QMap<QString, createMachine > m_registeredForType; + TQMap<TQString, createMachine > m_registeredForType; }; } diff --git a/lib/widgets/propeditor/propertywidget.cpp b/lib/widgets/propeditor/propertywidget.cpp index 388fd68a..dad296c5 100644 --- a/lib/widgets/propeditor/propertywidget.cpp +++ b/lib/widgets/propeditor/propertywidget.cpp @@ -19,16 +19,16 @@ ***************************************************************************/ #include "propertywidget.h" -#include <qpainter.h> +#include <tqpainter.h> namespace PropertyLib{ -PropertyWidget::PropertyWidget(MultiProperty *property, QWidget *parent, const char *name) - :QWidget(parent, name), m_property(property) +PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *parent, const char *name) + :TQWidget(parent, name), m_property(property) { } -QString PropertyWidget::propertyName() const +TQString PropertyWidget::propertyName() const { return m_property->name(); } @@ -38,7 +38,7 @@ void PropertyWidget::setProperty(MultiProperty *property) m_property = property; } -void PropertyWidget::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value) +void PropertyWidget::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); @@ -46,7 +46,7 @@ void PropertyWidget::drawViewer(QPainter *p, const QColorGroup &cg, const QRect p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toString()); } -void PropertyWidget::setValueList(const QMap<QString, QVariant> &// valueList +void PropertyWidget::setValueList(const TQMap<TQString, TQVariant> &// valueList ) { //this does nothing diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h index 42ebfa95..edbdf6f3 100644 --- a/lib/widgets/propeditor/propertywidget.h +++ b/lib/widgets/propeditor/propertywidget.h @@ -20,8 +20,8 @@ #ifndef PROPERTYWIDGET_H #define PROPERTYWIDGET_H -#include <qwidget.h> -#include <qvariant.h> +#include <tqwidget.h> +#include <tqvariant.h> /** @file propertywidget.h @short Contains @ref PropertyLib::PropertyWidget class. @@ -39,8 +39,8 @@ Subclass this class to create custom property viewer and editor widget. Descendants should implement value() and setValue() methods. Hint: in case you want to implement your property editor widget using -existing widgets like QLineEdit, QComboBox, etc. you can't use multiple -inheritance from two QObject descendants due to Qt library restriction. +existing widgets like TQLineEdit, TQComboBox, etc. you can't use multiple +inheritance from two TQObject descendants due to Qt library restriction. Therefore use line edits and combo boxes as child widgets. A set of predefined widgets for predefined property types are available @@ -50,24 +50,24 @@ class PropertyWidget: public QWidget{ Q_OBJECT public: /**Constructs widget for property with name "propertyName".*/ - PropertyWidget(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PropertyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); virtual ~PropertyWidget() {} /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const = 0; + virtual TQVariant value() const = 0; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true) = 0; + virtual void setValue(const TQVariant &value, bool emitChange=true) = 0; /**@return the name of edited property.*/ - virtual QString propertyName() const; + virtual TQString propertyName() const; /**Sets the name of edited property.*/ virtual void setProperty(MultiProperty *property); /**Sets the list of possible values shown in the editor widget. This method does not emit propertyChanged signal.*/ - virtual void setValueList(const QMap<QString, QVariant> &valueList); + virtual void setValueList(const TQMap<TQString, TQVariant> &valueList); /**Function to draw a property viewer when the editor isn't shown.*/ - virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value); + virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value); /**Reverts the property value to previous setting.*/ virtual void undo(); @@ -77,7 +77,7 @@ signals: to emit it only from @ref setValue() method. @ref PropertyLib::PropertyEditor widget will connect this to the appropriate slot which will make updates to the @ref PropertyLib::PropertyList that hold propeties.*/ - void propertyChanged(MultiProperty *property, const QVariant &value); + void propertyChanged(MultiProperty *property, const TQVariant &value); protected: MultiProperty *m_property; diff --git a/lib/widgets/propeditor/propertywidgetproxy.cpp b/lib/widgets/propeditor/propertywidgetproxy.cpp index d2c29aae..813708ca 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.cpp +++ b/lib/widgets/propeditor/propertywidgetproxy.cpp @@ -19,18 +19,18 @@ ***************************************************************************/ #include "propertywidgetproxy.h" -#include <qlayout.h> +#include <tqlayout.h> #include "propertywidget.h" #include "propertymachinefactory.h" namespace PropertyLib{ -PropertyWidgetProxy::PropertyWidgetProxy(QWidget *parent, const char *name) - :QWidget(parent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0) +PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *parent, const char *name) + :TQWidget(parent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0) { p = new Property(); - m_layout = new QHBoxLayout(this, 0, 0); + m_layout = new TQHBoxLayout(this, 0, 0); } PropertyWidgetProxy::~PropertyWidgetProxy() @@ -60,26 +60,26 @@ void PropertyWidgetProxy::setWidget() m_editor = PropertyMachineFactory::getInstance()->machineForProperty(mp)->propertyEditor; if (m_editor) { - m_editor->reparent(this, QPoint(0,0), true); + m_editor->reparent(this, TQPoint(0,0), true); m_layout->addWidget(m_editor); } } -QVariant PropertyWidgetProxy::value() const +TQVariant PropertyWidgetProxy::value() const { if (m_editor) return m_editor->value(); else - return QVariant(); + return TQVariant(); } -void PropertyWidgetProxy::setValue(const QVariant &value) +void PropertyWidgetProxy::setValue(const TQVariant &value) { if (m_editor) m_editor->setValue(value, false); } -bool PropertyWidgetProxy::setProperty( const char * name, const QVariant & value ) +bool PropertyWidgetProxy::setProperty( const char * name, const TQVariant & value ) { if( strcmp( name, "value") == 0 ) { @@ -88,15 +88,15 @@ bool PropertyWidgetProxy::setProperty( const char * name, const QVariant & value return true; } else - return QWidget::setProperty(name, value); + return TQWidget::setProperty(name, value); } -QVariant PropertyWidgetProxy::property( const char * name ) const +TQVariant PropertyWidgetProxy::property( const char * name ) const { if( strcmp( name, "value") == 0 ) return value( ); else - return QWidget::property(name); + return TQWidget::property(name); } } diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h index 31c28e76..e1183d91 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.h +++ b/lib/widgets/propeditor/propertywidgetproxy.h @@ -20,8 +20,8 @@ #ifndef PROPERTYWIDGETPROXY_H #define PROPERTYWIDGETPROXY_H -#include <qwidget.h> -#include <qvariant.h> +#include <tqwidget.h> +#include <tqvariant.h> #include "multiproperty.h" @@ -45,7 +45,7 @@ Q_OBJECT Q_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true ) Q_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false ) public: - PropertyWidgetProxy(QWidget *parent = 0, const char *name = 0); + PropertyWidgetProxy(TQWidget *parent = 0, const char *name = 0); ~PropertyWidgetProxy(); /**Sets the type of a property editor to appear.*/ @@ -55,13 +55,13 @@ public: void setPropertyType2(PropertyType propertyType); PropertyType propertyType2() const { return m_propertyType; } - QVariant value() const; - void setValue(const QVariant &value); + TQVariant value() const; + void setValue(const TQVariant &value); /**Sets the type of an editor basing on the @p value if the name is "value". - Otherwise works as QWidget::setProperty.*/ - bool setProperty( const char *name, const QVariant &value); - QVariant property( const char *name) const; + Otherwise works as TQWidget::setProperty.*/ + bool setProperty( const char *name, const TQVariant &value); + TQVariant property( const char *name) const; protected: virtual void setWidget(); @@ -73,7 +73,7 @@ private: PropertyType m_propertyType; PropertyWidget *m_editor; - QHBoxLayout *m_layout; + TQHBoxLayout *m_layout; }; } diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp index 5cbc1d40..90208304 100644 --- a/lib/widgets/propeditor/psizeedit.cpp +++ b/lib/widgets/propeditor/psizeedit.cpp @@ -20,39 +20,39 @@ #include "psizeedit.h" #include <klineedit.h> -#include <qlayout.h> -#include <qpainter.h> +#include <tqlayout.h> +#include <tqpainter.h> namespace PropertyLib{ -PSizeEdit::PSizeEdit(MultiProperty *property, QWidget *parent, const char *name) +PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); } -QVariant PSizeEdit::value() const +TQVariant PSizeEdit::value() const { return m_value; } -void PSizeEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); + p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); } -void PSizeEdit::setValue(const QVariant& value, bool emitChange) +void PSizeEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(QString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); + m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(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 3053f28f..4613f532 100644 --- a/lib/widgets/propeditor/psizeedit.h +++ b/lib/widgets/propeditor/psizeedit.h @@ -29,21 +29,21 @@ class QPainter; namespace PropertyLib{ /** -@short %Property editor for QSize values. +@short %Property editor for TQSize values. */ class PSizeEdit: public PropertyWidget { Q_OBJECT public: - PSizeEdit(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); private: KLineEdit *m_edit; - QVariant m_value; + TQVariant m_value; }; } diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp index 8695b9cd..9447a4bc 100644 --- a/lib/widgets/propeditor/psizepolicyedit.cpp +++ b/lib/widgets/propeditor/psizepolicyedit.cpp @@ -20,49 +20,49 @@ #include "psizepolicyedit.h" #include <klineedit.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qsizepolicy.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqsizepolicy.h> namespace PropertyLib{ -PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const QMap<QString, QVariant> &spValues, QWidget* parent, const char* name) +PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent, const char* name) :PropertyWidget(property, parent, name), m_spValues(spValues) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); } -QVariant PSizePolicyEdit::value() const +TQVariant PSizePolicyEdit::value() const { return m_value; } -void PSizePolicyEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QString("%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, 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())); } -void PSizePolicyEdit::setValue(const QVariant& value, bool emitChange) +void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(QString("%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").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); if (emitChange) emit propertyChanged(m_property, value); } -QString PSizePolicyEdit::findValueDescription(QVariant val) const +TQString PSizePolicyEdit::findValueDescription(TQVariant val) const { // qWarning("PSizePolicyEdit::findValueDescription : %d", val.toInt()); - for (QMap<QString, QVariant>::const_iterator it = m_spValues.begin(); it != m_spValues.end(); ++ it) + for (TQMap<TQString, TQVariant>::const_iterator it = m_spValues.begin(); it != m_spValues.end(); ++ it) { if (it.data() == val) return it.key(); diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h index 668359c2..36c26d1b 100644 --- a/lib/widgets/propeditor/psizepolicyedit.h +++ b/lib/widgets/propeditor/psizepolicyedit.h @@ -22,31 +22,31 @@ #include "propertywidget.h" -#include <qmap.h> +#include <tqmap.h> class KLineEdit; namespace PropertyLib{ /** -@short %Property editor for QSizePolicy values. +@short %Property editor for TQSizePolicy values. */ class PSizePolicyEdit : public PropertyWidget { Q_OBJECT public: - PSizePolicyEdit(MultiProperty* property, const QMap<QString, QVariant> &spValues, QWidget* parent=0, const char* name=0); + PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent=0, const char* name=0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); - QString findValueDescription(QVariant val) const; + TQString findValueDescription(TQVariant val) const; private: KLineEdit *m_edit; - QVariant m_value; - QMap<QString, QVariant> m_spValues; + TQVariant m_value; + TQMap<TQString, TQVariant> m_spValues; }; } diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index 0171adfb..755041c1 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -21,49 +21,49 @@ #include <limits.h> -#include <qspinbox.h> -#include <qlayout.h> +#include <tqspinbox.h> +#include <tqlayout.h> namespace PropertyLib{ -PSpinBox::PSpinBox(MultiProperty *property, QWidget *parent, const char *name) +PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); - m_edit = new QSpinBox(INT_MIN, INT_MAX, 1, this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); + m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); } -PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, QWidget *parent, const char *name) +PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); - m_edit = new QSpinBox(minValue, maxValue, step, this); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); + m_edit = new TQSpinBox(minValue, maxValue, step, this); l->addWidget(m_edit); - connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); } -QVariant PSpinBox::value() const +TQVariant PSpinBox::value() const { - return QVariant(m_edit->cleanText().toInt()); + return TQVariant(m_edit->cleanText().toInt()); } -void PSpinBox::setValue(const QVariant &value, bool emitChange) +void PSpinBox::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int))); + disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); m_edit->setValue(value.toInt()); - connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int))); + connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } void PSpinBox::updateProperty(int val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } } diff --git a/lib/widgets/propeditor/pspinbox.h b/lib/widgets/propeditor/pspinbox.h index 55d723f2..9998ff2f 100644 --- a/lib/widgets/propeditor/pspinbox.h +++ b/lib/widgets/propeditor/pspinbox.h @@ -32,20 +32,20 @@ namespace PropertyLib{ class PSpinBox: public PropertyWidget{ Q_OBJECT public: - PSpinBox(MultiProperty *property, QWidget *parent = 0, const char *name = 0); - PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, QWidget *parent = 0, const char *name = 0); + 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); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); private slots: void updateProperty(int val); private: - QSpinBox *m_edit; + TQSpinBox *m_edit; }; } diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index 18b8756e..f6803304 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "pstringlistedit.h" -#include <qlayout.h> -#include <qdialog.h> -#include <qpainter.h> +#include <tqlayout.h> +#include <tqdialog.h> +#include <tqpainter.h> #include <klineedit.h> #ifndef PURE_QT @@ -30,34 +30,34 @@ #include <kstdguiitem.h> #else #include "qeditlistbox.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> #include "compat_tools.h" #endif namespace PropertyLib{ -PStringListEdit::PStringListEdit(MultiProperty *property, QWidget *parent, const char *name) +PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - l = new QHBoxLayout(this); + l = new TQHBoxLayout(this); edit = new KLineEdit(this); edit->setReadOnly(true); - edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(edit); - pbSelect = new QPushButton("...", this); - pbSelect->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); + pbSelect = new TQPushButton("...", this); + pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(pbSelect); - connect(pbSelect, SIGNAL(clicked()), this, SLOT(showEditor())); + connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); } -QVariant PStringListEdit::value() const +TQVariant PStringListEdit::value() const { - return QVariant(m_list); + return TQVariant(m_list); } -void PStringListEdit::setValue(const QVariant &value, bool emitChange) +void PStringListEdit::setValue(const TQVariant &value, bool emitChange) { m_list = value.toStringList(); edit->setText(value.toStringList().join(", ")); @@ -67,8 +67,8 @@ void PStringListEdit::setValue(const QVariant &value, bool emitChange) void PStringListEdit::showEditor() { - QDialog* dia = new QDialog(this, "stringlist_dialog", true); - QVBoxLayout *dv = new QVBoxLayout(dia, 2); + TQDialog* dia = new TQDialog(this, "stringlist_dialog", true); + TQVBoxLayout *dv = new TQVBoxLayout(dia, 2); #ifdef PURE_QT QEditListBox *select = new QEditListBox(dia, "select_char"); @@ -77,18 +77,18 @@ void PStringListEdit::showEditor() #endif dv->addWidget(select); - QHBoxLayout *dh = new QHBoxLayout(dv, 6); + TQHBoxLayout *dh = new TQHBoxLayout(dv, 6); #ifndef PURE_QT KPushButton *pbOk = new KPushButton(KStdGuiItem::ok(), dia); KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), dia); #else - QPushButton *pbOk = new QPushButton(i18n("Ok"), dia); - QPushButton *pbCancel = new QPushButton(i18n("Cancel"), dia); + TQPushButton *pbOk = new TQPushButton(i18n("Ok"), dia); + TQPushButton *pbCancel = new TQPushButton(i18n("Cancel"), dia); #endif - QSpacerItem *si = new QSpacerItem(30, 0, QSizePolicy::Expanding, QSizePolicy::Expanding); + TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding); - connect(pbOk, SIGNAL(clicked()), dia, SLOT(accept())); - connect(pbCancel, SIGNAL(clicked()), dia, SLOT(reject())); + connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept())); + connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject())); dh->addItem(si); dh->addWidget(pbOk); @@ -96,7 +96,7 @@ void PStringListEdit::showEditor() select->insertStringList(m_list); - if (dia->exec() == QDialog::Accepted) + if (dia->exec() == TQDialog::Accepted) { m_list = select->items(); edit->setText(select->items().join(", ")); @@ -106,7 +106,7 @@ void PStringListEdit::showEditor() emit propertyChanged(m_property, m_list); } -void PStringListEdit::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value) +void PStringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { p->setPen(Qt::NoPen); p->setBrush(cg.background()); diff --git a/lib/widgets/propeditor/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h index 086391e8..25bbec74 100644 --- a/lib/widgets/propeditor/pstringlistedit.h +++ b/lib/widgets/propeditor/pstringlistedit.h @@ -36,25 +36,25 @@ class PStringListEdit: public PropertyWidget { Q_OBJECT public: - PStringListEdit(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); /**Function to draw a property viewer when the editor isn't shown.*/ - virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value); + virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value); private slots: void showEditor(); private: - QPushButton *pbSelect; - QHBoxLayout *l; + TQPushButton *pbSelect; + TQHBoxLayout *l; KLineEdit *edit; - QStringList m_list; + TQStringList m_list; }; } diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index 05ec4563..24f4259c 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -18,9 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qlayout.h> -#include <qpainter.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpushbutton.h> #include <klineedit.h> #ifndef PURE_QT @@ -28,52 +28,52 @@ #include <klocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> -#include <qdialog.h> +#include <tqdialog.h> #endif #include "psymbolcombo.h" namespace PropertyLib{ -PSymbolCombo::PSymbolCombo(MultiProperty *property, QWidget *parent, const char *name) +PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char *name) :PropertyWidget(property, parent, name) { - l = new QHBoxLayout(this); + l = new TQHBoxLayout(this); m_edit = new KLineEdit(this); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); m_edit->setMaxLength(1); l->addWidget(m_edit); - m_select = new QPushButton("...", this); - m_select->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); + m_select = new TQPushButton("...", this); + m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(m_select); #ifdef PURE_QT m_select->hide(); #endif - connect(m_select, SIGNAL(clicked()), this, SLOT(selectChar())); - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + connect(m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectChar())); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); } -QVariant PSymbolCombo::value() const +TQVariant PSymbolCombo::value() const { if (!(m_edit->text().isNull())) - return QVariant(QString("%1").arg(m_edit->text().at(0).unicode())); + return TQVariant(TQString("%1").arg(m_edit->text().at(0).unicode())); else - return QVariant(0); + return TQVariant(0); } -void PSymbolCombo::setValue(const QVariant &value, bool emitChange) +void PSymbolCombo::setValue(const TQVariant &value, bool emitChange) { #if QT_VERSION >= 0x030100 if (!(value.isNull())) #else - if (value.canCast(QVariant::Int)) + if (value.canCast(TQVariant::Int)) #endif { - disconnect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); - m_edit->setText(QChar(value.toInt())); - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + m_edit->setText(TQChar(value.toInt())); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } @@ -82,19 +82,19 @@ void PSymbolCombo::setValue(const QVariant &value, bool emitChange) void PSymbolCombo::selectChar() { #ifndef PURE_QT - QDialog* dia = new QDialog(this, "select_dialog", true); - QVBoxLayout *dv = new QVBoxLayout(dia, 2); + TQDialog* dia = new TQDialog(this, "select_dialog", true); + TQVBoxLayout *dv = new TQVBoxLayout(dia, 2); KCharSelect *select = new KCharSelect(dia, "select_char"); dv->addWidget(select); - QHBoxLayout *dh = new QHBoxLayout(dv, 6); + TQHBoxLayout *dh = new TQHBoxLayout(dv, 6); KPushButton *pbOk = new KPushButton(KStdGuiItem::ok(), dia); KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), dia); - QSpacerItem *si = new QSpacerItem(30, 0, QSizePolicy::Expanding, QSizePolicy::Expanding); + TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding); - connect(pbOk, SIGNAL(clicked()), dia, SLOT(accept())); - connect(pbCancel, SIGNAL(clicked()), dia, SLOT(reject())); + connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept())); + connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject())); dh->addItem(si); dh->addWidget(pbOk); @@ -103,7 +103,7 @@ void PSymbolCombo::selectChar() if (!(m_edit->text().isNull())) select->setChar(m_edit->text().at(0)); - if (dia->exec() == QDialog::Accepted) + if (dia->exec() == TQDialog::Accepted) { m_edit->setText(select->chr()); } @@ -111,17 +111,17 @@ void PSymbolCombo::selectChar() #endif } -void PSymbolCombo::updateProperty(const QString& val) +void PSymbolCombo::updateProperty(const TQString& val) { - emit propertyChanged(m_property, QVariant(QString("%1").arg(val.at(0).unicode()))); + emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).unicode()))); } -void PSymbolCombo::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value) +void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { p->setBrush(cg.background()); p->setPen(Qt::NoPen); p->drawRect(r); - p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QChar(value.toInt())); + p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQChar(value.toInt())); } } diff --git a/lib/widgets/propeditor/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h index e3bedfa8..621ce23c 100644 --- a/lib/widgets/propeditor/psymbolcombo.h +++ b/lib/widgets/propeditor/psymbolcombo.h @@ -35,26 +35,26 @@ namespace PropertyLib{ class PSymbolCombo: public PropertyWidget{ Q_OBJECT public: - PSymbolCombo(MultiProperty *property, QWidget *parent = 0, const char *name = 0); + PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ - virtual QVariant value() const; + virtual TQVariant value() const; /**Sets the value shown in the editor widget. Set emitChange to false if you don't want to emit propertyChanged signal.*/ - virtual void setValue(const QVariant &value, bool emitChange=true); + virtual void setValue(const TQVariant &value, bool emitChange=true); /**Function to draw a property viewer when the editor isn't shown.*/ - virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value); + virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value); public slots: void selectChar(); private slots: - void updateProperty(const QString &val); + void updateProperty(const TQString &val); private: KLineEdit *m_edit; - QPushButton *m_select; - QHBoxLayout *l; + TQPushButton *m_select; + TQHBoxLayout *l; }; } diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index 3a896cdf..64e4d0c7 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -22,49 +22,49 @@ #ifndef PURE_QT #include <kurlrequester.h> #else -#include <qpushbutton.h> -#include <qlineedit.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> #endif -#include <qfiledialog.h> -#include <qlayout.h> +#include <tqfiledialog.h> +#include <tqlayout.h> namespace PropertyLib{ -PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, QWidget* parent, const char* name) +PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const char* name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT m_edit = new KURLRequester(this); l->addWidget(m_edit); m_edit->setMode((KFile::Mode)mode); - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); #else m_edit = new KLineEdit(this); - m_select = new QPushButton("...",this); + m_select = new TQPushButton("...",this); l->addWidget(m_edit); l->addWidget(m_select); m_mode = mode; - connect( m_select, SIGNAL(clicked()),this,SLOT(select())); + connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); #endif - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } -QVariant PUrlEdit::value() const +TQVariant PUrlEdit::value() const { #ifndef PURE_QT - return QVariant(m_edit->url()); + return TQVariant(m_edit->url()); #else - return QVariant(m_url); + return TQVariant(m_url); #endif } -void PUrlEdit::setValue(const QVariant& value, bool emitChange) +void PUrlEdit::setValue(const TQVariant& value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); m_edit->setURL(value.toString()); - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&))); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); #else m_edit->setText(value.toString()); #endif @@ -72,19 +72,19 @@ void PUrlEdit::setValue(const QVariant& value, bool emitChange) emit propertyChanged(m_property, value); } -void PUrlEdit::updateProperty(const QString &val) +void PUrlEdit::updateProperty(const TQString &val) { - emit propertyChanged(m_property, QVariant(val)); + emit propertyChanged(m_property, TQVariant(val)); } void PUrlEdit::select() { #ifdef PURE_QT - QString path = m_url; + TQString path = m_url; if( m_mode == Directory ) - m_url = QFileDialog::getExistingDirectory( m_url,this); + m_url = TQFileDialog::getExistingDirectory( m_url,this); else - m_url = QFileDialog::getOpenFileName(m_url, QString::null, this); + m_url = TQFileDialog::getOpenFileName(m_url, TQString::null, 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 6c9c8a8d..6508ea7d 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -46,21 +46,21 @@ public: enum Mode {File,Directory}; #endif - PUrlEdit(Mode mode, MultiProperty* property, QWidget* parent=0, const char* name=0); + PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent=0, const char* name=0); - virtual QVariant value() const; - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void setValue(const TQVariant& value, bool emitChange); private slots: - void updateProperty(const QString &val); + void updateProperty(const TQString &val); void select(); private: #ifndef PURE_QT KURLRequester *m_edit; #else KLineEdit *m_edit; - QPushButton *m_select; - QString m_url; + TQPushButton *m_select; + TQString m_url; Mode m_mode; #endif }; diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index 763ac630..308570be 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "pyesnobutton.h" -#include <qlayout.h> -#include <qpainter.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpushbutton.h> #ifndef PURE_QT #include <klocale.h> @@ -31,34 +31,34 @@ namespace PropertyLib{ -PYesNoButton::PYesNoButton(MultiProperty* property, QWidget* parent, const char* name) +PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char* name) :PropertyWidget(property, parent, name) { - QHBoxLayout *l = new QHBoxLayout(this, 0, 0); - m_edit = new QPushButton(this); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); + m_edit = new TQPushButton(this); m_edit->setToggleButton(true); - m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool))); + connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); } -QVariant PYesNoButton::value() const +TQVariant PYesNoButton::value() const { - return QVariant(m_edit->isOn()); + return TQVariant(m_edit->isOn()); } -void PYesNoButton::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value) +void PYesNoButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value) { PropertyWidget::drawViewer(p, cg, r, value.toBool() ? i18n("Yes") : i18n("No")); } -void PYesNoButton::setValue(const QVariant& value, bool emitChange) +void PYesNoButton::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool))); + disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); m_edit->setDown(value.toBool()); value.toBool() ? m_edit->setText(i18n("Yes")) : m_edit->setText(i18n("No")); - connect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool))); + connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h index 3f4cabc4..9e5af75b 100644 --- a/lib/widgets/propeditor/pyesnobutton.h +++ b/lib/widgets/propeditor/pyesnobutton.h @@ -33,17 +33,17 @@ class PYesNoButton : public PropertyWidget { Q_OBJECT public: - PYesNoButton(MultiProperty* property, QWidget* parent = 0, const char* name = 0); + PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); - virtual QVariant value() const; - virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value); - virtual void setValue(const QVariant& value, bool emitChange); + virtual TQVariant value() const; + virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); + virtual void setValue(const TQVariant& value, bool emitChange); protected slots: void updateProperty(bool toggled); private: - QPushButton *m_edit; + TQPushButton *m_edit; }; } diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index 4de4e567..e1b09e4e 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -23,15 +23,15 @@ #include <klineedit.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qlistbox.h> -#include <qwhatsthis.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qapplication.h> -#include <qstringlist.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqlistbox.h> +#include <tqwhatsthis.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqapplication.h> +#include <tqstringlist.h> #include <assert.h> @@ -46,24 +46,24 @@ public: int buttons; }; -QEditListBox::QEditListBox(QWidget *parent, const char *name, +QEditListBox::QEditListBox(TQWidget *parent, const char *name, bool checkAtEntering, int buttons ) - :QGroupBox(parent, name ) + :TQGroupBox(parent, name ) { init( checkAtEntering, buttons ); } -QEditListBox::QEditListBox(const QString& title, QWidget *parent, +QEditListBox::QEditListBox(const TQString& title, TQWidget *parent, const char *name, bool checkAtEntering, int buttons) - :QGroupBox(title, parent, name ) + :TQGroupBox(title, parent, name ) { init( checkAtEntering, buttons ); } -QEditListBox::QEditListBox(const QString& title, const CustomEditor& custom, - QWidget *parent, const char *name, +QEditListBox::QEditListBox(const TQString& title, const CustomEditor& custom, + TQWidget *parent, const char *name, bool checkAtEntering, int buttons) - :QGroupBox(title, parent, name ) + :TQGroupBox(title, parent, name ) { m_lineEdit = custom.lineEdit(); init( checkAtEntering, buttons, custom.representationWidget() ); @@ -76,7 +76,7 @@ QEditListBox::~QEditListBox() } void QEditListBox::init( bool checkAtEntering, int buttons, - QWidget *representationWidget ) + TQWidget *representationWidget ) { d=new QEditListBoxPrivate; d->m_checkAtEntering=checkAtEntering; @@ -92,11 +92,11 @@ void QEditListBox::init( bool checkAtEntering, int buttons, servNewButton = servRemoveButton = servUpButton = servDownButton = 0L; - setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, - QSizePolicy::MinimumExpanding)); + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + TQSizePolicy::MinimumExpanding)); - QWidget * gb = this; - QGridLayout * grid = new QGridLayout(gb, 7 - lostButtons, 2, + TQWidget * gb = this; + TQGridLayout * grid = new TQGridLayout(gb, 7 - lostButtons, 2, MarginSize, SpazingSize); grid->addRowSpacing(0, fontMetrics().lineSpacing()); @@ -106,56 +106,56 @@ void QEditListBox::init( bool checkAtEntering, int buttons, grid->setMargin(15); if ( representationWidget ) - representationWidget->reparent( gb, QPoint(0,0) ); + representationWidget->reparent( gb, TQPoint(0,0) ); else m_lineEdit=new KLineEdit(gb); - m_listBox = new QListBox(gb); + m_listBox = new TQListBox(gb); - QWidget *editingWidget = representationWidget ? + TQWidget *editingWidget = representationWidget ? representationWidget : m_lineEdit; grid->addMultiCellWidget(editingWidget,1,1,0,1); grid->addMultiCellWidget(m_listBox, 2, 6 - lostButtons, 0, 0); int row = 2; if ( buttons & Add ) { - servNewButton = new QPushButton(i18n("&Add"), gb); + servNewButton = new TQPushButton(i18n("&Add"), gb); servNewButton->setEnabled(false); - connect(servNewButton, SIGNAL(clicked()), SLOT(addItem())); + connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); grid->addWidget(servNewButton, row++, 1); } if ( buttons & Remove ) { - servRemoveButton = new QPushButton(i18n("&Remove"), gb); + servRemoveButton = new TQPushButton(i18n("&Remove"), gb); servRemoveButton->setEnabled(false); - connect(servRemoveButton, SIGNAL(clicked()), SLOT(removeItem())); + connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); grid->addWidget(servRemoveButton, row++, 1); } if ( buttons & UpDown ) { - servUpButton = new QPushButton(i18n("Move &Up"), gb); + servUpButton = new TQPushButton(i18n("Move &Up"), gb); servUpButton->setEnabled(false); - connect(servUpButton, SIGNAL(clicked()), SLOT(moveItemUp())); + connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp())); - servDownButton = new QPushButton(i18n("Move &Down"), gb); + servDownButton = new TQPushButton(i18n("Move &Down"), gb); servDownButton->setEnabled(false); - connect(servDownButton, SIGNAL(clicked()), SLOT(moveItemDown())); + connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown())); grid->addWidget(servUpButton, row++, 1); grid->addWidget(servDownButton, row++, 1); } - connect(m_lineEdit,SIGNAL(textChanged(const QString&)),this,SLOT(typedSomething(const QString&))); + connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&))); - connect(m_lineEdit,SIGNAL(returnPressed()),this,SLOT(addItem())); - connect(m_listBox, SIGNAL(highlighted(int)), SLOT(enableMoveButtons(int))); + connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem())); + connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); // maybe supplied lineedit has some text already typedSomething( m_lineEdit->text() ); } -void QEditListBox::typedSomething(const QString& text) +void QEditListBox::typedSomething(const TQString& text) { if(currentItem() >= 0) { if(currentText() != m_lineEdit->text()) @@ -206,7 +206,7 @@ void QEditListBox::moveItemUp() return; } - QListBoxItem *selItem = m_listBox->item(selIndex); + TQListBoxItem *selItem = m_listBox->item(selIndex); m_listBox->takeItem(selItem); m_listBox->insertItem(selItem, selIndex-1); m_listBox->setCurrentItem(selIndex - 1); @@ -229,7 +229,7 @@ void QEditListBox::moveItemDown() return; } - QListBoxItem *selItem = m_listBox->item(selIndex); + TQListBoxItem *selItem = m_listBox->item(selIndex); m_listBox->takeItem(selItem); m_listBox->insertItem(selItem, selIndex+1); m_listBox->setCurrentItem(selIndex + 1); @@ -245,7 +245,7 @@ void QEditListBox::addItem() if ( !servNewButton || !servNewButton->isEnabled() ) return; - const QString& currentTextLE=m_lineEdit->text(); + const TQString& currentTextLE=m_lineEdit->text(); bool alreadyInList(false); //if we didn't check for dupes at the inserting we have to do it now if (!d->m_checkAtEntering) @@ -294,7 +294,7 @@ void QEditListBox::removeItem() if ( selected >= 0 ) { - QString removedText = m_listBox->currentText(); + TQString removedText = m_listBox->currentText(); m_listBox->removeItem( selected ); if ( count() > 0 ) @@ -351,17 +351,17 @@ void QEditListBox::clear() emit changed(); } -void QEditListBox::insertStringList(const QStringList& list, int index) +void QEditListBox::insertStringList(const TQStringList& list, int index) { m_listBox->insertStringList(list,index); } -void QEditListBox::insertStrList(const QStrList* list, int index) +void QEditListBox::insertStrList(const TQStrList* list, int index) { m_listBox->insertStrList(list,index); } -void QEditListBox::insertStrList(const QStrList& list, int index) +void QEditListBox::insertStrList(const TQStrList& list, int index) { m_listBox->insertStrList(list,index); } @@ -371,16 +371,16 @@ void QEditListBox::insertStrList(const char ** list, int numStrings, int index) m_listBox->insertStrList(list,numStrings,index); } -QStringList QEditListBox::items() const +TQStringList QEditListBox::items() const { - QStringList list; + TQStringList list; for ( uint i = 0; i < m_listBox->count(); i++ ) list.append( m_listBox->text( i )); return list; } -void QEditListBox::setItems(const QStringList& items) +void QEditListBox::setItems(const TQStringList& items) { m_listBox->clear(); m_listBox->insertStringList(items, 0); @@ -393,7 +393,7 @@ void QEditListBox::virtual_hook( int, void* ) /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -QEditListBox::CustomEditor::CustomEditor( QComboBox *combo ) +QEditListBox::CustomEditor::CustomEditor( TQComboBox *combo ) { m_representationWidget = combo; m_lineEdit = dynamic_cast<KLineEdit*>( combo->lineEdit() ); diff --git a/lib/widgets/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h index 93bf8bf3..245f8b57 100644 --- a/lib/widgets/propeditor/qeditlistbox.h +++ b/lib/widgets/propeditor/qeditlistbox.h @@ -20,8 +20,8 @@ #ifndef QEDITLISTBOX_H #define QEDITLISTBOX_H -#include <qgroupbox.h> -#include <qlistbox.h> +#include <tqgroupbox.h> +#include <tqlistbox.h> class KLineEdit; class QComboBox; @@ -46,7 +46,7 @@ class QEditListBox : public QGroupBox { Q_OBJECT - Q_PROPERTY( QStringList items READ items WRITE setItems ) + Q_PROPERTY( TQStringList items READ items WRITE setItems ) public: // @since 3.1 @@ -56,19 +56,19 @@ public: CustomEditor() : m_representationWidget( 0L ), m_lineEdit( 0L ) {} - CustomEditor( QWidget *repWidget, KLineEdit *edit ) + CustomEditor( TQWidget *repWidget, KLineEdit *edit ) : m_representationWidget( repWidget ), m_lineEdit( edit ) {} - CustomEditor( QComboBox *combo ); + CustomEditor( TQComboBox *combo ); - void setRepresentationWidget( QWidget *repWidget ) { + void setRepresentationWidget( TQWidget *repWidget ) { m_representationWidget = repWidget; } void setLineEdit( KLineEdit *edit ) { m_lineEdit = edit; } - virtual QWidget *representationWidget() const { + virtual TQWidget *representationWidget() const { return m_representationWidget; } virtual KLineEdit *lineEdit() const { @@ -76,7 +76,7 @@ public: } protected: - QWidget *m_representationWidget; + TQWidget *m_representationWidget; KLineEdit *m_lineEdit; }; @@ -100,7 +100,7 @@ public: * it will be checked if you press the Add-button. It is not * possible to enter items twice into the listbox. */ - QEditListBox(QWidget *parent = 0, const char *name = 0, + QEditListBox(TQWidget *parent = 0, const char *name = 0, bool checkAtEntering=false, int buttons = All ); /** * Create an editable listbox. @@ -108,33 +108,33 @@ 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 QString& title, QWidget *parent = 0, + QEditListBox(const TQString& title, TQWidget *parent = 0, const char *name = 0, bool checkAtEntering=false, int buttons = All ); /** * Another constructor, which allows to use a custom editing widget - * instead of the standard QLineEdit widget. E.g. you can use a - * KURLRequester or a QComboBox as input widget. The custom + * instead of the standard TQLineEdit widget. E.g. you can use a + * KURLRequester or a TQComboBox as input widget. The custom * editor must consist of a lineedit and optionally another widget that - * is used as representation. A QComboBox or a KURLRequester have a - * QLineEdit as child-widget for example, so the QComboBox is used as + * is used as representation. A TQComboBox or a KURLRequester have a + * TQLineEdit as child-widget for example, so the TQComboBox is used as * the representation widget. * * @see KURLRequester::customEditor() * @since 3.1 */ - QEditListBox( const QString& title, + QEditListBox( const TQString& title, const CustomEditor &customEditor, - QWidget *parent = 0, const char *name = 0, + TQWidget *parent = 0, const char *name = 0, bool checkAtEntering = false, int buttons = All ); virtual ~QEditListBox(); /** - * Return a pointer to the embedded QListBox. + * Return a pointer to the embedded TQListBox. */ - QListBox* listBox() const { return m_listBox; } + TQListBox* listBox() const { return m_listBox; } /** * Return a pointer to the embedded KLineEdit. */ @@ -142,72 +142,72 @@ public: /** * Return a pointer to the Add button */ - QPushButton* addButton() const { return servNewButton; } + TQPushButton* addButton() const { return servNewButton; } /** * Return a pointer to the Remove button */ - QPushButton* removeButton() const { return servRemoveButton; } + TQPushButton* removeButton() const { return servRemoveButton; } /** * Return a pointer to the Up button */ - QPushButton* upButton() const { return servUpButton; } + TQPushButton* upButton() const { return servUpButton; } /** * Return a pointer to the Down button */ - QPushButton* downButton() const { return servDownButton; } + TQPushButton* downButton() const { return servDownButton; } /** - * See QListBox::count() + * See TQListBox::count() */ int count() const { return int(m_listBox->count()); } /** - * See QListBox::insertStringList() + * See TQListBox::insertStringList() */ - void insertStringList(const QStringList& list, int index=-1); + void insertStringList(const TQStringList& list, int index=-1); /** - * See QListBox::insertStringList() + * See TQListBox::insertStringList() */ - void insertStrList(const QStrList* list, int index=-1); + void insertStrList(const TQStrList* list, int index=-1); /** - * See QListBox::insertStrList() + * See TQListBox::insertStrList() */ - void insertStrList(const QStrList& list, int index=-1); + void insertStrList(const TQStrList& list, int index=-1); /** - * See QListBox::insertStrList() + * See TQListBox::insertStrList() */ void insertStrList(const char ** list, int numStrings=-1, int index=-1); /** - * See QListBox::insertItem() + * See TQListBox::insertItem() */ - void insertItem(const QString& text, int index=-1) {m_listBox->insertItem(text,index);} + void insertItem(const TQString& text, int index=-1) {m_listBox->insertItem(text,index);} /** * Clears both the listbox and the line edit. */ void clear(); /** - * See QListBox::text() + * See TQListBox::text() */ - QString text(int index) const { return m_listBox->text(index); } + TQString text(int index) const { return m_listBox->text(index); } /** - * See QListBox::currentItem() + * See TQListBox::currentItem() */ int currentItem() const; /** - * See QListBox::currentText() + * See TQListBox::currentText() */ - QString currentText() const { return m_listBox->currentText(); } + TQString currentText() const { return m_listBox->currentText(); } /** * @returns a stringlist of all items in the listbox */ - QStringList items() const; + TQStringList items() const; /** * Clears the listbox and sets the contents to @p items * * @since 3.4 */ - void setItems(const QStringList& items); + void setItems(const TQStringList& items); signals: void changed(); @@ -217,14 +217,14 @@ public: * the parameter is the added string. * @since 3.2 */ - void added( const QString & text ); + void added( const TQString & text ); /** * This signal is emitted when the user removes a string from the list, * the parameter is the removed string. * @since 3.2 */ - void removed( const QString & text ); + void removed( const TQString & text ); protected slots: //the names should be self-explaining @@ -233,17 +233,17 @@ public: void addItem(); void removeItem(); void enableMoveButtons(int index); - void typedSomething(const QString& text); + void typedSomething(const TQString& text); private: - QListBox *m_listBox; - QPushButton *servUpButton, *servDownButton; - QPushButton *servNewButton, *servRemoveButton; + TQListBox *m_listBox; + TQPushButton *servUpButton, *servDownButton; + TQPushButton *servNewButton, *servRemoveButton; KLineEdit *m_lineEdit; //this is called in both ctors, to avoid code duplication void init( bool checkAtEntering, int buttons, - QWidget *representationWidget = 0L ); + TQWidget *representationWidget = 0L ); protected: virtual void virtual_hook( int id, void* data ); diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp index f1bde4cd..a8522105 100644 --- a/lib/widgets/propeditor/qfloatinput.cpp +++ b/lib/widgets/propeditor/qfloatinput.cpp @@ -23,23 +23,23 @@ #include <math.h> QFloatInput::QFloatInput( int min, int max, float step, int digits, - QWidget *parent, const char *name ) - : QSpinBox( (int) (min*pow(digits,10)), + TQWidget *parent, const char *name ) + : TQSpinBox( (int) (min*pow(digits,10)), (int) (max*pow(digits,10)), (int) (step*pow(digits,10)), parent, name ), m_digits( digits ) { setValue( (int) (min*pow(digits,10)) ); delete validator(); - QDoubleValidator* validator = - new QDoubleValidator( min, max, m_digits, this ); + TQDoubleValidator* validator = + new TQDoubleValidator( min, max, m_digits, this ); setValidator( validator ); } -QString QFloatInput::mapValueToText( int value ) +TQString QFloatInput::mapValueToText( int value ) { - QString format = QString("%.%1f").arg( m_digits ); - return QString().sprintf(format.latin1(), + TQString format = TQString("%.%1f").arg( m_digits ); + return TQString().sprintf(format.latin1(), (value/(float)pow(m_digits,10)) ); } diff --git a/lib/widgets/propeditor/qfloatinput.h b/lib/widgets/propeditor/qfloatinput.h index 5f5adbd4..4bbe63e6 100644 --- a/lib/widgets/propeditor/qfloatinput.h +++ b/lib/widgets/propeditor/qfloatinput.h @@ -21,17 +21,17 @@ #ifndef QFLOATINPUT_H #define QFLOATINPUT_H -#include <qapplication.h> -#include <qspinbox.h> -#include <qvalidator.h> +#include <tqapplication.h> +#include <tqspinbox.h> +#include <tqvalidator.h> class QFloatInput : public QSpinBox { public: QFloatInput( int min, int max, float step, int digits, - QWidget *parent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); - virtual QString mapValueToText( int value ); + virtual TQString mapValueToText( int value ); virtual int mapTextToValue( bool* ok ); diff --git a/lib/widgets/propeditor/test.cpp b/lib/widgets/propeditor/test.cpp index 0063e2d6..82665f98 100644 --- a/lib/widgets/propeditor/test.cpp +++ b/lib/widgets/propeditor/test.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qapplication.h> +#include <tqapplication.h> #include "propertyeditor.h" #include "propertylist.h" @@ -27,7 +27,7 @@ using namespace PropertyLib; int main( int argc, char **argv ) { - QApplication app( argc, argv ); + TQApplication app( argc, argv ); PropertyEditor *editor = new PropertyEditor( 0 ); @@ -44,10 +44,10 @@ int main( int argc, char **argv ) "sample pixmap description" ) ); currentList->addProperty( new Property( Property::Rect, "Rectangle", - "sample rectangle", QRect( 10, 11, 30, 40 ) ) ); + "sample rectangle", TQRect( 10, 11, 30, 40 ) ) ); currentList->addProperty( new Property( Property::Point, "Point", - "sample point", QPoint( 20, 30 ) ) ); + "sample point", TQPoint( 20, 30 ) ) ); currentList->addProperty( new Property( Property::Boolean, "Boolean", "sample bool", false ) ); @@ -59,7 +59,7 @@ int main( int argc, char **argv ) new Property( Property::Double, "Double", "sample double", 7.0 ) ); - QStringList things; + TQStringList things; things += "Thing 1"; things += "Thing 2"; diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 2cab4fea..800eec47 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -16,21 +16,21 @@ #include "qcomboview.h" #include <kdeversion.h> #ifndef QT_NO_COMBOBOX -#include "qpopupmenu.h" -#include "qlistview.h" -#include "qpainter.h" -#include "qdrawutil.h" -#include "qstrlist.h" -#include "qpixmap.h" -#include "qtimer.h" -#include "qapplication.h" -#include "qlineedit.h" -#include "qbitmap.h" +#include "tqpopupmenu.h" +#include "tqlistview.h" +#include "tqpainter.h" +#include "tqdrawutil.h" +#include "tqstrlist.h" +#include "tqpixmap.h" +#include "tqtimer.h" +#include "tqapplication.h" +#include "tqlineedit.h" +#include "tqbitmap.h" #include "private/qeffects_p.h" -#include "qstringlist.h" -#include "qcombobox.h" -#include "qstyle.h" -#include "qheader.h" +#include "tqstringlist.h" +#include "tqcombobox.h" +#include "tqstyle.h" +#include "tqheader.h" #include <limits.h> class QComboViewData @@ -39,16 +39,16 @@ public: QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb ) { duplicatesEnabled = TRUE; - cb->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ) ); + cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); } - inline QListView * listView() { return lView; } + inline TQListView * listView() { return lView; } void updateLinedGeometry(); - void setListView( QListView *l ) { lView = l ; + void setListView( TQListView *l ) { lView = l ; l->setMouseTracking( TRUE );} - QListViewItem *current; + TQListViewItem *current; int maxCount; int sizeLimit; QComboView::Policy p; @@ -65,14 +65,14 @@ public: bool duplicatesEnabled; int fullHeight, currHeight; - QLineEdit * ed; // /bin/ed rules! - QTimer *completionTimer; + TQLineEdit * ed; // /bin/ed rules! + TQTimer *completionTimer; - QSize sizeHint; + TQSize sizeHint; private: bool usinglView; - QListView *lView; + TQListView *lView; QComboView *combo; }; @@ -81,11 +81,11 @@ void QComboViewData::updateLinedGeometry() { if ( !ed || !combo ) return; - QRect r = QStyle::visualRect( combo->style().querySubControlMetrics(QStyle::CC_ComboBox, combo, - QStyle::SC_ComboBoxEditField), combo ); + TQRect r = TQStyle::visualRect( combo->style().querySubControlMetrics(TQStyle::CC_ComboBox, combo, + TQStyle::SC_ComboBoxEditField), combo ); // qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1); - const QPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0; + 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() ) @@ -138,8 +138,8 @@ static inline bool checkIndex( const char *method, const char * name, */ -QComboView::QComboView( bool rw, QWidget *parent, const char *name ) - : QWidget( parent, name, WResizeNoErase ) +QComboView::QComboView( bool rw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WResizeNoErase ) { d = new QComboViewData( this ); setUpListView(); @@ -156,7 +156,7 @@ QComboView::QComboView( bool rw, QWidget *parent, const char *name ) d->useCompletion = FALSE; d->completeAt = 0; d->completeNow = FALSE; - d->completionTimer = new QTimer( this ); + d->completionTimer = new TQTimer( this ); setFocusPolicy( StrongFocus ); @@ -204,18 +204,18 @@ void QComboView::clear() d->current = 0; if ( d->ed ) { - d->ed->setText( QString::fromLatin1("") ); + d->ed->setText( TQString::fromLatin1("") ); d->updateLinedGeometry(); } currentChanged(); } -QListViewItem *QComboView::currentItem() const +TQListViewItem *QComboView::currentItem() const { return d->current; } -void QComboView::setCurrentItem( QListViewItem *item ) +void QComboView::setCurrentItem( TQListViewItem *item ) { if ( item == d->current && !d->ed ) { return; @@ -272,16 +272,16 @@ void QComboView::setAutoResize( bool enable ) the contents change dynamically. To invalidate the cached value call setFont(). */ -QSize QComboView::sizeHint() const +TQSize QComboView::sizeHint() const { if ( isVisible() && d->sizeHint.isValid() ) return d->sizeHint; constPolish(); // int i, w; - QFontMetrics fm = fontMetrics(); + TQFontMetrics fm = fontMetrics(); - int maxW = childCount() ? 18 : 7 * fm.width(QChar('x')) + 18; + int maxW = childCount() ? 18 : 7 * fm.width(TQChar('x')) + 18; int maxH = QMAX( fm.lineSpacing(), 14 ) + 2; /* for( i = 0; i < count(); i++ ) { @@ -290,8 +290,8 @@ QSize QComboView::sizeHint() const maxW = w; } */ - d->sizeHint = (style().sizeFromContents(QStyle::CT_ComboBox, this, - QSize(maxW, maxH)).expandedTo(QApplication::globalStrut())); + d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, + TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut())); return d->sizeHint; } @@ -303,7 +303,7 @@ QSize QComboView::sizeHint() const the activated() signal. */ -void QComboView::internalActivate( QListViewItem * item ) +void QComboView::internalActivate( TQListViewItem * item ) { if (!item) { @@ -319,7 +319,7 @@ void QComboView::internalActivate( QListViewItem * item ) d->current = item; - QString t( item->text(0) ); + TQString t( item->text(0) ); if ( d->ed ) { d->ed->setText( t ); // qWarning("internalActivate( %s )", item->text(0).latin1()); @@ -337,7 +337,7 @@ void QComboView::internalActivate( QListViewItem * item ) the highlighted() signal. */ -void QComboView::internalHighlight( QListViewItem * item ) +void QComboView::internalHighlight( TQListViewItem * item ) { if (!item) { @@ -349,7 +349,7 @@ void QComboView::internalHighlight( QListViewItem * item ) return; } emit highlighted( item ); - QString t = item->text(0); + TQString t = item->text(0); if ( !t.isNull() ) emit highlighted( t ); } @@ -369,9 +369,9 @@ void QComboView::internalClickTimeout() popup list to \a palette. */ -void QComboView::setPalette( const QPalette &palette ) +void QComboView::setPalette( const TQPalette &palette ) { - QWidget::setPalette( palette ); + TQWidget::setPalette( palette ); if( d ) { if(d->listView()) d->listView()->setPalette( palette ); @@ -383,10 +383,10 @@ void QComboView::setPalette( const QPalette &palette ) list to \a font. */ -void QComboView::setFont( const QFont &font ) +void QComboView::setFont( const TQFont &font ) { - d->sizeHint = QSize(); // invalidate size hint - QWidget::setFont( font ); + d->sizeHint = TQSize(); // invalidate size hint + TQWidget::setFont( font ); d->listView()->setFont( font ); if (d->ed) d->ed->setFont( font ); @@ -398,49 +398,49 @@ void QComboView::setFont( const QFont &font ) /*!reimp */ -void QComboView::resizeEvent( QResizeEvent * e ) +void QComboView::resizeEvent( TQResizeEvent * e ) { if ( d->ed ) d->updateLinedGeometry(); d->listView()->resize( width(), d->listView()->height() ); - QWidget::resizeEvent( e ); + TQWidget::resizeEvent( e ); } /*!reimp */ -void QComboView::paintEvent( QPaintEvent * ) +void QComboView::paintEvent( TQPaintEvent * ) { - QPainter p( this ); - const QColorGroup & g = colorGroup(); + TQPainter p( this ); + const TQColorGroup & g = colorGroup(); p.setPen(g.text()); - QStyle::SFlags flags = QStyle::Style_Default; + TQStyle::SFlags flags = TQStyle::Style_Default; if (isEnabled()) - flags |= QStyle::Style_Enabled; + flags |= TQStyle::Style_Enabled; if (hasFocus()) - flags |= QStyle::Style_HasFocus; + flags |= TQStyle::Style_HasFocus; if ( width() < 5 || height() < 5 ) { qDrawShadePanel( &p, rect(), g, FALSE, 2, - &g.brush( QColorGroup::Button ) ); + &g.brush( TQColorGroup::Button ) ); return; } -// bool reverse = QApplication::reverseLayout(); - style().drawComplexControl( QStyle::CC_ComboBox, &p, this, rect(), g, - flags, QStyle::SC_All, +// bool reverse = TQApplication::reverseLayout(); + style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, + flags, TQStyle::SC_All, (d->arrowDown ? - QStyle::SC_ComboBoxArrow : - QStyle::SC_None )); + TQStyle::SC_ComboBoxArrow : + TQStyle::SC_None )); - QRect re = style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxEditField ); - re = QStyle::visualRect(re, this); + TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxEditField ); + re = TQStyle::visualRect(re, this); p.setClipRect( re ); if ( !d->ed ) { - QListViewItem * item = d->current; + TQListViewItem * item = d->current; if ( item ) { // we calculate the QListBoxTexts height (ignoring strut) int itemh = d->listView()->fontMetrics().lineSpacing() + 2; @@ -448,11 +448,11 @@ void QComboView::paintEvent( QPaintEvent * ) item->paintCell( &p, d->listView()->colorGroup(), 0, width(), AlignLeft | AlignVCenter ); } } else if ( d->listView() && d->listView()->currentItem( ) && d->current ) { - QListViewItem * item = d->current ; - const QPixmap *pix = item->pixmap(0); + 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( QColorGroup::Base ) ); + colorGroup().brush( TQColorGroup::Base ) ); p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix->height() ) / 2, *pix ); } @@ -464,7 +464,7 @@ void QComboView::paintEvent( QPaintEvent * ) /*!reimp */ -void QComboView::mousePressEvent( QMouseEvent *e ) +void QComboView::mousePressEvent( TQMouseEvent *e ) { if ( e->button() != LeftButton ) return; @@ -472,9 +472,9 @@ void QComboView::mousePressEvent( QMouseEvent *e ) d->discardNextMousePress = FALSE; return; } - QRect arrowRect = style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxArrow); - arrowRect = QStyle::visualRect(arrowRect, this); + TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxArrow); + arrowRect = TQStyle::visualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. @@ -491,7 +491,7 @@ void QComboView::mousePressEvent( QMouseEvent *e ) d->arrowDown = TRUE; repaint( FALSE ); } - QTimer::singleShot( 200, this, SLOT(internalClickTimeout())); + TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); d->shortClick = TRUE; } } @@ -499,21 +499,21 @@ void QComboView::mousePressEvent( QMouseEvent *e ) /*!reimp */ -void QComboView::mouseMoveEvent( QMouseEvent * ) +void QComboView::mouseMoveEvent( TQMouseEvent * ) { } /*!reimp */ -void QComboView::mouseReleaseEvent( QMouseEvent * ) +void QComboView::mouseReleaseEvent( TQMouseEvent * ) { } /*!reimp */ -void QComboView::mouseDoubleClickEvent( QMouseEvent *e ) +void QComboView::mouseDoubleClickEvent( TQMouseEvent *e ) { mousePressEvent( e ); } @@ -522,9 +522,9 @@ void QComboView::mouseDoubleClickEvent( QMouseEvent *e ) /*!reimp */ -void QComboView::keyPressEvent( QKeyEvent *e ) +void QComboView::keyPressEvent( TQKeyEvent *e ) { - QListViewItem *c = currentItem(); + TQListViewItem *c = currentItem(); if ( ( e->key() == Key_F4 && e->state() == 0 ) || ( e->key() == Key_Down && (e->state() & AltButton) ) || ( !d->ed && e->key() == Key_Space ) ) { @@ -571,7 +571,7 @@ void QComboView::keyPressEvent( QKeyEvent *e ) return; } else { d->completionTimer->stop(); - QString ct = currentText().left( d->completeAt ) + e->text(); + TQString ct = currentText().left( d->completeAt ) + e->text(); c = completionIndex( ct, c ); if ( c == 0 && d->completeAt > 0 ) { c = completionIndex( e->text(), listView()->firstChild() ); @@ -597,22 +597,22 @@ void QComboView::keyPressEvent( QKeyEvent *e ) emit activated( c ); } -QString QComboView::currentText() const +TQString QComboView::currentText() const { if ( d->ed ) return d->ed->text(); else if ( d->current ) return currentItem()->text(0); else - return QString::null; + return TQString::null; } /*!reimp */ -void QComboView::focusInEvent( QFocusEvent * e ) +void QComboView::focusInEvent( TQFocusEvent * e ) { - QWidget::focusInEvent( e ); + TQWidget::focusInEvent( e ); d->completeNow = FALSE; d->completeAt = 0; @@ -622,9 +622,9 @@ void QComboView::focusInEvent( QFocusEvent * e ) /*!reimp */ -void QComboView::focusOutEvent( QFocusEvent * e ) +void QComboView::focusOutEvent( TQFocusEvent * e ) { - QWidget::focusOutEvent( e ); + TQWidget::focusOutEvent( e ); d->completeNow = FALSE; d->completeAt = 0; @@ -634,20 +634,20 @@ void QComboView::focusOutEvent( QFocusEvent * e ) /*!reimp */ -void QComboView::wheelEvent( QWheelEvent *e ) +void QComboView::wheelEvent( TQWheelEvent *e ) { if ( d->poppedUp ) { - QApplication::sendEvent( d->listView(), e ); + TQApplication::sendEvent( d->listView(), e ); } else { if ( e->delta() > 0 ) { - QListViewItem *c = currentItem(); + TQListViewItem *c = currentItem(); if ( c && c->itemAbove() ) { setCurrentItem( c->itemAbove() ); emit activated( currentItem() ); emit activated( currentText() ); } } else { - QListViewItem *c = currentItem(); + TQListViewItem *c = currentItem(); if ( c && c->itemBelow() ) { setCurrentItem( c->itemBelow() ); emit activated( currentItem() ); @@ -658,10 +658,10 @@ void QComboView::wheelEvent( QWheelEvent *e ) } } -int childCount(QListViewItem *it) +int childCount(TQListViewItem *it) { int count = 1; - QListViewItem * myChild = it->firstChild(); + TQListViewItem * myChild = it->firstChild(); while( myChild ) { count += childCount(myChild); myChild = myChild->nextSibling(); @@ -669,10 +669,10 @@ int childCount(QListViewItem *it) return count; } -int childCount(QListView *lv) +int childCount(TQListView *lv) { int count = 0; - QListViewItem * myChild = lv->firstChild(); + TQListViewItem * myChild = lv->firstChild(); while( myChild ) { count += childCount(myChild); // count += 1; @@ -686,7 +686,7 @@ int childCount(QListView *lv) Calculates the listbox height needed to contain all items, or as many as the list box is supposed to contain. */ -static int listHeight( QListView *l, int /*sl*/ ) +static int listHeight( TQListView *l, int /*sl*/ ) { /* if ( l->childCount() > 0 ) return QMIN( l->childCount(), (uint)sl) * l->firstChild()->height(); @@ -722,7 +722,7 @@ void QComboView::popup() return; // Send all listbox events to eventFilter(): - QListView* lb = d->listView(); + TQListView* lb = d->listView(); lb->triggerUpdate( ); lb->installEventFilter( this ); lb->viewport()->installEventFilter( this ); @@ -730,13 +730,13 @@ void QComboView::popup() // int w = lb->variableWidth() ? lb->sizeHint().width() : width(); int w = width(); int h = listHeight( lb, d->sizeLimit ); - QRect screen = QApplication::desktop()->availableGeometry( const_cast<QComboView*>(this) ); + TQRect screen = TQApplication::desktop()->availableGeometry( const_cast<QComboView*>(this) ); int sx = screen.x(); // screen pos int sy = screen.y(); int sw = screen.width(); // screen width int sh = screen.height(); // screen height - QPoint pos = mapToGlobal( QPoint(0,height()) ); + TQPoint pos = mapToGlobal( TQPoint(0,height()) ); // ## Similar code is in QPopupMenu int x = pos.x(); int y = pos.y(); @@ -748,10 +748,10 @@ void QComboView::popup() x = sx; if (y + h > sy+sh && y - h - height() >= 0 ) y = y - h - height(); - QRect rect = - style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxListBoxPopup, - QStyleOption( x, y, w, h ) ); + TQRect rect = + style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxListBoxPopup, + TQStyleOption( x, y, w, h ) ); if ( rect.isNull() ) rect.setRect( x, y, w, h ); lb->setGeometry( rect ); @@ -759,17 +759,17 @@ void QComboView::popup() lb->raise(); bool block = lb->signalsBlocked(); lb->blockSignals( TRUE ); - QListViewItem *currentLBItem = d->current ; + TQListViewItem *currentLBItem = d->current ; lb->setCurrentItem( currentLBItem ); // set the current item to also be the selected item if it isn't already if ( currentLBItem && currentLBItem->isSelectable() && !currentLBItem->isSelected() ) lb->setSelected( currentLBItem, TRUE ); lb->blockSignals( block ); - lb->setVScrollBarMode(QScrollView::Auto); + lb->setVScrollBarMode(TQScrollView::Auto); //#ifndef QT_NO_EFFECTS -/* if ( QApplication::isEffectEnabled( UI_AnimateCombo ) ) { - if ( lb->y() < mapToGlobal(QPoint(0,0)).y() ) +/* if ( TQApplication::isEffectEnabled( UI_AnimateCombo ) ) { + if ( lb->y() < mapToGlobal(TQPoint(0,0)).y() ) qScrollEffect( lb, QEffects::UpScroll ); else qScrollEffect( lb ); @@ -785,12 +785,12 @@ void QComboView::popup() */ void QComboView::updateMask() { - QBitmap bm( size() ); + TQBitmap bm( size() ); bm.fill( color0 ); { - QPainter p( &bm, this ); - style().drawComplexControlMask(QStyle::CC_ComboBox, &p, this, rect()); + TQPainter p( &bm, this ); + style().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); } setMask( bm ); @@ -846,42 +846,42 @@ void QComboView::currentChanged() when the mouse button is released. */ -bool QComboView::eventFilter( QObject *object, QEvent *event ) +bool QComboView::eventFilter( TQObject *object, TQEvent *event ) { if ( !event ) return TRUE; else if ( object == d->ed ) { - if ( event->type() == QEvent::KeyPress ) { - bool isAccepted = ( (QKeyEvent*)event )->isAccepted(); - keyPressEvent( (QKeyEvent *)event ); - if ( ((QKeyEvent *)event)->isAccepted() ) { + if ( event->type() == TQEvent::KeyPress ) { + bool isAccepted = ( (TQKeyEvent*)event )->isAccepted(); + keyPressEvent( (TQKeyEvent *)event ); + if ( ((TQKeyEvent *)event)->isAccepted() ) { d->completeNow = FALSE; return TRUE; - } else if ( ((QKeyEvent *)event)->key() != Key_End ) { + } else if ( ((TQKeyEvent *)event)->key() != Key_End ) { d->completeNow = TRUE; d->completeAt = d->ed->cursorPosition(); } if ( isAccepted ) - ( (QKeyEvent*)event )->accept(); + ( (TQKeyEvent*)event )->accept(); else - ( (QKeyEvent*)event )->ignore(); - } else if ( event->type() == QEvent::KeyRelease ) { + ( (TQKeyEvent*)event )->ignore(); + } else if ( event->type() == TQEvent::KeyRelease ) { d->completeNow = FALSE; - keyReleaseEvent( (QKeyEvent *)event ); - return ((QKeyEvent *)event)->isAccepted(); - } else if ( event->type() == QEvent::FocusIn ) { - focusInEvent( (QFocusEvent *)event ); - } else if ( event->type() == QEvent::FocusOut ) { - focusOutEvent( (QFocusEvent *)event ); + keyReleaseEvent( (TQKeyEvent *)event ); + return ((TQKeyEvent *)event)->isAccepted(); + } else if ( event->type() == TQEvent::FocusIn ) { + focusInEvent( (TQFocusEvent *)event ); + } else if ( event->type() == TQEvent::FocusOut ) { + focusOutEvent( (TQFocusEvent *)event ); } else if ( d->useCompletion && d->completeNow ) { if ( !d->ed->text().isNull() && d->ed->cursorPosition() > d->completeAt && d->ed->cursorPosition() == (int)d->ed->text().length() ) { d->completeNow = FALSE; - QString ct( d->ed->text() ); - QListViewItem *i = completionIndex( ct, currentItem() ); + TQString ct( d->ed->text() ); + TQListViewItem *i = completionIndex( ct, currentItem() ); if ( i ) { - QString it = i->text(0); + TQString it = i->text(0); d->ed->validateAndSet( it, ct.length(), ct.length(), it.length() ); } @@ -889,22 +889,22 @@ bool QComboView::eventFilter( QObject *object, QEvent *event ) } } else if ( ( object == d->listView() || object == d->listView()->viewport() )) { - QMouseEvent *e = (QMouseEvent*)event; + TQMouseEvent *e = (TQMouseEvent*)event; switch( event->type() ) { - case QEvent::MouseMove: + case TQEvent::MouseMove: if ( !d->mouseWasInsidePopup ) { // qWarning("!d->mouseWasInsidePopup"); - QPoint pos = e->pos(); + TQPoint pos = e->pos(); if ( d->listView()->rect().contains( pos ) ) d->mouseWasInsidePopup = TRUE; // Check if arrow button should toggle if ( d->arrowPressed ) { - QPoint comboPos; + TQPoint comboPos; comboPos = mapFromGlobal( d->listView()->mapToGlobal(pos) ); - QRect arrowRect = - style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxArrow); - arrowRect = QStyle::visualRect(arrowRect, this); + TQRect arrowRect = + style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxArrow); + arrowRect = TQStyle::visualRect(arrowRect, this); if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { d->arrowDown = TRUE; @@ -918,12 +918,12 @@ bool QComboView::eventFilter( QObject *object, QEvent *event ) } } } else if ((e->state() & ( RightButton | LeftButton | MidButton ) ) == 0 && - style().styleHint(QStyle::SH_ComboBox_ListMouseTracking, this)) { + style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // qWarning("event filter:: emu"); - QWidget *mouseW = QApplication::widgetAt( e->globalPos(), TRUE ); + TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); // if ( mouseW == d->listView()->viewport() ) { //### if ( mouseW == d->listView()->viewport() ) { - QListViewItem *sel = d->listView()->itemAt(e->pos()); + TQListViewItem *sel = d->listView()->itemAt(e->pos()); if (sel) { d->listView()->setCurrentItem(sel); @@ -934,12 +934,12 @@ bool QComboView::eventFilter( QObject *object, QEvent *event ) } break; - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: if ( d->listView()->rect().contains( e->pos() ) ) { - QMouseEvent tmp( QEvent::MouseButtonDblClick, + TQMouseEvent tmp( TQEvent::MouseButtonDblClick, e->pos(), e->button(), e->state() ) ; // will hide popup - QApplication::sendEvent( object, &tmp ); + TQApplication::sendEvent( object, &tmp ); return TRUE; } else { if ( d->mouseWasInsidePopup ) { @@ -953,11 +953,11 @@ bool QComboView::eventFilter( QObject *object, QEvent *event ) } } break; - case QEvent::MouseButtonDblClick: - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseButtonPress: if ( !d->listView()->rect().contains( e->pos() ) ) { - QPoint globalPos = d->listView()->mapToGlobal(e->pos()); - if ( QApplication::widgetAt( globalPos, TRUE ) == this ) { + TQPoint globalPos = d->listView()->mapToGlobal(e->pos()); + if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { d->discardNextMousePress = TRUE; // avoid popping up again } @@ -965,11 +965,11 @@ bool QComboView::eventFilter( QObject *object, QEvent *event ) return TRUE; } break; - case QEvent::KeyPress: - switch( ((QKeyEvent *)event)->key() ) { + case TQEvent::KeyPress: + switch( ((TQKeyEvent *)event)->key() ) { case Key_Up: case Key_Down: - if ( !(((QKeyEvent *)event)->state() & AltButton) ) + if ( !(((TQKeyEvent *)event)->state() & AltButton) ) break; case Key_F4: case Key_Escape: @@ -986,14 +986,14 @@ bool QComboView::eventFilter( QObject *object, QEvent *event ) break; } break; - case QEvent::Hide: + case TQEvent::Hide: popDownListView(); break; default: break; } } - return QWidget::eventFilter( object, event ); + return TQWidget::eventFilter( object, event ); } @@ -1003,10 +1003,10 @@ bool QComboView::eventFilter( QObject *object, QEvent *event ) items start with \a prefix. */ -QListViewItem *QComboView::completionIndex( const QString & prefix, - QListViewItem *startingAt ) const +TQListViewItem *QComboView::completionIndex( const TQString & prefix, + TQListViewItem *startingAt ) const { - QListViewItem *start = startingAt; + TQListViewItem *start = startingAt; /* if ( start < 0 || start >= count() ) start = 0; if ( start >= count() ) @@ -1017,12 +1017,12 @@ QListViewItem *QComboView::completionIndex( const QString & prefix, return 0; /* if (!start->itemBelow()) return 0;*/ - QString match = prefix.lower(); + TQString match = prefix.lower(); if ( match.length() < 1 ) return start; - QString current; - QListViewItem *i = start; + TQString current; + TQListViewItem *i = start; do { current = i->text(0).lower(); if ( current.startsWith( match ) ) @@ -1077,12 +1077,12 @@ void QComboView::setInsertionPolicy( Policy policy ) void QComboView::returnPressed() { - QString s( d->ed->text() ); + TQString s( d->ed->text() ); if ( s.isEmpty() ) return; - QListViewItem *c = 0; + TQListViewItem *c = 0; bool doInsert = TRUE; if ( !d->duplicatesEnabled ) { c = listView()->findItem(s, 0); @@ -1113,11 +1113,11 @@ void QComboView::returnPressed() return; // break; case AtBottom: - c = new QListViewItem(listView(), listView()->lastItem(), s); + c = new TQListViewItem(listView(), listView()->lastItem(), s); break; case BeforeCurrent: if (currentItem() && currentItem()->itemAbove()) - c = new QListViewItem(listView(), currentItem()->itemAbove(), s); + c = new TQListViewItem(listView(), currentItem()->itemAbove(), s); else { c = 0; @@ -1126,7 +1126,7 @@ void QComboView::returnPressed() break; case AfterCurrent: if (currentItem() && currentItem()->itemBelow()) - c = new QListViewItem(listView(), currentItem()->itemBelow(), s); + c = new TQListViewItem(listView(), currentItem()->itemBelow(), s); else { c = 0; @@ -1150,7 +1150,7 @@ void QComboView::returnPressed() void QComboView::setEnabled( bool enable ) { - QWidget::setEnabled( enable ); + TQWidget::setEnabled( enable ); } @@ -1164,7 +1164,7 @@ void QComboView::setEnabled( bool enable ) \sa validator() clearValidator() QValidator */ -void QComboView::setValidator( const QValidator * v ) +void QComboView::setValidator( const TQValidator * v ) { if ( d && d->ed ) d->ed->setValidator( v ); @@ -1178,7 +1178,7 @@ void QComboView::setValidator( const QValidator * v ) \sa setValidator() clearValidator() QValidator */ -const QValidator * QComboView::validator() const +const TQValidator * QComboView::validator() const { return d && d->ed ? d->ed->validator() : 0; } @@ -1205,19 +1205,19 @@ void QComboView::clearValidator() necessary because of the line edit in QComboView. */ -void QComboView::setListView( QListView * newListView ) +void QComboView::setListView( TQListView * newListView ) { clear(); delete d->listView(); - newListView->reparent( this, WType_Popup, QPoint(0,0), FALSE ); + newListView->reparent( this, WType_Popup, TQPoint(0,0), FALSE ); d->setListView( newListView ); d->listView()->setFont( font() ); d->listView()->setPalette( palette() ); -/* d->listView()->setVScrollBarMode(QScrollView::AlwaysOff); - d->listView()->setHScrollBarMode(QScrollView::AlwaysOff);*/ - d->listView()->setFrameStyle( QFrame::Box | QFrame::Plain ); +/* d->listView()->setVScrollBarMode(TQScrollView::AlwaysOff); + d->listView()->setHScrollBarMode(TQScrollView::AlwaysOff);*/ + d->listView()->setFrameStyle( TQFrame::Box | TQFrame::Plain ); d->listView()->setLineWidth( 1 ); /* d->listView()->setRootIsDecorated( true ); d->listView()->setAllColumnsShowFocus(true);*/ @@ -1231,9 +1231,9 @@ void QComboView::setListView( QListView * newListView ) /* d->listView()->setFont( font() ); d->listView()->setPalette( palette() ); - d->listView()->setVScrollBarMode( QScrollView::AlwaysOff ); - d->listView()->setHScrollBarMode( QScrollView::AlwaysOff ); - d->listView()->setFrameStyle( QFrame::Box | QFrame::Plain ); + d->listView()->setVScrollBarMode( TQScrollView::AlwaysOff ); + d->listView()->setHScrollBarMode( TQScrollView::AlwaysOff ); + d->listView()->setFrameStyle( TQFrame::Box | TQFrame::Plain ); d->listView()->setLineWidth( 1 ); d->listView()->setRootIsDecorated( true ); d->listView()->setAllColumnsShowFocus(true); @@ -1241,28 +1241,28 @@ void QComboView::setListView( QListView * newListView ) d->listView()->resize( 100, 10 ); */ - connect( d->listView(), SIGNAL(returnPressed(QListViewItem*)), - SLOT(internalActivate(QListViewItem*))); - connect( d->listView(), SIGNAL(doubleClicked(QListViewItem*)), - SLOT(internalActivate(QListViewItem*))); - connect( d->listView(), SIGNAL(doubleClicked(QListViewItem*)), - SLOT(checkState(QListViewItem*))); - connect( d->listView(), SIGNAL(currentChanged(QListViewItem*)), - SLOT(internalHighlight(QListViewItem*))); - connect( d->listView(), SIGNAL(selectionChanged(QListViewItem*)), - SLOT(internalHighlight(QListViewItem*))); + connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)), + TQT_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), + TQT_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), + TQT_SLOT(checkState(TQListViewItem*))); + connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)), + TQT_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)), + TQT_SLOT(internalHighlight(TQListViewItem*))); } /*! Returns the current list box, or 0 if there is no list box. - (QComboView can use QPopupMenu instead of QListBox.) Provided to + (QComboView can use TQPopupMenu instead of TQListBox.) Provided to match setlistView(). \sa setlistView() */ -QListView * QComboView::listView() const +TQListView * QComboView::listView() const { return d ? d->listView() : 0; } @@ -1272,7 +1272,7 @@ QListView * QComboView::listView() const Only editable listboxes have a line editor. */ -QLineEdit* QComboView::lineEdit() const +TQLineEdit* QComboView::lineEdit() const { return d->ed; } @@ -1309,7 +1309,7 @@ void QComboView::clearEdit() \sa clearEdit() insertItem() */ -void QComboView::setEditText( const QString &newText ) +void QComboView::setEditText( const TQString &newText ) { if ( d && d->ed ) { d->updateLinedGeometry(); @@ -1331,12 +1331,12 @@ bool QComboView::autoCompletion() const /*!reimp */ -void QComboView::styleChange( QStyle& s ) +void QComboView::styleChange( TQStyle& s ) { - d->sizeHint = QSize(); // invalidate size hint... + d->sizeHint = TQSize(); // invalidate size hint... if ( d->ed ) d->updateLinedGeometry(); - QWidget::styleChange( s ); + TQWidget::styleChange( s ); } bool QComboView::editable() const @@ -1367,49 +1367,49 @@ void QComboView::setEditable( bool y ) void QComboView::setUpListView() { - d->setListView( new QListView( this, "in-combo", WType_Popup ) ); + d->setListView( new TQListView( this, "in-combo", WType_Popup ) ); d->listView()->setFont( font() ); d->listView()->setPalette( palette() ); -/* d->listView()->setVScrollBarMode( QScrollView::AlwaysOff ); - d->listView()->setHScrollBarMode( QScrollView::AlwaysOff );*/ - d->listView()->setFrameStyle( QFrame::Box | QFrame::Plain ); +/* d->listView()->setVScrollBarMode( TQScrollView::AlwaysOff ); + d->listView()->setHScrollBarMode( TQScrollView::AlwaysOff );*/ + d->listView()->setFrameStyle( TQFrame::Box | TQFrame::Plain ); d->listView()->setLineWidth( 1 ); d->listView()->setRootIsDecorated( false ); d->listView()->setAllColumnsShowFocus(true); d->listView()->addColumn(""); d->listView()->resize( 100, 10 ); - d->listView()->setResizeMode(QListView::LastColumn); + d->listView()->setResizeMode(TQListView::LastColumn); if (d->listView()->firstChild()) d->current = d->listView()->firstChild(); d->listView()->header()->hide(); - connect( d->listView(), SIGNAL(returnPressed(QListViewItem*)), - SLOT(internalActivate(QListViewItem*))); - connect( d->listView(), SIGNAL(doubleClicked(QListViewItem*)), - SLOT(internalActivate(QListViewItem*))); - connect( d->listView(), SIGNAL(doubleClicked(QListViewItem*)), - SLOT(checkState(QListViewItem*))); - connect( d->listView(), SIGNAL(currentChanged(QListViewItem*)), - SLOT(internalHighlight(QListViewItem*))); - connect( d->listView(), SIGNAL(selectionChanged(QListViewItem*)), - SLOT(internalHighlight(QListViewItem*))); + connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)), + TQT_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), + TQT_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), + TQT_SLOT(checkState(TQListViewItem*))); + connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)), + TQT_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)), + TQT_SLOT(internalHighlight(TQListViewItem*))); } void QComboView::setUpLineEdit() { if ( !d->ed ) - setLineEdit( new QLineEdit( this, "combo edit" ) ); + setLineEdit( new TQLineEdit( this, "combo edit" ) ); } /*! Sets the line edit to use \a edit instead of the current line edit. */ -void QComboView::setLineEdit( QLineEdit *edit ) +void QComboView::setLineEdit( TQLineEdit *edit ) { if ( !edit ) { #if defined(QT_CHECK_NULL) @@ -1431,13 +1431,13 @@ void QComboView::setLineEdit( QLineEdit *edit ) d->ed = edit; if ( edit->parent() != this ) { - edit->reparent( this, QPoint(0,0), FALSE ); + edit->reparent( this, TQPoint(0,0), FALSE ); edit->setFont( font() ); } - connect (edit, SIGNAL( textChanged( const QString& ) ), - this, SIGNAL( textChanged( const QString& ) ) ); - connect( edit, SIGNAL(returnPressed()), SLOT(returnPressed()) ); + connect (edit, TQT_SIGNAL( textChanged( const TQString& ) ), + this, TQT_SIGNAL( textChanged( const TQString& ) ) ); + connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); edit->setFrame( FALSE ); d->updateLinedGeometry(); @@ -1454,9 +1454,9 @@ void QComboView::setLineEdit( QLineEdit *edit ) update(); } -void QComboView::setCurrentText( const QString& txt ) +void QComboView::setCurrentText( const TQString& txt ) { - QListViewItem *i; + TQListViewItem *i; i = listView()->findItem(txt, 0); if ( i ) setCurrentItem( i ); @@ -1466,12 +1466,12 @@ void QComboView::setCurrentText( const QString& txt ) currentItem()->setText(0, txt); } -void QComboView::checkState( QListViewItem * item) +void QComboView::checkState( TQListViewItem * item) { item->setOpen(!item->isOpen()); } -void QComboView::setCurrentActiveItem( QListViewItem * item ) +void QComboView::setCurrentActiveItem( TQListViewItem * item ) { if ( item == d->current && !d->ed ) { return; diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index 8f618f50..b918df1f 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -17,7 +17,7 @@ #define QCOMBOVIEW_H #ifndef QT_H -#include "qwidget.h" +#include "tqwidget.h" #endif // QT_H #ifndef QT_NO_COMBOBOX @@ -36,9 +36,9 @@ class QListViewItem; class QComboViewData; /** -QComboView - a combo with a QListView as a popup widget. +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 QComboBox and have similar API. +in the same way as TQComboBox and have similar API. */ class Q_EXPORT QComboView : public QWidget { @@ -46,8 +46,8 @@ class Q_EXPORT QComboView : public QWidget Q_ENUMS( Policy ) Q_PROPERTY( bool editable READ editable WRITE setEditable ) // Q_PROPERTY( int count READ count ) - Q_PROPERTY( QString currentText READ currentText WRITE setCurrentText DESIGNABLE false ) -// Q_PROPERTY( QListView *currentItem READ currentItem WRITE setCurrentItem ) + 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 ) @@ -57,22 +57,22 @@ class Q_EXPORT QComboView : public QWidget Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: -// QComboView( QWidget* parent=0, const char* name=0 ); - QComboView( bool rw, QWidget* parent=0, const char* name=0 ); +// QComboView( TQWidget* parent=0, const char* name=0 ); + QComboView( bool rw, TQWidget* parent=0, const char* name=0 ); ~QComboView(); int childCount() const; - QListViewItem *currentItem() const; - virtual void setCurrentItem( QListViewItem * ); - virtual void setCurrentActiveItem( QListViewItem * ); + TQListViewItem *currentItem() const; + virtual void setCurrentItem( TQListViewItem * ); + virtual void setCurrentActiveItem( TQListViewItem * ); bool autoResize() const; virtual void setAutoResize( bool ); QSize sizeHint() const; - void setPalette( const QPalette & ); - void setFont( const QFont & ); + void setPalette( const TQPalette & ); + void setFont( const TQFont & ); void setEnabled( bool ); virtual void setSizeLimit( int ); @@ -87,19 +87,19 @@ public: virtual void setInsertionPolicy( Policy policy ); Policy insertionPolicy() const; - virtual void setValidator( const QValidator * ); - const QValidator * validator() const; + virtual void setValidator( const TQValidator * ); + const TQValidator * validator() const; - virtual void setListView( QListView * ); - QListView * listView() const; + virtual void setListView( TQListView * ); + TQListView * listView() const; - virtual void setLineEdit( QLineEdit *edit ); - QLineEdit* lineEdit() const; + virtual void setLineEdit( TQLineEdit *edit ); + TQLineEdit* lineEdit() const; virtual void setAutoCompletion( bool ); bool autoCompletion() const; - bool eventFilter( QObject *object, QEvent *event ); + bool eventFilter( TQObject *object, TQEvent *event ); void setDuplicatesEnabled( bool enable ); bool duplicatesEnabled() const; @@ -109,43 +109,43 @@ public: virtual void popup(); - QString currentText() const; - void setCurrentText( const QString& ); + TQString currentText() const; + void setCurrentText( const TQString& ); public slots: virtual void clear(); void clearValidator(); void clearEdit(); - virtual void setEditText( const QString &); + virtual void setEditText( const TQString &); signals: - void activated( QListViewItem * item ); - void highlighted( QListViewItem * item ); - void activated( const QString &); - void highlighted( const QString &); - void textChanged( const QString &); + void activated( TQListViewItem * item ); + void highlighted( TQListViewItem * item ); + void activated( const TQString &); + void highlighted( const TQString &); + void textChanged( const TQString &); void focusGranted(); void focusLost(); private slots: - void internalActivate( QListViewItem * ); - void internalHighlight( QListViewItem * ); + void internalActivate( TQListViewItem * ); + void internalHighlight( TQListViewItem * ); void internalClickTimeout(); void returnPressed(); - void checkState(QListViewItem*); + void checkState(TQListViewItem*); protected: - void paintEvent( QPaintEvent * ); - void resizeEvent( QResizeEvent * ); - void mousePressEvent( QMouseEvent * ); - void mouseMoveEvent( QMouseEvent * ); - void mouseReleaseEvent( QMouseEvent * ); - void mouseDoubleClickEvent( QMouseEvent * ); - void keyPressEvent( QKeyEvent *e ); - void focusInEvent( QFocusEvent *e ); - void focusOutEvent( QFocusEvent *e ); - void wheelEvent( QWheelEvent *e ); - void styleChange( QStyle& ); + void paintEvent( TQPaintEvent * ); + void resizeEvent( TQResizeEvent * ); + void mousePressEvent( TQMouseEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void mouseReleaseEvent( TQMouseEvent * ); + void mouseDoubleClickEvent( TQMouseEvent * ); + void keyPressEvent( TQKeyEvent *e ); + void focusInEvent( TQFocusEvent *e ); + void focusOutEvent( TQFocusEvent *e ); + void wheelEvent( TQWheelEvent *e ); + void styleChange( TQStyle& ); void updateMask(); @@ -155,7 +155,7 @@ private: void popDownListView(); void reIndex(); void currentChanged(); - QListViewItem *completionIndex( const QString &, QListViewItem * ) const; + TQListViewItem *completionIndex( const TQString &, TQListViewItem * ) const; QComboViewData *d; diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp index 7d7ecb39..6ca7e239 100644 --- a/lib/widgets/resizablecombo.cpp +++ b/lib/widgets/resizablecombo.cpp @@ -20,11 +20,11 @@ #include "kcomboview.h" -#include <qevent.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <qwhatsthis.h> +#include <tqevent.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqapplication.h> +#include <tqwhatsthis.h> #include <klocale.h> @@ -51,43 +51,43 @@ static const char * resize_xpm[] = { " . ", " "}; -ResizableCombo::ResizableCombo(KComboView *view, QWidget *parent, const char *name): - QWidget(parent, name), m_sizer(0), m_combo(view) +ResizableCombo::ResizableCombo(KComboView *view, TQWidget *parent, const char *name): + TQWidget(parent, name), m_sizer(0), m_combo(view) { - QHBoxLayout *l = new QHBoxLayout(this); - view->reparent(this, QPoint(0,0)); + TQHBoxLayout *l = new TQHBoxLayout(this); + view->reparent(this, TQPoint(0,0)); l->addWidget(view); m_sizer = new MyPushButton(this); - m_sizer->setPixmap(QPixmap(resize_xpm)); - QWhatsThis::add(m_sizer, i18n("Drag this to resize the combobox.")); + m_sizer->setPixmap(TQPixmap(resize_xpm)); + TQWhatsThis::add(m_sizer, i18n("Drag this to resize the combobox.")); l->addWidget(m_sizer); } -void MyPushButton::mousePressEvent( QMouseEvent * e ) +void MyPushButton::mousePressEvent( TQMouseEvent * e ) { m_resizing = true; m_pressedPos = e->globalPos(); m_width = m_combo->m_combo->width(); - QPushButton::mousePressEvent(e); + TQPushButton::mousePressEvent(e); } -void MyPushButton::mouseReleaseEvent( QMouseEvent * e ) +void MyPushButton::mouseReleaseEvent( TQMouseEvent * e ) { m_resizing = false; - QPushButton::mouseReleaseEvent(e); + TQPushButton::mouseReleaseEvent(e); } -void MyPushButton::mouseMoveEvent( QMouseEvent * e ) +void MyPushButton::mouseMoveEvent( TQMouseEvent * e ) { if (m_resizing) m_combo->m_combo->setMinimumWidth(m_width + e->globalPos().x() - pressedPos().x()); - QPushButton::mouseMoveEvent(e); + TQPushButton::mouseMoveEvent(e); } MyPushButton::MyPushButton( ResizableCombo * parent, const char * name ) - :QPushButton(parent, name), m_resizing(false), m_combo(parent) + :TQPushButton(parent, name), m_resizing(false), m_combo(parent) { setFocusPolicy(NoFocus); setFlat(true); diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h index 5c417378..b76b4f7e 100644 --- a/lib/widgets/resizablecombo.h +++ b/lib/widgets/resizablecombo.h @@ -19,8 +19,8 @@ #ifndef RESIZABLECOMBO_H #define RESIZABLECOMBO_H -#include <qpushbutton.h> -#include <qpoint.h> +#include <tqpushbutton.h> +#include <tqpoint.h> class KComboView; class QMouseEvent; @@ -38,7 +38,7 @@ Used to place resizable KComboBox onto toolbars. class ResizableCombo: public QWidget{ Q_OBJECT public: - ResizableCombo(KComboView *view, QWidget *parent = 0, const char *name = 0); + ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0); private: MyPushButton *m_sizer; @@ -52,19 +52,19 @@ class MyPushButton: public QPushButton public: MyPushButton(ResizableCombo *parent = 0, const char *name = 0 ); - QPoint pressedPos() + TQPoint pressedPos() { return m_pressedPos; } protected: - virtual void mouseReleaseEvent ( QMouseEvent * e ); - virtual void mousePressEvent ( QMouseEvent * e ); - virtual void mouseMoveEvent ( QMouseEvent * e ); + virtual void mouseReleaseEvent ( TQMouseEvent * e ); + virtual void mousePressEvent ( TQMouseEvent * e ); + virtual void mouseMoveEvent ( TQMouseEvent * e ); private: bool m_resizing; - QPoint m_pressedPos; + TQPoint m_pressedPos; int m_width; ResizableCombo *m_combo; }; |