diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:56:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:56:07 +0000 |
| commit | d6f8bbb45b267065a6907e71ff9c98bb6d161241 (patch) | |
| tree | d109539636691d7b03036ca1c0ed29dbae6577cf /lib/interfaces | |
| parent | 3331a47a9cad24795c7440ee8107143ce444ef34 (diff) | |
| download | tdevelop-d6f8bbb45b267065a6907e71ff9c98bb6d161241.tar.gz tdevelop-d6f8bbb45b267065a6907e71ff9c98bb6d161241.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/interfaces')
57 files changed, 758 insertions, 758 deletions
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; |