diff options
Diffstat (limited to 'languages/cpp')
272 files changed, 5940 insertions, 5940 deletions
diff --git a/languages/cpp/KDevCppSupportIface.cpp b/languages/cpp/KDevCppSupportIface.cpp index f5af83c9..793516ca 100644 --- a/languages/cpp/KDevCppSupportIface.cpp +++ b/languages/cpp/KDevCppSupportIface.cpp @@ -3,7 +3,7 @@ #include "cppsupportpart.h" KDevCppSupportIface::KDevCppSupportIface( CppSupportPart* cppSupport ) - : QObject( cppSupport ), DCOPObject( "KDevCppSupport" ), m_cppSupport( cppSupport ) + : TQObject( cppSupport ), DCOPObject( "KDevCppSupport" ), m_cppSupport( cppSupport ) { } diff --git a/languages/cpp/KDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h index 34780d8c..8aed7e94 100644 --- a/languages/cpp/KDevCppSupportIface.h +++ b/languages/cpp/KDevCppSupportIface.h @@ -2,12 +2,12 @@ #ifndef KDEVCPPSUPPORTIFACE_H #define KDEVCPPSUPPORTIFACE_H -#include <qobject.h> +#include <tqobject.h> #include <dcopobject.h> class CppSupportPart; -class KDevCppSupportIface : public QObject, public DCOPObject +class KDevCppSupportIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 7f5712a2..42031f59 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -32,24 +32,24 @@ #include <ktexteditor/editinterface.h> #include <klineedit.h> -#include <qfileinfo.h> -#include <qcombobox.h> -#include <qlistview.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qtextstream.h> +#include <tqfileinfo.h> +#include <tqcombobox.h> +#include <tqlistview.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqtextstream.h> AddAttributeDialog::AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - QWidget* parent, const char* name, bool modal, WFlags fl ) + TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddAttributeDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { - access->insertStringList( QStringList() << "Public" << "Protected" << "Private" ); + access->insertStringList( TQStringList() << "Public" << "Protected" << "Private" ); - storage->insertStringList( QStringList() << "Normal" << "Static" ); + storage->insertStringList( TQStringList() << "Normal" << "Static" ); returnType->setAutoCompletion( true ); - returnType->insertStringList( QStringList() + returnType->insertStringList( TQStringList() << "void" << "char" << "wchar_t" @@ -73,7 +73,7 @@ AddAttributeDialog::~AddAttributeDialog() void AddAttributeDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } void AddAttributeDialog::accept() @@ -83,7 +83,7 @@ void AddAttributeDialog::accept() if ( !editIface ) { /// @todo show messagebox - QDialog::accept(); + TQDialog::accept(); return ; } @@ -91,15 +91,15 @@ void AddAttributeDialog::accept() m_klass->getEndPosition( &line, &column ); // compute the insertion point map - QMap<QString, QPair<int, int> > points; - QStringList accessList; + TQMap<TQString, QPair<int, int> > points; + TQStringList accessList; const VariableList variableList = m_klass->variableList(); for ( VariableList::ConstIterator it = variableList.begin(); it != variableList.end(); ++it ) { int varEndLine, varEndColumn; ( *it ) ->getEndPosition( &varEndLine, &varEndColumn ); - QString access = accessID( *it ); + TQString access = accessID( *it ); QPair<int, int> varEndPoint = qMakePair( varEndLine, varEndColumn ); if ( !points.contains( access ) || points[ access ] < varEndPoint ) @@ -115,21 +115,21 @@ void AddAttributeDialog::accept() accessList += newAccessList( accessList ); - for ( QStringList::iterator it = accessList.begin(); it != accessList.end(); ++it ) + for ( TQStringList::iterator it = accessList.begin(); it != accessList.end(); ++it ) { - QListViewItem* item = attributes->firstChild(); + TQListViewItem* item = attributes->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); if ( currentItem->text( 0 ) != *it ) continue; - QString access = ( *it ).lower(); + TQString access = ( *it ).lower(); - QString str = variableDeclaration( currentItem ); + TQString str = variableDeclaration( currentItem ); QPair<int, int> pt; if ( points.contains( *it ) ) @@ -144,21 +144,21 @@ void AddAttributeDialog::accept() } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( QChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); } } m_cppSupport->backgroundParser() ->addFile( m_klass->fileName() ); - QDialog::accept(); + TQDialog::accept(); } -QString AddAttributeDialog::variableDeclaration( QListViewItem* item ) const +TQString AddAttributeDialog::variableDeclaration( TQListViewItem* item ) const { - QString str; - QTextStream stream( &str, IO_WriteOnly ); - QString ind; - ind.fill( QChar( ' ' ), 4 ); + TQString str; + TQTextStream stream( &str, IO_WriteOnly ); + TQString ind; + ind.fill( TQChar( ' ' ), 4 ); stream << ind; if ( item->text( 1 ) == "Static" ) @@ -183,7 +183,7 @@ void AddAttributeDialog::updateGUI() if ( enable ) { - QListViewItem * item = attributes->selectedItem(); + TQListViewItem * item = attributes->selectedItem(); item->setText( 0, access->currentText() ); item->setText( 1, storage->currentText() ); item->setText( 2, returnType->currentText() ); @@ -193,8 +193,8 @@ void AddAttributeDialog::updateGUI() void AddAttributeDialog::addAttribute() { - QListViewItem * item = new QListViewItem( attributes, "Protected", "Normal", - "int", QString( "attribute_%1" ).arg( ++m_count ) ); + TQListViewItem * item = new TQListViewItem( attributes, "Protected", "Normal", + "int", TQString( "attribute_%1" ).arg( ++m_count ) ); attributes->setCurrentItem( item ); attributes->setSelected( item, true ); @@ -206,14 +206,14 @@ void AddAttributeDialog::deleteCurrentAttribute() delete( attributes->currentItem() ); } -void AddAttributeDialog::currentChanged( QListViewItem* item ) +void AddAttributeDialog::currentChanged( TQListViewItem* item ) { if ( item ) { - QString _access = item->text( 0 ); - QString _storage = item->text( 1 ); - QString _returnType = item->text( 2 ); - QString _declarator = item->text( 3 ); + TQString _access = item->text( 0 ); + TQString _storage = item->text( 1 ); + TQString _returnType = item->text( 2 ); + TQString _declarator = item->text( 3 ); access->setCurrentText( _access ); storage->setCurrentText( _storage ); @@ -224,18 +224,18 @@ void AddAttributeDialog::currentChanged( QListViewItem* item ) updateGUI(); } -QStringList AddAttributeDialog::newAccessList( const QStringList& accessList ) const +TQStringList AddAttributeDialog::newAccessList( const TQStringList& accessList ) const { - QStringList newAccessList; + TQStringList newAccessList; - QListViewItem* item = attributes->firstChild(); + TQListViewItem* item = attributes->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); - QString access = currentItem->text( 0 ); + TQString access = currentItem->text( 0 ); if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) ) newAccessList.push_back( access ); } @@ -243,21 +243,21 @@ QStringList AddAttributeDialog::newAccessList( const QStringList& accessList ) c return newAccessList; } -QString AddAttributeDialog::accessID( VariableDom var ) const +TQString AddAttributeDialog::accessID( VariableDom var ) const { switch ( var->access() ) { case CodeModelItem::Public: - return QString::fromLatin1( "Public" ); + return TQString::fromLatin1( "Public" ); case CodeModelItem::Protected: - return QString::fromLatin1( "Protected" ); + return TQString::fromLatin1( "Protected" ); case CodeModelItem::Private: - return QString::fromLatin1( "Private" ); + return TQString::fromLatin1( "Private" ); } - return QString::null; + return TQString::null; } #include "addattributedialog.moc" diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index 8e160f2a..54d917b1 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -31,12 +31,12 @@ class AddAttributeDialog : public AddAttributeDialogBase Q_OBJECT public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddAttributeDialog(); virtual void addAttribute(); virtual void deleteCurrentAttribute(); - virtual void currentChanged( QListViewItem* item ); + virtual void currentChanged( TQListViewItem* item ); virtual void updateGUI(); protected: @@ -44,9 +44,9 @@ protected: virtual void accept(); private: - QString accessID( VariableDom var ) const; - QStringList newAccessList( const QStringList& accessList ) const; - QString variableDeclaration( QListViewItem* item ) const; + TQString accessID( VariableDom var ) const; + TQStringList newAccessList( const TQStringList& accessList ) const; + TQString variableDeclaration( TQListViewItem* item ) const; private: CppSupportPart* m_cppSupport; diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index 2b53868c..ae4e1738 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -34,28 +34,28 @@ #include <kdebug.h> #include <klineedit.h> -#include <qregexp.h> -#include <qfileinfo.h> -#include <qcombobox.h> -#include <qlistview.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qtextstream.h> +#include <tqregexp.h> +#include <tqfileinfo.h> +#include <tqcombobox.h> +#include <tqlistview.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqtextstream.h> AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - QWidget* parent, const char* name, bool modal, WFlags fl ) + TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddMethodDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { - QString fileName = m_klass->fileName(); + TQString fileName = m_klass->fileName(); - access->insertStringList( QStringList() << "Public" << "Protected" << "Private" << "Signals" << + access->insertStringList( TQStringList() << "Public" << "Protected" << "Private" << "Signals" << "Public Slots" << "Protected Slots" << "Private Slots" ); - storage->insertStringList( QStringList() << "Normal" << "Static" << "Virtual" << "Pure Virtual" << "Friend" ); + storage->insertStringList( TQStringList() << "Normal" << "Static" << "Virtual" << "Pure Virtual" << "Friend" ); // setup sourceFile combo - QMap<QString, bool> m; + TQMap<TQString, bool> m; #if 0 /// \FIXME ROBE FunctionList l = m_klass->functionList(); @@ -69,12 +69,12 @@ AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, #endif { - QStringList headers = QStringList::split( ",", "h,H,hh,hxx,hpp,inl,tlh,diff,ui.h" ); - QStringList fileList; - QMap<QString, bool>::Iterator it = m.begin(); + TQStringList headers = TQStringList::split( ",", "h,H,hh,hxx,hpp,inl,tlh,diff,ui.h" ); + TQStringList fileList; + TQMap<TQString, bool>::Iterator it = m.begin(); while ( it != m.end() ) { - QString ext = QFileInfo( it.key() ).extension(); + TQString ext = TQFileInfo( it.key() ).extension(); if ( !headers.contains( ext ) ) sourceFile->insertItem( it.key() ); ++it; @@ -82,14 +82,14 @@ AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, if ( sourceFile->count() == 0 ) { - QFileInfo info( fileName ); - QString impl = DomUtil::readEntry( *cppSupport->projectDom(), "/cppsupportpart/filetemplates/implementationsuffix", "cpp" ); + TQFileInfo info( fileName ); + TQString impl = DomUtil::readEntry( *cppSupport->projectDom(), "/cppsupportpart/filetemplates/implementationsuffix", "cpp" ); sourceFile->insertItem( info.dirPath( true ) + "/" + info.baseName() + impl ); } } returnType->setAutoCompletion( true ); - returnType->insertStringList( QStringList() + returnType->insertStringList( TQStringList() << "void" << "char" << "wchar_t" @@ -113,33 +113,33 @@ AddMethodDialog::~AddMethodDialog() void AddMethodDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } -QString AddMethodDialog::accessID( FunctionDom fun ) const +TQString AddMethodDialog::accessID( FunctionDom fun ) const { if ( fun->isSignal() ) - return QString::fromLatin1( "Signals" ); + return TQString::fromLatin1( "Signals" ); switch ( fun->access() ) { case CodeModelItem::Public: if ( fun->isSlot() ) - return QString::fromLatin1( "Public Slots" ); - return QString::fromLatin1( "Public" ); + return TQString::fromLatin1( "Public Slots" ); + return TQString::fromLatin1( "Public" ); case CodeModelItem::Protected: if ( fun->isSlot() ) - return QString::fromLatin1( "Protected Slots" ); - return QString::fromLatin1( "Protected" ); + return TQString::fromLatin1( "Protected Slots" ); + return TQString::fromLatin1( "Protected" ); case CodeModelItem::Private: if ( fun->isSlot() ) - return QString::fromLatin1( "Private Slots" ); - return QString::fromLatin1( "Private" ); + return TQString::fromLatin1( "Private Slots" ); + return TQString::fromLatin1( "Private" ); } - return QString::null; + return TQString::null; } void AddMethodDialog::accept() @@ -149,7 +149,7 @@ void AddMethodDialog::accept() if ( !editIface ) { /// @todo show messagebox - QDialog::accept(); + TQDialog::accept(); return ; } @@ -157,15 +157,15 @@ void AddMethodDialog::accept() m_klass->getEndPosition( &line, &column ); // compute the insertion point map - QMap<QString, QPair<int, int> > points; - QStringList accessList; + TQMap<TQString, QPair<int, int> > points; + TQStringList accessList; const FunctionList functionList = m_klass->functionList(); for ( FunctionList::ConstIterator it = functionList.begin(); it != functionList.end(); ++it ) { int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); - QString access = accessID( *it ); + TQString access = accessID( *it ); QPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) @@ -181,22 +181,22 @@ void AddMethodDialog::accept() accessList += newAccessList( accessList ); - for ( QStringList::iterator it = accessList.begin(); it != accessList.end(); ++it ) + for ( TQStringList::iterator it = accessList.begin(); it != accessList.end(); ++it ) { - QListViewItem* item = methods->firstChild(); + TQListViewItem* item = methods->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); if ( currentItem->text( 1 ) != *it ) continue; - QString access = ( *it ).lower(); + TQString access = ( *it ).lower(); bool isInline = currentItem->text( 0 ) == "True"; - QString str = isInline ? functionDefinition( currentItem ) : functionDeclaration( currentItem ); + TQString str = isInline ? functionDefinition( currentItem ) : functionDeclaration( currentItem ); QPair<int, int> pt; if ( points.contains( *it ) ) @@ -211,30 +211,30 @@ void AddMethodDialog::accept() } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( QChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); } } m_cppSupport->backgroundParser() ->addFile( m_klass->fileName() ); - QString str; - QListViewItem* item = methods->firstChild(); + TQString str; + TQListViewItem* item = methods->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); - QString str = functionDefinition( currentItem ); + TQString str = functionDefinition( currentItem ); if ( str.isEmpty() ) continue; - QString implementationFile = currentItem->text( 5 ); + TQString implementationFile = currentItem->text( 5 ); if ( currentItem->text( 0 ) == "True" ) implementationFile = m_klass->fileName(); - QFileInfo fileInfo( implementationFile ); - if ( !QFile::exists( fileInfo.absFilePath() ) ) + TQFileInfo fileInfo( implementationFile ); + if ( !TQFile::exists( fileInfo.absFilePath() ) ) { if ( KDevCreateFile * createFileSupp = m_cppSupport->extension<KDevCreateFile>( "KDevelop/CreateFile" ) ) createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() ); @@ -248,13 +248,13 @@ void AddMethodDialog::accept() bool isInline = currentItem->text( 0 ) == "True"; if ( !isInline ) { - editIface->insertLine( editIface->numLines(), QString::fromLatin1( "" ) ); + editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) ); editIface->insertText( editIface->numLines() - 1, 0, str ); m_cppSupport->backgroundParser() ->addFile( implementationFile ); } } - QDialog::accept(); + TQDialog::accept(); } void AddMethodDialog::updateGUI() @@ -274,7 +274,7 @@ void AddMethodDialog::updateGUI() if ( enable ) { - QListViewItem * item = methods->selectedItem(); + TQListViewItem * item = methods->selectedItem(); item->setText( 0, isInline->isChecked() ? "True" : "False" ); item->setText( 1, access->currentText() ); item->setText( 2, storage->currentText() ); @@ -292,8 +292,8 @@ void AddMethodDialog::updateGUI() void AddMethodDialog::addMethod() { - QListViewItem * item = new QListViewItem( methods, "False", "Public", "Normal", - "void", QString( "method_%1()" ).arg( ++m_count ), + TQListViewItem * item = new TQListViewItem( methods, "False", "Public", "Normal", + "void", TQString( "method_%1()" ).arg( ++m_count ), sourceFile->currentText() ); methods->setCurrentItem( item ); methods->setSelected( item, true ); @@ -307,16 +307,16 @@ void AddMethodDialog::deleteCurrentMethod() updateGUI(); } -void AddMethodDialog::currentChanged( QListViewItem* item ) +void AddMethodDialog::currentChanged( TQListViewItem* item ) { if ( item ) { - QString _isInline = item->text( 0 ); - QString _access = item->text( 1 ); - QString _storage = item->text( 2 ); - QString _returnType = item->text( 3 ); - QString _declarator = item->text( 4 ); - QString _sourceFile = item->text( 5 ); + TQString _isInline = item->text( 0 ); + TQString _access = item->text( 1 ); + TQString _storage = item->text( 2 ); + TQString _returnType = item->text( 3 ); + TQString _declarator = item->text( 4 ); + TQString _sourceFile = item->text( 5 ); isInline->setChecked( _isInline == "True" ? true : false ); access->setCurrentText( _access ); @@ -331,17 +331,17 @@ void AddMethodDialog::currentChanged( QListViewItem* item ) void AddMethodDialog::browseImplementationFile() { - QString fileName = KFileDialog::getOpenFileName(); + TQString fileName = KFileDialog::getOpenFileName(); sourceFile->setCurrentText( fileName ); updateGUI(); } -QString AddMethodDialog::functionDeclaration( QListViewItem * item ) const +TQString AddMethodDialog::functionDeclaration( TQListViewItem * item ) const { - QString str; - QTextStream stream( &str, IO_WriteOnly ); + TQString str; + TQTextStream stream( &str, IO_WriteOnly ); - QString access = item->text( 1 ).lower(); + TQString access = item->text( 1 ).lower(); stream << " "; /// @todo use AStyle if ( item->text( 2 ) == "Virtual" || item->text( 2 ) == "Pure Virtual" ) @@ -358,28 +358,28 @@ QString AddMethodDialog::functionDeclaration( QListViewItem * item ) const return str; } -QString AddMethodDialog::functionDefinition( QListViewItem* item ) const +TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const { if ( item->text( 1 ) == "Signals" || item->text( 2 ) == "Pure Virtual" || item->text( 2 ) == "Friend" ) { - return QString::null; + return TQString::null; } - QString className = m_klass->name(); - QString fullName = m_klass->scope().join( "::" ); + TQString className = m_klass->name(); + TQString fullName = m_klass->scope().join( "::" ); if ( !fullName.isEmpty() ) fullName += "::"; fullName += className; - QString str; - QTextStream stream( &str, IO_WriteOnly ); + TQString str; + TQTextStream stream( &str, IO_WriteOnly ); bool isInline = item->text( 0 ) == "True"; - QString ind; + TQString ind; if ( isInline ) - ind.fill( QChar( ' ' ), 4 ); + ind.fill( TQChar( ' ' ), 4 ); stream << "\n" << ind << "/*!\n" @@ -387,7 +387,7 @@ QString AddMethodDialog::functionDefinition( QListViewItem* item ) const << ind << " */\n"; stream - << ind << item->text( 3 ) << " " << ( isInline ? QString::fromLatin1( "" ) : fullName + "::" ) + << ind << item->text( 3 ) << " " << ( isInline ? TQString::fromLatin1( "" ) : fullName + "::" ) << item->text( 4 ) << "\n" << ind << "{\n" << ind << " /// @todo implement me\n" @@ -396,18 +396,18 @@ QString AddMethodDialog::functionDefinition( QListViewItem* item ) const return str; } -QStringList AddMethodDialog::newAccessList( const QStringList& accessList ) const +TQStringList AddMethodDialog::newAccessList( const TQStringList& accessList ) const { - QStringList newAccessList; + TQStringList newAccessList; - QListViewItem* item = methods->firstChild(); + TQListViewItem* item = methods->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); - QString access = currentItem->text( 1 ); + TQString access = currentItem->text( 1 ); if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) ) newAccessList.push_back( access ); } diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index 0b196c19..badfe537 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -31,12 +31,12 @@ class AddMethodDialog : public AddMethodDialogBase Q_OBJECT public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddMethodDialog(); virtual void addMethod(); virtual void deleteCurrentMethod(); - virtual void currentChanged( QListViewItem* item ); + virtual void currentChanged( TQListViewItem* item ); virtual void updateGUI(); virtual void browseImplementationFile(); @@ -45,10 +45,10 @@ protected: virtual void accept(); private: - QString accessID( FunctionDom fun ) const; - QString functionDeclaration( QListViewItem* item ) const; - QString functionDefinition( QListViewItem* item ) const; - QStringList newAccessList( const QStringList& accessList ) const; + TQString accessID( FunctionDom fun ) const; + TQString functionDeclaration( TQListViewItem* item ) const; + TQString functionDefinition( TQListViewItem* item ) const; + TQStringList newAccessList( const TQStringList& accessList ) const; private: CppSupportPart* m_cppSupport; diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index 841f88d4..973aee2c 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -2,120 +2,120 @@ #include "%{APPNAMELC}.h" -#include <qimage.h> -#include <qpixmap.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> -#include <qpopupmenu.h> -#include <qmenubar.h> -#include <qtextedit.h> -#include <qfile.h> -#include <qfiledialog.h> -#include <qstatusbar.h> -#include <qmessagebox.h> -#include <qprinter.h> -#include <qapplication.h> -#include <qaccel.h> -#include <qtextstream.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qwhatsthis.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqtoolbar.h> +#include <tqtoolbutton.h> +#include <tqpopupmenu.h> +#include <tqmenubar.h> +#include <tqtextedit.h> +#include <tqfile.h> +#include <tqfiledialog.h> +#include <tqstatusbar.h> +#include <tqmessagebox.h> +#include <tqprinter.h> +#include <tqapplication.h> +#include <tqaccel.h> +#include <tqtextstream.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqwhatsthis.h> #include "filesave.xpm" #include "fileopen.xpm" #include "fileprint.xpm" %{APPNAME}::%{APPNAME}() - : QMainWindow( 0, "%{APPNAME}", WDestructiveClose ) + : TQMainWindow( 0, "%{APPNAME}", WDestructiveClose ) { printer = new QPrinter; - QPixmap openIcon, saveIcon, printIcon; + TQPixmap openIcon, saveIcon, printIcon; - QToolBar * fileTools = new QToolBar( this, "file operations" ); + TQToolBar * fileTools = new TQToolBar( this, "file operations" ); fileTools->setLabel( tr("File Operations") ); - openIcon = QPixmap( fileopen ); - QToolButton * fileOpen - = new QToolButton( openIcon, tr("Open File"), QString::null, - this, SLOT(choose()), fileTools, "open file" ); + openIcon = TQPixmap( fileopen ); + TQToolButton * fileOpen + = new TQToolButton( openIcon, tr("Open File"), TQString::null, + this, TQT_SLOT(choose()), fileTools, "open file" ); - saveIcon = QPixmap( filesave ); - QToolButton * fileSave - = new QToolButton( saveIcon, tr("Save File"), QString::null, - this, SLOT(save()), fileTools, "save file" ); + saveIcon = TQPixmap( filesave ); + TQToolButton * fileSave + = new TQToolButton( saveIcon, tr("Save File"), TQString::null, + this, TQT_SLOT(save()), fileTools, "save file" ); - printIcon = QPixmap( fileprint ); - QToolButton * filePrint - = new QToolButton( printIcon, tr("Print File"), QString::null, - this, SLOT(print()), fileTools, "print file" ); + printIcon = TQPixmap( fileprint ); + TQToolButton * filePrint + = new TQToolButton( printIcon, tr("Print File"), TQString::null, + this, TQT_SLOT(print()), fileTools, "print file" ); - (void)QWhatsThis::whatsThisButton( fileTools ); + (void)TQWhatsThis::whatsThisButton( fileTools ); - QString fileOpenText = tr("<p><img source=\"fileopen\"> " + TQString fileOpenText = tr("<p><img source=\"fileopen\"> " "Click this button to open a <em>new file</em>. <br>" "You can also select the <b>Open</b> command " "from the <b>File</b> menu.</p>"); - QWhatsThis::add( fileOpen, fileOpenText ); + TQWhatsThis::add( fileOpen, fileOpenText ); - QMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); + TQMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); - QString fileSaveText = tr("<p>Click this button to save the file you " + TQString fileSaveText = tr("<p>Click this button to save the file you " "are editing. You will be prompted for a file name.\n" "You can also select the <b>Save</b> command " "from the <b>File</b> menu.</p>"); - QWhatsThis::add( fileSave, fileSaveText ); + TQWhatsThis::add( fileSave, fileSaveText ); - QString filePrintText = tr("Click this button to print the file you " + TQString filePrintText = tr("Click this button to print the file you " "are editing.\n You can also select the Print " "command from the File menu."); - QWhatsThis::add( filePrint, filePrintText ); + TQWhatsThis::add( filePrint, filePrintText ); - QPopupMenu * file = new QPopupMenu( this ); + TQPopupMenu * file = new TQPopupMenu( this ); menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, SLOT(choose()), CTRL+Key_O ); + this, TQT_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, SLOT(save()), CTRL+Key_S ); + this, TQT_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, SLOT(print()), CTRL+Key_P ); + this, TQT_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), qApp, SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); - QPopupMenu * help = new QPopupMenu( this ); + TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, SLOT(about()), Key_F1 ); - help->insertItem( tr("About &Qt"), this, SLOT(aboutQt()) ); + help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); - e = new QTextEdit( this, "editor" ); + e = new TQTextEdit( this, "editor" ); e->setFocus(); setCentralWidget( e ); statusBar()->message( tr("Ready"), 2000 ); @@ -140,7 +140,7 @@ void %{APPNAME}::newDoc() void %{APPNAME}::choose() { - QString fn = QFileDialog::getOpenFileName( QString::null, QString::null, + TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this); if ( !fn.isEmpty() ) load( fn ); @@ -149,13 +149,13 @@ void %{APPNAME}::choose() } -void %{APPNAME}::load( const QString &fileName ) +void %{APPNAME}::load( const TQString &fileName ) { - QFile f( fileName ); + TQFile f( fileName ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); + TQTextStream ts( &f ); e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); @@ -170,15 +170,15 @@ void %{APPNAME}::save() return; } - QString text = e->text(); - QFile f( filename ); + TQString text = e->text(); + TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { statusBar()->message( tr("Could not write to %1").arg(filename), 2000 ); return; } - QTextStream t( &f ); + TQTextStream t( &f ); t << text; f.close(); @@ -192,7 +192,7 @@ void %{APPNAME}::save() void %{APPNAME}::saveAs() { - QString fn = QFileDialog::getSaveFileName( QString::null, QString::null, + TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) { filename = fn; @@ -205,25 +205,25 @@ void %{APPNAME}::saveAs() void %{APPNAME}::print() { - // ###### Rewrite to use QSimpleRichText to print here as well + // ###### Rewrite to use TQSimpleRichText to print here as well const int Margin = 10; int pageNo = 1; if ( printer->setup(this) ) { // printer dialog statusBar()->message( tr("Printing...") ); - QPainter p; + TQPainter p; if( !p.begin( printer ) ) // paint on printer return; p.setFont( e->font() ); int yPos = 0; // y-position for each line - QFontMetrics fm = p.fontMetrics(); - QPaintDeviceMetrics metrics( printer ); // need width/height + TQFontMetrics fm = p.fontMetrics(); + TQPaintDeviceMetrics metrics( printer ); // need width/height // of printer surface for( int i = 0 ; i < e->lines() ; i++ ) { if ( Margin + yPos > metrics.height() - Margin ) { - QString msg( "Printing (page " ); - msg += QString::number( ++pageNo ); + TQString msg( "Printing (page " ); + msg += TQString::number( ++pageNo ); msg += ")..."; statusBar()->message( msg ); printer->newPage(); // no more room on this page @@ -242,14 +242,14 @@ void %{APPNAME}::print() } } -void %{APPNAME}::closeEvent( QCloseEvent* ce ) +void %{APPNAME}::closeEvent( TQCloseEvent* ce ) { if ( !e->isModified() ) { ce->accept(); return; } - switch( QMessageBox::information( this, tr("Qt Application Example"), + switch( TQMessageBox::information( this, tr("Qt Application Example"), tr("Do you want to save the changes" " to the document?"), tr("Yes"), tr("No"), tr("Cancel"), @@ -271,13 +271,13 @@ void %{APPNAME}::closeEvent( QCloseEvent* ce ) void %{APPNAME}::about() { - QMessageBox::about( this, tr("Qt Application Example"), + TQMessageBox::about( this, tr("Qt Application Example"), tr("This example demonstrates simple use of " - "QMainWindow,\nQMenuBar and QToolBar.")); + "TQMainWindow,\nQMenuBar and TQToolBar.")); } void %{APPNAME}::aboutQt() { - QMessageBox::aboutQt( this, tr("Qt Application Example") ); + TQMessageBox::aboutQt( this, tr("Qt Application Example") ); } diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h index 2d372da9..48bf459a 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h @@ -3,7 +3,7 @@ #ifndef %{APPNAMEUC}_H #define %{APPNAMEUC}_H -#include <qmainwindow.h> +#include <tqmainwindow.h> class QTextEdit; @@ -16,12 +16,12 @@ public: ~%{APPNAME}(); protected: - void closeEvent( QCloseEvent* ); + void closeEvent( TQCloseEvent* ); private slots: void newDoc(); void choose(); - void load( const QString &fileName ); + void load( const TQString &fileName ); void save(); void saveAs(); void print(); @@ -30,9 +30,9 @@ private slots: void aboutQt(); private: - QPrinter *printer; - QTextEdit *e; - QString filename; + TQPrinter *printer; + TQTextEdit *e; + TQString filename; }; diff --git a/languages/cpp/app_templates/cmakeqt3app/main.cpp b/languages/cpp/app_templates/cmakeqt3app/main.cpp index bd26f19a..8938adc5 100644 --- a/languages/cpp/app_templates/cmakeqt3app/main.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/main.cpp @@ -1,13 +1,13 @@ %{CPP_TEMPLATE} -#include <qapplication.h> +#include <tqapplication.h> #include "%{APPNAMELC}.h" int main( int argc, char ** argv ) { - QApplication a( argc, argv ); + TQApplication a( argc, argv ); %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp index a23da01b..32f32c65 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp +++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp @@ -7,7 +7,7 @@ %{APPNAME}::%{APPNAME}() : DCOPObject("serviceInterface") { kdDebug() << "Starting new service... " << endl; - m_List = QStringList(); + m_List = TQStringList(); } %{APPNAME}::~%{APPNAME}() @@ -15,25 +15,25 @@ kdDebug() << "Going away... " << endl; } -QString %{APPNAME}::string(int idx) +TQString %{APPNAME}::string(int idx) { return *m_List.at(idx); } -QStringList %{APPNAME}::list() +TQStringList %{APPNAME}::list() { return m_List; } -void %{APPNAME}::add(QString arg) +void %{APPNAME}::add(TQString arg) { kdDebug() << "Adding " << arg << " to the list" << endl; m_List << arg; } -bool %{APPNAME}::remove(QString arg) +bool %{APPNAME}::remove(TQString arg) { - QStringList::Iterator it = m_List.find(arg); + TQStringList::Iterator it = m_List.find(arg); if (it != m_List.end()) { m_List.remove(it); diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.h b/languages/cpp/app_templates/dcopservice/dcopservice.h index 4e9eda87..59aa3c28 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.h +++ b/languages/cpp/app_templates/dcopservice/dcopservice.h @@ -3,8 +3,8 @@ #ifndef _%{APPNAME}_H #define _%{APPNAME}_H -#include <qstringlist.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqstring.h> #include <dcopobject.h> class %{APPNAME} : public DCOPObject @@ -12,7 +12,7 @@ class %{APPNAME} : public DCOPObject K_DCOP private: - QStringList m_List; + TQStringList m_List; public: %{APPNAME}(); @@ -20,13 +20,13 @@ class %{APPNAME} : public DCOPObject ~%{APPNAME}(); k_dcop: - QString string(int); + TQString string(int); - QStringList list(); + TQStringList list(); - void add(QString); + void add(TQString); - bool remove(QString); + bool remove(TQString); bool exit(); diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 5460bba9..6388f452 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -3,10 +3,10 @@ #include "%{APPNAMELC}.h" #include "pref.h" -#include <qdragobject.h> +#include <tqdragobject.h> #include <kprinter.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> #include <kglobal.h> #include <klocale.h> @@ -49,10 +49,10 @@ setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); } @@ -62,7 +62,7 @@ void %{APPNAME}::load(const KURL& url) { - QString target; + TQString target; // the below code is what you should normally do. in this // example case, we want the url to our own. you probably // want to use this code instead for your app @@ -88,19 +88,19 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); - KStdAction::print(this, SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, - this, SLOT(optionsPreferences()), + this, TQT_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } @@ -126,19 +126,19 @@ void %{APPNAME}::readProperties(KConfig *config) // the app is being restored. read in here whatever you wrote // in 'saveProperties' - QString url = config->readPathEntry("lastURL"); + TQString url = config->readPathEntry("lastURL"); if (!url.isEmpty()) m_view->openURL(KURL(url)); } -void %{APPNAME}::dragEnterEvent(QDragEnterEvent *event) +void %{APPNAME}::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void %{APPNAME}::dropEvent(QDropEvent *event) +void %{APPNAME}::dropEvent(TQDropEvent *event) { // this is a very simplistic implementation of a drop event. we // will only accept a dropped URL. the Qt dnd code can do *much* @@ -173,10 +173,10 @@ void %{APPNAME}::fileOpen() // button is clicked /* // this brings up the generic open dialog - KURL url = KURLRequesterDlg::getURL(QString::null, this, i18n("Open Location") ); + KURL url = KURLRequesterDlg::getURL(TQString::null, this, i18n("Open Location") ); */ // standard filedialog - KURL url = KFileDialog::getOpenURL(QString::null, QString::null, this, i18n("Open Location")); + KURL url = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Open Location")); if (!url.isEmpty()) m_view->openURL(url); } @@ -209,13 +209,13 @@ void %{APPNAME}::filePrint() if (m_printer->setup(this)) { // setup the printer. with Qt, you always "print" to a - // QPainter.. whether the output medium is a pixmap, a screen, + // TQPainter.. whether the output medium is a pixmap, a screen, // or paper - QPainter p; + TQPainter p; p.begin(m_printer); // we let our view do the actual printing - QPaintDeviceMetrics metrics(m_printer); + TQPaintDeviceMetrics metrics(m_printer); m_view->print(&p, metrics.height(), metrics.width()); // and send the result to the printer @@ -233,13 +233,13 @@ void %{APPNAME}::optionsPreferences() } } -void %{APPNAME}::changeStatusbar(const QString& text) +void %{APPNAME}::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text); } -void %{APPNAME}::changeCaption(const QString& text) +void %{APPNAME}::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 45c65f4b..1c92feb8 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -46,8 +46,8 @@ protected: /** * Overridden virtuals for Qt drag 'n drop (XDND) */ - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); protected: /** @@ -72,8 +72,8 @@ private slots: void filePrint(); void optionsPreferences(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); private: void setupAccel(); diff --git a/languages/cpp/app_templates/kapp/app_client.cpp b/languages/cpp/app_templates/kapp/app_client.cpp index 5c062077..ecde60fb 100644 --- a/languages/cpp/app_templates/kapp/app_client.cpp +++ b/languages/cpp/app_templates/kapp/app_client.cpp @@ -2,8 +2,8 @@ #include <kapplication.h> #include <dcopclient.h> -#include <qdatastream.h> -#include <qstring.h> +#include <tqdatastream.h> +#include <tqstring.h> int main(int argc, char **argv) { @@ -14,13 +14,13 @@ int main(int argc, char **argv) client->attach(); // do a 'send' for now - QByteArray data; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data; + TQDataStream ds(data, IO_WriteOnly); if (argc > 1) - ds << QString(argv[1]); + ds << TQString(argv[1]); else - ds << QString("http://www.kde.org"); - client->send("%{APPNAMELC}", "%{APPNAME}Iface", "openURL(QString)", data); + ds << TQString("http://www.kde.org"); + client->send("%{APPNAMELC}", "%{APPNAME}Iface", "openURL(TQString)", data); return app.exec(); } diff --git a/languages/cpp/app_templates/kapp/appiface.h b/languages/cpp/app_templates/kapp/appiface.h index 4a24ae7f..9fa7cd1b 100644 --- a/languages/cpp/app_templates/kapp/appiface.h +++ b/languages/cpp/app_templates/kapp/appiface.h @@ -11,7 +11,7 @@ class %{APPNAME}Iface : virtual public DCOPObject public: k_dcop: - virtual void openURL(QString url) = 0; + virtual void openURL(TQString url) = 0; }; #endif // _%{APPNAMEUC}IFACE_H_ diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index a57adbf3..32afca2e 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -2,8 +2,8 @@ #include "%{APPNAMELC}view.h" -#include <qpainter.h> -#include <qlayout.h> +#include <tqpainter.h> +#include <tqlayout.h> #include <kurl.h> @@ -13,12 +13,12 @@ #include <krun.h> #include <klocale.h> -%{APPNAME}View::%{APPNAME}View(QWidget *parent) - : QWidget(parent), +%{APPNAME}View::%{APPNAME}View(TQWidget *parent) + : TQWidget(parent), DCOPObject("%{APPNAME}Iface") { // setup our layout manager to automatically add our widgets - QHBoxLayout *top_layout = new QHBoxLayout(this); + TQHBoxLayout *top_layout = new TQHBoxLayout(this); top_layout->setAutoAdd(true); // we want to look for all components that satisfy our needs. the @@ -63,10 +63,10 @@ return; } - connect(m_html, SIGNAL(setWindowCaption(const QString&)), - this, SLOT(slotSetTitle(const QString&))); - connect(m_html, SIGNAL(setStatusBarText(const QString&)), - this, SLOT(slotOnURL(const QString&))); + connect(m_html, TQT_SIGNAL(setWindowCaption(const TQString&)), + this, TQT_SLOT(slotSetTitle(const TQString&))); + connect(m_html, TQT_SIGNAL(setStatusBarText(const TQString&)), + this, TQT_SLOT(slotOnURL(const TQString&))); } @@ -74,18 +74,18 @@ { } -void %{APPNAME}View::print(QPainter *p, int height, int width) +void %{APPNAME}View::print(TQPainter *p, int height, int width) { // do the actual printing, here // p->drawText(etc..) } -QString %{APPNAME}View::currentURL() +TQString %{APPNAME}View::currentURL() { return m_html->url().url(); } -void %{APPNAME}View::openURL(QString url) +void %{APPNAME}View::openURL(TQString url) { openURL(KURL(url)); } @@ -95,12 +95,12 @@ void %{APPNAME}View::openURL(const KURL& url) m_html->openURL(url); } -void %{APPNAME}View::slotOnURL(const QString& url) +void %{APPNAME}View::slotOnURL(const TQString& url) { emit signalChangeStatusbar(url); } -void %{APPNAME}View::slotSetTitle(const QString& title) +void %{APPNAME}View::slotSetTitle(const TQString& title) { emit signalChangeCaption(title); } diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index ae0c6b6d..236749bc 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}VIEW_H_ #define _%{APPNAMEUC}VIEW_H_ -#include <qwidget.h> +#include <tqwidget.h> #include <kparts/part.h> #include <%{APPNAMELC}iface.h> @@ -21,14 +21,14 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME}View : public QWidget, public %{APPNAME}Iface +class %{APPNAME}View : public TQWidget, public %{APPNAME}Iface { Q_OBJECT public: /** * Default constructor */ - %{APPNAME}View(QWidget *parent); + %{APPNAME}View(TQWidget *parent); /** * Destructor @@ -38,12 +38,12 @@ public: /** * Random 'get' function */ - QString currentURL(); + TQString currentURL(); /** * Random 'set' function accessed by DCOP */ - virtual void openURL(QString url); + virtual void openURL(TQString url); /** * Random 'set' function @@ -53,22 +53,22 @@ public: /** * Print this view to any medium -- paper or not */ - void print(QPainter *, int height, int width); + void print(TQPainter *, int height, int width); signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); private slots: - void slotOnURL(const QString& url); - void slotSetTitle(const QString& title); + void slotOnURL(const TQString& url); + void slotSetTitle(const TQString& title); private: KParts::ReadOnlyPart *m_html; diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index ee647b1c..ff83190f 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -4,8 +4,8 @@ #include <klocale.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> %{APPNAME}Preferences::%{APPNAME}Preferences() : KDialogBase(TreeList, i18n("%{APPNAME} Preferences"), @@ -14,7 +14,7 @@ // this is the base class for your preferences dialog. it is now // a Treelist dialog.. but there are a number of other // possibilities (including Tab, Swallow, and just Plain) - QFrame *frame; + TQFrame *frame; frame = addPage(i18n("First Page"), i18n("Page One Options")); m_pageOne = new %{APPNAME}PrefPageOne(frame); @@ -22,21 +22,21 @@ m_pageTwo = new %{APPNAME}PrefPageTwo(frame); } -%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(QWidget *parent) - : QFrame(parent) +%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) + : TQFrame(parent) { - QHBoxLayout *layout = new QHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); layout->setAutoAdd(true); - new QLabel(i18n("Add something here"), this); + new TQLabel(i18n("Add something here"), this); } -%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(QWidget *parent) - : QFrame(parent) +%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) + : TQFrame(parent) { - QHBoxLayout *layout = new QHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); layout->setAutoAdd(true); - new QLabel(i18n("Add something here"), this); + new TQLabel(i18n("Add something here"), this); } #include "pref.moc" diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index 11aec821..93859cfd 100644 --- a/languages/cpp/app_templates/kapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h @@ -4,7 +4,7 @@ #define _%{APPNAMEUC}PREF_H_ #include <kdialogbase.h> -#include <qframe.h> +#include <tqframe.h> class %{APPNAME}PrefPageOne; class %{APPNAME}PrefPageTwo; @@ -24,14 +24,14 @@ class %{APPNAME}PrefPageOne : public QFrame { Q_OBJECT public: - %{APPNAME}PrefPageOne(QWidget *parent = 0); + %{APPNAME}PrefPageOne(TQWidget *parent = 0); }; class %{APPNAME}PrefPageTwo : public QFrame { Q_OBJECT public: - %{APPNAME}PrefPageTwo(QWidget *parent = 0); + %{APPNAME}PrefPageTwo(TQWidget *parent = 0); }; #endif // _%{APPNAMEUC}PREF_H_ diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 9fd4a694..1a40df32 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -33,14 +33,14 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -QObject* KatePluginFactory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { return new KatePlugin%{APPNAME}( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( QObject* parent, const char* name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) { } @@ -55,7 +55,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction ( i18n("Insert Hello World"), 0, this, - SLOT( slotInsertHello() ), view->actionCollection(), + TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new KInstance("kate")); diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 8cc5b237..879ff967 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -22,7 +22,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -33,7 +33,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - KatePlugin%{APPNAME}( QObject* parent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); @@ -43,7 +43,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface void slotInsertHello(); private: - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; }; #endif // _PLUGIN_%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 99d78eff..18595d10 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -7,8 +7,8 @@ #include <kstandarddirs.h> #include <kfiledialog.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> class PluginView : public KXMLGUIClient { @@ -37,14 +37,14 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -QObject* KatePluginFactory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { return new KatePlugin%{APPNAME}( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( QObject* parent, const char* name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) { } @@ -59,7 +59,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction ( i18n("Insert Hello World"), 0, this, - SLOT( slotInsertHello() ), view->actionCollection(), + TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new KInstance("kate")); @@ -90,11 +90,11 @@ void KatePlugin%{APPNAME}::slotInsertHello() kv->insertText ("Hello World"); } -Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, QWidget *w, const char* name) +Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, TQWidget *w, const char* name) { %{APPNAME}ConfigPage* p = new %{APPNAME}ConfigPage(this, w); initConfigPage( p ); - connect( p, SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); + connect( p, TQT_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQT_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -114,17 +114,17 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) /** * %{APPNAME}ConfigPage */ -%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (QObject* parent /*= 0L*/, QWidget *parentWidget /*= 0L*/) +%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { - QVBoxLayout* lo = new QVBoxLayout( this, 0, 0, "config_page_layout" ); + TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" ); lo->setSpacing(KDialogBase::spacingHint()); - QLabel* lab = new QLabel("KatePlugin%{APPNAME}'s config page", this); + TQLabel* lab = new TQLabel("KatePlugin%{APPNAME}'s config page", this); lo->addWidget(lab); - // TODO: add connection to emit SLOT( changed() ) + // TODO: add connection to emit TQT_SLOT( changed() ) } %{APPNAME}ConfigPage::~%{APPNAME}ConfigPage() diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index e4f97d00..6ad068d4 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -26,7 +26,7 @@ public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -37,7 +37,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kat Q_OBJECT public: - KatePlugin%{APPNAME}( QObject* parent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); @@ -45,10 +45,10 @@ public: /** overwrite some functions */ uint configPages () const { return 1; } - Kate::PluginConfigPage *configPage (uint , QWidget *w, const char *name=0); - QString configPageName(uint) const { return i18n("%{APPNAME}"); }; - QString configPageFullName(uint) const { return i18n("Configure KatePlugin%{APPNAME}"); }; - QPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const { return 0L; }; + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + TQString configPageName(uint) const { return i18n("%{APPNAME}"); }; + TQString configPageFullName(uint) const { return i18n("Configure KatePlugin%{APPNAME}"); }; + TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const { return 0L; }; public slots: void slotInsertHello(); @@ -58,7 +58,7 @@ private: void initConfigPage( %{APPNAME}ConfigPage* ); private: - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; }; @@ -68,7 +68,7 @@ class %{APPNAME}ConfigPage : public Kate::PluginConfigPage friend class KatePlugin%{APPNAME}; public: - %{APPNAME}ConfigPage (QObject* parent = 0L, QWidget *parentWidget = 0L); + %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~%{APPNAME}ConfigPage (); /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ). */ diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp index 69e87692..bb15b923 100644 --- a/languages/cpp/app_templates/kcmodule/module.cpp +++ b/languages/cpp/app_templates/kcmodule/module.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kglobal.h> @@ -8,10 +8,10 @@ #include "%{APPNAMELC}.h" -typedef KGenericFactory<%{APPNAME}, QWidget> %{APPNAME}Factory; +typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}")) -%{APPNAME}::%{APPNAME}(QWidget *parent, const char *name, const QStringList&) +%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&) : KCModule(parent, name), myAboutData(0) { // place widgets here @@ -57,7 +57,7 @@ void %{APPNAME}::configChanged() } -QString %{APPNAME}::quickHelp() const +TQString %{APPNAME}::quickHelp() const { return i18n("Helpful information about the %{APPNAMELC} module."); } diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h index cebf0f48..7f539c60 100644 --- a/languages/cpp/app_templates/kcmodule/module.h +++ b/languages/cpp/app_templates/kcmodule/module.h @@ -11,14 +11,14 @@ class %{APPNAME}: public KCModule Q_OBJECT public: - %{APPNAME}( QWidget *parent=0, const char *name=0, const QStringList& = QStringList() ); + %{APPNAME}( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); ~%{APPNAME}(); virtual void load(); virtual void save(); virtual void defaults(); virtual int buttons(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; virtual const KAboutData *aboutData()const { return myAboutData; }; diff --git a/languages/cpp/app_templates/kconfig35/app.cpp b/languages/cpp/app_templates/kconfig35/app.cpp index e32e28b5..e18b4148 100644 --- a/languages/cpp/app_templates/kconfig35/app.cpp +++ b/languages/cpp/app_templates/kconfig35/app.cpp @@ -4,7 +4,7 @@ #include "settings.h" #include "prefs.h" -#include <qdragobject.h> +#include <tqdragobject.h> #include <kaction.h> #include <kconfigdialog.h> @@ -34,10 +34,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); } @@ -47,14 +47,14 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, - m_view, SLOT(switchColors()), + m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); setupGUI(); @@ -75,17 +75,17 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), m_view, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); dialog->show(); } -void %{APPNAMELC}::changeCaption(const QString& text) +void %{APPNAMELC}::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); } -void %{APPNAMELC}::changeStatusbar(const QString& text) +void %{APPNAMELC}::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text); diff --git a/languages/cpp/app_templates/kconfig35/app.h b/languages/cpp/app_templates/kconfig35/app.h index abfd6c09..0174aa1b 100644 --- a/languages/cpp/app_templates/kconfig35/app.h +++ b/languages/cpp/app_templates/kconfig35/app.h @@ -43,8 +43,8 @@ private slots: void optionsPreferences(); void newToolbarConfig(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); private: diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp index 35e23682..30d627fe 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/kconfig35/appview.cpp @@ -4,9 +4,9 @@ #include "settings.h" #include <klocale.h> -#include <qlabel.h> +#include <tqlabel.h> -%{APPNAMELC}View::%{APPNAMELC}View(QWidget *parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) : %{APPNAMELC}view_base(parent) { settingsChanged(); @@ -20,7 +20,7 @@ void %{APPNAMELC}View::switchColors() { // switch the foreground/background colors of the label - QColor color = Settings::col_background(); + TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/kconfig35/appview.h index 45a10de7..5b69ae24 100644 --- a/languages/cpp/app_templates/kconfig35/appview.h +++ b/languages/cpp/app_templates/kconfig35/appview.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}VIEW_H_ #define _%{APPNAMEUC}VIEW_H_ -#include <qwidget.h> +#include <tqwidget.h> #include "%{APPNAMELC}view_base.h" @@ -26,7 +26,7 @@ public: /** * Default constructor */ - %{APPNAMELC}View(QWidget *parent); + %{APPNAMELC}View(TQWidget *parent); /** * Destructor @@ -37,12 +37,12 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); private slots: void switchColors(); diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index c11a58d1..b8849a58 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp @@ -4,8 +4,8 @@ #include "%{APPNAMELC}view.h" #include "settings.h" -#include <QtGui/QDropEvent> -#include <QtGui/QPainter> +#include <QtGui/TQDropEvent> +#include <QtGui/TQPainter> #include <kconfigdialog.h> #include <kstatusbar.h> @@ -47,15 +47,15 @@ void %{APPNAME}::setupActions() { - KStandardAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStandardAction::quit(qApp, SLOT(quit()), actionCollection()); + KStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStandardAction::quit(qApp, TQT_SLOT(quit()), actionCollection()); - KStandardAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this); actionCollection()->addAction( QLatin1String("switch_action"), custom ); - connect(custom, SIGNAL(triggered(bool)), m_view, SLOT(switchColors())); + connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors())); } void %{APPNAME}::fileNew() @@ -79,10 +79,10 @@ void %{APPNAME}::optionsPreferences() return; } KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self()); - QWidget *generalSettingsDlg = new QWidget; + TQWidget *generalSettingsDlg = new QWidget; ui_prefs_base.setupUi(generalSettingsDlg); dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting"); - connect(dialog, SIGNAL(settingsChanged(QString)), m_view, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged(TQString)), m_view, TQT_SLOT(settingsChanged())); dialog->setAttribute( Qt::WA_DeleteOnClose ); dialog->show(); } diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp index 256f6bcb..785a6858 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4view.cpp @@ -3,9 +3,9 @@ #include "settings.h" #include <klocale.h> -#include <QtGui/QLabel> +#include <QtGui/TQLabel> -%{APPNAME}View::%{APPNAME}View(QWidget *) +%{APPNAME}View::%{APPNAME}View(TQWidget *) { ui_%{APPNAMELC}view_base.setupUi(this); settingsChanged(); @@ -20,7 +20,7 @@ void %{APPNAME}View::switchColors() { // switch the foreground/background colors of the label - QColor color = Settings::col_background(); + TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); @@ -29,9 +29,9 @@ void %{APPNAME}View::switchColors() void %{APPNAME}View::settingsChanged() { - QPalette pal; - pal.setColor( QPalette::Window, Settings::col_background()); - pal.setColor( QPalette::WindowText, Settings::col_foreground()); + TQPalette pal; + pal.setColor( TQPalette::Window, Settings::col_background()); + pal.setColor( TQPalette::WindowText, Settings::col_foreground()); ui_%{APPNAMELC}view_base.kcfg_sillyLabel->setPalette( pal ); // i18n : internationalization diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h index ab08445f..9572b914 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.h +++ b/languages/cpp/app_templates/kde4app/kapp4view.h @@ -2,7 +2,7 @@ #ifndef %{APPNAMELC}VIEW_H #define %{APPNAMELC}VIEW_H -#include <QtGui/QWidget> +#include <QtGui/TQWidget> #include "ui_%{APPNAMELC}view_base.h" @@ -19,14 +19,14 @@ class KUrl; * @version %{VERSION} */ -class %{APPNAME}View : public QWidget, public Ui::%{APPNAMELC}view_base +class %{APPNAME}View : public TQWidget, public Ui::%{APPNAMELC}view_base { Q_OBJECT public: /** * Default constructor */ - %{APPNAME}View(QWidget *parent); + %{APPNAME}View(TQWidget *parent); /** * Destructor @@ -40,12 +40,12 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); private slots: void switchColors(); diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp index e295253a..e4fa554f 100644 --- a/languages/cpp/app_templates/kdedcop/app.cpp +++ b/languages/cpp/app_templates/kdedcop/app.cpp @@ -2,7 +2,7 @@ #include "%{APPNAMELC}.h" -#include <qlabel.h> +#include <tqlabel.h> #include <kmainwindow.h> #include <klocale.h> diff --git a/languages/cpp/app_templates/kdedcop/app_iface.h b/languages/cpp/app_templates/kdedcop/app_iface.h index 57bfb059..7049c712 100644 --- a/languages/cpp/app_templates/kdedcop/app_iface.h +++ b/languages/cpp/app_templates/kdedcop/app_iface.h @@ -10,10 +10,10 @@ class DCOPDemoIface : virtual public DCOPObject // Here you should place your DCOP interface. // Below are four example methods. - virtual QString strVal() const = 0; + virtual TQString strVal() const = 0; virtual int intVal() const = 0; virtual void setIntVal( int num ) = 0; - virtual void setStrVal( const QString &str ) = 0; + virtual void setStrVal( const TQString &str ) = 0; }; diff --git a/languages/cpp/app_templates/kdedcop/mainclass.cpp b/languages/cpp/app_templates/kdedcop/mainclass.cpp index 8f334114..a5e0d6a5 100644 --- a/languages/cpp/app_templates/kdedcop/mainclass.cpp +++ b/languages/cpp/app_templates/kdedcop/mainclass.cpp @@ -14,7 +14,7 @@ MainClass::~MainClass() { } -void MainClass::setStrVal(const QString & str) { +void MainClass::setStrVal(const TQString & str) { m_strValue = str; } @@ -22,7 +22,7 @@ void MainClass::setIntVal(int val) { m_intValue = val; } -QString MainClass::strVal() const { +TQString MainClass::strVal() const { return m_strValue; } diff --git a/languages/cpp/app_templates/kdedcop/mainclass.h b/languages/cpp/app_templates/kdedcop/mainclass.h index ca37f2ad..13504f82 100644 --- a/languages/cpp/app_templates/kdedcop/mainclass.h +++ b/languages/cpp/app_templates/kdedcop/mainclass.h @@ -18,13 +18,13 @@ public: // Here is the implementation of the example DCOP interface methods. - virtual void setStrVal(const QString &); + virtual void setStrVal(const TQString &); virtual void setIntVal(int); - virtual QString strVal() const; + virtual TQString strVal() const; virtual int intVal() const; private: - QString m_strValue; + TQString m_strValue; int m_intValue; }; diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 9d5cadcf..364ec0d7 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -1,7 +1,7 @@ %{CPP_TEMPLATE} -#include <qwhatsthis.h> -#include <qtimer.h> +#include <tqwhatsthis.h> +#include <tqtimer.h> #include <kiconloader.h> #include <klocale.h> @@ -21,24 +21,24 @@ typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) ); static const KDevPluginInfo data("kdev%{APPNAMELC}"); -%{APPNAME}Part::%{APPNAME}Part(QObject *parent, const char *name, const QStringList& ) +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& ) : KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdevlang_%{APPNAMELC}.rc"); - m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); kdDebug() << "Creating %{APPNAMELC} Part" << endl; - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), this, SLOT(savedFile(const KURL&)) ); - connect(partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); } @@ -74,14 +74,14 @@ void %{APPNAME}Part::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - QTimer::singleShot(0, this, SLOT(parse())); + TQTimer::singleShot(0, this, TQT_SLOT(parse())); } void %{APPNAME}Part::projectClosed() { @@ -97,11 +97,11 @@ void %{APPNAME}Part::savedFile(const KURL &fileName) emit addedSourceInfo( fileName.path() ); } } -void %{APPNAME}Part::addedFilesToProject(const QStringList &fileList) +void %{APPNAME}Part::addedFilesToProject(const TQStringList &fileList) { kdDebug(9014) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -110,15 +110,15 @@ void %{APPNAME}Part::addedFilesToProject(const QStringList &fileList) emit updatedSourceInfo(); } -void %{APPNAME}Part::removedFilesFromProject(const QStringList &fileList) +void %{APPNAME}Part::removedFilesFromProject(const TQStringList &fileList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); if( codeModel()->hasFile(fileName) ) { kdDebug(9014) << "removed " << fileName << endl; @@ -135,8 +135,8 @@ void %{APPNAME}Part::parse() if (project()) { kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) + TQStringList files = project()->allFiles(); + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; } diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index 25721d64..d6d92ff6 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -7,7 +7,7 @@ #include <kdevplugin.h> #include <codemodel.h> #include <kdevlanguagesupport.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdialogbase.h> class KAction; @@ -19,7 +19,7 @@ class %{APPNAME}Part : public KDevLanguageSupport { Q_OBJECT public: - %{APPNAME}Part(QObject *parent, const char *name, const QStringList &); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &); ~%{APPNAME}Part(); protected: virtual Features features(); @@ -31,8 +31,8 @@ class %{APPNAME}Part : public KDevLanguageSupport void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void parse(); void slotActivePartChanged(KParts::Part *part); private: diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp index 12396fec..cddf3e7e 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, QWidget *parent, const char *name) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index 1b321cd2..aea1cbea 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h @@ -10,7 +10,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, QWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index dd86843d..082549c4 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -1,9 +1,9 @@ %{CPP_TEMPLATE} #include "%{APPNAMELC}part.h" -#include <qtimer.h> -#include <qpopupmenu.h> -#include <qwhatsthis.h> +#include <tqtimer.h> +#include <tqpopupmenu.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kaction.h> @@ -28,7 +28,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(QObject *parent, const char *name, const QStringList &/*args*/) +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); @@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); m_widget->setCaption("widget caption"); m_widget->setIcon(SmallIcon(info()->icon())); - QWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); + TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int))); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); - connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened())); - connect(core(), SIGNAL(projectClosed()), this, SLOT(projectClosed())); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); - QTimer::singleShot(0, this, SLOT(init())); + TQTimer::singleShot(0, this, TQT_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,12 +92,12 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new KAction(i18n("&Do Something..."), 0, - this, SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); } -void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { // create configuraton dialogs here switch (pageNo) @@ -105,19 +105,19 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, QWidget *page, u case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } } } -void %{APPNAME}Part::contextMenu(QPopupMenu *popup, const Context *context) +void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) { // put actions into the context menu here if (context->hasType(Context::EditorContext)) @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(QPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, SLOT(doSomething()) ); + // this, TQT_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index 168b8a40..246e539d 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -4,7 +4,7 @@ #include <kdevplugin.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class QPopupMenu; class KAction; @@ -20,14 +20,14 @@ class %{APPNAME}Part: public KDevPlugin { Q_OBJECT public: - %{APPNAME}Part(QObject *parent, const char *name, const QStringList &args); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: void init(); - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); - void contextMenu(QPopupMenu *popup, const Context *context); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); + void contextMenu(TQPopupMenu *popup, const Context *context); void projectOpened(); void projectClosed(); @@ -38,7 +38,7 @@ private: KAction *action; - QGuardedPtr<%{APPNAME}Widget> m_widget; + TQGuardedPtr<%{APPNAME}Widget> m_widget; ConfigWidgetProxy *m_configProxy; }; diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp index 0c05b976..1fe3558c 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp @@ -10,7 +10,7 @@ #include "%{APPNAMELC}part.h" %{APPNAME}Widget::%{APPNAME}Widget(%{APPNAME}Part *part) - : QWidget(0, "%{APPNAMELC} widget"), m_part(part) + : TQWidget(0, "%{APPNAMELC} widget"), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h index e29e29d2..308c3e7e 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h @@ -2,8 +2,8 @@ #ifndef %{APPNAMEUC}_WIDGET_H #define %{APPNAMEUC}_WIDGET_H -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> class KDevProject; class %{APPNAME}Part; diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp index 5f07993b..42a9f3e7 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, QWidget *parent, const char *name) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index ec3ff4df..0ab0cb35 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h @@ -10,7 +10,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, QWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp index 12396fec..cddf3e7e 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, QWidget *parent, const char *name) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index 1b321cd2..aea1cbea 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -10,7 +10,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, QWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index dd86843d..082549c4 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -1,9 +1,9 @@ %{CPP_TEMPLATE} #include "%{APPNAMELC}part.h" -#include <qtimer.h> -#include <qpopupmenu.h> -#include <qwhatsthis.h> +#include <tqtimer.h> +#include <tqpopupmenu.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kaction.h> @@ -28,7 +28,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(QObject *parent, const char *name, const QStringList &/*args*/) +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); @@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); m_widget->setCaption("widget caption"); m_widget->setIcon(SmallIcon(info()->icon())); - QWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); + TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int))); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); - connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened())); - connect(core(), SIGNAL(projectClosed()), this, SLOT(projectClosed())); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); - QTimer::singleShot(0, this, SLOT(init())); + TQTimer::singleShot(0, this, TQT_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,12 +92,12 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new KAction(i18n("&Do Something..."), 0, - this, SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); } -void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { // create configuraton dialogs here switch (pageNo) @@ -105,19 +105,19 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, QWidget *page, u case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } } } -void %{APPNAME}Part::contextMenu(QPopupMenu *popup, const Context *context) +void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) { // put actions into the context menu here if (context->hasType(Context::EditorContext)) @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(QPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, SLOT(doSomething()) ); + // this, TQT_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index 168b8a40..246e539d 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -4,7 +4,7 @@ #include <kdevplugin.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class QPopupMenu; class KAction; @@ -20,14 +20,14 @@ class %{APPNAME}Part: public KDevPlugin { Q_OBJECT public: - %{APPNAME}Part(QObject *parent, const char *name, const QStringList &args); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: void init(); - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); - void contextMenu(QPopupMenu *popup, const Context *context); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); + void contextMenu(TQPopupMenu *popup, const Context *context); void projectOpened(); void projectClosed(); @@ -38,7 +38,7 @@ private: KAction *action; - QGuardedPtr<%{APPNAME}Widget> m_widget; + TQGuardedPtr<%{APPNAME}Widget> m_widget; ConfigWidgetProxy *m_configProxy; }; diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp index 0c05b976..1fe3558c 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp @@ -10,7 +10,7 @@ #include "%{APPNAMELC}part.h" %{APPNAME}Widget::%{APPNAME}Widget(%{APPNAME}Part *part) - : QWidget(0, "%{APPNAMELC} widget"), m_part(part) + : TQWidget(0, "%{APPNAMELC} widget"), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index e29e29d2..308c3e7e 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -2,8 +2,8 @@ #ifndef %{APPNAMEUC}_WIDGET_H #define %{APPNAMEUC}_WIDGET_H -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> class KDevProject; class %{APPNAME}Part; diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp index 5f07993b..42a9f3e7 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, QWidget *parent, const char *name) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index ec3ff4df..0ab0cb35 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -10,7 +10,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, QWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp index 3e6b849a..db259cb3 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp @@ -6,15 +6,15 @@ #include <kgenericfactory.h> //#include <kio/global.h> -//#include <qfileinfo.h> -//#include <qdir.h> +//#include <tqfileinfo.h> +//#include <tqdir.h> typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" )) -%{APPNAME}Plugin::%{APPNAME}Plugin(QObject *parent, const char *name, - const QStringList &args) +%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { //add the mimetype here - example: @@ -28,12 +28,12 @@ K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAME KFileMimeTypeInfo::ItemInfo* item; // our new items in the group - item = addItemInfo(group, "Items", i18n("Items"), QVariant::Int); - item = addItemInfo(group, "Size", i18n("Size"), QVariant::Int); + item = addItemInfo(group, "Items", i18n("Items"), TQVariant::Int); + item = addItemInfo(group, "Size", i18n("Size"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::KiloBytes); // strings are possible, too: - //addItemInfo(group, "Text", i18n("Document Type"), QVariant::String); + //addItemInfo(group, "Text", i18n("Document Type"), TQVariant::String); } bool %{APPNAME}Plugin::readInfo( KFileMetaInfo& info, uint /*what*/) diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h index 358b4dcb..8a0355f1 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h @@ -15,7 +15,7 @@ class %{APPNAME}Plugin: public KFilePlugin Q_OBJECT public: - %{APPNAME}Plugin( QObject *parent, const char *name, const QStringList& args ); + %{APPNAME}Plugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp index 44332685..811f9337 100644 --- a/languages/cpp/app_templates/khello/app.cpp +++ b/languages/cpp/app_templates/khello/app.cpp @@ -2,7 +2,7 @@ #include "%{APPNAMELC}.h" -#include <qlabel.h> +#include <tqlabel.h> #include <kmainwindow.h> #include <klocale.h> @@ -13,7 +13,7 @@ // set the shell's ui resource file setXMLFile("%{APPNAMELC}ui.rc"); - new QLabel( "Hello World", this, "hello label" ); + new TQLabel( "Hello World", this, "hello label" ); } %{APPNAME}::~%{APPNAME}() diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp index 6775ac39..266e894f 100644 --- a/languages/cpp/app_templates/khello2/widget.cpp +++ b/languages/cpp/app_templates/khello2/widget.cpp @@ -1,10 +1,10 @@ %{CPP_TEMPLATE} -#include <qlabel.h> +#include <tqlabel.h> #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget(QWidget* parent, const char* name, WFlags fl) +%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl) : %{APPNAME}WidgetBase(parent,name,fl) {} diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 275e13c7..50d7a721 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -10,7 +10,7 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase Q_OBJECT public: - %{APPNAME}Widget(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}Widget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index 5345ac0c..29ec3d1d 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include <qlcdnumber.h> +#include <tqlcdnumber.h> #include <kglobal.h> #include <klocale.h> #include <kconfig.h> @@ -10,12 +10,12 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(const QString& configFile, Type type, int actions, QWidget *parent, const char *name) +%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) { // Get the current application configuration handle ksConfig = config(); - QLCDNumber *w = new QLCDNumber(this); + TQLCDNumber *w = new TQLCDNumber(this); w->display(42); mainView = w; @@ -55,14 +55,14 @@ int %{APPNAME}::heightForWidth(int width) const return height(); } -void %{APPNAME}::resizeEvent(QResizeEvent *e) +void %{APPNAME}::resizeEvent(TQResizeEvent *e) { } extern "C" { - KPanelApplet* init( QWidget *parent, const QString& configFile) + KPanelApplet* init( TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}(configFile, KPanelApplet::Normal, diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index b078b2a4..ba4d6cd4 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -8,7 +8,7 @@ #endif #include <kpanelapplet.h> -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> @@ -26,8 +26,8 @@ public: * @param parent The pointer to the parent widget handed over in the factory function. * @param name A Qt object name for your applet. **/ - %{APPNAME}(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + %{APPNAME}(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); /** destructor */ ~%{APPNAME}(); @@ -97,11 +97,11 @@ public: virtual void preferences(); protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(TQResizeEvent *); private: KConfig *ksConfig; - QWidget *mainView; + TQWidget *mainView; }; #endif diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp index df32aebf..c8dc5d81 100644 --- a/languages/cpp/app_templates/kioslave/slave.cpp +++ b/languages/cpp/app_templates/kioslave/slave.cpp @@ -1,8 +1,8 @@ -#include <qcstring.h> -#include <qsocket.h> -#include <qdatetime.h> -#include <qbitarray.h> +#include <tqcstring.h> +#include <tqsocket.h> +#include <tqdatetime.h> +#include <tqbitarray.h> #include <stdlib.h> #include <math.h> @@ -26,7 +26,7 @@ using namespace KIO; -kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol(const QCString &pool_socket, const QCString &app_socket) +kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("kio_%{APPNAMELC}", pool_socket, app_socket) { kdDebug() << "kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol()" << endl; @@ -44,7 +44,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) kdDebug() << "kio_%{APPNAMELC}::get(const KURL& url)" << endl ; kdDebug() << "Seconds: " << url.query() << endl; - QString remoteServer = url.host(); + TQString remoteServer = url.host(); int remotePort = url.port(); kdDebug() << "myURL: " << url.prettyURL() << endl; @@ -52,9 +52,9 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) // Send the mimeType as soon as it is known mimeType("text/plain"); // Send the data - QString theData = "This is a test of kio_%{APPNAMELC}"; - data(QCString(theData.local8Bit())); - data(QByteArray()); // empty array means we're done sending the data + TQString theData = "This is a test of kio_%{APPNAMELC}"; + data(TQCString(theData.local8Bit())); + data(TQByteArray()); // empty array means we're done sending the data finished(); } diff --git a/languages/cpp/app_templates/kioslave/slave.h b/languages/cpp/app_templates/kioslave/slave.h index 649ead8c..d094a23a 100644 --- a/languages/cpp/app_templates/kioslave/slave.h +++ b/languages/cpp/app_templates/kioslave/slave.h @@ -2,8 +2,8 @@ #ifndef _%{APPNAMELC}_H_ #define _%{APPNAMELC}_H_ -#include <qstring.h> -#include <qcstring.h> +#include <tqstring.h> +#include <tqcstring.h> #include <kurl.h> #include <kio/global.h> @@ -14,7 +14,7 @@ class QCString; class kio_%{APPNAMELC}Protocol : public KIO::SlaveBase { public: - kio_%{APPNAMELC}Protocol(const QCString &pool_socket, const QCString &app_socket); + kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket); virtual ~kio_%{APPNAMELC}Protocol(); virtual void mimetype(const KURL& url); virtual void get(const KURL& url); diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp index 68cb262a..8a0de706 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.cpp +++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp @@ -1,9 +1,9 @@ #include "mainviewimp.h" -#include <qlabel.h> +#include <tqlabel.h> #include <klocale.h> -MainViewImp::MainViewImp(QWidget* parent, const char* name, WFlags fl) +MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl) : MainView(parent,name,fl) { } diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h index 51af1957..190a26e3 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.h +++ b/languages/cpp/app_templates/kmake/mainviewimp.h @@ -8,7 +8,7 @@ class MainViewImp : public MainView Q_OBJECT public: - MainViewImp(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + MainViewImp(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~MainViewImp(); public slots: diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index bd79c317..86287a3f 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -23,7 +23,7 @@ extern "C" KInstance* %{APPNAME}Factory::s_global = 0L; KAboutData* %{APPNAME}Factory::s_aboutData = 0L; -%{APPNAME}Factory::%{APPNAME}Factory( QObject* parent, const char* name ) +%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name ) : KoFactory( parent, name ) { global(); @@ -37,7 +37,7 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L; s_global = 0L; } -KParts::Part* %{APPNAME}Factory::createPartObject( QWidget *parentWidget, const char *widgetName, QObject* parent, const char* name, const char* classname, const QStringList & ) +KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { // If classname is "KoDocument", our host is a koffice application // otherwise, the host wants us as a simple part, so switch to readonly and single view. diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 45f1f649..58061af3 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -15,10 +15,10 @@ class %{APPNAME}Factory : public KoFactory { Q_OBJECT public: - %{APPNAME}Factory( QObject* parent = 0, const char* name = 0 ); + %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 ); ~%{APPNAME}Factory(); - virtual KParts::Part *createPartObject( QWidget *parentWidget = 0, const char *widgetName = 0, QObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const QStringList &args = QStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index 500179f3..c12b5fd7 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -6,40 +6,40 @@ #include "%{APPNAMELC}_part.h" #include "%{APPNAMELC}_view.h" -#include <qpainter.h> +#include <tqpainter.h> -%{APPNAME}Part::%{APPNAME}Part( QWidget *parentWidget, const char *widgetName, QObject* parent, const char* name, bool singleViewMode ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ) { } -bool %{APPNAME}Part::initDoc( InitDocFlags flags, QWidget* parentWidget ) +bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) { // If nothing is loaded, do initialize here return TRUE; } -KoView* %{APPNAME}Part::createViewInstance( QWidget* parent, const char* name ) +KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) { return new %{APPNAME}View( this, parent, name ); } -bool %{APPNAME}Part::loadOasis( const QDomDocument & doc, KoOasisStyles& oasisStyles, const QDomDocument & settings, KoStore* store ) +bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ) { /// @todo load the document using the OASIS format return true; } -bool %{APPNAME}Part::loadXML( QIODevice *, const QDomDocument & ) +bool %{APPNAME}Part::loadXML( TQIODevice *, const TQDomDocument & ) { /// @todo load the document from the QDomDocument return true; } -QDomDocument %{APPNAME}Part::saveXML() +TQDomDocument %{APPNAME}Part::saveXML() { /// @todo save the document into a QDomDocument - return QDomDocument(); + return TQDomDocument(); } bool %{APPNAME}Part::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) @@ -49,7 +49,7 @@ bool %{APPNAME}Part::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) } -void %{APPNAME}Part::paintContent( QPainter& painter, const QRect& rect, bool /*transparent*/, +void %{APPNAME}Part::paintContent( TQPainter& painter, const TQRect& rect, bool /*transparent*/, double /*zoomX*/, double /*zoomY*/ ) { // ####### handle transparency diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 03361ca7..95ebb3f6 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -12,19 +12,19 @@ class %{APPNAME}Part : public KoDocument { Q_OBJECT public: - %{APPNAME}Part( QWidget *parentWidget = 0, const char *widgetName = 0, QObject* parent = 0, const char* name = 0, bool singleViewMode = false ); + %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); - virtual void paintContent( QPainter& painter, const QRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); - virtual bool initDoc( InitDocFlags flags, QWidget* parentWidget = 0 ); + virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 ); - virtual bool loadOasis( const QDomDocument & doc, KoOasisStyles& oasisStyles, const QDomDocument & settings, KoStore* store ); - virtual bool loadXML( QIODevice *, const QDomDocument & ); - virtual QDomDocument saveXML(); + virtual bool loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ); + virtual bool loadXML( TQIODevice *, const TQDomDocument & ); + virtual TQDomDocument saveXML(); virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); protected: - virtual KoView* createViewInstance( QWidget* parent, const char* name ); + virtual KoView* createViewInstance( TQWidget* parent, const char* name ); }; #endif diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 28c0b42f..f32707a8 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -6,27 +6,27 @@ #include "%{APPNAMELC}_factory.h" #include "%{APPNAMELC}_part.h" -#include <qpainter.h> -#include <qiconset.h> +#include <tqpainter.h> +#include <tqiconset.h> #include <kaction.h> #include <kstdaction.h> #include <klocale.h> #include <kdebug.h> -%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, QWidget* parent, const char* name ) +%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name ) : KoView( part, parent, name ) { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); - KStdAction::cut(this, SLOT( cut() ), actionCollection(), "cut" ); + KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new KAction( i18n("&Cut"), "editcut", 0, this, SLOT( cut() ), + //m_cut = new KAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), // actionCollection(), "cut"); } -void %{APPNAME}View::paintEvent( QPaintEvent* ev ) +void %{APPNAME}View::paintEvent( TQPaintEvent* ev ) { - QPainter painter; + TQPainter painter; painter.begin( this ); /// @todo Scaling diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index eb14763f..bab3d89e 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -17,13 +17,13 @@ class %{APPNAME}View : public KoView { Q_OBJECT public: - %{APPNAME}View( %{APPNAME}Part* part, QWidget* parent = 0, const char* name = 0 ); + %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 ); protected slots: void cut(); protected: - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); virtual void updateReadWrite( bool readwrite ); diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index 34515ce2..ae9a85a6 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -1,16 +1,16 @@ -#include <qlabel.h> +#include <tqlabel.h> #include <kinstance.h> -#include <qstring.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqwidget.h> #include "%{APPNAMELC}.h" #include "%{APPNAMELC}.moc" -%{APPNAME}::%{APPNAME}(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name): +%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { - widget=new QLabel("Init Value",widgetParent); + widget=new TQLabel("Init Value",widgetParent); } @@ -20,14 +20,14 @@ void %{APPNAME}::handleURL(const KURL &url) { - widget->setText(QString("%{APPNAME}")+"::"+url.url()); + widget->setText(TQString("%{APPNAME}")+"::"+url.url()); } extern "C" { - void* create_konqsidebar_%{APPNAME}(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + void* create_konqsidebar_%{APPNAME}(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new %{APPNAME}(instance,par,widp,desktopname,name); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index 949c68d3..9599b530 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -7,7 +7,7 @@ #endif #include <konqsidebarplugin.h> -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> @@ -25,17 +25,17 @@ public: * @param desktopName The filename of the configuration file. * @param name A Qt object name for your plugin. **/ - %{APPNAME}(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name=0); + %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~%{APPNAME}(); - virtual QWidget *getWidget(){return widget;} - virtual void *provides(const QString &) {return 0;} + virtual TQWidget *getWidget(){return widget;} + virtual void *provides(const TQString &) {return 0;} protected: /*Example widget only. You use whichever widget you want. You onl have to care that getWidget returns some kind of widget */ - QLabel *widget; + TQLabel *widget; virtual void handleURL(const KURL &url); }; diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 68c34ab3..3a8a2274 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -76,16 +76,16 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } void %{APPNAME}::saveProperties(KConfig* /*config*/) @@ -159,8 +159,8 @@ void %{APPNAME}::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(applyNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), + this, TQT_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -183,7 +183,7 @@ void %{APPNAME}::fileOpen() // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked KURL url = - KFileDialog::getOpenURL( QString::null, QString::null, this ); + KFileDialog::getOpenURL( TQString::null, TQString::null, this ); if (url.isEmpty() == false) { diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index bf63557f..809d642a 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -8,27 +8,27 @@ #include <kglobal.h> #include <klocale.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qmultilineedit.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqmultilineedit.h> -%{APPNAME}Part::%{APPNAME}Part( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name ) : KParts::ReadWritePart(parent, name) { // we need an instance setInstance( %{APPNAME}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new QMultiLineEdit( parentWidget, widgetName ); + m_widget = new TQMultiLineEdit( parentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); // create our actions - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, SLOT(save()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQT_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -49,12 +49,12 @@ void %{APPNAME}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, SIGNAL(textChanged()), - this, SLOT(setModified())); + connect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); else { - disconnect(m_widget, SIGNAL(textChanged()), - this, SLOT(setModified())); + disconnect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); @@ -80,15 +80,15 @@ void %{APPNAME}Part::setModified(bool modified) bool %{APPNAME}Part::openFile() { - // m_file is always local so we can use QFile on it - QFile file(m_file); + // m_file is always local so we can use TQFile on it + TQFile file(m_file); if (file.open(IO_ReadOnly) == false) return false; - // our example widget is text-based, so we use QTextStream instead + // our example widget is text-based, so we use TQTextStream instead // of a raw QDataStream - QTextStream stream(&file); - QString str; + TQTextStream stream(&file); + TQString str; while (!stream.eof()) str += stream.readLine() + "\n"; @@ -110,12 +110,12 @@ bool %{APPNAME}Part::saveFile() return false; // m_file is always local, so we use QFile - QFile file(m_file); + TQFile file(m_file); if (file.open(IO_WriteOnly) == false) return false; - // use QTextStream to dump the text to the file - QTextStream stream(&file); + // use TQTextStream to dump the text to the file + TQTextStream stream(&file); stream << m_widget->text(); file.close(); @@ -128,7 +128,7 @@ void %{APPNAME}Part::fileOpen() // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked - QString file_name = KFileDialog::getOpenFileName(); + TQString file_name = KFileDialog::getOpenFileName(); if (file_name.isEmpty() == false) openURL(file_name); @@ -137,7 +137,7 @@ void %{APPNAME}Part::fileOpen() void %{APPNAME}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, - QString file_name = KFileDialog::getSaveFileName(); + TQString file_name = KFileDialog::getSaveFileName(); if (file_name.isEmpty() == false) saveAs(file_name); } @@ -164,15 +164,15 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L; s_instance = 0L; } -KParts::Part* %{APPNAME}PartFactory::createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ) +KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ) { // Create an instance of our Part %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, parent, name ); // See if we are to be read-write or not - if (QCString(classname) == "KParts::ReadOnlyPart") + if (TQCString(classname) == "KParts::ReadOnlyPart") obj->setReadWrite(false); return obj; diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 37c30189..6b56c36a 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -25,8 +25,8 @@ public: /** * Default constructor */ - %{APPNAME}Part(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name); + %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name); /** * Destructor @@ -61,7 +61,7 @@ protected slots: void fileSaveAs(); private: - QMultiLineEdit *m_widget; + TQMultiLineEdit *m_widget; }; class KInstance; @@ -73,9 +73,9 @@ class %{APPNAME}PartFactory : public KParts::Factory public: %{APPNAME}PartFactory(); virtual ~%{APPNAME}PartFactory(); - virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ); static KInstance* instance(); private: diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index a9ee55a3..61e3ca0e 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -8,13 +8,13 @@ #include <klocale.h> #include <kglobal.h> -Plugin%{APPNAME}::Plugin%{APPNAME}( QObject* parent, const char* name ) +Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) : Plugin( parent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. (void) new KAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, - this, SLOT(slotAction()), + this, TQT_SLOT(slotAction()), actionCollection(), "plugin_action" ); } @@ -29,8 +29,8 @@ void Plugin%{APPNAME}::slotAction() // change the following block. if ( !parent()->inherits("KHTMLPart") ) { - QString title( i18n( "Cannot Translate Source" ) ); - QString text( i18n( "You cannot translate anything except web pages " + TQString title( i18n( "Cannot Translate Source" ) ); + TQString text( i18n( "You cannot translate anything except web pages " "with this plugin." ) ); KMessageBox::sorry( 0, text, title ); @@ -49,8 +49,8 @@ void Plugin%{APPNAME}::slotAction() // valid URL if ( !url.isValid() ) { - QString title( i18n( "Malformed URL" ) ); - QString text( i18n( "The URL you entered is not valid, please " + TQString title( i18n( "Malformed URL" ) ); + TQString text( i18n( "The URL you entered is not valid, please " "correct it and try again" ) ); KMessageBox::sorry( 0, text, title ); @@ -63,7 +63,7 @@ void Plugin%{APPNAME}::slotAction() // BEGIN KURL work( "http://babel.altavista.com/translate.dyn" ); - QString query( "urltext=" ); + TQString query( "urltext=" ); query += KURL::encode_string( url.url() ); work.setQuery( query ); // END @@ -83,7 +83,7 @@ void Plugin%{APPNAME}::slotAction() s_instance = 0; } -QObject* %{APPNAME}Factory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { return new Plugin%{APPNAME}( parent, name ); } diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index e70ad1c1..7c7bfc0c 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -9,7 +9,7 @@ class Plugin%{APPNAME} : public KParts::Plugin { Q_OBJECT public: - Plugin%{APPNAME}( QObject* parent = 0, const char* name = 0 ); + Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~Plugin%{APPNAME}(); public slots: @@ -23,7 +23,7 @@ public: %{APPNAME}Factory(); virtual ~%{APPNAME}Factory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index 71155138..a851f02a 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -10,30 +10,30 @@ #include <kglobal.h> #include <klocale.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qmultilineedit.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqmultilineedit.h> typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); -%{APPNAMELC}Part::%{APPNAMELC}Part( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList & /*args*/) +%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList & /*args*/) : KParts::ReadWritePart(parent) { // we need an instance setInstance( %{APPNAMELC}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new QMultiLineEdit( parentWidget, widgetName ); + m_widget = new TQMultiLineEdit( parentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); // create our actions - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, SLOT(save()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQT_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -63,12 +63,12 @@ void %{APPNAMELC}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, SIGNAL(textChanged()), - this, SLOT(setModified())); + connect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); else { - disconnect(m_widget, SIGNAL(textChanged()), - this, SLOT(setModified())); + disconnect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); @@ -94,15 +94,15 @@ void %{APPNAMELC}Part::setModified(bool modified) bool %{APPNAMELC}Part::openFile() { - // m_file is always local so we can use QFile on it - QFile file(m_file); + // m_file is always local so we can use TQFile on it + TQFile file(m_file); if (file.open(IO_ReadOnly) == false) return false; - // our example widget is text-based, so we use QTextStream instead + // our example widget is text-based, so we use TQTextStream instead // of a raw QDataStream - QTextStream stream(&file); - QString str; + TQTextStream stream(&file); + TQString str; while (!stream.eof()) str += stream.readLine() + "\n"; @@ -124,12 +124,12 @@ bool %{APPNAMELC}Part::saveFile() return false; // m_file is always local, so we use QFile - QFile file(m_file); + TQFile file(m_file); if (file.open(IO_WriteOnly) == false) return false; - // use QTextStream to dump the text to the file - QTextStream stream(&file); + // use TQTextStream to dump the text to the file + TQTextStream stream(&file); stream << m_widget->text(); file.close(); @@ -142,7 +142,7 @@ void %{APPNAMELC}Part::fileOpen() // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked - QString file_name = KFileDialog::getOpenFileName(); + TQString file_name = KFileDialog::getOpenFileName(); if (file_name.isEmpty() == false) openURL(file_name); @@ -151,7 +151,7 @@ void %{APPNAMELC}Part::fileOpen() void %{APPNAMELC}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, - QString file_name = KFileDialog::getSaveFileName(); + TQString file_name = KFileDialog::getSaveFileName(); if (file_name.isEmpty() == false) saveAs(file_name); } diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h index e1dd002b..2d4ea947 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h @@ -27,8 +27,8 @@ public: /** * Default constructor */ - %{APPNAMELC}Part(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList & /*args*/); + %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList & /*args*/); /** * Destructor @@ -68,7 +68,7 @@ protected slots: void fileSaveAs(); private: - QMultiLineEdit *m_widget; + TQMultiLineEdit *m_widget; }; #endif // _%{APPNAMEUC}PART_H_ diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp index be5d8862..4286053a 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp @@ -1,11 +1,11 @@ %{CPP_TEMPLATE} -#include <qdragobject.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qdragobject.h> -#include <qstatusbar.h> -#include <qtoolbutton.h> +#include <tqdragobject.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqdragobject.h> +#include <tqstatusbar.h> +#include <tqtoolbutton.h> #include <kdebug.h> #include <kglobal.h> @@ -53,8 +53,8 @@ setStandardMDIMenuEnabled(false); m_manager = new KParts::PartManager(this); - connect(m_manager, SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(createGUI(KParts::Part*)) ); + connect(m_manager, TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(createGUI(KParts::Part*)) ); #if KDE_IS_VERSION(3, 3, 0) setToolviewStyle( KMdi::TextAndIcon ); @@ -77,7 +77,7 @@ // and a status bar statusBar()->show(); - connect( this, SIGNAL( viewActivated( KMdiChildView * ) ), this, SLOT( currentChanged( KMdiChildView * ) ) ); + connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) ); m_console = new kmdikonsole(this, "konsole"); m_console->setIcon( SmallIcon("konsole") ); @@ -88,11 +88,11 @@ #if KDE_IS_VERSION(3, 3, 0) if (Settings::showCloseTabsButton()) { - QToolButton *but = new QToolButton(tabWidget()); + TQToolButton *but = new TQToolButton(tabWidget()); but->setIconSet(SmallIcon("tab_remove")); but->adjustSize(); but->hide(); - connect(but, SIGNAL(clicked()), actionCollection()->action( "file_close" ), SIGNAL(activated())); + connect(but, TQT_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQT_SIGNAL(activated())); tabWidget()->setCornerWidget(but, TopRight); } #endif @@ -124,29 +124,29 @@ void %{APPNAMELC}kmdi::setupActions() { setXMLFile("%{APPNAMELC}_shell.rc"); - KStdAction::openNew(this, SLOT(slotFileNew()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::tipOfDay( this, SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::close(this, SLOT(slotFileClose()), actionCollection()); - KStdAction::quit(this, SLOT(slotFileQuit()), actionCollection()); + KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); KAction* action = KStdAction::configureToolbars(this, - SLOT(optionsConfigureToolbars()), actionCollection()); + TQT_SLOT(optionsConfigureToolbars()), actionCollection()); createGUI( NULL ); } void %{APPNAMELC}kmdi::showTip() { - KTipDialog::showTip(this,QString::null,true); + KTipDialog::showTip(this,TQString::null,true); } void %{APPNAMELC}kmdi::showTipOnStart() @@ -170,8 +170,8 @@ void %{APPNAMELC}kmdi::slotFileNew() void %{APPNAMELC}kmdi::openURL(const KURL & url) { // check if the url is not already opened first - QValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); - QValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); + TQValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); + TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); for (; it != end; ++it) { %{APPNAMELC}kmdiView *view = *it; @@ -283,9 +283,9 @@ void %{APPNAMELC}kmdi::optionsConfigureKeys() { //KKeyDialog::configure(actionCollection()); KKeyDialog dlg( false, this ); - QPtrList<KXMLGUIClient> clients = guiFactory()->clients(); + TQPtrList<KXMLGUIClient> clients = guiFactory()->clients(); - for( QPtrListIterator<KXMLGUIClient> it( clients ); it.current(); ++it ) + for( TQPtrListIterator<KXMLGUIClient> it( clients ); it.current(); ++it ) dlg.insert ( (*it)->actionCollection(), (*it)->instance()->aboutData()->programName() ); dlg.configure(); @@ -320,15 +320,15 @@ void %{APPNAMELC}kmdi::optionsPreferences() KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new prefs(), i18n("General"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); dialog->show(); } void %{APPNAMELC}kmdi::settingsChanged() { // propagate the changes to our views - /*QValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); - QValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); + /*TQValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); + TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); for (; it != end; ++it) { %{APPNAMELC}kmdiView *view = *it; @@ -336,19 +336,19 @@ void %{APPNAMELC}kmdi::settingsChanged() }*/ } -void %{APPNAMELC}kmdi::changeStatusbar(const QString& text) +void %{APPNAMELC}kmdi::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text, 2000); } -void %{APPNAMELC}kmdi::dragEnterEvent(QDragEnterEvent *event) +void %{APPNAMELC}kmdi::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void %{APPNAMELC}kmdi::dropEvent(QDropEvent *event) +void %{APPNAMELC}kmdi::dropEvent(TQDropEvent *event) { KURL::List urls; @@ -365,7 +365,7 @@ void %{APPNAMELC}kmdi::dropEvent(QDropEvent *event) bool %{APPNAMELC}kmdi::queryClose() { - QValueList<%{APPNAMELC}kmdiView*>::iterator it; + TQValueList<%{APPNAMELC}kmdiView*>::iterator it; // check if we can close all documents for (it = m_views.begin(); it != m_views.end(); ++it) diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h index 370a3034..8ff90205 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}KMDI_H #define _%{APPNAMEUC}KMDI_H -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kapplication.h> #include <kmdimainfrm.h> @@ -37,8 +37,8 @@ class %{APPNAMELC}kmdi : public KMdiMainFrm void openURL( const KURL& ); protected: - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); virtual bool queryClose(); private slots: @@ -57,7 +57,7 @@ class %{APPNAMELC}kmdi : public KMdiMainFrm void newToolbarConfig(); - void changeStatusbar(const QString& text); + void changeStatusbar(const TQString& text); void currentChanged( KMdiChildView *current ); bool requestClose(KMdiChildView* view); @@ -68,7 +68,7 @@ class %{APPNAMELC}kmdi : public KMdiMainFrm void setupAccel(); void setupActions(); - QValueList<%{APPNAMELC}kmdiView*> m_views; + TQValueList<%{APPNAMELC}kmdiView*> m_views; KToggleAction *m_toolbarAction; KToggleAction *m_statusbarAction; diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp index c4cfbf65..d7c00001 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp @@ -1,7 +1,7 @@ %{CPP_TEMPLATE} -#include <qpixmap.h> -#include <qlayout.h> +#include <tqpixmap.h> +#include <tqlayout.h> #include <kiconloader.h> #include <klocale.h> @@ -13,7 +13,7 @@ #include "%{APPNAMELC}kmdiView.h" - %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( QWidget *parentWidget, const char *name ) + %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name ) : KMdiChildView( parentWidget, name ) { m_part = NULL; @@ -35,11 +35,11 @@ part()->widget()->setFocus(); setFocusProxy(part()->widget()); - QBoxLayout* layout = new QHBoxLayout(this, 0, -1, "kdissertviewlayout" ); - part()->widget()->reparent( this, QPoint(0, 0) ); + TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); + part()->widget()->reparent( this, TQPoint(0, 0) ); layout->addWidget( part()->widget() ); - // connect( m_part, SIGNAL(stateChanged()), this, SLOT(updateCaption()) ); + // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); } else { diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h index 66e5203b..af05df48 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h @@ -16,7 +16,7 @@ class %{APPNAMELC}kmdiView : public KMdiChildView { Q_OBJECT public: - %{APPNAMELC}kmdiView( QWidget *parentWidget=0L, const char *name=0L ); + %{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L ); virtual ~%{APPNAMELC}kmdiView(); KParts::ReadWritePart *part() { return m_part; } diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp index da41685f..8171c6b8 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp @@ -1,7 +1,7 @@ %{CPP_TEMPLATE} -#include <qfileinfo.h> -#include <qframe.h> +#include <tqfileinfo.h> +#include <tqframe.h> #include <kparts/part.h> #include <kate/document.h> @@ -12,7 +12,7 @@ #include "kmdikonsole.h" -kmdikonsole::kmdikonsole(QWidget *parent, const char *name) : QVBox(parent, name) +kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name) { m_haskonsole = false; respawn(); @@ -31,17 +31,17 @@ void kmdikonsole::respawn() if (!m_part) return; - if (m_part->widget()->inherits("QFrame")) - ((QFrame*)m_part->widget())->setFrameStyle(QFrame::Panel|QFrame::Sunken); + if (m_part->widget()->inherits("TQFrame")) + ((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); m_haskonsole=true; - connect( m_part, SIGNAL(destroyed()), this, SLOT(slotDestroyed()) ); + connect( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); m_part->widget()->show(); show(); } -void kmdikonsole::setDirectory(const QString &dirname) +void kmdikonsole::setDirectory(const TQString &dirname) { if (m_haskonsole) { @@ -51,9 +51,9 @@ void kmdikonsole::setDirectory(const QString &dirname) } } -void kmdikonsole::showEvent(QShowEvent *ev) +void kmdikonsole::showEvent(TQShowEvent *ev) { - QWidget::showEvent(ev); + TQWidget::showEvent(ev); activate(); } diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h index 83adb417..ef5a2c1e 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h @@ -3,18 +3,18 @@ #ifndef KMDIKONSOLE_H #define KMDIKONSOLE_H -#include <qvbox.h> +#include <tqvbox.h> class kmdikonsole : public QVBox { Q_OBJECT public: - kmdikonsole( QWidget* parent, const char* name=0); + kmdikonsole( TQWidget* parent, const char* name=0); ~kmdikonsole(); public slots: - void setDirectory(const QString & dir); + void setDirectory(const TQString & dir); void activate(); private slots: @@ -22,7 +22,7 @@ class kmdikonsole : public QVBox void respawn(); protected: - void showEvent(QShowEvent *ev); + void showEvent(TQShowEvent *ev); private: KParts::ReadOnlyPart *m_part; diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index bc343554..2a696ea0 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -4,10 +4,10 @@ #include "settings.h" #include "prefs.h" -#include <qdragobject.h> +#include <tqdragobject.h> #include <kprinter.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> #include <kconfigdialog.h> #include <kglobal.h> @@ -48,10 +48,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); showTipOnStart(); } @@ -62,22 +62,22 @@ void %{APPNAME}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::tipOfDay( this, SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, - m_view, SLOT(switchColors()), + m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -140,17 +140,17 @@ void %{APPNAME}::optionsPreferences() // to the names of the variables in the .kcfg file KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), m_view, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); dialog->show(); } -void %{APPNAME}::changeStatusbar(const QString& text) +void %{APPNAME}::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text, 2000); } -void %{APPNAME}::changeCaption(const QString& text) +void %{APPNAME}::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); @@ -158,7 +158,7 @@ void %{APPNAME}::changeCaption(const QString& text) void %{APPNAME}::showTip() { - KTipDialog::showTip(this,QString::null,true); + KTipDialog::showTip(this,TQString::null,true); } void %{APPNAME}::showTipOnStart() diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h index 4f855793..e812716d 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.h +++ b/languages/cpp/app_templates/kscons_kxt/app.h @@ -53,8 +53,8 @@ private slots: void newToolbarConfig(); void showTip(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); private: void setupAccel(); diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp index 7dc99f61..2bcc9c6a 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.cpp +++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp @@ -4,9 +4,9 @@ #include "settings.h" #include <klocale.h> -#include <qlabel.h> +#include <tqlabel.h> -%{APPNAME}View::%{APPNAME}View(QWidget *parent) +%{APPNAME}View::%{APPNAME}View(TQWidget *parent) : %{APPNAME}view_base(parent) { settingsChanged(); @@ -20,7 +20,7 @@ void %{APPNAME}View::switchColors() { // switch the foreground/background colors of the label - QColor color = Settings::col_background(); + TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h index 86d097a4..96f0845f 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.h +++ b/languages/cpp/app_templates/kscons_kxt/appview.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}VIEW_H_ #define _%{APPNAMEUC}VIEW_H_ -#include <qwidget.h> +#include <tqwidget.h> #include "%{APPNAMELC}view_base.h" @@ -26,7 +26,7 @@ public: /** * Default constructor */ - %{APPNAME}View(QWidget *parent); + %{APPNAME}View(TQWidget *parent); /** * Destructor @@ -37,12 +37,12 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); public slots: void switchColors(); diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp index f4418571..efdbf40b 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp @@ -1,8 +1,8 @@ %{CPP_TEMPLATE} #include <stdlib.h> -#include <qcheckbox.h> -#include <qcolor.h> +#include <tqcheckbox.h> +#include <tqcolor.h> #include <kapplication.h> #include <klocale.h> #include <kpushbutton.h> @@ -24,7 +24,7 @@ extern "C" return new %{APPNAME}( id ); } - QDialog *kss_setup() + TQDialog *kss_setup() { KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Setup(); @@ -33,15 +33,15 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters -%{APPNAME}Setup::%{APPNAME}Setup( QWidget *parent, const char *name ) +%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) : %{APPNAME}UI( parent, name, TRUE ) { /// @todo //Connect your signals and slots here to configure the screen saver. - connect( OkayPushButton, SIGNAL( released() ), - SLOT( slotOkPressed() ) ); - connect( CancelPushButton, SIGNAL( released() ), - SLOT( slotCancelPressed() ) ); + connect( OkayPushButton, TQT_SIGNAL( released() ), + TQT_SLOT( slotOkPressed() ) ); + connect( CancelPushButton, TQT_SIGNAL( released() ), + TQT_SLOT( slotCancelPressed() ) ); } @@ -101,7 +101,7 @@ void %{APPNAME}::blank() { /// @todo //Add your code to render the screen. - setBackgroundColor( QColor(black) ); + setBackgroundColor( TQColor(black) ); // erase(); } diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h index 1301083d..a5d252a5 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.h @@ -21,7 +21,7 @@ class %{APPNAME}Setup : public %{APPNAME}UI { Q_OBJECT public: - %{APPNAME}Setup( QWidget *parent = NULL, const char *name = NULL ); + %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); private slots: void slotOkPressed(); diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index 6e2ce524..ce5577cb 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -4,10 +4,10 @@ #include "settings.h" #include "prefs.h" -#include <qdragobject.h> +#include <tqdragobject.h> #include <kprinter.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> #include <kconfigdialog.h> #include <kglobal.h> @@ -47,10 +47,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); } @@ -60,19 +60,19 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAMELC}View KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, - m_view, SLOT(switchColors()), + m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -135,17 +135,17 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), m_view, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); dialog->show(); } -void %{APPNAMELC}::changeStatusbar(const QString& text) +void %{APPNAMELC}::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text, 2000); } -void %{APPNAMELC}::changeCaption(const QString& text) +void %{APPNAMELC}::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 22037de2..09f031c4 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -47,8 +47,8 @@ private slots: void optionsPreferences(); void newToolbarConfig(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); private: void setupAccel(); diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 35e23682..30d627fe 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -4,9 +4,9 @@ #include "settings.h" #include <klocale.h> -#include <qlabel.h> +#include <tqlabel.h> -%{APPNAMELC}View::%{APPNAMELC}View(QWidget *parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) : %{APPNAMELC}view_base(parent) { settingsChanged(); @@ -20,7 +20,7 @@ void %{APPNAMELC}View::switchColors() { // switch the foreground/background colors of the label - QColor color = Settings::col_background(); + TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index 45a10de7..5b69ae24 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}VIEW_H_ #define _%{APPNAMEUC}VIEW_H_ -#include <qwidget.h> +#include <tqwidget.h> #include "%{APPNAMELC}view_base.h" @@ -26,7 +26,7 @@ public: /** * Default constructor */ - %{APPNAMELC}View(QWidget *parent); + %{APPNAMELC}View(TQWidget *parent); /** * Destructor @@ -37,12 +37,12 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); private slots: void switchColors(); diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 1b5eea45..7f4cda15 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -9,12 +9,12 @@ #include <noatun/controls.h> #include <noatun/effects.h> -#include <qpushbutton.h> -#include <qdragobject.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qobjectlist.h> -#include <qobjectdict.h> +#include <tqpushbutton.h> +#include <tqdragobject.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqobjectlist.h> +#include <tqobjectdict.h> #include <kpopupmenu.h> #include <kstatusbar.h> @@ -25,53 +25,53 @@ //#include <kfiledialog.h> //#include <kconfig.h> -%{APPNAME}UI::%{APPNAME}UI() : QWidget(0,"%{APPNAME}UI"), UserInterface() +%{APPNAME}UI::%{APPNAME}UI() : TQWidget(0,"%{APPNAME}UI"), UserInterface() { setAcceptDrops(true); static const int buttonSize=32; - mBack=new QPushButton(this); + mBack=new TQPushButton(this); mBack->setFixedSize(buttonSize,buttonSize); mBack->setPixmap(BarIcon("noatunback")); - connect(mBack, SIGNAL(clicked()), napp->player(), SLOT(back())); - QToolTip::add(mBack,i18n("Back")); + connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + TQToolTip::add(mBack,i18n("Back")); - mStop=new QPushButton(this); + mStop=new TQPushButton(this); mStop->setFixedSize(buttonSize,buttonSize); mStop->setPixmap(BarIcon("noatunstop")); - connect(mStop, SIGNAL(clicked()), napp->player(), SLOT(stop())); - QToolTip::add(mStop, i18n("Stop")); + connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + TQToolTip::add(mStop, i18n("Stop")); - mPlay=new QPushButton(this); + mPlay=new TQPushButton(this); mPlay->setToggleButton(true); mPlay->setFixedSize(buttonSize,buttonSize); mPlay->setPixmap(BarIcon("noatunplay")); - connect(mPlay, SIGNAL(clicked()), napp->player(), SLOT(playpause())); - QToolTip::add(mPlay, i18n("Play")); + connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause())); + TQToolTip::add(mPlay, i18n("Play")); - mForward=new QPushButton(this); + mForward=new TQPushButton(this); mForward->setFixedSize(buttonSize,buttonSize); mForward->setPixmap(BarIcon("noatunforward")); - connect(mForward, SIGNAL(clicked()), napp->player(), SLOT(forward())); - QToolTip::add(mForward, i18n("Forward")); + connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + TQToolTip::add(mForward, i18n("Forward")); - mPlaylist=new QPushButton(this); + mPlaylist=new TQPushButton(this); mPlaylist->setToggleButton(true); mPlaylist->setFixedSize(buttonSize,buttonSize); mPlaylist->setPixmap(BarIcon("noatunplaylist")); - connect(mPlaylist, SIGNAL(clicked()), napp->player(), SLOT(toggleListView())); - QToolTip::add(mPlaylist, i18n("Playlist")); + connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView())); + TQToolTip::add(mPlaylist, i18n("Playlist")); - mLoop=new QPushButton(this); + mLoop=new TQPushButton(this); mLoop->setFixedSize(buttonSize,buttonSize); mLoop->setPixmap(BarIcon("noatunloopnone")); - connect(mLoop, SIGNAL(clicked()), napp->player(), SLOT(loop())); - QToolTip::add(mLoop, i18n("Change loop style")); + connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop())); + TQToolTip::add(mLoop, i18n("Change loop style")); - mPopup=new QPushButton(this); + mPopup=new TQPushButton(this); mPopup->setFixedSize(buttonSize,buttonSize); mPopup->setPixmap(BarIcon("noatun")); - connect(mPopup, SIGNAL(clicked()), SLOT(popup())); + connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); mVolume=new L33tSlider(0,100,10,0, Horizontal, this); @@ -81,7 +81,7 @@ mStatusBar=new KStatusBar(this); - QGridLayout *l=new QGridLayout(this); + TQGridLayout *l=new TQGridLayout(this); l->addWidget(mBack,0,0); l->addWidget(mStop,0,1); l->addWidget(mPlay,0,2); @@ -98,33 +98,33 @@ statusBar()->message(i18n("No File Loaded")); statusBar()->insertItem("--:--/--:--", 1, 0, true); - connect(napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); - connect(napp, SIGNAL(showYourself()), this, SLOT(show()) ); + connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); + connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); - connect(napp->player(), SIGNAL(playing()), this, SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), this, SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), SIGNAL(timeout()), this, SLOT(slotTimeout())); - connect(napp->player(), SIGNAL(loopTypeChange(int)), this, SLOT(changeLoopType(int))); + connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int))); /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(seeker(), SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int))); - connect(this, SIGNAL(skipTo(int)), napp->player(), SLOT(skipTo(int))); - connect(seeker(), SIGNAL(sliderMoved(int)), SLOT(sliderMoved(int))); + connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); + connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); + connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); - connect(mVolume, SIGNAL(sliderMoved(int)), napp->player(), SLOT(setVolume(int))); - connect(mVolume, SIGNAL(userChanged(int)), napp->player(), SLOT(setVolume(int))); + connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int))); + connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int))); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(playlistShown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(playlistHidden())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (QPtrListIterator<QObject> i(*children()); i.current(); ++i) + for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -140,23 +140,23 @@ /** save settings here */ } -void %{APPNAME}UI::closeEvent(QCloseEvent*) +void %{APPNAME}UI::closeEvent(TQCloseEvent*) { unload(); } -void %{APPNAME}UI::showEvent(QShowEvent*e) +void %{APPNAME}UI::showEvent(TQShowEvent*e) { - QWidget::showEvent(e); + TQWidget::showEvent(e); } -void %{APPNAME}UI::dragEnterEvent(QDragEnterEvent *event) +void %{APPNAME}UI::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void %{APPNAME}UI::dropEvent(QDropEvent *event) +void %{APPNAME}UI::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -166,14 +166,14 @@ void %{APPNAME}UI::dropEvent(QDropEvent *event) } } -void %{APPNAME}UI::mouseReleaseEvent(QMouseEvent *e) +void %{APPNAME}UI::mouseReleaseEvent(TQMouseEvent *e) { - QWidget::mouseReleaseEvent(e); + TQWidget::mouseReleaseEvent(e); if (e->button()!=RightButton) return; NoatunStdAction::ContextMenu::showContextMenu(); } -void %{APPNAME}UI::changeStatusbar(const QString& text, const QString &text2) +void %{APPNAME}UI::changeStatusbar(const TQString& text, const TQString &text2) { if (!text2.isNull()) statusBar()->changeItem(text2, 1); @@ -181,7 +181,7 @@ void %{APPNAME}UI::changeStatusbar(const QString& text, const QString &text2) statusBar()->message(!text.isNull() ? text : napp->player()->current().title()); } -void %{APPNAME}UI::changeCaption(const QString& text) +void %{APPNAME}UI::changeCaption(const TQString& text) { setCaption(text); } @@ -265,21 +265,21 @@ void %{APPNAME}UI::changeLoopType(int t) } } -bool %{APPNAME}UI::eventFilter(QObject *o, QEvent *e) +bool %{APPNAME}UI::eventFilter(TQObject *o, TQEvent *e) { - if ((e->type() == QEvent::MouseButtonRelease) - && ((static_cast<QMouseEvent*>(e))->button()==RightButton)) + if ((e->type() == TQEvent::MouseButtonRelease) + && ((static_cast<TQMouseEvent*>(e))->button()==RightButton)) { - mouseReleaseEvent(static_cast<QMouseEvent*>(e)); + mouseReleaseEvent(static_cast<TQMouseEvent*>(e)); return true; } - if (e->type() == QEvent::Wheel) + if (e->type() == TQEvent::Wheel) { - wheelEvent(static_cast<QWheelEvent*>(e)); + wheelEvent(static_cast<TQWheelEvent*>(e)); return true; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } void %{APPNAME}UI::playlistShown() @@ -292,7 +292,7 @@ void %{APPNAME}UI::playlistHidden() mPlaylist->setOn(false); } -void %{APPNAME}UI::wheelEvent(QWheelEvent *e) +void %{APPNAME}UI::wheelEvent(TQWheelEvent *e) { int delta=e->delta(); mVolume->setValue(mVolume->value()+(delta/120)); diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.h b/languages/cpp/app_templates/noatunui/plugin_impl.h index 970246d4..e918f925 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.h +++ b/languages/cpp/app_templates/noatunui/plugin_impl.h @@ -23,27 +23,27 @@ class KStatusBar; * @version 0.1 * Note: You can user _every_ widget for implementing your userinterface. */ -class %{APPNAME}UI : public QWidget, public UserInterface +class %{APPNAME}UI : public TQWidget, public UserInterface { Q_OBJECT public: %{APPNAME}UI(); virtual ~%{APPNAME}UI(); - void load(const QString& url); + void load(const TQString& url); protected: - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); - virtual void closeEvent(QCloseEvent*); - virtual void showEvent(QShowEvent*e); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); + virtual void closeEvent(TQCloseEvent*); + virtual void showEvent(TQShowEvent*e); /** RMB -> context menu */ - virtual void mouseReleaseEvent(QMouseEvent *); - virtual bool eventFilter(QObject*, QEvent*); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual bool eventFilter(TQObject*, TQEvent*); /** volume control */ - virtual void wheelEvent(QWheelEvent *e); + virtual void wheelEvent(TQWheelEvent *e); protected: - QSlider *seeker() const { return mSeeker; } + TQSlider *seeker() const { return mSeeker; } KStatusBar *statusBar() const { return mStatusBar; } public slots: @@ -64,13 +64,13 @@ signals: void skipTo( int ); // emitted by skipToWrapper() private slots: - void changeStatusbar(const QString& text, const QString &text2=0); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text, const TQString &text2=0); + void changeCaption(const TQString& text); void popup(); private: - QPushButton *mBack, *mStop, *mPlay, *mForward, *mPlaylist, *mPopup, *mLoop; - QSlider *mSeeker, *mVolume; + TQPushButton *mBack, *mStop, *mPlay, *mForward, *mPlaylist, *mPopup, *mLoop; + TQSlider *mSeeker, *mVolume; KStatusBar *mStatusBar; }; diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index 84f3f9d5..ebb4233c 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -1,5 +1,5 @@ #include "%{APPNAMELC}.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <opie/oapplicationfactory.h> typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory; @@ -9,10 +9,10 @@ OPIE_EXPORT_APP( %{APPNAME}Factory ) * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( QWidget* parent, const char* name, WFlags fl ) +%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, SIGNAL(clicked()), this, SLOT(goodBye())); + connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 1ba8ead7..2a9c9efa 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -7,10 +7,10 @@ class %{APPNAME} : public %{APPNAME}Base Q_OBJECT public: - static QString appName() { - return QString::fromLatin1("%{APPNAMELC}" ); + static TQString appName() { + return TQString::fromLatin1("%{APPNAMELC}" ); } - %{APPNAME}( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp index 1474a0e4..3264314c 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp @@ -1,6 +1,6 @@ -#include <qlabel.h> -#include <qpainter.h> -#include <qmessagebox.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqmessagebox.h> #include <qpe/applnk.h> // for AppLnk #include <qpe/resource.h> // for Resource loading @@ -8,8 +8,8 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(QWidget *parent) - : QWidget( parent, "%{APPNAME} Applet" ) { +%{APPNAME}::%{APPNAME}(TQWidget *parent) + : TQWidget( parent, "%{APPNAME} Applet" ) { /* * we will load an Image, scale it for the right usage * remember your applet might be used by different @@ -19,7 +19,7 @@ * the only class that allows scaling. */ - QImage image = Resource::loadImage("%{APPNAMELC}/%{APPNAMELC}"); + TQImage image = Resource::loadImage("%{APPNAMELC}/%{APPNAMELC}"); /* * smooth scale to AppLnk smallIconSize for applest * smallIconSize gets adjusted to the resolution @@ -32,7 +32,7 @@ * now we need to convert the Image to a Pixmap cause these * can be drawn more easily */ - m_pix = new QPixmap(); + m_pix = new TQPixmap(); m_pix->convertFromImage( image ); /* @@ -56,15 +56,15 @@ * global with mapToGlobal(). Then you might also need to * move the widgets so it is visible */ -void %{APPNAME}::mousePressEvent(QMouseEvent* ) { - QMessageBox::information(this, tr("No action taken"), +void %{APPNAME}::mousePressEvent(TQMouseEvent* ) { + TQMessageBox::information(this, tr("No action taken"), tr("<qt>This Plugin does not yet support anything usefule aye.</qt>"), - QMessageBox::Ok ); + TQMessageBox::Ok ); } -void %{APPNAME}::paintEvent( QPaintEvent* ) { - QPainter p(this); +void %{APPNAME}::paintEvent( TQPaintEvent* ) { + TQPainter p(this); /* simpy draw the pixmap from the start of this widget */ p.drawPixmap(0, 0, *m_pix ); @@ -89,7 +89,7 @@ void %{APPNAME}::paintEvent( QPaintEvent* ) { /* * For the taskbar interface return a Widget */ -QWidget* %{APPNAME}Impl::applet( QWidget* parent ) { +TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) { /* * There are problems with ownership. So we add * our ownlist and clear this; diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h index 19475367..7cca8ee7 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.h +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h @@ -26,8 +26,8 @@ * luckiy there is a macro for the reference counting * We provide an Implementation of the interface. */ -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> #include <qpe/taskbarappletinterface.h> @@ -35,18 +35,18 @@ /* * Because we only draw an Icon in a fixed width and height * we declare and define %{APPNAME} here and you could use QLabel - * setPixmap or use QWidget and draw yourself. + * setPixmap or use TQWidget and draw yourself. * You might also want to reimplement mouse*Event to use some simple actions */ -class %{APPNAME} : public QWidget { +class %{APPNAME} : public TQWidget { Q_OBJECT public: - %{APPNAME}(QWidget *parent); + %{APPNAME}(TQWidget *parent); ~%{APPNAME}(); private: - void mousePressEvent( QMouseEvent* ); - void paintEvent( QPaintEvent* ); - QPixmap *m_pix; + void mousePressEvent( TQMouseEvent* ); + void paintEvent( TQPaintEvent* ); + TQPixmap *m_pix; }; class %{APPNAME}Impl : public TaskbarAppletInterface { @@ -57,7 +57,7 @@ public: QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - QWidget *applet( QWidget* parent ); + TQWidget *applet( TQWidget* parent ); int position()const; /* diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index 6da986eb..db2e4285 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -1,43 +1,43 @@ -#include <qwidget.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qsignalmapper.h> -#include <qpushbutton.h> +#include <tqwidget.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqsignalmapper.h> +#include <tqpushbutton.h> #include <qpe/resource.h> #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(QWidget* par, WFlags fl ) - : QHBox(par, "name", fl ) +%{APPNAME}::%{APPNAME}(TQWidget* par, WFlags fl ) + : TQHBox(par, "name", fl ) { - QCheckBox *box1 = new QCheckBox(tr("Alt"),this); - connect(box1,SIGNAL(toggled(bool)), - this,SLOT(slotAlt(bool))); + TQCheckBox *box1 = new TQCheckBox(tr("Alt"),this); + connect(box1,TQT_SIGNAL(toggled(bool)), + this,TQT_SLOT(slotAlt(bool))); m_alt = box1; - box1 = new QCheckBox(tr("Shift"),this ); - connect(box1,SIGNAL(toggled(bool)), - this,SLOT(slotShift(bool))); + box1 = new TQCheckBox(tr("Shift"),this ); + connect(box1,TQT_SIGNAL(toggled(bool)), + this,TQT_SLOT(slotShift(bool))); m_shi = box1; - box1 = new QCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this ); - connect(box1,SIGNAL(toggled(bool)), - this,SLOT(slotCtrl(bool))); + box1 = new TQCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this ); + connect(box1,TQT_SIGNAL(toggled(bool)), + this,TQT_SLOT(slotCtrl(bool))); m_ctrl = box1; - QSignalMapper *map = new QSignalMapper(this); - QPushButton *btn = new QPushButton("a",this); + TQSignalMapper *map = new TQSignalMapper(this); + TQPushButton *btn = new TQPushButton("a",this); map->setMapping(btn,0); - connect(btn,SIGNAL(clicked()),map,SLOT(map())); + connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); - btn = new QPushButton("b",this); + btn = new TQPushButton("b",this); map->setMapping(btn,1); - connect(btn,SIGNAL(clicked()),map,SLOT(map())); + connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); - btn = new QPushButton("c",this); + btn = new TQPushButton("c",this); map->setMapping(btn,2); - connect(btn,SIGNAL(clicked()),map,SLOT(map())); + connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); - connect(map,SIGNAL(mapped(int)), - this,SLOT(slotKey(int))); + connect(map,TQT_SIGNAL(mapped(int)), + this,TQT_SLOT(slotKey(int))); resetState(); } @@ -102,7 +102,7 @@ void %{APPNAME}::slotCtrl(bool b){ delete m_icn; } -QWidget *%{APPNAME}Impl::inputMethod( QWidget *parent, Qt::WFlags f ) +TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, Qt::WFlags f ) { if ( !m_pickboard ) m_pickboard = new %{APPNAME}( parent, f ); @@ -115,22 +115,22 @@ void %{APPNAME}Impl::resetState() m_pickboard->resetState(); } -QPixmap *%{APPNAME}Impl::icon() +TQPixmap *%{APPNAME}Impl::icon() { if ( !m_icn ) - m_icn = new QPixmap(Resource::loadPixmap("Tux")); + m_icn = new TQPixmap(Resource::loadPixmap("Tux")); return m_icn; } -QString %{APPNAME}Impl::name() +TQString %{APPNAME}Impl::name() { - return QObject::tr("Example Input"); + return TQObject::tr("Example Input"); } -void %{APPNAME}Impl::onKeyPress( QObject *receiver, const char *slot ) +void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot ) { if ( m_pickboard ) - QObject::connect( m_pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); + TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); } #ifndef QT_NO_COMPONENT diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h index 362e59b3..17972b29 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.h +++ b/languages/cpp/app_templates/opieinput/simpleimpl.h @@ -1,16 +1,16 @@ #ifndef %{APPNAME}IMPL_H #define %{APPNAME}IMPL_H -#include <qhbox.h> +#include <tqhbox.h> #include <qpe/inputmethodinterface.h> class QPixmap; class QCheckBox; -class %{APPNAME} : public QHBox { +class %{APPNAME} : public TQHBox { Q_OBJECT public: - %{APPNAME}( QWidget *par, WFlags f ); + %{APPNAME}( TQWidget *par, WFlags f ); ~%{APPNAME}(); void resetState(); private slots: @@ -22,7 +22,7 @@ signals: void key(ushort,ushort,ushort,bool,bool); private: int m_state; - QCheckBox *m_alt,*m_shi,*m_ctrl; + TQCheckBox *m_alt,*m_shi,*m_ctrl; }; class %{APPNAME}Impl : public InputMethodInterface @@ -36,15 +36,15 @@ public: Q_REFCOUNT #endif - virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); + virtual TQWidget *inputMethod( TQWidget *parent, Qt::WFlags f ); virtual void resetState(); - virtual QPixmap *icon(); - virtual QString name(); - virtual void onKeyPress( QObject *receiver, const char *slot ); + virtual TQPixmap *icon(); + virtual TQString name(); + virtual void onKeyPress( TQObject *receiver, const char *slot ); private: %{APPNAME} *m_pickboard; - QPixmap *m_icn; + TQPixmap *m_icn; }; #endif diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp index 95245661..17b59a3e 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp @@ -4,13 +4,13 @@ #include <qpe/resource.h> /* QT */ -#include <qiconset.h> -#include <qpopupmenu.h> -#include <qmessagebox.h> +#include <tqiconset.h> +#include <tqpopupmenu.h> +#include <tqmessagebox.h> %{APPNAME}::%{APPNAME}() - :QObject( 0, "%{APPNAME}" ) + :TQObject( 0, "%{APPNAME}" ) { } @@ -22,27 +22,27 @@ int %{APPNAME}::position() const return 3; } -QString %{APPNAME}::name() const +TQString %{APPNAME}::name() const { return tr( "MenuApplet Example Name" ); } -QString %{APPNAME}::text() const +TQString %{APPNAME}::text() const { return tr( "Click the white rabbit" ); } -QIconSet %{APPNAME}::icon() const +TQIconSet %{APPNAME}::icon() const { - QPixmap pix; - QImage img = Resource::loadImage( "Tux" ); + TQPixmap pix; + TQImage img = Resource::loadImage( "Tux" ); if ( !img.isNull() ) pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); return pix; } -QPopupMenu* %{APPNAME}::popup(QWidget*) const +TQPopupMenu* %{APPNAME}::popup(TQWidget*) const { /* no subdir */ return 0; @@ -50,7 +50,7 @@ QPopupMenu* %{APPNAME}::popup(QWidget*) const void %{APPNAME}::activated() { - QMessageBox::information(0,tr("No white rabbit found"), + TQMessageBox::information(0,tr("No white rabbit found"), tr("<qt>No white rabbit was seen near Opie." "Only the beautiful OpieZilla is available" "for your pleassure</qt>")); diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h index 3961e3c4..b384ee2d 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.h +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h @@ -3,9 +3,9 @@ #include <qpe/menuappletinterface.h> -#include <qobject.h> +#include <tqobject.h> -class %{APPNAME} : public QObject, public MenuAppletInterface +class %{APPNAME} : public TQObject, public MenuAppletInterface { Q_OBJECT @@ -19,13 +19,13 @@ public: virtual int position() const; - virtual QString name ( ) const; - virtual QIconSet icon ( ) const; - virtual QString text ( ) const; - /* virtual QString tr( const char* ) const; - virtual QString tr( const char*, const char* ) const; + virtual TQString name ( ) const; + virtual TQIconSet icon ( ) const; + virtual TQString text ( ) const; + /* virtual TQString tr( const char* ) const; + virtual TQString tr( const char*, const char* ) const; */ - virtual QPopupMenu *popup ( QWidget *parent ) const; + virtual TQPopupMenu *popup ( TQWidget *parent ) const; virtual void activated ( ); }; diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h index 9158a7c8..7a8882b4 100644 --- a/languages/cpp/app_templates/opienet/simmplemodule.h +++ b/languages/cpp/app_templates/opienet/simmplemodule.h @@ -12,17 +12,17 @@ public: VirtualModule(); ~VirtualModule(); - const QString type() {return QString::fromLatin1("vpn" );} - void setProfile( const QString& ) {} + const TQString type() {return TQString::fromLatin1("vpn" );} + void setProfile( const TQString& ) {} bool isOwner( Interface* ); - QWidget *configure( Interface* ); - QWidget *information( Interface* ); + TQWidget *configure( Interface* ); + TQWidget *information( Interface* ); QList<Interface> getInterfaces(); - void possibleNewInterfaces( QMap<QString, QString>& ); - Interface *addNewInterface( const QString& ); + void possibleNewInterfaces( TQMap<TQString, TQString>& ); + Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - QString getPixmapName( Interface* ) {return QString::fromLatin1("Tux"); } - void receive( const QCString&, const QByteArray& ar ) {} // don't listen + TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: QList<Interface> m_interfaces; }; diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index 9182a2f9..bbabcbda 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -1,6 +1,6 @@ #include "%{APPNAMELC}iface.h" -%{APPNAME}Interface::%{APPNAME}Interface( QObject* parent, +%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent, const char* name, bool status ) : Interface(parent, name, status ) @@ -16,7 +16,7 @@ bool %{APPNAME}Interface::refresh() { * something actual existing * I take wlan0 in my case */ - QString old = getInterfaceName(); + TQString old = getInterfaceName(); qWarning("Interface name was " + old ); setInterfaceName( "wlan0" ); diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index f235c160..ef514697 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -7,7 +7,7 @@ class %{APPNAME}Interface : public Interface { Q_OBJECT public: - %{APPNAME}Interface(QObject* parent, const char* name = "vpn", bool up = false ); + %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false ); ~%{APPNAME}Interface(); public slots: diff --git a/languages/cpp/app_templates/opienet/simplemodule.cpp b/languages/cpp/app_templates/opienet/simplemodule.cpp index a67974a8..0a96c844 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.cpp +++ b/languages/cpp/app_templates/opienet/simplemodule.cpp @@ -1,4 +1,4 @@ -#include <qwidget.h> +#include <tqwidget.h> #include <interfaces/interfaceinformationimp.h> @@ -32,12 +32,12 @@ bool %{APPNAME}Module::isOwner( Interface* iface ) { return m_interfaces.find( iface ) != -1; } -QWidget* %{APPNAME}Module::configure( Interface* ) { +TQWidget* %{APPNAME}Module::configure( Interface* ) { /* We don't have any Config for now */ return 0l; } -QWidget* %{APPNAME}Module::information( Interface* iface ) { +TQWidget* %{APPNAME}Module::information( Interface* iface ) { return new InterfaceInformationImp(0, "Interface info", iface ); } @@ -45,13 +45,13 @@ QList<Interface> %{APPNAME}Module::getInterfaces() { return m_interfaces; } -void %{APPNAME}Module::possibleNewInterfaces( QMap<QString, QString>& map) { - map.insert( QObject::tr("VPN PPTP"), - QObject::tr("Add new Point to Point Tunnel Protocol connection" ) ); +void %{APPNAME}Module::possibleNewInterfaces( TQMap<TQString, TQString>& map) { + map.insert( TQObject::tr("VPN PPTP"), + TQObject::tr("Add new Point to Point Tunnel Protocol connection" ) ); } -Interface* %{APPNAME}Module::addNewInterface( const QString& ) { +Interface* %{APPNAME}Module::addNewInterface( const TQString& ) { /* check the str if we support more interfaces */ /* Interface* iface = new %{APPNAME}Interface( 0 ); diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h index 1b02b688..4120d811 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.h +++ b/languages/cpp/app_templates/opienet/simplemodule.h @@ -12,17 +12,17 @@ public: %{APPNAME}Module(); ~%{APPNAME}Module(); - const QString type() {return QString::fromLatin1("vpn" );} - void setProfile( const QString& ) {} + const TQString type() {return TQString::fromLatin1("vpn" );} + void setProfile( const TQString& ) {} bool isOwner( Interface* ); - QWidget *configure( Interface* ); - QWidget *information( Interface* ); + TQWidget *configure( Interface* ); + TQWidget *information( Interface* ); QList<Interface> getInterfaces(); - void possibleNewInterfaces( QMap<QString, QString>& ); - Interface *addNewInterface( const QString& ); + void possibleNewInterfaces( TQMap<TQString, TQString>& ); + Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - QString getPixmapName( Interface* ) {return QString::fromLatin1("Tux"); } - void receive( const QCString&, const QByteArray& ar ) {} // don't listen + TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: QList<Interface> m_interfaces; }; diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp index 3d32b274..c7df8069 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp +++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp @@ -9,8 +9,8 @@ delete (%{APPNAME}Widget*)m_widget; } -QString %{APPNAME}::pluginName() const { - return QObject::tr( "%{APPNAME}" ); +TQString %{APPNAME}::pluginName() const { + return TQObject::tr( "%{APPNAME}" ); } double %{APPNAME}::versionNumber() const { @@ -18,11 +18,11 @@ double %{APPNAME}::versionNumber() const { } // this sets the image that will be shown on the left side of the plugin -QString %{APPNAME}::pixmapNameWidget() const { - return QString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}"); +TQString %{APPNAME}::pixmapNameWidget() const { + return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}"); } -QWidget* %{APPNAME}::widget( QWidget * wid ) { +TQWidget* %{APPNAME}::widget( TQWidget * wid ) { if(!m_widget) { m_widget = new %{APPNAME}Widget( wid, "%{APPNAME}" ); } @@ -31,18 +31,18 @@ QWidget* %{APPNAME}::widget( QWidget * wid ) { // that would be the icon of the config widget in todays config view -QString %{APPNAME}::pixmapNameConfig() const { +TQString %{APPNAME}::pixmapNameConfig() const { return 0l; } // No config widget yet, look at the datebook plugin for an example of that -TodayConfigWidget* %{APPNAME}::configWidget( QWidget* /*parent*/ ) { +TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) { return 0l; } // add the binary name of the app to launch here -QString %{APPNAME}::appName() const { - return QString::null; +TQString %{APPNAME}::appName() const { + return TQString::null; } // if the plugin should be excluded form the refresh cycles that can be set in the today app diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.h b/languages/cpp/app_templates/opietoday/exampleplugin.h index b321f434..ebd44ba5 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.h +++ b/languages/cpp/app_templates/opietoday/exampleplugin.h @@ -1,8 +1,8 @@ #ifndef %{APPNAME}_PLUGIN_H #define %{APPNAME}_PLUGIN_H -#include <qwidget.h> -#include <qguardedptr.h> +#include <tqwidget.h> +#include <tqguardedptr.h> #include <opie/todayplugininterface.h> #include <opie/todayconfigwidget.h> @@ -16,19 +16,19 @@ public: %{APPNAME}(); ~%{APPNAME}(); - QString pluginName() const; + TQString pluginName() const; double versionNumber() const; - QString pixmapNameWidget() const; - QWidget* widget(QWidget *); - QString pixmapNameConfig() const; - TodayConfigWidget* configWidget(QWidget *); - QString appName() const; + TQString pixmapNameWidget() const; + TQWidget* widget(TQWidget *); + TQString pixmapNameConfig() const; + TodayConfigWidget* configWidget(TQWidget *); + TQString appName() const; bool excludeFromRefresh() const; void refresh(); void reinitialize(); private: - QGuardedPtr<%{APPNAME}Widget> m_widget; + TQGuardedPtr<%{APPNAME}Widget> m_widget; }; #endif diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index b0cb0dcc..a80dad81 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget( QWidget *parent, const char* name) - : QWidget(parent, name ) { +%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent, const char* name) + : TQWidget(parent, name ) { m_exampleLabel = 0l; m_layout = 0l; @@ -17,12 +17,12 @@ // that should be triggered when clicked are defined in slotClicked() // of course also normal widgets can be used. m_exampleLabel = new OClickableLabel( this ); - connect( m_exampleLabel, SIGNAL( clicked() ), this, SLOT( slotClicked() ) ); + connect( m_exampleLabel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); if ( m_layout ) { delete m_layout; } - m_layout = new QHBoxLayout( this ); + m_layout = new TQHBoxLayout( this ); m_layout->setAutoAdd( true ); readConfig(); diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index 26a72128..53a67b18 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -1,16 +1,16 @@ #ifndef %{APPNAME}_PLUGIN_WIDGET_H #define %{APPNAME}_PLUGIN_WIDGET_H -#include <qlayout.h> +#include <tqlayout.h> #include <opie/oclickablelabel.h> -class %{APPNAME}Widget : public QWidget { +class %{APPNAME}Widget : public TQWidget { Q_OBJECT public: - %{APPNAME}Widget( QWidget *parent, const char *name ); + %{APPNAME}Widget( TQWidget *parent, const char *name ); ~%{APPNAME}Widget(); void refresh(); @@ -20,7 +20,7 @@ private slots: private: OClickableLabel* m_exampleLabel; - QHBoxLayout* m_layout; + TQHBoxLayout* m_layout; void readConfig(); void getInfo(); }; diff --git a/languages/cpp/app_templates/qmakeapp/main.cpp b/languages/cpp/app_templates/qmakeapp/main.cpp index bd26f19a..8938adc5 100644 --- a/languages/cpp/app_templates/qmakeapp/main.cpp +++ b/languages/cpp/app_templates/qmakeapp/main.cpp @@ -1,13 +1,13 @@ %{CPP_TEMPLATE} -#include <qapplication.h> +#include <tqapplication.h> #include "%{APPNAMELC}.h" int main( int argc, char ** argv ) { - QApplication a( argc, argv ); + TQApplication a( argc, argv ); %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 841f88d4..973aee2c 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -2,120 +2,120 @@ #include "%{APPNAMELC}.h" -#include <qimage.h> -#include <qpixmap.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> -#include <qpopupmenu.h> -#include <qmenubar.h> -#include <qtextedit.h> -#include <qfile.h> -#include <qfiledialog.h> -#include <qstatusbar.h> -#include <qmessagebox.h> -#include <qprinter.h> -#include <qapplication.h> -#include <qaccel.h> -#include <qtextstream.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qwhatsthis.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqtoolbar.h> +#include <tqtoolbutton.h> +#include <tqpopupmenu.h> +#include <tqmenubar.h> +#include <tqtextedit.h> +#include <tqfile.h> +#include <tqfiledialog.h> +#include <tqstatusbar.h> +#include <tqmessagebox.h> +#include <tqprinter.h> +#include <tqapplication.h> +#include <tqaccel.h> +#include <tqtextstream.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqwhatsthis.h> #include "filesave.xpm" #include "fileopen.xpm" #include "fileprint.xpm" %{APPNAME}::%{APPNAME}() - : QMainWindow( 0, "%{APPNAME}", WDestructiveClose ) + : TQMainWindow( 0, "%{APPNAME}", WDestructiveClose ) { printer = new QPrinter; - QPixmap openIcon, saveIcon, printIcon; + TQPixmap openIcon, saveIcon, printIcon; - QToolBar * fileTools = new QToolBar( this, "file operations" ); + TQToolBar * fileTools = new TQToolBar( this, "file operations" ); fileTools->setLabel( tr("File Operations") ); - openIcon = QPixmap( fileopen ); - QToolButton * fileOpen - = new QToolButton( openIcon, tr("Open File"), QString::null, - this, SLOT(choose()), fileTools, "open file" ); + openIcon = TQPixmap( fileopen ); + TQToolButton * fileOpen + = new TQToolButton( openIcon, tr("Open File"), TQString::null, + this, TQT_SLOT(choose()), fileTools, "open file" ); - saveIcon = QPixmap( filesave ); - QToolButton * fileSave - = new QToolButton( saveIcon, tr("Save File"), QString::null, - this, SLOT(save()), fileTools, "save file" ); + saveIcon = TQPixmap( filesave ); + TQToolButton * fileSave + = new TQToolButton( saveIcon, tr("Save File"), TQString::null, + this, TQT_SLOT(save()), fileTools, "save file" ); - printIcon = QPixmap( fileprint ); - QToolButton * filePrint - = new QToolButton( printIcon, tr("Print File"), QString::null, - this, SLOT(print()), fileTools, "print file" ); + printIcon = TQPixmap( fileprint ); + TQToolButton * filePrint + = new TQToolButton( printIcon, tr("Print File"), TQString::null, + this, TQT_SLOT(print()), fileTools, "print file" ); - (void)QWhatsThis::whatsThisButton( fileTools ); + (void)TQWhatsThis::whatsThisButton( fileTools ); - QString fileOpenText = tr("<p><img source=\"fileopen\"> " + TQString fileOpenText = tr("<p><img source=\"fileopen\"> " "Click this button to open a <em>new file</em>. <br>" "You can also select the <b>Open</b> command " "from the <b>File</b> menu.</p>"); - QWhatsThis::add( fileOpen, fileOpenText ); + TQWhatsThis::add( fileOpen, fileOpenText ); - QMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); + TQMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); - QString fileSaveText = tr("<p>Click this button to save the file you " + TQString fileSaveText = tr("<p>Click this button to save the file you " "are editing. You will be prompted for a file name.\n" "You can also select the <b>Save</b> command " "from the <b>File</b> menu.</p>"); - QWhatsThis::add( fileSave, fileSaveText ); + TQWhatsThis::add( fileSave, fileSaveText ); - QString filePrintText = tr("Click this button to print the file you " + TQString filePrintText = tr("Click this button to print the file you " "are editing.\n You can also select the Print " "command from the File menu."); - QWhatsThis::add( filePrint, filePrintText ); + TQWhatsThis::add( filePrint, filePrintText ); - QPopupMenu * file = new QPopupMenu( this ); + TQPopupMenu * file = new TQPopupMenu( this ); menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, SLOT(choose()), CTRL+Key_O ); + this, TQT_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, SLOT(save()), CTRL+Key_S ); + this, TQT_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, SLOT(print()), CTRL+Key_P ); + this, TQT_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), qApp, SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); - QPopupMenu * help = new QPopupMenu( this ); + TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, SLOT(about()), Key_F1 ); - help->insertItem( tr("About &Qt"), this, SLOT(aboutQt()) ); + help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); - e = new QTextEdit( this, "editor" ); + e = new TQTextEdit( this, "editor" ); e->setFocus(); setCentralWidget( e ); statusBar()->message( tr("Ready"), 2000 ); @@ -140,7 +140,7 @@ void %{APPNAME}::newDoc() void %{APPNAME}::choose() { - QString fn = QFileDialog::getOpenFileName( QString::null, QString::null, + TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this); if ( !fn.isEmpty() ) load( fn ); @@ -149,13 +149,13 @@ void %{APPNAME}::choose() } -void %{APPNAME}::load( const QString &fileName ) +void %{APPNAME}::load( const TQString &fileName ) { - QFile f( fileName ); + TQFile f( fileName ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); + TQTextStream ts( &f ); e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); @@ -170,15 +170,15 @@ void %{APPNAME}::save() return; } - QString text = e->text(); - QFile f( filename ); + TQString text = e->text(); + TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { statusBar()->message( tr("Could not write to %1").arg(filename), 2000 ); return; } - QTextStream t( &f ); + TQTextStream t( &f ); t << text; f.close(); @@ -192,7 +192,7 @@ void %{APPNAME}::save() void %{APPNAME}::saveAs() { - QString fn = QFileDialog::getSaveFileName( QString::null, QString::null, + TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) { filename = fn; @@ -205,25 +205,25 @@ void %{APPNAME}::saveAs() void %{APPNAME}::print() { - // ###### Rewrite to use QSimpleRichText to print here as well + // ###### Rewrite to use TQSimpleRichText to print here as well const int Margin = 10; int pageNo = 1; if ( printer->setup(this) ) { // printer dialog statusBar()->message( tr("Printing...") ); - QPainter p; + TQPainter p; if( !p.begin( printer ) ) // paint on printer return; p.setFont( e->font() ); int yPos = 0; // y-position for each line - QFontMetrics fm = p.fontMetrics(); - QPaintDeviceMetrics metrics( printer ); // need width/height + TQFontMetrics fm = p.fontMetrics(); + TQPaintDeviceMetrics metrics( printer ); // need width/height // of printer surface for( int i = 0 ; i < e->lines() ; i++ ) { if ( Margin + yPos > metrics.height() - Margin ) { - QString msg( "Printing (page " ); - msg += QString::number( ++pageNo ); + TQString msg( "Printing (page " ); + msg += TQString::number( ++pageNo ); msg += ")..."; statusBar()->message( msg ); printer->newPage(); // no more room on this page @@ -242,14 +242,14 @@ void %{APPNAME}::print() } } -void %{APPNAME}::closeEvent( QCloseEvent* ce ) +void %{APPNAME}::closeEvent( TQCloseEvent* ce ) { if ( !e->isModified() ) { ce->accept(); return; } - switch( QMessageBox::information( this, tr("Qt Application Example"), + switch( TQMessageBox::information( this, tr("Qt Application Example"), tr("Do you want to save the changes" " to the document?"), tr("Yes"), tr("No"), tr("Cancel"), @@ -271,13 +271,13 @@ void %{APPNAME}::closeEvent( QCloseEvent* ce ) void %{APPNAME}::about() { - QMessageBox::about( this, tr("Qt Application Example"), + TQMessageBox::about( this, tr("Qt Application Example"), tr("This example demonstrates simple use of " - "QMainWindow,\nQMenuBar and QToolBar.")); + "TQMainWindow,\nQMenuBar and TQToolBar.")); } void %{APPNAME}::aboutQt() { - QMessageBox::aboutQt( this, tr("Qt Application Example") ); + TQMessageBox::aboutQt( this, tr("Qt Application Example") ); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.h b/languages/cpp/app_templates/qmakeapp/qmakeapp.h index 2d372da9..48bf459a 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.h +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.h @@ -3,7 +3,7 @@ #ifndef %{APPNAMEUC}_H #define %{APPNAMEUC}_H -#include <qmainwindow.h> +#include <tqmainwindow.h> class QTextEdit; @@ -16,12 +16,12 @@ public: ~%{APPNAME}(); protected: - void closeEvent( QCloseEvent* ); + void closeEvent( TQCloseEvent* ); private slots: void newDoc(); void choose(); - void load( const QString &fileName ); + void load( const TQString &fileName ); void save(); void saveAs(); void print(); @@ -30,9 +30,9 @@ private slots: void aboutQt(); private: - QPrinter *printer; - QTextEdit *e; - QString filename; + TQPrinter *printer; + TQTextEdit *e; + TQString filename; }; diff --git a/languages/cpp/app_templates/qt4makeapp/main.cpp b/languages/cpp/app_templates/qt4makeapp/main.cpp index 3416347e..4f6295a2 100644 --- a/languages/cpp/app_templates/qt4makeapp/main.cpp +++ b/languages/cpp/app_templates/qt4makeapp/main.cpp @@ -1,12 +1,12 @@ %{CPP_TEMPLATE} -#include <QApplication> +#include <TQApplication> #include "%{APPNAMELC}.h" int main(int argc, char *argv[]) { Q_INIT_RESOURCE(application); - QApplication app(argc, argv); + TQApplication app(argc, argv); %{APPNAME} * mw = new %{APPNAME}(); mw->show(); return app.exec(); diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp index af16391f..11bcf85f 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp @@ -3,10 +3,10 @@ #include <QtGui> #include "%{APPNAMELC}.h" -#include <QTextEdit> -#include <QTextStream> -#include <QCloseEvent> -#include <QFileDialog> +#include <TQTextEdit> +#include <TQTextStream> +#include <TQCloseEvent> +#include <TQFileDialog> %{APPNAME}::%{APPNAME}() { @@ -20,13 +20,13 @@ readSettings(); - connect(textEdit->document(), SIGNAL(contentsChanged()), - this, SLOT(documentWasModified())); + connect(textEdit->document(), TQT_SIGNAL(contentsChanged()), + this, TQT_SLOT(documentWasModified())); setCurrentFile(""); } -void %{APPNAME}::closeEvent(QCloseEvent *event) +void %{APPNAME}::closeEvent(TQCloseEvent *event) { if (maybeSave()) { writeSettings(); @@ -47,7 +47,7 @@ void %{APPNAME}::newFile() void %{APPNAME}::open() { if (maybeSave()) { - QString fileName = QFileDialog::getOpenFileName(this); + TQString fileName = TQFileDialog::getOpenFileName(this); if (!fileName.isEmpty()) loadFile(fileName); } @@ -64,7 +64,7 @@ bool %{APPNAME}::save() bool %{APPNAME}::saveAs() { - QString fileName = QFileDialog::getSaveFileName(this); + TQString fileName = TQFileDialog::getSaveFileName(this); if (fileName.isEmpty()) return false; @@ -73,7 +73,7 @@ bool %{APPNAME}::saveAs() void %{APPNAME}::about() { - QMessageBox::about(this, tr("About Application"), + TQMessageBox::about(this, tr("About Application"), tr("The <b>Application</b> example demonstrates how to " "write modern GUI applications using Qt, with a menu bar, " "toolbars, and a status bar.")); @@ -86,62 +86,62 @@ void %{APPNAME}::documentWasModified() void %{APPNAME}::createActions() { - newAct = new QAction(QIcon(":/filenew.xpm"), tr("&New"), this); + newAct = new TQAction(QIcon(":/filenew.xpm"), tr("&New"), this); newAct->setShortcut(tr("Ctrl+N")); newAct->setStatusTip(tr("Create a new file")); - connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); + connect(newAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(newFile())); - openAct = new QAction(QIcon(":/fileopen.xpm"), tr("&Open..."), this); + openAct = new TQAction(QIcon(":/fileopen.xpm"), tr("&Open..."), this); openAct->setShortcut(tr("Ctrl+O")); openAct->setStatusTip(tr("Open an existing file")); - connect(openAct, SIGNAL(triggered()), this, SLOT(open())); + connect(openAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(open())); - saveAct = new QAction(QIcon(":/filesave.xpm"), tr("&Save"), this); + saveAct = new TQAction(QIcon(":/filesave.xpm"), tr("&Save"), this); saveAct->setShortcut(tr("Ctrl+S")); saveAct->setStatusTip(tr("Save the document to disk")); - connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); + connect(saveAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(save())); - saveAsAct = new QAction(tr("Save &As..."), this); + saveAsAct = new TQAction(tr("Save &As..."), this); saveAsAct->setStatusTip(tr("Save the document under a new name")); - connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); + connect(saveAsAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(saveAs())); - exitAct = new QAction(tr("E&xit"), this); + exitAct = new TQAction(tr("E&xit"), this); exitAct->setShortcut(tr("Ctrl+Q")); exitAct->setStatusTip(tr("Exit the application")); - connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); + connect(exitAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(close())); - cutAct = new QAction(QIcon(":/editcut.xpm"), tr("Cu&t"), this); + cutAct = new TQAction(QIcon(":/editcut.xpm"), tr("Cu&t"), this); cutAct->setShortcut(tr("Ctrl+X")); cutAct->setStatusTip(tr("Cut the current selection's contents to the " "clipboard")); - connect(cutAct, SIGNAL(triggered()), textEdit, SLOT(cut())); + connect(cutAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(cut())); - copyAct = new QAction(QIcon(":/editcopy.xpm"), tr("&Copy"), this); + copyAct = new TQAction(QIcon(":/editcopy.xpm"), tr("&Copy"), this); copyAct->setShortcut(tr("Ctrl+C")); copyAct->setStatusTip(tr("Copy the current selection's contents to the " "clipboard")); - connect(copyAct, SIGNAL(triggered()), textEdit, SLOT(copy())); + connect(copyAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(copy())); - pasteAct = new QAction(QIcon(":/editpaste.xpm"), tr("&Paste"), this); + pasteAct = new TQAction(QIcon(":/editpaste.xpm"), tr("&Paste"), this); pasteAct->setShortcut(tr("Ctrl+V")); pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " "selection")); - connect(pasteAct, SIGNAL(triggered()), textEdit, SLOT(paste())); + connect(pasteAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(paste())); - aboutAct = new QAction(tr("&About"), this); + aboutAct = new TQAction(tr("&About"), this); aboutAct->setStatusTip(tr("Show the application's About box")); - connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); + connect(aboutAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(about())); - aboutQtAct = new QAction(tr("About &Qt"), this); + aboutQtAct = new TQAction(tr("About &Qt"), this); aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); - connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); + connect(aboutQtAct, TQT_SIGNAL(triggered()), qApp, TQT_SLOT(aboutQt())); cutAct->setEnabled(false); copyAct->setEnabled(false); - connect(textEdit, SIGNAL(copyAvailable(bool)), - cutAct, SLOT(setEnabled(bool))); - connect(textEdit, SIGNAL(copyAvailable(bool)), - copyAct, SLOT(setEnabled(bool))); + connect(textEdit, TQT_SIGNAL(copyAvailable(bool)), + cutAct, TQT_SLOT(setEnabled(bool))); + connect(textEdit, TQT_SIGNAL(copyAvailable(bool)), + copyAct, TQT_SLOT(setEnabled(bool))); } void %{APPNAME}::createMenus() @@ -186,16 +186,16 @@ void %{APPNAME}::createStatusBar() void %{APPNAME}::readSettings() { - QSettings settings("Trolltech", "Application Example"); - QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); - QSize size = settings.value("size", QSize(400, 400)).toSize(); + TQSettings settings("Trolltech", "Application Example"); + TQPoint pos = settings.value("pos", TQPoint(200, 200)).toPoint(); + TQSize size = settings.value("size", TQSize(400, 400)).toSize(); resize(size); move(pos); } void %{APPNAME}::writeSettings() { - QSettings settings("Trolltech", "Application Example"); + TQSettings settings("Trolltech", "Application Example"); settings.setValue("pos", pos()); settings.setValue("size", size()); } @@ -203,68 +203,68 @@ void %{APPNAME}::writeSettings() bool %{APPNAME}::maybeSave() { if (textEdit->document()->isModified()) { - int ret = QMessageBox::warning(this, tr("Application"), + int ret = TQMessageBox::warning(this, tr("Application"), tr("The document has been modified.\n" "Do you want to save your changes?"), - QMessageBox::Yes | QMessageBox::Default, - QMessageBox::No, - QMessageBox::Cancel | QMessageBox::Escape); - if (ret == QMessageBox::Yes) + TQMessageBox::Yes | TQMessageBox::Default, + TQMessageBox::No, + TQMessageBox::Cancel | TQMessageBox::Escape); + if (ret == TQMessageBox::Yes) return save(); - else if (ret == QMessageBox::Cancel) + else if (ret == TQMessageBox::Cancel) return false; } return true; } -void %{APPNAME}::loadFile(const QString &fileName) +void %{APPNAME}::loadFile(const TQString &fileName) { - QFile file(fileName); - if (!file.open(QFile::ReadOnly | QFile::Text)) { - QMessageBox::warning(this, tr("Application"), + TQFile file(fileName); + if (!file.open(TQFile::ReadOnly | TQFile::Text)) { + TQMessageBox::warning(this, tr("Application"), tr("Cannot read file %1:\n%2.") .arg(fileName) .arg(file.errorString())); return; } - QTextStream in(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + TQTextStream in(&file); + TQApplication::setOverrideCursor(Qt::WaitCursor); textEdit->setPlainText(in.readAll()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); setCurrentFile(fileName); statusBar()->showMessage(tr("File loaded"), 2000); } -bool %{APPNAME}::saveFile(const QString &fileName) +bool %{APPNAME}::saveFile(const TQString &fileName) { - QFile file(fileName); - if (!file.open(QFile::WriteOnly | QFile::Text)) { - QMessageBox::warning(this, tr("Application"), + TQFile file(fileName); + if (!file.open(TQFile::WriteOnly | TQFile::Text)) { + TQMessageBox::warning(this, tr("Application"), tr("Cannot write file %1:\n%2.") .arg(fileName) .arg(file.errorString())); return false; } - QTextStream out(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + TQTextStream out(&file); + TQApplication::setOverrideCursor(Qt::WaitCursor); out << textEdit->toPlainText(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); setCurrentFile(fileName); statusBar()->showMessage(tr("File saved"), 2000); return true; } -void %{APPNAME}::setCurrentFile(const QString &fileName) +void %{APPNAME}::setCurrentFile(const TQString &fileName) { curFile = fileName; textEdit->document()->setModified(false); setWindowModified(false); - QString shownName; + TQString shownName; if (curFile.isEmpty()) shownName = "untitled.txt"; else @@ -273,9 +273,9 @@ void %{APPNAME}::setCurrentFile(const QString &fileName) setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); } -QString %{APPNAME}::strippedName(const QString &fullFileName) +TQString %{APPNAME}::strippedName(const TQString &fullFileName) { - return QFileInfo(fullFileName).fileName(); + return TQFileInfo(fullFileName).fileName(); } %{APPNAME}::~%{APPNAME}() diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h index cd470d00..8140766b 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h @@ -3,8 +3,8 @@ #ifndef %{APPNAMEUC}_H #define %{APPNAMEUC}_H -#include <QMainWindow> -#include <QCloseEvent> +#include <TQMainWindow> +#include <TQCloseEvent> class QAction; class QMenu; @@ -19,7 +19,7 @@ public: ~%{APPNAME}(); protected: - void closeEvent(QCloseEvent *event); + void closeEvent(TQCloseEvent *event); private slots: void newFile(); @@ -37,29 +37,29 @@ private: void readSettings(); void writeSettings(); bool maybeSave(); - void loadFile(const QString &fileName); - bool saveFile(const QString &fileName); - void setCurrentFile(const QString &fileName); - QString strippedName(const QString &fullFileName); + void loadFile(const TQString &fileName); + bool saveFile(const TQString &fileName); + void setCurrentFile(const TQString &fileName); + TQString strippedName(const TQString &fullFileName); - QTextEdit *textEdit; - QString curFile; + TQTextEdit *textEdit; + TQString curFile; QMenu *fileMenu; QMenu *editMenu; QMenu *helpMenu; - QToolBar *fileToolBar; - QToolBar *editToolBar; - QAction *newAct; - QAction *openAct; - QAction *saveAct; - QAction *saveAsAct; - QAction *exitAct; - QAction *cutAct; - QAction *copyAct; - QAction *pasteAct; - QAction *aboutAct; - QAction *aboutQtAct; + TQToolBar *fileToolBar; + TQToolBar *editToolBar; + TQAction *newAct; + TQAction *openAct; + TQAction *saveAct; + TQAction *saveAsAct; + TQAction *exitAct; + TQAction *cutAct; + TQAction *copyAct; + TQAction *pasteAct; + TQAction *aboutAct; + TQAction *aboutQtAct; }; #endif diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp index a35d57cb..45331649 100644 --- a/languages/cpp/app_templates/qtopia4app/example.cpp +++ b/languages/cpp/app_templates/qtopia4app/example.cpp @@ -1,9 +1,9 @@ #include "%{APPNAMELC}.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> -%{APPNAME}Base::%{APPNAME}Base( QWidget *parent, Qt::WFlags f ) - : QWidget( parent, f ) +%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, Qt::WFlags f ) + : TQWidget( parent, f ) { setupUi( this ); } @@ -16,10 +16,10 @@ * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( QWidget *parent, Qt::WFlags f ) +%{APPNAME}::%{APPNAME}( TQWidget *parent, Qt::WFlags f ) : %{APPNAME}Base( parent, f ) { - connect(quit, SIGNAL(clicked()), this, SLOT(goodBye())); + connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h index 7d58c7d8..5bfc69ba 100644 --- a/languages/cpp/app_templates/qtopia4app/example.h +++ b/languages/cpp/app_templates/qtopia4app/example.h @@ -3,10 +3,10 @@ #define %{APPNAMEUC}_H #include "ui_%{APPNAMELC}base.h" -class %{APPNAME}Base : public QWidget, public Ui_%{APPNAME}Base +class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base { public: - %{APPNAME}Base( QWidget *parent = 0, Qt::WFlags f = 0 ); + %{APPNAME}Base( TQWidget *parent = 0, Qt::WFlags f = 0 ); virtual ~%{APPNAME}Base(); }; @@ -14,7 +14,7 @@ class %{APPNAME} : public %{APPNAME}Base { Q_OBJECT public: - %{APPNAME}( QWidget *parent = 0, Qt::WFlags f = 0 ); + %{APPNAME}( TQWidget *parent = 0, Qt::WFlags f = 0 ); virtual ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index 939f708e..a849977d 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -1,15 +1,15 @@ #include "%{APPNAMELC}.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> /* * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( QWidget* parent, const char* name, WFlags fl ) +%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, SIGNAL(clicked()), this, SLOT(goodBye())); + connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h index 883cb27d..42dfc2dd 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.h +++ b/languages/cpp/app_templates/qtopiaapp/example.h @@ -8,7 +8,7 @@ class %{APPNAME} : public %{APPNAME}Base Q_OBJECT public: - %{APPNAME}( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp index d21f4782..a6ef1a2b 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -12,8 +12,8 @@ #include "ast_utils.h" #include "ast.h" -#include <qstringlist.h> -#include <qregexp.h> +#include <tqstringlist.h> +#include <tqregexp.h> #include <klocale.h> #include <kdebug.h> @@ -40,8 +40,8 @@ AST* findNodeAt( AST* node, int line, int column ) ( line < endLine || ( line == endLine && column < endColumn ) ) ) { - QPtrList<AST> children = node->children(); - QPtrListIterator<AST> it( children ); + TQPtrList<AST> children = node->children(); + TQPtrListIterator<AST> it( children ); while ( it.current() ) { AST * a = it.current(); @@ -58,7 +58,7 @@ AST* findNodeAt( AST* node, int line, int column ) return 0; } -void scopeOfNode( AST* ast, QStringList& scope ) +void scopeOfNode( AST* ast, TQStringList& scope ) { if ( !ast ) return ; @@ -66,14 +66,14 @@ void scopeOfNode( AST* ast, QStringList& scope ) if ( ast->parent() ) scopeOfNode( ast->parent(), scope ); - QString s; + TQString s; switch ( ast->nodeType() ) { case NodeType_ClassSpecifier: if ( ( ( ClassSpecifierAST* ) ast ) ->name() ) { s = ( ( ClassSpecifierAST* ) ast ) ->name() ->text(); - s = s.isEmpty() ? QString::fromLatin1( "<unnamed>" ) : s; + s = s.isEmpty() ? TQString::fromLatin1( "<unnamed>" ) : s; scope.push_back( s ); } break; @@ -81,7 +81,7 @@ void scopeOfNode( AST* ast, QStringList& scope ) case NodeType_Namespace: { AST* namespaceName = ( ( NamespaceAST* ) ast ) ->namespaceName(); - s = namespaceName ? namespaceName->text() : QString::fromLatin1( "<unnamed>" ); + s = namespaceName ? namespaceName->text() : TQString::fromLatin1( "<unnamed>" ); scope.push_back( s ); } break; @@ -95,8 +95,8 @@ void scopeOfNode( AST* ast, QStringList& scope ) if ( !d->declaratorId() ) break; - QPtrList<ClassOrNamespaceNameAST> l = d->declaratorId() ->classOrNamespaceNameList(); - QPtrListIterator<ClassOrNamespaceNameAST> nameIt( l ); + TQPtrList<ClassOrNamespaceNameAST> l = d->declaratorId() ->classOrNamespaceNameList(); + TQPtrListIterator<ClassOrNamespaceNameAST> nameIt( l ); while ( nameIt.current() ) { AST * name = nameIt.current() ->name(); @@ -113,25 +113,25 @@ void scopeOfNode( AST* ast, QStringList& scope ) } -QString typeSpecToString( TypeSpecifierAST* typeSpec ) /// @todo remove +TQString typeSpecToString( TypeSpecifierAST* typeSpec ) /// @todo remove { if ( !typeSpec ) - return QString::null; + return TQString::null; - return typeSpec->text().replace( QRegExp( " :: " ), "::" ); + return typeSpec->text().replace( TQRegExp( " :: " ), "::" ); } -QString declaratorToString( DeclaratorAST* declarator, const QString& scope, bool skipPtrOp ) +TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, bool skipPtrOp ) { if ( !declarator ) - return QString::null; + return TQString::null; - QString text; + TQString text; if ( !skipPtrOp ) { - QPtrList<AST> ptrOpList = declarator->ptrOpList(); - for ( QPtrListIterator<AST> it( ptrOpList ); it.current(); ++it ) + TQPtrList<AST> ptrOpList = declarator->ptrOpList(); + for ( TQPtrListIterator<AST> it( ptrOpList ); it.current(); ++it ) { text += it.current() ->text(); } @@ -141,13 +141,13 @@ QString declaratorToString( DeclaratorAST* declarator, const QString& scope, boo text += scope; if ( declarator->subDeclarator() ) - text += QString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + QString::fromLatin1( ")" ); + text += TQString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::fromLatin1( ")" ); if ( declarator->declaratorId() ) text += declarator->declaratorId() ->text(); - QPtrList<AST> arrays = declarator->arrayDimensionList(); - QPtrListIterator<AST> it( arrays ); + TQPtrList<AST> arrays = declarator->arrayDimensionList(); + TQPtrListIterator<AST> it( arrays ); while ( it.current() ) { text += "[]"; @@ -161,12 +161,12 @@ QString declaratorToString( DeclaratorAST* declarator, const QString& scope, boo ParameterDeclarationListAST* l = declarator->parameterDeclarationClause() ->parameterDeclarationList(); if ( l != 0 ) { - QPtrList<ParameterDeclarationAST> params = l->parameterList(); - QPtrListIterator<ParameterDeclarationAST> it( params ); + TQPtrList<ParameterDeclarationAST> params = l->parameterList(); + TQPtrListIterator<ParameterDeclarationAST> it( params ); while ( it.current() ) { - QString type = typeSpecToString( it.current() ->typeSpec() ); + TQString type = typeSpecToString( it.current() ->typeSpec() ); text += type; if ( !type.isEmpty() ) text += " "; @@ -185,6 +185,6 @@ QString declaratorToString( DeclaratorAST* declarator, const QString& scope, boo text += " const"; } - return text.replace( QRegExp( " :: " ), "::" ).simplifyWhiteSpace(); + return text.replace( TQRegExp( " :: " ), "::" ).simplifyWhiteSpace(); } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/ast_utils.h b/languages/cpp/ast_utils.h index ce9ec99f..1a1c1813 100644 --- a/languages/cpp/ast_utils.h +++ b/languages/cpp/ast_utils.h @@ -12,7 +12,7 @@ #ifndef __ast_utils_h #define __ast_utils_h -#include <qstring.h> +#include <tqstring.h> class AST; class DeclaratorAST; @@ -25,9 +25,9 @@ namespace KTextEditor } AST* findNodeAt( AST* unit, int line, int column ); -void scopeOfNode( AST* ast, QStringList& ); -QString typeSpecToString( TypeSpecifierAST* typeSpec ); -QString declaratorToString( DeclaratorAST* declarator, const QString& scope = QString::null, bool skipPtrOp = false ); +void scopeOfNode( AST* ast, TQStringList& ); +TQString typeSpecToString( TypeSpecifierAST* typeSpec ); +TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString::null, bool skipPtrOp = false ); #endif // __ast_utils_h // kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index ed51d0c6..d3f9c2ee 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -18,7 +18,7 @@ #include "kdevdeepcopy.h" #include "kdevdriver.h" -#include <qmutex.h> +#include <tqmutex.h> #include <kparts/part.h> #include <ktexteditor/editinterface.h> @@ -32,11 +32,11 @@ #include <kdebug.h> #include <kapplication.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqtextstream.h> #include <list> -#include <qdatastream.h> +#include <tqdatastream.h> class BackgroundKDevDriver : public KDevDriver { @@ -44,7 +44,7 @@ public: BackgroundKDevDriver( CppSupportPart* cppSupport, BackgroundParser* bp ) : KDevDriver( cppSupport, false ), m_backgroundParser(bp) { } virtual void fileParsed( ParsedFile& fileName ); - virtual void addDependence( const QString& fileName, const Dependence& dep ); + virtual void addDependence( const TQString& fileName, const Dependence& dep ); private: BackgroundParser* m_backgroundParser; }; @@ -53,8 +53,8 @@ private: class KDevSourceProvider: public SourceProvider { public: - //Deadlock is a mutex that is locked when KDevSourceProvider::contents(..) is used, and that should be unlocked before QApplication is locked(that way a deadlock where the thread that holds the QApplication-mutex and tries to lock the given mutex, while the thread that calls contents(..) and holds the given mutex and tries to lock the QApplication-mutex, cannot happen) - KDevSourceProvider( CppSupportPart* cppSupport, QMutex& deadlock ) + //Deadlock is a mutex that is locked when KDevSourceProvider::contents(..) is used, and that should be unlocked before TQApplication is locked(that way a deadlock where the thread that holds the QApplication-mutex and tries to lock the given mutex, while the thread that calls contents(..) and holds the given mutex and tries to lock the QApplication-mutex, cannot happen) + KDevSourceProvider( CppSupportPart* cppSupport, TQMutex& deadlock ) : m_cppSupport( cppSupport ), m_readFromDisk( false ), m_deadlock(deadlock) @@ -69,9 +69,9 @@ public: return m_readFromDisk; } - virtual QString contents( const QString& fileName ) + virtual TQString contents( const TQString& fileName ) { - QString contents = QString::null; + TQString contents = TQString::null; if ( !m_readFromDisk ) { @@ -81,8 +81,8 @@ public: //kdDebug(9007) << "-------> kapp locked" << endl; - QPtrList<KParts::Part> parts( *m_cppSupport->partController() ->parts() ); - QPtrListIterator<KParts::Part> it( parts ); + TQPtrList<KParts::Part> parts( *m_cppSupport->partController() ->parts() ); + TQPtrListIterator<KParts::Part> it( parts ); while ( it.current() ) { KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( it.current() ); @@ -92,7 +92,7 @@ public: if ( !doc || !editIface || doc->url().path() != fileName ) continue; - contents = QString( editIface->text().ascii() ); // deep copy + contents = TQString( editIface->text().ascii() ); // deep copy //kdDebug(9007) << "-------> kapp unlocked" << endl; @@ -105,12 +105,12 @@ public: //kdDebug(9007) << "-------> kapp unlocked" << endl; } - if( m_readFromDisk || contents == QString::null ) + if( m_readFromDisk || contents == TQString::null ) { - QFile f( fileName ); + TQFile f( fileName ); if ( f.open( IO_ReadOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); contents = stream.read(); f.close(); } @@ -119,7 +119,7 @@ public: return contents; } - virtual bool isModified( const QString& fileName ) + virtual bool isModified( const TQString& fileName ) { bool ret = false; m_deadlock.unlock(); @@ -139,7 +139,7 @@ public: private: CppSupportPart* m_cppSupport; bool m_readFromDisk; - QMutex& m_deadlock; + TQMutex& m_deadlock; private: KDevSourceProvider( const KDevSourceProvider& source ); void operator = ( const KDevSourceProvider& source ); @@ -156,52 +156,52 @@ public: bool isEmpty() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.empty(); } uint count() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.size(); } QPair<SafeString, bool> front() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.front(); } void clear() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.clear(); } - void push_front( const QString& fileName, bool readFromDisk = false ) + void push_front( const TQString& fileName, bool readFromDisk = false ) { SafeString s( fileName.ascii() ); - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.push_front( qMakePair( s, readFromDisk ) ); } - void push_back( const QString& fileName, bool readFromDisk = false ) + void push_back( const TQString& fileName, bool readFromDisk = false ) { SafeString s( fileName.ascii() ); - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.push_back( qMakePair( s, readFromDisk ) ); } void pop_front() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.pop_front(); } - int count( const QString& fileName ) const { + int count( const TQString& fileName ) const { int c = 0; - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); ListType::const_iterator it = m_fileList.begin(); while ( it != m_fileList.end() ) { @@ -214,15 +214,15 @@ public: QPair<SafeString, bool> takeFront() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); QPair<SafeString, bool> ret = m_fileList.front(); m_fileList.pop_front(); return ret; } - bool contains( const QString& fileName ) const + bool contains( const TQString& fileName ) const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); ListType::const_iterator it = m_fileList.begin(); while ( it != m_fileList.end() ) { @@ -233,9 +233,9 @@ public: return false; } - void remove( const QString& fileName ) + void remove( const TQString& fileName ) { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); ListType::iterator it = m_fileList.begin(); while ( it != m_fileList.end() ) { @@ -247,20 +247,20 @@ public: } private: - mutable QMutex m_mutex; + mutable TQMutex m_mutex; ListType m_fileList; }; -BackgroundParser::BackgroundParser( CppSupportPart* part, QWaitCondition* consumed ) +BackgroundParser::BackgroundParser( CppSupportPart* part, TQWaitCondition* consumed ) : m_consumed( consumed ), m_cppSupport( part ), m_close( false ), m_saveMemory( false ) { m_fileList = new SynchronizedFileList(); m_driver = new BackgroundKDevDriver( m_cppSupport, this ); m_driver->setSourceProvider( new KDevSourceProvider( m_cppSupport, m_mutex ) ); - QString conf_file_name = m_cppSupport->specialHeaderName(); + TQString conf_file_name = m_cppSupport->specialHeaderName(); m_mutex.lock(); - if ( QFile::exists( conf_file_name ) ) + if ( TQFile::exists( conf_file_name ) ) m_driver->parseFile( conf_file_name, true, true, true ); m_mutex.unlock(); @@ -278,9 +278,9 @@ BackgroundParser::~BackgroundParser() m_fileList = 0; } -void BackgroundParser::addFile( const QString& fileName, bool readFromDisk ) +void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk ) { - QString fn = deepCopy( fileName ); + TQString fn = deepCopy( fileName ); //bool added = false; /*if ( !m_fileList->contains( fn ) ) @@ -294,9 +294,9 @@ void BackgroundParser::addFile( const QString& fileName, bool readFromDisk ) m_canParse.wakeAll(); } -void BackgroundParser::addFileFront( const QString& fileName, bool readFromDisk ) +void BackgroundParser::addFileFront( const TQString& fileName, bool readFromDisk ) { - QString fn = deepCopy( fileName ); + TQString fn = deepCopy( fileName ); bool added = false; /*if ( m_fileList->contains( fn ) ) @@ -312,9 +312,9 @@ void BackgroundParser::addFileFront( const QString& fileName, bool readFromDisk void BackgroundParser::removeAllFiles() { kdDebug( 9007 ) << "BackgroundParser::removeAllFiles()" << endl; - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); - QMap<QString, Unit*>::Iterator it = m_unitDict.begin(); + TQMap<TQString, Unit*>::Iterator it = m_unitDict.begin(); while ( it != m_unitDict.end() ) { Unit * unit = it.data(); @@ -329,9 +329,9 @@ void BackgroundParser::removeAllFiles() m_isEmpty.wakeAll(); } -void BackgroundParser::removeFile( const QString& fileName ) +void BackgroundParser::removeFile( const TQString& fileName ) { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); Unit* unit = findUnit( fileName ); if ( unit ) @@ -347,7 +347,7 @@ void BackgroundParser::removeFile( const QString& fileName ) m_isEmpty.wakeAll(); } -void BackgroundKDevDriver::addDependence( const QString& fileName, const Dependence& dep ) { +void BackgroundKDevDriver::addDependence( const TQString& fileName, const Dependence& dep ) { //give waiting threads a chance to perform their actions m_backgroundParser->m_mutex.unlock(); m_backgroundParser->m_mutex.lock(); @@ -358,7 +358,7 @@ void BackgroundKDevDriver::fileParsed( ParsedFile& fileName ) { m_backgroundParser->fileParsed( fileName ); } -void BackgroundParser::parseFile( const QString& fileName, bool readFromDisk, bool lock ) +void BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk, bool lock ) { if( lock ) m_mutex.lock(); @@ -374,9 +374,9 @@ void BackgroundParser::parseFile( const QString& fileName, bool readFromDisk, bo m_mutex.unlock(); } -QValueList<Problem> cloneProblemList( const QValueList<Problem>& list ) { - QValueList<Problem> ret; - for( QValueList<Problem>::const_iterator it = list.begin(); it != list.end(); ++it ) { +TQValueList<Problem> cloneProblemList( const TQValueList<Problem>& list ) { + TQValueList<Problem> ret; + for( TQValueList<Problem>::const_iterator it = list.begin(); it != list.end(); ++it ) { ret << Problem( *it, true ); } return ret; @@ -389,13 +389,13 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { ParsedFilePointer translationUnit; //Since the lexer-cache keeps many QStrings like macro-names used in the background, everything must be copied here. The safest solution is just //serializing and deserializing the whole thing(the serialization does not respect the AST, but that can be copied later because that's safe) - QMemArray<char> data; + TQMemArray<char> data; { - QDataStream stream( data, IO_WriteOnly ); + TQDataStream stream( data, IO_WriteOnly ); translationUnitUnsafe->write( stream ); } { - QDataStream stream( data, IO_ReadOnly ); + TQDataStream stream( data, IO_ReadOnly ); translationUnit = new ParsedFile( stream ); } @@ -422,24 +422,24 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { KApplication::postEvent( m_cppSupport, new FileParsedEvent( file.fileName(), unit->problems, m_readFromDisk ) ); - m_currentFile = QString::null; + m_currentFile = TQString::null; if ( m_fileList->isEmpty() ) m_isEmpty.wakeAll(); } -Unit* BackgroundParser::findUnit( const QString& fileName ) +Unit* BackgroundParser::findUnit( const TQString& fileName ) { - QMap<QString, Unit*>::Iterator it = m_unitDict.find( fileName ); + TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName ); return it != m_unitDict.end() ? *it : 0; } -bool BackgroundParser::hasTranslationUnit( const QString& fileName ) { - QMap<QString, Unit*>::Iterator it = m_unitDict.find( fileName ); +bool BackgroundParser::hasTranslationUnit( const TQString& fileName ) { + TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName ); return it != m_unitDict.end(); } -ParsedFilePointer BackgroundParser::translationUnit( const QString& fileName ) +ParsedFilePointer BackgroundParser::translationUnit( const TQString& fileName ) { Unit * u = findUnit( fileName ); if ( u == 0 ) @@ -453,7 +453,7 @@ ParsedFilePointer BackgroundParser::translationUnit( const QString& fileName ) return u->translationUnit; } -QValueList<Problem> BackgroundParser::problems( const QString& fileName, bool readFromDisk, bool forceParse ) +TQValueList<Problem> BackgroundParser::problems( const TQString& fileName, bool readFromDisk, bool forceParse ) { Q_UNUSED(readFromDisk); Unit * u = findUnit( fileName ); @@ -465,13 +465,13 @@ QValueList<Problem> BackgroundParser::problems( const QString& fileName, bool re u = parseFile( fileName, readFromDisk ); */ } - return u ? u->problems : QValueList<Problem>(); + return u ? u->problems : TQValueList<Problem>(); } void BackgroundParser::close() { { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_close = true; m_canParse.wakeAll(); } @@ -484,28 +484,28 @@ void BackgroundParser::close() bool BackgroundParser::filesInQueue() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList->count() || !m_currentFile.isEmpty(); } -int BackgroundParser::countInQueue( const QString& file ) const { +int BackgroundParser::countInQueue( const TQString& file ) const { return m_fileList->count( file ); } void BackgroundParser::updateParserConfiguration() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_driver->setup(); - QString conf_file_name = m_cppSupport->specialHeaderName(); + TQString conf_file_name = m_cppSupport->specialHeaderName(); m_driver->removeAllMacrosInFile( conf_file_name ); m_driver->parseFile( conf_file_name, true, true, true ); } void BackgroundParser::run() { - // (void) m_cppSupport->codeCompletion()->repository()->getEntriesInScope( QStringList(), false ); + // (void) m_cppSupport->codeCompletion()->repository()->getEntriesInScope( TQStringList(), false ); while ( !m_close ) { @@ -527,20 +527,20 @@ void BackgroundParser::run() break; QPair<SafeString, bool> entry = m_fileList->takeFront(); - QString fileName = entry.first.c_str(); + TQString fileName = entry.first.c_str(); bool readFromDisk = entry.second; m_currentFile = deepCopy(fileName); ( void ) parseFile( fileName, readFromDisk, true ); - m_currentFile = QString::null; + m_currentFile = TQString::null; } kdDebug( 9007 ) << "!!!!!!!!!!!!!!!!!! BG PARSER DESTROYED !!!!!!!!!!!!" << endl; // adymo: commented to fix #88091 -// QThread::exit(); +// TQThread::exit(); } void BackgroundParser::saveMemory() { diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h index 2bbf1173..6bbec3fc 100644 --- a/languages/cpp/backgroundparser.h +++ b/languages/cpp/backgroundparser.h @@ -15,10 +15,10 @@ #include "ast.h" #include "driver.h" -#include <qthread.h> -#include <qwaitcondition.h> -#include <qmutex.h> -#include <qmap.h> +#include <tqthread.h> +#include <tqwaitcondition.h> +#include <tqmutex.h> +#include <tqmap.h> #include <kdebug.h> class CppSupportPart; @@ -35,8 +35,8 @@ public: translationUnit = 0; } - QString fileName; - QValueList<Problem> problems; + TQString fileName; + TQValueList<Problem> problems; ParsedFilePointer translationUnit; protected: @@ -47,10 +47,10 @@ protected: class BackgroundParser: public QThread { public: - BackgroundParser( CppSupportPart*, QWaitCondition* consumed ); + BackgroundParser( CppSupportPart*, TQWaitCondition* consumed ); virtual ~BackgroundParser(); - QMutex& mutex() + TQMutex& mutex() { return m_mutex; } @@ -63,27 +63,27 @@ public: m_mutex.unlock(); } - QWaitCondition& canParse() + TQWaitCondition& canParse() { return m_canParse; } - QWaitCondition& isEmpty() + TQWaitCondition& isEmpty() { return m_isEmpty; } bool filesInQueue(); - int countInQueue( const QString& file ) const; + int countInQueue( const TQString& file ) const; - void addFile( const QString& fileName, bool readFromDisk = false ); - void addFileFront( const QString& fileName, bool readFromDisk = false ); - void removeFile( const QString& fileName ); + void addFile( const TQString& fileName, bool readFromDisk = false ); + void addFileFront( const TQString& fileName, bool readFromDisk = false ); + void removeFile( const TQString& fileName ); void removeAllFiles(); - bool hasTranslationUnit( const QString& fileName ); - ParsedFilePointer translationUnit( const QString& fileName ); - QValueList<Problem> problems( const QString& fileName , bool readFromDisk = false, bool forceParse = false ); + bool hasTranslationUnit( const TQString& fileName ); + ParsedFilePointer translationUnit( const TQString& fileName ); + TQValueList<Problem> problems( const TQString& fileName , bool readFromDisk = false, bool forceParse = false ); void updateParserConfiguration(); ///Should be run on a regular basis(every X minutes). It reduces some caches etc. BackgroundParser must be locked before. @@ -96,21 +96,21 @@ public: protected: friend class BackgroundKDevDriver; void fileParsed( ParsedFile& fileName ); - Unit* findUnit( const QString& fileName ); - void parseFile( const QString& fileName, bool readFromDisk, bool lock = false ) + Unit* findUnit( const TQString& fileName ); + void parseFile( const TQString& fileName, bool readFromDisk, bool lock = false ) ; private: class KDevDriver* m_driver; - QString m_currentFile; - QWaitCondition m_canParse; - QWaitCondition m_isEmpty; - QWaitCondition* m_consumed; - QMutex m_mutex; + TQString m_currentFile; + TQWaitCondition m_canParse; + TQWaitCondition m_isEmpty; + TQWaitCondition* m_consumed; + TQMutex m_mutex; SynchronizedFileList* m_fileList; CppSupportPart* m_cppSupport; bool m_close; - QMap<QString, Unit*> m_unitDict; + TQMap<TQString, Unit*> m_unitDict; bool m_saveMemory; //used to prevent blocking //State of parseFile(..): diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 09b13938..44ce91c2 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -10,19 +10,19 @@ * * ***************************************************************************/ // qt includes -#include <qtabwidget.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qspinbox.h> -#include <qradiobutton.h> -#include <qcombobox.h> -#include <qmultilineedit.h> -#include <qslider.h> -#include <qheader.h> -#include <qcolor.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqtabwidget.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqradiobutton.h> +#include <tqcombobox.h> +#include <tqmultilineedit.h> +#include <tqslider.h> +#include <tqheader.h> +#include <tqcolor.h> +#include <tqlabel.h> +#include <tqlayout.h> // kde includes #include <kdevproject.h> @@ -60,19 +60,19 @@ using namespace std; -CCConfigWidget::CCConfigWidget( CppSupportPart* part, QWidget* parent, const char* name ) +CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const char* name ) : CCConfigWidgetBase( parent, name ) { m_pPart = part; - connect( m_pPart->codeRepository(), SIGNAL( catalogRegistered( Catalog* ) ), - this, SLOT( catalogRegistered( Catalog* ) ) ); - connect( m_pPart->codeRepository(), SIGNAL( catalogUnregistered( Catalog* ) ), - this, SLOT( catalogUnregistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), + this, TQT_SLOT( catalogRegistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogUnregistered( Catalog* ) ), + this, TQT_SLOT( catalogUnregistered( Catalog* ) ) ); - connect( m_qtDir, SIGNAL(urlSelected(const QString &)), - this, SLOT(isValidQtDir(const QString &))); - connect( m_qtDir, SIGNAL(textChanged(const QString &)), - this, SLOT(isValidQtDir(const QString &))); + connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)), + this, TQT_SLOT(isValidQtDir(const TQString &))); + connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SLOT(isValidQtDir(const TQString &))); initGeneralTab( ); initQtTab(); @@ -85,7 +85,7 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, QWidget* parent, const cha void CCConfigWidget::initGeneralTab( ) { - QDomDocument dom = *m_pPart->projectDom(); + TQDomDocument dom = *m_pPart->projectDom(); interface_suffix->setText( DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfacesuffix", ".h" ) ); implementation_suffix->setText( DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/implementationsuffix", ".cpp" ) ); @@ -112,7 +112,7 @@ void CCConfigWidget::accept( ) void CCConfigWidget::saveFileTemplatesTab( ) { - QDomDocument dom = *m_pPart->projectDom(); + TQDomDocument dom = *m_pPart->projectDom(); DomUtil::writeEntry( dom, "/cppsupportpart/filetemplates/interfacesuffix", interface_suffix->text() ); DomUtil::writeEntry( dom, "/cppsupportpart/filetemplates/implementationsuffix", implementation_suffix->text() ); @@ -157,12 +157,12 @@ void CCConfigWidget::initCodeCompletionTab( ) break; }*/ - QValueList<Catalog*> catalogs = m_pPart->codeRepository() ->registeredCatalogs(); - for ( QValueList<Catalog*>::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) + TQValueList<Catalog*> catalogs = m_pPart->codeRepository() ->registeredCatalogs(); + for ( TQValueList<Catalog*>::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { Catalog* c = *it; - QFileInfo dbInfo( c->dbName() ); - QCheckListItem* item = new QCheckListItem( advancedOptions, KURL::decode_string( dbInfo.baseName(true) ), QCheckListItem::CheckBox ); + TQFileInfo dbInfo( c->dbName() ); + TQCheckListItem* item = new TQCheckListItem( advancedOptions, KURL::decode_string( dbInfo.baseName(true) ), TQCheckListItem::CheckBox ); item->setOn( c->enabled() ); m_catalogs[ item ] = c; @@ -203,7 +203,7 @@ void CCConfigWidget::saveCodeCompletionTab( ) if( radioGroupByAlphabet->isChecked() ) c->setCompletionBoxItemOrder( CppCodeCompletionConfig::ByAlphabet );*/ - for ( QMap<QCheckListItem*, Catalog*>::Iterator it = m_catalogs.begin(); it != m_catalogs.end(); ++it ) + for ( TQMap<TQCheckListItem*, Catalog*>::Iterator it = m_catalogs.begin(); it != m_catalogs.end(); ++it ) { it.data() ->setEnabled( it.key() ->isOn() ); } @@ -229,11 +229,11 @@ void CCConfigWidget::slotRemovePCS() if ( !advancedOptions->selectedItem() ) return ; - QString db = advancedOptions->selectedItem() ->text( 0 ); - QString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db ); + TQString db = advancedOptions->selectedItem() ->text( 0 ); + TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db ); KStandardDirs *dirs = m_pPart->instance() ->dirs(); - QString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db"; + TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db"; if ( KMessageBox::Continue == KMessageBox::warningContinueCancel( 0, question, i18n( "Delete Database" ), KStdGuiItem::del() ) ) { @@ -243,8 +243,8 @@ void CCConfigWidget::slotRemovePCS() void CCConfigWidget::catalogRegistered( Catalog * c ) { - QFileInfo dbInfo( c->dbName() ); - QCheckListItem* item = new QCheckListItem( advancedOptions, KURL::decode_string( dbInfo.baseName(true) ), QCheckListItem::CheckBox ); + TQFileInfo dbInfo( c->dbName() ); + TQCheckListItem* item = new TQCheckListItem( advancedOptions, KURL::decode_string( dbInfo.baseName(true) ), TQCheckListItem::CheckBox ); item->setOn( c->enabled() ); m_catalogs[ item ] = c; @@ -252,11 +252,11 @@ void CCConfigWidget::catalogRegistered( Catalog * c ) void CCConfigWidget::catalogUnregistered( Catalog * c ) { - for ( QMap<QCheckListItem*, Catalog*>::Iterator it = m_catalogs.begin(); it != m_catalogs.end(); ++it ) + for ( TQMap<TQCheckListItem*, Catalog*>::Iterator it = m_catalogs.begin(); it != m_catalogs.end(); ++it ) { if ( it.data() == c ) { - QCheckListItem * item = it.key(); + TQCheckListItem * item = it.key(); delete( item ); m_catalogs.remove( it ); break; @@ -284,16 +284,16 @@ void CCConfigWidget::slotGetterSetterValuesChanged( ) bool hasError = false; if ( m_edtParameterName->text().isEmpty() ) { - m_lblParameterName->setPaletteForegroundColor( QColor( "red" ) ); + m_lblParameterName->setPaletteForegroundColor( TQColor( "red" ) ); m_edtExampleGet->setText( "error, missing parametername" ); m_edtExampleSet->setText( "error, missing parametername" ); hasError = true; } - QString name = m_edtVariableName->text(); + TQString name = m_edtVariableName->text(); if ( name.isEmpty() ) { - m_lblVariableName->setPaletteForegroundColor( QColor( "red" ) ); + m_lblVariableName->setPaletteForegroundColor( TQColor( "red" ) ); m_edtExampleGet->setText( "error, missing variablename" ); m_edtExampleSet->setText( "error, missing variablename" ); hasError = true; @@ -301,23 +301,23 @@ void CCConfigWidget::slotGetterSetterValuesChanged( ) if ( hasError ) { - m_edtExampleGet->setPaletteForegroundColor( QColor( "red" ) ); - m_edtExampleSet->setPaletteForegroundColor( QColor( "red" ) ); + m_edtExampleGet->setPaletteForegroundColor( TQColor( "red" ) ); + m_edtExampleSet->setPaletteForegroundColor( TQColor( "red" ) ); return ; } else { - m_lblVariableName->setPaletteForegroundColor( QColor( "black" ) ); - m_lblParameterName->setPaletteForegroundColor( QColor( "black" ) ); - m_edtExampleGet->setPaletteForegroundColor( QColor( "black" ) ); - m_edtExampleSet->setPaletteForegroundColor( QColor( "black" ) ); + m_lblVariableName->setPaletteForegroundColor( TQColor( "black" ) ); + m_lblParameterName->setPaletteForegroundColor( TQColor( "black" ) ); + m_edtExampleGet->setPaletteForegroundColor( TQColor( "black" ) ); + m_edtExampleSet->setPaletteForegroundColor( TQColor( "black" ) ); } - QStringList prefixes = QStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ); + TQStringList prefixes = TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ); unsigned int len = 0; - QStringList::ConstIterator theend = prefixes.end(); - for ( QStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) + TQStringList::ConstIterator theend = prefixes.end(); + for ( TQStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) { if ( name.startsWith( *ci ) && ( *ci ).length() > len ) len = ( *ci ).length(); @@ -326,14 +326,14 @@ void CCConfigWidget::slotGetterSetterValuesChanged( ) if ( len > 0 ) name.remove( 0, len ); - QString getName = name; + TQString getName = name; if ( !m_edtGet->text().isEmpty() ) { getName[ 0 ] = getName[ 0 ].upper(); getName.prepend( m_edtGet->text() ); } - QString setName = name; + TQString setName = name; if ( !m_edtSet->text().isEmpty() ) { setName[ 0 ] = setName[ 0 ].upper(); @@ -355,7 +355,7 @@ void CCConfigWidget::saveGetterSetterTab( ) config->setPrefixGet( m_edtGet->text() ); config->setPrefixSet( m_edtSet->text() ); - config->setPrefixVariable( QStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ) ); + config->setPrefixVariable( TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ) ); config->setParameterName( m_edtParameterName->text() ); config->store(); } @@ -370,7 +370,7 @@ void CCConfigWidget::initSplitTab( ) m_splitEnable->setChecked( config->splitEnabled() ); m_splitSync->setChecked( config->autoSync() ); - QString o = config->orientation(); + TQString o = config->orientation(); m_splitVertical->setChecked( o == "Vertical" ); m_splitHorizontal->setChecked( o == "Horizontal" ); } @@ -453,29 +453,29 @@ void CCConfigWidget::initQtTab() } } -bool CCConfigWidget::isExecutable( const QString& path ) +bool CCConfigWidget::isExecutable( const TQString& path ) { - QFileInfo fi(path); + TQFileInfo fi(path); return ( fi.exists() && fi.isExecutable() ); } -void CCConfigWidget::isQMakeExecutable( const QString& path ) +void CCConfigWidget::isQMakeExecutable( const TQString& path ) { if( !isExecutable( path ) ) { - m_qmakePath->lineEdit()->setPaletteForegroundColor(QColor("#ff0000")); + m_qmakePath->lineEdit()->setPaletteForegroundColor(TQColor("#ff0000")); }else { m_qmakePath->lineEdit()->unsetPalette(); } } -void CCConfigWidget::isDesignerExecutable( const QString& path ) +void CCConfigWidget::isDesignerExecutable( const TQString& path ) { if( !isExecutable( path ) ) { - m_designerPath->lineEdit()->setPaletteForegroundColor(QColor("#ff0000")); + m_designerPath->lineEdit()->setPaletteForegroundColor(TQColor("#ff0000")); }else { m_designerPath->lineEdit()->unsetPalette(); @@ -519,14 +519,14 @@ void CCConfigWidget::saveQtTab() c->store(); } -void CCConfigWidget::isValidQtDir( const QString &dir ) +void CCConfigWidget::isValidQtDir( const TQString &dir ) { - QFileInfo inc( dir + QString( QChar( QDir::separator() ) )+ - "include"+QString( QChar( QDir::separator() ) )+ - "qt.h" ); + TQFileInfo inc( dir + TQString( TQChar( TQDir::separator() ) )+ + "include"+TQString( TQChar( TQDir::separator() ) )+ + "tqt.h" ); if ( !m_versionQt4->isChecked() && !inc.exists() ) { - m_qtDir->lineEdit()->setPaletteForegroundColor(QColor("#ff0000")); + m_qtDir->lineEdit()->setPaletteForegroundColor(TQColor("#ff0000")); }else { m_qtDir->lineEdit()->unsetPalette(); @@ -561,13 +561,13 @@ void CCConfigWidget::openPluginPaths() kdDebug(9024) << "Plugin paths opened" << endl; QtBuildConfig* c = m_pPart->qtBuildConfig(); KDialog d( this ); - QVBoxLayout* mainlayout = new QVBoxLayout( &d ); + TQVBoxLayout* mainlayout = new TQVBoxLayout( &d ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d ); - connect( ok, SIGNAL(clicked()), &d, SLOT(accept())); + connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept())); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d ); - connect( cancel, SIGNAL(clicked()), &d, SLOT(reject())); - QHBoxLayout* btns = new QHBoxLayout( &d ); - btns->addItem( new QSpacerItem(10,10,QSizePolicy::Expanding) ); + connect( cancel, TQT_SIGNAL(clicked()), &d, TQT_SLOT(reject())); + TQHBoxLayout* btns = new TQHBoxLayout( &d ); + btns->addItem( new TQSpacerItem(10,10,TQSizePolicy::Expanding) ); btns->addWidget(ok); btns->addWidget(cancel); @@ -579,7 +579,7 @@ void CCConfigWidget::openPluginPaths() mainlayout->addWidget( p ); mainlayout->addLayout( btns ); d.resize( 450, 250 ); - if( d.exec() == QDialog::Accepted) + if( d.exec() == TQDialog::Accepted) { c->setDesignerPluginPaths( p->items() ); } diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h index b8874ed2..8dd8c9a3 100644 --- a/languages/cpp/ccconfigwidget.h +++ b/languages/cpp/ccconfigwidget.h @@ -13,7 +13,7 @@ #define _CCCONFIGWIDGET_H_ #include "ccconfigwidgetbase.h" -#include <qmap.h> +#include <tqmap.h> class CppSupportPart; class Catalog; @@ -25,7 +25,7 @@ class CCConfigWidget : public CCConfigWidgetBase Q_OBJECT public: - CCConfigWidget( CppSupportPart* part, QWidget* parent = 0, const char* name = 0 ); + CCConfigWidget( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); virtual ~CCConfigWidget( ); public slots: @@ -39,14 +39,14 @@ protected slots: private slots: void catalogRegistered( Catalog* c ); void catalogUnregistered( Catalog* c ); - void isValidQtDir( const QString & ); - void isDesignerExecutable( const QString& ); - void isQMakeExecutable( const QString& ); + void isValidQtDir( const TQString & ); + void isDesignerExecutable( const TQString& ); + void isQMakeExecutable( const TQString& ); void toggleQtVersion( bool ); void openPluginPaths( ); private: - bool isExecutable( const QString & ); + bool isExecutable( const TQString & ); void initGeneralTab(); void saveFileTemplatesTab(); @@ -65,7 +65,7 @@ private: private: CppSupportPart* m_pPart; - QMap<QCheckListItem*, Catalog*> m_catalogs; + TQMap<TQCheckListItem*, Catalog*> m_catalogs; KEditListBox* m_designerPluginPaths; }; diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index c6049801..70ad5d10 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qtextedit.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqtextedit.h> +#include <tqfile.h> +#include <tqfileinfo.h> #include <kstandarddirs.h> #include <kconfig.h> @@ -21,7 +21,7 @@ #include "cppsupportfactory.h" #include "classgeneratorconfig.h" -ClassGeneratorConfig::ClassGeneratorConfig( QWidget* parent, const char* name, WFlags fl ) +ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* parent, const char* name, WFlags fl ) : ClassGeneratorConfigBase( parent, name, fl ) { readConfig(); @@ -29,12 +29,12 @@ ClassGeneratorConfig::ClassGeneratorConfig( QWidget* parent, const char* name, W template_edit->setText( *currTemplate ); } -ClassGeneratorConfig::ClassGeneratorConfig( QString v_cppHeaderText, QString v_cppSourceText, - QString v_objcHeaderText, QString v_objcSourceText, - QString v_gtkHeaderText, QString v_gtkSourceText, +ClassGeneratorConfig::ClassGeneratorConfig( TQString v_cppHeaderText, TQString v_cppSourceText, + TQString v_objcHeaderText, TQString v_objcSourceText, + TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - QWidget* parent, const char* name, WFlags fl ) + TQWidget* parent, const char* name, WFlags fl ) : ClassGeneratorConfigBase( parent, name, fl ), cppHeaderText( v_cppHeaderText ), cppSourceText( v_cppSourceText ), objcHeaderText( v_objcHeaderText ), objcSourceText( v_objcSourceText ), @@ -62,42 +62,42 @@ void ClassGeneratorConfig::templateTypeChanged( int type ) template_edit->setText( *currTemplate ); } -QString ClassGeneratorConfig::cppHeader() +TQString ClassGeneratorConfig::cppHeader() { if ( currTemplate == &cppHeaderText ) * currTemplate = template_edit->text(); return cppHeaderText; } -QString ClassGeneratorConfig::cppSource() +TQString ClassGeneratorConfig::cppSource() { if ( currTemplate == &cppSourceText ) * currTemplate = template_edit->text(); return cppSourceText; } -QString ClassGeneratorConfig::objcHeader() +TQString ClassGeneratorConfig::objcHeader() { if ( currTemplate == &objcHeaderText ) * currTemplate = template_edit->text(); return objcHeaderText; } -QString ClassGeneratorConfig::objcSource() +TQString ClassGeneratorConfig::objcSource() { if ( currTemplate == &objcSourceText ) * currTemplate = template_edit->text(); return objcSourceText; } -QString ClassGeneratorConfig::gtkHeader() +TQString ClassGeneratorConfig::gtkHeader() { if ( currTemplate == >kHeaderText ) * currTemplate = template_edit->text(); return gtkHeaderText; } -QString ClassGeneratorConfig::gtkSource() +TQString ClassGeneratorConfig::gtkSource() { if ( currTemplate == >kSourceText ) * currTemplate = template_edit->text(); @@ -129,7 +129,7 @@ bool ClassGeneratorConfig::genDoc() return doc_box->isChecked(); } -QString *ClassGeneratorConfig::identifyTemplate( int value ) +TQString *ClassGeneratorConfig::identifyTemplate( int value ) { switch ( value ) { @@ -177,15 +177,15 @@ void ClassGeneratorConfig::readConfig() } -QString ClassGeneratorConfig::templateText( QString path ) +TQString ClassGeneratorConfig::templateText( TQString path ) { - QFileInfo f( path ); + TQFileInfo f( path ); if ( f.exists() ) { - QFile file( path ); + TQFile file( path ); if ( file.open( IO_ReadOnly ) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); return stream.read(); } else @@ -222,12 +222,12 @@ void ClassGeneratorConfig::storeConfig() } } -void ClassGeneratorConfig::saveTemplateText( QString path, QString content ) +void ClassGeneratorConfig::saveTemplateText( TQString path, TQString content ) { - QFile f( path ); + TQFile f( path ); if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << content; f.close(); } diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h index b9cb08a3..783934d4 100644 --- a/languages/cpp/classgeneratorconfig.h +++ b/languages/cpp/classgeneratorconfig.h @@ -21,26 +21,26 @@ class ClassGeneratorConfig : public ClassGeneratorConfigBase public: enum NameCase { LowerCase, UpperCase, SameAsClassCase, SameAsFileCase }; - ClassGeneratorConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ClassGeneratorConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ClassGeneratorConfig( QString v_cppHeaderText, QString v_cppSourceText, - QString v_objcHeaderText, QString v_objcSourceText, - QString v_gtkHeaderText, QString v_gtkSourceText, + ClassGeneratorConfig( TQString v_cppHeaderText, TQString v_cppSourceText, + TQString v_objcHeaderText, TQString v_objcSourceText, + TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~ClassGeneratorConfig(); /*$PUBLIC_FUNCTIONS$*/ void readConfig(); - QString cppHeader(); - QString cppSource(); - QString objcHeader(); - QString objcSource(); - QString gtkHeader(); - QString gtkSource(); + TQString cppHeader(); + TQString cppSource(); + TQString objcHeader(); + TQString objcSource(); + TQString gtkHeader(); + TQString gtkSource(); NameCase fileCase(); NameCase defCase(); @@ -61,18 +61,18 @@ protected slots: virtual void templateTypeChanged( int type ); private: - QString *identifyTemplate( int value ); - QString templateText( QString path ); - void saveTemplateText( QString path, QString content ); - - QString cppHeaderText; - QString cppSourceText; - QString objcHeaderText; - QString objcSourceText; - QString gtkHeaderText; - QString gtkSourceText; - - QString *currTemplate; + TQString *identifyTemplate( int value ); + TQString templateText( TQString path ); + void saveTemplateText( TQString path, TQString content ); + + TQString cppHeaderText; + TQString cppSourceText; + TQString objcHeaderText; + TQString objcSourceText; + TQString gtkHeaderText; + TQString gtkSourceText; + + TQString *currTemplate; }; #endif diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index 5bb22a68..e71f3a66 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -16,17 +16,17 @@ #include <kdebug.h> /// @todo move in utils.cpp -static QValueList<KTextEditor::CompletionEntry> -my_unique( const QValueList<KTextEditor::CompletionEntry>& entryList ) +static TQValueList<KTextEditor::CompletionEntry> +my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList ) { - QValueList< KTextEditor::CompletionEntry > l; - QMap<QString, bool> map; - QValueList< KTextEditor::CompletionEntry >::ConstIterator it = entryList.begin(); + TQValueList< KTextEditor::CompletionEntry > l; + TQMap<TQString, bool> map; + TQValueList< KTextEditor::CompletionEntry >::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { KTextEditor::CompletionEntry e = *it++; - QString key = e.type + " " + + TQString key = e.type + " " + e.text + " " + e.prefix + " " + e.postfix + " "; @@ -46,14 +46,14 @@ CodeInformationRepository::CodeInformationRepository( KDevCodeRepository* rep ) CodeInformationRepository::~CodeInformationRepository() {} -QValueList<Tag> CodeInformationRepository::query( const QValueList<Catalog :: QueryArgument> & args ) +TQValueList<Tag> CodeInformationRepository::query( const TQValueList<Catalog :: QueryArgument> & args ) { // kdDebug( 9007 ) << "CodeInformationRepository::query()" << endl; - QValueList<Tag> tags; + TQValueList<Tag> tags; - QValueList<Catalog*> catalogs = m_rep->registeredCatalogs(); - QValueList<Catalog*>::Iterator it = catalogs.begin(); + TQValueList<Catalog*> catalogs = m_rep->registeredCatalogs(); + TQValueList<Catalog*>::Iterator it = catalogs.begin(); while ( it != catalogs.end() ) { Catalog * catalog = *it; @@ -68,36 +68,36 @@ QValueList<Tag> CodeInformationRepository::query( const QValueList<Catalog :: Qu return tags; } -QValueList<Tag> CodeInformationRepository::getTagsInFile( const QString & fileName ) +TQValueList<Tag> CodeInformationRepository::getTagsInFile( const TQString & fileName ) { kdDebug( 9007 ) << "CodeInformationRepository::getTagsInFile()" << endl; - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "fileName", fileName ); - QValueList<Catalog*> catalogs = m_rep->registeredCatalogs(); - QValueList<Catalog*>::Iterator it = catalogs.begin(); + TQValueList<Catalog*> catalogs = m_rep->registeredCatalogs(); + TQValueList<Catalog*>::Iterator it = catalogs.begin(); while ( it != catalogs.end() ) { Catalog * catalog = *it; ++it; - QValueList<Tag> tags = catalog->query( args ); + TQValueList<Tag> tags = catalog->query( args ); if ( tags.size() ) return tags; } - return QValueList<Tag>(); + return TQValueList<Tag>(); } -QValueList<Tag> CodeInformationRepository::getTagsInScope( const QStringList & scope, bool // isInstance +TQValueList<Tag> CodeInformationRepository::getTagsInScope( const TQStringList & scope, bool // isInstance ) { kdDebug( 9007 ) << "CodeInformationRepository::getTagsInScope()" << endl; - QValueList<Tag> tags; - QValueList<Catalog::QueryArgument> args; + TQValueList<Tag> tags; + TQValueList<Catalog::QueryArgument> args; #if 0 @@ -133,7 +133,7 @@ QValueList<Tag> CodeInformationRepository::getTagsInScope( const QStringList & s return tags; } -QValueList<KTextEditor::CompletionEntry> CodeInformationRepository::getEntriesInScope( const QStringList & scope, bool isInstance, bool recompute ) +TQValueList<KTextEditor::CompletionEntry> CodeInformationRepository::getEntriesInScope( const TQStringList & scope, bool isInstance, bool recompute ) { kdDebug( 9007 ) << "CodeInformationRepository::getEntriesInScope()" << endl; @@ -149,14 +149,14 @@ QValueList<KTextEditor::CompletionEntry> CodeInformationRepository::getEntriesIn } -QValueList<Tag> CodeInformationRepository::getBaseClassList( const QString& className ) +TQValueList<Tag> CodeInformationRepository::getBaseClassList( const TQString& className ) { // kdDebug( 9007 ) << "CodeInformationRepository::getBaseClassList()" << endl; if ( className.isEmpty() ) - return QValueList<Tag>(); + return TQValueList<Tag>(); - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "kind", Tag::Kind_Base_class ); /* if( className.length() >= 2 ) args << Catalog::QueryArgument( "prefix", className.left(2) );*/ @@ -164,12 +164,12 @@ QValueList<Tag> CodeInformationRepository::getBaseClassList( const QString& clas return query( args ); } -QValueList<Tag> CodeInformationRepository::getClassOrNamespaceList( const QStringList & scope ) +TQValueList<Tag> CodeInformationRepository::getClassOrNamespaceList( const TQStringList & scope ) { kdDebug( 9007 ) << "CodeInformationRepository::getClassOrNamespaceList()" << endl; - QValueList<Tag> tags; - QValueList<Catalog::QueryArgument> args; + TQValueList<Tag> tags; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "kind", Tag::Kind_Namespace ) << Catalog::QueryArgument( "scope", scope ); @@ -183,10 +183,10 @@ QValueList<Tag> CodeInformationRepository::getClassOrNamespaceList( const QStrin return tags; } -QValueList<Tag> CodeInformationRepository::getTagsInScope( const QString & name, const QStringList & scope ) +TQValueList<Tag> CodeInformationRepository::getTagsInScope( const TQString & name, const TQStringList & scope ) { - QValueList<Tag> tags; - QValueList<Catalog::QueryArgument> args; + TQValueList<Tag> tags; + TQValueList<Catalog::QueryArgument> args; args.clear(); args << Catalog::QueryArgument( "scope", scope ); @@ -233,8 +233,8 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC { CppFunction<Tag> tagInfo( tag ); - QStringList arguments = tagInfo.arguments(); - QStringList argumentNames = tagInfo.argumentNames(); + TQStringList arguments = tagInfo.arguments(); + TQStringList argumentNames = tagInfo.argumentNames(); if ( completionMode == CppCodeCompletion::VirtualDeclCompletion ) { @@ -252,7 +252,7 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC else entry.text += "( "; - QString signature; + TQString signature; for ( uint i = 0; i < arguments.size(); ++i ) { if( !proc ) @@ -263,9 +263,9 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC if ( completionMode == CppCodeCompletion::NormalCompletion || completionMode == CppCodeCompletion::VirtualDeclCompletion ) { - QString argName = argumentNames[ i ]; + TQString argName = argumentNames[ i ]; if ( !argName.isEmpty() ) - signature += QString::fromLatin1( " " ) + argName; + signature += TQString::fromLatin1( " " ) + argName; } @@ -286,15 +286,15 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC if ( completionMode == CppCodeCompletion::VirtualDeclCompletion ) { entry.text += entry.postfix + ";"; - entry.postfix = QString::null; + entry.postfix = TQString::null; } else if ( completionMode != CppCodeCompletion::NormalCompletion ) { entry.text += entry.postfix; - entry.postfix = QString::null; + entry.postfix = TQString::null; } - QString comment = tag.attribute( "description" ).toString(); + TQString comment = tag.attribute( "description" ).toString(); if ( !comment.isNull() ) entry.comment = comment; //else @@ -317,12 +317,12 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC return entry; } -QValueList<KTextEditor :: CompletionEntry> CodeInformationRepository::toEntryList( const QValueList<Tag> & tags, CppCodeCompletion::CompletionMode completionMode ) +TQValueList<KTextEditor :: CompletionEntry> CodeInformationRepository::toEntryList( const TQValueList<Tag> & tags, CppCodeCompletion::CompletionMode completionMode ) { - QValueList<KTextEditor :: CompletionEntry> entryList; - QMap<QString, bool> ns; + TQValueList<KTextEditor :: CompletionEntry> entryList; + TQMap<TQString, bool> ns; - QValueList<Tag>::ConstIterator it = tags.begin(); + TQValueList<Tag>::ConstIterator it = tags.begin(); while ( it != tags.end() ) { Tag tag = *it; diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h index f7fa712a..2c5f4cb2 100644 --- a/languages/cpp/codeinformationrepository.h +++ b/languages/cpp/codeinformationrepository.h @@ -14,13 +14,13 @@ #include "catalog.h" #include "cppcodecompletion.h" -#include <qmap.h> +#include <tqmap.h> #include <ktexteditor/codecompletioninterface.h> struct TypeProcessor { - virtual QString processType( const QString& type ) = 0; - virtual QString parentType() = 0; + virtual TQString processType( const TQString& type ) = 0; + virtual TQString parentType() = 0; }; class KDevCodeRepository; @@ -31,21 +31,21 @@ public: CodeInformationRepository( KDevCodeRepository* rep ); virtual ~CodeInformationRepository(); - static QValueList<KTextEditor::CompletionEntry> toEntryList( const QValueList<Tag>& tags, + static TQValueList<KTextEditor::CompletionEntry> toEntryList( const TQValueList<Tag>& tags, CppCodeCompletion::CompletionMode mode = CppCodeCompletion::NormalCompletion ); static KTextEditor::CompletionEntry toEntry( Tag& tag, CppCodeCompletion::CompletionMode mode = CppCodeCompletion::NormalCompletion, TypeProcessor* proc = 0 ); - QValueList<KTextEditor::CompletionEntry> getEntriesInScope( const QStringList& scope, bool isInstance, bool recompute = false ); + TQValueList<KTextEditor::CompletionEntry> getEntriesInScope( const TQStringList& scope, bool isInstance, bool recompute = false ); - QValueList<Tag> query( const QValueList<Catalog::QueryArgument>& args ); - QValueList<Tag> getTagsInScope( const QStringList& scope, bool isInstance ); - QValueList<Tag> getTagsInScope( const QString& name, const QStringList& scope ); + TQValueList<Tag> query( const TQValueList<Catalog::QueryArgument>& args ); + TQValueList<Tag> getTagsInScope( const TQStringList& scope, bool isInstance ); + TQValueList<Tag> getTagsInScope( const TQString& name, const TQStringList& scope ); - QValueList<Tag> getTagsInFile( const QString& fileName ); - QValueList<Tag> getBaseClassList( const QString& className ); - QValueList<Tag> getClassOrNamespaceList( const QStringList& scope ); + TQValueList<Tag> getTagsInFile( const TQString& fileName ); + TQValueList<Tag> getBaseClassList( const TQString& className ); + TQValueList<Tag> getClassOrNamespaceList( const TQStringList& scope ); private: - QValueList<KTextEditor::CompletionEntry> m_globalEntries; + TQValueList<KTextEditor::CompletionEntry> m_globalEntries; KDevCodeRepository* m_rep; private: diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index ac547fc7..8f632d69 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -9,14 +9,14 @@ * * ***************************************************************************/ -#include <qapplication.h> -#include <qlabel.h> -#include <qvbuttongroup.h> -#include <qradiobutton.h> -#include <qvaluelist.h> -#include <qtabwidget.h> -#include <qlayout.h> -#include <qvbox.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqvbuttongroup.h> +#include <tqradiobutton.h> +#include <tqvaluelist.h> +#include <tqtabwidget.h> +#include <tqlayout.h> +#include <tqvbox.h> #include <kdialog.h> #include <klocale.h> #include <kgenericfactory.h> @@ -29,11 +29,11 @@ K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory<GccOptionsPlugin> class GeneralTab : public QWidget { public: - GeneralTab( GccOptionsPlugin::Type type, QWidget *parent = 0, const char *name = 0 ); + GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~GeneralTab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: FlagCheckBoxController *controller; @@ -43,14 +43,14 @@ private: class OptimizationTab : public QWidget { public: - OptimizationTab( GccOptionsPlugin::Type type, QWidget *parent = 0, const char *name = 0 ); + OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~OptimizationTab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: - QRadioButton *Odefault, *O0, *O1, *O2; + TQRadioButton *Odefault, *O0, *O1, *O2; FlagListBox *optBox; }; @@ -58,11 +58,11 @@ private: class G77Tab : public QWidget { public: - G77Tab( QWidget *parent = 0, const char *name = 0 ); + G77Tab( TQWidget *parent = 0, const char *name = 0 ); ~G77Tab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: FlagCheckBoxController *controller; @@ -72,11 +72,11 @@ private: class Warnings1Tab : public QWidget { public: - Warnings1Tab( GccOptionsPlugin::Type type, QWidget *parent = 0, const char *name = 0 ); + Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~Warnings1Tab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: FlagCheckBoxController *controller; @@ -87,25 +87,25 @@ private: class Warnings2Tab : public QWidget { public: - Warnings2Tab( GccOptionsPlugin::Type type, QWidget *parent = 0, const char *name = 0 ); + Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~Warnings2Tab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: FlagListBox *wrestBox; }; -GeneralTab::GeneralTab( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) - : QWidget( parent, name ), controller( new FlagCheckBoxController ) +GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); layout->addSpacing( 10 ); - QVButtonGroup *output_group = new QVButtonGroup( i18n( "Output" ), this ); + TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this ); new FlagCheckBox( output_group, controller, "-fsyntax-only", i18n( "Only check the code for syntax errors, do not produce object code" ) ); new FlagCheckBox( output_group, controller, @@ -113,10 +113,10 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, QWidget *parent, const char new FlagCheckBox( output_group, controller, "-save-temps", i18n( "Do not delete intermediate output like assembler files" ) ); - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addSpacing( 10 ); - QVButtonGroup *codegen_group = new QVButtonGroup( i18n( "Code Generation" ), this ); + TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); if ( type != GccOptionsPlugin::GPP ) { new FlagCheckBox( codegen_group, controller, @@ -141,7 +141,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, QWidget *parent, const char new FlagCheckBox( codegen_group, controller, "-short-double", i18n( "Make 'double' the same as 'float'" ) ); - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addStretch(); } @@ -152,30 +152,30 @@ GeneralTab::~GeneralTab() } -void GeneralTab::readFlags( QStringList *list ) +void GeneralTab::readFlags( TQStringList *list ) { controller->readFlags( list ); } -void GeneralTab::writeFlags( QStringList *list ) +void GeneralTab::writeFlags( TQStringList *list ) { controller->writeFlags( list ); } -OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) - : QWidget( parent, name ) +OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); - QVButtonGroup *group = new QVButtonGroup( i18n( "Optimization Level" ), this ); - Odefault = new QRadioButton( i18n( "Default" ), group ); + TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this ); + Odefault = new TQRadioButton( i18n( "Default" ), group ); Odefault->setChecked( true ); - O0 = new QRadioButton( i18n( "No optimization" ), group ); - O1 = new QRadioButton( i18n( "Level 1" ), group ); - O2 = new QRadioButton( i18n( "Level 2" ), group ); + O0 = new TQRadioButton( i18n( "No optimization" ), group ); + O1 = new TQRadioButton( i18n( "Level 1" ), group ); + O2 = new TQRadioButton( i18n( "Level 2" ), group ); optBox = new FlagListBox( this ); @@ -210,7 +210,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, QWidget *parent, "-fdefault-inline" ); } - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addStretch(); } @@ -219,11 +219,11 @@ OptimizationTab::~OptimizationTab() {} -void OptimizationTab::readFlags( QStringList *list ) +void OptimizationTab::readFlags( TQStringList *list ) { optBox->readFlags( list ); - QStringList::Iterator sli; + TQStringList::Iterator sli; sli = list->find( "-O0" ); if ( sli != list->end() ) { @@ -248,7 +248,7 @@ void OptimizationTab::readFlags( QStringList *list ) } -void OptimizationTab::writeFlags( QStringList *list ) +void OptimizationTab::writeFlags( TQStringList *list ) { optBox->writeFlags( list ); @@ -261,14 +261,14 @@ void OptimizationTab::writeFlags( QStringList *list ) } -G77Tab::G77Tab( QWidget *parent, const char *name ) - : QWidget( parent, name ), controller( new FlagCheckBoxController ) +G77Tab::G77Tab( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); layout->addSpacing( 10 ); - QVButtonGroup *dialect_group = new QVButtonGroup( i18n( "Dialect" ), this ); + TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this ); new FlagCheckBox( dialect_group, controller, "-ffree-form", i18n( "Interpret source code as Fortran 90 free form" ), "-fno-exception" ); @@ -282,10 +282,10 @@ G77Tab::G77Tab( QWidget *parent, const char *name ) new FlagCheckBox( dialect_group, controller, "-fonetrip", i18n( "DO loops are executed at least once" ) ); - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addSpacing( 10 ); - QVButtonGroup *codegen_group = new QVButtonGroup( i18n( "Code Generation" ), this ); + TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); new FlagCheckBox( codegen_group, controller, "-fno-automatic", i18n( "Treat local variables as if SAVE statement had been specified" ) ); new FlagCheckBox( codegen_group, controller, @@ -293,7 +293,7 @@ G77Tab::G77Tab( QWidget *parent, const char *name ) new FlagCheckBox( codegen_group, controller, "-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) ); - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addStretch(); } @@ -304,22 +304,22 @@ G77Tab::~G77Tab() } -void G77Tab::readFlags( QStringList *list ) +void G77Tab::readFlags( TQStringList *list ) { controller->readFlags( list ); } -void G77Tab::writeFlags( QStringList *list ) +void G77Tab::writeFlags( TQStringList *list ) { controller->writeFlags( list ); } -Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) - : QWidget( parent, name ), controller( new FlagCheckBoxController ) +Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); new FlagCheckBox( this, controller, @@ -400,24 +400,24 @@ Warnings1Tab::~Warnings1Tab() } -void Warnings1Tab::readFlags( QStringList *list ) +void Warnings1Tab::readFlags( TQStringList *list ) { controller->readFlags( list ); wallBox->readFlags( list ); } -void Warnings1Tab::writeFlags( QStringList *list ) +void Warnings1Tab::writeFlags( TQStringList *list ) { controller->writeFlags( list ); wallBox->writeFlags( list ); } -Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) - : QWidget( parent, name ) +Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); wrestBox = new FlagListBox( this ); @@ -559,23 +559,23 @@ Warnings2Tab::~Warnings2Tab() {} -void Warnings2Tab::readFlags( QStringList *list ) +void Warnings2Tab::readFlags( TQStringList *list ) { wrestBox->readFlags( list ); } -void Warnings2Tab::writeFlags( QStringList *list ) +void Warnings2Tab::writeFlags( TQStringList *list ) { wrestBox->writeFlags( list ); } // Last but not least... :-) -GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) +GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, parent, name, true ) { - QVBox * vbox; + TQVBox * vbox; vbox = addVBoxPage( i18n( "General" ) ); general = new GeneralTab( type, vbox, "general tab" ); @@ -603,9 +603,9 @@ GccOptionsDialog::~GccOptionsDialog() {} -void GccOptionsDialog::setFlags( const QString &flags ) +void GccOptionsDialog::setFlags( const TQString &flags ) { - QStringList flaglist = QStringList::split( " ", flags ); + TQStringList flaglist = TQStringList::split( " ", flags ); // Hand them to 'general' at last, so it can make a line edit // with the unprocessed items @@ -619,9 +619,9 @@ void GccOptionsDialog::setFlags( const QString &flags ) } -QString GccOptionsDialog::flags() const +TQString GccOptionsDialog::flags() const { - QStringList flaglist; + TQStringList flaglist; if ( g77 ) g77->writeFlags( &flaglist ); @@ -630,8 +630,8 @@ QString GccOptionsDialog::flags() const warnings2->writeFlags( &flaglist ); general->writeFlags( &flaglist ); - QString flags; - QStringList::ConstIterator li; + TQString flags; + TQStringList::ConstIterator li; for ( li = flaglist.begin(); li != flaglist.end(); ++li ) { flags += ( *li ); @@ -649,7 +649,7 @@ QString GccOptionsDialog::flags() const } -GccOptionsPlugin::GccOptionsPlugin( QObject *parent, const char *name, const QStringList &args ) +GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ) : KDevCompilerOptions( parent, name ) { gcctype = Unknown; @@ -657,7 +657,7 @@ GccOptionsPlugin::GccOptionsPlugin( QObject *parent, const char *name, const QSt if ( args.count() == 0 ) return ; - QString typeStr = args[ 0 ]; + TQString typeStr = args[ 0 ]; if ( typeStr == "gcc" ) gcctype = GccOptionsPlugin::GCC; @@ -672,7 +672,7 @@ GccOptionsPlugin::~GccOptionsPlugin() {} -QString GccOptionsPlugin::captionForType( Type type ) +TQString GccOptionsPlugin::captionForType( Type type ) { switch ( type ) { @@ -683,19 +683,19 @@ QString GccOptionsPlugin::captionForType( Type type ) case G77: return i18n( "GNU Fortran 77 Compiler Options" ); default: - return QString::null; + return TQString::null; } } -QString GccOptionsPlugin::exec( QWidget *parent, const QString &flags ) +TQString GccOptionsPlugin::exec( TQWidget *parent, const TQString &flags ) { if ( gcctype == Unknown ) - return QString::null; + return TQString::null; GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, parent, "gcc options dialog" ); - QString newFlags = flags; + TQString newFlags = flags; dlg->setFlags( flags ); - if ( dlg->exec() == QDialog::Accepted ) + if ( dlg->exec() == TQDialog::Accepted ) newFlags = dlg->flags(); delete dlg; return newFlags; diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index a3b8cd70..e5144e01 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -30,12 +30,12 @@ class GccOptionsPlugin : public KDevCompilerOptions public: enum Type { GCC, GPP, G77, Unknown }; - GccOptionsPlugin( QObject *parent, const char *name, const QStringList &args ); + GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~GccOptionsPlugin(); - static QString captionForType(Type type); + static TQString captionForType(Type type); - virtual QString exec(QWidget *parent, const QString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); private: Type gcctype; @@ -45,11 +45,11 @@ private: class GccOptionsDialog : public KDialogBase { public: - GccOptionsDialog( GccOptionsPlugin::Type type, QWidget *parent=0, const char *name=0 ); + GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~GccOptionsDialog(); - void setFlags(const QString &flags); - QString flags() const; + void setFlags(const TQString &flags); + TQString flags() const; private: GeneralTab *general; @@ -57,7 +57,7 @@ private: G77Tab *g77; Warnings1Tab *warnings1; Warnings2Tab *warnings2; - QStringList unrecognizedFlags; + TQStringList unrecognizedFlags; }; #endif diff --git a/languages/cpp/completiondebug.h b/languages/cpp/completiondebug.h index 088b3b99..325ad193 100644 --- a/languages/cpp/completiondebug.h +++ b/languages/cpp/completiondebug.h @@ -20,7 +20,7 @@ email : david.nolden.kdevelop@art-master.de ///When defined, a backtrace is printed the first time the maximum depth is reached for the first time. //#define DEPTHBACKTRACE -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdebug.h> namespace CompletionDebug { @@ -29,7 +29,7 @@ class KDDebugState { private: StreamType m_stream; kndbgstream m_nstream; - QStringList m_prefixStack; + TQStringList m_prefixStack; int m_counter; int m_depth; bool m_enabled; @@ -41,7 +41,7 @@ class KDDebugState { KDDebugState( StreamType stream ) : m_stream( stream ), m_counter( 0 ), m_depth( 0 ), m_enabled( true ), m_hadWarning( false ) {} - void push( const QString & txt ) { + void push( const TQString & txt ) { m_prefixStack.push_back( txt ); pushDepth(); } @@ -74,7 +74,7 @@ class KDDebugState { #endif m_stream << "(" << m_counter << ")"; - for ( QStringList::iterator it = m_prefixStack.begin(); it != m_prefixStack.end() ; ++it ) + for ( TQStringList::iterator it = m_prefixStack.begin(); it != m_prefixStack.end() ; ++it ) m_stream << *it; m_counter++; @@ -92,7 +92,7 @@ class KDDebugState { #ifndef NDEBUG void outputPrefix( kdbgstream& target ) { target << "(" << m_counter << ")"; - for ( QStringList::iterator it = m_prefixStack.begin(); it != m_prefixStack.end() ; ++it ) + for ( TQStringList::iterator it = m_prefixStack.begin(); it != m_prefixStack.end() ; ++it ) target << *it; m_counter++; diff --git a/languages/cpp/computerecoverypoints.h b/languages/cpp/computerecoverypoints.h index eccd44f6..4e2056d5 100644 --- a/languages/cpp/computerecoverypoints.h +++ b/languages/cpp/computerecoverypoints.h @@ -22,20 +22,20 @@ #ifndef __COMPUTERECOVERYPOINTS_H__ #define __COMPUTERECOVERYPOINTS_H__ -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "simpletype.h" #include "simpletypenamespace.h" #include "tree_parser.h" -static QString toSimpleName( NameAST* name ) +static TQString toSimpleName( NameAST* name ) { if ( !name ) - return QString::null; + return TQString::null; - QString s; - QPtrList<ClassOrNamespaceNameAST> l = name->classOrNamespaceNameList(); - QPtrListIterator<ClassOrNamespaceNameAST> nameIt( l ); + TQString s; + TQPtrList<ClassOrNamespaceNameAST> l = name->classOrNamespaceNameList(); + TQPtrListIterator<ClassOrNamespaceNameAST> nameIt( l ); while ( nameIt.current() ) { if ( nameIt.current() ->name() ) @@ -55,8 +55,8 @@ static QString toSimpleName( NameAST* name ) struct RecoveryPoint { int kind; - QStringList scope; - QValueList<QStringList> imports; + TQStringList scope; + TQValueList<TQStringList> imports; int startLine, startColumn; int endLine, endColumn; @@ -67,15 +67,15 @@ struct RecoveryPoint {} ///Registers the recovery-points imports into the given namespace - void registerImports( SimpleType ns, QString hardCodedAliases ) { + void registerImports( SimpleType ns, TQString hardCodedAliases ) { SimpleTypeNamespace* n = dynamic_cast<SimpleTypeNamespace*>( &(*ns) ); if( !n ) { kdDebug( 9007 ) << "the global namespace was not resolved correctly " << endl; } else { ///put the imports into the global namespace - for( QValueList<QStringList>::iterator it = imports.begin(); it != imports.end(); ++it ) { + for( TQValueList<TQStringList>::iterator it = imports.begin(); it != imports.end(); ++it ) { kdDebug( 9007 ) << "inserting import " << *it << " into the global scope" << endl; - n->addAliasMap( QString(""), (*it).join("::"), IncludeFiles() ); ///@TODO: remove this + n->addAliasMap( TQString(""), (*it).join("::"), IncludeFiles() ); ///@TODO: remove this } n->addAliases( hardCodedAliases ); } @@ -91,13 +91,13 @@ private: class ComputeRecoveryPoints: public TreeParser { public: - ComputeRecoveryPoints( QPtrList<RecoveryPoint>& points ) + ComputeRecoveryPoints( TQPtrList<RecoveryPoint>& points ) : recoveryPoints( points ) {} virtual void parseTranslationUnit( const ParsedFile& ast ) { - QValueList<QStringList> dummy; + TQValueList<TQStringList> dummy; m_imports.push( dummy ); TreeParser::parseTranslationUnit( ast ); @@ -111,7 +111,7 @@ public: if ( !ast->name() ) return ; - //QStringList type = CppCodeCompletion::typeName( ast->name() ->text() ).scope(); + //TQStringList type = CppCodeCompletion::typeName( ast->name() ->text() ).scope(); m_imports.top().push_back( ast->name() ->text() ); } @@ -181,9 +181,9 @@ public: } private: - QPtrList<RecoveryPoint>& recoveryPoints; - QValueStack< QValueList<QStringList> > m_imports; - QStringList m_currentScope; + TQPtrList<RecoveryPoint>& recoveryPoints; + TQValueStack< TQValueList<TQStringList> > m_imports; + TQStringList m_currentScope; }; #endif diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index d5952b95..842e0c69 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -15,8 +15,8 @@ #include <klocale.h> #include <kdebug.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> void ConfigureProblemReporter::init() { @@ -39,13 +39,13 @@ void ConfigureProblemReporter::setPart( CppSupportPart* part ) if ( !m_part ) return ; - QString conf_file_name = m_part->specialHeaderName(); - if ( QFile::exists( conf_file_name ) ) + TQString conf_file_name = m_part->specialHeaderName(); + if ( TQFile::exists( conf_file_name ) ) { - QFile f( conf_file_name ); + TQFile f( conf_file_name ); if ( f.open( IO_ReadOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); specialHeader->setText( stream.read() ); f.close(); } @@ -67,11 +67,11 @@ void ConfigureProblemReporter::accept() if ( m_part && specialHeader->isModified() ) { - QString conf_file_name = m_part->specialHeaderName( true ); - QFile f( conf_file_name ); + TQString conf_file_name = m_part->specialHeaderName( true ); + TQFile f( conf_file_name ); if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << specialHeader->text(); f.close(); diff --git a/languages/cpp/cpp_tags.h b/languages/cpp/cpp_tags.h index 077fbd82..a82ac758 100644 --- a/languages/cpp/cpp_tags.h +++ b/languages/cpp/cpp_tags.h @@ -13,8 +13,8 @@ #ifndef CPP_TAGS_H #define CPP_TAGS_H -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> template <class Tag> class CppBaseClass @@ -44,9 +44,9 @@ public: return m_tag; } - static QString format( const Tag& tag ) + static TQString format( const Tag& tag ) { - return QString::null; + return TQString::null; } int access() const @@ -71,22 +71,22 @@ public: m_tag.setFlags( m_info.flags ); } - QString name() const + TQString name() const { return m_tag.name(); } - void setName( const QString& name ) + void setName( const TQString& name ) { m_tag.setName( name ); } - QString baseClass() const + TQString baseClass() const { return m_tag.attribute( "b" ).toString(); } - void setBaseClass( const QString& baseClass ) + void setBaseClass( const TQString& baseClass ) { m_tag.setAttribute( "b", baseClass ); } @@ -135,9 +135,9 @@ public: return m_tag; } - static QString format( const Tag& tag ) + static TQString format( const Tag& tag ) { - return QString::null; + return TQString::null; } int access() const @@ -173,22 +173,22 @@ public: m_tag.setFlags( m_info.flags ); } - QString type() const + TQString type() const { return m_tag.attribute( "t" ).toString(); } - void setType( const QString& type ) + void setType( const TQString& type ) { m_tag.setAttribute( "t", type ); } - QString name() const + TQString name() const { return m_tag.name(); } - void setName( const QString& name ) + void setName( const TQString& name ) { m_tag.setName( name ); } @@ -239,9 +239,9 @@ public: return m_tag; } - static QString format( const Tag& tag ) + static TQString format( const Tag& tag ) { - return QString::null; + return TQString::null; } int access() const @@ -355,42 +355,42 @@ public: } - QString type() const + TQString type() const { return m_tag.attribute( "t" ).toString(); } - void setType( const QString& type ) + void setType( const TQString& type ) { m_tag.setAttribute( "t", type ); } - QString name() const + TQString name() const { return m_tag.name(); } - void setName( const QString& name ) + void setName( const TQString& name ) { m_tag.setName( name ); } - QStringList arguments() const + TQStringList arguments() const { return m_tag.attribute( "a" ).toStringList(); } - void setArguments( const QStringList args ) + void setArguments( const TQStringList args ) { m_tag.setAttribute( "a", args ); } - QStringList argumentNames() const + TQStringList argumentNames() const { return m_tag.attribute( "an" ).toStringList(); } - void setArgumentNames( const QStringList args ) + void setArgumentNames( const TQStringList args ) { m_tag.setAttribute( "an", args ); } diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 27cc9009..266c3878 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -37,7 +37,7 @@ email : david.nolden.kdevelop@art-master.de #include <typeinfo> -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kapplication.h> #include <kdebug.h> @@ -49,15 +49,15 @@ email : david.nolden.kdevelop@art-master.de #include <ktexteditor/document.h> #include <kaction.h> -#include <qdatastream.h> -#include <qfile.h> -#include <qmap.h> -#include <qregexp.h> -#include <qstatusbar.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qpair.h> -#include <qvaluestack.h> +#include <tqdatastream.h> +#include <tqfile.h> +#include <tqmap.h> +#include <tqregexp.h> +#include <tqstatusbar.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqpair.h> +#include <tqvaluestack.h> #include <kdevpartcontroller.h> #include <kdevmainwindow.h> @@ -99,14 +99,14 @@ const char* destructorPrefix = "<destructor>"; -- TODO: The documentation shown in the calltips looks very bad, a better solution must be found(maybe an additional tooltip) */ - void statusBarText( const QString& str, int time ) { + void statusBarText( const TQString& str, int time ) { CppCodeCompletion* c = CppCodeCompletion::instance(); if( c ) c->addStatusText( str, time ); } TypePointer CppCodeCompletion::createGlobalNamespace() { - KSharedPtr<SimpleTypeCachedNamespace> n = new SimpleTypeCachedNamespace( QStringList(), QStringList() ); + KSharedPtr<SimpleTypeCachedNamespace> n = new SimpleTypeCachedNamespace( TQStringList(), TQStringList() ); n->addAliases(m_pSupport->codeCompletionConfig()->namespaceAliases() ); return n.data(); } @@ -133,16 +133,16 @@ SafetyCounter safetyCounter; CppCodeCompletion* cppCompletionInstance = 0; //file global functions, must be before any "using namespace" -QString cleanForMenu( QString txt ) { +TQString cleanForMenu( TQString txt ) { return txt.replace( "&", "&&" ).replace( " ", " " ); } -QString buildSignature( TypePointer currType ) { +TQString buildSignature( TypePointer currType ) { SimpleTypeFunctionInterface * f = currType->asFunction(); if ( !f ) return ""; - QString ret; + TQString ret; LocateResult rtt = currType->locateDecType( f->getReturnType() ); if ( rtt->resolved() || rtt.resolutionCount() > 1 ) ret = rtt->fullNameChain(); @@ -153,7 +153,7 @@ QString buildSignature( TypePointer currType ) { TypeDesc desc = currType->desc(); desc.decreaseFunctionDepth(); - QString sig = ret + " " + desc.fullNameChain() + f->signature(); + TQString sig = ret + " " + desc.fullNameChain() + f->signature(); if ( f->isConst() ) sig += " const"; return sig; @@ -164,10 +164,10 @@ PopupTracker* PopupTracker::pt = 0; /** Multiple empty lines are reduced to one, too long lines wrapped over, and the beginnings of the lines are normalized */ -QStringList maximumLength( const QStringList& in, int length ) { - QStringList ret; +TQStringList maximumLength( const TQStringList& in, int length ) { + TQStringList ret; uint firstNonSpace = 50000; - for ( QStringList::const_iterator it = in.begin(); it != in.end(); ++it ) + for ( TQStringList::const_iterator it = in.begin(); it != in.end(); ++it ) for ( uint a = 0; a < ( *it ).length(); a++ ) if ( !( *it ) [ a ].isSpace() ) { if ( firstNonSpace > a ) @@ -175,17 +175,17 @@ QStringList maximumLength( const QStringList& in, int length ) { break; } if ( firstNonSpace == 50000 ) - return QStringList(); + return TQStringList(); bool hadEmptyLine = false; - for ( QStringList::const_iterator it = in.begin(); it != in.end(); ++it ) { + for ( TQStringList::const_iterator it = in.begin(); it != in.end(); ++it ) { if ( ( *it ).length() <= firstNonSpace ) { if ( !hadEmptyLine ) ret << " "; hadEmptyLine = true; } else { hadEmptyLine = false; - QString str = ( *it ).mid( firstNonSpace ); + TQString str = ( *it ).mid( firstNonSpace ); while ( !str.isEmpty() ) { if ( (int)str.length() < length ) { ret << str; @@ -200,10 +200,10 @@ QStringList maximumLength( const QStringList& in, int length ) { return ret; } -QStringList prepareTextForMenu( const QString& comment, int maxLines, int maxLength ) { - QStringList in = QStringList::split( "\n", comment ); - QStringList out; - for ( QStringList::iterator it = in.begin(); it != in.end(); ++it ) { +TQStringList prepareTextForMenu( const TQString& comment, int maxLines, int maxLength ) { + TQStringList in = TQStringList::split( "\n", comment ); + TQStringList out; + for ( TQStringList::iterator it = in.begin(); it != in.end(); ++it ) { out << cleanForMenu( *it ); if ( (int)out.count() >= maxLines ) { out << "[...]"; @@ -214,15 +214,15 @@ QStringList prepareTextForMenu( const QString& comment, int maxLines, int maxLen return maximumLength( out, maxLength ); } -QStringList formatComment( const QString& comment, int maxCols = 120 ) { - QStringList ret; +TQStringList formatComment( const TQString& comment, int maxCols = 120 ) { + TQStringList ret; SafetyCounter s( 14 ); ///maximum of 14 lines - QStringList lines = QStringList::split( "\n", comment ); - for ( QStringList::iterator it = lines.begin(); it != lines.end(); ++it ) { - QStringList words = QStringList::split( " ", *it ); + TQStringList lines = TQStringList::split( "\n", comment ); + for ( TQStringList::iterator it = lines.begin(); it != lines.end(); ++it ) { + TQStringList words = TQStringList::split( " ", *it ); while ( !words.isEmpty() && s ) { - QString line = "? "; + TQString line = "? "; int len = 0; while ( !words.isEmpty() && len < maxCols ) { len += words.front().length(); @@ -243,14 +243,14 @@ bool operator < ( const CodeCompletionEntry& e1, const CodeCompletionEntry& e2 ) } template <class ItemType> -static QValueList<ItemType> unique( const QValueList<ItemType>& entryList ) { +static TQValueList<ItemType> unique( const TQValueList<ItemType>& entryList ) { - QValueList< ItemType > l; - QMap<QString, bool> map; - typename QValueList< ItemType >::ConstIterator it = entryList.begin(); + TQValueList< ItemType > l; + TQMap<TQString, bool> map; + typename TQValueList< ItemType >::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { CodeCompletionEntry e = *it++; - QString key = ( e.type + " " + + TQString key = ( e.type + " " + e.prefix + " " + e.text + " " + e.postfix + " " ).simplifyWhiteSpace().stripWhiteSpace(); @@ -262,13 +262,13 @@ static QValueList<ItemType> unique( const QValueList<ItemType>& entryList ) { return l; } -static QStringList unique( const QStringList& entryList ) { +static TQStringList unique( const TQStringList& entryList ) { - QStringList l; - QMap<QString, bool> map; - QStringList::ConstIterator it = entryList.begin(); + TQStringList l; + TQMap<TQString, bool> map; + TQStringList::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { - QString e = *it++; + TQString e = *it++; if ( map.find( e ) == map.end() ) { map[ e ] = TRUE; l << e; @@ -277,14 +277,14 @@ static QStringList unique( const QStringList& entryList ) { return l; } -static QStringList unique( const QValueList<QStringList>& entryList ) { +static TQStringList unique( const TQValueList<TQStringList>& entryList ) { - QStringList l; - QMap<QString, bool> map; - QValueList<QStringList>::ConstIterator it = entryList.begin(); + TQStringList l; + TQMap<TQString, bool> map; + TQValueList<TQStringList>::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { - QStringList li = ( *it++ ); - QString e = li.join( "\n" ); + TQStringList li = ( *it++ ); + TQString e = li.join( "\n" ); if ( map.find( e ) == map.end() ) { map[ e ] = TRUE; l += li; @@ -295,7 +295,7 @@ static QStringList unique( const QValueList<QStringList>& entryList ) { } -bool tokenAt( const QString& text, const QString& token, int textPos ) { +bool tokenAt( const TQString& text, const TQString& token, int textPos ) { if ( text.isEmpty() ) return false; @@ -311,7 +311,7 @@ bool tokenAt( const QString& text, const QString& token, int textPos ) { if ( tokenPos == 0 || textPos == 0 ) { if ( tokenPos == 0 ) { if ( textPos >= 1 && text[ textPos ] == token[ tokenPos ] ) { - QChar c = text[ textPos - 1 ]; + TQChar c = text[ textPos - 1 ]; return c.isSpace() || c == '{' || c == '}' || c == ';'; } else { return false; @@ -346,26 +346,26 @@ struct PopupFillerHelpStruct { return true; } - QMap<QString, QPopupMenu*> m_namespacePopupCache; + TQMap<TQString, TQPopupMenu*> m_namespacePopupCache; - void insertItem( QPopupMenu* parent, SimpleTypeImpl::MemberInfo d , QString prefix ) { + void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); - QString memType = d.memberTypeToString(); + TQString memType = d.memberTypeToString(); if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) memType = "enum"; - QString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, SLOT( popupAction( int ) ) ); + TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } - void insertItem ( QPopupMenu* parent, TypeDesc d , QString prefix ) { + void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); - QString txt1, txt2; + TQString txt1, txt2; if ( d.resolved() && d.resolved() ->isNamespace() ) { SimpleTypeCachedNamespace * ns = dynamic_cast<SimpleTypeCachedNamespace*>( d.resolved().data() ); @@ -374,9 +374,9 @@ struct PopupFillerHelpStruct { for ( SimpleTypeNamespace::SlaveList::iterator it = slaves.begin(); it != slaves.end(); ++it ) { SimpleTypeCodeModel* cm = dynamic_cast<SimpleTypeCodeModel*>( ( *it ).first.first.resolved().data() ); if ( cm && cm->item() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); - QString scope = cm->scope().join("::"); - QMap< QString, QPopupMenu* >::iterator it = m_namespacePopupCache.find( scope ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + TQString scope = cm->scope().join("::"); + TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.find( scope ); if( it != m_namespacePopupCache.end() ) { parent->insertItem( "Imported Namespace " + scope, *it ); delete m; @@ -402,13 +402,13 @@ struct PopupFillerHelpStruct { if ( SimpleTypeCachedCodeModel * item = dynamic_cast<SimpleTypeCachedCodeModel*>( d.resolved().data() ) ) { ///(1) if ( item->item() && item->item() ->isNamespace() ) { NamespaceModel* ns = dynamic_cast<NamespaceModel*>( item->item().data() ); - QStringList wholeScope = ns->scope(); + TQStringList wholeScope = ns->scope(); wholeScope << ns->name(); for( FileList::iterator it = files.begin(); it != files.end(); ++it ) { // if( !safetyCounter ) break; NamespaceModel* ns = (*it).data(); - for( QStringList::iterator it2 = wholeScope.begin(); it2 != wholeScope.end(); ++it2 ) { + for( TQStringList::iterator it2 = wholeScope.begin(); it2 != wholeScope.end(); ++it2 ) { if( ns->hasNamespace( (*it2) ) ) { ns = ns->namespaceByName( *it2 ); if( !ns ) break; @@ -423,7 +423,7 @@ struct PopupFillerHelpStruct { int sLine, sCol, eLine, eCol; i->getStartPosition( &sLine, &sCol ); i->getEndPosition( &eLine, &eCol ); - insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + QString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. + insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. } } @@ -447,19 +447,19 @@ struct PopupFillerHelpStruct { } } - int id = parent->insertItem( txt1, receiver, SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); if ( d.resolved() ) receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() ); if ( !txt2.isEmpty() ) { - int id2 = parent->insertItem( txt2, receiver, SLOT( popupDefinitionAction( int ) ) ); + int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } } }; -ItemDom itemFromScope( const QStringList& scope, NamespaceDom startNamespace ) { +ItemDom itemFromScope( const TQStringList& scope, NamespaceDom startNamespace ) { if ( scope.isEmpty() ) return ItemDom(); @@ -469,7 +469,7 @@ ItemDom itemFromScope( const QStringList& scope, NamespaceDom startNamespace ) { ClassModel* curr = glob ; - QStringList::const_iterator mit = scope.begin(); + TQStringList::const_iterator mit = scope.begin(); while ( curr->isNamespace() && mit != scope.end() && ( ( NamespaceModel* ) curr ) ->hasNamespace( *mit ) ) { curr = &( *( ( ( NamespaceModel* ) curr ) ->namespaceByName( *mit ) ) ); @@ -523,29 +523,29 @@ struct PopupClassViewFillerHelpStruct { return false; } - void insertItem( QPopupMenu* parent, SimpleTypeImpl::MemberInfo d , QString prefix ) { + void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); FileDom f = receiver->m_pSupport->codeModel() ->fileByName( d.decl.file ); if ( !f ) return ; - ItemDom dom = itemFromScope( QStringList::split( "::", d.name ), model_cast<NamespaceDom>( f ) ); + ItemDom dom = itemFromScope( TQStringList::split( "::", d.name ), model_cast<NamespaceDom>( f ) ); - QString memType = d.memberTypeToString(); + TQString memType = d.memberTypeToString(); if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) memType = "enum"; - QString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, SLOT( popupClassViewAction( int ) ) ); + TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } - void insertItem ( QPopupMenu* parent, TypeDesc d , QString prefix ) { + void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); - QString txt; + TQString txt; if ( !d.resolved() ) return ; @@ -578,8 +578,8 @@ struct PopupClassViewFillerHelpStruct { } } else { if ( dom ) { - QString n = d.resolved() ->scope().join( "::" ); - //QString n = d.fullNameChain(); + TQString n = d.resolved() ->scope().join( "::" ); + //TQString n = d.fullNameChain(); if ( d.resolved() ->asFunction() ) { n = buildSignature( d.resolved() ); } @@ -596,7 +596,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = parent->insertItem( txt, receiver, SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -606,27 +606,27 @@ struct PopupClassViewFillerHelpStruct { template <class HelpStruct = PopupFillerHelpStruct> class PopupFiller { HelpStruct struk; - QString depthAdd; + TQString depthAdd; SafetyCounter s; public: - PopupFiller( HelpStruct str , QString dAdd, int maxCount = 100 ) : struk( str ), depthAdd( dAdd ), s( maxCount ) {} + PopupFiller( HelpStruct str , TQString dAdd, int maxCount = 100 ) : struk( str ), depthAdd( dAdd ), s( maxCount ) {} - void fillIncludes( const DeclarationInfo& decl, QPopupMenu* parent, bool& needSeparator ) { + void fillIncludes( const DeclarationInfo& decl, TQPopupMenu* parent, bool& needSeparator ) { if( !struk.receiver->getIncludeFiles()[ HashedString( decl.file ) ] ) { - QString file = decl.file; + TQString file = decl.file; //The include-file seems to be missing if( needSeparator ) { needSeparator = false; parent->insertSeparator(); } - QString includeFile = file; - QFileInfo info( file ); + TQString includeFile = file; + TQFileInfo info( file ); Driver* driver = struk.receiver->cppSupport()->driver(); if( driver ) { - QStringList elements = QStringList::split( "/", file ); + TQStringList elements = TQStringList::split( "/", file ); includeFile = elements.back(); elements.pop_back(); @@ -644,7 +644,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -653,7 +653,7 @@ class PopupFiller { } } - void fill( QPopupMenu * parent, LocateResult d, QString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { + void fill( TQPopupMenu * parent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { Debug dbg( "#fl# ", 10 ) ; @@ -670,7 +670,7 @@ class PopupFiller { f.type = d.desc(); f.memberType = SimpleTypeImpl::MemberInfo::Variable; - /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, SLOT( popupAction( int ) ) ); + /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ struk.insertItem( parent, f, prefix ); @@ -678,11 +678,11 @@ class PopupFiller { parent->insertSeparator(); if ( !sourceVariable.comment.isEmpty() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m ); - QStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); - for ( QStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, SLOT( popupClassViewAction( int ) ) ); + TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); + for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { + m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } parent->insertSeparator(); } @@ -694,7 +694,7 @@ class PopupFiller { SimpleType p = d->resolved()->parent(); LocateResult r = p->locateDecType( d->name() ); if( r ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Specialized from \"%1\"" ).arg( cleanForMenu( r->fullNameChain() ) ), m ); fill( m, r ); } @@ -703,7 +703,7 @@ class PopupFiller { TypeDesc::TemplateParams p = d->templateParams(); for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) { //if( (*it)->resolved() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Template-param \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, **it ); /*} else { @@ -715,25 +715,25 @@ class PopupFiller { if ( d->resolved() ->asFunction() ) { LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() ); if ( rt ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Return-type \"%1\"" ).arg( cleanForMenu( rt->fullNameChain() ) ), m ); fill( m, rt ); } - QValueList<TypeDesc> args = d->resolved() ->asFunction() ->getArgumentTypes(); - QStringList argNames = d->resolved() ->asFunction() ->getArgumentNames(); + TQValueList<TypeDesc> args = d->resolved() ->asFunction() ->getArgumentTypes(); + TQStringList argNames = d->resolved() ->asFunction() ->getArgumentNames(); if ( !args.isEmpty() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Argument-types" ), m ); - QStringList::iterator it2 = argNames.begin(); - for ( QValueList<TypeDesc>::iterator it = args.begin(); it != args.end(); ++it ) { + TQStringList::iterator it2 = argNames.begin(); + for ( TQValueList<TypeDesc>::iterator it = args.begin(); it != args.end(); ++it ) { LocateResult at = d->resolved() ->locateDecType( *it ); - QString name = ""; + TQString name = ""; if ( it2 != argNames.end() ) { name = *it2; ++it2; } - QPopupMenu * mo = PopupTracker::createPopup( m ); + TQPopupMenu * mo = PopupTracker::createPopup( m ); m->insertItem( i18n( "Argument \"%1\"" ).arg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo ); fill( mo, at ); @@ -743,14 +743,14 @@ class PopupFiller { } #ifndef DISABLE_TRACING if ( d.trace() ) { - QValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); + TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); if ( !trace.isEmpty() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Trace" ), m ); - for ( QValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { - QPopupMenu * mo = PopupTracker::createPopup( m ); - QString tail = ( *it ).second.fullNameChain(); + for ( TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { + TQPopupMenu * mo = PopupTracker::createPopup( m ); + TQString tail = ( *it ).second.fullNameChain(); if ( !tail.isEmpty() ) tail = "::" + tail; m->insertItem( i18n( "%1 -> %2" ).arg( cleanForMenu( ( *it ).first.name + tail ) ).arg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo ); @@ -759,16 +759,16 @@ class PopupFiller { if ( !( *it ).first.decl.comment.isEmpty() ) { mo->insertSeparator(); - QPopupMenu * m = PopupTracker::createPopup( mo ); + TQPopupMenu * m = PopupTracker::createPopup( mo ); mo->insertItem( i18n( "Comment" ), m ); - QStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 ); - for ( QStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, SLOT( popupClassViewAction( int ) ) ); + TQStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 ); + for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { + m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } } /*bool needSeparator = true; - if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator QString().isEmpty() ) + if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator TQString().isEmpty() ) fillIncludes( (*it).first.decl, mo, needSeparator );*/ } } @@ -776,26 +776,26 @@ class PopupFiller { #endif if ( d->resolved() ) { - QValueList<LocateResult> bases = d->resolved() ->getBases(); - for ( QValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQValueList<LocateResult> bases = d->resolved() ->getBases(); + for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Base-class \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, *it ); } if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Nested in \"%1\"" ).arg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m ); fill( m, d->resolved() ->parent() ->desc() ); } if ( !d->resolved() ->comment().isEmpty() ) { parent->insertSeparator(); - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m ); - QStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); - for ( QStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, SLOT( popupClassViewAction( int ) ) ); + TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); + for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { + m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } } } @@ -805,10 +805,10 @@ class PopupFiller { bool needSeparator = true; //Show the include-files for the whole trace, because usually the first in the trace should be the one to include if ( d.trace() ) { - QValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); + TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); if ( !trace.isEmpty() ) { - for ( QValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { - if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator QString().isEmpty() ) + for ( TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { + if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator TQString().isEmpty() ) fillIncludes( (*it).first.decl, parent, needSeparator ); } } @@ -828,11 +828,11 @@ struct CompTypeProcessor : public TypeProcessor { CompTypeProcessor( SimpleType scope, bool processArguments ) : m_scope( scope ), m_processArguments( processArguments ) {} - virtual QString parentType() { + virtual TQString parentType() { return m_scope->fullType(); } - virtual QString processType( const QString& type ) { + virtual TQString processType( const TQString& type ) { if ( !m_processArguments ) return type; LocateResult t = m_scope->locateDecType( type ); @@ -844,8 +844,8 @@ struct CompTypeProcessor : public TypeProcessor { }; struct CppCodeCompletionData { - QPtrList<RecoveryPoint> recoveryPoints; - //QStringList classNameList; + TQPtrList<RecoveryPoint> recoveryPoints; + //TQStringList classNameList; CppCodeCompletionData() { recoveryPoints.setAutoDelete( true ); @@ -857,7 +857,7 @@ struct CppCodeCompletionData { QPair<int, int> pt = qMakePair( line, column ); - QPtrListIterator<RecoveryPoint> it( recoveryPoints ); + TQPtrListIterator<RecoveryPoint> it( recoveryPoints ); RecoveryPoint* recPt = 0; while ( it.current() ) { @@ -895,29 +895,29 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_pSupport = part; - connect( m_pSupport->codeCompletionConfig(), SIGNAL( stored() ), this, SLOT( emptyCache() ) ); + connect( m_pSupport->codeCompletionConfig(), TQT_SIGNAL( stored() ), this, TQT_SLOT( emptyCache() ) ); m_activeCursor = 0; m_activeEditor = 0; m_activeCompletion = 0; m_activeHintInterface = 0; m_activeView = 0; - m_ccTimer = new QTimer( this ); - m_showStatusTextTimer = new QTimer( this ); + m_ccTimer = new TQTimer( this ); + m_showStatusTextTimer = new TQTimer( this ); m_ccLine = 0; m_ccColumn = 0; - connect( m_ccTimer, SIGNAL( timeout() ), this, SLOT( slotTimeout() ) ); - connect( m_showStatusTextTimer, SIGNAL( timeout() ), this, SLOT( slotStatusTextTimeout() ) ); + connect( m_ccTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); + connect( m_showStatusTextTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotStatusTextTimeout() ) ); computeFileEntryList(); CppSupportPart* cppSupport = m_pSupport; - connect( cppSupport->project(), SIGNAL( addedFilesToProject( const QStringList& ) ), - this, SLOT( computeFileEntryList() ) ); - connect( cppSupport->project(), SIGNAL( removedFilesFromProject( const QStringList& ) ), - this, SLOT( computeFileEntryList() ) ); - connect( cppSupport, SIGNAL( synchronousParseReady( const QString&, ParsedFilePointer ) ), this, SLOT( synchronousParseReady( const QString&, ParsedFilePointer ) ) ); + connect( cppSupport->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList& ) ), + this, TQT_SLOT( computeFileEntryList() ) ); + connect( cppSupport->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList& ) ), + this, TQT_SLOT( computeFileEntryList() ) ); + connect( cppSupport, TQT_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQT_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) ); m_bArgHintShow = false; m_bCompletionBoxShow = false; @@ -927,14 +927,14 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_repository = new CodeInformationRepository( cppSupport->codeRepository() ); - connect( cppSupport->codeRepository(), SIGNAL(catalogRegistered( Catalog* )), this, SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), SIGNAL(catalogUnregistered( Catalog* )), this, SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), SIGNAL(catalogChanged( Catalog* )), this, SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogRegistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogUnregistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogChanged( Catalog* )), this, TQT_SLOT( emptyCache() ) ); setupCodeInformationRepository(); if ( part->partController() ->parts() ) { - QPtrListIterator<KParts::Part> it( *part->partController() ->parts() ); + TQPtrListIterator<KParts::Part> it( *part->partController() ->parts() ); while ( KParts::Part * part = it.current() ) { integratePart( part ); ++it; @@ -944,22 +944,22 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { if ( part->partController() ->activePart() ) slotActivePartChanged( part->partController() ->activePart() ); - connect( part->partController( ), SIGNAL( partAdded( KParts::Part* ) ), - this, SLOT( slotPartAdded( KParts::Part* ) ) ); - connect( part->partController( ), SIGNAL( activePartChanged( KParts::Part* ) ), - this, SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( part->partController( ), TQT_SIGNAL( partAdded( KParts::Part* ) ), + this, TQT_SLOT( slotPartAdded( KParts::Part* ) ) ); + connect( part->partController( ), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); - connect( part, SIGNAL( fileParsed( const QString& ) ), - this, SLOT( slotFileParsed( const QString& ) ) ); - connect( part, SIGNAL( codeModelUpdated( const QString& ) ), - this, SLOT( slotCodeModelUpdated( const QString& ) ) ); + connect( part, TQT_SIGNAL( fileParsed( const TQString& ) ), + this, TQT_SLOT( slotFileParsed( const TQString& ) ) ); + connect( part, TQT_SIGNAL( codeModelUpdated( const TQString& ) ), + this, TQT_SLOT( slotCodeModelUpdated( const TQString& ) ) ); KAction * action = new KAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma, - this, SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); + this, TQT_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); action->plug( &m_DummyActionWidget ); action = new KAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, - this, SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); + this, TQT_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); action->plug( &m_DummyActionWidget ); } @@ -968,8 +968,8 @@ CppCodeCompletion::~CppCodeCompletion( ) { delete d; } -void CppCodeCompletion::addStatusText( QString text, int timeout ) { - m_statusTextList.append( QPair<int, QString>( timeout, text ) ); +void CppCodeCompletion::addStatusText( TQString text, int timeout ) { + m_statusTextList.append( QPair<int, TQString>( timeout, text ) ); if ( !m_showStatusTextTimer->isActive() ) { slotStatusTextTimeout(); } @@ -998,8 +998,8 @@ void CppCodeCompletion::slotTimeout() { if ( nLine != m_ccLine || nCol != m_ccColumn ) return ; - QString textLine = m_activeEditor->textLine( nLine ); - QChar ch = textLine[ nCol ]; + TQString textLine = m_activeEditor->textLine( nLine ); + TQChar ch = textLine[ nCol ]; if ( ch.isLetterOrNumber() || ch == '_' ) return ; @@ -1027,13 +1027,13 @@ void CppCodeCompletion::integratePart( KParts::Part * part ) { if ( m_pSupport ) { //The slot should connected even when automatic completion is disabled, so it can be enabled any time kdDebug( 9007 ) << k_funcinfo << "enabling code completion" << endl; - connect( part, SIGNAL( textChanged() ), this, SLOT( slotTextChanged() ) ); - connect( part->widget(), SIGNAL( completionDone() ), this, - SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), SIGNAL( completionAborted() ), this, - SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), SIGNAL( argHintHidden() ), this, - SLOT( slotArgHintHidden() ) ); + connect( part, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) ); + connect( part->widget(), TQT_SIGNAL( completionDone() ), this, + TQT_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQT_SIGNAL( completionAborted() ), this, + TQT_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQT_SIGNAL( argHintHidden() ), this, + TQT_SLOT( slotArgHintHidden() ) ); } } } @@ -1046,7 +1046,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { emptyCache(); this->d->recoveryPoints.clear(); if ( m_activeHintInterface && m_activeView ) { - disconnect( m_activeView , SIGNAL( needTextHint( int, int, QString & ) ), this, SLOT( slotTextHint( int, int, QString& ) ) ); + disconnect( m_activeView , TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); m_activeHintInterface = 0; } @@ -1055,7 +1055,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { kdDebug( 9007 ) << k_funcinfo << endl; - m_activeFileName = QString::null; + m_activeFileName = TQString::null; KTextEditor::Document* doc = dynamic_cast<KTextEditor::Document*>( part ); if ( !doc ) @@ -1093,7 +1093,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { if ( m_activeHintInterface ) { #ifndef DISABLETOOLTIPS m_activeHintInterface->enableTextHints( 500 ); - connect( m_activeView, SIGNAL( needTextHint( int, int, QString & ) ), this, SLOT( slotTextHint( int, int, QString& ) ) ); + connect( m_activeView, TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); #endif } else { @@ -1112,9 +1112,9 @@ void CppCodeCompletion::slotTextChanged() { unsigned int nLine, nCol; m_activeCursor->cursorPositionReal( &nLine, &nCol ); - QString strCurLine = m_activeEditor->textLine( nLine ); - QString ch = strCurLine.mid( nCol - 1, 1 ); - QString ch2 = strCurLine.mid( nCol - 2, 2 ); + TQString strCurLine = m_activeEditor->textLine( nLine ); + TQString ch = strCurLine.mid( nCol - 1, 1 ); + TQString ch2 = strCurLine.mid( nCol - 2, 2 ); // Tell the completion box to _go_away_ when the completion char // becomes empty or whitespace and the box is already showing. @@ -1123,7 +1123,7 @@ void CppCodeCompletion::slotTextChanged() { if ( ch.simplifyWhiteSpace().isEmpty() && !strCurLine.simplifyWhiteSpace().contains( "virtual" ) && m_bCompletionBoxShow ) { - QValueList<KTextEditor::CompletionEntry> entryList; + TQValueList<KTextEditor::CompletionEntry> entryList; m_bCompletionBoxShow = true; m_activeCompletion->showCompletionBox( entryList, 0 ); } @@ -1227,14 +1227,14 @@ void CppCodeCompletion::fitContextItem( int nLine, int nCol ) { enum { T_ACCESS, T_PAREN, T_BRACKET, T_IDE, T_UNKNOWN, T_TEMP }; -QString CppCodeCompletion::replaceCppComments( const QString& contents ) { - QString text = contents; +TQString CppCodeCompletion::replaceCppComments( const TQString& contents ) { + TQString text = contents; int pos = 0; while ( ( pos = m_cppCodeCommentsRx.search( text, pos ) ) != -1 ) { if ( m_cppCodeCommentsRx.cap( 1 ).startsWith( "//" ) ) { - QString before = m_cppCodeCommentsRx.cap( 1 ); - QString after; + TQString before = m_cppCodeCommentsRx.cap( 1 ); + TQString after; after.fill( ' ', before.length() - 5 ); after.prepend( "/*" ); after.append( "*/" ); @@ -1247,14 +1247,14 @@ QString CppCodeCompletion::replaceCppComments( const QString& contents ) { return text; } -int CppCodeCompletion::expressionAt( const QString& contents, int index ) { +int CppCodeCompletion::expressionAt( const TQString& contents, int index ) { kdDebug( 9007 ) << k_funcinfo << endl; /* C++ style comments present issues with finding the expr so I'm matching for them and replacing them with empty C style comments of the same length for purposes of finding the expr. */ - QString text = clearComments( contents ); + TQString text = clearComments( contents ); int last = T_UNKNOWN; int start = index; @@ -1265,8 +1265,8 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { --index; } - QChar ch = text[ index ]; - QString ch2 = text.mid( index - 1, 2 ); + TQChar ch = text[ index ]; + TQString ch2 = text.mid( index - 1, 2 ); if ( ( last != T_IDE ) && ( ch.isLetterOrNumber() || ch == '_' ) ) { while ( index > 0 && ( text[ index ].isLetterOrNumber() || text[ index ] == '_' ) ) { --index; @@ -1275,7 +1275,7 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { } else if ( last != T_IDE && ch == ')' ) { int count = 0; while ( index > 0 ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '(' ) { ++count; } else if ( ch == ')' ) { @@ -1290,7 +1290,7 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { } else if ( last != T_IDE && ch == '>' && ch2 != "->" ) { int count = 0; while ( index > 0 ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '<' ) { ++count; } else if ( ch == '>' ) { @@ -1305,7 +1305,7 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { } else if ( ch == ']' ) { int count = 0; while ( index > 0 ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '[' ) { ++count; } else if ( ch == ']' ) { @@ -1344,16 +1344,16 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { return index; } -QStringList CppCodeCompletion::splitExpression( const QString& text ) { +TQStringList CppCodeCompletion::splitExpression( const TQString& text ) { #define ADD_CURRENT()\ if( current.length() ) { l << current; /*kdDebug(9007) << "add word " << current << endl;*/ current = ""; } - QStringList l; + TQStringList l; uint index = 0; - QString current; + TQString current; while ( index < text.length() ) { - QChar ch = text[ index ]; - QString ch2 = text.mid( index, 2 ); + TQChar ch = text[ index ]; + TQString ch2 = text.mid( index, 2 ); if ( ch == '.' ) { current += ch; @@ -1362,7 +1362,7 @@ QStringList CppCodeCompletion::splitExpression( const QString& text ) { } else if ( ch == '(' ) { int count = 0; while ( index < text.length() ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '(' ) { ++count; } else if ( ch == ')' ) { @@ -1376,7 +1376,7 @@ QStringList CppCodeCompletion::splitExpression( const QString& text ) { } else if ( ch == '[' ) { int count = 0; while ( index < text.length() ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '[' ) { ++count; } else if ( ch == ']' ) { @@ -1418,7 +1418,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column , return EvaluationResult(); { - QString curLine = m_activeEditor->textLine( line ); + TQString curLine = m_activeEditor->textLine( line ); ///move column to the last letter of the pointed word while ( column + 1 < ( int ) curLine.length() && isValidIdentifierSign( curLine[ column ] ) && isValidIdentifierSign( curLine[ column + 1 ] ) ) @@ -1429,7 +1429,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column , if ( column >= ( int ) curLine.length() || curLine[ column ].isSpace() ) return EvaluationResult(); - QString expr = curLine.left( column + 1 ); + TQString expr = curLine.left( column + 1 ); kdDebug( 9007 ) << "evaluating line \"" << expr.stripWhiteSpace() << "\"" << endl; if ( curLine[ column ] == '-' || curLine[ column ] == ';' ) @@ -1446,10 +1446,10 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column , void CppCodeCompletion::popupAction( int number ) { PopupActions::iterator it = m_popupActions.find( number ); if ( it != m_popupActions.end() ) { - QString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator QString(); + TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); if( (*it).startLine == -1 ) { //startLine -1 indicates that the file should be added to the include-files - m_activeEditor->insertLine( 0, QString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) ); + m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) ); } else { m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine ); } @@ -1461,7 +1461,7 @@ void CppCodeCompletion::popupAction( int number ) { void CppCodeCompletion::popupDefinitionAction( int number ) { PopupActions::iterator it = m_popupDefinitionActions.find( number ); if ( it != m_popupDefinitionActions.end() ) { - QString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator QString(); + TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); if ( !m_pSupport->switchHeaderImpl( fileName, ( *it ).startLine, ( *it ).startCol ) ) m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine ); } else { @@ -1490,7 +1490,7 @@ void CppCodeCompletion::popupClassViewAction( int number ) { } } -void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Context *context, int line, int column ) { +void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Context *context, int line, int column ) { clearStatusText(); Q_UNUSED(context); if ( !m_pSupport->codeCompletionConfig() ->showEvaluationContextMenu() ) @@ -1529,15 +1529,15 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex ///Test if it is a macro if( type.isMacro ) { - QPopupMenu * m = PopupTracker::createPopup( popup ); + TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ ); else gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, SLOT( popupAction( int ) ) ); - QPopupMenu * b = PopupTracker::createPopup( m ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); + TQPopupMenu * b = PopupTracker::createPopup( m ); m->insertItem( i18n( "Body" ), b ); DeclarationInfo i; @@ -1548,27 +1548,27 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex i.endLine = type.macro.line(); m_popupActions.insert( id, i ); - QStringList ls = prepareTextForMenu( type.macro.body(), 20, 100 ); - for ( QStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - b->insertItem( *it, 0, SLOT( popupClassViewAction( int ) ) ); + TQStringList ls = prepareTextForMenu( type.macro.body(), 20, 100 ); + for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { + b->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } } ///Test if it is an include-directive - QString includeFileName, includeFilePath; + TQString includeFileName, includeFilePath; bool simpleAlgorithm = false; bool isIncludeDirective = getIncludeInfo( line, includeFileName, includeFilePath, simpleAlgorithm ); if( isIncludeDirective ) { ///Add menu entry if( !includeFilePath.isEmpty() ) { int gid; - QPopupMenu * m = PopupTracker::createPopup( popup ); + TQPopupMenu * m = PopupTracker::createPopup( popup ); if ( contextMenuEntriesAtTop ) gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m, 5, cpos++ ); else gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo i; i.file = includeFilePath; @@ -1595,7 +1595,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex if ( isIncludeDirective || (!type->resolved() && !type.sourceVariable && ( !type.resultType.trace() || type.resultType.trace() ->trace().isEmpty() ) && !BuiltinTypes::isBuiltin( type.resultType ) ) ) return ; - QString name = type->fullNameChain(); + TQString name = type->fullNameChain(); if ( type.sourceVariable ) name += " " + type.sourceVariable.name; if ( type.resultType->resolved() && type.resultType->resolved() ->asFunction() ) @@ -1606,7 +1606,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex PopupFillerHelpStruct h( this ); PopupFiller<PopupFillerHelpStruct> filler( h, "" ); - QPopupMenu * m = PopupTracker::createPopup( popup ); + TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m, 5, cpos++ ); @@ -1616,7 +1616,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) ); /*if( type.sourceVariable && type.sourceVariable.name != "this" ) { - int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable ); }*/ @@ -1626,7 +1626,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex if ( type->resolved() ) { ///Now fill the class-view-browsing-stuff { - QPopupMenu * m = PopupTracker::createPopup( popup ); + TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m, 6, cpos++ ); @@ -1646,7 +1646,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex popup->insertSeparator( cpos ); } -void CppCodeCompletion::slotTextHint( int line, int column, QString &text ) { +void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) { if ( ! m_pSupport->codeCompletionConfig() ->statusBarTypeEvaluation() ) return ; @@ -1654,12 +1654,12 @@ void CppCodeCompletion::slotTextHint( int line, int column, QString &text ) { clearStatusText(); - if ( m_lastHintTime.msecsTo( QTime::currentTime() ) < 300 ) { + if ( m_lastHintTime.msecsTo( TQTime::currentTime() ) < 300 ) { kdDebug( 9007 ) << "slotNeedTextHint called too often" << endl; return ; } - m_lastHintTime = QTime::currentTime(); + m_lastHintTime = TQTime::currentTime(); clearStatusText(); text = ""; @@ -1682,9 +1682,9 @@ void CppCodeCompletion::slotTextHint( int line, int column, QString &text ) { if( f ) { text += "function: \"" + buildSignature( type->resolved() ) + "\""; } else { - QValueList<TypeDesc> trace = type.resultType->trace(); + TQValueList<TypeDesc> trace = type.resultType->trace(); if( !trace.isEmpty() ) { - for( QValueList<TypeDesc>::iterator it = trace.begin(); it != trace.end(); ++it ) { + for( TQValueList<TypeDesc>::iterator it = trace.begin(); it != trace.end(); ++it ) { text += (*it).fullNameChain() + " --> "; } text += "\n"; @@ -1731,19 +1731,19 @@ void CppCodeCompletion::slotTextHint( int line, int column, QString &text ) { } ///not good.. -bool CppCodeCompletion::isTypeExpression( const QString& expr ) { +bool CppCodeCompletion::isTypeExpression( const TQString& expr ) { TypeDesc d( expr ); if ( !d.isValidType() ) return false; - QString ex = d.fullNameChain(); - QStringList lex = QStringList::split( " ", ex ); - QStringList lexpr = QStringList::split( " ", expr ); + TQString ex = d.fullNameChain(); + TQStringList lex = TQStringList::split( " ", ex ); + TQStringList lexpr = TQStringList::split( " ", expr ); return lex.join( " " ) == lexpr.join( " " ); } -bool CppCodeCompletion::mayBeTypeTail( int line, int column, QString& append, bool inFunction ) { - QString tail = clearComments( m_activeEditor->text( line, column + 1, line + 10 > ( int ) m_activeEditor->numLines() ? ( int ) m_activeEditor->numLines() : line + 10, 0 ) ); +bool CppCodeCompletion::mayBeTypeTail( int line, int column, TQString& append, bool inFunction ) { + TQString tail = clearComments( m_activeEditor->text( line, column + 1, line + 10 > ( int ) m_activeEditor->numLines() ? ( int ) m_activeEditor->numLines() : line + 10, 0 ) ); tail.replace( "\n", " " ); SafetyCounter s ( 100 ); bool hadSpace = false; @@ -1776,7 +1776,7 @@ bool CppCodeCompletion::mayBeTypeTail( int line, int column, QString& append, bo return false; } -bool CppCodeCompletion::canBeTypePrefix( const QString& prefix, bool inFunction ) { +bool CppCodeCompletion::canBeTypePrefix( const TQString& prefix, bool inFunction ) { for ( int p = prefix.length() - 1 ; p >= 0; --p ) { if ( prefix[ p ].isSpace() ) { @@ -1802,13 +1802,13 @@ bool CppCodeCompletion::canBeTypePrefix( const QString& prefix, bool inFunction ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int startLine, int startCol, bool inFunction ) { ExpressionInfo ret; - QString contents = clearComments( getText( startLine, startCol, line, column ) ); + TQString contents = clearComments( getText( startLine, startCol, line, column ) ); int start_expr = expressionAt( contents, contents.length() ); if ( start_expr != int( contents.length() ) ) { - QString str = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); + TQString str = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); if ( str.startsWith( "new " ) ) { str = str.mid( 4 ).stripWhiteSpace(); } @@ -1820,7 +1820,7 @@ ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int st if ( ret ) { ///Check whether it may be a type-expression bool mayBeType = true; - QString append; + TQString append; if ( !mayBeTypeTail( line, column - 1, append, inFunction ) ) mayBeType = false; if ( mayBeType ) { @@ -1829,7 +1829,7 @@ ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int st } //make this a regexp - QString e = ret.expr(); + TQString e = ret.expr(); if ( e.contains( "." ) || e.contains( "->" ) || e.contains( "(" ) || e.contains( ")" ) || e.contains( "=" ) || e.contains( "-" ) ) mayBeType = false; @@ -1863,10 +1863,10 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin f->getStartPosition( &modelStartLine, &modelStartColumn ); f->getEndPosition( &modelEndLine, &modelEndColumn ); - QString textLine = m_activeEditor->textLine( modelStartLine ); + TQString textLine = m_activeEditor->textLine( modelStartLine ); kdDebug( 9007 ) << "startLine = " << textLine << endl; - QString contents = getText( modelStartLine, modelStartColumn, line, col ); + TQString contents = getText( modelStartLine, modelStartColumn, line, col ); Driver d; Lexer lexer( &d ); @@ -1900,13 +1900,13 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin if ( !ctx ) return 0; - QStringList scope = f->scope(); + TQStringList scope = f->scope(); if ( !scope.isEmpty() ) { SimpleType parentType; /* if( !m_cachedFromContext ) { - TypePointer t = SimpleType(QStringList())->locateDecType( scope.join("") ).desc().resolved();; + TypePointer t = SimpleType(TQStringList())->locateDecType( scope.join("") ).desc().resolved();; if( t ) parentType = SimpleType( t.data() ); else @@ -1922,8 +1922,8 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin if( dynamic_cast<SimpleTypeNamespace*>( &(*global) ) ) { SimpleTypeNamespace* globalNs = static_cast <SimpleTypeNamespace*>( &(*global) ); - QValueList<QPair<QString, QString> > localImports = ctx->imports(); - for( QValueList<QPair<QString, QString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) + TQValueList<QPair<TQString, TQString> > localImports = ctx->imports(); + for( TQValueList<QPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) globalNs->addAliasMap( (*it).first, (*it).second ); } @@ -1984,7 +1984,7 @@ bool CppCodeCompletion::functionContains( FunctionDom f , int line, int col ) { int sl, sc, el, ec; f->getStartPosition( &sl, &sc ); f->getEndPosition( &el, &ec ); - QString t = clearComments( getText( sl, sc, el, ec ) ); + TQString t = clearComments( getText( sl, sc, el, ec ) ); if ( t.isEmpty() ) return false; @@ -2013,7 +2013,7 @@ void CppCodeCompletion::getFunctionBody( FunctionDom f , int& line, int& col ) { int sl, sc, el, ec; f->getStartPosition( &sl, &sc ); f->getEndPosition( &el, &ec ); - QString t = clearComments( getText( sl, sc, el, ec ) ); + TQString t = clearComments( getText( sl, sc, el, ec ) ); if ( t.isEmpty() ) return; @@ -2095,10 +2095,10 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column // emptyCache(); fitContextItem( line, column ); - QString strCurLine = m_activeEditor->textLine( nLine ); + TQString strCurLine = m_activeEditor->textLine( nLine ); - QString ch = strCurLine.mid( nCol - 1, 1 ); - QString ch2 = strCurLine.mid( nCol - 2, 2 ); + TQString ch = strCurLine.mid( nCol - 1, 1 ); + TQString ch2 = strCurLine.mid( nCol - 2, 2 ); while ( ch[ 0 ].isSpace() && nCol >= 3 ) { nCol -= 1; @@ -2108,7 +2108,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column if ( ch2 == "->" || ch == "." || ch == "(" ) { int pos = ch2 == "->" ? nCol - 3 : nCol - 2; - QChar c = strCurLine[ pos ]; + TQChar c = strCurLine[ pos ]; while ( pos > 0 && c.isSpace() ) c = strCurLine[ --pos ]; @@ -2126,7 +2126,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column showArguments = true; } - QString word; + TQString word; { ExpressionInfo exp_ = findExpressionAt( line, column , line, 0 ); @@ -2196,7 +2196,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column } else { ///Remove the not completely typed last word while normal completion if ( !showArguments && ( opt & CompletionOption ) ) { - QString e = exp.expr(); + TQString e = exp.expr(); int idx = e.length() - 1; while ( e[ idx ].isLetterOrNumber() || e[ idx ] == '_' ) --idx; @@ -2229,7 +2229,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column RecoveryPoint* recoveryPoint = this->d->findRecoveryPoint( line, column ); - QStringList scope; + TQStringList scope; if ( !currentClass ) { kdDebug( 9007 ) << "no container-class found" << endl; @@ -2251,7 +2251,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column if ( m_cachedFromContext ) { TypeDesc d( scope.join( "::" ) ); d.setIncludeFiles( getIncludeFiles() ); - SimpleTypeImpl * i = SimpleType( QStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); + SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); if ( i ) container = i; else @@ -2287,13 +2287,13 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column return ret; } -bool isAfterKeyword( const QString& str, int column ) { - QStringList keywords; +bool isAfterKeyword( const TQString& str, int column ) { + TQStringList keywords; keywords << "new"; keywords << "throw"; keywords << "return"; keywords << "emit"; ///This could be done even better by only showing signals for completion.. - for ( QStringList::iterator it = keywords.begin(); it != keywords.end(); ++it ) { + for ( TQStringList::iterator it = keywords.begin(); it != keywords.end(); ++it ) { int len = ( *it ).length(); if ( column >= len && str.mid( column - len, len ) == *it ) return true; @@ -2345,10 +2345,10 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { surroundingEndLine = m_activeEditor->numLines() - 1; int surroundingEndCol = m_activeEditor->lineLength( surroundingEndLine ); - QString pre = getText( surroundingStartLine, 0, line, column ); + TQString pre = getText( surroundingStartLine, 0, line, column ); int pos = pre.length(); pre += getText( line, column, surroundingEndLine, surroundingEndCol ); - QString cleared = clearComments( pre ); + TQString cleared = clearComments( pre ); if ( cleared[ pos ] != pre[ pos ] ) { kdDebug( 9007 ) << "stopping completion because we're in a coment" << endl; return ; @@ -2356,10 +2356,10 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { int nLine = line, nCol = column; - QString strCurLine = clearComments( m_activeEditor->textLine( nLine ) ); + TQString strCurLine = clearComments( m_activeEditor->textLine( nLine ) ); - QString ch = strCurLine.mid( nCol - 1, 1 ); - QString ch2 = strCurLine.mid( nCol - 2, 2 ); + TQString ch = strCurLine.mid( nCol - 1, 1 ); + TQString ch2 = strCurLine.mid( nCol - 2, 2 ); while ( ch[ 0 ].isSpace() && nCol >= 3 ) { nCol -= 1; @@ -2381,7 +2381,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( ch2 == "->" || ch == "." || ch == "(" ) { int pos = ch2 == "->" ? nCol - 3 : nCol - 2; - QChar c = strCurLine[ pos ]; + TQChar c = strCurLine[ pos ]; while ( pos > 0 && c.isSpace() ) c = strCurLine[ --pos ]; @@ -2412,7 +2412,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( isAfterKeyword( strCurLine, column ) ) { ///Maybe a constructor using "new", or "throw", "return", ... } else { - ///it is a local constructor like "QString name("David");" + ///it is a local constructor like "TQString name("David");" nCol = column; } } @@ -2424,7 +2424,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { EvaluationResult type; SimpleType this_type; - QString expr, word; + TQString expr, word; DeclarationAST::Node recoveredDecl; TypeSpecifierAST::Node recoveredTypeSpec; @@ -2442,7 +2442,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { RecoveryPoint * recoveryPoint = d->findRecoveryPoint( line, column ); if ( recoveryPoint || currentFunction ) { contextItem = currentFunction.data(); - QStringList scope; + TQStringList scope; int startLine, startColumn; if ( currentFunction ) { ///maybe change the priority of these @@ -2456,12 +2456,12 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { scope = recoveryPoint->scope; } - QString textLine = m_activeEditor->textLine( startLine ); + TQString textLine = m_activeEditor->textLine( startLine ); kdDebug( 9007 ) << "startLine = " << textLine << endl; if ( currentFunction || recoveryPoint->kind == NodeType_FunctionDefinition ) { - QString textToReparse = clearComments( getText( startLine, startColumn, line, showArguments ? nCol : column ) ); + TQString textToReparse = clearComments( getText( startLine, startColumn, line, showArguments ? nCol : column ) ); kdDebug( 9007 ) << "-------------> reparse text" << endl << textToReparse << endl << "--------------------------------------------" << endl; @@ -2492,7 +2492,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { /// @todo remove code duplication - QString contents = textToReparse; + TQString contents = textToReparse; int start_expr = expressionAt( contents, contents.length() ); // kdDebug(9007) << "start_expr = " << start_expr << endl; @@ -2508,7 +2508,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { --end_expr; if ( contents[ end_expr ] != ',' ) { - expr = QString::null; + expr = TQString::null; } else { start_expr = expressionAt( contents, end_expr ); expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); @@ -2531,14 +2531,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { DeclaratorAST* d = def->initDeclarator() ->declarator(); NameAST* name = d->declaratorId(); - QStringList nested; + TQStringList nested; - QPtrList<ClassOrNamespaceNameAST> l; + TQPtrList<ClassOrNamespaceNameAST> l; if ( name ) { l = name->classOrNamespaceNameList(); } - // QPtrList<ClassOrNamespaceNameAST> l = name->classOrNamespaceNameList(); - QPtrListIterator<ClassOrNamespaceNameAST> nameIt( l ); + // TQPtrList<ClassOrNamespaceNameAST> l = name->classOrNamespaceNameList(); + TQPtrListIterator<ClassOrNamespaceNameAST> nameIt( l ); while ( nameIt.current() ) { if ( nameIt.current() ->name() ) { nested << nameIt.current() ->name() ->text(); @@ -2555,8 +2555,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if( dynamic_cast<SimpleTypeNamespace*>( SimpleType::globalNamespace().data() ) ) { SimpleTypeNamespace* globalNs = static_cast <SimpleTypeNamespace*>( SimpleType::globalNamespace().data() ); - QValueList<QPair<QString, QString> > localImports = ctx->imports(); - for( QValueList<QPair<QString, QString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) + TQValueList<QPair<TQString, TQString> > localImports = ctx->imports(); + for( TQValueList<QPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) globalNs->addAliasMap( (*it).first, (*it).second ); } } else { @@ -2571,7 +2571,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { conf.setGlobalNamespace( t ); SimpleTypeNamespace * n = dynamic_cast<SimpleTypeNamespace*>( t.data() ); if ( !n ) { - QString str = QString( "the global namespace was not resolved correctly , real type: " ) + typeid( n ).name() + QString( " name: " ) + n->scope().join( "::" ) + " scope-size: " + n->scope().count(); + TQString str = TQString( "the global namespace was not resolved correctly , real type: " ) + typeid( n ).name() + TQString( " name: " ) + n->scope().join( "::" ) + " scope-size: " + n->scope().count(); kdDebug( 9007 ) << str << endl; m_pSupport->mainWindow() ->statusBar() ->message( str , 1000 ); } else { @@ -2582,7 +2582,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( m_cachedFromContext ) { TypeDesc d( scope.join( "::" ) ); d.setIncludeFiles( getIncludeFiles() ); - SimpleTypeImpl * i = SimpleType( QStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); + SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); if ( i ) { parentType = i; } else { @@ -2633,7 +2633,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { kdDebug( 9007 ) << "no valid declaration to recover!!!" << endl; } } else if ( recoveryPoint->kind == NodeType_ClassSpecifier ) { - QString textToReparse = getText( recoveryPoint->startLine, recoveryPoint->startColumn, + TQString textToReparse = getText( recoveryPoint->startLine, recoveryPoint->startColumn, recoveryPoint->endLine, recoveryPoint->endColumn, line ); // kdDebug(9007) << "-------------> please reparse only text" << endl << textToReparse << endl // << "--------------------------------------------" << endl; @@ -2651,7 +2651,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { //ClassSpecifierAST * clazz = static_cast<ClassSpecifierAST*>( recoveredTypeSpec.get() ); - QString keyword = getText( line, 0, line, column ).simplifyWhiteSpace(); + TQString keyword = getText( line, 0, line, column ).simplifyWhiteSpace(); kdDebug( 9007 ) << "===========================> keyword is: " << keyword << endl; @@ -2659,8 +2659,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { BaseClauseAST *baseClause = clazz->baseClause(); if ( baseClause ) { - QPtrList<BaseSpecifierAST> baseList = baseClause->baseSpecifierList(); - QPtrList<BaseSpecifierAST>::iterator it = baseList.begin(); + TQPtrList<BaseSpecifierAST> baseList = baseClause->baseSpecifierList(); + TQPtrList<BaseSpecifierAST>::iterator it = baseList.begin(); for ( ; it != baseList.end(); ++it ) type.append( ( *it )->name()->text() ); @@ -2673,7 +2673,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { kdDebug(9007) << "------> found virtual keyword for class specifier '" << clazz->text() << "'" << endl; }*/ - } else if ( QString( "virtual" ).find( keyword ) != -1 ) + } else if ( TQString( "virtual" ).find( keyword ) != -1 ) m_blockForKeyword = true; else m_blockForKeyword = false; @@ -2694,7 +2694,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { int startLine, startColumn; def->getStartPosition( &startLine, &startColumn ); - QString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); + TQString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); /// @todo remove code duplication @@ -2713,7 +2713,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { --end_expr; if ( contents[ end_expr ] != ',' ) { - expr = QString::null; + expr = TQString::null; } else { start_expr = expressionAt( contents, end_expr ); expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); @@ -2732,7 +2732,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { ctx = computeContext( def, line, column, startLine, startColumn ); - QStringList scope; + TQStringList scope; scopeOfNode( def, scope ); this_type = SimpleType( scope, getIncludeFiles() ); @@ -2755,12 +2755,12 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { return ; if ( ch2 == "::" ) { - QString str = clearComments( expr ); + TQString str = clearComments( expr ); if ( !str.contains( '.' ) && !str.contains( "->" ) ) ///Necessary, because the expression may also be like user->BaseUser:: isInstance = false; } - QString resolutionType = "(resolved)"; + TQString resolutionType = "(resolved)"; if( !type->resolved() ) { if( BuiltinTypes::isBuiltin( type.resultType ) ) { resolutionType = "(builtin " + BuiltinTypes::comment( type.resultType ) + ")"; @@ -2773,7 +2773,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { kdDebug( 9007 ) << "===========================> word is: " << word << endl; if ( !showArguments ) { - QValueList<CodeCompletionEntry> entryList; + TQValueList<CodeCompletionEntry> entryList; if ( !type && this_type && ( expr.isEmpty() || expr.endsWith( ";" ) ) ) { @@ -2817,9 +2817,9 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if( ctx ) computeCompletionEntryList( entryList, ctx, isInstance ); // if ( m_pSupport->codeCompletionConfig() ->includeGlobalFunctions() ) - // computeCompletionEntryList( type, entryList, QStringList(), false ); + // computeCompletionEntryList( type, entryList, TQStringList(), false ); - computeCompletionEntryList( type, entryList, QStringList(), false ); + computeCompletionEntryList( type, entryList, TQStringList(), false ); if ( this_type.scope().size() ) computeCompletionEntryList( this_type, entryList, this_type.scope(), isInstance ); @@ -2829,11 +2829,11 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { computeCompletionEntryList( type, entryList, type->resolved() ->scope() , isInstance ); } - QStringList trueMatches; + TQStringList trueMatches; if ( invokedOnDemand ) { // find matching words - QValueList<CodeCompletionEntry>::Iterator it; + TQValueList<CodeCompletionEntry>::Iterator it; for ( it = entryList.begin(); it != entryList.end(); ++it ) { if ( ( *it ).text.startsWith( word ) ) { trueMatches << ( *it ).text; @@ -2860,14 +2860,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { m_bCompletionBoxShow = true; ///Warning: the conversion is only possible because CodeCompletionEntry is binary compatible with KTextEditor::CompletionEntry, ///never change that! - m_activeCompletion->showCompletionBox( *( ( QValueList<KTextEditor::CompletionEntry>* ) ( &entryList ) ), word.length() ); + m_activeCompletion->showCompletionBox( *( ( TQValueList<KTextEditor::CompletionEntry>* ) ( &entryList ) ), word.length() ); } } else { - QValueList<QStringList> signatureList; + TQValueList<TQStringList> signatureList; signatureList = computeSignatureList( type ); - QString methodName = type->name(); + TQString methodName = type->name(); ///Search for variables with ()-operator in the context if ( ctx ) { @@ -2911,7 +2911,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } -QValueList<QStringList> CppCodeCompletion::computeSignatureList( EvaluationResult result ) { +TQValueList<TQStringList> CppCodeCompletion::computeSignatureList( EvaluationResult result ) { SimpleType type = result; if ( result.expr.t == ExpressionInfo::TypeExpression ) { @@ -2920,7 +2920,7 @@ QValueList<QStringList> CppCodeCompletion::computeSignatureList( EvaluationResul type = type->typeOf( d, SimpleTypeImpl::MemberInfo::Function ); ///Compute the signature of the constructor } - QValueList<QStringList> retList; + TQValueList<TQStringList> retList; SimpleTypeFunctionInterface* f = type->asFunction(); SimpleType currType = type; @@ -2934,10 +2934,10 @@ QValueList<QStringList> CppCodeCompletion::computeSignatureList( EvaluationResul } while ( f ) { - QStringList lst; - QString sig = buildSignature( currType.get() ); - QString comment = currType->comment(); - QStringList commentList; + TQStringList lst; + TQString sig = buildSignature( currType.get() ); + TQString comment = currType->comment(); + TQStringList commentList; if ( m_pSupport->codeCompletionConfig() ->showCommentWithArgumentHint() ) { if ( !comment.isEmpty() ) { @@ -2962,13 +2962,13 @@ QValueList<QStringList> CppCodeCompletion::computeSignatureList( EvaluationResul return retList; } -void CppCodeCompletion::synchronousParseReady( const QString& file, ParsedFilePointer unit ) { +void CppCodeCompletion::synchronousParseReady( const TQString& file, ParsedFilePointer unit ) { if ( file == m_activeFileName ) { computeRecoveryPoints( unit ); } } -void CppCodeCompletion::slotCodeModelUpdated( const QString& fileName ) { +void CppCodeCompletion::slotCodeModelUpdated( const TQString& fileName ) { if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) return ; @@ -2977,7 +2977,7 @@ void CppCodeCompletion::slotCodeModelUpdated( const QString& fileName ) { computeRecoveryPointsLocked(); } -void CppCodeCompletion::slotFileParsed( const QString& fileName ) { +void CppCodeCompletion::slotFileParsed( const TQString& fileName ) { if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) return ; @@ -2999,24 +2999,24 @@ SimpleContext* CppCodeCompletion::computeContext( FunctionDefinitionAST * ast, i DeclaratorAST * d = ast->initDeclarator() ->declarator(); if ( ParameterDeclarationClauseAST * clause = d->parameterDeclarationClause() ) { if ( ParameterDeclarationListAST * params = clause->parameterDeclarationList() ) { - QPtrList<ParameterDeclarationAST> l( params->parameterList() ); - QPtrListIterator<ParameterDeclarationAST> it( l ); + TQPtrList<ParameterDeclarationAST> l( params->parameterList() ); + TQPtrListIterator<ParameterDeclarationAST> it( l ); while ( it.current() ) { ParameterDeclarationAST * param = it.current(); ++it; SimpleVariable var; - QStringList ptrList; - QPtrList<AST> ptrOpList = param->declarator() ->ptrOpList(); - QPtrList<AST>::iterator it = ptrOpList.begin(); + TQStringList ptrList; + TQPtrList<AST> ptrOpList = param->declarator() ->ptrOpList(); + TQPtrList<AST>::iterator it = ptrOpList.begin(); for ( ; it != ptrOpList.end(); ++it ) { ptrList.append( ( *it ) ->text() ); } var.ptrList = ptrList; var.type = param->typeSpec() ->text() + ptrList.join( "" ); - var.name = declaratorToString( param->declarator(), QString::null, true ); + var.name = declaratorToString( param->declarator(), TQString::null, true ); var.comment = param->comment(); param->getStartPosition( &var.startLine, &var.startCol ); param->getEndPosition( &var.endLine, &var.endCol ); @@ -3080,8 +3080,8 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, StatementListAST* a if ( !inContextScope( ast, line, col, false, true ) ) return ; - QPtrList<StatementAST> l( ast->statementList() ); - QPtrListIterator<StatementAST> it( l ); + TQPtrList<StatementAST> l( ast->statementList() ); + TQPtrListIterator<StatementAST> it( l ); while ( it.current() ) { StatementAST * stmt = it.current(); ++it; @@ -3144,8 +3144,8 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, CatchStatementListA /*if ( !inContextScope( ast, line, col, false, true ) ) return;*/ - QPtrList<CatchStatementAST> l( ast->statementList() ); - QPtrListIterator<CatchStatementAST> it( l ); + TQPtrList<CatchStatementAST> l( ast->statementList() ); + TQPtrListIterator<CatchStatementAST> it( l ); while ( it.current() ) { CatchStatementAST * stmt = it.current(); ++it; @@ -3168,21 +3168,21 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen ///@todo respect NodeType_Typedef if( ast->declaration() && ast->declaration() ->nodeType() == NodeType_UsingDirective ) { UsingDirectiveAST* usingDecl = static_cast<UsingDirectiveAST*>( ast->declaration() ); - QString name; + TQString name; if( usingDecl->name() ) { name = usingDecl->name()->text(); if( !name.isNull() ) - ctx->addImport( QPair<QString, QString>( "", name ) ); + ctx->addImport( QPair<TQString, TQString>( "", name ) ); } } if( ast->declaration() && ast->declaration() ->nodeType() == NodeType_NamespaceAlias ) { NamespaceAliasAST* namespaceAlias = static_cast<NamespaceAliasAST*>( ast->declaration() ); - QString name; + TQString name; if( namespaceAlias ->namespaceName() && namespaceAlias->aliasName() ) { - ctx->addImport( QPair<QString, QString>( namespaceAlias->namespaceName()->text(), namespaceAlias->aliasName()->text() ) ); + ctx->addImport( QPair<TQString, TQString>( namespaceAlias->namespaceName()->text(), namespaceAlias->aliasName()->text() ) ); } } @@ -3199,8 +3199,8 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen if ( !initDeclListAST ) return ; - QPtrList<InitDeclaratorAST> l = initDeclListAST->initDeclaratorList(); - QPtrListIterator<InitDeclaratorAST> it( l ); + TQPtrList<InitDeclaratorAST> l = initDeclListAST->initDeclaratorList(); + TQPtrListIterator<InitDeclaratorAST> it( l ); while ( it.current() ) { DeclaratorAST * d = it.current() ->declarator(); ++it; @@ -3208,9 +3208,9 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen if ( d->declaratorId() ) { SimpleVariable var; - QStringList ptrList; - QPtrList<AST> ptrOpList = d->ptrOpList(); - QPtrList<AST>::iterator it = ptrOpList.begin(); + TQStringList ptrList; + TQPtrList<AST> ptrOpList = d->ptrOpList(); + TQPtrList<AST>::iterator it = ptrOpList.begin(); for ( ; it != ptrOpList.end(); ++it ) { ptrList.append( ( *it ) ->text() ); } @@ -3241,9 +3241,9 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, ConditionAST* ast, SimpleVariable var; - QStringList ptrList; - QPtrList<AST> ptrOpList = ast->declarator() ->ptrOpList(); - QPtrList<AST>::iterator it = ptrOpList.begin(); + TQStringList ptrList; + TQPtrList<AST> ptrOpList = ast->declarator() ->ptrOpList(); + TQPtrList<AST>::iterator it = ptrOpList.begin(); for ( ; it != ptrOpList.end(); ++it ) { ptrList.append( ( *it ) ->text() ); } @@ -3298,19 +3298,19 @@ FunctionDefinitionAST * CppCodeCompletion::functionDefinition( AST* node ) { return 0; } -QString CppCodeCompletion::getText( int startLine, int startColumn, int endLine, int endColumn, int omitLine ) { +TQString CppCodeCompletion::getText( int startLine, int startColumn, int endLine, int endColumn, int omitLine ) { if ( startLine == endLine ) { - QString textLine = m_activeEditor->textLine( startLine ); + TQString textLine = m_activeEditor->textLine( startLine ); return textLine.mid( startColumn, endColumn - startColumn ); } - QStringList contents; + TQStringList contents; for ( int line = startLine; line <= endLine; ++line ) { if ( line == omitLine ) continue; - QString textLine = m_activeEditor->textLine( line ); + TQString textLine = m_activeEditor->textLine( line ); if ( line == startLine ) textLine = textLine.mid( startColumn ); @@ -3344,7 +3344,7 @@ void CppCodeCompletion::computeRecoveryPoints( ParsedFilePointer unit ) { walker.parseTranslationUnit( *unit ); } -QString codeModelAccessToString( CodeModelItem::Access access ) { +TQString codeModelAccessToString( CodeModelItem::Access access ) { switch ( access ) { case CodeModelItem::Public: return "public"; @@ -3360,13 +3360,13 @@ QString codeModelAccessToString( CodeModelItem::Access access ) { #define MAXCOMMENTCOLUMNS 45 -QString CppCodeCompletion::commentFromItem( const SimpleType& parent, const ItemDom& item ) { +TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const ItemDom& item ) { --m_maxComments; - static QString maxReached = " "; + static TQString maxReached = " "; if( m_maxComments < 0 ) { return maxReached; } - QString ret; + TQString ret; int line, col; item->getStartPosition( &line, &col ); @@ -3397,7 +3397,7 @@ QString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Item const FunctionModel * f = dynamic_cast<const FunctionModel*>( item.data() ); ret += "\nKind: Function"; if ( f ) { - QString state; + TQString state; if ( f->isStatic() ) state += "static "; if ( f->isVirtual() ) @@ -3463,22 +3463,22 @@ QString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Item ret += "\nKind: Class"; } - ret += QString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); + ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); if ( !item->comment().isEmpty() ) ret += "\n\n" + prepareTextForMenu( item->comment(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ); return ret; } -QString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) { +TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) { --m_maxComments; - static QString maxReached = " "; + static TQString maxReached = " "; if( m_maxComments < 0 ) { return maxReached; } int line, col; tag.getStartPosition( &line, &col ); - QString ret; // = tag.comment(); + TQString ret; // = tag.comment(); if ( !parent->scope().isEmpty() ) { ret += "Container: " + parent->fullTypeResolvedWithScope(); @@ -3508,7 +3508,7 @@ QString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) ret += "\nKind: Function"; - QString state; + TQString state; if ( function.isStatic() ) state += "static "; if ( function.isVirtual() ) @@ -3585,14 +3585,14 @@ QString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) ret += "\nKind: Struct"; } - ret += QString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); + ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); if ( !tag.comment().isEmpty() ) { ret += "\n\n" + prepareTextForMenu( tag.comment(), 20, MAXCOMMENTCOLUMNS ).join( "\n" ); } return ret; } -void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList<CodeCompletionEntry>& entryList, const QStringList& type, SimpleTypeNamespace* ns, std::set<HashedString>& ignore, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueList<CodeCompletionEntry>& entryList, const TQStringList& type, SimpleTypeNamespace* ns, std::set<HashedString>& ignore, bool isInstance, int depth ) { HashedString myName = HashedString( ns->scope().join("::") +"%"+typeid(*ns).name() ); if ( ignore.find( myName ) != ignore.end() ) return ; @@ -3608,7 +3608,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList< CodeCompletionEntry > & entryList, const QStringList & type, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueList< CodeCompletionEntry > & entryList, const TQStringList & type, bool isInstance, int depth ) { dbgState.setState( disableVerboseForCompletionList ); Debug d( "#cel#" ); @@ -3625,12 +3625,12 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList if ( ClassModel * mod = dynamic_cast<ClassModel*> ( &( *item ) ) ) computeCompletionEntryList( typeR, entryList, ClassDom( mod ) , isInstance, depth ); } else { - QValueList<Catalog::QueryArgument> args; - QValueList<Tag> tags; + TQValueList<Catalog::QueryArgument> args; + TQValueList<Tag> tags; - QStringList ts = type; + TQStringList ts = type; if( !ts.isEmpty() ) { - QString s = ts.back() + typeR->specialization(); + TQString s = ts.back() + typeR->specialization(); ts.pop_back(); ts.push_back( s ); } @@ -3681,14 +3681,14 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList args.clear(); args << Catalog::QueryArgument( "kind", Tag::Kind_Base_class ); - QString fullname = type.join( "::" )+typeR->specialization(); + TQString fullname = type.join( "::" )+typeR->specialization(); /* if( fullname.length() >=2 ) args << Catalog::QueryArgument( "prefix", fullname.left(2) );*/ args << Catalog::QueryArgument( "name", fullname ); - QValueList<LocateResult> parents = typeR->getBases( ); - for ( QValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { + TQValueList<LocateResult> parents = typeR->getBases( ); + for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; SimpleType tp = SimpleType( ( *it ) ->resolved() ); @@ -3700,18 +3700,18 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, QValueList< Tag > & tags, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, TQValueList< Tag > & tags, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; - QString className = type->desc().name(); + TQString className = type->desc().name(); bool isNs = type->isNamespace(); CompTypeProcessor proc( type, m_pSupport->codeCompletionConfig() ->processFunctionArguments() && type->usingTemplates() ); bool resolve = m_pSupport->codeCompletionConfig() ->processPrimaryTypes() && type->usingTemplates(); - QValueList<Tag>::Iterator it = tags.begin(); + TQValueList<Tag>::Iterator it = tags.begin(); while ( it != tags.end() ) { Tag & tag = *it; ++it; @@ -3753,7 +3753,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< fl.flags = tag.flags(); int num = fl.data.access; - QString str = "public"; + TQString str = "public"; if ( num != 0 ) { str = TagUtils::accessToString( num ); } else { @@ -3807,7 +3807,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< break; } - e.userdata = QString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting ); + e.userdata = TQString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting ); if ( m_completionMode != SignalCompletion ) { if ( !type->isNamespace() ) { @@ -3819,7 +3819,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } - QString prefix = tagType( tag ).stripWhiteSpace(); + TQString prefix = tagType( tag ).stripWhiteSpace(); if ( tag.kind() == Tag::Kind_Enumerator && tag.hasAttribute( "enum" ) ) { prefix = tag.attribute( "enum" ).asString(); @@ -3867,7 +3867,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, ClassDom klass, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, ClassDom klass, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -3878,7 +3878,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< FunctionDefinitionList definitions = klass->functionDefinitionList(); FunctionList l; - QStringList classScope = klass->scope(); + TQStringList classScope = klass->scope(); classScope << klass->name(); for ( FunctionDefinitionList::iterator it = definitions.begin(); it != definitions.end(); ++it ) { @@ -3930,9 +3930,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< computeCompletionEntryList( klass->name(), type, entryList, klass->typeAliasList(), isInstance, depth ); } - QValueList<LocateResult> parents = type->getBases( ); + TQValueList<LocateResult> parents = type->getBases( ); - for ( QValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { + for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; @@ -3950,7 +3950,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, NamespaceDom scope, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, NamespaceDom scope, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -3962,7 +3962,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< computeCompletionEntryList( type, entryList, scope->namespaceList(), isInstance, depth ); } -void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType type, QValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -3981,7 +3981,7 @@ void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType t if ( isInstance ) continue; - entry.userdata = QString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 ); + entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 ); entryList << entry; @@ -3993,7 +3993,7 @@ void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType t } } -void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType type, QValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -4015,11 +4015,11 @@ void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType t entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); entry.text = klass->name(); entry.comment = commentFromItem( type, klass.data() ); - entry.userdata = QString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 ); + entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 ); entryList << entry; } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, const NamespaceList & lst, bool /*isInstance*/, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const NamespaceList & lst, bool /*isInstance*/, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -4038,11 +4038,11 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, const FunctionList & methods, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const FunctionList & methods, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; - QString className = type->desc().name(); + TQString className = type->desc().name(); bool isNs = type->isNamespace(); bool resolve = type->usingTemplates() && m_pSupport->codeCompletionConfig() ->processPrimaryTypes(); @@ -4073,7 +4073,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< if ( ! resolve ) { entry.prefix = meth->resultType(); } else { - QString tt = meth->resultType(); + TQString tt = meth->resultType(); LocateResult t = type->locateDecType( tt ); if ( t ) { entry.prefix = t->fullNameChain(); @@ -4087,7 +4087,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< entry.prefix = destructorPrefix; entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); - QString text; + TQString text; ArgumentList args = meth->argumentList(); ArgumentList::Iterator argIt = args.begin(); @@ -4112,7 +4112,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< text += proc.processType( arg->type() ); if ( m_completionMode == NormalCompletion || m_completionMode == VirtualDeclCompletion ) - text += QString( " " ) + arg->name(); + text += TQString( " " ) + arg->name(); if ( argIt != args.end() ) text += ", "; @@ -4136,7 +4136,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< if ( meth->isStatic() ) subSorting = 5; - entry.userdata += QString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting ); + entry.userdata += TQString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting ); if ( m_completionMode == VirtualDeclCompletion ) entry.text += text + ";"; @@ -4162,9 +4162,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, const VariableList & attributes, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const VariableList & attributes, bool isInstance, int depth ) { Debug d( "#cel#" ); - QString className = type->desc().name(); + TQString className = type->desc().name(); bool isNs = type->isNamespace(); if ( !safetyCounter || !d ) @@ -4187,14 +4187,14 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry entry; entry.text = attr->name(); entry.comment = commentFromItem( type, model_cast<ItemDom>( attr ) ); - entry.userdata += QString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 ); + entry.userdata += TQString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 ); if ( !attr->isEnumeratorVariable() ) { if ( ! resolve ) { entry.prefix = attr->type(); } else { - QString tt = attr->type(); + TQString tt = attr->type(); LocateResult t = type->locateDecType( tt ); //SimpleType t = type->typeOf( attr->name() ); if ( t ) @@ -4217,14 +4217,14 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( QValueList< CodeCompletionEntry > & entryList, SimpleContext * ctx, bool /*isInstance*/, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQValueList< CodeCompletionEntry > & entryList, SimpleContext * ctx, bool /*isInstance*/, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; while ( ctx ) { - QValueList<SimpleVariable> vars = ctx->vars(); - QValueList<SimpleVariable>::ConstIterator it = vars.begin(); + TQValueList<SimpleVariable> vars = ctx->vars(); + TQValueList<SimpleVariable>::ConstIterator it = vars.begin(); while ( it != vars.end() ) { const SimpleVariable & var = *it; ++it; @@ -4252,7 +4252,7 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim EvaluationResult res; res = obj.evaluate(); - QString resolutionType = "(resolved)"; + TQString resolutionType = "(resolved)"; if( !res->resolved() ) { if( BuiltinTypes::isBuiltin( res.resultType ) ) { resolutionType = "(builtin " + BuiltinTypes::comment( res.resultType ) + ")"; @@ -4269,13 +4269,13 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim void CppCodeCompletion::computeFileEntryList( ) { m_fileEntryList.clear(); - QStringList fileList = m_pSupport->project() ->allFiles(); - for ( QStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { + TQStringList fileList = m_pSupport->project() ->allFiles(); + for ( TQStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { if ( !m_pSupport->isHeader( *it ) ) continue; CodeCompletionEntry entry; - entry.text = QFileInfo( *it ).fileName(); + entry.text = TQFileInfo( *it ).fileName(); m_fileEntryList.push_back( entry ); } @@ -4283,8 +4283,8 @@ void CppCodeCompletion::computeFileEntryList( ) { m_fileEntryList = unique( m_fileEntryList ); } -HashedStringSet CppCodeCompletion::getIncludeFiles( const QString& fi ) { - QString file = fi; +HashedStringSet CppCodeCompletion::getIncludeFiles( const TQString& fi ) { + TQString file = fi; if( file.isEmpty() ) file = m_activeFileName; @@ -4328,7 +4328,7 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) // Determine the declaration info based on the type of item we are dealing with. DeclarationInfo d; - QString includeFileName, includeFilePath; + TQString includeFileName, includeFilePath; bool unused; if ( result.isMacro ) { @@ -4354,12 +4354,12 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) SimpleTypeCachedCodeModel * item = dynamic_cast<SimpleTypeCachedCodeModel*>( ( *slaves.begin() ).first.first.resolved().data() ); if ( item && item->item() && item->item()->isNamespace() ) { NamespaceModel* ns = dynamic_cast<NamespaceModel*>( item->item().data() ); - QStringList wholeScope = ns->scope(); + TQStringList wholeScope = ns->scope(); wholeScope << ns->name(); FileList files = cppSupport()->codeModel()->fileList(); for ( FileList::iterator it = files.begin(); it != files.end(); ++it ) { NamespaceModel* ns = (*it).data(); - for ( QStringList::iterator it2 = wholeScope.begin(); it2 != wholeScope.end(); ++it2 ) { + for ( TQStringList::iterator it2 = wholeScope.begin(); it2 != wholeScope.end(); ++it2 ) { if ( ns->hasNamespace( (*it2) ) ) { ns = ns->namespaceByName( *it2 ); if ( !ns ) break; @@ -4386,7 +4386,7 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) } // Unresolved, maybe its a named enumeration? else if ( type && type.trace() ) { - QValueList< QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = type.trace()->trace(); + TQValueList< QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = type.trace()->trace(); if ( !trace.isEmpty() ) { if ( trace.begin() != trace.end() ) { d = ( *trace.begin() ).first.decl; @@ -4395,16 +4395,16 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) } } if ( d ) { - QString fileName = d.file == "current_file" ? m_activeFileName : d.file.operator QString(); + TQString fileName = d.file == "current_file" ? m_activeFileName : d.file.operator TQString(); if ( f == Definition && cppSupport()->switchHeaderImpl( fileName, d.startLine, d.startCol ) ) return; cppSupport()->partController()->editDocument( fileName, d.startLine ); } } -QString CppCodeCompletion::createTypeInfoString( int line, int column ) +TQString CppCodeCompletion::createTypeInfoString( int line, int column ) { - QString typeInfoString; + TQString typeInfoString; SimpleTypeConfiguration conf( m_activeFileName ); EvaluationResult type = evaluateExpressionAt( line, column, conf ); @@ -4412,11 +4412,11 @@ QString CppCodeCompletion::createTypeInfoString( int line, int column ) if ( type.expr.expr().stripWhiteSpace().isEmpty() ) return typeInfoString; - typeInfoString += type.expr.expr() + QString(" : " ); + typeInfoString += type.expr.expr() + TQString(" : " ); if ( type->resolved() ) { - QString scope = type->resolved()->scope().join("::"); + TQString scope = type->resolved()->scope().join("::"); int pos = scope.findRev("::"); if ( scope.isEmpty() || pos == -1 ) { @@ -4427,7 +4427,7 @@ QString CppCodeCompletion::createTypeInfoString( int line, int column ) scope.truncate( pos + 2 ); } - typeInfoString += scope + type->fullNameChain() + QString( i18n(" (resolved) ") ); + typeInfoString += scope + type->fullNameChain() + TQString( i18n(" (resolved) ") ); } else { @@ -4435,16 +4435,16 @@ QString CppCodeCompletion::createTypeInfoString( int line, int column ) { if( !BuiltinTypes::isBuiltin( type.resultType ) ) { - typeInfoString += type->fullNameChain() + QString( i18n(" (unresolved) ") ); + typeInfoString += type->fullNameChain() + TQString( i18n(" (unresolved) ") ); } else { - typeInfoString += type->fullNameChain() + ", " + BuiltinTypes::comment( type.resultType ) + QString( i18n(" (builtin type) ") ); + typeInfoString += type->fullNameChain() + ", " + BuiltinTypes::comment( type.resultType ) + TQString( i18n(" (builtin type) ") ); } } else { - typeInfoString += QString( i18n(" (unresolved) ") ); + typeInfoString += TQString( i18n(" (unresolved) ") ); } } @@ -4458,16 +4458,16 @@ QString CppCodeCompletion::createTypeInfoString( int line, int column ) return typeInfoString; } -bool CppCodeCompletion::getIncludeInfo( int line, QString& includeFileName, QString& includeFilePath, bool& usedProjectFiles ) +bool CppCodeCompletion::getIncludeInfo( int line, TQString& includeFileName, TQString& includeFilePath, bool& usedProjectFiles ) { bool isIncludeDirective = false; - QString lineText = getText( line, 0, line+1, 0 ); - QRegExp includeRx( "(?:#include[\\s]*(?:\\\"|\\<))([^\\n]*)(\\\"|\\>)" ); + TQString lineText = getText( line, 0, line+1, 0 ); + TQRegExp includeRx( "(?:#include[\\s]*(?:\\\"|\\<))([^\\n]*)(\\\"|\\>)" ); if( includeRx.search( lineText ) != -1 ) { //It is an include-directive. The regular expression captures the string, and the closing sign('"' or '>'). isIncludeDirective = true; usedProjectFiles = false; - QStringList captured = includeRx.capturedTexts(); + TQStringList captured = includeRx.capturedTexts(); if( captured.size() == 3 ) { Dependence d; d.first = captured[1]; diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 0eb49908..67f7b10b 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -34,28 +34,28 @@ #include <ktexteditor/cursorinterface.h> #include <ktexteditor/view.h> -#include <qobject.h> -#include <qmutex.h> -#include <qstringlist.h> -#include <qtimer.h> -#include <qguardedptr.h> -#include <qregexp.h> +#include <tqobject.h> +#include <tqmutex.h> +#include <tqstringlist.h> +#include <tqtimer.h> +#include <tqguardedptr.h> +#include <tqregexp.h> #include "driver.h" ///A little debugging class -#include <qpopupmenu.h> -class PopupTracker : public QObject { +#include <tqpopupmenu.h> +class PopupTracker : public TQObject { Q_OBJECT public: static PopupTracker* pt; static uint pendingPopups; - static QPopupMenu* createPopup( QWidget* parent ) { + static TQPopupMenu* createPopup( TQWidget* parent ) { if( !pt ) pt = new PopupTracker(); - QPopupMenu* m = new QPopupMenu( parent ); + TQPopupMenu* m = new TQPopupMenu( parent ); ++pendingPopups; - connect( m, SIGNAL(destroyed()), pt, SLOT(destroyedPopup()) ); + connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); return m; } @@ -123,31 +123,31 @@ public: return m_completionMode; } - QString createTypeInfoString( int line, int column ); + TQString createTypeInfoString( int line, int column ); - QString replaceCppComments( const QString& contents ); - int expressionAt( const QString& text, int index ); - QStringList splitExpression( const QString& text ); + TQString replaceCppComments( const TQString& contents ); + int expressionAt( const TQString& text, int index ); + TQStringList splitExpression( const TQString& text ); CppEvaluation::EvaluationResult evaluateExpression( ExpressionInfo expr, SimpleContext* ctx ); CppEvaluation::EvaluationResult evaluateExpressionAt( int line, int column, SimpleTypeConfiguration& conf, bool ifUnknownSetType = false ); - void contextEvaluationMenus ( QPopupMenu *popup, const Context *context, int line, int col ); + void contextEvaluationMenus ( TQPopupMenu *popup, const Context *context, int line, int col ); CppSupportPart* cppSupport() const; - HashedStringSet getIncludeFiles( const QString& file = QString() ); + HashedStringSet getIncludeFiles( const TQString& file = TQString() ); static CppCodeCompletion* instance() { return m_instance; } ///Adds a string that will be ticked through the status-bar - void addStatusText( QString text, int timeout ); + void addStatusText( TQString text, int timeout ); void clearStatusText(); - QString activeFileName() const { + TQString activeFileName() const { return m_activeFileName; } @@ -166,17 +166,17 @@ private slots: void slotArgHintHidden(); void slotCompletionBoxHidden(); void slotTextChanged(); - void slotFileParsed( const QString& fileName ); - void slotCodeModelUpdated( const QString& fileName ); + void slotFileParsed( const TQString& fileName ); + void slotCodeModelUpdated( const TQString& fileName ); void slotTimeout(); void slotStatusTextTimeout(); void computeFileEntryList(); - bool isTypeExpression( const QString& expr ); - void slotTextHint( int line, int col, QString &text ); + bool isTypeExpression( const TQString& expr ); + void slotTextHint( int line, int col, TQString &text ); void popupAction( int number ); void popupDefinitionAction( int number ); void popupClassViewAction( int number ); - void synchronousParseReady( const QString& file, ParsedFilePointer unit ); + void synchronousParseReady( const TQString& file, ParsedFilePointer unit ); void slotJumpToDefCursorContext(); void slotJumpToDeclCursorContext(); @@ -187,16 +187,16 @@ private: bool functionContains( FunctionDom f , int line, int col ); void getFunctionBody( FunctionDom f , int& line, int& col ); void selectItem( ItemDom item ); - void addTypePopups( QPopupMenu* parent, TypeDesc d, QString depthAdd, QString prefix = "" ); - void addTypeClassPopups( QPopupMenu* parent, TypeDesc d, QString depthAdd, QString prefix = "" ); - QValueList<QStringList> computeSignatureList( CppEvaluation::EvaluationResult function ); + void addTypePopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypeClassPopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + TQValueList<TQStringList> computeSignatureList( CppEvaluation::EvaluationResult function ); void integratePart( KParts::Part* part ); void setupCodeInformationRepository(); FunctionDefinitionAST* functionDefinition( AST* node ); void computeRecoveryPoints( ParsedFilePointer unit ); void computeRecoveryPointsLocked(); void jumpCursorContext( FunctionType ); - bool getIncludeInfo( int line, QString& includeFileName, QString& includeFilePath, bool& usedProjectFiles ); + bool getIncludeInfo( int line, TQString& includeFileName, TQString& includeFilePath, bool& usedProjectFiles ); enum EvaluateExpressionOptions { IncludeStandardExpressions = 1, @@ -209,33 +209,33 @@ private: DefaultCompletionOptions = 1 | 4 | 8 | 16 }; - bool mayBeTypeTail( int line, int column, QString& append, bool inFunction = false ); - bool canBeTypePrefix( const QString& prefix, bool inFunction = false ); + bool mayBeTypeTail( int line, int column, TQString& append, bool inFunction = false ); + bool canBeTypePrefix( const TQString& prefix, bool inFunction = false ); ExpressionInfo findExpressionAt( int line, int col, int startLine, int startCol, bool inFunction = false ); SimpleContext* computeFunctionContext( FunctionDom f, int line, int col, SimpleTypeConfiguration& conf ); CppEvaluation::EvaluationResult evaluateExpressionType( int line, int column, SimpleTypeConfiguration& conf, EvaluateExpressionOptions opt = DefaultCompletionOptions ); - SimpleType unTypeDef( SimpleType scope , QMap<QString, QString>& typedefs ); + SimpleType unTypeDef( SimpleType scope , TQMap<TQString, TQString>& typedefs ); - // QString buildSignature( TypePointer currType ); - SimpleType typeOf( QValueList<Tag>& tags, MemberAccessOp accessOp ); + // TQString buildSignature( TypePointer currType ); + SimpleType typeOf( TQValueList<Tag>& tags, MemberAccessOp accessOp ); /// @todo remove isInstance - void computeCompletionEntryList( QValueList<CodeCompletionEntry>& entryList, SimpleContext* ctx, bool isInstance, int depth = 0 ); - void computeCompletionEntryList( SimpleType type, QValueList<CodeCompletionEntry>& - entryList, const QStringList& typeList, SimpleTypeNamespace* ns, std::set<HashedString>& ignore, bool isInstance, int depth = 0 ); - void computeCompletionEntryList( SimpleType type, QValueList<CodeCompletionEntry>& - entryList, const QStringList& typeList, bool isInstance, int depth = 0 ); - void computeCompletionEntryList( SimpleType type, QValueList<CodeCompletionEntry>& entryList, QValueList<Tag>& tags, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList<CodeCompletionEntry>& entryList, ClassDom klass, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList<CodeCompletionEntry>& entryList, NamespaceDom scope, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList<CodeCompletionEntry>& entryList, const FunctionList& methods, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList<CodeCompletionEntry>& entryList, const VariableList& attributes, bool isInstance, int depth ); - void computeCompletionEntryList( QString parent, SimpleType type, QValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth ); - void computeCompletionEntryList( QString parent, SimpleType type, QValueList<CodeCompletionEntry>& entryList, const TypeAliasList& lst, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList<CodeCompletionEntry>& entryList, const NamespaceList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQValueList<CodeCompletionEntry>& entryList, SimpleContext* ctx, bool isInstance, int depth = 0 ); + void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& + entryList, const TQStringList& typeList, SimpleTypeNamespace* ns, std::set<HashedString>& ignore, bool isInstance, int depth = 0 ); + void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& + entryList, const TQStringList& typeList, bool isInstance, int depth = 0 ); + void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, TQValueList<Tag>& tags, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, ClassDom klass, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, NamespaceDom scope, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const FunctionList& methods, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const VariableList& attributes, bool isInstance, int depth ); + void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const TypeAliasList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const NamespaceList& lst, bool isInstance, int depth ); SimpleContext* computeContext( FunctionDefinitionAST* ast, int line, int col, int lineOffset, int colOffset ); void computeContext( SimpleContext*& ctx, StatementAST* ast, int line, int col ); @@ -252,7 +252,7 @@ private: void computeContext( SimpleContext*& ctx, ConditionAST* ast, int line, int col ); bool inContextScope( AST* ast, int line, int col, bool checkStart = true, bool checkEnd = true ); - QString getText( int startLine, int startColumn, int endLine, int endColumn, int omitLine = -1 ); + TQString getText( int startLine, int startColumn, int endLine, int endColumn, int omitLine = -1 ); private: @@ -263,15 +263,15 @@ private: friend class ExpressionEvaluation; friend class PopupFillerHelpStruct; friend class PopupClassViewFillerHelpStruct; - QGuardedPtr<CppSupportPart> m_pSupport; - QTimer* m_ccTimer; - QTimer* m_showStatusTextTimer; - QValueList<QPair<int, QString> > m_statusTextList; + TQGuardedPtr<CppSupportPart> m_pSupport; + TQTimer* m_ccTimer; + TQTimer* m_showStatusTextTimer; + TQValueList<QPair<int, TQString> > m_statusTextList; void fitContextItem( int nLine, int nColumn ); void needRecoveryPoints(); - QString m_activeFileName; + TQString m_activeFileName; KTextEditor::ViewCursorInterface* m_activeCursor; KTextEditor::EditInterface* m_activeEditor; KTextEditor::TextHintInterface* m_activeHintInterface; @@ -291,33 +291,33 @@ private: CppCodeCompletionData* d; CompletionMode m_completionMode; - QTime m_lastHintTime; + TQTime m_lastHintTime; //If more then the given count of comments were requested, all following ones will be blank.(Performance-reasons) void setMaxComments( int count ); - QString commentFromItem( const SimpleType& parent, const ItemDom& item ); - QString commentFromTag( const SimpleType& parent, Tag& tag ); + TQString commentFromItem( const SimpleType& parent, const ItemDom& item ); + TQString commentFromTag( const SimpleType& parent, Tag& tag ); ItemDom m_cachedFromContext; ///Can be a function or a class, representing the position from where the last completion was started. Necessary as long as all imports are put into the global namespace. - QRegExp m_includeRx; - QRegExp m_cppCodeCommentsRx; - QRegExp m_codeCompleteChRx; - QRegExp m_codeCompleteCh2Rx; - QValueList<KTextEditor::CompletionEntry> m_fileEntryList; + TQRegExp m_includeRx; + TQRegExp m_cppCodeCommentsRx; + TQRegExp m_codeCompleteChRx; + TQRegExp m_codeCompleteCh2Rx; + TQValueList<KTextEditor::CompletionEntry> m_fileEntryList; int m_maxComments; - typedef QMap<int, DeclarationInfo> PopupActions; - typedef QMap<int, ItemDom> PopupClassViewActions; + typedef TQMap<int, DeclarationInfo> PopupActions; + typedef TQMap<int, ItemDom> PopupClassViewActions; PopupActions m_popupActions; PopupActions m_popupDefinitionActions; PopupClassViewActions m_popupClassViewActions; // we need something to plug actions that are not in any menu // into in order for their shortcuts to work - QWidget m_DummyActionWidget; + TQWidget m_DummyActionWidget; }; #endif diff --git a/languages/cpp/cppcodecompletionconfig.cpp b/languages/cpp/cppcodecompletionconfig.cpp index 2c394858..9ecca5f4 100644 --- a/languages/cpp/cppcodecompletionconfig.cpp +++ b/languages/cpp/cppcodecompletionconfig.cpp @@ -16,12 +16,12 @@ #include <domutil.h> #include <kdebug.h> -#include <qdom.h> +#include <tqdom.h> -QString CppCodeCompletionConfig::defaultPath = QString::fromLatin1( "/kdevcppsupport/codecompletion" ); +TQString CppCodeCompletionConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/codecompletion" ); -CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, QDomDocument* dom ) - : QObject( part ), m_part( part ), m_dom( dom ) +CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, TQDomDocument* dom ) + : TQObject( part ), m_part( part ), m_dom( dom ) { init(); } diff --git a/languages/cpp/cppcodecompletionconfig.h b/languages/cpp/cppcodecompletionconfig.h index 13b23ccf..4fbf2d1b 100644 --- a/languages/cpp/cppcodecompletionconfig.h +++ b/languages/cpp/cppcodecompletionconfig.h @@ -13,7 +13,7 @@ #ifndef CPPCODECOMPLETIONCONFIG_H #define CPPCODECOMPLETIONCONFIG_H -#include <qobject.h> +#include <tqobject.h> class CppSupportPart; class QDomDocument; @@ -26,7 +26,7 @@ class CppCodeCompletionConfig : public QObject { Q_OBJECT public: - CppCodeCompletionConfig( CppSupportPart* part, QDomDocument* dom ); + CppCodeCompletionConfig( CppSupportPart* part, TQDomDocument* dom ); virtual ~CppCodeCompletionConfig(); // bool includeGlobalFunctions() const @@ -93,7 +93,7 @@ public: } ///Additional include-paths defined by the user - void setCustomIncludePaths(QString str) { + void setCustomIncludePaths(TQString str) { m_includePaths = str; } @@ -116,7 +116,7 @@ public: } ///Additional include-paths defined by the user - QString customIncludePaths() const { + TQString customIncludePaths() const { return m_includePaths; } @@ -160,7 +160,7 @@ public: return m_statusBarTypeEvaluation; } - QString namespaceAliases() const { + TQString namespaceAliases() const { ///used return m_namespaceAliases; } @@ -201,7 +201,7 @@ public: m_statusBarTypeEvaluation = b; } - void setNamespaceAliases( QString n ) { + void setNamespaceAliases( TQString n ) { ///used m_namespaceAliases = n; } @@ -274,7 +274,7 @@ private: private: CppSupportPart* m_part; - QDomDocument* m_dom; + TQDomDocument* m_dom; /* bool m_includeGlobalFunctions; bool m_includeTypes; bool m_includeEnums; @@ -292,18 +292,18 @@ private: bool m_alwaysIncludeNamespaces; bool m_alwaysParseInBackground; bool m_usePermanentCaching; - QString m_includePaths; + TQString m_includePaths; bool m_showOnlyAccessibleItems; CompletionBoxItemOrder m_completionBoxItemOrder; bool m_showEvaluationContextMenu; bool m_showCommentWithArgumentHint; bool m_statusBarTypeEvaluation; - QString m_namespaceAliases; + TQString m_namespaceAliases; bool m_processPrimaryTypes; bool m_processFunctionArguments; - static QString defaultPath; + static TQString defaultPath; }; #endif diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp index ff1f4ab9..b84185f5 100644 --- a/languages/cpp/cppevaluation.cpp +++ b/languages/cpp/cppevaluation.cpp @@ -27,7 +27,7 @@ extern SafetyCounter safetyCounter; namespace CppEvaluation { -void statusLog( const QString& str ) { +void statusLog( const TQString& str ) { ifVerboseMajor( dbgMajor() << str << endl ); statusBarText( str, 2000 ); } @@ -43,41 +43,41 @@ RegisterOperator< IndexOperator > IndexReg( AllOperators ); RegisterOperator< ParenOperator > ParenReg( AllOperators ); template<class To, class From> -QValueList<To> convertList( const QValueList<From>& from ) { - QValueList<To> ret; - for( typename QValueList<From>::const_iterator it = from.begin(); it != from.end(); ++it ) { +TQValueList<To> convertList( const TQValueList<From>& from ) { + TQValueList<To> ret; + for( typename TQValueList<From>::const_iterator it = from.begin(); it != from.end(); ++it ) { ret << (To)*it; } return ret; } -QString nameFromType( SimpleType t ) { +TQString nameFromType( SimpleType t ) { return t->fullTypeResolved(); } -QString Operator::printTypeList( QValueList<EvaluationResult>& lst ) +TQString Operator::printTypeList( TQValueList<EvaluationResult>& lst ) { - QString ret; - for( QValueList<EvaluationResult>::iterator it = lst.begin(); it != lst.end(); ++it ) { + TQString ret; + for( TQValueList<EvaluationResult>::iterator it = lst.begin(); it != lst.end(); ++it ) { ret += "\"" + (*it)->fullNameChain() + "\", "; } ret.truncate( ret.length() - 3 ); return ret; } -void Operator::log( const QString& msg ) { +void Operator::log( const TQString& msg ) { statusLog( "\"" + name() + "\": " + msg ); //ifVerboseMajor( dbgMajor() << "\"" << name() << "\": " << msg << endl ); } OperatorSet::~OperatorSet() { - for( QValueList< Operator* >::iterator it = m_operators.begin(); it != m_operators.end(); ++it ) { + for( TQValueList< Operator* >::iterator it = m_operators.begin(); it != m_operators.end(); ++it ) { delete *it; } } -OperatorIdentification OperatorSet::identifyOperator( const QString& str_ , Operator::BindingSide allowedBindings) { - QString str = str_.stripWhiteSpace(); +OperatorIdentification OperatorSet::identifyOperator( const TQString& str_ , Operator::BindingSide allowedBindings) { + TQString str = str_.stripWhiteSpace(); for( OperatorList::iterator it = m_operators.begin(); it != m_operators.end(); ++it ) { if( ((*it)->binding() & allowedBindings) == (*it)->binding() ) { if( OperatorIdentification ident = (*it)->identify( str ) ) { @@ -89,7 +89,7 @@ OperatorIdentification OperatorSet::identifyOperator( const QString& str_ , Oper return OperatorIdentification(); } -OperatorIdentification UnaryOperator::identify( QString& str ) { +OperatorIdentification UnaryOperator::identify( TQString& str ) { OperatorIdentification ret; if( str.startsWith( m_identString ) ) { ret.start = 0; @@ -100,9 +100,9 @@ OperatorIdentification UnaryOperator::identify( QString& str ) { return ret; } -EvaluationResult UnaryOperator::apply( QValueList<EvaluationResult> params, QValueList<EvaluationResult> innerParams ) { +EvaluationResult UnaryOperator::apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ) { if( !checkParams( params ) ) { - log( QString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) ); + log( TQString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) ); return EvaluationResult(); } else { EvaluationResult t = unaryApply( params.front(), innerParams ); @@ -116,11 +116,11 @@ EvaluationResult UnaryOperator::apply( QValueList<EvaluationResult> params, QVal } } -EvaluationResult NestedTypeOperator::unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& /*innerParams*/ ) { +EvaluationResult NestedTypeOperator::unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& /*innerParams*/ ) { return param; } -EvaluationResult DotOperator::unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& /*innerParams*/ ) { +EvaluationResult DotOperator::unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& /*innerParams*/ ) { if( param->totalPointerDepth() == 0 ) { return param; } else { @@ -130,7 +130,7 @@ EvaluationResult DotOperator::unaryApply( EvaluationResult param, const QValueLi } -EvaluationResult ArrowOperator::unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& innerParams ) { +EvaluationResult ArrowOperator::unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& innerParams ) { if( param->totalPointerDepth() == 1 ) { param->setTotalPointerDepth( param->totalPointerDepth() - 1 ); return param; @@ -149,7 +149,7 @@ EvaluationResult ArrowOperator::unaryApply( EvaluationResult param, const QValue }; } -EvaluationResult StarOperator::unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& /*innerParams*/ ) { +EvaluationResult StarOperator::unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& /*innerParams*/ ) { if( param->totalPointerDepth() > 0 ) { param->setTotalPointerDepth( param->totalPointerDepth() - 1 ); return param; @@ -163,14 +163,14 @@ EvaluationResult StarOperator::unaryApply( EvaluationResult param, const QValueL }; } -EvaluationResult AddressOperator::unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& /*innerParams*/ ) { +EvaluationResult AddressOperator::unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& /*innerParams*/ ) { param->setTotalPointerDepth( param->totalPointerDepth() + 1 ); return param; } -OperatorIdentification UnaryParenOperator::identify( QString& str ) { +OperatorIdentification UnaryParenOperator::identify( TQString& str ) { OperatorIdentification ret; - if( str.startsWith( QString( identString()[0] ) ) ) { + if( str.startsWith( TQString( identString()[0] ) ) ) { ret.start = 0; ret.end = findClose( str, 0 ); if( ret.end == -1 ) { @@ -200,7 +200,7 @@ OperatorIdentification UnaryParenOperator::identify( QString& str ) { } -EvaluationResult IndexOperator::unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& innerParams ) { +EvaluationResult IndexOperator::unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& innerParams ) { if( param->totalPointerDepth() > 0 ) { param->setTotalPointerDepth( param->totalPointerDepth() - 1 ); return param; @@ -214,7 +214,7 @@ EvaluationResult IndexOperator::unaryApply( EvaluationResult param, const QValue }; } -EvaluationResult ParenOperator::unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& innerParams ) { +EvaluationResult ParenOperator::unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& innerParams ) { if( param ) { if( param->resolved() ) { return param->resolved()->applyOperator( SimpleTypeImpl::ParenOp, convertList<LocateResult>(innerParams) ); @@ -253,7 +253,7 @@ EvaluationResult ExpressionEvaluation::evaluate() { return res; } -EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, EvaluationResult scope, SimpleContext * ctx, SimpleContext* innerCtx , bool canBeTypeExpression) { +EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( TQString expr, EvaluationResult scope, SimpleContext * ctx, SimpleContext* innerCtx , bool canBeTypeExpression) { LogDebug d( "#evl#" ); if( expr.isEmpty() || !safetyCounter ) { scope.expr.t = ExpressionInfo::NormalExpression; @@ -270,9 +270,9 @@ EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, expr = expr.stripWhiteSpace(); ///Find the rightmost operator with the lowest priority, for the first split. - QValueList<OperatorIdentification> idents; + TQValueList<OperatorIdentification> idents; for( uint a = 0; a < expr.length(); ++a ) { - QString part = expr.mid( a ); + TQString part = expr.mid( a ); OperatorIdentification ident = m_operators.identifyOperator( part ); if( ident ) { ifVerboseMajor( dbgMajor() << "identified \"" << ident.op->name() << "\" in string " << part << endl ); @@ -292,7 +292,7 @@ EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, if( !idents.isEmpty() ) { OperatorIdentification lowest; - for( QValueList<OperatorIdentification>::iterator it = idents.begin(); it != idents.end(); ++it ) { + for( TQValueList<OperatorIdentification>::iterator it = idents.begin(); it != idents.end(); ++it ) { if( lowest ) { if( lowest.op->priority() >= (*it).op->priority() ) lowest = *it; @@ -302,8 +302,8 @@ EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, } if( lowest ) { - QString leftSide = expr.left( lowest.start ).stripWhiteSpace(); - QString rightSide = expr.right( expr.length() - lowest.end ).stripWhiteSpace(); + TQString leftSide = expr.left( lowest.start ).stripWhiteSpace(); + TQString rightSide = expr.right( expr.length() - lowest.end ).stripWhiteSpace(); EvaluationResult left, right; if( !leftSide.isEmpty() ) { @@ -323,12 +323,12 @@ EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, ifVerboseMajor( dbgMajor() << "problem while evaluating expression \"" << expr << "\", the operator \"" << lowest.op->name() << "\" has a binding to the right side, but no right side could be evaluated: \"" << rightSide << "\"" << endl ); } - QValueList<EvaluationResult> innerParams; - QValueList<EvaluationResult> params; + TQValueList<EvaluationResult> innerParams; + TQValueList<EvaluationResult> params; if( lowest.op->binding() & Operator::Left ) params << left; if( lowest.op->binding() & Operator::Right ) params << right; - for( QValueList<QString>::iterator it = lowest.innerParams.begin(); it != lowest.innerParams.end(); ++it ) { + for( TQValueList<TQString>::iterator it = lowest.innerParams.begin(); it != lowest.innerParams.end(); ++it ) { ifVerboseMajor(dbgMajor() << "evaluating inner parameter \"" + *it + "\"" ); innerParams << evaluateExpressionInternal( (*it), SimpleType(), innerCtx, innerCtx, lowest.op->canBeType( Operator::Neutral ) ); } @@ -465,7 +465,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, } /*} else { bestRet = EvaluationResult( type ); - QStringList s = split+exprList; + TQStringList s = split+exprList; s.pop_front(); if( !s.isEmpty() ) bestRet->append( new TypeDescShared( s.join("::") ) ); diff --git a/languages/cpp/cppevaluation.h b/languages/cpp/cppevaluation.h index e4adeb28..97924b0a 100644 --- a/languages/cpp/cppevaluation.h +++ b/languages/cpp/cppevaluation.h @@ -22,7 +22,7 @@ #ifndef CPPEVALUATION_H #define CPPEVALUATION_H -#include <qvaluelist.h> +#include <tqvaluelist.h> #include "expressioninfo.h" #include "simpletype.h" @@ -31,19 +31,19 @@ class SimpleContext; -void statusBarText( const QString& str, int time = 1000 ); +void statusBarText( const TQString& str, int time = 1000 ); namespace CppEvaluation { template <class To, class From> -extern QValueList<To> convertList( const QValueList<From>& from ); +extern TQValueList<To> convertList( const TQValueList<From>& from ); -extern QString nameFromType( SimpleType t ); +extern TQString nameFromType( SimpleType t ); class Operator; struct OperatorIdentification { - QValueList<QString> innerParams; /** Inner parameters of the operator( for the vec["hello"] the "hello" ) */ + TQValueList<TQString> innerParams; /** Inner parameters of the operator( for the vec["hello"] the "hello" ) */ int start, end; /** Range the operator occupies */ bool found; Operator* op; ///Can be 0 ! @@ -139,12 +139,12 @@ class Operator { virtual BindingSide binding() = 0; ///The side to which the operator binds ///When this returns true, the ident-structure must be filled correctly - virtual OperatorIdentification identify( QString& str ) = 0; + virtual OperatorIdentification identify( TQString& str ) = 0; ///params - virtual EvaluationResult apply( QValueList<EvaluationResult> params, QValueList<EvaluationResult> innerParams ) = 0; + virtual EvaluationResult apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ) = 0; - virtual QString name() = 0; + virtual TQString name() = 0; ///Should return whether the item it the given side can be a type(Neutral stands for the inner paremeters) virtual bool canBeType( BindingSide side ) { @@ -152,14 +152,14 @@ class Operator { } protected: - void log( const QString& msg ); - QString printTypeList( QValueList<EvaluationResult>& lst ); + void log( const TQString& msg ); + TQString printTypeList( TQValueList<EvaluationResult>& lst ); }; class OperatorSet { private: - typedef QValueList< Operator* > OperatorList; + typedef TQValueList< Operator* > OperatorList; OperatorList m_operators; public: OperatorSet() {} @@ -170,7 +170,7 @@ class OperatorSet { m_operators << op; } - OperatorIdentification identifyOperator( const QString& str_ , Operator::BindingSide allowedBindings = ( Operator::BindingSide ) ( Operator::Left | Operator::Right | Operator::Neutral ) ); + OperatorIdentification identifyOperator( const TQString& str_ , Operator::BindingSide allowedBindings = ( Operator::BindingSide ) ( Operator::Left | Operator::Right | Operator::Neutral ) ); }; extern OperatorSet AllOperators; @@ -190,7 +190,7 @@ class RegisterOperator { class UnaryOperator : public Operator { public: - UnaryOperator( int priority , QString identString, QString description, Operator::BindingSide binding ) : Operator(), m_priority( priority ), m_identString( identString ), m_name( description ), m_binding( binding ) {} + UnaryOperator( int priority , TQString identString, TQString description, Operator::BindingSide binding ) : Operator(), m_priority( priority ), m_identString( identString ), m_name( description ), m_binding( binding ) {} virtual int priority() { return m_priority; @@ -208,28 +208,28 @@ class UnaryOperator : public Operator { return 1; } - virtual OperatorIdentification identify( QString& str ); + virtual OperatorIdentification identify( TQString& str ); - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& innerParams ) = 0; + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& innerParams ) = 0; - virtual bool checkParams( const QValueList<EvaluationResult>& params ) { + virtual bool checkParams( const TQValueList<EvaluationResult>& params ) { return !params.isEmpty() && params[ 0 ]; } - virtual EvaluationResult apply( QValueList<EvaluationResult> params, QValueList<EvaluationResult> innerParams ); + virtual EvaluationResult apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ); - virtual QString name() { + virtual TQString name() { return m_name; } private: int m_priority; - QString m_identString; - QString m_name; + TQString m_identString; + TQString m_name; Operator::BindingSide m_binding; protected: - QString identString() const { + TQString identString() const { return m_identString; } @@ -240,7 +240,7 @@ class NestedTypeOperator : public UnaryOperator { public: NestedTypeOperator() : UnaryOperator( 18, "::", "nested-type-operator", Operator::Left ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& /*innerParams*/ ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& /*innerParams*/ ); }; //RegisterOperator< NestedTypeOperator > NestedTypeReg( AllOperators ); ///This registers the operator to the list of all operators @@ -249,7 +249,7 @@ class DotOperator : public UnaryOperator { public: DotOperator() : UnaryOperator( 17, ".", "dot-operator", Operator::Left ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& /*innerParams*/ ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& /*innerParams*/ ); virtual bool canBeType( BindingSide side ) { return false; @@ -260,7 +260,7 @@ class ArrowOperator : public UnaryOperator { public: ArrowOperator() : UnaryOperator( 17, "->", "arrow-operator", Operator::Left ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& innerParams ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& innerParams ); virtual bool canBeType( BindingSide side ) { return false; @@ -273,7 +273,7 @@ class StarOperator : public UnaryOperator { StarOperator() : UnaryOperator( 15, "*", "star-operator", Operator::Right ) { ///Normally this should have a priority of 16, but that would need changes to the expression-parsin g-loop } - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& /*innerParams*/ ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& /*innerParams*/ ); virtual bool canBeType( BindingSide side ) { return false; @@ -285,7 +285,7 @@ class AddressOperator : public UnaryOperator { public: AddressOperator() : UnaryOperator( 16, "&", "address-operator", Operator::Right ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& /*innerParams*/ ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& /*innerParams*/ ); virtual bool canBeType( BindingSide side ) { return false; @@ -296,9 +296,9 @@ class AddressOperator : public UnaryOperator { class UnaryParenOperator : public UnaryOperator { public: ///Identstring should be both parens, for Example "[]" or "()" - UnaryParenOperator( int priority , QString identString, QString description, Operator::BindingSide binding ) : UnaryOperator( priority, identString, description, binding ) {} + UnaryParenOperator( int priority , TQString identString, TQString description, Operator::BindingSide binding ) : UnaryOperator( priority, identString, description, binding ) {} - virtual OperatorIdentification identify( QString& str ); + virtual OperatorIdentification identify( TQString& str ); virtual bool canBeType( BindingSide side ) { return false; @@ -309,7 +309,7 @@ class IndexOperator : public UnaryParenOperator { public: IndexOperator() : UnaryParenOperator( 17, "[]", "index-operator", Operator::Left ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& innerParams ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& innerParams ); virtual bool canBeType( BindingSide side ) { return false; @@ -321,11 +321,11 @@ class ParenOperator : public UnaryParenOperator { public: ParenOperator() : UnaryParenOperator( 16, "()", "paren-operator", Operator::Left ) {} - virtual bool checkParams( const QValueList<EvaluationResult>& params ) { + virtual bool checkParams( const TQValueList<EvaluationResult>& params ) { return !params.isEmpty(); } - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList<EvaluationResult>& innerParams ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList<EvaluationResult>& innerParams ); virtual bool canBeType( BindingSide side ) { return false; @@ -354,7 +354,7 @@ class ExpressionEvaluation { vector[ (*it)->position ](). */ - virtual EvaluationResult evaluateExpressionInternal( QString expr, EvaluationResult scope, SimpleContext * ctx, SimpleContext* innerCtx , bool canBeTypeExpression = true ); + virtual EvaluationResult evaluateExpressionInternal( TQString expr, EvaluationResult scope, SimpleContext * ctx, SimpleContext* innerCtx , bool canBeTypeExpression = true ); ///Locates types or members EvaluationResult evaluateAtomicExpression( TypeDesc expr, EvaluationResult scope, SimpleContext * ctx = 0, bool canBeTypeExpression = true ); diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index f5961a7a..7b2d98cd 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -19,12 +19,12 @@ ***************************************************************************/ #include "cppimplementationwidget.h" -#include <qfileinfo.h> -#include <qtextstream.h> -#include <qfile.h> -#include <qdir.h> -#include <qregexp.h> -#include <qdom.h> +#include <tqfileinfo.h> +#include <tqtextstream.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqregexp.h> +#include <tqdom.h> #include <klocale.h> #include <kmessagebox.h> @@ -37,60 +37,60 @@ #include <filetemplate.h> CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, - QWidget *parent, const char *name, bool modal ) + TQWidget *parent, const char *name, bool modal ) : ImplementationWidget( part, parent, name, modal ) {} -QStringList CppImplementationWidget::createClassFiles() +TQStringList CppImplementationWidget::createClassFiles() { - QString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\npublic:\n $CLASSNAME$(QWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; - QString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(QWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; + TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; + TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$MOCINCLUDE$\"\n"; - QFileInfo formInfo( m_formName ); - template_h.replace( QRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" ); - template_h.replace( QRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); - template_h.replace( QRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); - template_h.replace( QRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() ); + TQFileInfo formInfo( m_formName ); + template_h.replace( TQRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" ); + template_h.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); + template_h.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); + template_h.replace( TQRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() ); - template_cpp.replace( QRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" ); - template_cpp.replace( QRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); - template_cpp.replace( QRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); - template_cpp.replace( QRegExp( "\\$MOCINCLUDE\\$" ), fileNameEdit->text() + ".moc" ); + template_cpp.replace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" ); + template_cpp.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); + template_cpp.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); + template_cpp.replace( TQRegExp( "\\$MOCINCLUDE\\$" ), fileNameEdit->text() + ".moc" ); template_h = FileTemplate::read( m_part, "h" ) + template_h; template_cpp = FileTemplate::read( m_part, "cpp" ) + template_cpp; - QString file_h = fileNameEdit->text() + ".h"; - QString file_cpp = fileNameEdit->text() + ".cpp"; + TQString file_h = fileNameEdit->text() + ".h"; + TQString file_cpp = fileNameEdit->text() + ".cpp"; if ( !m_part->project() ->activeDirectory().isEmpty() ) { file_h = m_part->project() ->activeDirectory() + "/" + file_h; file_cpp = m_part->project() ->activeDirectory() + "/" + file_cpp; } - QFile ifile( QDir::cleanDirPath( m_part->project() ->projectDirectory() + "/" + file_cpp ) ); + TQFile ifile( TQDir::cleanDirPath( m_part->project() ->projectDirectory() + "/" + file_cpp ) ); if ( !ifile.open( IO_WriteOnly ) ) { KMessageBox::error( this, i18n( "Cannot write to implementation file" ) ); - return QStringList(); + return TQStringList(); } - QTextStream istream( &ifile ); + TQTextStream istream( &ifile ); istream << template_cpp; ifile.close(); - QFile hfile( QDir::cleanDirPath( m_part->project() ->projectDirectory() + "/" + file_h ) ); + TQFile hfile( TQDir::cleanDirPath( m_part->project() ->projectDirectory() + "/" + file_h ) ); if ( !hfile.open( IO_WriteOnly ) ) { KMessageBox::error( this, i18n( "Cannot write to header file" ) ); - return QStringList(); + return TQStringList(); } - QTextStream hstream( &hfile ); + TQTextStream hstream( &hfile ); hstream << template_h; hfile.close(); - QStringList fileList; + TQStringList fileList; fileList.append( file_h ); fileList.append( file_cpp ); diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index 0fc9d306..b79b0aff 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -31,10 +31,10 @@ class CppImplementationWidget : public ImplementationWidget { Q_OBJECT public: - CppImplementationWidget( KDevLanguageSupport *part, QWidget* parent = 0, const char* name = 0, bool modal = false ); + CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); protected: - virtual QStringList createClassFiles(); + virtual TQStringList createClassFiles(); }; #endif diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index b941b46e..fc338900 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -19,23 +19,23 @@ #include "cppnewclassdlg.h" -#include <qcheckbox.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qradiobutton.h> -#include <qregexp.h> -#include <qtextedit.h> -#include <qrect.h> -#include <qstyle.h> +#include <tqcheckbox.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqradiobutton.h> +#include <tqregexp.h> +#include <tqtextedit.h> +#include <tqrect.h> +#include <tqstyle.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> -#include <qcombobox.h> -#include <qlistview.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qtabwidget.h> +#include <tqcombobox.h> +#include <tqlistview.h> +#include <tqpopupmenu.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> #include <klineedit.h> #include <kdeversion.h> @@ -52,14 +52,14 @@ #include "classgeneratorconfig.h" -QString QRegExp_escape( const QString& str ) +TQString QRegExp_escape( const TQString& str ) { #if QT_VERSION >= 0x030100 - return QRegExp::escape( str ); + return TQRegExp::escape( str ); #else // this block is copyrighted by Trolltech AS (GPL) static const char meta[] = "$()*+.?[\\]^{|}"; - QString quoted = str; + TQString quoted = str; int i = 0; while ( i < ( int ) quoted.length() ) @@ -72,7 +72,7 @@ QString QRegExp_escape( const QString& str ) #endif } -CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, QWidget *parent, const char *name ) +CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, const char *name ) : CppNewClassDialogBase( parent, name ), myModel( 0 ) { headerModified = false; @@ -81,7 +81,7 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, QWidget *parent, con m_part = part; // read file template configuration // KDevProject *project = part->project(); - QDomDocument &dom = *part->projectDom(); + TQDomDocument &dom = *part->projectDom(); interface_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfaceURL" ); implementation_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/implementationURL" ); interface_suffix = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfacesuffix", ".h" ); @@ -92,22 +92,22 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, QWidget *parent, con baseclasses_view->setSorting( -1 ); constructors_view->setSorting( -1 ); - accessMenu = new QPopupMenu( this ); + accessMenu = new TQPopupMenu( this ); accessMenu->insertItem( i18n( "Use as Private" ), - this, SLOT( changeToPrivate() ), 0, 1 ); + this, TQT_SLOT( changeToPrivate() ), 0, 1 ); accessMenu->insertItem( i18n( "Use as Protected" ), - this, SLOT( changeToProtected() ), 0, 2 ); + this, TQT_SLOT( changeToProtected() ), 0, 2 ); accessMenu->insertItem( i18n( "Use as Public" ), - this, SLOT( changeToPublic() ), 0, 3 ); + this, TQT_SLOT( changeToPublic() ), 0, 3 ); accessMenu->insertSeparator(); accessMenu->insertItem( i18n( "Unset" ), - this, SLOT( changeToInherited() ), 0, 5 ); + this, TQT_SLOT( changeToInherited() ), 0, 5 ); - overMenu = new QPopupMenu( this ); + overMenu = new TQPopupMenu( this ); overMenu->insertItem( i18n( "Extend Base Class Functionality" ), - this, SLOT( extendFunctionality() ), 0, 11 ); + this, TQT_SLOT( extendFunctionality() ), 0, 11 ); overMenu->insertItem( i18n( "Replace Base Class Method" ), - this, SLOT( replaceFunctionality() ), 0, 12 ); + this, TQT_SLOT( replaceFunctionality() ), 0, 12 ); compBasename = basename_edit->completionObject(); setCompletionBasename( m_part->codeModel() ); @@ -135,7 +135,7 @@ void CppNewClassDialog::setCompletionBasename( CodeModel *model ) // Import selected namespace without qualifier NamespaceDom namespaceDom = model->globalNamespace(); - QStringList::const_iterator it = currNamespace.begin(); + TQStringList::const_iterator it = currNamespace.begin(); for ( ; it != currNamespace.end() ; ++it ) { if ( ! namespaceDom->hasNamespace( *it ) ) @@ -149,16 +149,16 @@ void CppNewClassDialog::setCompletionBasename( CodeModel *model ) addCompletionBasenameNamespacesRecursive( model->globalNamespace() ); - QStringList compItems = compBasename->items(); + TQStringList compItems = compBasename->items(); it = compItems.begin(); for ( int i = 0; it != compItems.end(); ++it, ++i ) kdDebug( 9007 ) << "compBasename->items()[" << i << "] = \"" << *it << "\"" << endl; } -QStringList& gres( QStringList &list, const QRegExp & rx, const QString & after ) +TQStringList& gres( TQStringList &list, const TQRegExp & rx, const TQString & after ) { - QStringList::Iterator it = list.begin(); + TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { ( *it ).replace( rx, after ); @@ -168,18 +168,18 @@ QStringList& gres( QStringList &list, const QRegExp & rx, const QString & after } void CppNewClassDialog::addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, - const QString & namespaceParent ) + const TQString & namespaceParent ) { // Add classes of this namespace - QStringList classList = sortedNameList( namespaceDom -> classList() ); + TQStringList classList = sortedNameList( namespaceDom -> classList() ); if ( ! namespaceParent.isEmpty() ) { #if QT_VERSION >= 0x030200 - classList.gres( QRegExp( "^" ), namespaceParent + "::" ); + classList.gres( TQRegExp( "^" ), namespaceParent + "::" ); #else - gres( classList, QRegExp( "^" ), namespaceParent + "::" ); + gres( classList, TQRegExp( "^" ), namespaceParent + "::" ); #endif } @@ -193,7 +193,7 @@ void CppNewClassDialog::addCompletionBasenameNamespacesRecursive( const Namespac for ( ; it != namespaceList.end() ; ++it ) { - QString fullNamespace; + TQString fullNamespace; if ( ! namespaceParent.isEmpty() ) fullNamespace = namespaceParent + "::"; @@ -204,13 +204,13 @@ void CppNewClassDialog::addCompletionBasenameNamespacesRecursive( const Namespac } -void CppNewClassDialog::setCompletionNamespaceRecursive( const NamespaceDom & namespaceDom, const QString & namespaceParent ) +void CppNewClassDialog::setCompletionNamespaceRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent ) { NamespaceList namespaceList = namespaceDom->namespaceList(); NamespaceList::const_iterator it = namespaceList.begin(); for ( ; it != namespaceList.end() ; ++it ) { - QString fullNamespace; + TQString fullNamespace; if ( ! namespaceParent.isEmpty() ) fullNamespace = namespaceParent + "::"; @@ -222,20 +222,20 @@ void CppNewClassDialog::setCompletionNamespaceRecursive( const NamespaceDom & na } } -void CppNewClassDialog::nameHandlerChanged( const QString &text ) +void CppNewClassDialog::nameHandlerChanged( const TQString &text ) { DomUtil::writeEntry( *m_part->projectDom(), "/cppsupportpart/newclass/filenamesetting", text ); m_parse = text; classNameChanged( classname_edit->text() ); } -void CppNewClassDialog::classNameChanged( const QString &text ) +void CppNewClassDialog::classNameChanged( const TQString &text ) { - QString str = text; + TQString str = text; if ( !headerModified ) { - QString header = str + interface_suffix; + TQString header = str + interface_suffix; switch ( gen_config->fileCase() ) { case ClassGeneratorConfig::LowerCase: @@ -247,12 +247,12 @@ void CppNewClassDialog::classNameChanged( const QString &text ) default: ; } - header = header.replace( QRegExp( "(template *<.*> *)?(class +)?" ), "" ); + header = header.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); header_edit->setText( header ); } if ( !implementationModified ) { - QString implementation; + TQString implementation; if ( str.contains( "template" ) ) implementation = str + "_impl" + interface_suffix; else @@ -268,23 +268,23 @@ void CppNewClassDialog::classNameChanged( const QString &text ) default: ; } - implementation = implementation.replace( QRegExp( "(template *<.*> *)?(class +)?" ), "" ); + implementation = implementation.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); implementation_edit->setText( implementation ); } } -void CppNewClassDialog::classNamespaceChanged( const QString &text ) +void CppNewClassDialog::classNamespaceChanged( const TQString &text ) { - currNamespace = QStringList::split( QString( "::" ), text ); + currNamespace = TQStringList::split( TQString( "::" ), text ); setCompletionBasename( m_part -> codeModel() ); reloadAdvancedInheritance( true ); } -void CppNewClassDialog::baseclassname_changed( const QString &text ) +void CppNewClassDialog::baseclassname_changed( const TQString &text ) { if ( ( basename_edit->hasFocus() ) && ( !baseincludeModified ) ) { - QString header = text; + TQString header = text; // handle Qt classes in a special way. if( m_part->qtBuildConfig()->isUsed() && header.startsWith( "Q" ) ) @@ -295,14 +295,14 @@ void CppNewClassDialog::baseclassname_changed( const QString &text ) } else if( m_part->qtBuildConfig()->version() == 4 ) { - // 1:1, e.g QObject is #include <QObject> + // 1:1, e.g TQObject is #include <TQObject> } } else { - if ( header.contains( QRegExp( "::" ) ) ) - header = header.mid( header.findRev( QRegExp( "::" ) ) + 2 ); - header = header.replace( QRegExp( " *<.*>" ), "" ); + if ( header.contains( TQRegExp( "::" ) ) ) + header = header.mid( header.findRev( TQRegExp( "::" ) ) + 2 ); + header = header.replace( TQRegExp( " *<.*>" ), "" ); header += interface_suffix; switch ( gen_config->superCase() ) @@ -322,7 +322,7 @@ void CppNewClassDialog::baseclassname_changed( const QString &text ) } } -void CppNewClassDialog::baseIncludeChanged( const QString &text ) +void CppNewClassDialog::baseIncludeChanged( const TQString &text ) { if ( baseinclude_edit->hasFocus() ) { @@ -395,17 +395,17 @@ void CppNewClassDialog::checkQWidgetInheritance( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( "QWidget" ); + basename_edit->setText( "TQWidget" ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + - "(QWidget *parent, const char *name):\n QWidget(parent, name)\n{\n}\n"); - constructors_h_edit->append(classname_edit->text() + "(QWidget *parent, const char *name);\n");*/ + "(TQWidget *parent, const char *name):\n TQWidget(parent, name)\n{\n}\n"); + constructors_h_edit->append(classname_edit->text() + "(TQWidget *parent, const char *name);\n");*/ } if ( val && ( baseclasses_view->childCount() > 1 ) ) if ( KMessageBox::warningContinueCancel( this, - i18n( "Multiple inheritance requires QObject derivative to be first and unique in base class list." ), - i18n( "Warning" ), KStdGuiItem::cont(), "Check QWidget inheritance rules" ) == KMessageBox::Cancel ) + i18n( "Multiple inheritance requires TQObject derivative to be first and unique in base class list." ), + i18n( "Warning" ), KStdGuiItem::cont(), "Check TQWidget inheritance rules" ) == KMessageBox::Cancel ) childclass_box->setChecked( false ); } @@ -417,7 +417,7 @@ void CppNewClassDialog::qobject_box_stateChanged( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( "QObject" ); + basename_edit->setText( "TQObject" ); } @@ -451,7 +451,7 @@ void CppNewClassDialog::accept() { ClassGenerator generator( *this ); if ( generator.generate() ) - QDialog::accept(); + TQDialog::accept(); } @@ -481,12 +481,12 @@ void CppNewClassDialog::addBaseClass() baseincludeModified = false; if ( baseclasses_view->selectedItem() ) baseclasses_view->selectedItem() ->setSelected( false ); - QListViewItem* it = new QListViewItem( baseclasses_view, baseclasses_view->lastItem(), - QString::null, "public", QString( "%1" ).arg( scope_box->currentItem() ), QString::null, "false" ); + TQListViewItem* it = new TQListViewItem( baseclasses_view, baseclasses_view->lastItem(), + TQString::null, "public", TQString( "%1" ).arg( scope_box->currentItem() ), TQString::null, "false" ); setStateOfInheritanceEditors( true ); public_button->setChecked( true ); virtual_box->setChecked( false ); - basename_edit->setText( QString::null ); + basename_edit->setText( TQString::null ); basename_edit->setFocus(); baseclasses_view->setSelected( it, true ); } @@ -501,7 +501,7 @@ void CppNewClassDialog::remBaseClass() } if ( baseclasses_view->selectedItem() ) { - QListViewItem * it = baseclasses_view->selectedItem(); + TQListViewItem * it = baseclasses_view->selectedItem(); remClassFromAdv( it->text( 0 ) ); baseclasses_view->selectedItem() ->setSelected( false ); if ( it->itemBelow() ) @@ -521,7 +521,7 @@ void CppNewClassDialog::remBaseClassOnly() { if ( baseclasses_view->selectedItem() ) { - QListViewItem * it = baseclasses_view->selectedItem(); + TQListViewItem * it = baseclasses_view->selectedItem(); baseclasses_view->selectedItem() ->setSelected( false ); if ( it->itemBelow() ) baseclasses_view->setSelected( it->itemBelow(), true ); @@ -534,14 +534,14 @@ void CppNewClassDialog::remBaseClassOnly() } } -void CppNewClassDialog::remClassFromAdv( QString text ) +void CppNewClassDialog::remClassFromAdv( TQString text ) { // Strip off namespace qualification if ( text.contains( "::" ) ) text = text.mid( text.findRev( "::" ) + 2 ); removeTemplateParams( text ); - QListViewItem *it = 0; + TQListViewItem *it = 0; if ( ( it = access_view->findItem( text, 0 ) ) ) delete it; if ( ( it = methods_view->findItem( text, 0 ) ) ) @@ -562,7 +562,7 @@ void CppNewClassDialog::remClassFromAdv( QString text ) } } -void CppNewClassDialog::currBaseNameChanged( const QString &text ) +void CppNewClassDialog::currBaseNameChanged( const TQString &text ) { if ( baseclasses_view->selectedItem() && ( basename_edit->hasFocus() ) ) { @@ -584,7 +584,7 @@ void CppNewClassDialog::currBasePrivateSet() if ( baseclasses_view->selectedItem() ) { setAccessForBase( baseclasses_view->selectedItem() ->text( 0 ), "private" ); - baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + QString( "private" ) ); + baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + TQString( "private" ) ); } } @@ -593,7 +593,7 @@ void CppNewClassDialog::currBaseProtectedSet() if ( baseclasses_view->selectedItem() ) { setAccessForBase( baseclasses_view->selectedItem() ->text( 0 ), "protected" ); - baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + QString( "protected" ) ); + baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + TQString( "protected" ) ); } } @@ -602,7 +602,7 @@ void CppNewClassDialog::currBasePublicSet() if ( baseclasses_view->selectedItem() ) { setAccessForBase( baseclasses_view->selectedItem() ->text( 0 ), "public" ); - baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + QString( "public" ) ); + baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + TQString( "public" ) ); } } @@ -610,7 +610,7 @@ void CppNewClassDialog::scopeboxActivated( int value ) { if ( baseclasses_view->selectedItem() ) { - baseclasses_view->selectedItem() ->setText( 2, QString( "%1" ).arg( value ) ); + baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).arg( value ) ); } } @@ -618,14 +618,14 @@ void CppNewClassDialog::currBaseVirtualChanged( int val ) { if ( baseclasses_view->selectedItem() ) { - baseclasses_view->selectedItem() ->setText( 1, QString( val ? "virtual " : "" ) + - QString( private_button->isChecked() ? "private" : "" ) + - QString( protected_button->isChecked() ? "protected" : "" ) + - QString( public_button->isChecked() ? "public" : "" ) ); + baseclasses_view->selectedItem() ->setText( 1, TQString( val ? "virtual " : "" ) + + TQString( private_button->isChecked() ? "private" : "" ) + + TQString( protected_button->isChecked() ? "protected" : "" ) + + TQString( public_button->isChecked() ? "public" : "" ) ); } } -void CppNewClassDialog::currBaseSelected( QListViewItem *it ) +void CppNewClassDialog::currBaseSelected( TQListViewItem *it ) { if ( it == 0 ) { @@ -671,15 +671,15 @@ void CppNewClassDialog::upbaseclass_button_clicked() } if ( baseclasses_view->selectedItem() ) { - QListViewItem * it = baseclasses_view->selectedItem(); + TQListViewItem * it = baseclasses_view->selectedItem(); if ( it->itemAbove() ) { - QListViewItem * newit; + TQListViewItem * newit; if ( it->itemAbove() ->itemAbove() ) - newit = new QListViewItem( baseclasses_view, it->itemAbove() ->itemAbove(), + newit = new TQListViewItem( baseclasses_view, it->itemAbove() ->itemAbove(), it->text( 0 ), it->text( 1 ), it->text( 2 ), it->text( 3 ), it->text( 4 ) ); else - newit = new QListViewItem( baseclasses_view, it->text( 0 ), it->text( 1 ), + newit = new TQListViewItem( baseclasses_view, it->text( 0 ), it->text( 1 ), it->text( 2 ), it->text( 3 ), it->text( 4 ) ); remBaseClassOnly(); baseclasses_view->setSelected( newit, true ); @@ -701,10 +701,10 @@ void CppNewClassDialog::downbaseclass_button_clicked() } if ( baseclasses_view->selectedItem() ) { - QListViewItem * it = baseclasses_view->selectedItem(); + TQListViewItem * it = baseclasses_view->selectedItem(); if ( it->itemBelow() ) { - QListViewItem * newit = new QListViewItem( baseclasses_view, it->itemBelow(), + TQListViewItem * newit = new TQListViewItem( baseclasses_view, it->itemBelow(), it->text( 0 ), it->text( 1 ), it->text( 2 ), it->text( 3 ), it->text( 3 ) ); remBaseClassOnly(); baseclasses_view->setSelected( newit, true ); @@ -719,9 +719,9 @@ void CppNewClassDialog::downbaseclass_button_clicked() void CppNewClassDialog::updateConstructorsOrder() { - QListViewItemIterator it( baseclasses_view ); - QListViewItem *c_it; - QListViewItem *fc_it = 0; + TQListViewItemIterator it( baseclasses_view ); + TQListViewItem *c_it; + TQListViewItem *fc_it = 0; while ( it.current() ) { @@ -776,18 +776,18 @@ void CppNewClassDialog::changeToPublic() void CppNewClassDialog::changeToInherited() { if ( access_view->selectedItem() ) - access_view->selectedItem() ->setText( 2, QString::null ); + access_view->selectedItem() ->setText( 2, TQString::null ); } -void CppNewClassDialog::newTabSelected( const QString& /*text*/ ) +void CppNewClassDialog::newTabSelected( const TQString& /*text*/ ) { /* if (text == i18n("&Advanced Inheritance")) reloadAdvancedInheritance(true);*/ } -void CppNewClassDialog::newTabSelected( QWidget* /*w*/ ) +void CppNewClassDialog::newTabSelected( TQWidget* /*w*/ ) { - /* if ( QString(w->name()) == QString("tab2")) + /* if ( TQString(w->name()) == TQString("tab2")) { reloadAdvancedInheritance(false); }*/ @@ -800,7 +800,7 @@ void CppNewClassDialog::reloadAdvancedInheritance( bool clean ) clearMethodsList( clean ); clearUpgradeList( clean ); - QListViewItemIterator it( baseclasses_view ); + TQListViewItemIterator it( baseclasses_view ); while ( it.current() ) { if ( ! ( it.current() ->text( 0 ).isEmpty() ) ) @@ -811,10 +811,10 @@ void CppNewClassDialog::reloadAdvancedInheritance( bool clean ) } } -void CppNewClassDialog::parseClass( QString clName, QString inheritance ) +void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) { // Determine namespace - QStringList clNamespace = currNamespace; + TQStringList clNamespace = currNamespace; bool clFullQualified = false; if ( clName.contains( "::" ) ) @@ -822,26 +822,26 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) // Full qualified, override imported namespace clFullQualified = true; int splitpoint = clName.findRev( "::" ); - clNamespace = QStringList::split( "::", clName.left( splitpoint ) ); + clNamespace = TQStringList::split( "::", clName.left( splitpoint ) ); clName = clName.mid( splitpoint + 2 ); } kdDebug( 9007 ) << "clFullQualified = " << clFullQualified << endl; kdDebug( 9007 ) << "clName = " << clName << endl; - QString debMsg = "clNamespace = "; - for ( QStringList::const_iterator it = clNamespace.begin(); + TQString debMsg = "clNamespace = "; + for ( TQStringList::const_iterator it = clNamespace.begin(); it != clNamespace.end(); ++it ) debMsg += ( *it ) + "::"; kdDebug( 9007 ) << debMsg << endl; - QString templateAdd = templateActualParamsFormatted( clName ); + TQString templateAdd = templateActualParamsFormatted( clName ); removeTemplateParams( clName ); ClassList myClasses; // = m_part->codeModel()->globalNamespace()->classByName(clName); NamespaceDom namespaceDom = m_part->codeModel() ->globalNamespace(); - QStringList::const_iterator namespaceIt = clNamespace.begin(); + TQStringList::const_iterator namespaceIt = clNamespace.begin(); for ( ; namespaceIt != clNamespace.end(); ++namespaceIt ) { if ( ! namespaceDom -> hasNamespace( *namespaceIt ) ) @@ -869,12 +869,12 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) it->templateAddition = templateAdd; PListViewItem<ClassDom> *over = new PListViewItem<ClassDom>( *classIt, methods_view, ( *classIt ) ->name() ); over->templateAddition = templateAdd; - QListViewItem *over_methods = new QListViewItem( over, i18n( "Methods" ) ); - QListViewItem *over_slots = new QListViewItem( over, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *over_methods = new TQListViewItem( over, i18n( "Methods" ) ); + TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (Qt-specific)" ) ); PListViewItem<ClassDom> *access = new PListViewItem<ClassDom>( *classIt, access_view, ( *classIt ) ->name() ); - QListViewItem *access_methods = new QListViewItem( access, i18n( "Methods" ) ); - QListViewItem *access_slots = new QListViewItem( access, i18n( "Slots (Qt-specific)" ) ); - QListViewItem *access_attrs = new QListViewItem( access, i18n( "Attributes" ) ); + TQListViewItem *access_methods = new TQListViewItem( access, i18n( "Methods" ) ); + TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *access_attrs = new TQListViewItem( access, i18n( "Attributes" ) ); FunctionList functionList = ( *classIt ) ->functionList(); for ( FunctionList::const_iterator methodIt = functionList.begin(); @@ -894,7 +894,7 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) { addToMethodsList( over_slots, *methodIt ); - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected attributes if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -915,7 +915,7 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) addToMethodsList( over_methods, *methodIt ); // see what modifier is given for the base class - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected methods if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -936,7 +936,7 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) { if ( ( *varIt ) ->access() != CodeModelItem::Private ) { - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected attributes if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -952,14 +952,14 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) } } -bool CppNewClassDialog::isConstructor( QString className, const FunctionDom &method ) +bool CppNewClassDialog::isConstructor( TQString className, const FunctionDom &method ) { // regexp: myclass\\s*\\(\\s*(const)?\\s*myclass\\s*&[A-Za-z_0-9\\s]*\\) is for copy constructors if ( ( className == method->name() ) ) { qWarning( "1x" ); - if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).contains( QRegExp( " *(const)? *" + className + " *& *" ) ) ) ) - // if ( method->asString().contains(QRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) ) + if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).contains( TQRegExp( " *(const)? *" + className + " *& *" ) ) ) ) + // if ( method->asString().contains(TQRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) ) return false; else return true; @@ -968,34 +968,34 @@ bool CppNewClassDialog::isConstructor( QString className, const FunctionDom &met return false; } -void CppNewClassDialog::addToConstructorsList( QCheckListItem *myClass, FunctionDom method ) +void CppNewClassDialog::addToConstructorsList( TQCheckListItem *myClass, FunctionDom method ) { - new PCheckListItem<FunctionDom>( method, myClass, m_part->formatModelItem( method.data() ), QCheckListItem::RadioButton ); + new PCheckListItem<FunctionDom>( method, myClass, m_part->formatModelItem( method.data() ), TQCheckListItem::RadioButton ); } -void CppNewClassDialog::addToMethodsList( QListViewItem *parent, FunctionDom method ) +void CppNewClassDialog::addToMethodsList( TQListViewItem *parent, FunctionDom method ) { - PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ), QCheckListItem::CheckBox ); + PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); method->isAbstract() ? it->setText( 1, i18n( "replace" ) ) : it->setText( 1, i18n( "extend" ) ); } -void CppNewClassDialog::addToUpgradeList( QListViewItem *parent, FunctionDom method, QString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ) { PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ) ); it->setText( 1, modifier ); } -void CppNewClassDialog::addToUpgradeList( QListViewItem *parent, VariableDom attr, QString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ) { PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, parent, m_part->formatModelItem( attr.data() ) ); it->setText( 1, modifier ); } -void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) +void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) { // Determine namespace - QStringList clNamespace = currNamespace; + TQStringList clNamespace = currNamespace; bool clFullQualified = false; if ( clName.contains( "::" ) ) @@ -1003,7 +1003,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) // Full qualified, override imported namespace clFullQualified = true; int splitpoint = clName.findRev( "::" ); - clNamespace = QStringList::split( "::", clName.left( splitpoint ) ); + clNamespace = TQStringList::split( "::", clName.left( splitpoint ) ); clName = clName.mid( splitpoint + 2 ); } @@ -1011,7 +1011,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) kdDebug( 9007 ) << "clName = " << clName << endl; kdDebug( 9007 ) << "clNamespace = " << clNamespace.join( "." ) << endl; - QString templateAdd = templateActualParamsFormatted( clName ); + TQString templateAdd = templateActualParamsFormatted( clName ); removeTemplateParams( clName ); myModel = new CodeModel(); @@ -1028,12 +1028,12 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) it->templateAddition = templateAdd; PListViewItem<ClassDom> *over = new PListViewItem<ClassDom>( *classIt, methods_view, ( *classIt ) ->name() ); over->templateAddition = templateAdd; - QListViewItem *over_methods = new QListViewItem( over, i18n( "Methods" ) ); - QListViewItem *over_slots = new QListViewItem( over, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *over_methods = new TQListViewItem( over, i18n( "Methods" ) ); + TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (Qt-specific)" ) ); PListViewItem<ClassDom> *access = new PListViewItem<ClassDom>( *classIt, access_view, ( *classIt ) ->name() ); - QListViewItem *access_methods = new QListViewItem( access, i18n( "Methods" ) ); - QListViewItem *access_slots = new QListViewItem( access, i18n( "Slots (Qt-specific)" ) ); - QListViewItem *access_attrs = new QListViewItem( access, i18n( "Attributes" ) ); + TQListViewItem *access_methods = new TQListViewItem( access, i18n( "Methods" ) ); + TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *access_attrs = new TQListViewItem( access, i18n( "Attributes" ) ); FunctionList functionList = ( *classIt ) ->functionList(); for ( FunctionList::const_iterator methodIt = functionList.begin(); @@ -1053,7 +1053,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) { addToMethodsList( over_slots, *methodIt ); - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected attributes if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -1074,7 +1074,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) addToMethodsList( over_methods, *methodIt ); //see what modifier is given for the base class - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected methods if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -1095,7 +1095,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) { if ( ( *varIt ) ->access() != CodeModelItem::Private ) { - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected attributes if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -1113,7 +1113,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) void CppNewClassDialog::clear_selection_button_clicked() { - QListViewItemIterator it( constructors_view ); + TQListViewItemIterator it( constructors_view ); while ( it.current() ) { PCheckListItem<FunctionDom> *curr; @@ -1129,7 +1129,7 @@ void CppNewClassDialog::clearConstructorsList( bool clean ) constructors_view->clear(); /* else { - QListViewItemIterator it( constructors_view ); + TQListViewItemIterator it( constructors_view ); while ( it.current() ) { if ( ! currBaseClasses.contains(it.current().text(0)) ) @@ -1151,7 +1151,7 @@ void CppNewClassDialog::clearUpgradeList( bool clean ) access_view->clear(); } -void CppNewClassDialog::setAccessForItem( QListViewItem *curr, QString newAccess, bool isPublic ) +void CppNewClassDialog::setAccessForItem( TQListViewItem *curr, TQString newAccess, bool isPublic ) { if ( newAccess == "public" ) curr->setText( 1, isPublic ? "public" : "protected" ); @@ -1160,19 +1160,19 @@ void CppNewClassDialog::setAccessForItem( QListViewItem *curr, QString newAccess if ( !curr->text( 2 ).isEmpty() ) { if ( ( curr->text( 2 ) == "private" ) && ( ( newAccess == "public" ) || ( newAccess == "protected" ) ) ) - curr->setText( 2, QString::null ); + curr->setText( 2, TQString::null ); if ( ( curr->text( 2 ) == "protected" ) && ( ( newAccess == "public" ) && ( isPublic ) ) ) - curr->setText( 2, QString::null ); + curr->setText( 2, TQString::null ); } } -void CppNewClassDialog::setAccessForBase( QString baseclass, QString newAccess ) +void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess ) { - QListViewItem * base; + TQListViewItem * base; if ( ( base = access_view->findItem( baseclass, 0 ) ) ) { - QListViewItemIterator it( base ); + TQListViewItemIterator it( base ); while ( it.current() ) { if ( !it.current() ->text( 1 ).isEmpty() ) @@ -1190,7 +1190,7 @@ void CppNewClassDialog::setAccessForBase( QString baseclass, QString newAccess ) } -void CppNewClassDialog::access_view_mouseButtonPressed( int button, QListViewItem * item, const QPoint &p, int /*c*/ ) +void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int /*c*/ ) { if ( item && ( ( button == LeftButton ) || ( button == RightButton ) ) && ( item->depth() > 1 ) ) { @@ -1215,7 +1215,7 @@ void CppNewClassDialog::access_view_mouseButtonPressed( int button, QListViewIte } -void CppNewClassDialog::methods_view_mouseButtonPressed( int button , QListViewItem * item, const QPoint&p , int /*c*/ ) +void CppNewClassDialog::methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int /*c*/ ) { if ( item && ( button == RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) { @@ -1237,7 +1237,7 @@ void CppNewClassDialog::replaceFunctionality() void CppNewClassDialog::selectall_button_clicked() { - QListViewItemIterator it( constructors_view ); + TQListViewItemIterator it( constructors_view ); while ( it.current() ) { PCheckListItem<FunctionDom> *curr; @@ -1249,17 +1249,17 @@ void CppNewClassDialog::selectall_button_clicked() void CppNewClassDialog::to_constructors_list_clicked() { - QString templateAdd = templateStrFormatted().isEmpty() ? QString::null : templateStrFormatted() + "\n"; - QString constructor_h = classNameFormatted(); - QString constructor_cpp = templateAdd + classNameFormatted() + templateParamsFormatted() + "::" + classNameFormatted(); + TQString templateAdd = templateStrFormatted().isEmpty() ? TQString::null : templateStrFormatted() + "\n"; + TQString constructor_h = classNameFormatted(); + TQString constructor_cpp = templateAdd + classNameFormatted() + templateParamsFormatted() + "::" + classNameFormatted(); constructor_h += "("; constructor_cpp += "("; - QString params_h; - QString params_cpp; - QString base; + TQString params_h; + TQString params_cpp; + TQString base; int unnamed = 1; - QListViewItemIterator it( constructors_view ); + TQListViewItemIterator it( constructors_view ); while ( it.current() ) { PCheckListItem<FunctionDom> *curr; @@ -1278,8 +1278,8 @@ void CppNewClassDialog::to_constructors_list_clicked() params_h += params_h.isEmpty() ? "" : ", "; //fill arguments for both constructor and base class initializer - QString cparams; - QString bparams; + TQString cparams; + TQString bparams; ArgumentList argumentList = curr->item() ->argumentList(); for ( ArgumentList::const_iterator argIt = argumentList.begin(); argIt != argumentList.end(); ++argIt ) @@ -1289,8 +1289,8 @@ void CppNewClassDialog::to_constructors_list_clicked() cparams += ( *argIt ) ->type() + " "; if ( ( *argIt ) ->name().isEmpty() ) { - cparams += QString( "arg%1" ).arg( unnamed ); - bparams += QString( "arg%1" ).arg( unnamed++ ); + cparams += TQString( "arg%1" ).arg( unnamed ); + bparams += TQString( "arg%1" ).arg( unnamed++ ); } else { @@ -1308,7 +1308,7 @@ void CppNewClassDialog::to_constructors_list_clicked() ++it; } - constructor_cpp += params_cpp + ")" + base + QString( "\n{\n}\n\n\n" ); + constructor_cpp += params_cpp + ")" + base + TQString( "\n{\n}\n\n\n" ); constructor_h += params_h + ");\n\n"; constructors_h_edit->append( constructor_h ); @@ -1333,14 +1333,14 @@ void CppNewClassDialog::to_constructors_list_clicked() bool CppNewClassDialog::ClassGenerator::validateInput() { className = dlg.classname_edit->text().simplifyWhiteSpace(); - QString temp = className; - className.replace( QRegExp( "template *<.*> *(class *)?" ), "" ); - templateStr = temp.replace( QRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( QRegExp( " *class *$" ), "" ); + TQString temp = className; + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); templateParams = templateStr; - templateParams.replace( QRegExp( "^ *template *" ), "" ); - templateParams.replace( QRegExp( " *class *" ), "" ); + templateParams.replace( TQRegExp( "^ *template *" ), "" ); + templateParams.replace( TQRegExp( " *class *" ), "" ); templateParams.simplifyWhiteSpace(); if ( className.isEmpty() ) @@ -1384,13 +1384,13 @@ bool CppNewClassDialog::ClassGenerator::generate() subDir = project->projectDirectory() + "/"; if ( !project->activeDirectory().isEmpty() ){ subDir += project->activeDirectory(); - subDir = QDir::cleanDirPath(subDir); + subDir = TQDir::cleanDirPath(subDir); subDir += "/"; } headerPath = subDir + header; implementationPath = subDir + implementation; - if ( QFileInfo( headerPath ).exists() || QFileInfo( implementationPath ).exists() ) + if ( TQFileInfo( headerPath ).exists() || TQFileInfo( implementationPath ).exists() ) { KMessageBox::error( &dlg, i18n( "KDevelop is not able to add classes " "to existing header or implementation files." ) ); @@ -1399,12 +1399,12 @@ bool CppNewClassDialog::ClassGenerator::generate() if( ( dlg.m_part->project() ->options() & KDevProject::UsesQMakeBuildSystem) ) { - QDir dir( QFileInfo( project->projectDirectory()+QString( QChar( QDir::separator() ) )+project->activeDirectory() + QString( QChar( QDir::separator() ) ) + header ).dirPath() ); + TQDir dir( TQFileInfo( project->projectDirectory()+TQString( TQChar( TQDir::separator() ) )+project->activeDirectory() + TQString( TQChar( TQDir::separator() ) ) + header ).dirPath() ); kdDebug(9024) << "Dir for new file:" << dir.absPath() << endl; if( dir.isRelative() ) dir.convertToAbs(); - QValueStack<QString> dirsToCreate; + TQValueStack<TQString> dirsToCreate; while( !dir.exists() ) { dirsToCreate.push( dir.dirName() ); @@ -1423,8 +1423,8 @@ bool CppNewClassDialog::ClassGenerator::generate() gen_interface(); - QStringList fileList; - QString file; + TQStringList fileList; + TQString file; if( project->activeDirectory().isEmpty() ) file = header; else @@ -1449,7 +1449,7 @@ void CppNewClassDialog::ClassGenerator::common_text() // common namespaceStr = dlg.namespace_edit->text(); - namespaces = QStringList::split( QString( "::" ), namespaceStr ); + namespaces = TQStringList::split( TQString( "::" ), namespaceStr ); childClass = dlg.childclass_box->isChecked(); objc = dlg.objc_box->isChecked(); @@ -1458,25 +1458,25 @@ void CppNewClassDialog::ClassGenerator::common_text() headeronly = dlg.headeronly_box->isChecked(); if ( ( dlg.baseclasses_view->childCount() == 0 ) && childClass ) - new QListViewItem( dlg.baseclasses_view, "QWidget", "public" ); + new TQListViewItem( dlg.baseclasses_view, "TQWidget", "public" ); if ( objc && ( dlg.baseclasses_view->childCount() == 0 ) ) - new QListViewItem( dlg.baseclasses_view, "NSObject", "public" ); + new TQListViewItem( dlg.baseclasses_view, "NSObject", "public" ); if ( dlg.documentation_edit->text().isEmpty() && ( !dlg.gen_config->doc_box->isChecked() ) ) doc = ""; else { - doc = QString( "/**\n" ); + doc = TQString( "/**\n" ); if ( !dlg.documentation_edit->text().isEmpty() ) { doc.append( dlg.documentation_edit->text() ); if ( dlg.gen_config->author_box->isChecked() ) doc.append( "\n\n" ); } - QString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); - QString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); + TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); + TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); if( !email.isEmpty() ) - author += QString( " <%1>" ).arg( email ); + author += TQString( " <%1>" ).arg( email ); if ( dlg.gen_config->author_box->isChecked() ) doc.append( "\t@author " + author + "\n" ); @@ -1485,7 +1485,7 @@ void CppNewClassDialog::ClassGenerator::common_text() if ( !namespaceStr.isEmpty() ) { - for ( QStringList::Iterator it = namespaces.begin(); it != namespaces.end(); ++it ) + for ( TQStringList::Iterator it = namespaces.begin(); it != namespaces.end(); ++it ) { if ( !namespaceBeg.isEmpty() ) namespaceBeg += "\n\n"; @@ -1498,31 +1498,31 @@ void CppNewClassDialog::ClassGenerator::common_text() //advanced constructor creation - advConstructorsHeader = QString::null; - advConstructorsSource = QString::null; + advConstructorsHeader = TQString::null; + advConstructorsSource = TQString::null; if ( !dlg.constructors_h_edit->text().isEmpty() ) { advConstructorsHeader = " " + dlg.constructors_h_edit->text(); - advConstructorsHeader.replace( QRegExp( "\n" ), "\n " ); + advConstructorsHeader.replace( TQRegExp( "\n" ), "\n " ); } if ( !dlg.constructors_cpp_edit->text().isEmpty() ) { advConstructorsSource = dlg.constructors_cpp_edit->text(); } - advConstructorsHeader.replace( QRegExp( "[\\n ]*$" ), QString::null ); - advConstructorsSource.replace( QRegExp( "[\\n ]*$" ), QString::null ); + advConstructorsHeader.replace( TQRegExp( "[\\n ]*$" ), TQString::null ); + advConstructorsSource.replace( TQRegExp( "[\\n ]*$" ), TQString::null ); //advanced method overriding - advH_public = QString::null; - advH_public_slots = QString::null; - advH_protected = QString::null; - advH_protected_slots = QString::null; - advH_private = QString::null; - advH_private_slots = QString::null; - advCpp = QString::null; + advH_public = TQString::null; + advH_public_slots = TQString::null; + advH_protected = TQString::null; + advH_protected_slots = TQString::null; + advH_private = TQString::null; + advH_private_slots = TQString::null; + advCpp = TQString::null; - QListViewItemIterator it( dlg.methods_view ); + TQListViewItemIterator it( dlg.methods_view ); while ( it.current() ) { PCheckListItem<FunctionDom> *curr; @@ -1530,7 +1530,7 @@ void CppNewClassDialog::ClassGenerator::common_text() { if ( curr->isOn() && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { - QString * adv_h = 0; + TQString * adv_h = 0; if ( curr->item() ->access() == CodeModelItem::Private ) adv_h = curr->item() ->isSlot() ? &advH_private_slots : &advH_private; if ( curr->item() ->access() == CodeModelItem::Protected ) @@ -1540,7 +1540,7 @@ void CppNewClassDialog::ClassGenerator::common_text() // if (advCpp.isEmpty()) advCpp += "\n\n"; - QString bcName = curr->parent() ->parent() ->text( 0 ); + TQString bcName = curr->parent() ->parent() ->text( 0 ); PListViewItem<ClassDom> *bc; if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->parent() ->parent() ) ) ) { @@ -1554,7 +1554,7 @@ void CppNewClassDialog::ClassGenerator::common_text() } //advanced access control and upgrading - QListViewItemIterator ita( dlg.access_view ); + TQListViewItemIterator ita( dlg.access_view ); while ( ita.current() ) { PListViewItem<VariableDom> *curr; @@ -1563,7 +1563,7 @@ void CppNewClassDialog::ClassGenerator::common_text() { if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { - QString * adv_h = 0; + TQString * adv_h = 0; if ( curr->text( 2 ) == "private" ) adv_h = &advH_private; if ( curr->text( 2 ) == "public" ) @@ -1574,14 +1574,14 @@ void CppNewClassDialog::ClassGenerator::common_text() /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ if ( adv_h ) - *adv_h += QString( " using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; + *adv_h += TQString( " using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; } } else if ( ( curr_m = dynamic_cast<PListViewItem<FunctionDom>* >( ita.current() ) ) ) { if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->parent() ) && ( curr_m->parent() ->parent() ) ) { - QString * adv_h = 0; + TQString * adv_h = 0; if ( curr_m->text( 2 ) == "private" ) adv_h = &advH_private; if ( curr_m->text( 2 ) == "public" ) @@ -1592,8 +1592,8 @@ void CppNewClassDialog::ClassGenerator::common_text() /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ - QString methodName = curr_m->item() ->name(); - if ( !methodName.contains( QRegExp( "^[a-zA-z_]" ) ) ) + TQString methodName = curr_m->item() ->name(); + if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; *adv_h += " using " + curr_m->parent() ->parent() ->text( 0 ) + "::" + methodName + ";\n"; } @@ -1601,33 +1601,33 @@ void CppNewClassDialog::ClassGenerator::common_text() ++ita; } - QRegExp e( "[\\n ]*$" ); - advH_public.replace( e, QString::null ); - advH_public_slots.replace( e, QString::null ); - advH_protected.replace( e, QString::null ); - advH_protected_slots.replace( e, QString::null ); - advH_private.replace( e, QString::null ); - advH_private_slots.replace( e, QString::null ); - advCpp.replace( e, QString::null ); + TQRegExp e( "[\\n ]*$" ); + advH_public.replace( e, TQString::null ); + advH_public_slots.replace( e, TQString::null ); + advH_protected.replace( e, TQString::null ); + advH_protected_slots.replace( e, TQString::null ); + advH_private.replace( e, TQString::null ); + advH_private_slots.replace( e, TQString::null ); + advCpp.replace( e, TQString::null ); } void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method, - QString className, QString templateStr, QString *adv_h, QString *adv_cpp, bool extend, QString baseClassName ) + TQString className, TQString templateStr, TQString *adv_h, TQString *adv_cpp, bool extend, TQString baseClassName ) { /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ - QString methodName = method->name(); - if ( !methodName.contains( QRegExp( "^[a-zA-z_]" ) ) ) + TQString methodName = method->name(); + if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; - *adv_h += " " + ( method->isVirtual() ? QString( "virtual " ) : QString( "" ) ) - + ( method->isStatic() ? QString( "static " ) : QString( "" ) ) + *adv_h += " " + ( method->isVirtual() ? TQString( "virtual " ) : TQString( "" ) ) + + ( method->isStatic() ? TQString( "static " ) : TQString( "" ) ) + method->resultType() + " " + methodName + "("; if ( !templateStr.isEmpty() ) * adv_cpp += templateStr + "\n"; *adv_cpp += method->resultType() + " " + className + templateParams + "::" + methodName + "("; - QString bparams; - QString cparams; + TQString bparams; + TQString cparams; int unnamed = 1; ArgumentList argumentList = method->argumentList(); @@ -1639,8 +1639,8 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method cparams += ( *argIt ) ->type() + " "; if ( ( *argIt ) ->name().isEmpty() ) { - cparams += QString( "arg%1" ).arg( unnamed ); - bparams += QString( "arg%1" ).arg( unnamed++ ); + cparams += TQString( "arg%1" ).arg( unnamed ); + bparams += TQString( "arg%1" ).arg( unnamed++ ); } else { @@ -1664,22 +1664,22 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() // implementation - QString classImpl; - QFileInfo fi( implementationPath ); - QString module = fi.baseName(); - QString basefilename = fi.baseName( true ); + TQString classImpl; + TQFileInfo fi( implementationPath ); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName( true ); if ( dlg.filetemplate_box->isChecked() ) { - /* QDomDocument dom = *dlg.m_part->projectDom(); + /* TQDomDocument dom = *dlg.m_part->projectDom(); if(DomUtil::readBoolEntry(dom,"/cppsupportpart/filetemplates/choosefiles",false)) classImpl = FileTemplate::read(dlg.m_part, DomUtil::readEntry(dom,"/cppsupportpart/filetemplates/implementationURL",""), FileTemplate::Custom); else*/ classImpl = FileTemplate::read( dlg.m_part, fi.extension( true ) ); } - classImpl.replace( QRegExp( "\\$MODULE\\$" ), module ); - classImpl.replace( QRegExp( "\\$FILENAME\\$" ), basefilename ); + classImpl.replace( TQRegExp( "\\$MODULE\\$" ), module ); + classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); if ( objc ) { @@ -1692,16 +1692,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() else { classImpl += dlg.gen_config->cppSource(); - /* classImpl += QString( + /* classImpl += TQString( "#include \"$HEADER$\"\n" "\n" "\n") + namespaceBeg - + ( advConstructorsSource.isEmpty() ? QString("$CLASSNAME$::$CLASSNAME$($ARGS$)\n" + + ( advConstructorsSource.isEmpty() ? TQString("$CLASSNAME$::$CLASSNAME$($ARGS$)\n" "$BASEINITIALIZER$" "{\n" "}\n") : advConstructorsSource ) - + QString("\n" + + TQString("\n" "$CLASSNAME$::~$CLASSNAME$()\n" "{\n" "}\n") @@ -1709,15 +1709,15 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() + namespaceEnd;*/ } - QString relPath; + TQString relPath; for ( int i = implementation.findRev( '/' ); i != -1; i = implementation.findRev( '/', --i ) ) relPath += "../"; - QString constructors = ( advConstructorsSource.isEmpty() ? QString( "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::$CLASSNAME$($ARGS$)\n" + TQString constructors = ( advConstructorsSource.isEmpty() ? TQString( "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::$CLASSNAME$($ARGS$)\n" "$BASEINITIALIZER$" "{\n" "}" ) : advConstructorsSource ) - + QString( "\n\n\n" + + TQString( "\n\n\n" "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::~$CLASSNAME$()\n" "{\n" "}\n" ); @@ -1728,26 +1728,26 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "QWidget *parent = 0, const char *name = 0"; - argsCpp = "QWidget *parent, const char *name"; + argsH = "TQWidget *parent = 0, const char *name = 0"; + argsCpp = "TQWidget *parent, const char *name"; } else { - argsH = "QWidget *parent = 0"; - argsCpp = "QWidget *parent"; + argsH = "TQWidget *parent = 0"; + argsCpp = "TQWidget *parent"; } } else if ( qobject ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "QObject *parent = 0, const char *name = 0"; - argsCpp = "QObject *parent, const char *name"; + argsH = "TQObject *parent = 0, const char *name = 0"; + argsCpp = "TQObject *parent, const char *name"; } else { - argsH = "QObject *parent = 0"; - argsCpp = "QObject *parent"; + argsH = "TQObject *parent = 0"; + argsCpp = "TQObject *parent"; } } else @@ -1755,25 +1755,25 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() argsH = ""; argsCpp = ""; } - QString baseInitializer; + TQString baseInitializer; if ( childClass && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : QWidget(parent, name)"; + baseInitializer = " : TQWidget(parent, name)"; else - baseInitializer = " : QWidget(parent)"; + baseInitializer = " : TQWidget(parent)"; } else if ( qobject && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : QObject(parent, name)"; + baseInitializer = " : TQObject(parent, name)"; else - baseInitializer = " : QObject(parent)"; + baseInitializer = " : TQObject(parent)"; } else if ( dlg.baseclasses_view->childCount() != 0 ) { - QListViewItemIterator it( dlg.baseclasses_view ); + TQListViewItemIterator it( dlg.baseclasses_view ); baseInitializer += " : "; while ( it.current() ) { @@ -1808,41 +1808,41 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() baseInitializer += "\n"; } - constructors.replace( QRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer ); - constructors.replace( QRegExp( "\\$CLASSNAME\\$" ), className ); + constructors.replace( TQRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer ); + constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); if ( templateStr.isEmpty() ) { - constructors.replace( QRegExp( "\\$TEMPLATESTR\\$\\n" ), "" ); - constructors.replace( QRegExp( "\\$TEMPLATEPARAMS\\$" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$\\n" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), "" ); } else { - constructors.replace( QRegExp( "\\$TEMPLATESTR\\$" ), templateStr ); - constructors.replace( QRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams ); - classImpl.replace( QRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$" ), templateStr ); + constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams ); + classImpl.replace( TQRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" ); } // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); - constructors.replace( QRegExp( "\\$ARGS\\$" ), argsCpp ); + constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsCpp ); // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); //remove unnesessary carriadge returns - QString hp = relPath + header; + TQString hp = relPath + header; beautifySource( classImpl, hp, className, namespaceBeg, constructors, advCpp, namespaceEnd, implementation ); - classImpl.replace( QRegExp( "\\$HEADER\\$" ), relPath + header ); - classImpl.replace( QRegExp( "\\$CLASSNAME\\$" ), className ); - classImpl.replace( QRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); - classImpl.replace( QRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors ); - classImpl.replace( QRegExp( "\\$DEFINITIONS\\$" ), advCpp ); - classImpl.replace( QRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); - classImpl.replace( QRegExp( "\\$FILENAME\\$" ), implementation ); + classImpl.replace( TQRegExp( "\\$HEADER\\$" ), relPath + header ); + classImpl.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + classImpl.replace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); + classImpl.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors ); + classImpl.replace( TQRegExp( "\\$DEFINITIONS\\$" ), advCpp ); + classImpl.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); + classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), implementation ); if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) ) { - QString moc = header; - moc.replace( QRegExp( "\\..*" ), ".moc" ); + TQString moc = header; + moc.replace( TQRegExp( "\\..*" ), ".moc" ); classImpl += "#include \"" + moc + "\"\n"; } @@ -1855,13 +1855,13 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() kdDebug( 9007 ) << "implementationPath = " << implementationPath << endl; - QFile ifile( implementationPath ); + TQFile ifile( implementationPath ); if ( !ifile.open( IO_WriteOnly ) ) { KMessageBox::error( &dlg, i18n( "Cannot write to implementation file" ) ); return ; } - QTextStream istream( &ifile ); + TQTextStream istream( &ifile ); istream << classImpl; ifile.close(); @@ -1875,22 +1875,22 @@ void CppNewClassDialog::ClassGenerator::gen_interface() { // interface - QString classIntf; - QFileInfo fi( headerPath ); - QString module = fi.baseName(); - QString basefilename = fi.baseName( true ); + TQString classIntf; + TQFileInfo fi( headerPath ); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName( true ); if ( dlg.filetemplate_box->isChecked() ) { - /* QDomDocument dom = *dlg.m_part->projectDom(); + /* TQDomDocument dom = *dlg.m_part->projectDom(); if(DomUtil::readBoolEntry(dom,"/cppsupportpart/filetemplates/choosefiles",false)) classIntf = FileTemplate::read(dlg.m_part, DomUtil::readEntry(dom,"/cppsupportpart/filetemplates/interfaceURL",""), FileTemplate::Custom); else*/ classIntf = FileTemplate::read( dlg.m_part, fi.extension( true ) ); } - classIntf.replace( QRegExp( "\\$MODULE\\$" ), module ); - classIntf.replace( QRegExp( "\\$FILENAME\\$" ), basefilename ); + classIntf.replace( TQRegExp( "\\$MODULE\\$" ), module ); + classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); if ( objc ) { @@ -1903,32 +1903,32 @@ void CppNewClassDialog::ClassGenerator::gen_interface() else { classIntf += dlg.gen_config->cppHeader(); - /* classIntf = QString("\n" + /* classIntf = TQString("\n" "#ifndef $HEADERGUARD$\n" "#define $HEADERGUARD$\n" "\n" "$INCLUDEBASEHEADER$\n" "\n") + namespaceBeg - + QString("class $CLASSNAME$$INHERITANCE$\n" + + TQString("class $CLASSNAME$$INHERITANCE$\n" "{\n" "$QOBJECT$" "public:\n") - + ( advConstructorsHeader.isEmpty() ? QString(" $CLASSNAME$($ARGS$);\n") : advConstructorsHeader ) - + QString("\n ~$CLASSNAME$();\n") + + ( advConstructorsHeader.isEmpty() ? TQString(" $CLASSNAME$($ARGS$);\n") : advConstructorsHeader ) + + TQString("\n ~$CLASSNAME$();\n") + advH_public - + (advH_public_slots.isEmpty() ? QString::fromLatin1("") : ("\n\npublic slots:" + advH_public_slots)) - + (advH_protected.isEmpty() ? QString::fromLatin1("") : ("\n\nprotected:" + advH_protected)) - + (advH_protected_slots.isEmpty() ? QString::fromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots)) - + (advH_private.isEmpty() ? QString::fromLatin1("") : ("\n\nprivate:" + advH_private)) - + (advH_private_slots.isEmpty() ? QString::fromLatin1("") : ("\n\nprivate slots:" + advH_private_slots)) - + QString("};\n" + + (advH_public_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\npublic slots:" + advH_public_slots)) + + (advH_protected.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected:" + advH_protected)) + + (advH_protected_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots)) + + (advH_private.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate:" + advH_private)) + + (advH_private_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate slots:" + advH_private_slots)) + + TQString("};\n" "\n") + namespaceEnd + "#endif\n";*/ } - QString headerGuard; + TQString headerGuard; switch ( dlg.gen_config->defCase() ) { case ClassGeneratorConfig::UpperCase: @@ -1945,24 +1945,24 @@ void CppNewClassDialog::ClassGenerator::gen_interface() break; } - headerGuard.replace( QRegExp( "\\." ), "_" ); - headerGuard.replace( QRegExp( "::" ), "_" ); - QString includeBaseHeader; + headerGuard.replace( TQRegExp( "\\." ), "_" ); + headerGuard.replace( TQRegExp( "::" ), "_" ); + TQString includeBaseHeader; if( dlg.m_part->qtBuildConfig()->isUsed() ) { if( childClass && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - includeBaseHeader = "#include <qwidget.h>"; + includeBaseHeader = "#include <tqwidget.h>"; else - includeBaseHeader = "#include <QWidget>"; + includeBaseHeader = "#include <TQWidget>"; } else if( qobject && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - includeBaseHeader = "#include <qobject.h>"; + includeBaseHeader = "#include <tqobject.h>"; else - includeBaseHeader = "#include <QObject>"; + includeBaseHeader = "#include <TQObject>"; } } @@ -1972,37 +1972,37 @@ void CppNewClassDialog::ClassGenerator::gen_interface() if ( dlg.baseclasses_view->firstChild() ->text( 0 ) != "NSObject" ) if ( !dlg.baseclasses_view->firstChild() ->text( 3 ).isEmpty() ) includeBaseHeader = "#include " - + ( dlg.baseclasses_view->firstChild() ->text( 2 ).toInt() == 0 ? QString( "<" ) : QString( "\"" ) ) + + ( dlg.baseclasses_view->firstChild() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) ) + dlg.baseclasses_view->firstChild() ->text( 3 ) - + ( dlg.baseclasses_view->firstChild() ->text( 2 ).toInt() == 0 ? QString( ">" ) : QString( "\"" ) ); + + ( dlg.baseclasses_view->firstChild() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) ); } else { - QListViewItemIterator it( dlg.baseclasses_view ); + TQListViewItemIterator it( dlg.baseclasses_view ); while ( it.current() ) { if ( !it.current() ->text( 0 ).isEmpty() ) if ( !it.current() ->text( 3 ).isEmpty() ) - // if ((!childClass) || (it.current()->text(0) != "QWidget")) - includeBaseHeader += ( includeBaseHeader.isEmpty() ? QString( "" ) : QString( "\n" ) ) + QString::fromLatin1( "#include " ) + - ( it.current() ->text( 2 ).toInt() == 0 ? QString( "<" ) : QString( "\"" ) ) + // if ((!childClass) || (it.current()->text(0) != "TQWidget")) + includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) + + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) ) + it.current() ->text( 3 ) - + ( it.current() ->text( 2 ).toInt() == 0 ? QString( ">" ) : QString( "\"" ) ); + + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) ); ++it; } } - QString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); - QString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); + TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); + TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); if( !email.isEmpty() ) - author += QString( " <%1>" ).arg( email ); + author += TQString( " <%1>" ).arg( email ); - QString inheritance; + TQString inheritance; if ( dlg.baseclasses_view->childCount() > 0 ) { inheritance += " : "; - QListViewItemIterator it( dlg.baseclasses_view ); + TQListViewItemIterator it( dlg.baseclasses_view ); while ( it.current() ) { if ( !it.current() ->text( 0 ).isEmpty() ) @@ -2023,21 +2023,21 @@ void CppNewClassDialog::ClassGenerator::gen_interface() } } else if ( qobject ) - inheritance += ": public QObject"; + inheritance += ": public TQObject"; - QString constructors = QString( advConstructorsHeader.isEmpty() ? - QString( " $CLASSNAME$($ARGS$);" ) : advConstructorsHeader ) - + QString( "\n\n ~$CLASSNAME$();" ); + TQString constructors = TQString( advConstructorsHeader.isEmpty() ? + TQString( " $CLASSNAME$($ARGS$);" ) : advConstructorsHeader ) + + TQString( "\n\n ~$CLASSNAME$();" ); - constructors.replace( QRegExp( "\\$CLASSNAME\\$" ), className ); - constructors.replace( QRegExp( "\\$ARGS\\$" ), argsH ); + constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsH ); - QString qobjectStr; + TQString qobjectStr; if ( childClass || qobject ) qobjectStr = "Q_OBJECT"; - QString baseclass; + TQString baseclass; if ( dlg.baseclasses_view->childCount() > 0 ) baseclass = dlg.baseclasses_view->firstChild() ->text( 0 ); //remove unnesessary carriadge returns @@ -2047,30 +2047,30 @@ void CppNewClassDialog::ClassGenerator::gen_interface() advH_protected, advH_protected_slots, advH_private, advH_private_slots, namespaceEnd ); - classIntf.replace( QRegExp( "\\$HEADERGUARD\\$" ), headerGuard ); - classIntf.replace( QRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader ); - classIntf.replace( QRegExp( "\\$AUTHOR\\$" ), author ); - classIntf.replace( QRegExp( "\\$DOC\\$" ), doc ); - classIntf.replace( QRegExp( "\\$TEMPLATE\\$" ), templateStr ); - classIntf.replace( QRegExp( "\\$CLASSNAME\\$" ), className ); + classIntf.replace( TQRegExp( "\\$HEADERGUARD\\$" ), headerGuard ); + classIntf.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader ); + classIntf.replace( TQRegExp( "\\$AUTHOR\\$" ), author ); + classIntf.replace( TQRegExp( "\\$DOC\\$" ), doc ); + classIntf.replace( TQRegExp( "\\$TEMPLATE\\$" ), templateStr ); + classIntf.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); if ( dlg.baseclasses_view->childCount() > 0 ) - classIntf.replace( QRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) ); - classIntf.replace( QRegExp( "\\$INHERITANCE\\$" ), inheritance ); - classIntf.replace( QRegExp( "\\$QOBJECT\\$" ), qobjectStr ); - classIntf.replace( QRegExp( "\\$ARGS\\$" ), argsH ); - classIntf.replace( QRegExp( "\\$FILENAME\\$" ), header ); - classIntf.replace( QRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); - classIntf.replace( QRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors ); - classIntf.replace( QRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public ); - classIntf.replace( QRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots ); - classIntf.replace( QRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), QString( "protected:\n" ) + advH_protected ); - classIntf.replace( QRegExp( "\\$PROTECTEDSLOTS\\$" ), QString( "protected slots:\n" ) + advH_protected_slots ); - classIntf.replace( QRegExp( "\\$PRIVATEDECLARATIONS\\$" ), QString( "private:\n" ) + advH_private ); - classIntf.replace( QRegExp( "\\$PRIVATESLOTS\\$" ), QString( "private slots:\n" ) + advH_private_slots ); - classIntf.replace( QRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); + classIntf.replace( TQRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) ); + classIntf.replace( TQRegExp( "\\$INHERITANCE\\$" ), inheritance ); + classIntf.replace( TQRegExp( "\\$QOBJECT\\$" ), qobjectStr ); + classIntf.replace( TQRegExp( "\\$ARGS\\$" ), argsH ); + classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), header ); + classIntf.replace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); + classIntf.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors ); + classIntf.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public ); + classIntf.replace( TQRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots ); + classIntf.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), TQString( "protected:\n" ) + advH_protected ); + classIntf.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$" ), TQString( "protected slots:\n" ) + advH_protected_slots ); + classIntf.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$" ), TQString( "private:\n" ) + advH_private ); + classIntf.replace( TQRegExp( "\\$PRIVATESLOTS\\$" ), TQString( "private slots:\n" ) + advH_private_slots ); + classIntf.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); if ( !templateStr.isEmpty() && (!headeronly) ) - classIntf.replace( QRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" ); + classIntf.replace( TQRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" ); if ( dlg.gen_config->reformat_box->isChecked() ) { @@ -2079,13 +2079,13 @@ void CppNewClassDialog::ClassGenerator::gen_interface() classIntf = fmt->formatSource( classIntf ); } - QFile hfile( headerPath ); + TQFile hfile( headerPath ); if ( !hfile.open( IO_WriteOnly ) ) { KMessageBox::error( &dlg, i18n( "Cannot write to header file" ) ); return ; } - QTextStream hstream( &hfile ); + TQTextStream hstream( &hfile ); hstream << classIntf; hfile.close(); @@ -2094,140 +2094,140 @@ void CppNewClassDialog::ClassGenerator::gen_interface() dlg.m_part->partController()->editDocument( u ); } -void CppNewClassDialog::ClassGenerator::beautifyHeader( QString &templ, QString &headerGuard, - QString &includeBaseHeader, QString &author, QString &doc, QString &className, QString &templateStr, - QString &baseclass, QString &inheritance, QString &qobjectStr, QString &args, - QString &header, QString &namespaceBeg, QString &constructors, QString &advH_public, QString &advH_public_slots, - QString &advH_protected, QString &advH_protected_slots, QString &advH_private, QString &advH_private_slots, - QString &namespaceEnd ) +void CppNewClassDialog::ClassGenerator::beautifyHeader( TQString &templ, TQString &headerGuard, + TQString &includeBaseHeader, TQString &author, TQString &doc, TQString &className, TQString &templateStr, + TQString &baseclass, TQString &inheritance, TQString &qobjectStr, TQString &args, + TQString &header, TQString &namespaceBeg, TQString &constructors, TQString &advH_public, TQString &advH_public_slots, + TQString &advH_protected, TQString &advH_protected_slots, TQString &advH_private, TQString &advH_private_slots, + TQString &namespaceEnd ) { if ( headerGuard.isEmpty() ) - templ.replace( QRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), TQString::null ); if ( includeBaseHeader.isEmpty() ) - templ.replace( QRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), TQString::null ); if ( author.isEmpty() ) - templ.replace( QRegExp( "\\$AUTHOR\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$AUTHOR\\$[\\n ]*" ), TQString::null ); if ( doc.isEmpty() ) - templ.replace( QRegExp( "\\$DOC\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$DOC\\$[\\n ]*" ), TQString::null ); if ( className.isEmpty() ) - templ.replace( QRegExp( "\\$CLASSNAME\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString::null ); if ( templateStr.isEmpty() ) - templ.replace( QRegExp( "\\$TEMPLATE\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$TEMPLATE\\$[\\n ]*" ), TQString::null ); if ( baseclass.isEmpty() ) - templ.replace( QRegExp( "\\$BASECLASS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$BASECLASS\\$[\\n ]*" ), TQString::null ); if ( inheritance.isEmpty() ) - templ.replace( QRegExp( "\\$INHERITANCE\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$INHERITANCE\\$[\\n ]*" ), TQString::null ); if ( qobjectStr.isEmpty() ) - templ.replace( QRegExp( "\\$QOBJECT\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$QOBJECT\\$[\\n ]*" ), TQString::null ); if ( args.isEmpty() ) - templ.replace( QRegExp( "\\$ARGS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$ARGS\\$[\\n ]*" ), TQString::null ); if ( header.isEmpty() ) - templ.replace( QRegExp( "\\$FILENAME\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString::null ); if ( namespaceBeg.isEmpty() ) - templ.replace( QRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString::null ); if ( constructors.isEmpty() ) - templ.replace( QRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), TQString::null ); if ( advH_public.isEmpty() ) - templ.replace( QRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), TQString::null ); if ( advH_public_slots.isEmpty() ) - templ.replace( QRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), TQString::null ); if ( advH_protected.isEmpty() ) - templ.replace( QRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), TQString::null ); if ( advH_protected_slots.isEmpty() ) - templ.replace( QRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), TQString::null ); if ( advH_private.isEmpty() ) - templ.replace( QRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), TQString::null ); if ( advH_private_slots.isEmpty() ) - templ.replace( QRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), TQString::null ); if ( namespaceEnd.isEmpty() ) - templ.replace( QRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString::null ); } -void CppNewClassDialog::ClassGenerator::beautifySource( QString &templ, QString &header, QString &className, QString &namespaceBeg, - QString &constructors, QString &advCpp, QString &namespaceEnd, QString &implementation ) +void CppNewClassDialog::ClassGenerator::beautifySource( TQString &templ, TQString &header, TQString &className, TQString &namespaceBeg, + TQString &constructors, TQString &advCpp, TQString &namespaceEnd, TQString &implementation ) { if ( header.isEmpty() ) - templ.replace( QRegExp( "\\$HEADER\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$HEADER\\$[\\n ]*" ), TQString::null ); if ( className.isEmpty() ) - templ.replace( QRegExp( "\\$CLASSNAME\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString::null ); if ( namespaceBeg.isEmpty() ) - templ.replace( QRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString::null ); if ( constructors.isEmpty() ) - templ.replace( QRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), TQString::null ); if ( advCpp.isEmpty() ) - templ.replace( QRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), TQString::null ); if ( namespaceEnd.isEmpty() ) - templ.replace( QRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString::null ); if ( implementation.isEmpty() ) - templ.replace( QRegExp( "\\$FILENAME\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString::null ); } -QString CppNewClassDialog::classNameFormatted( ) +TQString CppNewClassDialog::classNameFormatted( ) { return classNameFormatted( classname_edit->text() ); } -QString CppNewClassDialog::classNameFormatted( const QString &name ) +TQString CppNewClassDialog::classNameFormatted( const TQString &name ) { - QString temp = name.simplifyWhiteSpace(); - return temp.replace( QRegExp( "template *<.*> *(class *)?" ), "" ); + TQString temp = name.simplifyWhiteSpace(); + return temp.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); } -QString CppNewClassDialog::templateStrFormatted( ) +TQString CppNewClassDialog::templateStrFormatted( ) { return templateStrFormatted( classname_edit->text() ); } -QString CppNewClassDialog::templateStrFormatted( const QString &name ) +TQString CppNewClassDialog::templateStrFormatted( const TQString &name ) { - QString className = name.simplifyWhiteSpace(); - QString temp = className; - className.replace( QRegExp( "template *<.*> *(class *)?" ), "" ); - QString templateStr = temp.replace( QRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( QRegExp( " *class *$" ), "" ); + TQString className = name.simplifyWhiteSpace(); + TQString temp = className; + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); return templateStr; } -QString CppNewClassDialog::templateParamsFormatted( ) +TQString CppNewClassDialog::templateParamsFormatted( ) { return templateParamsFormatted( classname_edit->text() ); } -QString CppNewClassDialog::templateParamsFormatted( const QString &name ) +TQString CppNewClassDialog::templateParamsFormatted( const TQString &name ) { - QString className = name.simplifyWhiteSpace(); - QString temp = className; - className.replace( QRegExp( "template *<.*> *(class *)?" ), "" ); - QString templateStr = temp.replace( QRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( QRegExp( " *class *$" ), "" ); + TQString className = name.simplifyWhiteSpace(); + TQString temp = className; + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); - QString templateParams = templateStr; - templateParams.replace( QRegExp( "^ *template *" ), "" ); - templateParams.replace( QRegExp( " *class *" ), "" ); + TQString templateParams = templateStr; + templateParams.replace( TQRegExp( "^ *template *" ), "" ); + templateParams.replace( TQRegExp( " *class *" ), "" ); templateParams.simplifyWhiteSpace(); return templateParams; } -QString CppNewClassDialog::templateActualParamsFormatted( const QString & name ) +TQString CppNewClassDialog::templateActualParamsFormatted( const TQString & name ) { - QString className = name.simplifyWhiteSpace(); - QString temp = className; - className.replace( QRegExp( "<.*> *" ), "" ); - QString templateStr = temp.replace( QRegExp( QRegExp_escape( className ) ), "" ); + TQString className = name.simplifyWhiteSpace(); + TQString temp = className; + className.replace( TQRegExp( "<.*> *" ), "" ); + TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); return templateStr; } -void CppNewClassDialog::removeTemplateParams( QString & name ) +void CppNewClassDialog::removeTemplateParams( TQString & name ) { - name.replace( QRegExp( "<.*> *" ), "" ); + name.replace( TQRegExp( "<.*> *" ), "" ); } -bool CppNewClassDialog::isDestructor( QString className, const FunctionDom &method ) +bool CppNewClassDialog::isDestructor( TQString className, const FunctionDom &method ) { - if ( m_part->formatModelItem( method.data() ).contains( QRegExp( " *~ *" + className ) ) ) + if ( m_part->formatModelItem( method.data() ).contains( TQRegExp( " *~ *" + className ) ) ) return true; return false; } diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index fb680921..18399d1c 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -16,9 +16,9 @@ #ifndef _CPPNEWCLASSDLG_H_ #define _CPPNEWCLASSDLG_H_ -#include <qlineedit.h> -#include <qlistview.h> -#include <qwidgetstack.h> +#include <tqlineedit.h> +#include <tqlistview.h> +#include <tqwidgetstack.h> #include "codemodel.h" #include "cppnewclassdlgbase.h" @@ -35,36 +35,36 @@ class PCheckListItem: public QCheckListItem { public: - PCheckListItem ( T item, QCheckListItem * parent, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QCheckListItem * parent, QListViewItem * after, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListViewItem * parent, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListViewItem * parent, QListViewItem * after, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListView * parent, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListView * parent, QListViewItem * after, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListViewItem * parent, const QString & text, const QPixmap & p ) : - QCheckListItem ( parent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( parent, text, p ), m_item( item ) {} - PCheckListItem ( T item, QListView * parent, const QString & text, const QPixmap & p ) : - QCheckListItem ( parent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( parent, text, p ), m_item( item ) {} T item() @@ -72,7 +72,7 @@ public: return m_item; } - QString templateAddition; + TQString templateAddition; private: T m_item; @@ -83,20 +83,20 @@ class PListViewItem: public QListViewItem { public: - PListViewItem ( T item, QListViewItem * parent, QListViewItem * after, const QString & text ) : - QListViewItem ( parent, after, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( parent, after, text ), m_item( item ) {} - PListViewItem ( T item, QListViewItem * parent, const QString & text ) : - QListViewItem ( parent, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * parent, const TQString & text ) : + TQListViewItem ( parent, text ), m_item( item ) {} - PListViewItem ( T item, QListView * parent, const QString & text ) : - QListViewItem ( parent, text ), m_item( item ) + PListViewItem ( T item, TQListView * parent, const TQString & text ) : + TQListViewItem ( parent, text ), m_item( item ) {} - PListViewItem ( T item, QListView * parent, QListViewItem * after, const QString & text ) : - QListViewItem ( parent, after, text ), m_item( item ) + PListViewItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( parent, after, text ), m_item( item ) {} T item() @@ -104,7 +104,7 @@ public: return m_item; } - QString templateAddition; + TQString templateAddition; private: T m_item; }; @@ -115,28 +115,28 @@ class CppNewClassDialog : public CppNewClassDialogBase Q_OBJECT public: - CppNewClassDialog( CppSupportPart *part, QWidget *parent = 0, const char *name = 0 ); + CppNewClassDialog( CppSupportPart *part, TQWidget *parent = 0, const char *name = 0 ); ~CppNewClassDialog(); protected: virtual void accept(); - virtual void classNameChanged( const QString &text ); - virtual void classNamespaceChanged( const QString &text ); + virtual void classNameChanged( const TQString &text ); + virtual void classNamespaceChanged( const TQString &text ); virtual void headerChanged(); virtual void implementationChanged(); - virtual void nameHandlerChanged( const QString &text ); - virtual void baseclassname_changed( const QString &text ); - virtual void baseIncludeChanged( const QString &text ); + virtual void nameHandlerChanged( const TQString &text ); + virtual void baseclassname_changed( const TQString &text ); + virtual void baseIncludeChanged( const TQString &text ); virtual void addBaseClass(); virtual void remBaseClass(); virtual void remBaseClassOnly(); - virtual void currBaseNameChanged( const QString &text ); + virtual void currBaseNameChanged( const TQString &text ); virtual void currBasePrivateSet(); virtual void currBaseProtectedSet(); virtual void currBasePublicSet(); virtual void currBaseVirtualChanged( int val ); - virtual void currBaseSelected( QListViewItem *it ); + virtual void currBaseSelected( TQListViewItem *it ); virtual void scopeboxActivated( int value ); virtual void checkObjCInheritance( int val ); @@ -146,14 +146,14 @@ protected: virtual void downbaseclass_button_clicked(); virtual void baseclasses_view_selectionChanged(); - virtual void newTabSelected( const QString &text ); - virtual void newTabSelected( QWidget *w ); - virtual void access_view_mouseButtonPressed( int button, QListViewItem * item, const QPoint &p, int c ); + virtual void newTabSelected( const TQString &text ); + virtual void newTabSelected( TQWidget *w ); + virtual void access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int c ); virtual void changeToPrivate(); virtual void changeToProtected(); virtual void changeToPublic(); virtual void changeToInherited(); - virtual void methods_view_mouseButtonPressed( int button , QListViewItem * item, const QPoint&p , int c ); + virtual void methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int c ); virtual void extendFunctionality(); virtual void replaceFunctionality(); virtual void to_constructors_list_clicked(); @@ -164,59 +164,59 @@ protected: virtual void headeronly_box_stateChanged(int val); void reloadAdvancedInheritance( bool clean = false ); - void parseClass( QString clName, QString inheritance ); - void parsePCSClass( QString clName, QString inheritance ); - void addToConstructorsList( QCheckListItem *myClass, FunctionDom method ); - void addToMethodsList( QListViewItem *parent, FunctionDom method ); - void addToUpgradeList( QListViewItem *parent, FunctionDom method, QString modifier ); - void addToUpgradeList( QListViewItem *parent, VariableDom attr, QString modifier ); + void parseClass( TQString clName, TQString inheritance ); + void parsePCSClass( TQString clName, TQString inheritance ); + void addToConstructorsList( TQCheckListItem *myClass, FunctionDom method ); + void addToMethodsList( TQListViewItem *parent, FunctionDom method ); + void addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ); + void addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ); void clearConstructorsList( bool clean = false ); void clearMethodsList( bool clean = false ); void clearUpgradeList( bool clean = false ); - bool isConstructor( QString className, const FunctionDom &method ); - bool isDestructor( QString className, const FunctionDom &method ); + bool isConstructor( TQString className, const FunctionDom &method ); + bool isDestructor( TQString className, const FunctionDom &method ); private: bool headerModified; bool baseincludeModified; bool implementationModified; - QString m_parse; - QPopupMenu *accessMenu; - QPopupMenu *overMenu; + TQString m_parse; + TQPopupMenu *accessMenu; + TQPopupMenu *overMenu; CppSupportPart *m_part; CodeModel *myModel; // configuration variables - QString interface_url; - QString implementation_url; - QString interface_suffix; - QString implementation_suffix; - QStringList currNamespace; + TQString interface_url; + TQString implementation_url; + TQString interface_suffix; + TQString implementation_suffix; + TQStringList currNamespace; bool lowercase_filenames; - QStringList currBaseClasses; + TQStringList currBaseClasses; KCompletion * compBasename; KCompletion * compNamespace; void setCompletionBasename( CodeModel *model ); - void addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, const QString & namespaceParent = "" ); - void setCompletionNamespaceRecursive( const NamespaceDom & namespaceDom, const QString & namespaceParent = "" ); + void addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent = "" ); + void setCompletionNamespaceRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent = "" ); void setStateOfInheritanceEditors( bool state, bool hideList = true ); - void setAccessForBase( QString baseclass, QString newAccess ); - void setAccessForItem( QListViewItem *curr, QString newAccess, bool isPublic ); - void remClassFromAdv( QString text ); + void setAccessForBase( TQString baseclass, TQString newAccess ); + void setAccessForItem( TQListViewItem *curr, TQString newAccess, bool isPublic ); + void remClassFromAdv( TQString text ); void checkUpButtonState(); void checkDownButtonState(); void updateConstructorsOrder(); - QString classNameFormatted(); - QString templateStrFormatted(); - QString templateParamsFormatted(); - QString classNameFormatted( const QString & ); - QString templateStrFormatted( const QString & ); - QString templateParamsFormatted( const QString & ); - QString templateActualParamsFormatted( const QString & ); - void removeTemplateParams( QString & ); + TQString classNameFormatted(); + TQString templateStrFormatted(); + TQString templateParamsFormatted(); + TQString classNameFormatted( const TQString & ); + TQString templateStrFormatted( const TQString & ); + TQString templateParamsFormatted( const TQString & ); + TQString templateActualParamsFormatted( const TQString & ); + void removeTemplateParams( TQString & ); friend class ClassGenerator; @@ -234,49 +234,49 @@ private: void common_text(); void gen_implementation(); void gen_interface(); - void genMethodDeclaration( FunctionDom method, QString className, QString templateStr, - QString *adv_h, QString *adv_cpp, bool extend, QString baseClassName ); - - void beautifyHeader( QString &templ, QString &headerGuard, - QString &includeBaseHeader, QString &author, QString &doc, QString &className, QString &templateStr, - QString &baseclass, QString &inheritance, QString &qobjectStr, QString &args, - QString &header, QString &namespaceBeg, QString &constructors, QString &advH_public, - QString &advH_public_slots, - QString &advH_protected, QString &advH_protected_slots, QString &advH_private, QString &advH_private_slots, - QString &namespaceEnd ); - void beautifySource( QString &templ, QString &header, QString &className, QString &namespaceBeg, - QString &constructors, QString &advCpp, QString &namespaceEnd, QString &implementation ); - - QString className; - QString templateStr; - QString templateParams; - QString header; - QString implementation; - - QString advConstructorsHeader; - QString advConstructorsSource; + void genMethodDeclaration( FunctionDom method, TQString className, TQString templateStr, + TQString *adv_h, TQString *adv_cpp, bool extend, TQString baseClassName ); + + void beautifyHeader( TQString &templ, TQString &headerGuard, + TQString &includeBaseHeader, TQString &author, TQString &doc, TQString &className, TQString &templateStr, + TQString &baseclass, TQString &inheritance, TQString &qobjectStr, TQString &args, + TQString &header, TQString &namespaceBeg, TQString &constructors, TQString &advH_public, + TQString &advH_public_slots, + TQString &advH_protected, TQString &advH_protected_slots, TQString &advH_private, TQString &advH_private_slots, + TQString &namespaceEnd ); + void beautifySource( TQString &templ, TQString &header, TQString &className, TQString &namespaceBeg, + TQString &constructors, TQString &advCpp, TQString &namespaceEnd, TQString &implementation ); + + TQString className; + TQString templateStr; + TQString templateParams; + TQString header; + TQString implementation; + + TQString advConstructorsHeader; + TQString advConstructorsSource; KDevProject *project; - QString subDir, headerPath, implementationPath; - QString doc; - QString namespaceStr; + TQString subDir, headerPath, implementationPath; + TQString doc; + TQString namespaceStr; bool childClass; bool objc; bool qobject; bool gtk; bool headeronly; - QStringList namespaces; - QString namespaceBeg, namespaceEnd; - QString argsH; - QString argsCpp; - - QString advH_public; - QString advH_public_slots; - QString advH_protected; - QString advH_protected_slots; - QString advH_private; - QString advH_private_slots; - QString advCpp; + TQStringList namespaces; + TQString namespaceBeg, namespaceEnd; + TQString argsH; + TQString argsCpp; + + TQString advH_public; + TQString advH_public_slots; + TQString advH_protected; + TQString advH_protected_slots; + TQString advH_private; + TQString advH_private_slots; + TQString advCpp; CppNewClassDialog& dlg; diff --git a/languages/cpp/cppsplitheadersourceconfig.cpp b/languages/cpp/cppsplitheadersourceconfig.cpp index 68253368..7298354b 100644 --- a/languages/cpp/cppsplitheadersourceconfig.cpp +++ b/languages/cpp/cppsplitheadersourceconfig.cpp @@ -25,12 +25,12 @@ #include <domutil.h> #include <kdebug.h> -#include <qdom.h> +#include <tqdom.h> -QString CppSplitHeaderSourceConfig::defaultPath = QString::fromLatin1( "/kdevcppsupport/splitheadersource" ); +TQString CppSplitHeaderSourceConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/splitheadersource" ); -CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, QDomDocument* dom ) - : QObject( part ), m_part( part ), m_dom( dom ) +CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, TQDomDocument* dom ) + : TQObject( part ), m_part( part ), m_dom( dom ) { init(); } @@ -73,7 +73,7 @@ void CppSplitHeaderSourceConfig::setAutoSync( bool b ) m_splitSync = b; } -void CppSplitHeaderSourceConfig::setOrientation( const QString &o ) +void CppSplitHeaderSourceConfig::setOrientation( const TQString &o ) { m_splitOrientation = o; } diff --git a/languages/cpp/cppsplitheadersourceconfig.h b/languages/cpp/cppsplitheadersourceconfig.h index d975bc2c..52be4297 100644 --- a/languages/cpp/cppsplitheadersourceconfig.h +++ b/languages/cpp/cppsplitheadersourceconfig.h @@ -21,7 +21,7 @@ #ifndef CPPSPLITHEADERSOURCECONFIG_H #define CPPSPLITHEADERSOURCECONFIG_H -#include <qobject.h> +#include <tqobject.h> class CppSupportPart; class QDomDocument; @@ -30,7 +30,7 @@ class CppSplitHeaderSourceConfig : public QObject { Q_OBJECT public: - CppSplitHeaderSourceConfig( CppSupportPart* part, QDomDocument* dom ); + CppSplitHeaderSourceConfig( CppSupportPart* part, TQDomDocument* dom ); virtual ~CppSplitHeaderSourceConfig(); bool splitEnabled() const @@ -45,11 +45,11 @@ public: } void setAutoSync( bool b ); - QString orientation() const + TQString orientation() const { return m_splitOrientation; } - void setOrientation( const QString &o ); + void setOrientation( const TQString &o ); public slots: void store(); @@ -62,12 +62,12 @@ signals: private: CppSupportPart* m_part; - QDomDocument* m_dom; + TQDomDocument* m_dom; bool m_splitEnable; bool m_splitSync; - QString m_splitOrientation; + TQString m_splitOrientation; - static QString defaultPath; + static TQString defaultPath; }; #endif diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h index 0c266726..2dbac39a 100644 --- a/languages/cpp/cppsupport_events.h +++ b/languages/cpp/cppsupport_events.h @@ -14,29 +14,29 @@ #include "kdevdeepcopy.h" -#include <qevent.h> -#include <qvaluelist.h> +#include <tqevent.h> +#include <tqvaluelist.h> #if QT_VERSION < 0x030100 #include <kdevmutex.h> #else -#include <qmutex.h> +#include <tqmutex.h> #endif enum { - Event_FileParsed = QEvent::User + 1000 + Event_FileParsed = TQEvent::User + 1000 }; class FileParsedEvent: public QCustomEvent { public: - FileParsedEvent( const QString& fileName, const QValueList<Problem>& problems, bool fromDisk = false ) - : QCustomEvent( Event_FileParsed ), m_fileName( deepCopy( fileName ) ), m_fromDisk( fromDisk ) + FileParsedEvent( const TQString& fileName, const TQValueList<Problem>& problems, bool fromDisk = false ) + : TQCustomEvent( Event_FileParsed ), m_fileName( deepCopy( fileName ) ), m_fromDisk( fromDisk ) { // the members are deep copies - QValueListConstIterator<Problem> it = problems.begin(); + TQValueListConstIterator<Problem> it = problems.begin(); while ( it != problems.end() ) { Problem p = *it; @@ -46,11 +46,11 @@ public: } } - QString fileName() const + TQString fileName() const { return m_fileName; } - QValueList<Problem> problems() const + TQValueList<Problem> problems() const { return m_problems; } @@ -60,8 +60,8 @@ public: } private: - QString m_fileName; - QValueList<Problem> m_problems; + TQString m_fileName; + TQValueList<Problem> m_problems; bool m_fromDisk; private: diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index e6f80abc..338fa724 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -1,4 +1,4 @@ -#include <qdir.h> +#include <tqdir.h> #include <kapplication.h> #include <kconfig.h> @@ -8,26 +8,26 @@ #include "cppsupport_utils.h" -static void typeNameList( QStringList& path, QStringList & lst, const CodeModel * model ); -static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns ); -static void typeNameList( QStringList & path, QStringList & lst, ClassDom klass ); +static void typeNameList( TQStringList& path, TQStringList & lst, const CodeModel * model ); +static void typeNameList( TQStringList& path, TQStringList & lst, NamespaceDom ns ); +static void typeNameList( TQStringList & path, TQStringList & lst, ClassDom klass ); -QStringList typeNameList( const CodeModel* model ) +TQStringList typeNameList( const CodeModel* model ) { - QStringList lst; - QStringList path; + TQStringList lst; + TQStringList path; typeNameList( path, lst, model ); return lst; } -static void typeNameList( QStringList& path, QStringList & lst, const CodeModel * model ) +static void typeNameList( TQStringList& path, TQStringList & lst, const CodeModel * model ) { const FileList fileList = model->fileList(); for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) typeNameList( path, lst, model_cast<NamespaceDom>(*it) ); } -static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns ) +static void typeNameList( TQStringList& path, TQStringList & lst, NamespaceDom ns ) { if( !ns->isFile() ) path.push_back( ns->name() ); @@ -44,7 +44,7 @@ static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns path.pop_back(); } -static void typeNameList( QStringList & path, QStringList & lst, ClassDom klass ) +static void typeNameList( TQStringList & path, TQStringList & lst, ClassDom klass ) { path.push_back( klass->name() ); @@ -57,13 +57,13 @@ static void typeNameList( QStringList & path, QStringList & lst, ClassDom klass path.pop_back(); } -static void typedefMap( QMap<QString, QString> & map, const CodeModel * model ); -static void typedefMap( QMap<QString, QString> & map, NamespaceDom ns ); -static void typedefMap( QMap<QString, QString> & map, ClassDom klass ); +static void typedefMap( TQMap<TQString, TQString> & map, const CodeModel * model ); +static void typedefMap( TQMap<TQString, TQString> & map, NamespaceDom ns ); +static void typedefMap( TQMap<TQString, TQString> & map, ClassDom klass ); -QMap<QString, QString> typedefMap( const CodeModel* model ) +TQMap<TQString, TQString> typedefMap( const CodeModel* model ) { - QMap<QString, QString> map; + TQMap<TQString, TQString> map; typedefMap( map, model ); /*We need to flatten the typedefs to avoid circular aliases. @@ -72,7 +72,7 @@ QMap<QString, QString> typedefMap( const CodeModel* model ) map["Bar"] = "Foo"; map["Baz"] = "Bar";*/ - QMap<QString, QString>::iterator it = map.begin(); + TQMap<TQString, TQString>::iterator it = map.begin(); for ( ; it != map.end(); ++it ) { while ( map.contains( map[ it.key() ] ) && @@ -85,14 +85,14 @@ QMap<QString, QString> typedefMap( const CodeModel* model ) return map; } -static void typedefMap( QMap<QString, QString> & map, const CodeModel * model ) +static void typedefMap( TQMap<TQString, TQString> & map, const CodeModel * model ) { const FileList fileList = model->fileList(); for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) typedefMap( map, model_cast<NamespaceDom>(*it) ); } -static void typedefMap( QMap<QString, QString> & map, NamespaceDom ns ) +static void typedefMap( TQMap<TQString, TQString> & map, NamespaceDom ns ) { const TypeAliasList aliasList = ns->typeAliasList(); for( TypeAliasList::ConstIterator it=aliasList.begin(); it!=aliasList.end(); ++it ) @@ -107,7 +107,7 @@ static void typedefMap( QMap<QString, QString> & map, NamespaceDom ns ) typedefMap( map, *it ); } -static void typedefMap( QMap<QString, QString> & map, ClassDom klass ) +static void typedefMap( TQMap<TQString, TQString> & map, ClassDom klass ) { const TypeAliasList aliasList = klass->typeAliasList(); for( TypeAliasList::ConstIterator it=aliasList.begin(); it!=aliasList.end(); ++it ) @@ -118,7 +118,7 @@ static void typedefMap( QMap<QString, QString> & map, ClassDom klass ) typedefMap( map, *it ); } -QString formattedOpeningParenthesis(bool suppressSpace) +TQString formattedOpeningParenthesis(bool suppressSpace) { KConfig * config = kapp->config(); config->setGroup("AStyle"); @@ -127,7 +127,7 @@ QString formattedOpeningParenthesis(bool suppressSpace) return "( "; } -QString formattedClosingParenthesis(bool suppressSpace) +TQString formattedClosingParenthesis(bool suppressSpace) { KConfig * config = kapp->config(); config->setGroup("AStyle"); diff --git a/languages/cpp/cppsupport_utils.h b/languages/cpp/cppsupport_utils.h index 9182dd08..37331eaa 100644 --- a/languages/cpp/cppsupport_utils.h +++ b/languages/cpp/cppsupport_utils.h @@ -12,16 +12,16 @@ #ifndef __cppsupport_utils_h #define __cppsupport_utils_h -#include <qmap.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqstringlist.h> #include "codemodel.h" -QStringList typeNameList( const CodeModel* model ); -QMap<QString, QString> typedefMap( const CodeModel* model ); +TQStringList typeNameList( const CodeModel* model ); +TQMap<TQString, TQString> typedefMap( const CodeModel* model ); -QString formattedOpeningParenthesis(bool suppressSpace = false); -QString formattedClosingParenthesis(bool suppressSpace = false); +TQString formattedOpeningParenthesis(bool suppressSpace = false); +TQString formattedClosingParenthesis(bool suppressSpace = false); #endif // __cppsupport_utils_h // kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index f72b168c..334c7d6c 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -55,21 +55,21 @@ #include "configproblemreporter.h" #include "codeinformationrepository.h" -#include <qeventloop.h> -#include <qheader.h> -#include <qdir.h> -#include <qdom.h> -#include <qfileinfo.h> -#include <qguardedptr.h> -#include <qpopupmenu.h> -#include <qprogressdialog.h> -#include <qstringlist.h> -#include <qtimer.h> -#include <qstatusbar.h> -#include <qprogressbar.h> -#include <qregexp.h> -#include <qlabel.h> -#include <qvbox.h> +#include <tqeventloop.h> +#include <tqheader.h> +#include <tqdir.h> +#include <tqdom.h> +#include <tqfileinfo.h> +#include <tqguardedptr.h> +#include <tqpopupmenu.h> +#include <tqprogressdialog.h> +#include <tqstringlist.h> +#include <tqtimer.h> +#include <tqstatusbar.h> +#include <tqprogressbar.h> +#include <tqregexp.h> +#include <tqlabel.h> +#include <tqvbox.h> #include <kmessagebox.h> #include <kaction.h> #include <kapplication.h> @@ -110,11 +110,11 @@ const bool alwaysParseInBackground = true; enum { KDEV_DB_VERSION = 21 }; enum { KDEV_PCS_VERSION = 18 }; -QStringList CppSupportPart::m_sourceMimeTypes = QStringList() << "text/x-csrc" << "text/x-c++src"; -QStringList CppSupportPart::m_headerMimeTypes = QStringList() << "text/x-chdr" << "text/x-c++hdr"; +TQStringList CppSupportPart::m_sourceMimeTypes = TQStringList() << "text/x-csrc" << "text/x-c++src"; +TQStringList CppSupportPart::m_headerMimeTypes = TQStringList() << "text/x-chdr" << "text/x-c++hdr"; -QStringList CppSupportPart::m_sourceExtensions = QStringList::split( ",", "c,C,cc,cpp,c++,cxx,m,mm,M" ); -QStringList CppSupportPart::m_headerExtensions = QStringList::split( ",", "h,H,hh,h++,hxx,hpp,inl,tlh,diff,ui.h" ); +TQStringList CppSupportPart::m_sourceExtensions = TQStringList::split( ",", "c,C,cc,cpp,c++,cxx,m,mm,M" ); +TQStringList CppSupportPart::m_headerExtensions = TQStringList::split( ",", "h,H,hh,h++,hxx,hpp,inl,tlh,diff,ui.h" ); class CppDriver: public KDevDriver { @@ -132,8 +132,8 @@ public: { cppSupport() ->problemReporter() ->removeAllProblems( fileName.fileName() ); - QValueList<Problem> pl = problems( fileName.fileName() ); - QValueList<Problem>::ConstIterator it = pl.begin(); + TQValueList<Problem> pl = problems( fileName.fileName() ); + TQValueList<Problem>::ConstIterator it = pl.begin(); while ( it != pl.end() ) { const Problem & p = *it++; @@ -156,11 +156,11 @@ public: if( cppSupport()->_jd ) { cppSupport()->_jd->backgroundState ++; - cppSupport()->_jd->lastParse = QTime::currentTime(); + cppSupport()->_jd->lastParse = TQTime::currentTime(); } - QFileInfo fileInfo( fileName.fileName() ); - QString path = URLUtil::canonicalPath( fileName.fileName() ); + TQFileInfo fileInfo( fileName.fileName() ); + TQString path = URLUtil::canonicalPath( fileName.fileName() ); cppSupport()->m_timestamp[ path ] = fileInfo.lastModified(); @@ -191,7 +191,7 @@ public: }; -CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QStringList &args ) +CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ) : KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ), @@ -201,10 +201,10 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString m_pCompletionConfig = new CppCodeCompletionConfig( this, projectDom() ); m_pSplitHeaderSourceConfig = new CppSplitHeaderSourceConfig( this, projectDom() ); - m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, SIGNAL( stored() ), - this, SLOT( splitHeaderSourceConfigStored() ) ); - connect( m_pCompletionConfig, SIGNAL( stored() ), - this, SLOT( codeCompletionConfigStored() ) ); + m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQT_SIGNAL( stored() ), + this, TQT_SLOT( splitHeaderSourceConfigStored() ) ); + connect( m_pCompletionConfig, TQT_SIGNAL( stored() ), + this, TQT_SLOT( codeCompletionConfigStored() ) ); m_qtBuildConfig = new QtBuildConfig( this, projectDom() ); m_qtBuildConfig->store(); @@ -214,45 +214,45 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString m_driver = new CppDriver( this ); m_problemReporter = 0; - m_textChangedTimer = new QTimer( this ); - connect( m_textChangedTimer, SIGNAL(timeout()), this, SLOT(slotParseCurrentFile()) ); + m_textChangedTimer = new TQTimer( this ); + connect( m_textChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseCurrentFile()) ); - m_cursorMovedTimer = new QTimer( this ); - connect( m_cursorMovedTimer, SIGNAL(timeout()), this, SLOT(slotCursorPositionChanged()) ); + m_cursorMovedTimer = new TQTimer( this ); + connect( m_cursorMovedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCursorPositionChanged()) ); -// m_deleteParserStoreTimer = new QTimer( this ); - m_saveMemoryTimer = new QTimer( this ); - m_buildSafeFileSetTimer = new QTimer( this ); -// m_functionHintTimer = new QTimer( this ); - connect( m_buildSafeFileSetTimer, SIGNAL(timeout()), this, SLOT(buildSafeFileSet()) ); - connect( m_saveMemoryTimer, SIGNAL(timeout()), this, SLOT(slotSaveMemory()) ); -// connect( m_deleteParserStoreTimer, SIGNAL(timeout()), this, SLOT(slotDeleteParserStore()) ); +// m_deleteParserStoreTimer = new TQTimer( this ); + m_saveMemoryTimer = new TQTimer( this ); + m_buildSafeFileSetTimer = new TQTimer( this ); +// m_functionHintTimer = new TQTimer( this ); + connect( m_buildSafeFileSetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(buildSafeFileSet()) ); + connect( m_saveMemoryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveMemory()) ); +// connect( m_deleteParserStoreTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDeleteParserStore()) ); resetParserStoreTimer(); m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes - // connect( m_functionHintTimer, SIGNAL(timeout()), this, SLOT(slotFunctionHint()) ); + // connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) ); setXMLFile( "kdevcppsupport.rc" ); m_catalogList.setAutoDelete( true ); - connect( core(), SIGNAL( projectOpened() ), this, SLOT( projectOpened() ) ); - connect( core(), SIGNAL( projectClosed() ), this, SLOT( projectClosed() ) ); - connect( core(), SIGNAL( languageChanged() ), this, SLOT( projectOpened() ) ); - connect( partController(), SIGNAL( savedFile( const KURL& ) ), - this, SLOT( savedFile( const KURL& ) ) ); - connect( core(), SIGNAL( contextMenu( QPopupMenu *, const Context * ) ), - this, SLOT( contextMenu( QPopupMenu *, const Context * ) ) ); - connect( partController(), SIGNAL( activePartChanged( KParts::Part* ) ), - this, SLOT( activePartChanged( KParts::Part* ) ) ); - connect( partController(), SIGNAL( partRemoved( KParts::Part* ) ), - this, SLOT( partRemoved( KParts::Part* ) ) ); - - connect( core(), SIGNAL( configWidget( KDialogBase* ) ), - this, SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( projectOpened() ) ); + connect( core(), TQT_SIGNAL( projectClosed() ), this, TQT_SLOT( projectClosed() ) ); + connect( core(), TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( projectOpened() ) ); + connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), + this, TQT_SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + connect( partController(), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQT_SLOT( activePartChanged( KParts::Part* ) ) ); + connect( partController(), TQT_SIGNAL( partRemoved( KParts::Part* ) ), + this, TQT_SLOT( partRemoved( KParts::Part* ) ) ); + + connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), + this, TQT_SLOT( configWidget( KDialogBase* ) ) ); m_switchHeaderSourceAction = new KAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12, - this, SLOT( slotSwitchHeader() ), + this, TQT_SLOT( slotSwitchHeader() ), actionCollection(), "edit_switchheader" ); m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) ); m_switchHeaderSourceAction->setWhatsThis( i18n( "<b>Switch Header/Implementation</b><p>" @@ -265,7 +265,7 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString KAction *action; action = new KAction( i18n( "Complete Text" ), CTRL + Key_Space, - this, SLOT( slotCompleteText() ), + this, TQT_SLOT( slotCompleteText() ), actionCollection(), "edit_complete_text" ); action->setToolTip( i18n( "Complete current expression" ) ); action->setWhatsThis( i18n( "<b>Complete Text</p><p>Completes current expression using " @@ -274,11 +274,11 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString action->setEnabled( false ); m_createGetterSetterAction = new KAction( i18n( "Create Accessor Methods" ), 0, - this, SLOT( slotCreateAccessMethods() ), actionCollection(), + this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(), "edit_create_getter_setter" ); action = new KAction( i18n( "Make Member" ), 0, Key_F2, - this, SLOT( slotMakeMember() ), + this, TQT_SLOT( slotMakeMember() ), actionCollection(), "edit_make_member" ); action->setToolTip( i18n( "Make member" ) ); action->setWhatsThis( i18n( "<b>Make member</b><p>Creates a class member function in implementation file " @@ -286,7 +286,7 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString action->plug( &m_DummyActionWidget ); action = new KAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space, - this, SLOT( slotNavigate() ), + this, TQT_SLOT( slotNavigate() ), actionCollection(), "edit_navigate" ); action->setToolTip( i18n( "Show the navigation-menu" ) ); action->setWhatsThis( i18n( "<b>Navigate</b><p>Shows a navigation-menu based on the type-evaluation of the item under the cursor." ) ); @@ -294,7 +294,7 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString action = new KAction( i18n( "New Class..." ), "classnew", 0, - this, SLOT( slotNewClass() ), + this, TQT_SLOT( slotNewClass() ), actionCollection(), "project_newclass" ); action->setToolTip( i18n( "Generate a new class" ) ); action->setWhatsThis( i18n( "<b>New Class</b><p>Calls the <b>New Class</b> wizard." ) ); @@ -306,8 +306,8 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString withcpp = true; // daniel - connect( core( ), SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevCppSupportIface( this ); //(void) dcopClient(); @@ -336,7 +336,7 @@ CppSupportPart::~CppSupportPart() codeRepository() ->setMainCatalog( 0 ); - QPtrListIterator<Catalog> it( m_catalogList ); + TQPtrListIterator<Catalog> it( m_catalogList ); while ( Catalog * catalog = it.current() ) { ++it; @@ -361,11 +361,11 @@ CppSupportPart::~CppSupportPart() } -void CppSupportPart::customEvent( QCustomEvent* ev ) +void CppSupportPart::customEvent( TQCustomEvent* ev ) { kdDebug( 9007 ) << "CppSupportPart::customEvent(" << ev->type() << ")" << endl; - QTime t; + TQTime t; t.start(); bool fromDisk = false; @@ -375,14 +375,14 @@ void CppSupportPart::customEvent( QCustomEvent* ev ) FileParsedEvent * event = ( FileParsedEvent* ) ev; fromDisk = event->fromDisk(); - QString fileName = event->fileName(); + TQString fileName = event->fileName(); bool hasErrors = false; if ( m_problemReporter ) { m_problemReporter->removeAllProblems( fileName ); - QValueList<Problem> problems = event->problems(); - QValueList<Problem>::ConstIterator it = problems.begin(); + TQValueList<Problem> problems = event->problems(); + TQValueList<Problem>::ConstIterator it = problems.begin(); while ( it != problems.end() ) { const Problem & p = *it++; @@ -413,7 +413,7 @@ void CppSupportPart::customEvent( QCustomEvent* ev ) //Increase status-bar if( p.hasFlag( ParseEmitWaiting::Silent ) && _jd ) { _jd->backgroundState ++; - _jd->lastParse = QTime::currentTime(); + _jd->lastParse = TQTime::currentTime(); } } else { @@ -424,7 +424,7 @@ void CppSupportPart::customEvent( QCustomEvent* ev ) //Increase status-bar if( p.hasFlag( ParseEmitWaiting::Silent ) && _jd ) { _jd->backgroundState ++; - _jd->lastParse = QTime::currentTime(); + _jd->lastParse = TQTime::currentTime(); } } } @@ -433,26 +433,26 @@ void CppSupportPart::customEvent( QCustomEvent* ev ) void CppSupportPart::projectConfigWidget( KDialogBase* dlg ) { - QVBox * vbox = 0; + TQVBox * vbox = 0; vbox = dlg->addVBoxPage( i18n( "C++ Support" ), i18n( "C++ Support" ), BarIcon( info() ->icon(), KIcon::SizeMedium ) ); CCConfigWidget* w = new CCConfigWidget( this, vbox ); - connect( dlg, SIGNAL( okClicked( ) ), w, SLOT( accept( ) ) ); + connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); } void CppSupportPart::configWidget( KDialogBase *dlg ) { - QVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ), + TQVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ), BarIcon( info() ->icon(), KIcon::SizeMedium ) ); ClassGeneratorConfig *w = new ClassGeneratorConfig( vbox, "classgenerator config widget" ); - connect( dlg, SIGNAL( okClicked() ), w, SLOT( storeConfig() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) ); vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"), BarIcon( "source_cpp", KIcon::SizeMedium) ); ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox ); ww->setPart( this ); - connect(dlg, SIGNAL(okClicked()), ww, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept())); } void CppSupportPart::activePartChanged( KParts::Part *part ) @@ -465,11 +465,11 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeView ) { - disconnect( m_activeView, SIGNAL( cursorPositionChanged() ), this, 0 ); + disconnect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, 0 ); } if ( m_activeDocument ) { - disconnect( m_activeDocument, SIGNAL(textChanged()), this, 0 ); + disconnect( m_activeDocument, TQT_SIGNAL(textChanged()), this, 0 ); } m_isTyping = false; @@ -480,13 +480,13 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) m_activeSelection = dynamic_cast<KTextEditor::SelectionInterface*>( part ); m_activeViewCursor = dynamic_cast<KTextEditor::ViewCursorInterface*>( m_activeView ); - m_activeFileName = QString::null; + m_activeFileName = TQString::null; if ( m_activeDocument ) { m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() ); - QFileInfo fi( m_activeFileName ); - QString ext = fi.extension(); + TQFileInfo fi( m_activeFileName ); + TQString ext = fi.extension(); if ( isSource( m_activeFileName ) || isHeader( m_activeFileName ) ) enabled = true; } @@ -500,14 +500,14 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeDocument ) { - connect( m_activeDocument, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) ); + connect( m_activeDocument, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); m_textChangedTimer->start( 250, true ); // kick the parse timer, we might want to parse the current file } if ( m_activeViewCursor ) { - connect( m_activeView, SIGNAL( cursorPositionChanged() ), this, SLOT(slotCursorMoved()) ); -// this, SLOT( slotCursorPositionChanged() ) ); + connect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, TQT_SLOT(slotCursorMoved()) ); +// this, TQT_SLOT( slotCursorPositionChanged() ) ); } @@ -516,8 +516,8 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( !textHintIface ) return ; - connect( view, SIGNAL( needTextHint( int, int, QString& ) ), - this, SLOT( slotNeedTextHint( int, int, QString& ) ) ); + connect( view, TQT_SIGNAL( needTextHint( int, int, TQString& ) ), + this, TQT_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); textHintIface->enableTextHints( 1000 ); #endif @@ -537,11 +537,11 @@ void CppSupportPart::projectOpened( ) kdDebug( 9007 ) << "projectOpened( )" << endl; m_backgroundParser = new BackgroundParser( this, &m_eventConsumed ); - m_backgroundParser->start( QThread::IdlePriority ); + m_backgroundParser->start( TQThread::IdlePriority ); // setup the driver - QString conf_file_name = specialHeaderName(); - if ( QFile::exists( conf_file_name ) ) + TQString conf_file_name = specialHeaderName(); + if ( TQFile::exists( conf_file_name ) ) m_driver->parseFile( conf_file_name, true, true, true ); m_projectDirectory = URLUtil::canonicalPath( project() ->projectDirectory() ); @@ -551,17 +551,17 @@ void CppSupportPart::projectOpened( ) embedProblemReporter(); - connect( core(), SIGNAL( configWidget( KDialogBase* ) ), - m_problemReporter, SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), + m_problemReporter, TQT_SLOT( configWidget( KDialogBase* ) ) ); - connect( project( ), SIGNAL( addedFilesToProject( const QStringList & ) ), - this, SLOT( addedFilesToProject( const QStringList & ) ) ); - connect( project( ), SIGNAL( removedFilesFromProject( const QStringList & ) ), - this, SLOT( removedFilesFromProject( const QStringList & ) ) ); - connect( project( ), SIGNAL( changedFilesInProject( const QStringList & ) ), - this, SLOT( changedFilesInProject( const QStringList & ) ) ); - connect( project(), SIGNAL( projectCompiled() ), - this, SLOT( slotProjectCompiled() ) ); + connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQT_SIGNAL( projectCompiled() ), + this, TQT_SLOT( slotProjectCompiled() ) ); m_timestamp.clear(); m_parseEmitWaiting.clear(); @@ -573,7 +573,7 @@ void CppSupportPart::projectOpened( ) m_buildSafeFileSetTimer->start( 500, true ); updateParserConfiguration(); //Necessary to respect custom include-paths and such - QTimer::singleShot( 500, this, SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); } void CppSupportPart::embedProblemReporter( bool force ) @@ -601,17 +601,17 @@ void CppSupportPart::projectClosed( ) m_projectClosing = true; - QStringList enabledPCSs; - QValueList<Catalog*> catalogs = codeRepository() ->registeredCatalogs(); - for ( QValueList<Catalog*>::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) + TQStringList enabledPCSs; + TQValueList<Catalog*> catalogs = codeRepository() ->registeredCatalogs(); + for ( TQValueList<Catalog*>::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { Catalog* c = *it; if ( c->enabled() ) - enabledPCSs.push_back( QFileInfo( c->dbName() ).baseName(true) ); + enabledPCSs.push_back( TQFileInfo( c->dbName() ).baseName(true) ); } DomUtil::writeListEntry( *project() ->projectDom(), "kdevcppsupport/references", "pcs", enabledPCSs ); - for ( QMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*>::const_iterator it = m_designers.begin(); + for ( TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*>::const_iterator it = m_designers.begin(); it != m_designers.end(); ++it ) { kdDebug( 9007 ) << "calling save settings fro designer integration" << endl; @@ -656,7 +656,7 @@ void CppSupportPart::slotNavigate() { } -void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) +void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { m_activeClass = 0; m_activeFunction = 0; @@ -682,12 +682,12 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) } } - QString text; + TQString text; int atline, atcol; MakeMemberHelper( text, atline, atcol ); if ( !text.isEmpty() ) { - id = popup->insertItem( i18n( "Make Member" ), this, SLOT( slotMakeMember() ) ); + id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) ); popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file " "based on the member declaration at the current line." ) ); } @@ -721,7 +721,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( showContextMenuExplosion ) { //kdDebug( 9007 ) << "CppSupportPart::contextMenu 1" << endl; - QString candidate; + TQString candidate; if ( isSource( m_activeFileName ) ) candidate = sourceOrHeaderCandidate(); else @@ -735,7 +735,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( !candidate.isEmpty() && codeModel() ->hasFile( candidate ) ) { - QPopupMenu * m2 = new QPopupMenu( popup ); + TQPopupMenu * m2 = new TQPopupMenu( popup ); id = popup->insertItem( i18n( "Go to Declaration" ), m2 ); popup->setWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations " "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) ); @@ -746,15 +746,15 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) FunctionList functionList2 = CodeModelUtils::allFunctions( file2 ); for ( FunctionList::ConstIterator it = functionList2.begin(); it != functionList2.end(); ++it ) { - QString text = ( *it ) ->scope().join( "::" ); + TQString text = ( *it ) ->scope().join( "::" ); //kdDebug( 9007 ) << "CppSupportPart::contextMenu 3 text: " << text << endl; if ( !text.isEmpty() ) { text += "::"; } text += formatModelItem( *it, true ); - text = text.replace( QString::fromLatin1( "&" ), QString::fromLatin1( "&&" ) ); - int id = m2->insertItem( text, this, SLOT( gotoDeclarationLine( int ) ) ); + text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); + int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m2->setItemParameter( id, line ); @@ -767,7 +767,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) //kdDebug( 9007 ) << "CppSupportPart::contextMenu 4" << endl; } - QString candidate1; + TQString candidate1; if ( isHeader( m_activeFileName ) ) { candidate1 = sourceOrHeaderCandidate(); @@ -779,7 +779,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) //kdDebug( 9007 ) << "CppSupportPart::go to definition in " << candidate1 << endl; if ( codeModel() ->hasFile( candidate1 ) ) { - QPopupMenu * m = new QPopupMenu( popup ); + TQPopupMenu * m = new TQPopupMenu( popup ); id = popup->insertItem( i18n( "Go to Definition" ), m ); popup->setWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions " "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) ); @@ -788,14 +788,14 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) const FunctionDefinitionList functionDefinitionList = CodeModelUtils::allFunctionDefinitionsDetailed( file ).functionList; for ( FunctionDefinitionList::ConstIterator it = functionDefinitionList.begin(); it != functionDefinitionList.end(); ++it ) { - QString text = ( *it ) ->scope().join( "::" ); + TQString text = ( *it ) ->scope().join( "::" ); if ( !text.isEmpty() ) { text += "::"; } text += formatModelItem( *it, true ); - text = text.replace( QString::fromLatin1( "&" ), QString::fromLatin1( "&&" ) ); - int id = m->insertItem( text, this, SLOT( gotoLine( int ) ) ); + text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); + int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m->setItemParameter( id, line ); @@ -810,7 +810,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) } const EditorContext *econtext = static_cast<const EditorContext*>( context ); - QString str = econtext->currentLine(); + TQString str = econtext->currentLine(); if ( str.isEmpty() ) return ; } @@ -821,7 +821,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( mcontext->item() ->isClass() ) { m_activeClass = ( ClassModel* ) mcontext->item(); - int id = popup->insertItem( i18n( "Extract Interface..." ), this, SLOT( slotExtractInterface() ) ); + int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) ); popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. " "No implementation code is extracted and no implementation code is created." ) ); } @@ -839,17 +839,17 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( url.fileName().endsWith( ".ui" ) ) { m_contextFileName = url.path(); - int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, SLOT( slotCreateSubclass() ) ); + int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } } -QStringList makeListUnique( const QStringList& rhs ) { - QMap<QString, bool> map; - QStringList ret; - for( QStringList::const_iterator it = rhs.begin(); it != rhs.end(); ++it ) { +TQStringList makeListUnique( const TQStringList& rhs ) { + TQMap<TQString, bool> map; + TQStringList ret; + for( TQStringList::const_iterator it = rhs.begin(); it != rhs.end(); ++it ) { if( map.find( *it ) == map.end() ) { ret << *it; map.insert( *it, true ); @@ -859,18 +859,18 @@ QStringList makeListUnique( const QStringList& rhs ) { } // Makes sure that header files come first -QStringList CppSupportPart::reorder( const QStringList &list ) +TQStringList CppSupportPart::reorder( const TQStringList &list ) { - QStringList headers, others; + TQStringList headers, others; - QStringList headerExtensions = QStringList::split( ",", "h,H,hh,hxx,hpp,tlh" ); + TQStringList headerExtensions = TQStringList::split( ",", "h,H,hh,hxx,hpp,tlh" ); - QString projectPath = project()->projectDirectory(); + TQString projectPath = project()->projectDirectory(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) { - QString filePath = *it; + TQString filePath = *it; // brilliant stuff.. this method is apparently called both with // relative and absolute paths.. if ( !filePath.startsWith("/") ) @@ -878,7 +878,7 @@ QStringList CppSupportPart::reorder( const QStringList &list ) filePath = projectPath + "/" + filePath; } if( !isValidSource( filePath ) ) continue; - if ( headerExtensions.contains( QFileInfo( filePath ).extension() ) ) + if ( headerExtensions.contains( TQFileInfo( filePath ).extension() ) ) headers << ( filePath ); else others << ( filePath ); @@ -887,14 +887,14 @@ QStringList CppSupportPart::reorder( const QStringList &list ) return makeListUnique( headers + others ); } -void CppSupportPart::addedFilesToProject( const QStringList &fileList ) +void CppSupportPart::addedFilesToProject( const TQStringList &fileList ) { m_projectFileList = project() ->allFiles(); - QStringList files = reorder( fileList ); + TQStringList files = reorder( fileList ); - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - QString path = *it; + TQString path = *it; if (!path.startsWith("/")) path = URLUtil::canonicalPath( m_projectDirectory + "/" + ( *it ) ); @@ -904,12 +904,12 @@ void CppSupportPart::addedFilesToProject( const QStringList &fileList ) m_buildSafeFileSetTimer->start( 500, true ); } -void CppSupportPart::removedFilesFromProject( const QStringList &fileList ) +void CppSupportPart::removedFilesFromProject( const TQStringList &fileList ) { m_projectFileList = project() ->allFiles(); - for ( QStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) + for ( TQStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { - QString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); + TQString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); kdDebug( 9007 ) << "=====================> remove file: " << path << endl; removeWithReferences( path ); @@ -918,13 +918,13 @@ void CppSupportPart::removedFilesFromProject( const QStringList &fileList ) m_buildSafeFileSetTimer->start( 500, true ); } -void CppSupportPart::changedFilesInProject( const QStringList & fileList ) +void CppSupportPart::changedFilesInProject( const TQStringList & fileList ) { - QStringList files = reorder( fileList ); + TQStringList files = reorder( fileList ); - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - QString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); + TQString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); maybeParse( path ); //emit addedSourceInfo( path ); @@ -953,16 +953,16 @@ void CppSupportPart::savedFile( const KURL &file ) #endif } -QString CppSupportPart::findSourceFile() +TQString CppSupportPart::findSourceFile() { // get the path of the currently active document - QFileInfo fi( m_activeFileName ); - QString path = fi.filePath(); - QString ext = fi.extension(); + TQFileInfo fi( m_activeFileName ); + TQString path = fi.filePath(); + TQString ext = fi.extension(); // extract the base path (full path without '.' and extension) - QString base = path.left( path.length() - ext.length() - 1 ); - QStringList candidates; - if ( QStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) + TQString base = path.left( path.length() - ext.length() - 1 ); + TQStringList candidates; + if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) { candidates << ( base + ".c" ); candidates << ( base + ".cc" ); @@ -977,11 +977,11 @@ QString CppSupportPart::findSourceFile() candidates << ( base + "_impl.h" ); } - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = candidates.begin(); it != candidates.end(); ++it ) { kdDebug( 9007 ) << "Trying " << ( *it ) << endl; - if ( QFileInfo( *it ).exists() ) + if ( TQFileInfo( *it ).exists() ) { return * it; } @@ -989,15 +989,15 @@ QString CppSupportPart::findSourceFile() return m_activeFileName; } -QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) +TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) { - QString urlPath; + TQString urlPath; if ( url.isEmpty() ) { KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( partController() ->activePart() ); if ( !doc ) - return QString::null; + return TQString::null; urlPath = doc->url().path(); } else @@ -1005,34 +1005,34 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) urlPath = url.path(); } // get the path of the currently active document - QFileInfo fi( urlPath ); - QString path = fi.filePath(); + TQFileInfo fi( urlPath ); + TQString path = fi.filePath(); // extract the exension - QString ext = fi.extension(); + TQString ext = fi.extension(); if ( ext.isEmpty() ) - return QString::null; + return TQString::null; // extract the base path (full path without '.' and extension) - QString base = path.left( path.length() - ext.length() - 1 ); + TQString base = path.left( path.length() - ext.length() - 1 ); //kdDebug( 9007 ) << "base: " << base << ", ext: " << ext << endl; // just the filename without the extension - QString fileNameWoExt = fi.fileName(); + TQString fileNameWoExt = fi.fileName(); if ( !ext.isEmpty() ) fileNameWoExt.replace( "." + ext, "" ); - QString possibleExts; + TQString possibleExts; // depending on the current extension assemble a list of // candidate files to look for - QStringList candidates; + TQStringList candidates; // special case for template classes created by the new class dialog if ( path.endsWith( "_impl.h" ) ) { - QString headerpath = path; + TQString headerpath = path; headerpath.replace( "_impl.h", ".h" ); candidates << headerpath; fileNameWoExt.replace( "_impl", "" ); possibleExts = "h"; } // if file is a header file search for implementation file - else if ( QStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) + else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) { candidates << ( base + ".c" ); candidates << ( base + ".cc" ); @@ -1048,7 +1048,7 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) possibleExts = "c,cc,cpp,c++,cxx,C,m,mm,M,inl,_impl.h"; } // if file is an implementation file, search for header file - else if ( QStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).contains( ext ) ) + else if ( TQStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).contains( ext ) ) { candidates << ( base + ".h" ); candidates << ( base + ".H" ); @@ -1059,12 +1059,12 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) possibleExts = "h,H,hh,hxx,hpp,tlh"; } // search for files from the assembled candidate lists, return the first - // candidate file that actually exists or QString::null if nothing is found. - QStringList::ConstIterator it; + // candidate file that actually exists or TQString::null if nothing is found. + TQStringList::ConstIterator it; for ( it = candidates.begin(); it != candidates.end(); ++it ) { //kdDebug( 9007 ) << "Trying " << ( *it ) << endl; - if ( QFileInfo( *it ).exists() ) + if ( TQFileInfo( *it ).exists() ) { kdDebug( 9007 ) << "using: " << *it << endl; return * it; @@ -1072,10 +1072,10 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) } //kdDebug( 9007 ) << "Now searching in project files." << endl; // Our last resort: search the project file list for matching files - QStringList::iterator fileIt; - QFileInfo candidateFileWoExt; - QString candidateFileWoExtString; - QStringList possibleExtsList = QStringList::split( ',', possibleExts ); + TQStringList::iterator fileIt; + TQFileInfo candidateFileWoExt; + TQString candidateFileWoExtString; + TQStringList possibleExtsList = TQStringList::split( ',', possibleExts ); for ( fileIt = m_projectFileList.begin(); fileIt != m_projectFileList.end(); ++fileIt ) { candidateFileWoExt.setFile(*fileIt); @@ -1087,13 +1087,13 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) if ( possibleExtsList.contains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() ) { //kdDebug( 9007 ) << "checking if " << *fileIt << " exists" << endl; - if ( QFileInfo( *fileIt ).exists() ) + if ( TQFileInfo( *fileIt ).exists() ) kdDebug( 9007 ) << "using: " << *fileIt << endl; return *fileIt; } } } - return QString::null; + return TQString::null; } void CppSupportPart::slotSaveMemory() { @@ -1137,7 +1137,7 @@ void CppSupportPart::slotSwitchHeader( bool scrollOnly ) partController() ->splitCurrentDocument( url ); } -bool CppSupportPart::switchHeaderImpl( const QString& file, int line, int col, bool scrollOnly ) +bool CppSupportPart::switchHeaderImpl( const TQString& file, int line, int col, bool scrollOnly ) { bool handled = false; @@ -1181,10 +1181,10 @@ FunctionDom CppSupportPart::findFunction( const FunctionDom& def ) } FunctionDom CppSupportPart::findFunctionInNamespace( const NamespaceDom& ns, const FunctionDom& def, const std::set<NamespaceImportModel>& nsImports, - const QString& candidateFile, int scopeIndex, FunctionDom& bestMatch ) + const TQString& candidateFile, int scopeIndex, FunctionDom& bestMatch ) { FunctionDom d; - QStringList scope = def->scope(); + TQStringList scope = def->scope(); if ( !(scopeIndex >= (signed) scope.size()) ) { NamespaceDom ns_next = ns->namespaceByName( scope[ scopeIndex ] ); if ( ns_next ) { @@ -1231,10 +1231,10 @@ FunctionDom CppSupportPart::findFunctionInNamespace( const NamespaceDom& ns, con } FunctionDom CppSupportPart::findFunctionInClass( const ClassDom& cs, const FunctionDom& def, const std::set<NamespaceImportModel>& nsImports, - const QString& candidateFile, int scopeIndex, FunctionDom& bestMatch ) + const TQString& candidateFile, int scopeIndex, FunctionDom& bestMatch ) { FunctionDom d; - QStringList scope = def->scope(); + TQStringList scope = def->scope(); if ( !(scopeIndex >= (signed) scope.size()) ) { ClassList classList = cs->classByName( scope[ scopeIndex ] ); for ( ClassList::ConstIterator it_cs = classList.begin(); it_cs != classList.end(); ) { @@ -1270,7 +1270,7 @@ FunctionDom CppSupportPart::findFunctionDefinition( const FunctionDom& decl ) // Since the definition can be the child of any namespace in its scope depending on syntax, we have to check every one. FunctionDom def, bestMatch; NamespaceDom ns = codeModel()->globalNamespace(); - QString candidateFile = sourceOrHeaderCandidate( decl->fileName() ); + TQString candidateFile = sourceOrHeaderCandidate( decl->fileName() ); FunctionDefinitionList functionList = ns->functionDefinitionByName( decl->name() ); for ( FunctionDefinitionList::ConstIterator it_def = functionList.begin(); it_def != functionList.end() && !def; ++it_def ) { if ( CodeModelUtils::compareDeclarationToDefinition( decl, *it_def, ns->namespaceImports() ) ) { @@ -1288,8 +1288,8 @@ FunctionDom CppSupportPart::findFunctionDefinition( const FunctionDom& decl ) } } } - QStringList scope = decl->scope(); - for ( QStringList::ConstIterator it_scope = scope.begin(); it_scope != scope.end() && !def; ++it_scope ) { + TQStringList scope = decl->scope(); + for ( TQStringList::ConstIterator it_scope = scope.begin(); it_scope != scope.end() && !def; ++it_scope ) { NamespaceDom ns_next = ns->namespaceByName( *it_scope ); if ( ns_next ) { ns = ns_next; @@ -1351,15 +1351,15 @@ KDevLanguageSupport::Features CppSupportPart::features() return Features ( Structs | Functions | Variables | Declarations ); } -QString CppSupportPart::formatClassName( const QString &name ) +TQString CppSupportPart::formatClassName( const TQString &name ) { - QString n = name; + TQString n = name; return n.replace( ".", "::" ); } -QString CppSupportPart::unformatClassName( const QString &name ) +TQString CppSupportPart::unformatClassName( const TQString &name ) { - QString n = name; + TQString n = name; return n.replace( "::", "." ); } @@ -1372,7 +1372,7 @@ bool CppSupportPart::shouldSplitDocument(const KURL &url) KURL::List::ConstIterator it = list.begin(); while ( it != list.end() ) { - QString candidate = sourceOrHeaderCandidate( ( *it ) ); + TQString candidate = sourceOrHeaderCandidate( ( *it ) ); if ( candidate.isEmpty() ) { ++it; @@ -1395,7 +1395,7 @@ bool CppSupportPart::shouldSplitDocument(const KURL &url) Qt::Orientation CppSupportPart::splitOrientation() const { - QString o = splitHeaderSourceConfig()->orientation(); + TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) return Qt::Vertical; else @@ -1467,29 +1467,29 @@ bool CppSupportPart::parseProject( bool force ) kapp->setOverrideCursor( waitCursor ); _jd = new JobData; - if( QFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower() + if( TQFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower() + ".kdevelop.pcs" ).exists()) { - QDir d( project() ->projectDirectory()); + TQDir d( project() ->projectDirectory()); d.rename(project() ->projectName().lower() + ".kdevelop.pcs", project() ->projectName() +".kdevelop.pcs"); } _jd->file.setName( project() ->projectDirectory() + "/" + project()->projectName() + ".kdevelop.pcs" ); - QString skip_file_name = project() ->projectDirectory() + "/" + + TQString skip_file_name = project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.ignore_pcs"; - QString skip_lower_file_name = project() ->projectDirectory() + "/" + + TQString skip_lower_file_name = project() ->projectDirectory() + "/" + project() ->projectName().lower() + ".kdevelop.ignore_pcs"; - if ( !force && !QFile::exists( skip_file_name ) && - !QFile::exists( skip_lower_file_name ) && _jd->file.open( IO_ReadOnly ) ) + if ( !force && !TQFile::exists( skip_file_name ) && + !TQFile::exists( skip_lower_file_name ) && _jd->file.open( IO_ReadOnly ) ) { _jd->stream.setDevice( &( _jd->file ) ); createIgnorePCSFile(); - QString sig; + TQString sig; int pcs_version = 0; _jd->stream >> sig >> pcs_version; if ( sig == "PCS" && pcs_version == KDEV_PCS_VERSION ) @@ -1501,7 +1501,7 @@ bool CppSupportPart::parseProject( bool force ) for ( int i = 0; i < numFiles; ++i ) { - QString fn; + TQString fn; uint ts; uint offset; @@ -1513,7 +1513,7 @@ bool CppSupportPart::parseProject( bool force ) _jd->files = reorder( modifiedFileList() ); - QProgressBar* bar = new QProgressBar( _jd->files.count( ), mainWindow( ) ->statusBar( ) ); + TQProgressBar* bar = new TQProgressBar( _jd->files.count( ), mainWindow( ) ->statusBar( ) ); bar->setMinimumWidth( 120 ); bar->setCenterIndicator( true ); mainWindow( ) ->statusBar( ) ->addWidget( bar ); @@ -1522,11 +1522,11 @@ bool CppSupportPart::parseProject( bool force ) _jd->progressBar = bar; _jd->dir.setPath( m_projectDirectory ); _jd->it = _jd->files.begin(); - _jd->reparseList = QStringList(); + _jd->reparseList = TQStringList(); _jd->backgroundCount = 0; _jd->cycle = 0; - QTimer::singleShot( 0, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); m_saveMemoryTimer->stop(); //Do not regularly remove cached files that may still be needed while parsing(the cache anyway be full for the whole parsing-process) return true; @@ -1544,15 +1544,15 @@ void CppSupportPart::slotParseFiles() { _jd->progressBar->setProgress( _jd->progressBar->progress() + 1 ); - QFileInfo fileInfo( _jd->dir, *( _jd->it ) ); + TQFileInfo fileInfo( _jd->dir, *( _jd->it ) ); if ( fileInfo.exists() && fileInfo.isFile() && fileInfo.isReadable() ) { - QString absFilePath = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQString absFilePath = URLUtil::canonicalPath( fileInfo.absFilePath() ); if ( isValidSource( absFilePath ) ) { - QDateTime t = fileInfo.lastModified(); + TQDateTime t = fileInfo.lastModified(); if ( ! ( m_timestamp.contains( absFilePath ) && m_timestamp[ absFilePath ] == t ) ) { @@ -1583,7 +1583,7 @@ void CppSupportPart::slotParseFiles() } ++( _jd->it ); - QTimer::singleShot( 0, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); if( _jd->it == _jd->files.end()) { if( _jd->reparseList.isEmpty() ) { @@ -1603,7 +1603,7 @@ void CppSupportPart::slotParseFiles() _jd->lastBackgroundState = -1; _jd->backgroundState = 0; _jd->cycle = 1; - _jd->lastParse = QTime::currentTime(); + _jd->lastParse = TQTime::currentTime(); kapp->restoreOverrideCursor( ); } } @@ -1618,10 +1618,10 @@ void CppSupportPart::slotParseFiles() kapp->restoreOverrideCursor( ); emit updatedSourceInfo(); mainWindow( ) ->statusBar( ) ->message( i18n( "Done" ), 2000 ); - QFile::remove( project() ->projectDirectory() + TQFile::remove( project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.ignore_pcs" ); - QFile::remove( project() ->projectDirectory() + TQFile::remove( project() ->projectDirectory() + "/" + project() ->projectName().lower() + ".kdevelop.ignore_pcs" ); @@ -1637,13 +1637,13 @@ void CppSupportPart::slotParseFiles() } else { _jd->progressBar->setProgress( _jd->backgroundState ); ///restart _jd->progressBar->setTotalSteps( _jd->backgroundCount ); - if( _jd->lastParse.msecsTo( QTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) { + if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) { _jd->backgroundCount = _jd->backgroundState; ///Stop waiting if there is no progress and no file in the background-parser - QTimer::singleShot( 0, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); } else { int timeStep = 0; if( alwaysParseInBackground ) { - QTimer::singleShot( 10, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 10, this, TQT_SLOT( slotParseFiles() ) ); } else { if( _jd->it == _jd->reparseList.end() ) { /*_jd->it = _jd->files.end(); @@ -1651,7 +1651,7 @@ void CppSupportPart::slotParseFiles() timeStep = 1; } else { /*///Parse the files one by one - if( _jd->lastParse.msecsTo( QTime::currentTime()) > 100 || _jd->backgroundState != _jd->lastBackgroundState ) {*/ + if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 100 || _jd->backgroundState != _jd->lastBackgroundState ) {*/ maybeParse( *_jd->it, false ); ++(_jd->it); _jd->lastBackgroundState = _jd->backgroundState; @@ -1659,41 +1659,41 @@ void CppSupportPart::slotParseFiles() timeStep = 1; }*/ } - QTimer::singleShot( timeStep, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( timeStep, this, TQT_SLOT( slotParseFiles() ) ); } } } } } -void CppSupportPart::maybeParse( const QString& fn, bool background ) +void CppSupportPart::maybeParse( const TQString& fn, bool background ) { if ( !isValidSource( fn ) ) return ; - QFileInfo fileInfo( fn ); - QString path = URLUtil::canonicalPath( fn ); - QDateTime t = fileInfo.lastModified(); + TQFileInfo fileInfo( fn ); + TQString path = URLUtil::canonicalPath( fn ); + TQDateTime t = fileInfo.lastModified(); if ( !fileInfo.exists() ) return; - QMap<QString, QDateTime>::Iterator it = m_timestamp.find( path ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path ); if ( codeModel()->hasFile( fn ) && it != m_timestamp.end() && *it == t ) return; - QStringList l; + TQStringList l; l << fn; parseFilesAndDependencies( l, background ); } -bool CppSupportPart::isQueued( const QString& file ) const { +bool CppSupportPart::isQueued( const TQString& file ) const { //int c = m_backgroundParser->countInQueue( file ); //if( c == 0 ) return false; return m_parseEmitWaiting.waiting( file, ParseEmitWaiting::Silent, 2 ); //Since it may be possible that the background-parser is currently parsing the file(in an obselete state), it is allowed to have the file in the queue twice. } -void CppSupportPart::slotNeedTextHint( int line, int column, QString& textHint ) +void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint ) { if ( 1 || !m_activeEditor ) return ; @@ -1723,7 +1723,7 @@ void CppSupportPart::slotNeedTextHint( int line, int column, QString& textHint ) m_backgroundParser->unlock(); } -void CppSupportPart::MakeMemberHelper( QString& text, int& atLine, int& atColumn ) +void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColumn ) { if ( !m_activeViewCursor || !m_valid ) return ; @@ -1731,7 +1731,7 @@ void CppSupportPart::MakeMemberHelper( QString& text, int& atLine, int& atColumn atLine = -2; atColumn = 0; - QString implFile = findSourceFile(); + TQString implFile = findSourceFile(); m_backgroundParser->lock(); TranslationUnitAST* translationUnit = *m_backgroundParser->translationUnit( m_activeFileName ); @@ -1767,33 +1767,33 @@ void CppSupportPart::MakeMemberHelper( QString& text, int& atLine, int& atColumn if ( !fail && decl && declarator && declarator->parameterDeclarationClause() ) { - QStringList scope; + TQStringList scope; scopeOfNode( decl, scope ); - QString scopeStr = scope.join( "::" ); + TQString scopeStr = scope.join( "::" ); if ( !scopeStr.isEmpty() ) scopeStr += "::"; - QString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace(); + TQString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace(); if ( declarator->exceptionSpecification() ) { - declStr += QString::fromLatin1( " throw( " ); - QPtrList<AST> l = declarator->exceptionSpecification() ->nodeList(); - QPtrListIterator<AST> type_it( l ); + declStr += TQString::fromLatin1( " throw( " ); + TQPtrList<AST> l = declarator->exceptionSpecification() ->nodeList(); + TQPtrListIterator<AST> type_it( l ); while ( type_it.current() ) { declStr += type_it.current() ->text(); ++type_it; if ( type_it.current() ) - declStr += QString::fromLatin1( ", " ); + declStr += TQString::fromLatin1( ", " ); } - declStr += QString::fromLatin1( " )" ); + declStr += TQString::fromLatin1( " )" ); } text += "\n\n"; - QString type = typeSpecToString( decl->typeSpec() ); + TQString type = typeSpecToString( decl->typeSpec() ); text += type; if ( !type.isNull() ) text += + " "; @@ -1815,18 +1815,18 @@ void CppSupportPart::MakeMemberHelper( QString& text, int& atLine, int& atColumn void CppSupportPart::slotMakeMember() { - QString text; + TQString text; int atColumn, atLine; MakeMemberHelper( text, atLine, atColumn ); if ( !text.isEmpty() ) { - QString implFile = findSourceFile(); + TQString implFile = findSourceFile(); if ( !implFile.isEmpty() ) { partController() ->editDocument( KURL( implFile ) ); - kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput | QEventLoop::ExcludeSocketNotifiers, 500 ); + kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 ); } if ( atLine == -2 ) atLine = m_activeEditor->numLines() - 1; @@ -1845,17 +1845,17 @@ void CppSupportPart::slotMakeMember() } } -QStringList CppSupportPart::subclassWidget( const QString& formName ) +TQStringList CppSupportPart::subclassWidget( const TQString& formName ) { - QStringList newFileNames; + TQStringList newFileNames; SubclassingDlg *dlg = new SubclassingDlg( this, formName, newFileNames ); dlg->exec(); return newFileNames; } -QStringList CppSupportPart::updateWidget( const QString& formName, const QString& fileName ) +TQStringList CppSupportPart::updateWidget( const TQString& formName, const TQString& fileName ) { - QStringList dummy; + TQStringList dummy; SubclassingDlg *dlg = new SubclassingDlg( this, formName, fileName, dummy ); dlg->exec(); return dummy; @@ -1868,11 +1868,11 @@ void CppSupportPart::partRemoved( KParts::Part* part ) if ( KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( part ) ) { - QString fileName = doc->url().path(); + TQString fileName = doc->url().path(); if ( !isValidSource( fileName ) ) return ; - QString canonicalFileName = URLUtil::canonicalPath( fileName ); + TQString canonicalFileName = URLUtil::canonicalPath( fileName ); m_backgroundParser->removeFile( canonicalFileName ); m_backgroundParser->addFile( canonicalFileName, true ); } @@ -1884,26 +1884,26 @@ void CppSupportPart::slotProjectCompiled() parseProject(); } -QStringList CppSupportPart::modifiedFileList() +TQStringList CppSupportPart::modifiedFileList() { - QStringList lst; + TQStringList lst; - QStringList fileList = m_projectFileList; - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = m_projectFileList; + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { - QString fileName = *it; + TQString fileName = *it; ++it; - QFileInfo fileInfo( m_projectDirectory, fileName ); - QString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQFileInfo fileInfo( m_projectDirectory, fileName ); + TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); if ( !( isSource( path ) || isHeader( path ) ) ) continue; - QDateTime t = fileInfo.lastModified(); + TQDateTime t = fileInfo.lastModified(); - QMap<QString, QDateTime>::Iterator dictIt = m_timestamp.find( path ); + TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path ); if ( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t ) continue; @@ -1918,8 +1918,8 @@ KTextEditor::Document * CppSupportPart::findDocument( const KURL & url ) if ( !partController() ->parts() ) return 0; - QPtrList<KParts::Part> parts( *partController() ->parts() ); - QPtrListIterator<KParts::Part> it( parts ); + TQPtrList<KParts::Part> parts( *partController() ->parts() ); + TQPtrListIterator<KParts::Part> it( parts ); while ( KParts::Part * part = it.current() ) { KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( part ); @@ -1936,16 +1936,16 @@ void CppSupportPart::setupCatalog( ) kdDebug( 9007 ) << "CppSupportPart::setupCatalog()" << endl; KStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); - QStringList pcsList = dirs->findAllResources( "pcs", "*.db", false, true ); - QStringList pcsIdxList = dirs->findAllResources( "pcs", "*.idx", false, true ); + TQStringList pcsList = dirs->findAllResources( "pcs", "*.db", false, true ); + TQStringList pcsIdxList = dirs->findAllResources( "pcs", "*.idx", false, true ); - QStringList enabledPCSs; + TQStringList enabledPCSs; if ( DomUtil::elementByPath( *project() ->projectDom(), "kdevcppsupport/references" ).isNull() ) { - for ( QStringList::Iterator it = pcsList.begin(); it != pcsList.end(); ++it ) + for ( TQStringList::Iterator it = pcsList.begin(); it != pcsList.end(); ++it ) { kdDebug( 9007 ) << "CppSupportPart::setupCatalog()1 " << *it << endl; - enabledPCSs.push_back( QFileInfo( *it ).baseName(true) ); + enabledPCSs.push_back( TQFileInfo( *it ).baseName(true) ); } } else @@ -1953,18 +1953,18 @@ void CppSupportPart::setupCatalog( ) enabledPCSs = DomUtil::readListEntry( *project() ->projectDom(), "kdevcppsupport/references", "pcs" ); } - QStringList indexList = QStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; + TQStringList indexList = TQStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; if ( pcsList.size() && pcsVersion() < KDEV_DB_VERSION ) { - QStringList l = pcsList + pcsIdxList; + TQStringList l = pcsList + pcsIdxList; int rtn = KMessageBox::questionYesNoList( 0, i18n( "Persistent class store will be disabled: you have a wrong version of pcs installed.\nRemove old pcs files?" ), l, i18n( "C++ Support" ), KStdGuiItem::del(), KStdGuiItem::cancel() ); if ( rtn == KMessageBox::Yes ) { - QStringList::Iterator it = l.begin(); + TQStringList::Iterator it = l.begin(); while ( it != l.end() ) { - QFile::remove + TQFile::remove ( *it ); ++it; } @@ -1977,16 +1977,16 @@ void CppSupportPart::setupCatalog( ) } } - QStringList::Iterator it = pcsList.begin(); + TQStringList::Iterator it = pcsList.begin(); while ( it != pcsList.end() ) { kdDebug( 9007 ) << "CppSupportPart::setupCatalog()2 " << *it << endl; Catalog * catalog = new Catalog(); catalog->open( *it ); - catalog->setEnabled( enabledPCSs.contains( QFileInfo( *it ).baseName(true) ) ); + catalog->setEnabled( enabledPCSs.contains( TQFileInfo( *it ).baseName(true) ) ); ++it; - for ( QStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) + for ( TQStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) catalog->addIndex( ( *idxIt ).utf8() ); m_catalogList.append( catalog ); @@ -1998,12 +1998,12 @@ void CppSupportPart::setupCatalog( ) KMimeType::List CppSupportPart::mimeTypes( ) { - QStringList mimeList; + TQStringList mimeList; mimeList += m_headerMimeTypes; mimeList += m_sourceMimeTypes; KMimeType::List list; - for ( QStringList::Iterator it = mimeList.begin(); it != mimeList.end(); ++it ) + for ( TQStringList::Iterator it = mimeList.begin(); it != mimeList.end(); ++it ) { if ( KMimeType::Ptr mime = KMimeType::mimeType( *it ) ) list << mime; @@ -2027,17 +2027,17 @@ void CppSupportPart::setPcsVersion( int version ) config->sync(); } -QString CppSupportPart::formatTag( const Tag & inputTag ) +TQString CppSupportPart::formatTag( const Tag & inputTag ) { Tag tag = inputTag; switch ( tag.kind() ) { case Tag::Kind_Namespace: - return QString::fromLatin1( "namespace " ) + tag.name(); + return TQString::fromLatin1( "namespace " ) + tag.name(); case Tag::Kind_Class: - return QString::fromLatin1( "class " ) + tag.name(); + return TQString::fromLatin1( "class " ) + tag.name(); case Tag::Kind_Function: case Tag::Kind_FunctionDeclaration: @@ -2075,14 +2075,14 @@ void CppSupportPart::codeCompletionConfigStored( ) void CppSupportPart::splitHeaderSourceConfigStored( ) { - QString o = splitHeaderSourceConfig()->orientation(); + TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) emit splitOrientationChanged( Qt::Vertical ); else if ( o == "Horizontal" ) emit splitOrientationChanged( Qt::Horizontal ); } -void CppSupportPart::removeWithReferences( const QString & fileName ) +void CppSupportPart::removeWithReferences( const TQString & fileName ) { kdDebug( 9007 ) << "remove with references: " << fileName << endl; m_timestamp.remove( fileName ); @@ -2094,23 +2094,23 @@ kdDebug( 9007 ) << "remove with references: " << fileName << endl; codeModel() ->removeFile( codeModel() ->fileByName( fileName ) ); } -bool CppSupportPart::isValidSource( const QString& fileName ) const +bool CppSupportPart::isValidSource( const TQString& fileName ) const { - QFileInfo fileInfo( fileName ); - QString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQFileInfo fileInfo( fileName ); + TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); return /*project() && project() ->isProjectFile( path ) &&*/ ( isSource( path ) || isHeader( path ) ) - && !QFile::exists( fileInfo.dirPath( true ) + "/.kdev_ignore" ); + && !TQFile::exists( fileInfo.dirPath( true ) + "/.kdev_ignore" ); } -QString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription ) +TQString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription ) { if ( item->isFunction() || item->isFunctionDefinition() ) { const FunctionModel * model = static_cast<const FunctionModel*>( item ); - QString function; - QString args; + TQString function; + TQString args; ArgumentList argumentList = model->argumentList(); for ( ArgumentList::const_iterator it = argumentList.begin(); it != argumentList.end(); ++it ) { @@ -2118,10 +2118,10 @@ QString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortDe args += formatModelItem( ( *it ).data() ); } if ( !shortDescription ) - function += ( model->isVirtual() ? QString( "virtual " ) : QString( "" ) ) + model->resultType() + " "; + function += ( model->isVirtual() ? TQString( "virtual " ) : TQString( "" ) ) + model->resultType() + " "; - function += model->name() + "(" + args + ")" + ( model->isConstant() ? QString( " const" ) : QString( "" ) ) + - ( model->isAbstract() ? QString( " = 0" ) : QString( "" ) ); + function += model->name() + "(" + args + ")" + ( model->isConstant() ? TQString( " const" ) : TQString( "" ) ) + + ( model->isAbstract() ? TQString( " = 0" ) : TQString( "" ) ); return function; } @@ -2135,12 +2135,12 @@ QString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortDe else if ( item->isArgument() ) { const ArgumentModel * model = static_cast<const ArgumentModel*>( item ); - QString arg; + TQString arg; if ( !shortDescription ) arg += model->type() + " "; arg += model->name(); if ( !shortDescription ) - arg += model->defaultValue().isEmpty() ? QString( "" ) : QString( " = " ) + model->defaultValue(); + arg += model->defaultValue().isEmpty() ? TQString( "" ) : TQString( " = " ) + model->defaultValue(); return arg.stripWhiteSpace(); } else @@ -2159,7 +2159,7 @@ void CppSupportPart::saveProjectSourceInfo() if ( !project() || fileList.isEmpty() ) return ; - QFile f( project() ->projectDirectory() + "/" + TQFile f( project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.pcs" ); if ( !f.open( IO_WriteOnly ) ) return ; @@ -2168,10 +2168,10 @@ void CppSupportPart::saveProjectSourceInfo() createIgnorePCSFile(); - QDataStream stream( &f ); - QMap<QString, uint> offsets; + TQDataStream stream( &f ); + TQMap<TQString, uint> offsets; - QString pcs( "PCS" ); + TQString pcs( "PCS" ); stream << pcs << KDEV_PCS_VERSION; stream << int( fileList.size() ); @@ -2200,22 +2200,22 @@ void CppSupportPart::saveProjectSourceInfo() stream.device() ->at( end ); } - QFile::remove( project() ->projectDirectory() + "/" + TQFile::remove( project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.ignore_pcs" ); - QFile::remove( project() ->projectDirectory() + "/" + TQFile::remove( project() ->projectDirectory() + "/" + project() ->projectName().lower() + ".kdevelop.ignore_pcs" ); m_backgroundParser->unlock(); } -QString CppSupportPart::extractInterface( const ClassDom& klass ) +TQString CppSupportPart::extractInterface( const ClassDom& klass ) { - QString txt; - QTextStream stream( &txt, IO_WriteOnly ); + TQString txt; + TQTextStream stream( &txt, IO_WriteOnly ); - QString name = klass->name() + "Interface"; - QString ind; - ind.fill( QChar( ' ' ), 4 ); + TQString name = klass->name() + "Interface"; + TQString ind; + ind.fill( TQChar( ' ' ), 4 ); stream << "class " << name << "\n" @@ -2255,21 +2255,21 @@ void CppSupportPart::slotExtractInterface( ) if ( !m_activeClass ) return ; - QFileInfo fileInfo( m_activeClass->fileName() ); - QString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h"; - if ( QFile::exists( ifaceFileName ) ) + TQFileInfo fileInfo( m_activeClass->fileName() ); + TQString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h"; + if ( TQFile::exists( ifaceFileName ) ) { KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).arg( ifaceFileName ), i18n( "C++ Support" ) ); } else { - QString text = extractInterface( m_activeClass ); + TQString text = extractInterface( m_activeClass ); - QFile f( ifaceFileName ); + TQFile f( ifaceFileName ); if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << "#ifndef __" << m_activeClass->name().upper() << "_INTERFACE_H" << "\n" << "#define __" << m_activeClass->name().upper() << "_INTERFACE_H" << "\n" @@ -2298,19 +2298,19 @@ void CppSupportPart::gotoLine( int line ) m_activeViewCursor->setCursorPositionReal( line, 0 ); } -FileDom CppSupportPart::fileByName( const QString& name) { +FileDom CppSupportPart::fileByName( const TQString& name) { return codeModel()->fileByName( name ); } -int CppSupportPart::parseFilesAndDependencies( QStringList files, bool background, bool parseFirst, bool silent ) { - QMap<QString, int> fileGroups; +int CppSupportPart::parseFilesAndDependencies( TQStringList files, bool background, bool parseFirst, bool silent ) { + TQMap<TQString, int> fileGroups; int nextGroup = 0; - for( QStringList::iterator it = files.begin(); it != files.end(); ++it ) { + for( TQStringList::iterator it = files.begin(); it != files.end(); ++it ) { FileDom d = fileByName( *it ); - QStringList lst; + TQStringList lst; if( !d ) { lst << *it; }else{ @@ -2326,20 +2326,20 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun if( fileGroups.find( *it ) != fileGroups.end() ) cgroup = fileGroups[*it]; - for( QStringList::iterator lit = lst.begin(); lit != lst.end(); ++lit ) + for( TQStringList::iterator lit = lst.begin(); lit != lst.end(); ++lit ) fileGroups[*lit] = cgroup; } - QValueVector<QStringList> groups; + TQValueVector<TQStringList> groups; groups.resize( nextGroup ); ///put the groups together - for( QMap<QString, int>::iterator it = fileGroups.begin(); it != fileGroups.end(); ++it ) { + for( TQMap<TQString, int>::iterator it = fileGroups.begin(); it != fileGroups.end(); ++it ) { groups[*it] << it.key(); } for( int a = 0; a < nextGroup; a++ ) { - QStringList group = reorder( groups[a] ); + TQStringList group = reorder( groups[a] ); /* kdDebug( 9007 ) << "reparsing the following group: " << ":\n" << group.join("\n") << "\n\n";*/ @@ -2361,7 +2361,7 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun } if( parseFirst && !group.empty() ) { - for(QStringList::iterator it = --group.end(); it != group.end(); ) { + for(TQStringList::iterator it = --group.end(); it != group.end(); ) { backgroundParser()->addFileFront(*it); if( it == group.begin() ) { it = group.end(); @@ -2370,7 +2370,7 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun } } } else { - for(QStringList::iterator it = group.begin(); it != group.end(); ++it) { + for(TQStringList::iterator it = group.begin(); it != group.end(); ++it) { backgroundParser()->addFile(*it); } } @@ -2378,7 +2378,7 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun m_backgroundParser->unlock(); } else { - for(QStringList::iterator it = group.begin(); it != group.end(); ++it) { + for(TQStringList::iterator it = group.begin(); it != group.end(); ++it) { m_driver->parseFile( *it ); } } @@ -2387,7 +2387,7 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun return fileGroups.count(); } -int CppSupportPart::parseFileAndDependencies( const QString & fileName, bool background, bool parseFirst, bool silent ) { +int CppSupportPart::parseFileAndDependencies( const TQString & fileName, bool background, bool parseFirst, bool silent ) { if(! isValidSource( fileName ) ) return 0; // kdDebug( 9007 ) << "reparsing dependencies of " << fileName << "\n"; @@ -2400,7 +2400,7 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { bool modelHasFiles = true; - for( QStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) { + for( TQStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) { if( !codeModel()->hasFile( *it ) ) modelHasFiles = false; } @@ -2409,16 +2409,16 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { if( (files.flag & ParseEmitWaiting::HadErrors) && modelHasFiles && !files.hasFlag( ParseEmitWaiting::Silent ) ) { mainWindow() ->statusBar() ->message( "File parsed, but not updating code-model because of errors", 2000 ); kdDebug( 9007 ) << "not updating code-model because at least one file has errors" << endl; - // for( QStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) + // for( TQStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) // m_backgroundParser->removeFile( *it ); } else { ///update timestamps - for( QStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) { + for( TQStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) { if( !codeModel()->hasFile( *it ) ) modelHasFiles = false; - QString& fileName = *it; + TQString& fileName = *it; - QFileInfo fileInfo( fileName ); - QString path = URLUtil::canonicalPath( fileName ); + TQFileInfo fileInfo( fileName ); + TQString path = URLUtil::canonicalPath( fileName ); if ( !fileInfo.exists() ) { removeWithReferences( path ); @@ -2433,15 +2433,15 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { m_backgroundParser->lock(); - QStringList l = files.res; + TQStringList l = files.res; - QMap<QString, bool> wholeResult; - QStringList missing; + TQMap<TQString, bool> wholeResult; + TQStringList missing; - QMap<QString, FileDom> newFiles; + TQMap<TQString, FileDom> newFiles; while(!l.isEmpty() ) { - QString fileName = l.front(); + TQString fileName = l.front(); if( !m_backgroundParser->hasTranslationUnit( fileName ) ) { kdDebug( 9007 ) << "error: translation-unit is missing: " << fileName << endl; @@ -2462,8 +2462,8 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { newFiles[fileName] = walker.file(); ///update timestamps - QFileInfo fileInfo( fileName ); - QString path = URLUtil::canonicalPath( fileName ); + TQFileInfo fileInfo( fileName ); + TQString path = URLUtil::canonicalPath( fileName ); m_timestamp[ path ] = fileInfo.lastModified(); } else { @@ -2471,8 +2471,8 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { } if( walker.file() ) { - QStringList grp = walker.file()->wholeGroupStrings(); - for( QStringList::const_iterator it = grp.begin(); it != grp.end(); ++it ) + TQStringList grp = walker.file()->wholeGroupStrings(); + for( TQStringList::const_iterator it = grp.begin(); it != grp.end(); ++it ) wholeResult[*it] = true; } } @@ -2486,7 +2486,7 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { } bool canUpdate = true; - for( QMap<QString, FileDom>::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { + for( TQMap<TQString, FileDom>::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { FileDom oldFile = codeModel()->fileByName( it.key() ); if( !oldFile || !oldFile->canUpdate( *it ) ) { @@ -2497,14 +2497,14 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { if( canUpdate ) { ///Update the code-model - for( QMap<QString, FileDom>::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { + for( TQMap<TQString, FileDom>::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { FileDom oldFile = codeModel()->fileByName( it.key() ); oldFile->update( *it ); codeModel()->mergeGroups( oldFile->groupId(), (*it)->groupId() ); ///Merge parsing-groups together } } else { ///Remove the current files and replace them with the new ones - for( QMap<QString, FileDom>::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { + for( TQMap<TQString, FileDom>::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { removeWithReferences( it.key() ); codeModel()->addFile( *it ); } @@ -2513,7 +2513,7 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { ///make the list unique l.clear(); - for( QMap<QString, bool>::const_iterator it = wholeResult.begin(); it != wholeResult.end(); ++it ) + for( TQMap<TQString, bool>::const_iterator it = wholeResult.begin(); it != wholeResult.end(); ++it ) l << it.key();*/ m_backgroundParser->unlock(); @@ -2526,11 +2526,11 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { if( files.hasFlag( ParseEmitWaiting::Silent ) ) { if( alwaysParseInBackground ) - for( QStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) + for( TQStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) m_backgroundParser->removeFile( *it ); } else { if( !canUpdate ) { ///If the current model could be updated, do not emit addedSourceInfo(..) and remove the units from the parser, because nobody will be using them - QStringList l = files.res; + TQStringList l = files.res; while(!l.isEmpty() ) { emit aboutToRemoveSourceInfo( l.front() ); emit removedSourceInfo( l.front() ); @@ -2541,7 +2541,7 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { if( !files.hasFlag( ParseEmitWaiting::Silent ) ) emitFileParsed( files ); } else { - QStringList l = files.res; + TQStringList l = files.res; while( !l.isEmpty() ) { emit codeModelUpdated( l.front() ); emit aboutToRemoveSourceInfo( l.front() ); @@ -2555,16 +2555,16 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { } } -/*void CppSupportPart::recomputeCodeModel( const QString& fileName ) +/*void CppSupportPart::recomputeCodeModel( const TQString& fileName ) {*/ //} -void CppSupportPart::emitSynchronousParseReady( const QString& file, ParsedFilePointer unit ) { +void CppSupportPart::emitSynchronousParseReady( const TQString& file, ParsedFilePointer unit ) { emit synchronousParseReady( file, unit ); } -void CppSupportPart::emitFileParsed( QStringList l ) +void CppSupportPart::emitFileParsed( TQStringList l ) { while( !l.isEmpty() ) { emit fileParsed( l.front() ); @@ -2572,22 +2572,22 @@ void CppSupportPart::emitFileParsed( QStringList l ) } } -bool CppSupportPart::isHeader( const QString& fileName ) const +bool CppSupportPart::isHeader( const TQString& fileName ) const { /*KMimeType::Ptr ptr = KMimeType::findByPath( fileName ); if ( ptr && m_headerMimeTypes.contains( ptr->name() ) ) return true;*/ - return ( m_headerExtensions.findIndex( QFileInfo( fileName ).extension() ) != -1 ); + return ( m_headerExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 ); } -bool CppSupportPart::isSource( const QString& fileName ) const +bool CppSupportPart::isSource( const TQString& fileName ) const { /*KMimeType::Ptr ptr = KMimeType::findByPath( fileName ); if ( ptr && m_sourceMimeTypes.contains( ptr->name() ) ) return true;*/ - return ( m_sourceExtensions.findIndex( QFileInfo( fileName ).extension() ) != -1 ); + return ( m_sourceExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 ); } void CppSupportPart::gotoDeclarationLine( int line ) @@ -2602,14 +2602,14 @@ void CppSupportPart::gotoDeclarationLine( int line ) } } -void CppSupportPart::removeCatalog( const QString & dbName ) +void CppSupportPart::removeCatalog( const TQString & dbName ) { - if ( !QFile::exists( dbName ) ) + if ( !TQFile::exists( dbName ) ) return ; - QValueList<Catalog*> catalogs = codeRepository() ->registeredCatalogs(); + TQValueList<Catalog*> catalogs = codeRepository() ->registeredCatalogs(); Catalog* c = 0; - for ( QValueList<Catalog*>::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) + for ( TQValueList<Catalog*>::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { if ( ( *it ) ->dbName() == dbName ) { @@ -2624,15 +2624,15 @@ void CppSupportPart::removeCatalog( const QString & dbName ) m_catalogList.remove( c ); } - QFileInfo fileInfo( dbName ); - QDir dir( fileInfo.dir( true ) ); - QStringList indexList = QStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; - for(QStringList::Iterator iter = indexList.begin(); iter != indexList.end(); iter++) + TQFileInfo fileInfo( dbName ); + TQDir dir( fileInfo.dir( true ) ); + TQStringList indexList = TQStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; + for(TQStringList::Iterator iter = indexList.begin(); iter != indexList.end(); iter++) { - QStringList fileList = dir.entryList( fileInfo.baseName(true) +"." +(*iter) + ".idx" ); - for ( QStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) + TQStringList fileList = dir.entryList( fileInfo.baseName(true) +"." +(*iter) + ".idx" ); + for ( TQStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { - QString idxName = fileInfo.dirPath( true ) + "/" + *it; + TQString idxName = fileInfo.dirPath( true ) + "/" + *it; kdDebug( 9007 ) << "=========> remove db index: " << idxName << endl; dir.remove( *it ); } @@ -2679,7 +2679,7 @@ void CppSupportPart::slotCursorPositionChanged() unsigned int column = 0; if ( KDevEditorUtil::currentPositionReal( &line, &column, dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) ) { - QString typeInfoString = codeCompletion()->createTypeInfoString( line, column ); + TQString typeInfoString = codeCompletion()->createTypeInfoString( line, column ); mainWindow()->statusBar()->message( typeInfoString ); } } @@ -2697,8 +2697,8 @@ void CppSupportPart::slotFunctionHint( ) // m_functionHintTimer->stop(); if ( FunctionDefinitionDom fun = currentFunctionDefinition() ) { - QStringList scope = fun->scope(); - QString funName = scope.join( "::" ); + TQStringList scope = fun->scope(); + TQString funName = scope.join( "::" ); if ( !funName.isEmpty() ) funName += "::"; @@ -2711,11 +2711,11 @@ void CppSupportPart::slotFunctionHint( ) void CppSupportPart::createIgnorePCSFile( ) { - static QCString skip_me( "ignore me\n" ); + static TQCString skip_me( "ignore me\n" ); - QString skip_file_name = project() ->projectDirectory() + "/" + TQString skip_file_name = project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.ignore_pcs"; - QFile skip_pcs_file( skip_file_name ); + TQFile skip_pcs_file( skip_file_name ); if ( skip_pcs_file.open( IO_WriteOnly ) ) { skip_pcs_file.writeBlock( skip_me ); @@ -2723,7 +2723,7 @@ void CppSupportPart::createIgnorePCSFile( ) } } -QString CppSupportPart::specialHeaderName( bool local ) const +TQString CppSupportPart::specialHeaderName( bool local ) const { if ( local ) return ::locateLocal( "data", "kdevcppsupport/configuration", CppSupportFactory::instance() ); @@ -2735,7 +2735,7 @@ void CppSupportPart::updateParserConfiguration() { m_backgroundParser->updateParserConfiguration(); - QString conf_file_name = specialHeaderName(); + TQString conf_file_name = specialHeaderName(); m_driver->removeAllMacrosInFile( conf_file_name ); dynamic_cast<KDevDriver*>(m_driver)->setup(); @@ -2788,7 +2788,7 @@ void CppSupportPart::slotDeleteParserStore() { void CppSupportPart::slotCreateSubclass() { - QFileInfo fi( m_contextFileName ); + TQFileInfo fi( m_contextFileName ); if ( fi.extension( false ) != "ui" ) return ; QtDesignerCppIntegration *des = dynamic_cast<QtDesignerCppIntegration*>( designer( KInterfaceDesigner::QtDesigner ) ); @@ -2796,10 +2796,10 @@ void CppSupportPart::slotCreateSubclass() des->selectImplementation( m_contextFileName ); } -void CppSupportPart::addMethod( ClassDom aClass, const QString& name, const QString type, - const QString& parameters, CodeModelItem::Access accessType, +void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQString type, + const TQString& parameters, CodeModelItem::Access accessType, bool isConst, bool isInline, bool isVirtual, bool isPureVirtual, - const QString& implementation ) + const TQString& implementation ) { partController() ->editDocument( KURL( aClass->fileName() ) ); KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( partController() ->activePart() ); @@ -2808,18 +2808,18 @@ void CppSupportPart::addMethod( ClassDom aClass, const QString& name, const QStr /// @fixme show messagebox return ; } - QString declarationString = type + " " + name + "(" + parameters + ")" + ( isConst ? " const" : "" ); + TQString declarationString = type + " " + name + "(" + parameters + ")" + ( isConst ? " const" : "" ); KDevSourceFormatter* sourceFormatter = extension<KDevSourceFormatter>( "KDevelop/SourceFormatter" ); - QString finalDeclaration = ( ( isVirtual || isPureVirtual ) ? "\nvirtual " : "\n" + declarationString + + TQString finalDeclaration = ( ( isVirtual || isPureVirtual ) ? "\nvirtual " : "\n" + declarationString + ( isPureVirtual ? " = 0 " : "" ) + ( isInline ? "\n{\n" + implementation + "\n}\n" : ";" ) ); if ( sourceFormatter != 0 ) finalDeclaration = sourceFormatter->formatSource( finalDeclaration ); - QString indentString = "\t"; + TQString indentString = "\t"; if ( sourceFormatter != 0 ) indentString = sourceFormatter->indentString(); @@ -2832,23 +2832,23 @@ void CppSupportPart::addMethod( ClassDom aClass, const QString& name, const QStr return ; // construct fully qualified name for method definition - QString fullyQualifiedName = aClass->scope().join("::"); + TQString fullyQualifiedName = aClass->scope().join("::"); if (! fullyQualifiedName.isEmpty()) { fullyQualifiedName += "::"; } fullyQualifiedName += aClass->name() + "::" + name; - QString definitionString = "\n" + type + " " + fullyQualifiedName + "(" + parameters + ")" + ( isConst ? " const" : "" ) + "\n{\n" + implementation + "\n}\n"; + TQString definitionString = "\n" + type + " " + fullyQualifiedName + "(" + parameters + ")" + ( isConst ? " const" : "" ) + "\n{\n" + implementation + "\n}\n"; if ( sourceFormatter != 0 ) definitionString = sourceFormatter->formatSource( definitionString ); - QFileInfo info( aClass->fileName() ); - QString implementationFile = info.dirPath( true ) + "/" + info.baseName() + ".cpp" ; - QFileInfo fileInfo( implementationFile ); + TQFileInfo info( aClass->fileName() ); + TQString implementationFile = info.dirPath( true ) + "/" + info.baseName() + ".cpp" ; + TQFileInfo fileInfo( implementationFile ); KDevCreateFile* createFileSupport = extension<KDevCreateFile>( "KDevelop/CreateFile" ); - if ( !QFile::exists( fileInfo.absFilePath() ) && createFileSupport != 0 ) + if ( !TQFile::exists( fileInfo.absFilePath() ) && createFileSupport != 0 ) createFileSupport->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() ); partController() ->editDocument( KURL( implementationFile ) ); @@ -2856,7 +2856,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const QString& name, const QStr if ( !editIface ) return ; //@fixme errorverdoedelung - editIface->insertLine( editIface->numLines(), QString::fromLatin1( "" ) ); + editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) ); editIface->insertText( editIface->numLines() - 1, 0, definitionString ); backgroundParser() ->addFile( implementationFile ); } @@ -3011,42 +3011,42 @@ void CppSupportPart::buildSafeFileSet() { SynchronizedFileSet::SetType files; //everything that goes into this set must be deep-copied kdDebug( 9007 ) << "CppSupportPart:: rebuilding safe-file-set" << endl; - for( QStringList::const_iterator it = m_projectFileList.begin(); it != m_projectFileList.end(); ++it ) { - QFileInfo fi( *it ); - QString file = *it; + for( TQStringList::const_iterator it = m_projectFileList.begin(); it != m_projectFileList.end(); ++it ) { + TQFileInfo fi( *it ); + TQString file = *it; if( fi.isRelative() ) { - fi.setFile( QDir(m_projectDirectory), *it ); + fi.setFile( TQDir(m_projectDirectory), *it ); file = fi.absFilePath(); } //deep-copy - files.insert( QString::fromUtf8(file.utf8()) ); + files.insert( TQString::fromUtf8(file.utf8()) ); } ///Now get all translation-units from the code-repository - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "kind", Tag::Kind_TranslationUnit ); - QValueList<Tag> tags( codeCompletion()->repository()->query( args ) ); + TQValueList<Tag> tags( codeCompletion()->repository()->query( args ) ); - for( QValueList<Tag>::const_iterator it = tags.begin(); it != tags.end(); ++it ) { + for( TQValueList<Tag>::const_iterator it = tags.begin(); it != tags.end(); ++it ) { files.insert( (*it).fileName() + "||" + (*it).attribute("macroValueHash").toString() + "||" + (*it).attribute("macroIdHash").toString() ); } m_safeProjectFiles.setFiles( files ); } void CppSupportPart::addToRepository( ParsedFilePointer file ) { - QString catalogString( "automatic_" + KURL::encode_string_no_slash(m_projectDirectory) ); + TQString catalogString( "automatic_" + KURL::encode_string_no_slash(m_projectDirectory) ); KStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); - QString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + catalogString + ".db"; + TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + catalogString + ".db"; Catalog* catalog = 0; ///First check if the catalog is already there - QValueList<Catalog*> catalogs = codeRepository()->registeredCatalogs(); - for( QValueList<Catalog*>::const_iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { + TQValueList<Catalog*> catalogs = codeRepository()->registeredCatalogs(); + for( TQValueList<Catalog*>::const_iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { if( (*it)->dbName() == dbName ) { catalog = *it; break; @@ -3055,7 +3055,7 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { if( !catalog ) { kdDebug( 9007 ) << "creating new catalog named " << catalogString << " for automatic filling" << endl; - //QStringList indexList = QStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; + //TQStringList indexList = TQStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; catalog = new Catalog; catalog->open( dbName ); catalog->addIndex( "kind" ); @@ -3064,27 +3064,27 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { catalog->addIndex( "prefix" ); catalog->addIndex( "fileName" ); /* - for ( QStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) + for ( TQStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) catalog->addIndex( ( *idxIt ).utf8() );*/ addCatalog( catalog ); } catalog->setEnabled( true ); ///Now check if the file was already parsed with the same parameters, if yes don't parse again(auto-update is currently not supported, when major changes have been done in the libraries, the repository should be deleted) - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; bool compatibleParsed = false; Tag compatibleParsedTag; args << Catalog::QueryArgument( "kind", Tag::Kind_TranslationUnit ); args << Catalog::QueryArgument( "fileName", file->fileName() ); - QValueList<Tag> tags( catalog->query( args ) ); + TQValueList<Tag> tags( catalog->query( args ) ); if( !tags.isEmpty() ) { - for( QValueList<Tag>::const_iterator it = tags.begin(); it != tags.end(); ++it ) { + for( TQValueList<Tag>::const_iterator it = tags.begin(); it != tags.end(); ++it ) { if( (*it).hasAttribute( "cppparsedfile" ) ) { - QVariant v = (*it).attribute( "cppparsedfile" ); + TQVariant v = (*it).attribute( "cppparsedfile" ); ///@todo reenable this - /*QByteArray b = v.toByteArray(); + /*TQByteArray b = v.toByteArray(); if( !b.isEmpty() ) { //Would be much more efficient not to do this deserialization ParsedFile f(b); @@ -3105,8 +3105,8 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { if( compatibleParsed ) { ///Add a Tag that makes sure that the file will not be parsed again compatibleParsedTag.setAttribute( "includedFrom", file->includedFrom() ); - QByteArray data; - QDataStream s( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream s( data, IO_WriteOnly ); file->write( s ); compatibleParsedTag.setAttribute( "cppparsedfile", data ); catalog->addItem( compatibleParsedTag ); @@ -3118,32 +3118,32 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { w.parseTranslationUnit( *file ); codeRepository()->touchCatalog( catalog ); - m_safeProjectFiles.insert( file->fileName() + "||" + QString("%1").arg(file->usedMacros().valueHash()) + "||" + QString("%1").arg(file->usedMacros().idHash()) ); + m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()) ); } -QString CppSupportPart::findHeaderSimple( const QString &header ) +TQString CppSupportPart::findHeaderSimple( const TQString &header ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = m_projectFileList.begin(); it != m_projectFileList.end(); ++it ) { - QString s = *it; + TQString s = *it; if (s == header) return s; if ( ( s.right( header.length() ) == header ) && ( s[s.length() - header.length() - 1] == '/' ) ) return s; } - return QString::null; + return TQString::null; } -UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ), m_stop(false) { +UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : TQThread(), m_parent( parent ), m_stop(false) { } void UIBlockTester::UIBlockTesterThread::run() { while(!m_stop) { msleep( m_parent.m_msecs / 10 ); m_parent.m_timeMutex.lock(); - QDateTime t = QDateTime::currentDateTime(); + TQDateTime t = TQDateTime::currentDateTime(); uint msecs = m_parent.m_lastTime.time().msecsTo( t.time() ); if( msecs > m_parent.m_msecs ) { m_parent.lockup(); @@ -3158,9 +3158,9 @@ void UIBlockTester::UIBlockTesterThread::stop() { } UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) { - m_timer = new QTimer( this ); + m_timer = new TQTimer( this ); m_timer->start( milliseconds/10 ); - connect( m_timer, SIGNAL(timeout()), this, SLOT(timer()) ); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) ); timer(); m_thread.start(); } @@ -3171,7 +3171,7 @@ UIBlockTester::~UIBlockTester() { void UIBlockTester::timer() { m_timeMutex.lock(); - m_lastTime = QDateTime::currentDateTime(); + m_lastTime = TQDateTime::currentDateTime(); m_timeMutex.unlock(); } diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index e01d5115..fecfe2d1 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -21,25 +21,25 @@ #include <kdevcore.h> #include <kdevlanguagesupport.h> -#include <qthread.h> -#include <qmutex.h> -#include <qtimer.h> +#include <tqthread.h> +#include <tqmutex.h> +#include <tqtimer.h> #include <kdialogbase.h> -#include <qguardedptr.h> -#include <qstring.h> -#include <qwaitcondition.h> -#include <qdatetime.h> -#include <qdir.h> -#include <qprogressbar.h> +#include <tqguardedptr.h> +#include <tqstring.h> +#include <tqwaitcondition.h> +#include <tqdatetime.h> +#include <tqdir.h> +#include <tqprogressbar.h> #include <kdebug.h> #include <ext/hash_map> #include "driver.h" ///A class that helps detecting what exactly makes the UI block. To use it, just place a breakpoint on UIBlockTester::lockup() and inspect the execution-position of the main thread -class UIBlockTester : public QObject { +class UIBlockTester : public TQObject { Q_OBJECT - class UIBlockTesterThread : public QThread { + class UIBlockTesterThread : public TQThread { public: UIBlockTesterThread( UIBlockTester& parent ); void run(); @@ -63,9 +63,9 @@ protected: private: UIBlockTesterThread m_thread; - QDateTime m_lastTime; - QMutex m_timeMutex; - QTimer * m_timer; + TQDateTime m_lastTime; + TQMutex m_timeMutex; + TQTimer * m_timer; uint m_msecs; }; @@ -113,42 +113,42 @@ public: bool isEmpty() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileSet.empty(); } uint count() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileSet.size(); } void clear() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileSet.clear(); } void setFiles( const SetType& files ) { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileSet = files; } void insert( const HashedString& str ) { - HashedString s( QString::fromUtf8(str.str().utf8()) ); - QMutexLocker locker( &m_mutex ); + HashedString s( TQString::fromUtf8(str.str().utf8()) ); + TQMutexLocker locker( &m_mutex ); m_fileSet.insert( s ); } bool contains( const HashedString& str ) const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileSet.find( str ) != m_fileSet.end(); } private: - mutable QMutex m_mutex; + mutable TQMutex m_mutex; SetType m_fileSet; }; @@ -157,7 +157,7 @@ class CppSupportPart : public KDevLanguageSupport Q_OBJECT public: - CppSupportPart( QObject *parent, const char *name, const QStringList &args ); + CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~CppSupportPart(); bool isValid() const @@ -165,7 +165,7 @@ public: return m_valid; } - QString specialHeaderName( bool local = false ) const; + TQString specialHeaderName( bool local = false ) const; void updateParserConfiguration(); void updateBackgroundParserConfig(); @@ -178,8 +178,8 @@ public: } /** parses the file and all files that belong to it using the background-parser */ - int parseFileAndDependencies( const QString& fileName, bool background = true, bool parseFirst = false, bool silent = false ); - int parseFilesAndDependencies( QStringList files, bool background = true, bool parseFirst = false, bool silent = false ); + int parseFileAndDependencies( const TQString& fileName, bool background = true, bool parseFirst = false, bool silent = false ); + int parseFilesAndDependencies( TQStringList files, bool background = true, bool parseFirst = false, bool silent = false ); BackgroundParser* backgroundParser() const { @@ -208,19 +208,19 @@ public: */ inline QtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; } - const QPtrList<Catalog>& catalogList() const + const TQPtrList<Catalog>& catalogList() const { return m_catalogList; } void addCatalog( Catalog* catalog ); - void removeCatalog( const QString& dbName ); + void removeCatalog( const TQString& dbName ); - bool isValidSource( const QString& fileName ) const; + bool isValidSource( const TQString& fileName ) const; - virtual void customEvent( QCustomEvent* ev ); + virtual void customEvent( TQCustomEvent* ev ); - virtual QStringList subclassWidget( const QString& formName ); - virtual QStringList updateWidget( const QString& formName, const QString& fileName ); + virtual TQStringList subclassWidget( const TQString& formName ); + virtual TQStringList updateWidget( const TQString& formName, const TQString& fileName ); FunctionDefinitionDom currentFunctionDefinition(); FunctionDefinitionDom functionDefinitionAt( int line, int column ); @@ -229,17 +229,17 @@ public: KTextEditor::Document* findDocument( const KURL& url ); static KConfig *config(); - virtual QString formatTag( const Tag& tag ); - virtual QString formatModelItem( const CodeModelItem *item, bool shortDescription = false ); + virtual TQString formatTag( const Tag& tag ); + virtual TQString formatModelItem( const CodeModelItem *item, bool shortDescription = false ); virtual void addClass(); - QString extractInterface( const ClassDom& klass ); + TQString extractInterface( const ClassDom& klass ); - bool isHeader( const QString& fileName ) const; - bool isSource( const QString& fileName ) const; + bool isHeader( const TQString& fileName ) const; + bool isSource( const TQString& fileName ) const; //uses the old simple algorithm to find the header - QString findHeaderSimple( const QString &header ); + TQString findHeaderSimple( const TQString &header ); virtual KDevDesignerIntegration *designer( KInterfaceDesigner::DesignerType type ); @@ -251,7 +251,7 @@ public: * @param name The name of the method. * @param type The return type of the method. * @param parameters A string containing the parameters - * (including names, default values, but no '(' , ')', e.g.: "int, const QString& aString"). + * (including names, default values, but no '(' , ')', e.g.: "int, const TQString& aString"). * @param accessType The access specifier e.g. CodeModelItem::PUBLIC. * @param isConst true if method is const. * @param isInline true if method should be declared inline. @@ -260,12 +260,12 @@ public: * @param implementation a optional implementation, if this is not set the method body will be empty. * @author Jonas Jacobi <j.jacobi@gmx.de> */ - virtual void addMethod( ClassDom aClass, const QString& name, const QString type, const QString& parameters, CodeModelItem::Access accessType, bool isConst, bool isInline, bool isVirtual, bool isPureVirtual, const QString& implementation = "" ); + virtual void addMethod( ClassDom aClass, const TQString& name, const TQString type, const TQString& parameters, CodeModelItem::Access accessType, bool isConst, bool isInline, bool isVirtual, bool isPureVirtual, const TQString& implementation = "" ); void createAccessMethods( ClassDom theClass, VariableDom theVariable ); - bool isQueued( const QString& file ) const; - bool switchHeaderImpl( const QString& file, int line, int col, bool scrollOnly = false ); + bool isQueued( const TQString& file ) const; + bool switchHeaderImpl( const TQString& file, int line, int col, bool scrollOnly = false ); const Driver* driver() const; @@ -275,17 +275,17 @@ public: const SynchronizedFileSet& safeFileSet() const; SynchronizedFileSet& safeFileSet(); signals: - void fileParsed( const QString& fileName ); + void fileParsed( const TQString& fileName ); ///Emitted whenever a file was parsed, but the code-model could be updated(the file in the code-model did not have to be replaced) - void codeModelUpdated( const QString& fileName ); + void codeModelUpdated( const TQString& fileName ); ///Emitted whenever a translation-unit was parsed in the main thread - void synchronousParseReady( const QString& file, ParsedFilePointer unit ); + void synchronousParseReady( const TQString& file, ParsedFilePointer unit ); protected: virtual KDevLanguageSupport::Features features(); virtual KMimeType::List mimeTypes(); - virtual QString formatClassName( const QString &name ); - virtual QString unformatClassName( const QString &name ); + virtual TQString formatClassName( const TQString &name ); + virtual TQString unformatClassName( const TQString &name ); virtual bool shouldSplitDocument( const KURL &url ); virtual Qt::Orientation splitOrientation() const; virtual void addMethod( ClassDom klass ); @@ -299,15 +299,15 @@ private slots: void savedFile( const KURL &fileName ); void configWidget( KDialogBase *dlg ); void projectConfigWidget( KDialogBase *dlg ); - void contextMenu( QPopupMenu *popup, const Context *context ); - void addedFilesToProject( const QStringList &fileList ); - void removedFilesFromProject( const QStringList &fileList ); - void changedFilesInProject( const QStringList & fileList ); + void contextMenu( TQPopupMenu *popup, const Context *context ); + void addedFilesToProject( const TQStringList &fileList ); + void removedFilesFromProject( const TQStringList &fileList ); + void changedFilesInProject( const TQStringList & fileList ); void slotProjectCompiled(); void setupCatalog(); void codeCompletionConfigStored(); void splitHeaderSourceConfigStored(); - // void recomputeCodeModel( const QString& fileName ); + // void recomputeCodeModel( const TQString& fileName ); void slotNavigate(); void slotNewClass(); void slotSwitchHeader( bool scrollOnly = false ); @@ -318,7 +318,7 @@ private slots: // void slotFunctionHint(); void gotoLine( int line ); void gotoDeclarationLine( int line ); - void emitFileParsed( QStringList l ); + void emitFileParsed( TQStringList l ); void slotParseFiles(); void slotCreateSubclass(); void slotCreateAccessMethods(); @@ -331,7 +331,7 @@ private slots: void removeProblemReporter(); - void slotNeedTextHint( int, int, QString& ); + void slotNeedTextHint( int, int, TQString& ); /** * loads, parses and creates both classstores needed @@ -381,31 +381,31 @@ private: /** * checks if a file has to be parsed */ - FileDom fileByName( const QString& name); - void maybeParse( const QString& fileName, bool background = true ); - void removeWithReferences( const QString& fileName ); + FileDom fileByName( const TQString& name); + void maybeParse( const TQString& fileName, bool background = true ); + void removeWithReferences( const TQString& fileName ); void createIgnorePCSFile(); - void MakeMemberHelper( QString& text, int& atline, int& atcol ); + void MakeMemberHelper( TQString& text, int& atline, int& atcol ); - QString sourceOrHeaderCandidate( const KURL &url = KURL() ); + TQString sourceOrHeaderCandidate( const KURL &url = KURL() ); FunctionDom findFunction( const FunctionDom& def ); FunctionDom findFunctionInNamespace( const NamespaceDom& ns, const FunctionDom& def, const std::set<NamespaceImportModel>& nsImports, - const QString& candidateFile, int scopeIndex, FunctionDom& bestMatch ); + const TQString& candidateFile, int scopeIndex, FunctionDom& bestMatch ); FunctionDom findFunctionInClass( const ClassDom& cs, const FunctionDom& def, const std::set<NamespaceImportModel>& nsImports, - const QString& candidateFile, int scopeIndex, FunctionDom& bestMatch ); + const TQString& candidateFile, int scopeIndex, FunctionDom& bestMatch ); FunctionDom findFunctionDefinition( const FunctionDom& decl ); void jumpToCodeModelItem( const ItemDom& item, bool scrollOnly ); - QStringList modifiedFileList(); - QString findSourceFile(); + TQStringList modifiedFileList(); + TQString findSourceFile(); int pcsVersion(); void setPcsVersion( int version ); void saveProjectSourceInfo(); - QStringList reorder( const QStringList& list ); + TQStringList reorder( const TQStringList& list ); CppCodeCompletion* m_pCompletion; CppCodeCompletionConfig* m_pCompletionConfig; @@ -418,11 +418,11 @@ private: QtBuildConfig* m_qtBuildConfig; bool withcpp; - QString m_contextFileName; + TQString m_contextFileName; VariableDom m_curAttribute; ClassDom m_curClass; - QGuardedPtr< ProblemReporter > m_problemReporter; + TQGuardedPtr< ProblemReporter > m_problemReporter; BackgroundParser* m_backgroundParser; UIBlockTester* m_lockupTester; @@ -431,36 +431,36 @@ private: KTextEditor::SelectionInterface* m_activeSelection; KTextEditor::EditInterface* m_activeEditor; KTextEditor::ViewCursorInterface* m_activeViewCursor; - QString m_activeFileName; + TQString m_activeFileName; - QMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers; + TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers; - QWaitCondition m_eventConsumed; + TQWaitCondition m_eventConsumed; bool m_projectClosed; bool m_projectClosing; - QMap<QString, QDateTime> m_timestamp; + TQMap<TQString, TQDateTime> m_timestamp; bool m_valid; bool m_isTyping; bool m_hadErrors; ///Whether there were already errors when the user started typing - QPtrList<Catalog> m_catalogList; + TQPtrList<Catalog> m_catalogList; Driver* m_driver; - QString m_projectDirectory; - QStringList m_projectFileList; + TQString m_projectDirectory; + TQStringList m_projectFileList; ClassDom m_activeClass; FunctionDom m_activeFunction; VariableDom m_activeVariable; - QGuardedPtr<KPopupMenu> m_navigationMenu; + TQGuardedPtr<KPopupMenu> m_navigationMenu; -// QTimer* m_functionHintTimer; -// QTimer* m_deleteParserStoreTimer; - QTimer* m_saveMemoryTimer; - QTimer * m_textChangedTimer; - QTimer * m_cursorMovedTimer; - QTimer* m_buildSafeFileSetTimer; +// TQTimer* m_functionHintTimer; +// TQTimer* m_deleteParserStoreTimer; + TQTimer* m_saveMemoryTimer; + TQTimer * m_textChangedTimer; + TQTimer * m_cursorMovedTimer; + TQTimer* m_buildSafeFileSetTimer; class ParseEmitWaiting { public: @@ -472,23 +472,23 @@ private: }; private: struct Item { - QStringList first; - QStringList second; + TQStringList first; + TQStringList second; Flags flags; Item() : flags(None) { } - Item( QStringList f, QStringList s, Flags fl = None ) : first( f ), second( s ), flags( fl ) + Item( TQStringList f, TQStringList s, Flags fl = None ) : first( f ), second( s ), flags( fl ) { } }; - //typedef QPair<QStringList, QStringList> Item; ///The files we are waiting fore, and the files we already got - typedef QValueList< Item > List; + //typedef QPair<TQStringList, TQStringList> Item; ///The files we are waiting fore, and the files we already got + typedef TQValueList< Item > List; List m_waiting; - QStringList harvestUntil( List::iterator targIt ) { + TQStringList harvestUntil( List::iterator targIt ) { List::iterator it = m_waiting.begin(); - QStringList ret; + TQStringList ret; while( it != targIt && it != m_waiting.end() ) { ret += (*it).first; it = m_waiting.erase( it ); @@ -497,18 +497,18 @@ private: } public: - void addGroup( QStringList& files, Flags flag = None ) { - m_waiting << Item(files, QStringList(), flag); + void addGroup( TQStringList& files, Flags flag = None ) { + m_waiting << Item(files, TQStringList(), flag); } - void addGroupFront( QStringList& files, Flags flag = None ) { - m_waiting.push_front( Item(files, QStringList(), flag) ); + void addGroupFront( TQStringList& files, Flags flag = None ) { + m_waiting.push_front( Item(files, TQStringList(), flag) ); } void clear() { m_waiting.clear(); } ///files that were not requested must not be processed, since they maybe do not respect the group-relationships. - bool reject( QString file ) { + bool reject( TQString file ) { for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { if( (*it).first.find( file ) != (*it).first.end() ) { return false; @@ -517,7 +517,7 @@ private: return true; } - bool waiting( QString file, Flags forbidFlags = None, int count = 1 ) const { + bool waiting( TQString file, Flags forbidFlags = None, int count = 1 ) const { int hits = 0; for( List::const_iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { if( (*it).first.find( file ) != (*it).first.end() ) { @@ -531,13 +531,13 @@ private: } struct Processed { - QStringList res; + TQStringList res; Flags flag; Processed() : flag(None) { } - Processed(const QStringList& l , Flags f = None ) : res( l ), flag( f ) { + Processed(const TQStringList& l , Flags f = None ) : res( l ), flag( f ) { } - operator QStringList() { + operator TQStringList() { return res; } @@ -559,8 +559,8 @@ private: private: ///Just return all files that have been parsed - Processed errorRecover( QString currentFile ) { - QStringList ret; + Processed errorRecover( TQString currentFile ) { + TQStringList ret; kdDebug( 9007 ) << "ParseEmitWaiting: error in the waiting-chain" << endl; for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { ret += (*it).second; @@ -572,8 +572,8 @@ private: public: ///returns the parsed-messages that should be emitted - Processed processFile( QString file, Flags flag = None ) { - QStringList ret; + Processed processFile( TQString file, Flags flag = None ) { + TQStringList ret; for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { if( (*it).first.find( file ) != (*it).first.end() ) { if( (*it).second.find( file ) == (*it).second.end() ) { @@ -588,7 +588,7 @@ private: return Processed( harvestUntil( ++it ), f ); } else { ///The file was registered, now wait for the next - return QStringList(); + return TQStringList(); } } else { ///The file has already been parsed @@ -615,37 +615,37 @@ private: SynchronizedFileSet m_safeProjectFiles; BackgroundParserConfig * m_backgroundParserConfig; - static QStringList m_sourceMimeTypes; - static QStringList m_headerMimeTypes; + static TQStringList m_sourceMimeTypes; + static TQStringList m_headerMimeTypes; - static QStringList m_sourceExtensions; - static QStringList m_headerExtensions; + static TQStringList m_sourceExtensions; + static TQStringList m_headerExtensions; friend class KDevCppSupportIface; friend class CppDriver; // we need something to plug actions that are not in any menu // into in order for their shortcuts to work - QWidget m_DummyActionWidget; + TQWidget m_DummyActionWidget; void addToRepository( ParsedFilePointer ); - void emitSynchronousParseReady( const QString& file, ParsedFilePointer unit ); + void emitSynchronousParseReady( const TQString& file, ParsedFilePointer unit ); struct JobData { - QDir dir; - QGuardedPtr<QProgressBar> progressBar; - QStringList::Iterator it; - QStringList files; + TQDir dir; + TQGuardedPtr<TQProgressBar> progressBar; + TQStringList::Iterator it; + TQStringList files; int cycle; int backgroundCount; int lastBackgroundState; int backgroundState; - QStringList reparseList; - QMap< QString, QPair<uint, uint> > pcs; - QDataStream stream; - QFile file; - QTime lastParse; + TQStringList reparseList; + TQMap< TQString, QPair<uint, uint> > pcs; + TQDataStream stream; + TQFile file; + TQTime lastParse; ~JobData() { diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp index 5b64290f..7190e796 100644 --- a/languages/cpp/creategettersetterconfiguration.cpp +++ b/languages/cpp/creategettersetterconfiguration.cpp @@ -15,12 +15,12 @@ #include <domutil.h> -#include <qdom.h> +#include <tqdom.h> #include <kmessagebox.h> -QString CreateGetterSetterConfiguration::defaultPath = QString::fromLatin1( "/kdevcppsupport/creategettersetter" ); +TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" ); CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part ) -: QObject(part), m_part(part), m_settings(0) +: TQObject(part), m_part(part), m_settings(0) { init(); } @@ -38,7 +38,7 @@ void CreateGetterSetterConfiguration::init( ) m_prefixGet = DomUtil::readEntry( *m_settings, defaultPath + "/prefixGet", "" ); m_prefixSet = DomUtil::readEntry( *m_settings, defaultPath + "/prefixSet", "set" ); - m_prefixVariable = QStringList::split(",", DomUtil::readEntry( *m_settings, defaultPath + "/prefixVariable", "m_,_" )); + m_prefixVariable = TQStringList::split(",", DomUtil::readEntry( *m_settings, defaultPath + "/prefixVariable", "m_,_" )); m_parameterName = DomUtil::readEntry( *m_settings, defaultPath + "/parameterName", "theValue" ); m_isInlineGet = DomUtil::readBoolEntry(*m_settings, defaultPath + "/inlineGet", true ); m_isInlineSet = DomUtil::readBoolEntry(*m_settings, defaultPath + "/inlineSet", true ); diff --git a/languages/cpp/creategettersetterconfiguration.h b/languages/cpp/creategettersetterconfiguration.h index e11a45ee..e89dd60b 100644 --- a/languages/cpp/creategettersetterconfiguration.h +++ b/languages/cpp/creategettersetterconfiguration.h @@ -12,9 +12,9 @@ #ifndef CREATEGETTERSETTERCONFIGURATION_H #define CREATEGETTERSETTERCONFIGURATION_H -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> class CppSupportPart; class QDomDocument; @@ -44,39 +44,39 @@ public slots: void store(); public: - void setPrefixGet(const QString& theValue) + void setPrefixGet(const TQString& theValue) { m_prefixGet = theValue; } - QString prefixGet() const + TQString prefixGet() const { return m_prefixGet; } - void setPrefixSet(const QString& theValue) + void setPrefixSet(const TQString& theValue) { m_prefixSet = theValue; } - QString prefixSet() const + TQString prefixSet() const { return m_prefixSet; } - void setPrefixVariable(const QStringList& theValue) + void setPrefixVariable(const TQStringList& theValue) { m_prefixVariable = theValue; } - QStringList prefixVariable() const + TQStringList prefixVariable() const { return m_prefixVariable; } - void setParameterName(const QString& theValue) + void setParameterName(const TQString& theValue) { m_parameterName = theValue; } - QString parameterName() const + TQString parameterName() const { return m_parameterName; } @@ -101,17 +101,17 @@ public: private: CppSupportPart* m_part; - QDomDocument* m_settings; + TQDomDocument* m_settings; - QString m_prefixGet; - QString m_prefixSet; - QStringList m_prefixVariable; - QString m_parameterName; + TQString m_prefixGet; + TQString m_prefixSet; + TQStringList m_prefixVariable; + TQString m_parameterName; bool m_isInlineGet; bool m_isInlineSet; private: - static QString defaultPath; + static TQString defaultPath; }; #endif diff --git a/languages/cpp/creategettersetterdialog.cpp b/languages/cpp/creategettersetterdialog.cpp index 41a2f27e..e63fcf23 100644 --- a/languages/cpp/creategettersetterdialog.cpp +++ b/languages/cpp/creategettersetterdialog.cpp @@ -13,16 +13,16 @@ #include "cppsupportpart.h" #include <klineedit.h> -#include <qcheckbox.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqregexp.h> #include "creategettersetterconfiguration.h" CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassDom aClass, - VariableDom aVar, QWidget *parent, const char *pName ) + VariableDom aVar, TQWidget *parent, const char *pName ) : CreateGetterSetterDialogBase( parent, pName ), m_part( part ), m_class( aClass ), m_var( aVar ) { - QString name = aVar->name(); + TQString name = aVar->name(); setCaption( "Create methods for " + name ); if ( aVar->type().startsWith( "const" ) && !aVar->type().endsWith( "*" ) ) @@ -35,11 +35,11 @@ CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassD if ( config == 0 ) return ; - QStringList prefixes = config->prefixVariable(); + TQStringList prefixes = config->prefixVariable(); unsigned int len = 0; - QStringList::ConstIterator theend = prefixes.end(); //find longest fitting prefix and remove it - for ( QStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) + TQStringList::ConstIterator theend = prefixes.end(); //find longest fitting prefix and remove it + for ( TQStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) { if ( name.startsWith( *ci ) && ( *ci ).length() > len ) len = ( *ci ).length(); @@ -50,11 +50,11 @@ CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassD m_edtGet->setText( name ); - QString getName = name; + TQString getName = name; if ( ! config->prefixGet().isEmpty() ) getName[ 0 ] = getName[ 0 ].upper(); - QString setName = name; + TQString setName = name; if ( ! config->prefixSet().isEmpty() ) setName[ 0 ] = setName[ 0 ].upper(); @@ -81,7 +81,7 @@ void CreateGetterSetterDialog::accept( ) if ( m_chkSet->isChecked() && !m_edtSet->text().isEmpty() ) { - QString parameterStr; + TQString parameterStr; if ( m_var->type().endsWith( "*" ) ) { @@ -89,7 +89,7 @@ void CreateGetterSetterDialog::accept( ) } else { - QRegExp basicTypes( "((unsigned)?\\s*(char|byte|short|int|long))|double|float|bool" ); + TQRegExp basicTypes( "((unsigned)?\\s*(char|byte|short|int|long))|double|float|bool" ); if ( basicTypes.exactMatch( m_var->type() ) ) parameterStr = m_var->type() + " " + config->parameterName(); else @@ -100,7 +100,7 @@ void CreateGetterSetterDialog::accept( ) "\t" + m_var->name() + " = " + config->parameterName() + ";" ); } //@todo illegale eingaben nicht akzeptieren wie z.b. int& ... - QDialog::accept(); + TQDialog::accept(); } /** diff --git a/languages/cpp/creategettersetterdialog.h b/languages/cpp/creategettersetterdialog.h index a535e303..435002f2 100644 --- a/languages/cpp/creategettersetterdialog.h +++ b/languages/cpp/creategettersetterdialog.h @@ -25,7 +25,7 @@ class CreateGetterSetterDialog: public CreateGetterSetterDialogBase { Q_OBJECT public: - CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, QWidget *parent = 0, const char *name = 0); + CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *parent = 0, const char *name = 0); protected slots: void accept(); diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 1dc45034..d716bcc2 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -35,13 +35,13 @@ #include <kstringhandler.h> #include <klineedit.h> -#include <qprogressbar.h> -#include <qheader.h> -#include <qlabel.h> -#include <qregexp.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qpushbutton.h> +#include <tqprogressbar.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqregexp.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqpushbutton.h> #include <stdlib.h> #include <unistd.h> @@ -64,7 +64,7 @@ public: } #if 0 /// \FIXME robe - void addDocDirectory( const QString& dir ) + void addDocDirectory( const TQString& dir ) { m_docDirectoryList.append( dir ); TagCreator::setDocumentationDirectories( m_docDirectoryList ); @@ -76,8 +76,8 @@ public: /// @todo increment progress #if 0 /// @todo show problems - QValueList<Problem> l = problems( fileName ); - QValueList<Problem>::Iterator it = l.begin(); + TQValueList<Problem> l = problems( fileName ); + TQValueList<Problem>::Iterator it = l.begin(); while ( it != l.end() ) { const Problem & p = *it; @@ -99,18 +99,18 @@ public: void setup() { bool ok; - QString gccLibPath = SetupHelper::getGccIncludePath(&ok); + TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.replace( QRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); //addIncludePath( "/usr/include/g++-3" ); //addIncludePath( "/usr/include/g++" ); - QStringList lines = SetupHelper::getGccMacros(&ok); + TQStringList lines = SetupHelper::getGccMacros(&ok); if (!ok) return; - for (QStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { - QStringList lst = QStringList::split( ' ', *it ); + for (TQStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { + TQStringList lst = TQStringList::split( ' ', *it ); if ( lst.count() != 3 ) continue; addMacro( Macro( lst[1], lst[2] ) ); @@ -124,7 +124,7 @@ private: Catalog* catalog; #if 0 /// \FIXME - QStringList m_docDirectoryList; + TQStringList m_docDirectoryList; #endif }; @@ -132,12 +132,12 @@ private: class PCSListViewItem: public KListViewItem { public: - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, QListViewItem* parent ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent ) : KListViewItem( parent ), m_importer( importer ) { init( ptr ); } - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, QListView* parent ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent ) : KListViewItem( parent ), m_importer( importer ) { init( ptr ); @@ -167,14 +167,14 @@ private: class CreatePCSDialog::PCSJobData { public: - QString dbName; + TQString dbName; Catalog * catalog; RppDriver * driver; - QStringList list; - QStringList::iterator it; + TQStringList list; + TQStringList::iterator it; int progress; - PCSJobData( const QString & dbName, QStringList const & fileList ) + PCSJobData( const TQString & dbName, TQStringList const & fileList ) : dbName( dbName), list( fileList ), it( list.begin() ), progress( 0 ) { catalog = new Catalog; @@ -196,7 +196,7 @@ public: -CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, QWidget* parent, const char* name, bool modal, WFlags fl ) +CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl ) : CreatePCSDialogBase( parent, name, modal, fl ), m_part( part ), m_jobData( 0 ) { helpButton()->hide(); @@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, QWidget* parent, const c KService::Ptr ptr = *it; int error = 0; - KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, this, ptr->name().latin1(), QStringList(), &error ); + KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, this, ptr->name().latin1(), TQStringList(), &error ); if ( importer ) { new PCSListViewItem( ptr, importer, importerListView ); @@ -221,7 +221,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, QWidget* parent, const c setNextEnabled( importerPage, false ); - QHBoxLayout* hbox = new QHBoxLayout( settingsPage ); + TQHBoxLayout* hbox = new TQHBoxLayout( settingsPage ); hbox->setAutoAdd( true ); if ( importerListView->firstChild() ) @@ -237,12 +237,12 @@ CreatePCSDialog::~CreatePCSDialog() /*$SPECIALIZATION$*/ void CreatePCSDialog::back() { - QWizard::back(); + TQWizard::back(); } void CreatePCSDialog::next() { - QWizard::next(); + TQWizard::next(); } void CreatePCSDialog::reject() @@ -254,7 +254,7 @@ void CreatePCSDialog::reject() m_jobData = 0; } - QWizard::reject(); + TQWizard::reject(); } void CreatePCSDialog::accept() @@ -262,10 +262,10 @@ void CreatePCSDialog::accept() delete m_jobData; m_jobData = 0; - QWizard::accept(); + TQWizard::accept(); } -void CreatePCSDialog::slotSelected( const QString & ) +void CreatePCSDialog::slotSelected( const TQString & ) { if ( currentPage() == settingsPage ) { @@ -276,7 +276,7 @@ void CreatePCSDialog::slotSelected( const QString & ) m_settings = importer->createSettingsPage( settingsPage ); setNextEnabled( currentPage(), false ); setHelpEnabled( currentPage(), false ); - connect( m_settings, SIGNAL( enabled( int ) ), this, SLOT( setNextPageEnabled( int ) ) ); + connect( m_settings, TQT_SIGNAL( enabled( int ) ), this, TQT_SLOT( setNextPageEnabled( int ) ) ); if ( m_settings ) { @@ -295,19 +295,19 @@ void CreatePCSDialog::slotSelected( const QString & ) setNextEnabled( currentPage(), false ); KDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer(); - QStringList fileList = importer->fileList(); + TQStringList fileList = importer->fileList(); progressBar->setTotalSteps( fileList.size() ); progressBar->setPercentageVisible( true ); KStandardDirs *dirs = m_part->instance() ->dirs(); - QString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash(filename_edit->text()) + ".db"; + TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash(filename_edit->text()) + ".db"; kdDebug( 9007 ) << "================================> dbName = " << dbName << endl; m_part->removeCatalog( dbName ); m_jobData = new PCSJobData( dbName, fileList ); - QTimer::singleShot( 0, this, SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); } } @@ -340,7 +340,7 @@ void CreatePCSDialog::parseNext( ) ++(m_jobData->it); - QTimer::singleShot( 0, this, SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); } @@ -349,7 +349,7 @@ void CreatePCSDialog::setNextPageEnabled( int enabled ) setNextEnabled( currentPage(), enabled ); } -void CreatePCSDialog::slotSelectionChanged( QListViewItem * item ) +void CreatePCSDialog::slotSelectionChanged( TQListViewItem * item ) { setNextPageEnabled( item != 0 ); } diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index 0d03d16f..87c4818d 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -21,14 +21,14 @@ class CreatePCSDialog : public CreatePCSDialogBase Q_OBJECT public: - CreatePCSDialog( CppSupportPart* part, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreatePCSDialog(); /*$PUBLIC_FUNCTIONS$*/ public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelected( const QString& ); - virtual void slotSelectionChanged( QListViewItem* ); + virtual void slotSelected( const TQString& ); + virtual void slotSelectionChanged( TQListViewItem* ); protected: /*$PROTECTED_FUNCTIONS$*/ @@ -45,7 +45,7 @@ protected slots: private: CppSupportPart* m_part; - QWidget* m_settings; + TQWidget* m_settings; class RppDriver; class PCSJobData; diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp index 7bcf674f..c9ed193e 100644 --- a/languages/cpp/debugger/breakpoint.cpp +++ b/languages/cpp/debugger/breakpoint.cpp @@ -20,11 +20,11 @@ #include <klocale.h> #include <kdebug.h> -#include <qfileinfo.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qregexp.h> -#include <qstring.h> +#include <tqfileinfo.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqregexp.h> +#include <tqstring.h> #include <stdio.h> #include <typeinfo> @@ -174,18 +174,18 @@ void Breakpoint::modifyBreakpoint(GDBController* controller) { controller-> addCommandBeforeRun( - new ModifyBreakpointCommand(QString("-break-condition %1 ") + + new ModifyBreakpointCommand(TQString("-break-condition %1 ") + conditional(), this)); controller-> addCommandBeforeRun( - new ModifyBreakpointCommand(QString("-break-after %1 ") + - QString::number(ignoreCount()), this)); + new ModifyBreakpointCommand(TQString("-break-after %1 ") + + TQString::number(ignoreCount()), this)); controller-> addCommandBeforeRun( new ModifyBreakpointCommand(isEnabled() ? - QString("-break-enable %1") - : QString("-break-disable %1"), this)); + TQString("-break-enable %1") + : TQString("-break-disable %1"), this)); } void Breakpoint::removedInGdb() @@ -210,12 +210,12 @@ bool Breakpoint::match(const Breakpoint* breakpoint) const /***************************************************************************/ -QString Breakpoint::dbgRemoveCommand() const +TQString Breakpoint::dbgRemoveCommand() const { if (dbgId_>0) - return QString("-break-delete %1").arg(dbgId_); // gdb command - not translatable + return TQString("-break-delete %1").arg(dbgId_); // gdb command - not translatable - return QString(); + return TQString(); } @@ -258,9 +258,9 @@ void Breakpoint::setActive(int active, int id) /***************************************************************************/ -QString Breakpoint::statusDisplay(int activeFlag) const +TQString Breakpoint::statusDisplay(int activeFlag) const { - QString status=""; + TQString status=""; if (!s_enabled_) status = i18n("Disabled"); else @@ -280,9 +280,9 @@ QString Breakpoint::statusDisplay(int activeFlag) const return status; } -QString Breakpoint::traceRealFormatString() const +TQString Breakpoint::traceRealFormatString() const { - QString result; + TQString result; if (traceFormatStringEnabled()) { @@ -298,9 +298,9 @@ QString Breakpoint::traceRealFormatString() const } else { - result += " " + QString::number(key()) + ": "; + result += " " + TQString::number(key()) + ": "; } - for(QStringList::const_iterator i = tracedExpressions_.begin(), + for(TQStringList::const_iterator i = tracedExpressions_.begin(), e = tracedExpressions_.end(); i != e; ++i) { result += " " + *i + " = %d"; @@ -310,7 +310,7 @@ QString Breakpoint::traceRealFormatString() const // Quote the thing result = "\"" + result + "\\n\""; - for(QStringList::const_iterator i = tracedExpressions_.begin(), + for(TQStringList::const_iterator i = tracedExpressions_.begin(), e = tracedExpressions_.end(); i != e; ++i) { result += ", " + *i; @@ -381,21 +381,21 @@ FilePosBreakpoint::FilePosBreakpoint() line_(-1) {} -FilePosBreakpoint::FilePosBreakpoint(const QString &fileName, int lineNum, +FilePosBreakpoint::FilePosBreakpoint(const TQString &fileName, int lineNum, bool temporary, bool enabled) : Breakpoint(temporary, enabled) { // Sets 'subtype' - setLocation(QString("%1:%2").arg(fileName).arg(lineNum)); + setLocation(TQString("%1:%2").arg(fileName).arg(lineNum)); } FilePosBreakpoint::~FilePosBreakpoint() { } -QString FilePosBreakpoint::dbgSetCommand(GDBController *c) const +TQString FilePosBreakpoint::dbgSetCommand(GDBController *c) const { - QString cmdStr = "-break-insert"; + TQString cmdStr = "-break-insert"; if (isTemporary()) cmdStr = cmdStr + " -t"; @@ -416,7 +416,7 @@ bool FilePosBreakpoint::match_data(const Breakpoint *xb) const return false; } -QString FilePosBreakpoint::displayType() const +TQString FilePosBreakpoint::displayType() const { return i18n("Code breakpoint", "Code"); } @@ -431,7 +431,7 @@ bool FilePosBreakpoint::hasFileAndLine() const return line_ != -1; } -QString FilePosBreakpoint::fileName() const +TQString FilePosBreakpoint::fileName() const { return fileName_; } @@ -443,11 +443,11 @@ unsigned FilePosBreakpoint::lineNum() const -QString FilePosBreakpoint::location(bool compact) const +TQString FilePosBreakpoint::location(bool compact) const { if (subtype_ == filepos && hasFileAndLine() && compact) { - return QFileInfo(fileName_).fileName()+":"+QString::number(line_); + return TQFileInfo(fileName_).fileName()+":"+TQString::number(line_); } else { @@ -457,21 +457,21 @@ QString FilePosBreakpoint::location(bool compact) const /***************************************************************************/ -void FilePosBreakpoint::setLocation(const QString& location) +void FilePosBreakpoint::setLocation(const TQString& location) { location_ = location; - QRegExp regExp1("(.*):(\\d+)$"); + TQRegExp regExp1("(.*):(\\d+)$"); regExp1.setMinimal(true); if ( regExp1.search(location, 0) >= 0 ) { subtype_ = filepos; - QString t = regExp1.cap(1); - QString dirPath = QFileInfo(t).dirPath(); + TQString t = regExp1.cap(1); + TQString dirPath = TQFileInfo(t).dirPath(); if ( dirPath == "." ) { - QString existingDirPath = QFileInfo(fileName_).dirPath(); + TQString existingDirPath = TQFileInfo(fileName_).dirPath(); if (existingDirPath != ".") fileName_ = existingDirPath+"/"+regExp1.cap(1); else @@ -482,7 +482,7 @@ void FilePosBreakpoint::setLocation(const QString& location) line_ = regExp1.cap(2).toInt(); - location_ = QString("%1:%2").arg(fileName_).arg(regExp1.cap(2)); + location_ = TQString("%1:%2").arg(fileName_).arg(regExp1.cap(2)); } else { @@ -516,7 +516,7 @@ void FilePosBreakpoint::handleSet(const GDBMI::ResultRecord& r) /***************************************************************************/ /***************************************************************************/ -Watchpoint::Watchpoint(const QString& varName, bool temporary, bool enabled) +Watchpoint::Watchpoint(const TQString& varName, bool temporary, bool enabled) : Breakpoint(temporary, enabled), varName_(varName) { @@ -536,7 +536,7 @@ void Watchpoint::setBreakpoint(GDBController* controller) controller->addCommandBeforeRun( new GDBCommand( - QString("-data-evaluate-expression &%1").arg(varName_), + TQString("-data-evaluate-expression &%1").arg(varName_), this, &Watchpoint::handleAddressComputed)); } @@ -547,7 +547,7 @@ void Watchpoint::handleAddressComputed(const GDBMI::ResultRecord& r) address_ = r["value"].literal().toULongLong(0, 16); controller()->addCommandBeforeRun( new GDBCommand( - QString("-break-watch *%1").arg(r["value"].literal()), + TQString("-break-watch *%1").arg(r["value"].literal()), static_cast<Breakpoint*>(this), &Watchpoint::handleSet)); } @@ -577,9 +577,9 @@ void Watchpoint::removedInGdb() /***************************************************************************/ -QString Watchpoint::dbgSetCommand(GDBController *) const +TQString Watchpoint::dbgSetCommand(GDBController *) const { - return QString("-break-watch ")+varName_; // gdb command - not translatable + return TQString("-break-watch ")+varName_; // gdb command - not translatable } /***************************************************************************/ @@ -591,14 +591,14 @@ bool Watchpoint::match_data(const Breakpoint* xb) const return (varName_ == b->varName_); } -ReadWatchpoint::ReadWatchpoint(const QString& varName, bool temporary, bool enabled) +ReadWatchpoint::ReadWatchpoint(const TQString& varName, bool temporary, bool enabled) : Watchpoint(varName, temporary, enabled) { } -QString ReadWatchpoint::dbgSetCommand(GDBController *) const +TQString ReadWatchpoint::dbgSetCommand(GDBController *) const { - return QString("-break-watch -r ")+varName(); + return TQString("-break-watch -r ")+varName(); } bool ReadWatchpoint::match_data(const Breakpoint* xb) const @@ -625,7 +625,7 @@ bool ReadWatchpoint::match_data(const Breakpoint* xb) const // ///***************************************************************************/ // -//QString ExitBreakpoint::dbgSetCommand() const +//TQString ExitBreakpoint::dbgSetCommand() const //{ // return ""; //} @@ -667,14 +667,14 @@ bool ReadWatchpoint::match_data(const Breakpoint* xb) const // ///***************************************************************************/ // -//QString RegExpBreakpoint::dbgSetCommand() const +//TQString RegExpBreakpoint::dbgSetCommand() const //{ // return ""; //} // ///***************************************************************************/ // -////QString RegExpBreakpoint::dbgRemoveCommand() const +////TQString RegExpBreakpoint::dbgRemoveCommand() const ////{ //// return ""; ////} @@ -698,14 +698,14 @@ bool ReadWatchpoint::match_data(const Breakpoint* xb) const // ///***************************************************************************/ // -//QString CatchBreakpoint::dbgSetCommand() const +//TQString CatchBreakpoint::dbgSetCommand() const //{ // return ""; //} // ///***************************************************************************/ // -////QString CatchBreakpoint::dbgRemoveCommand() const +////TQString CatchBreakpoint::dbgRemoveCommand() const ////{ //// return ""; ////} diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h index f06fc3d3..8470617c 100644 --- a/languages/cpp/debugger/breakpoint.h +++ b/languages/cpp/debugger/breakpoint.h @@ -18,9 +18,9 @@ #include <klocale.h> -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> /***************************************************************************/ /***************************************************************************/ @@ -60,8 +60,8 @@ public: - virtual QString dbgSetCommand(GDBController *) const = 0; - virtual QString dbgRemoveCommand() const; + virtual TQString dbgSetCommand(GDBController *) const = 0; + virtual TQString dbgRemoveCommand() const; /** Returns true if 'breakpoint' is identical to *this. Checks for trival cases like pointer equality and differing typeid() and then calls virtual @@ -95,11 +95,11 @@ public: void setIgnoreCount(int ignoreCount) { ignoreCount_ = ignoreCount; } int ignoreCount() const { return ignoreCount_; } - void setAddress(const QString &address) { address_ = address; } - QString address() const { return address_; } + void setAddress(const TQString &address) { address_ = address; } + TQString address() const { return address_; } - void setConditional(const QString &condition) { condition_ = condition; } - QString conditional() const { return condition_; } + void setConditional(const TQString &condition) { condition_ = condition; } + TQString conditional() const { return condition_; } void setPending(bool pending) { s_pending_ = pending; } bool isPending() const { return s_pending_; } @@ -127,27 +127,27 @@ public: void setHits(int hits) { hits_ = hits; } int hits() const { return hits_; } - virtual QString statusDisplay(int activeFlag) const; + virtual TQString statusDisplay(int activeFlag) const; virtual BP_TYPES type() const { return BP_TYPE_Invalid; } - virtual QString displayType() const { return i18n( "Invalid" ); } + virtual TQString displayType() const { return i18n( "Invalid" ); } bool tracingEnabled() const { return s_tracingEnabled_; } void setTracingEnabled(bool enable) { s_tracingEnabled_ = enable; } - const QStringList& tracedExpressions() const { return tracedExpressions_; } - void setTracedExpressions(const QStringList& l) { tracedExpressions_ = l; } + const TQStringList& tracedExpressions() const { return tracedExpressions_; } + void setTracedExpressions(const TQStringList& l) { tracedExpressions_ = l; } bool traceFormatStringEnabled() const { return s_traceFormatStringEnabled_; } void setTraceFormatStringEnabled(bool en) { s_traceFormatStringEnabled_ = en; } - const QString& traceFormatString() const { return traceFormatString_; } - void setTraceFormatString(const QString& s) { traceFormatString_ = s; } + const TQString& traceFormatString() const { return traceFormatString_; } + void setTraceFormatString(const TQString& s) { traceFormatString_ = s; } - QString traceRealFormatString() const; + TQString traceRealFormatString() const; - virtual QString location(bool compact=true) const = 0; - virtual void setLocation(const QString& ) = 0; + virtual TQString location(bool compact=true) const = 0; + virtual void setLocation(const TQString& ) = 0; virtual bool isValid() const = 0; signals: @@ -187,10 +187,10 @@ private: int active_; // counter incremented on receipt of all BP's int ignoreCount_; - QString address_; - QString condition_; - QStringList tracedExpressions_; - QString traceFormatString_; + TQString address_; + TQString condition_; + TQStringList tracedExpressions_; + TQString traceFormatString_; GDBController* controller_; }; @@ -203,20 +203,20 @@ class FilePosBreakpoint : public Breakpoint public: FilePosBreakpoint(); - FilePosBreakpoint(const QString &fileName, int lineNum, + FilePosBreakpoint(const TQString &fileName, int lineNum, bool temporary=false, bool enabled=true); virtual ~FilePosBreakpoint(); - virtual QString dbgSetCommand(GDBController *) const; + virtual TQString dbgSetCommand(GDBController *) const; virtual bool match_data(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_FilePos; } - QString displayType() const; - QString location(bool compact=true) const; - void setLocation(const QString& location); + TQString displayType() const; + TQString location(bool compact=true) const; + void setLocation(const TQString& location); bool isValid() const; bool hasFileAndLine() const; - QString fileName() const; + TQString fileName() const; unsigned lineNum() const; protected: @@ -228,8 +228,8 @@ private: enum subtype { filepos = 1, function, address }; subtype subtype_; - QString location_; - QString fileName_; + TQString location_; + TQString fileName_; int line_; }; /***************************************************************************/ @@ -240,7 +240,7 @@ private: //public: // RegExpBreakpoint(bool temporary=false, bool enabled=true); // virtual ~RegExpBreakpoint(); -// virtual QString dbgSetCommand() const; +// virtual TQString dbgSetCommand() const; //}; /***************************************************************************/ /***************************************************************************/ @@ -250,7 +250,7 @@ private: //public: // CatchBreakpoint(bool temporary=false, bool enabled=true); // virtual ~CatchBreakpoint(); -// virtual QString dbgSetCommand() const; +// virtual TQString dbgSetCommand() const; // virtual CatchBreakpoint& operator=(const CatchBreakpoint& rhs); //}; /***************************************************************************/ @@ -261,7 +261,7 @@ private: //public: // ExitBreakpoint(bool temporary=false, bool enabled=true); // virtual ~ExitBreakpoint(); -// virtual QString dbgSetCommand() const; +// virtual TQString dbgSetCommand() const; // bool match(const Breakpoint* brkpt) const; // virtual void configureDisplay(); //}; @@ -271,9 +271,9 @@ private: class Watchpoint : public Breakpoint { public: - Watchpoint(const QString &varName, bool temporary=false, bool enabled=true); + Watchpoint(const TQString &varName, bool temporary=false, bool enabled=true); virtual ~Watchpoint(); - virtual QString dbgSetCommand(GDBController *) const; + virtual TQString dbgSetCommand(GDBController *) const; void applicationExited(GDBController*); void removedInGdb(); @@ -281,31 +281,31 @@ public: bool match_data(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_Watchpoint; } - QString displayType() const { return i18n("Watchpoint"); } - void setVarName(const QString& varName) { varName_ = varName; } - QString varName() const { return varName_; } + TQString displayType() const { return i18n("Watchpoint"); } + void setVarName(const TQString& varName) { varName_ = varName; } + TQString varName() const { return varName_; } unsigned long long address() const { return address_; } - QString location(bool) const { return varName_; } - void setLocation(const QString& location) { varName_ = location; } + TQString location(bool) const { return varName_; } + void setLocation(const TQString& location) { varName_ = location; } bool isValid() const { return !varName_.isEmpty(); } private: void setBreakpoint(GDBController* controller); void handleAddressComputed(const GDBMI::ResultRecord&); - QString varName_; + TQString varName_; unsigned long long address_; }; class ReadWatchpoint : public Watchpoint { public: - ReadWatchpoint(const QString &varName, bool temporary=false, bool enabled=true); - virtual QString dbgSetCommand(GDBController *) const; + ReadWatchpoint(const TQString &varName, bool temporary=false, bool enabled=true); + virtual TQString dbgSetCommand(GDBController *) const; bool match_data(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_ReadWatchpoint; } - QString displayType() const { return i18n("Read Watchpoint"); } + TQString displayType() const { return i18n("Read Watchpoint"); } }; } diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h index 8d13f2d0..5085da79 100644 --- a/languages/cpp/debugger/dbgcontroller.h +++ b/languages/cpp/debugger/dbgcontroller.h @@ -18,7 +18,7 @@ #include "mi/gdbmi.h" -#include <qobject.h> +#include <tqobject.h> #include <domutil.h> @@ -79,7 +79,7 @@ public: public slots: virtual void configure() = 0; - virtual void slotCoreFile(const QString &coreFile) = 0; + virtual void slotCoreFile(const TQString &coreFile) = 0; virtual void slotAttachTo(int pid) = 0; virtual void slotStopDebugger() = 0; @@ -87,8 +87,8 @@ public slots: virtual void slotRun() = 0; // Kills the application but does not stop the debugger itself. virtual void slotKill() = 0; - virtual void slotRunUntil(const QString &fileName, int lineNum) = 0; - virtual void slotJumpTo(const QString &fileName, int lineNum) = 0; + virtual void slotRunUntil(const TQString &fileName, int lineNum) = 0; + virtual void slotJumpTo(const TQString &fileName, int lineNum) = 0; virtual void slotStepInto() = 0; virtual void slotStepOver() = 0; virtual void slotStepIntoIns() = 0; @@ -107,7 +107,7 @@ protected slots: virtual void slotDbgProcessExited(KProcess *proc) = 0; signals: - void gotoSourcePosition (const QString &fileName, int lineNum); + void gotoSourcePosition (const TQString &fileName, int lineNum); void rawGDBMemoryDump (char *buf); void rawGDBRegisters (char *buf); void rawGDBLibraries (char *buf); @@ -116,8 +116,8 @@ signals: void gdbInternalCommandStdout (const char *output); void gdbUserCommandStdout (const char *output); void gdbStderr (const char *output); - void showStepInSource (const QString &fileName, int lineNum, const QString &address); - void dbgStatus (const QString &status, int statusFlag); + void showStepInSource (const TQString &fileName, int lineNum, const TQString &address); + void dbgStatus (const TQString &status, int statusFlag); protected: KProcess *dbgProcess_; diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 524e4539..e96d7395 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -26,15 +26,15 @@ #include <klistviewsearchline.h> #include <kmessagebox.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> -#include <qtoolbutton.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qheader.h> -#include <qtimer.h> +#include <tqtoolbutton.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqheader.h> +#include <tqtimer.h> #include <unistd.h> #include <sys/types.h> @@ -50,11 +50,11 @@ namespace GDBDebugger // For use with the internal debugger, but this dialog doesn't know anything // about why it's doing it. -Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) +Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) : KDialog(parent, name, true), // modal psProc_(0), pids_(new KListView(this)), - pidLines_(QString()) + pidLines_(TQString()) { setCaption(i18n("Attach to Process")); @@ -65,7 +65,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) pids_->addColumn("COMMAND"); - QBoxLayout *topLayout = new QVBoxLayout(this, 5); + TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); searchLineWidget_ = new KListViewSearchLineWidget(pids_, this); topLayout->addWidget(searchLineWidget_); @@ -75,19 +75,19 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal); buttonbox->addStretch(); - QPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, SIGNAL(clicked()), SLOT(accept())); - connect(cancel, SIGNAL(clicked()), SLOT(reject())); + connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); // Default display to 40 chars wide, default height is okay resize( ((KGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); - QTimer::singleShot(0, this, SLOT(slotInit())); + TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); } @@ -133,8 +133,8 @@ void Dbg_PS_Dialog::slotInit() } #endif - connect( psProc_, SIGNAL(processExited(KProcess *)), SLOT(slotProcessExited()) ); - connect( psProc_, SIGNAL(receivedStdout(KProcess *, char *, int)), SLOT(slotReceivedOutput(KProcess *, char *, int)) ); + connect( psProc_, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotProcessExited()) ); + connect( psProc_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(KProcess *, char *, int)) ); psProc_->start(KProcess::NotifyOnExit, KProcess::Stdout); } @@ -143,7 +143,7 @@ void Dbg_PS_Dialog::slotInit() void Dbg_PS_Dialog::slotReceivedOutput(KProcess */*proc*/, char *buffer, int buflen) { - pidLines_ += QString::fromLocal8Bit(buffer, buflen); + pidLines_ += TQString::fromLocal8Bit(buffer, buflen); } /***************************************************************************/ @@ -158,10 +158,10 @@ void Dbg_PS_Dialog::slotProcessExited() int start = pidLines_.find('\n', 0); // Skip the first line (header line) int pos; - static QRegExp ps_output_line("^\\s*(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)"); + static TQRegExp ps_output_line("^\\s*(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)"); while ( (pos = pidLines_.find('\n', start)) != -1) { - QString item = pidLines_.mid(start, pos-start); + TQString item = pidLines_.mid(start, pos-start); if (!item.isEmpty() && item.find(pidCmd_) == -1) { if(ps_output_line.search(item) == -1) @@ -177,7 +177,7 @@ void Dbg_PS_Dialog::slotProcessExited() break; } - new QListViewItem(pids_, + new TQListViewItem(pids_, ps_output_line.cap(1), ps_output_line.cap(2), ps_output_line.cap(3), @@ -192,7 +192,7 @@ void Dbg_PS_Dialog::slotProcessExited() searchLineWidget_->searchLine()->setFocus(); } -void Dbg_PS_Dialog::focusIn(QFocusEvent*) +void Dbg_PS_Dialog::focusIn(TQFocusEvent*) { searchLineWidget_->searchLine()->setFocus(); } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index d88eb72f..acc725bc 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -33,7 +33,7 @@ class Dbg_PS_Dialog : public KDialog Q_OBJECT public: - Dbg_PS_Dialog( QWidget *parent=0, const char *name=0 ); + Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 ); ~Dbg_PS_Dialog(); int pidSelected(); @@ -44,14 +44,14 @@ private slots: void slotProcessExited(); protected: - void focusIn(QFocusEvent*); + void focusIn(TQFocusEvent*); private: KProcess* psProc_; KListView* pids_; KListViewSearchLineWidget* searchLineWidget_; - QString pidLines_; - QString pidCmd_; + TQString pidLines_; + TQString pidCmd_; }; } diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index a3e58343..3fbef3c4 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -25,14 +25,14 @@ #include <kwin.h> #include <kwinmodule.h> -#include <qapplication.h> -#include <qcursor.h> -#include <qframe.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqapplication.h> +#include <tqcursor.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // ************************************************************************** // ************************************************************************** @@ -71,25 +71,25 @@ public: DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0); virtual ~DbgMoveHandle(); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); private: DbgToolBar* toolBar_; - QPoint offset_; + TQPoint offset_; bool moving_; }; // ************************************************************************** DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f) - : QFrame(parent, name, f), + : TQFrame(parent, name, f), toolBar_(parent), - offset_(QPoint(0,0)), + offset_(TQPoint(0,0)), moving_(false) { - setFrameStyle(QFrame::Panel|QFrame::Raised); + setFrameStyle(TQFrame::Panel|TQFrame::Raised); setFixedHeight(12); } @@ -101,9 +101,9 @@ DbgMoveHandle::~DbgMoveHandle() // ************************************************************************** -void DbgMoveHandle::mousePressEvent(QMouseEvent *e) +void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) { - QFrame::mousePressEvent(e); + TQFrame::mousePressEvent(e); if (moving_) return; @@ -111,38 +111,38 @@ void DbgMoveHandle::mousePressEvent(QMouseEvent *e) KPopupMenu *menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), SLOT(slotDock())); + parent(), TQT_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"), - parent(), SLOT(slotIconifyAndDock())); + parent(), TQT_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; offset_ = parentWidget()->pos() - e->globalPos(); - setFrameStyle(QFrame::Panel|QFrame::Sunken); - QApplication::setOverrideCursor(QCursor(sizeAllCursor)); - setPalette(QPalette(colorGroup().background())); + setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); + setPalette(TQPalette(colorGroup().background())); repaint(); } } // ************************************************************************** -void DbgMoveHandle::mouseReleaseEvent(QMouseEvent *e) +void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e) { - QFrame::mouseReleaseEvent(e); + TQFrame::mouseReleaseEvent(e); moving_ = false; - offset_ = QPoint(0,0); - setFrameStyle(QFrame::Panel|QFrame::Raised); - QApplication::restoreOverrideCursor(); - setPalette(QPalette(colorGroup().background())); + offset_ = TQPoint(0,0); + setFrameStyle(TQFrame::Panel|TQFrame::Raised); + TQApplication::restoreOverrideCursor(); + setPalette(TQPalette(colorGroup().background())); repaint(); } // ************************************************************************** -void DbgMoveHandle::mouseMoveEvent(QMouseEvent *e) +void DbgMoveHandle::mouseMoveEvent(TQMouseEvent *e) { - QFrame::mouseMoveEvent(e); + TQFrame::mouseMoveEvent(e); if (!moving_) return; @@ -158,21 +158,21 @@ void DbgMoveHandle::mouseMoveEvent(QMouseEvent *e) class DbgButton : public QPushButton { public: - DbgButton(const QPixmap &pixmap, const QString &text, + DbgButton(const TQPixmap &pixmap, const TQString &text, DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; - void drawButtonLabel(QPainter *painter); - QSize sizeHint() const; + void drawButtonLabel(TQPainter *painter); + TQSize sizeHint() const; private: - QPixmap pixmap_; + TQPixmap pixmap_; }; // ************************************************************************** -DbgButton::DbgButton(const QPixmap& pixmap, const QString& text, +DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text, DbgToolBar* parent, const char* name) - : QPushButton(parent, name), + : TQPushButton(parent, name), pixmap_(pixmap) { setText(text); @@ -180,7 +180,7 @@ DbgButton::DbgButton(const QPixmap& pixmap, const QString& text, // ************************************************************************** -void DbgButton::drawButtonLabel(QPainter *painter) +void DbgButton::drawButtonLabel(TQPainter *painter) { // We always have a pixmap (today...) // Centre it if there's no text @@ -198,15 +198,15 @@ void DbgButton::drawButtonLabel(QPainter *painter) // ************************************************************************** -QSize DbgButton::sizeHint() const +TQSize DbgButton::sizeHint() const { if (text().isEmpty()) return pixmap_.size(); else { - QSize ps = pixmap_.size(); - QSize bs = QPushButton::sizeHint(); - QSize result; + TQSize ps = pixmap_.size(); + TQSize bs = TQPushButton::sizeHint(); + TQSize result; result.setWidth( ps.width() + bs.width()+10 ); result.setHeight( ps.height() > bs.height() ? ps.height() : bs.height() ); return result; @@ -217,17 +217,17 @@ QSize DbgButton::sizeHint() const // ************************************************************************** // ************************************************************************** -DbgDocker::DbgDocker(QWidget* parent, DbgToolBar* toolBar, const QPixmap& pixmap) : +DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) : KSystemTray(parent, "DbgDocker"), toolBar_(toolBar) { setPixmap(pixmap); - QToolTip::add( this, i18n("KDevelop debugger: Click to execute one line of code (\"step\")") ); + TQToolTip::add( this, i18n("KDevelop debugger: Click to execute one line of code (\"step\")") ); } // ************************************************************************** -void DbgDocker::mousePressEvent(QMouseEvent *e) +void DbgDocker::mousePressEvent(TQMouseEvent *e) { if (!rect().contains( e->pos())) return; @@ -243,8 +243,8 @@ void DbgDocker::mousePressEvent(QMouseEvent *e) { KPopupMenu* menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, SLOT(slotUndock())); - menu->insertItem(i18n("Activate (KDevelop gets focus)"), toolBar_, SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (KDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -258,8 +258,8 @@ void DbgDocker::mousePressEvent(QMouseEvent *e) // ************************************************************************** DbgToolBar::DbgToolBar(DebuggerPart* part, - QWidget* parent, const char* name) - : QFrame(0, name), + TQWidget* parent, const char* name) + : TQFrame(0, name), part_(part), activeWindow_(0), winModule_(0), @@ -272,7 +272,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, { winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, SIGNAL(clicked()), part_, SLOT(slotStepOver())); + connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -286,65 +286,65 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, KWin::setType(winId(), NET::Dock); setFocusPolicy(NoFocus); - setFrameStyle( QFrame::Box | QFrame::Plain ); + setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth(4); setMidLineWidth(0); - QBoxLayout* topLayout = new QVBoxLayout(this); + TQBoxLayout* topLayout = new TQVBoxLayout(this); - QBoxLayout* nextLayout = new QHBoxLayout(); - QBoxLayout* stepLayout = new QHBoxLayout(); - QBoxLayout* focusLayout = new QHBoxLayout(); + TQBoxLayout* nextLayout = new TQHBoxLayout(); + TQBoxLayout* stepLayout = new TQHBoxLayout(); + TQBoxLayout* focusLayout = new TQHBoxLayout(); DbgMoveHandle* moveHandle= new DbgMoveHandle(this); - QPushButton* bRun = new DbgButton(BarIcon("dbgrun"), i18n("Run"), this); - QPushButton* bInterrupt = new DbgButton(BarIcon("player_pause"), i18n("Interrupt"), this); - QPushButton* bNext = new DbgButton(BarIcon("dbgnext"), QString::null, this); - QPushButton* bNexti = new DbgButton(BarIcon("dbgnextinst"), QString::null, this); - QPushButton* bStep = new DbgButton(BarIcon("dbgstep"), QString::null, this); - QPushButton* bStepi = new DbgButton(BarIcon("dbgstepinst"), QString::null, this); - QPushButton* bFinish = new DbgButton(BarIcon("dbgstepout"), i18n("Step Out"), this); - QPushButton* bRunTo = new DbgButton(BarIcon("dbgrunto"), i18n("Run to Cursor"), this); - QPushButton* bView = new DbgButton(BarIcon("dbgmemview"), i18n("Viewers"), this); - bKDevFocus_ = new DbgButton(BarIcon("kdevelop"), QString::null, this); - bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), QString::null, this); - - connect(bRun, SIGNAL(clicked()), part_, SLOT(slotRun())); - connect(bInterrupt, SIGNAL(clicked()), part_, SLOT(slotPause())); - connect(bNext, SIGNAL(clicked()), part_, SLOT(slotStepOver())); - connect(bNexti, SIGNAL(clicked()), part_, SLOT(slotStepOverInstruction())); - connect(bStep, SIGNAL(clicked()), part_, SLOT(slotStepInto())); - connect(bStepi, SIGNAL(clicked()), part_, SLOT(slotStepIntoInstruction())); - connect(bFinish, SIGNAL(clicked()), part_, SLOT(slotStepOut())); - connect(bRunTo, SIGNAL(clicked()), part_, SLOT(slotRunToCursor())); - connect(bView, SIGNAL(clicked()), part_, SLOT(slotMemoryView())); - connect(bKDevFocus_, SIGNAL(clicked()), this, SLOT(slotKdevFocus())); - connect(bPrevFocus_, SIGNAL(clicked()), this, SLOT(slotPrevFocus())); - - QToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); - QToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); - QToolTip::add( bNext, i18n("Execute one line of code, but run through functions") ); - QToolTip::add( bNexti, i18n("Execute one assembler instruction, but run through functions") ); - QToolTip::add( bStep, i18n("Execute one line of code, stepping into functions if appropriate") ); - QToolTip::add( bStepi, i18n("Execute one assembler instruction, stepping into functions if appropriate") ); - QToolTip::add( bFinish, i18n("Execute to end of current stack frame") ); - QToolTip::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); - QToolTip::add( bView, i18n("Memory, dissemble, registers, library viewers") ); - QToolTip::add( bKDevFocus_, i18n("Set focus on KDevelop") ); - QToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus") ); - - QWhatsThis::add( bRun, i18n("Continue with application execution. May start the application.") ); - QWhatsThis::add( bInterrupt, i18n("Interrupt the application execution.") ); - QWhatsThis::add( bNext, i18n("Execute one line of code, but run through functions.") ); - QWhatsThis::add( bNexti, i18n("Execute one assembler instruction, but run through functions.") ); - QWhatsThis::add( bStep, i18n("Execute one line of code, stepping into functions if appropriate.") ); - QWhatsThis::add( bStepi, i18n("Execute one assembler instruction, stepping into functions if appropriate.") ); - QWhatsThis::add( bFinish, i18n("Execute to end of current stack frame.") ); - QWhatsThis::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); - QWhatsThis::add( bView, i18n("Memory, dissemble, registers, library viewers.") ); - QWhatsThis::add( bKDevFocus_, i18n("Set focus on KDevelop.") ); - QWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus.") ); + TQPushButton* bRun = new DbgButton(BarIcon("dbgrun"), i18n("Run"), this); + TQPushButton* bInterrupt = new DbgButton(BarIcon("player_pause"), i18n("Interrupt"), this); + TQPushButton* bNext = new DbgButton(BarIcon("dbgnext"), TQString::null, this); + TQPushButton* bNexti = new DbgButton(BarIcon("dbgnextinst"), TQString::null, this); + TQPushButton* bStep = new DbgButton(BarIcon("dbgstep"), TQString::null, this); + TQPushButton* bStepi = new DbgButton(BarIcon("dbgstepinst"), TQString::null, this); + TQPushButton* bFinish = new DbgButton(BarIcon("dbgstepout"), i18n("Step Out"), this); + TQPushButton* bRunTo = new DbgButton(BarIcon("dbgrunto"), i18n("Run to Cursor"), this); + TQPushButton* bView = new DbgButton(BarIcon("dbgmemview"), i18n("Viewers"), this); + bKDevFocus_ = new DbgButton(BarIcon("kdevelop"), TQString::null, this); + bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString::null, this); + + connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); + connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); + connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(bNexti, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOverInstruction())); + connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); + connect(bStepi, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepIntoInstruction())); + connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); + connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); + connect(bView, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotMemoryView())); + connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + + TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); + TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); + TQToolTip::add( bNext, i18n("Execute one line of code, but run through functions") ); + TQToolTip::add( bNexti, i18n("Execute one assembler instruction, but run through functions") ); + TQToolTip::add( bStep, i18n("Execute one line of code, stepping into functions if appropriate") ); + TQToolTip::add( bStepi, i18n("Execute one assembler instruction, stepping into functions if appropriate") ); + TQToolTip::add( bFinish, i18n("Execute to end of current stack frame") ); + TQToolTip::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); + TQToolTip::add( bView, i18n("Memory, dissemble, registers, library viewers") ); + TQToolTip::add( bKDevFocus_, i18n("Set focus on KDevelop") ); + TQToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus") ); + + TQWhatsThis::add( bRun, i18n("Continue with application execution. May start the application.") ); + TQWhatsThis::add( bInterrupt, i18n("Interrupt the application execution.") ); + TQWhatsThis::add( bNext, i18n("Execute one line of code, but run through functions.") ); + TQWhatsThis::add( bNexti, i18n("Execute one assembler instruction, but run through functions.") ); + TQWhatsThis::add( bStep, i18n("Execute one line of code, stepping into functions if appropriate.") ); + TQWhatsThis::add( bStepi, i18n("Execute one assembler instruction, stepping into functions if appropriate.") ); + TQWhatsThis::add( bFinish, i18n("Execute to end of current stack frame.") ); + TQWhatsThis::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); + TQWhatsThis::add( bView, i18n("Memory, dissemble, registers, library viewers.") ); + TQWhatsThis::add( bKDevFocus_, i18n("Set focus on KDevelop.") ); + TQWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus.") ); topLayout->addWidget(moveHandle); topLayout->addWidget(bRun); @@ -421,7 +421,7 @@ void DbgToolBar::slotPrevFocus() // If the app is active then the app button is highlighted, otherwise // kdev button is highlighted. -void DbgToolBar::slotDbgStatus(const QString&, int state) +void DbgToolBar::slotDbgStatus(const TQString&, int state) { bool appIndicator = state & s_dbgBusy; if (appIndicator != appIsActive_) { @@ -435,11 +435,11 @@ void DbgToolBar::slotDbgStatus(const QString&, int state) void DbgToolBar::setAppIndicator(bool appIndicator) { if (appIndicator) { - bPrevFocus_->setPalette(QPalette(colorGroup().mid())); - bKDevFocus_->setPalette(QPalette(colorGroup().background())); + bPrevFocus_->setPalette(TQPalette(colorGroup().mid())); + bKDevFocus_->setPalette(TQPalette(colorGroup().background())); } else { - bPrevFocus_->setPalette(QPalette(colorGroup().background())); - bKDevFocus_->setPalette(QPalette(colorGroup().mid())); + bPrevFocus_->setPalette(TQPalette(colorGroup().background())); + bKDevFocus_->setPalette(TQPalette(colorGroup().mid())); } } diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 4f284701..188862d4 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -21,7 +21,7 @@ class KWinModule; #include <ksystemtray.h> #include <kwin.h> // needed for WId :( -#include <qframe.h> +#include <tqframe.h> namespace GDBDebugger { @@ -35,9 +35,9 @@ class DbgDocker : public KSystemTray Q_OBJECT public: - DbgDocker(QWidget *parent, DbgToolBar *toolBar, const QPixmap &pixmap); + DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap); virtual ~DbgDocker() {}; - virtual void mousePressEvent(QMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); signals: void clicked(); @@ -52,11 +52,11 @@ class DbgToolBar : public QFrame Q_OBJECT public: - DbgToolBar(DebuggerPart *part, QWidget* parent, const char* name=0); + DbgToolBar(DebuggerPart *part, TQWidget* parent, const char* name=0); virtual ~DbgToolBar(); private slots: - void slotDbgStatus(const QString&, int); + void slotDbgStatus(const TQString&, int); void slotDock(); void slotUndock(); void slotIconifyAndDock(); diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp index 11de247f..f2891378 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -20,24 +20,24 @@ #include <kurlrequester.h> #include <klineedit.h> -#include <qcheckbox.h> -#include <qfileinfo.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqfileinfo.h> +#include <tqradiobutton.h> namespace GDBDebugger { -DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, QWidget *parent, const char *name) +DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, const char *name) : DebuggerConfigWidgetBase(parent, name), dom(*part->projectDom()) { gdbPath_edit->setMode(KFile::File|KFile::ExistingOnly|KFile::LocalOnly); gdbPath_edit->setURL( DomUtil::readEntry(dom, "/kdevdebugger/general/gdbpath")); - QString shell = DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value"); - if( shell == QString("no_value") ) + TQString shell = DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value"); + if( shell == TQString("no_value") ) { - shell = QString::null; + shell = TQString::null; } debuggingShell_edit->setURL( shell ); diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h index dbf63d4b..3a8283a2 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.h +++ b/languages/cpp/debugger/debuggerconfigwidget.h @@ -16,7 +16,7 @@ #include "debuggerconfigwidgetbase.h" -#include <qdom.h> +#include <tqdom.h> namespace GDBDebugger { @@ -28,14 +28,14 @@ class DebuggerConfigWidget : public DebuggerConfigWidgetBase Q_OBJECT public: - DebuggerConfigWidget( DebuggerPart* part, QWidget *parent=0, const char *name=0 ); + DebuggerConfigWidget( DebuggerPart* part, TQWidget *parent=0, const char *name=0 ); ~DebuggerConfigWidget(); public slots: void accept(); private: - QDomDocument &dom; + TQDomDocument &dom; }; } diff --git a/languages/cpp/debugger/debuggerdcopinterface.h b/languages/cpp/debugger/debuggerdcopinterface.h index 4a9bcf30..afde8b09 100644 --- a/languages/cpp/debugger/debuggerdcopinterface.h +++ b/languages/cpp/debugger/debuggerdcopinterface.h @@ -23,7 +23,7 @@ public: k_dcop: virtual ASYNC slotDebugExternalProcess() = 0; - virtual ASYNC slotDebugCommandLine(const QString& command) = 0; + virtual ASYNC slotDebugCommandLine(const TQString& command) = 0; }; #endif diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index c8c3c1a1..4842ca84 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -14,11 +14,11 @@ #include "debuggerpart.h" #include "label_with_double_click.h" -#include <qdir.h> -#include <qvbox.h> -#include <qwhatsthis.h> -#include <qpopupmenu.h> -#include <qtooltip.h> +#include <tqdir.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> +#include <tqpopupmenu.h> +#include <tqtooltip.h> #include <kaction.h> #include <kdebug.h> @@ -33,7 +33,7 @@ #include <kmessagebox.h> #include <kapplication.h> #include <dcopclient.h> -#include <qtimer.h> +#include <tqtimer.h> #include <kstringhandler.h> #include <kdockwidget.h> @@ -76,7 +76,7 @@ static const KDevPluginInfo data("kdevdebugger"); typedef KDevGenericFactory<DebuggerPart> DebuggerFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) ) -DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList & ) : +DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : KDevPlugin( &data, parent, name ? name : "DebuggerPart" ), controller(0), previousDebuggerState_(s_dbgNotStarted), justRestarted_(false), needRebuild_(true), @@ -104,7 +104,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList gdbBreakpointWidget = new GDBBreakpointWidget( controller, 0, "gdbBreakpointWidget" ); gdbBreakpointWidget->setCaption(i18n("Breakpoint List")); - QWhatsThis::add + TQWhatsThis::add (gdbBreakpointWidget, i18n("<b>Breakpoint list</b><p>" "Displays a list of breakpoints with " "their current status. Clicking on a " @@ -124,7 +124,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList framestackWidget = new FramestackWidget( controller, 0, "framestackWidget" ); framestackWidget->setEnabled(false); framestackWidget->setCaption(i18n("Frame Stack")); - QWhatsThis::add + TQWhatsThis::add (framestackWidget, i18n("<b>Frame stack</b><p>" "Often referred to as the \"call stack\", " "this is a list showing what function is " @@ -140,7 +140,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList disassembleWidget = new DisassembleWidget( controller, 0, "disassembleWidget" ); disassembleWidget->setEnabled(false); disassembleWidget->setCaption(i18n("Machine Code Display")); - QWhatsThis::add + TQWhatsThis::add (disassembleWidget, i18n("<b>Machine code display</b><p>" "A machine code view into your running " "executable with the current instruction " @@ -157,7 +157,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList gdbOutputWidget->setEnabled(false); gdbOutputWidget->setIcon( SmallIcon("inline_image") ); gdbOutputWidget->setCaption(i18n("GDB Output")); - QWhatsThis::add + TQWhatsThis::add (gdbOutputWidget, i18n("<b>GDB output</b><p>" "Shows all gdb commands being executed. " "You can also issue any other gdb command while debugging.")); @@ -166,12 +166,12 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList mainWindow()->setViewAvailable(gdbOutputWidget, false); // gdbBreakpointWidget -> this - connect( gdbBreakpointWidget, SIGNAL(refreshBPState(const Breakpoint&)), - this, SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, SIGNAL(publishBPState(const Breakpoint&)), - this, SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, SIGNAL(gotoSourcePosition(const QString&, int)), - this, SLOT(slotGotoSource(const QString&, int)) ); + connect( gdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), + this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); viewerWidget = new ViewerWidget( controller, 0, "viewerWidget"); @@ -179,15 +179,15 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList i18n("Debug views"), i18n("Special debugger views")); mainWindow()->setViewAvailable(viewerWidget, false); - connect(viewerWidget, SIGNAL(setViewShown(bool)), - this, SLOT(slotShowView(bool))); + connect(viewerWidget, TQT_SIGNAL(setViewShown(bool)), + this, TQT_SLOT(slotShowView(bool))); // Now setup the actions KAction *action; // action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new KAction(i18n("&Start"), "dbgrun", Key_F9, - this, SLOT(slotRun()), + this, TQT_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("<b>Start in debugger</b><p>" @@ -198,7 +198,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList "about variables, frame stack, and so on.") ); action = new KAction(i18n("&Restart"), "dbgrestart", 0, - this, SLOT(slotRestart()), + this, TQT_SLOT(slotRestart()), actionCollection(), "debug_restart"); action->setToolTip( i18n("Restart program") ); action->setWhatsThis( i18n("<b>Restarts application</b><p>" @@ -208,33 +208,33 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Sto&p"), "stop", 0, - this, SLOT(slotStop()), + this, TQT_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); action = new KAction(i18n("Interrupt"), "player_pause", 0, - this, SLOT(slotPause()), + this, TQT_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current GDB command.")); action = new KAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, SLOT(slotRunToCursor()), + this, TQT_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); action = new KAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, - this, SLOT(slotJumpToCursor()), + this, TQT_SLOT(slotJumpToCursor()), actionCollection(), "debug_jumptocursor"); action->setToolTip( i18n("Jump to cursor") ); action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position.")); action = new KAction(i18n("Step &Over"), "dbgnext", Key_F10, - this, SLOT(slotStepOver()), + this, TQT_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("<b>Step over</b><p>" @@ -245,14 +245,14 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, - this, SLOT(slotStepOverInstruction()), + this, TQT_SLOT(slotStepOverInstruction()), actionCollection(), "debug_stepoverinst"); action->setToolTip( i18n("Step over instruction") ); action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction.")); action = new KAction(i18n("Step &Into"), "dbgstep", Key_F11, - this, SLOT(slotStepInto()), + this, TQT_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("<b>Step into</b><p>" @@ -262,14 +262,14 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, - this, SLOT(slotStepIntoInstruction()), + this, TQT_SLOT(slotStepIntoInstruction()), actionCollection(), "debug_stepintoinst"); action->setToolTip( i18n("Step into instruction") ); action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction.")); action = new KAction(i18n("Step O&ut"), "dbgstepout", Key_F12, - this, SLOT(slotStepOut()), + this, TQT_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current function") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -281,7 +281,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Viewers"), "dbgmemview", 0, - this, SLOT(slotMemoryView()), + this, TQT_SLOT(slotMemoryView()), actionCollection(), "debug_memview"); action->setToolTip( i18n("Debugger viewers") ); action->setWhatsThis(i18n("<b>Debugger viewers</b><p>Various information about application being executed. There are 4 views available:<br>" @@ -292,7 +292,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Examine Core File..."), "core", 0, - this, SLOT(slotExamineCore()), + this, TQT_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); action->setWhatsThis( i18n("<b>Examine core file</b><p>" @@ -304,72 +304,72 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Attach to Process"), "connect_creating", 0, - this, SLOT(slotAttachProcess()), + this, TQT_SLOT(slotAttachProcess()), actionCollection(), "debug_attach"); action->setToolTip( i18n("Attach to process") ); action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process.")); action = new KAction(i18n("Toggle Breakpoint"), 0, 0, - this, SLOT(toggleBreakpoint()), + this, TQT_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), SIGNAL(clientAdded(KXMLGUIClient*)), - this, SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( partController(), SIGNAL(loadedFile(const KURL &)), - gdbBreakpointWidget, SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), SIGNAL(toggledBreakpoint(const QString &, int)), - gdbBreakpointWidget, SLOT(slotToggleBreakpoint(const QString &, int)) ); - connect( debugger(), SIGNAL(editedBreakpoint(const QString &, int)), - gdbBreakpointWidget, SLOT(slotEditBreakpoint(const QString &, int)) ); - connect( debugger(), SIGNAL(toggledBreakpointEnabled(const QString &, int)), - gdbBreakpointWidget, SLOT(slotToggleBreakpointEnabled(const QString &, int)) ); + connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), + gdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - 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 *)) ); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), - this, SLOT(slotStop(KDevPlugin*)) ); - connect( core(), SIGNAL(projectClosed()), - this, SLOT(projectClosed()) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQT_SIGNAL(projectClosed()), + this, TQT_SLOT(projectClosed()) ); - connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, SIGNAL(receivedStdoutLine(const QCString&)), - appFrontend(), SLOT(insertStdoutLine(const QCString&)) ); - connect( procLineMaker, SIGNAL(receivedStderrLine(const QCString&)), - appFrontend(), SLOT(insertStderrLine(const QCString&)) ); + connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, SIGNAL(receivedPartialStdoutLine(const QCString&)), - appFrontend(), SLOT(addPartialStdoutLine(const QCString&))); - connect( procLineMaker, SIGNAL(receivedPartialStderrLine(const QCString&)), - appFrontend(), SLOT(addPartialStderrLine(const QCString&))); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&))); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&))); // The output from tracepoints goes to "application" window, because // we don't have any better alternative, and using yet another window // is undesirable. Besides, this makes tracepoint look even more similar // to printf debugging. - connect( gdbBreakpointWidget, SIGNAL(tracingOutput(const char*)), - procLineMaker, SLOT(slotReceivedStdout(const char*))); + connect( gdbBreakpointWidget, TQT_SIGNAL(tracingOutput(const char*)), + procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect(partController(), SIGNAL(savedFile(const KURL &)), - this, SLOT(slotFileSaved())); + connect(partController(), TQT_SIGNAL(savedFile(const KURL &)), + this, TQT_SLOT(slotFileSaved())); if (project()) - connect(project(), SIGNAL(projectCompiled()), - this, SLOT(slotProjectCompiled())); + connect(project(), TQT_SIGNAL(projectCompiled()), + this, TQT_SLOT(slotProjectCompiled())); setupController(); - QTimer::singleShot(0, this, SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); } void DebuggerPart::setupDcop() @@ -379,24 +379,24 @@ void DebuggerPart::setupDcop() if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); - connect(kapp->dcopClient(), SIGNAL(applicationRegistered(const QCString&)), SLOT(slotDCOPApplicationRegistered(const QCString&))); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); kapp->dcopClient()->setNotifications(true); } -void DebuggerPart::slotDCOPApplicationRegistered(const QCString& appId) +void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) { if (appId.find("drkonqi-") == 0) { - QByteArray answer; - QCString replyType; + TQByteArray answer; + TQCString replyType; - kapp->dcopClient()->call(appId, "krashinfo", "appName()", QByteArray(), replyType, answer, true, 5000); + kapp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000); - QDataStream d(answer, IO_ReadOnly); - QCString appName; + TQDataStream d(answer, IO_ReadOnly); + TQCString appName; d >> appName; if (appName.length() && project() && project()->mainProgram().endsWith(appName)) { - kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(QString)", i18n("Debug in &KDevelop")); + kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &KDevelop")); connectDCOPSignal(appId, "krashinfo", "acceptDebuggingApplication()", "slotDebugExternalProcess()", true); } } @@ -404,32 +404,32 @@ void DebuggerPart::slotDCOPApplicationRegistered(const QCString& appId) ASYNC DebuggerPart::slotDebugExternalProcess() { - QByteArray answer; - QCString replyType; + TQByteArray answer; + TQCString replyType; - kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", QByteArray(), replyType, answer, true, 5000); + kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000); - QDataStream d(answer, IO_ReadOnly); + TQDataStream d(answer, IO_ReadOnly); int pid; d >> pid; if (attachProcess(pid) && m_drkonqi.isEmpty()) { m_drkonqi = kapp->dcopClient()->senderId(); - QTimer::singleShot(15000, this, SLOT(slotCloseDrKonqi())); + TQTimer::singleShot(15000, this, TQT_SLOT(slotCloseDrKonqi())); mainWindow()->raiseView(framestackWidget); } mainWindow()->main()->raise(); } -ASYNC DebuggerPart::slotDebugCommandLine(const QString& /*command*/) +ASYNC DebuggerPart::slotDebugCommandLine(const TQString& /*command*/) { KMessageBox::information(0, "Asked to debug command line"); } void DebuggerPart::slotCloseDrKonqi() { - kapp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", QByteArray()); + kapp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray()); m_drkonqi = ""; } @@ -467,10 +467,10 @@ void DebuggerPart::guiClientAdded( KXMLGUIClient* client ) // Can't change state until after XMLGUI has been loaded... // Anyone know of a better way of doing this? if( client == this ) - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); } -void DebuggerPart::contextMenu(QPopupMenu *popup, const Context *context) +void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) { if (!context->hasType( Context::EditorContext )) return; @@ -491,13 +491,13 @@ void DebuggerPart::contextMenu(QPopupMenu *popup, const Context *context) int index = running ? 0 : -1; if (running) { - // Too bad we can't add QAction to popup menu in Qt3. + // Too bad we can't add TQAction to popup menu in Qt3. KAction* act = actionCollection()->action("debug_runtocursor"); Q_ASSERT(act); if (act) { int id = popup->insertItem( act->iconSet(), i18n("Run to &Cursor"), - this, SLOT(slotRunToCursor()), + this, TQT_SLOT(slotRunToCursor()), 0, -1, index); popup->setWhatsThis(id, act->whatsThis()); @@ -507,21 +507,21 @@ void DebuggerPart::contextMenu(QPopupMenu *popup, const Context *context) if (econtext->url().isLocalFile()) { int id = popup->insertItem( i18n("Toggle Breakpoint"), - this, SLOT(toggleBreakpoint()), + this, TQT_SLOT(toggleBreakpoint()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { - QString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); + TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed), - this, SLOT(contextEvaluate()), + this, TQT_SLOT(contextEvaluate()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed), - this, SLOT(contextWatch()), + this, TQT_SLOT(contextWatch()), 0, -1, index); index += running; popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list.")); @@ -560,10 +560,10 @@ void DebuggerPart::contextEvaluate() void DebuggerPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), KIcon::SizeMedium) ); + TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), KIcon::SizeMedium) ); DebuggerConfigWidget *w = new DebuggerConfigWidget(this, vbox, "debugger config widget"); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); - connect( dlg, SIGNAL(finished()), controller, SLOT(configure()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(finished()), controller, TQT_SLOT(configure()) ); } @@ -572,68 +572,68 @@ void DebuggerPart::setupController() VariableTree *variableTree = variableWidget->varTree(); // variableTree -> gdbBreakpointWidget - connect( variableTree, SIGNAL(toggleWatchpoint(const QString &)), - gdbBreakpointWidget, SLOT(slotToggleWatchpoint(const QString &))); + connect( variableTree, TQT_SIGNAL(toggleWatchpoint(const TQString &)), + gdbBreakpointWidget, TQT_SLOT(slotToggleWatchpoint(const TQString &))); // gdbOutputWidget -> controller - connect( gdbOutputWidget, SIGNAL(userGDBCmd(const QString &)), - controller, SLOT(slotUserGDBCmd(const QString&))); - connect( gdbOutputWidget, SIGNAL(breakInto()), - controller, SLOT(slotBreakInto())); + connect( gdbOutputWidget, TQT_SIGNAL(userGDBCmd(const TQString &)), + controller, TQT_SLOT(slotUserGDBCmd(const TQString&))); + connect( gdbOutputWidget, TQT_SIGNAL(breakInto()), + controller, TQT_SLOT(slotBreakInto())); - connect( controller, SIGNAL(breakpointHit(int)), - gdbBreakpointWidget, SLOT(slotBreakpointHit(int))); + connect( controller, TQT_SIGNAL(breakpointHit(int)), + gdbBreakpointWidget, TQT_SLOT(slotBreakpointHit(int))); // controller -> disassembleWidget - connect( controller, SIGNAL(showStepInSource(const QString&, int, const QString&)), - disassembleWidget, SLOT(slotShowStepInSource(const QString&, int, const QString&))); + connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); // controller -> this - connect( controller, SIGNAL(dbgStatus(const QString&, int)), - this, SLOT(slotStatus(const QString&, int))); - connect( controller, SIGNAL(showStepInSource(const QString&, int, const QString&)), - this, SLOT(slotShowStep(const QString&, int))); - connect( controller, SIGNAL(debuggerAbnormalExit()), - this, SLOT(slotDebuggerAbnormalExit())); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + this, TQT_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + this, TQT_SLOT(slotShowStep(const TQString&, int))); + connect( controller, TQT_SIGNAL(debuggerAbnormalExit()), + this, TQT_SLOT(slotDebuggerAbnormalExit())); - connect(controller, SIGNAL(event(GDBController::event_t)), - this, SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQT_SIGNAL(event(GDBController::event_t)), + this, TQT_SLOT(slotEvent(GDBController::event_t))); // controller -> procLineMaker - connect( controller, SIGNAL(ttyStdout(const char*)), - procLineMaker, SLOT(slotReceivedStdout(const char*))); - connect( controller, SIGNAL(ttyStderr(const char*)), - procLineMaker, SLOT(slotReceivedStderr(const char*))); + connect( controller, TQT_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQT_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); // controller -> gdbOutputWidget - connect( controller, SIGNAL(gdbInternalCommandStdout(const char*)), - gdbOutputWidget, SLOT(slotInternalCommandStdout(const char*)) ); - connect( controller, SIGNAL(gdbUserCommandStdout(const char*)), - gdbOutputWidget, SLOT(slotUserCommandStdout(const char*)) ); + connect( controller, TQT_SIGNAL(gdbInternalCommandStdout(const char*)), + gdbOutputWidget, TQT_SLOT(slotInternalCommandStdout(const char*)) ); + connect( controller, TQT_SIGNAL(gdbUserCommandStdout(const char*)), + gdbOutputWidget, TQT_SLOT(slotUserCommandStdout(const char*)) ); - connect( controller, SIGNAL(gdbStderr(const char*)), - gdbOutputWidget, SLOT(slotReceivedStderr(const char*)) ); - connect( controller, SIGNAL(dbgStatus(const QString&, int)), - gdbOutputWidget, SLOT(slotDbgStatus(const QString&, int))); + connect( controller, TQT_SIGNAL(gdbStderr(const char*)), + gdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + gdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); // controller -> viewerWidget - connect( controller, SIGNAL(dbgStatus(const QString&, int)), - viewerWidget, SLOT(slotDebuggerState(const QString&, int))); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int))); - connect(statusBarIndicator, SIGNAL(doubleClicked()), - controller, SLOT(explainDebuggerStatus())); + connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()), + controller, TQT_SLOT(explainDebuggerStatus())); } bool DebuggerPart::startDebugger() { - QString build_dir; // Currently selected build directory + TQString build_dir; // Currently selected build directory DomUtil::PairList run_envvars; // List with the environment variables - QString run_directory; // Directory from where the program should be run - QString program; // Absolute path to application - QString run_arguments; // Command line arguments to be passed to the application + TQString run_directory; // Directory from where the program should be run + TQString program; // Absolute path to application + TQString run_arguments; // Command line arguments to be passed to the application if (project()) { build_dir = project()->buildDirectory(); @@ -643,13 +643,13 @@ bool DebuggerPart::startDebugger() run_arguments = project()->debugArguments(); } - QString shell = DomUtil::readEntry(*projectDom(), "/kdevdebugger/general/dbgshell"); + TQString shell = DomUtil::readEntry(*projectDom(), "/kdevdebugger/general/dbgshell"); if( !shell.isEmpty() ) { shell = shell.simplifyWhiteSpace(); - QString shell_without_args = QStringList::split(QChar(' '), shell ).first(); + TQString shell_without_args = TQStringList::split(TQChar(' '), shell ).first(); - QFileInfo info( shell_without_args ); + TQFileInfo info( shell_without_args ); if( info.isRelative() ) { shell_without_args = build_dir + "/" + shell_without_args; @@ -670,7 +670,7 @@ bool DebuggerPart::startDebugger() { core()->running(this, true); - stateChanged( QString("active") ); + stateChanged( TQString("active") ); KActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Continue") ); @@ -748,15 +748,15 @@ void DebuggerPart::slotStopDebugger() "while it is running, in order to get information " "about variables, frame stack, and so on.") ); - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); core()->running(this, false); } void DebuggerPart::slotShowView(bool show) { - const QWidget* s = static_cast<const QWidget*>(sender()); - QWidget* ncs = const_cast<QWidget*>(s); + const TQWidget* s = static_cast<const TQWidget*>(sender()); + TQWidget* ncs = const_cast<TQWidget*>(s); mainWindow()->setViewAvailable(ncs, show); if (show) mainWindow()->raiseView(ncs); @@ -857,18 +857,18 @@ void DebuggerPart::slotRun() if (rebuild) { - disconnect(SIGNAL(buildProject())); + disconnect(TQT_SIGNAL(buildProject())); // The KDevProject has no method to build the project, // so try connecting to a slot has is present to all // existing project managers. // Note: this assumes that 'slotBuild' will save // modified files. - if (connect(this, SIGNAL(buildProject()), - project(), SLOT(slotBuild()))) + if (connect(this, TQT_SIGNAL(buildProject()), + project(), TQT_SLOT(slotBuild()))) { - connect(project(), SIGNAL(projectCompiled()), - this, SLOT(slotRun_part2())); + connect(project(), TQT_SIGNAL(projectCompiled()), + this, TQT_SLOT(slotRun_part2())); emit buildProject(); rebuild = true; @@ -894,8 +894,8 @@ void DebuggerPart::slotRun_part2() { needRebuild_ = false; - disconnect(project(), SIGNAL(projectCompiled()), - this, SLOT(slotRun_part2())); + disconnect(project(), TQT_SIGNAL(projectCompiled()), + this, TQT_SLOT(slotRun_part2())); if (controller->stateIsOn( s_dbgNotStarted )) { @@ -950,8 +950,8 @@ void DebuggerPart::slotExamineCore() { mainWindow()->statusBar()->message(i18n("Choose a core file to examine..."), 1000); - QString dirName = project()? project()->projectDirectory() : QDir::homeDirPath(); - QString coreFile = KFileDialog::getOpenFileName(dirName); + TQString dirName = project()? project()->projectDirectory() : TQDir::homeDirPath(); + TQString coreFile = KFileDialog::getOpenFileName(dirName); if (coreFile.isNull()) return; @@ -1092,33 +1092,33 @@ void DebuggerPart::slotRefreshBPState( const Breakpoint& BP) } } -void DebuggerPart::slotStatus(const QString &msg, int state) +void DebuggerPart::slotStatus(const TQString &msg, int state) { - QString stateIndicator, stateIndicatorFull; + TQString stateIndicator, stateIndicatorFull; if (state & s_dbgNotStarted) { stateIndicator = " "; stateIndicatorFull = "Debugger not started"; - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); } else if (state & s_dbgBusy) { stateIndicator = "R"; stateIndicatorFull = "Debugger is busy"; - stateChanged( QString("active") ); + stateChanged( TQString("active") ); } else if (state & s_programExited) { stateIndicator = "E"; stateIndicatorFull = "Application has exited"; - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); } else { stateIndicator = "P"; stateIndicatorFull = "Application is paused"; - stateChanged( QString("paused") ); + stateChanged( TQString("paused") ); // On the first stop, show the variables view. // We do it on first stop, and not at debugger start, because // a program might just successfully run till completion. If we show @@ -1173,7 +1173,7 @@ void DebuggerPart::slotStatus(const QString &msg, int state) kdDebug(9012) << " " << msg << endl; statusBarIndicator->setText(stateIndicator); - QToolTip::add(statusBarIndicator, stateIndicatorFull); + TQToolTip::add(statusBarIndicator, stateIndicatorFull); if (!msg.isEmpty()) mainWindow()->statusBar()->message(msg, 3000); @@ -1192,7 +1192,7 @@ void DebuggerPart::slotEvent(GDBController::event_t e) } -void DebuggerPart::slotShowStep(const QString &fileName, int lineNum) +void DebuggerPart::slotShowStep(const TQString &fileName, int lineNum) { if ( ! fileName.isEmpty() ) { @@ -1206,7 +1206,7 @@ void DebuggerPart::slotShowStep(const QString &fileName, int lineNum) } -void DebuggerPart::slotGotoSource(const QString &fileName, int lineNum) +void DebuggerPart::slotGotoSource(const TQString &fileName, int lineNum) { if ( ! fileName.isEmpty() ) partController()->editDocument(KURL( fileName ), lineNum); @@ -1229,13 +1229,13 @@ void DebuggerPart::slotActivePartChanged( KParts::Part* part ) action->setEnabled( iface != 0 ); } -void DebuggerPart::restorePartialProjectSession(const QDomElement* el) +void DebuggerPart::restorePartialProjectSession(const TQDomElement* el) { gdbBreakpointWidget->restorePartialProjectSession(el); gdbOutputWidget->restorePartialProjectSession(el); } -void DebuggerPart::savePartialProjectSession(QDomElement* el) +void DebuggerPart::savePartialProjectSession(TQDomElement* el) { gdbBreakpointWidget->savePartialProjectSession(el); gdbOutputWidget->savePartialProjectSession(el); diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index afb3b340..c20b1f39 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -14,7 +14,7 @@ #ifndef _DEBUGGERPART_H_ #define _DEBUGGERPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include "kdevplugin.h" #include "kdevcore.h" @@ -49,19 +49,19 @@ class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface Q_OBJECT public: - DebuggerPart( QObject *parent, const char *name, const QStringList & ); + DebuggerPart( TQObject *parent, const char *name, const TQStringList & ); ~DebuggerPart(); - virtual void restorePartialProjectSession(const QDomElement* el); - virtual void savePartialProjectSession(QDomElement* el); + virtual void restorePartialProjectSession(const TQDomElement* el); + virtual void savePartialProjectSession(TQDomElement* el); k_dcop: virtual ASYNC slotDebugExternalProcess(); - virtual ASYNC slotDebugCommandLine(const QString& command); + virtual ASYNC slotDebugCommandLine(const TQString& command); private slots: void setupDcop(); void guiClientAdded(KXMLGUIClient*); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void toggleBreakpoint(); void contextEvaluate(); void contextWatch(); @@ -94,11 +94,11 @@ private slots: void slotRefreshBPState(const Breakpoint&); - void slotStatus(const QString &msg, int state); - void slotShowStep(const QString &fileName, int lineNum); - void slotGotoSource(const QString &fileName, int lineNum); + void slotStatus(const TQString &msg, int state); + void slotShowStep(const TQString &fileName, int lineNum); + void slotGotoSource(const TQString &fileName, int lineNum); - void slotDCOPApplicationRegistered(const QCString &appId); + void slotDCOPApplicationRegistered(const TQCString &appId); void slotCloseDrKonqi(); // Hide or show the view that's the sender of this signal. @@ -123,20 +123,20 @@ private: void setupController(); bool haveModifiedFiles(); - QGuardedPtr<VariableWidget> variableWidget; - QGuardedPtr<GDBBreakpointWidget> gdbBreakpointWidget; - QGuardedPtr<FramestackWidget> framestackWidget; - QGuardedPtr<DisassembleWidget> disassembleWidget; - QGuardedPtr<GDBOutputWidget> gdbOutputWidget; - QGuardedPtr<ViewerWidget> viewerWidget; + TQGuardedPtr<VariableWidget> variableWidget; + TQGuardedPtr<GDBBreakpointWidget> gdbBreakpointWidget; + TQGuardedPtr<FramestackWidget> framestackWidget; + TQGuardedPtr<DisassembleWidget> disassembleWidget; + TQGuardedPtr<GDBOutputWidget> gdbOutputWidget; + TQGuardedPtr<ViewerWidget> viewerWidget; GDBController *controller; - QGuardedPtr<QLabel> statusBarIndicator; - QGuardedPtr<DbgToolBar> floatingToolBar; + TQGuardedPtr<TQLabel> statusBarIndicator; + TQGuardedPtr<DbgToolBar> floatingToolBar; ProcessLineMaker* procLineMaker; ProcessLineMaker* gdbLineMaker; - QString m_contextIdent; - QCString m_drkonqi; + TQString m_contextIdent; + TQCString m_drkonqi; KDevDebugger *m_debugger; int previousDebuggerState_; diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 217f0b88..41eb7896 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -2,9 +2,9 @@ #include "debuggertracingdialog.h" #include "breakpoint.h" -#include <qbutton.h> -#include <qlabel.h> -#include <qcheckbox.h> +#include <tqbutton.h> +#include <tqlabel.h> +#include <tqcheckbox.h> #include <klineedit.h> #include <keditlistbox.h> #include <kmessagebox.h> @@ -14,16 +14,16 @@ namespace GDBDebugger DebuggerTracingDialog ::DebuggerTracingDialog(Breakpoint* bp, - QWidget* parent, const char* name) + TQWidget* parent, const char* name) : DebuggerTracingDialogBase(parent, name), bp_(bp) { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); - connect(enable, SIGNAL(stateChanged(int)), - this, SLOT(enableOrDisable(int))); + connect(enable, TQT_SIGNAL(stateChanged(int)), + this, TQT_SLOT(enableOrDisable(int))); - connect(enableCustomFormat, SIGNAL(stateChanged(int)), - this, SLOT(enableOrDisableCustomFormat(int))); + connect(enableCustomFormat, TQT_SIGNAL(stateChanged(int)), + this, TQT_SLOT(enableOrDisableCustomFormat(int))); enable->setChecked(bp_->tracingEnabled()); expressions->setItems(bp_->tracedExpressions()); @@ -35,7 +35,7 @@ namespace GDBDebugger void DebuggerTracingDialog::enableOrDisable(int state) { - bool enable = (state == QButton::On); + bool enable = (state == TQButton::On); expressionsLabel->setEnabled(enable); expressions->setEnabled(enable); @@ -45,7 +45,7 @@ namespace GDBDebugger void DebuggerTracingDialog::enableOrDisableCustomFormat(int state) { - customFormat->setEnabled(state == QButton::On); + customFormat->setEnabled(state == TQButton::On); } void DebuggerTracingDialog::accept() @@ -57,7 +57,7 @@ namespace GDBDebugger if (enableCustomFormat->isOn()) { - QString s = customFormat->text(); + TQString s = customFormat->text(); unsigned percent_count = 0; for (unsigned i = 0; i < s.length(); ++i) if (s[i] == '%') diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h index 1379f684..916ae912 100644 --- a/languages/cpp/debugger/debuggertracingdialog.h +++ b/languages/cpp/debugger/debuggertracingdialog.h @@ -25,7 +25,7 @@ namespace GDBDebugger Q_OBJECT public: DebuggerTracingDialog(Breakpoint* bp, - QWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = 0); private slots: void enableOrDisable(int); diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 759393f5..562aa1ae 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -22,9 +22,9 @@ #include <ktextedit.h> #include <kglobalsettings.h> -#include <qdict.h> -#include <qheader.h> -#include <qtextedit.h> +#include <tqdict.h> +#include <tqheader.h> +#include <tqtextedit.h> #include <stdlib.h> @@ -35,8 +35,8 @@ namespace GDBDebugger /***************************************************************************/ /***************************************************************************/ -DisassembleWidget::DisassembleWidget(GDBController* controller, QWidget *parent, const char *name) - : QTextEdit(parent, name), controller_(controller), +DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent, const char *name) + : TQTextEdit(parent, name), controller_(controller), active_(false), lower_(0), upper_(0), @@ -92,8 +92,8 @@ void DisassembleWidget::slotActivate(bool activate) /***************************************************************************/ -void DisassembleWidget::slotShowStepInSource( const QString &, int, - const QString ¤tAddress) +void DisassembleWidget::slotShowStepInSource( const TQString &, int, + const TQString ¤tAddress) { kdDebug(9012) << "DisasssembleWidget::slotShowStepInSource()" << endl; @@ -116,7 +116,7 @@ void DisassembleWidget::getNextDisplay() { Q_ASSERT(!currentAddress_.isNull()); - QString cmd = QString("-data-disassemble -s $pc -e \"$pc + 128\" -- 0"); + TQString cmd = TQString("-data-disassemble -s $pc -e \"$pc + 128\" -- 0"); controller_->addCommandToFront( new GDBCommand( cmd, this, &DisassembleWidget::memoryRead ) ); } @@ -127,7 +127,7 @@ void DisassembleWidget::getNextDisplay() void DisassembleWidget::memoryRead(const GDBMI::ResultRecord& r) { const GDBMI::Value& content = r["asm_insns"]; - QString rawdata; + TQString rawdata; clear(); @@ -135,12 +135,12 @@ void DisassembleWidget::memoryRead(const GDBMI::ResultRecord& r) { const GDBMI::Value& line = content[i]; - QString addr = line["address"].literal(); - QString fct = line["func-name"].literal(); - QString offs = line["offset"].literal(); - QString inst = line["inst"].literal(); + TQString addr = line["address"].literal(); + TQString fct = line["func-name"].literal(); + TQString offs = line["offset"].literal(); + TQString inst = line["inst"].literal(); - rawdata += QString(addr + " " + fct+"+"+offs + " " + inst + "\n"); + rawdata += TQString(addr + " " + fct+"+"+offs + " " + inst + "\n"); if (i == 0) { lower_ = strtoul(addr.latin1(), 0, 0); @@ -155,13 +155,13 @@ void DisassembleWidget::memoryRead(const GDBMI::ResultRecord& r) } -void DisassembleWidget::showEvent(QShowEvent*) +void DisassembleWidget::showEvent(TQShowEvent*) { slotActivate(true); } -void DisassembleWidget::hideEvent(QHideEvent*) +void DisassembleWidget::hideEvent(TQHideEvent*) { slotActivate(false); } diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 6b2fdd3a..55288c0c 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -18,7 +18,7 @@ #include "mi/gdbmi.h" -#include <qtextedit.h> +#include <tqtextedit.h> /***************************************************************************/ /***************************************************************************/ @@ -35,16 +35,16 @@ class DisassembleWidget : public QTextEdit Q_OBJECT public: - DisassembleWidget( GDBController* controller, QWidget *parent=0, const char *name=0 ); + DisassembleWidget( GDBController* controller, TQWidget *parent=0, const char *name=0 ); virtual ~DisassembleWidget(); public slots: void slotActivate(bool activate); - void slotShowStepInSource(const QString &fileName, int lineNum, const QString &address); + void slotShowStepInSource(const TQString &fileName, int lineNum, const TQString &address); private: - virtual void showEvent(QShowEvent*); - virtual void hideEvent(QHideEvent*); + virtual void showEvent(TQShowEvent*); + virtual void hideEvent(TQHideEvent*); bool displayCurrent(); void getNextDisplay(); @@ -57,7 +57,7 @@ private: unsigned long lower_; unsigned long upper_; unsigned long address_; - QString currentAddress_; + TQString currentAddress_; }; } diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index e731a1ee..fb0246e6 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -21,11 +21,11 @@ #include <kdebug.h> #include <kglobalsettings.h> -#include <qheader.h> -#include <qlistbox.h> -#include <qregexp.h> -#include <qstrlist.h> -#include <qpainter.h> +#include <tqheader.h> +#include <tqlistbox.h> +#include <tqregexp.h> +#include <tqstrlist.h> +#include <tqpainter.h> #include <ctype.h> @@ -39,9 +39,9 @@ namespace GDBDebugger { FramestackWidget::FramestackWidget(GDBController* controller, - QWidget *parent, + TQWidget *parent, const char *name, WFlags f) - : QListView(parent, name, f), + : TQListView(parent, name, f), viewedThread_(0), controller_(controller), mayUpdate_( false ) @@ -49,19 +49,19 @@ FramestackWidget::FramestackWidget(GDBController* controller, setRootIsDecorated(true); setSorting(-1); setSelectionMode(Single); - addColumn(QString::null); // Frame number - addColumn(QString::null); // function name/address - addColumn(QString::null); // source + addColumn(TQString::null); // Frame number + addColumn(TQString::null); // function name/address + addColumn(TQString::null); // source header()->hide(); // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, SIGNAL(event(GDBController::event_t)), - this, SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQT_SIGNAL(event(GDBController::event_t)), + this, TQT_SLOT(slotEvent(GDBController::event_t))); - connect( this, SIGNAL(clicked(QListViewItem*)), - this, SLOT(slotSelectionChanged(QListViewItem*)) ); + connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), + this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); } @@ -72,11 +72,11 @@ FramestackWidget::~FramestackWidget() /***************************************************************************/ -QListViewItem *FramestackWidget::lastChild() const +TQListViewItem *FramestackWidget::lastChild() const { - QListViewItem* child = firstChild(); + TQListViewItem* child = firstChild(); if (child) - while (QListViewItem* nextChild = child->nextSibling()) + while (TQListViewItem* nextChild = child->nextSibling()) child = nextChild; return child; @@ -88,12 +88,12 @@ void FramestackWidget::clear() { viewedThread_ = 0; - QListView::clear(); + TQListView::clear(); } /***************************************************************************/ -void FramestackWidget::slotSelectionChanged(QListViewItem *thisItem) +void FramestackWidget::slotSelectionChanged(TQListViewItem *thisItem) { ThreadStackItem *thread = dynamic_cast<ThreadStackItem*> (thisItem); if (thread) @@ -110,7 +110,7 @@ void FramestackWidget::slotSelectionChanged(QListViewItem *thisItem) // Switch to the target thread. if (frame->threadNo() != -1) controller_->addCommand( - new GDBCommand(QString("-thread-select %1") + new GDBCommand(TQString("-thread-select %1") .arg(frame->threadNo()).ascii())); viewedThread_ = findThread(frame->threadNo()); @@ -186,7 +186,7 @@ void FramestackWidget::slotEvent(GDBController::event_t e) } } -void FramestackWidget::showEvent(QShowEvent*) +void FramestackWidget::showEvent(TQShowEvent*) { if (controller_->stateIsOn(s_appRunning|s_dbgBusy|s_dbgNotStarted|s_shuttingDown)) return; @@ -208,7 +208,7 @@ void FramestackWidget::getBacktrace(int min_frame, int max_frame) maxFrame_ = max_frame; controller_->addCommand( - new GDBCommand(QString("-stack-info-depth %1").arg(max_frame+1), + new GDBCommand(TQString("-stack-info-depth %1").arg(max_frame+1), this, &FramestackWidget::handleStackDepth)); } @@ -223,7 +223,7 @@ void FramestackWidget::handleStackDepth(const GDBMI::ResultRecord& r) maxFrame_ = existing_frames; //add the following command to the front, so noone switches threads in between controller_->addCommandToFront( - new GDBCommand(QString("-stack-list-frames %1 %2") + new GDBCommand(TQString("-stack-list-frames %1 %2") .arg(minFrame_).arg(maxFrame_), this, &FramestackWidget::parseGDBBacktraceList)); } @@ -235,7 +235,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo) { // Switch to the target thread. controller_->addCommand( - new GDBCommand(QString("-thread-select %1") + new GDBCommand(TQString("-thread-select %1") .arg(threadNo).ascii())); viewedThread_ = findThread(threadNo); @@ -247,7 +247,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo) { // Switch back to the original thread. controller_->addCommand( - new GDBCommand(QString("-thread-select %1") + new GDBCommand(TQString("-thread-select %1") .arg(currentThread).ascii())); } } @@ -271,15 +271,15 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r) // Really threaded program. for(unsigned i = 0, e = ids.results.size(); i != e; ++i) { - QString id = ids.results[i]->value->literal(); + TQString id = ids.results[i]->value->literal(); controller_->addCommand( - new GDBCommand(QString("-thread-select %1").arg(id).ascii(), + new GDBCommand(TQString("-thread-select %1").arg(id).ascii(), this, &FramestackWidget::handleThread)); } controller_->addCommand( - new GDBCommand(QString("-thread-select %1") + new GDBCommand(TQString("-thread-select %1") .arg(controller_->currentThread()).ascii())); } @@ -292,13 +292,13 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r) void FramestackWidget::handleThread(const GDBMI::ResultRecord& r) { - QString id = r["new-thread-id"].literal(); + TQString id = r["new-thread-id"].literal(); int id_num = id.toInt(); - QString name_column; - QString func_column; - QString args_column; - QString source_column; + TQString name_column; + TQString func_column; + TQString args_column; + TQString source_column; formatFrame(r["frame"], func_column, source_column); @@ -329,7 +329,7 @@ void FramestackWidget::parseGDBBacktraceList(const GDBMI::ResultRecord& r) Q_ASSERT(dynamic_cast<const GDBMI::ListValue*>(&frames)); // Remove "..." item, if there's one. - QListViewItem* last; + TQListViewItem* last; if (viewedThread_) { last = viewedThread_->firstChild(); @@ -352,13 +352,13 @@ void FramestackWidget::parseGDBBacktraceList(const GDBMI::ResultRecord& r) // For now, just produce string simular to gdb // console output. In future we might have a table, // or something better. - QString frameDesc; + TQString frameDesc; - QString name_column; - QString func_column; - QString source_column; + TQString name_column; + TQString func_column; + TQString source_column; - QString level_s = frame["level"].literal(); + TQString level_s = frame["level"].literal(); int level = level_s.toInt(); name_column = "#" + level_s; @@ -377,7 +377,7 @@ void FramestackWidget::parseGDBBacktraceList(const GDBMI::ResultRecord& r) } if (has_more_frames) { - QListViewItem* item; + TQListViewItem* item; if (viewedThread_) item = new FrameStackItem(viewedThread_, lastLevel+1, "..."); else @@ -404,7 +404,7 @@ void FramestackWidget::parseGDBBacktraceList(const GDBMI::ResultRecord& r) ThreadStackItem *FramestackWidget::findThread(int threadNo) { - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); while (sibling) { ThreadStackItem *thread = dynamic_cast<ThreadStackItem*> (sibling); @@ -422,7 +422,7 @@ ThreadStackItem *FramestackWidget::findThread(int threadNo) FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo) { - QListViewItem* frameItem = 0; + TQListViewItem* frameItem = 0; if (threadNo != -1) { @@ -445,8 +445,8 @@ FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo) } void FramestackWidget::formatFrame(const GDBMI::Value& frame, - QString& func_column, - QString& source_column) + TQString& func_column, + TQString& source_column) { func_column = source_column = ""; @@ -476,15 +476,15 @@ void FramestackWidget::formatFrame(const GDBMI::Value& frame, } -void FramestackWidget::drawContentsOffset( QPainter * p, int ox, int oy, +void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ) { - QListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch); + TQListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch); int s1_x = header()->sectionPos(1); int s1_w = header()->sectionSize(1); - QRect section1(s1_x, contentsHeight(), s1_w, viewport()->height()); + TQRect section1(s1_x, contentsHeight(), s1_w, viewport()->height()); p->fillRect(section1, KGlobalSettings::alternateBackgroundColor()); } @@ -495,8 +495,8 @@ void FramestackWidget::drawContentsOffset( QPainter * p, int ox, int oy, FrameStackItem::FrameStackItem(FramestackWidget *parent, unsigned frameNo, - const QString &name) - : QListViewItem(parent, parent->lastChild()), + const TQString &name) + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), threadNo_(-1) { @@ -507,8 +507,8 @@ FrameStackItem::FrameStackItem(FramestackWidget *parent, FrameStackItem::FrameStackItem(ThreadStackItem *parent, unsigned frameNo, - const QString &name) - : QListViewItem(parent, parent->lastChild()), + const TQString &name) + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), threadNo_(parent->threadNo()) { @@ -522,11 +522,11 @@ FrameStackItem::~FrameStackItem() // ************************************************************************** -QListViewItem *FrameStackItem::lastChild() const +TQListViewItem *FrameStackItem::lastChild() const { - QListViewItem* child = firstChild(); + TQListViewItem* child = firstChild(); if (child) - while (QListViewItem* nextChild = child->nextSibling()) + while (TQListViewItem* nextChild = child->nextSibling()) child = nextChild; return child; @@ -547,7 +547,7 @@ void FrameStackItem::setOpen(bool open) } } #endif - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); } // ************************************************************************** @@ -555,7 +555,7 @@ void FrameStackItem::setOpen(bool open) // ************************************************************************** ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo) -: QListViewItem(parent), +: TQListViewItem(parent), threadNo_(threadNo) { setText(0, i18n("Thread %1").arg(threadNo_)); @@ -569,11 +569,11 @@ ThreadStackItem::~ThreadStackItem() // ************************************************************************** -QListViewItem *ThreadStackItem::lastChild() const +TQListViewItem *ThreadStackItem::lastChild() const { - QListViewItem* child = firstChild(); + TQListViewItem* child = firstChild(); if (child) - while (QListViewItem* nextChild = child->nextSibling()) + while (TQListViewItem* nextChild = child->nextSibling()) child = nextChild; return child; @@ -609,31 +609,31 @@ void ThreadStackItem::setOpen(bool open) setText(2, savedSource_); } - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); } -void FrameStackItem::paintCell(QPainter * p, const QColorGroup & cg, +void FrameStackItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { - QColorGroup cg2(cg); + TQColorGroup cg2(cg); if (column % 2) { - cg2.setColor(QColorGroup::Base, + cg2.setColor(TQColorGroup::Base, KGlobalSettings::alternateBackgroundColor()); } - QListViewItem::paintCell(p, cg2, column, width, align); + TQListViewItem::paintCell(p, cg2, column, width, align); } -void ThreadStackItem::paintCell(QPainter * p, const QColorGroup & cg, +void ThreadStackItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { - QColorGroup cg2(cg); + TQColorGroup cg2(cg); if (column % 2) { - cg2.setColor(QColorGroup::Base, + cg2.setColor(TQColorGroup::Base, KGlobalSettings::alternateBackgroundColor()); } - QListViewItem::paintCell(p, cg2, column, width, align); + TQListViewItem::paintCell(p, cg2, column, width, align); } diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h index 36cac1ba..656d2cdb 100644 --- a/languages/cpp/debugger/framestackwidget.h +++ b/languages/cpp/debugger/framestackwidget.h @@ -16,8 +16,8 @@ #ifndef _FRAMESTACKWIDGET_H_ #define _FRAMESTACKWIDGET_H_ -#include <qlistview.h> -#include <qstringlist.h> +#include <tqlistview.h> +#include <tqstringlist.h> #include "gdbcontroller.h" #include "mi/miparser.h" @@ -38,9 +38,9 @@ public: virtual ~ThreadStackItem(); void setOpen(bool open); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; - void paintCell(QPainter * p, const QColorGroup & cg, + void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); int threadNo() @@ -48,8 +48,8 @@ public: private: int threadNo_; - QString savedFunc_; - QString savedSource_; + TQString savedFunc_; + TQString savedSource_; }; /***************************************************************************/ @@ -61,16 +61,16 @@ class FrameStackItem : public QListViewItem public: FrameStackItem(FramestackWidget *parent, unsigned frameNo, - const QString &name); + const TQString &name); FrameStackItem(ThreadStackItem *parent, unsigned frameNo, - const QString &name); + const TQString &name); virtual ~FrameStackItem(); void setOpen(bool open); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; - void paintCell(QPainter * p, const QColorGroup & cg, + void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); int frameNo() @@ -94,11 +94,11 @@ class FramestackWidget : public QListView public: FramestackWidget( GDBController* controller, - QWidget *parent=0, + TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~FramestackWidget(); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; ThreadStackItem *findThread(int threadNo); FrameStackItem *findFrame(int frameNo, int threadNo); @@ -108,7 +108,7 @@ public: protected: - void drawContentsOffset( QPainter * p, int ox, int oy, + void drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ); @@ -120,8 +120,8 @@ private: The function is used both for frames and threads. */ void formatFrame(const GDBMI::Value& frame, - QString& func_column, - QString& source_column); + TQString& func_column, + TQString& source_column); /** Cause gdb to produce backtrace for the current thread. @@ -148,13 +148,13 @@ private: public slots: void slotEvent(GDBController::event_t e); - void slotSelectionChanged(QListViewItem *thisItem); + void slotSelectionChanged(TQListViewItem *thisItem); #if QT_VERSION < 300 private: - QListViewItem* findItemWhichBeginsWith(const QString& text) const; + TQListViewItem* findItemWhichBeginsWith(const TQString& text) const; #endif - virtual void showEvent(QShowEvent*); + virtual void showEvent(TQShowEvent*); private: diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index f9a83d6c..b092a015 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -29,18 +29,18 @@ #include <kurl.h> #include <kmessagebox.h> -#include <qvbuttongroup.h> -#include <qfileinfo.h> -#include <qheader.h> -#include <qtable.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qvbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcheckbox.h> +#include <tqvbuttongroup.h> +#include <tqfileinfo.h> +#include <tqheader.h> +#include <tqtable.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> #include <stdlib.h> #include <ctype.h> @@ -80,7 +80,7 @@ class BreakpointTableRow : public QTableItem { public: - BreakpointTableRow(QTable* table, EditType editType, Breakpoint* bp); + BreakpointTableRow(TQTable* table, EditType editType, Breakpoint* bp); ~BreakpointTableRow(); bool match (Breakpoint* bp) const; @@ -100,9 +100,9 @@ private: /***************************************************************************/ /***************************************************************************/ -BreakpointTableRow::BreakpointTableRow(QTable* parent, EditType editType, +BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType, Breakpoint* bp) : - QTableItem(parent, editType, ""), + TQTableItem(parent, editType, ""), m_breakpoint(bp) { appendEmptyRow(); @@ -140,13 +140,13 @@ void BreakpointTableRow::appendEmptyRow() table()->setItem(row, Control, this); - QCheckTableItem* cti = new QCheckTableItem( table(), ""); + TQCheckTableItem* cti = new TQCheckTableItem( table(), ""); table()->setItem(row, Enable, cti); ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); - QObject::connect(act, SIGNAL(edit(QTableItem*)), - table()->parent(), SLOT(editTracing(QTableItem*))); + TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), + table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -155,22 +155,22 @@ void BreakpointTableRow::setRow() { if ( m_breakpoint ) { - QTableItem *item = table()->item ( row(), Enable ); + TQTableItem *item = table()->item ( row(), Enable ); Q_ASSERT(item->rtti() == 2); - ((QCheckTableItem*)item)->setChecked(m_breakpoint->isEnabled()); + ((TQCheckTableItem*)item)->setChecked(m_breakpoint->isEnabled()); - QString status=m_breakpoint->statusDisplay(m_activeFlag); + TQString status=m_breakpoint->statusDisplay(m_activeFlag); table()->setText(row(), Status, status); table()->setText(row(), Condition, m_breakpoint->conditional()); - table()->setText(row(), IgnoreCount, QString::number(m_breakpoint->ignoreCount() )); - table()->setText(row(), Hits, QString::number(m_breakpoint->hits() )); + table()->setText(row(), IgnoreCount, TQString::number(m_breakpoint->ignoreCount() )); + table()->setText(row(), Hits, TQString::number(m_breakpoint->hits() )); - QString displayType = m_breakpoint->displayType(); + TQString displayType = m_breakpoint->displayType(); table()->setText(row(), Location, m_breakpoint->location()); - QTableItem* ce = table()->item( row(), Tracing ); + TQTableItem* ce = table()->item( row(), Tracing ); ce->setText(breakpoint()->tracingEnabled() ? "Enabled" : "Disabled"); // In case there's editor open in this cell, update it too. static_cast<ComplexEditCell*>(ce)->updateValue(); @@ -196,15 +196,15 @@ void BreakpointTableRow::setRow() /***************************************************************************/ GDBBreakpointWidget::GDBBreakpointWidget(GDBController* controller, - QWidget *parent, const char *name) : -QHBox(parent, name), + TQWidget *parent, const char *name) : +TQHBox(parent, name), controller_(controller) { m_table = new GDBTable(0, numCols, this, name); - m_table->setSelectionMode(QTable::SingleRow); + m_table->setSelectionMode(TQTable::SingleRow); m_table->setShowGrid (false); m_table->setLeftMargin(0); - m_table->setFocusStyle(QTable::FollowStyle); + m_table->setFocusStyle(TQTable::FollowStyle); m_table->hideColumn(Control); m_table->setColumnReadOnly(Type, true); @@ -212,7 +212,7 @@ controller_(controller) m_table->setColumnReadOnly(Hits, true); m_table->setColumnWidth( Enable, 20); - QHeader *header = m_table->horizontalHeader(); + TQHeader *header = m_table->horizontalHeader(); header->setLabel( Enable, "" ); header->setLabel( Type, i18n("Type") ); @@ -223,7 +223,7 @@ controller_(controller) header->setLabel( Hits, i18n("Hits") ); header->setLabel( Tracing, i18n("Tracing") ); - QPopupMenu* newBreakpoint = new QPopupMenu(this); + TQPopupMenu* newBreakpoint = new TQPopupMenu(this); newBreakpoint->insertItem(i18n("Code breakpoint", "Code"), BP_TYPE_FilePos); newBreakpoint->insertItem(i18n("Data breakpoint", "Data write"), @@ -232,7 +232,7 @@ controller_(controller) BP_TYPE_ReadWatchpoint); - m_ctxMenu = new QPopupMenu( this ); + m_ctxMenu = new TQPopupMenu( this ); m_ctxMenu->insertItem( i18n("New breakpoint", "New"), newBreakpoint); m_ctxMenu->insertItem( i18n( "Show text" ), BW_ITEM_Show ); @@ -251,39 +251,39 @@ controller_(controller) m_table->show(); - connect( newBreakpoint, SIGNAL(activated(int)), - this, SLOT(slotAddBlankBreakpoint(int)) ); + connect( newBreakpoint, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_table, SIGNAL(contextMenuRequested(int, int, const QPoint &)), - this, SLOT(slotContextMenuShow(int, int, const QPoint & )) ); - connect( m_ctxMenu, SIGNAL(activated(int)), - this, SLOT(slotContextMenuSelect(int)) ); + connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotContextMenuSelect(int)) ); - connect( m_table, SIGNAL(doubleClicked(int, int, int, const QPoint &)), - this, SLOT(slotRowDoubleClicked(int, int, int, const QPoint &))); + connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - connect( m_table, SIGNAL(valueChanged(int, int)), - this, SLOT(slotNewValue(int, int))); + connect( m_table, TQT_SIGNAL(valueChanged(int, int)), + this, TQT_SLOT(slotNewValue(int, int))); - connect( m_table, SIGNAL(returnPressed()), - this, SLOT(slotEditBreakpoint())); -// connect( m_table, SIGNAL(f2Pressed()), -// this, SLOT(slotEditBreakpoint())); - connect( m_table, SIGNAL(deletePressed()), - this, SLOT(slotRemoveBreakpoint())); + connect( m_table, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(slotEditBreakpoint())); +// connect( m_table, TQT_SIGNAL(f2Pressed()), +// this, TQT_SLOT(slotEditBreakpoint())); + connect( m_table, TQT_SIGNAL(deletePressed()), + this, TQT_SLOT(slotRemoveBreakpoint())); // This slot doesn't exist anymore -// connect( m_table, SIGNAL(insertPressed()), -// this, SLOT(slotAddBlankBreakpoint())); +// connect( m_table, TQT_SIGNAL(insertPressed()), +// this, TQT_SLOT(slotAddBlankBreakpoint())); // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, SIGNAL(event(GDBController::event_t)), - this, SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQT_SIGNAL(event(GDBController::event_t)), + this, TQT_SLOT(slotEvent(GDBController::event_t))); connect(controller, - SIGNAL(watchpointHit(int, const QString&, const QString&)), + TQT_SIGNAL(watchpointHit(int, const TQString&, const TQString&)), this, - SLOT(slotWatchpointHit(int, const QString&, const QString&))); + TQT_SLOT(slotWatchpointHit(int, const TQString&, const TQString&))); } /***************************************************************************/ @@ -357,8 +357,8 @@ void GDBBreakpointWidget::slotBreakpointHit(int id) } void GDBBreakpointWidget::slotWatchpointHit(int id, - const QString& oldValue, - const QString& newValue) + const TQString& oldValue, + const TQString& newValue) { BreakpointTableRow* br = findId(id); @@ -451,10 +451,10 @@ bool GDBBreakpointWidget::hasWatchpointForAddress( BreakpointTableRow* GDBBreakpointWidget::addBreakpoint(Breakpoint *bp) { BreakpointTableRow* btr = - new BreakpointTableRow( m_table, QTableItem::WhenCurrent, bp ); + new BreakpointTableRow( m_table, TQTableItem::WhenCurrent, bp ); - connect(bp, SIGNAL(modified(Breakpoint*)), - this, SLOT(slotBreakpointModified(Breakpoint*))); + connect(bp, TQT_SIGNAL(modified(Breakpoint*)), + this, TQT_SLOT(slotBreakpointModified(Breakpoint*))); sendToGdb(*bp); @@ -489,7 +489,7 @@ void GDBBreakpointWidget::removeBreakpoint(BreakpointTableRow* btr) /***************************************************************************/ -void GDBBreakpointWidget::slotToggleBreakpoint(const QString &fileName, int lineNum) +void GDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -504,7 +504,7 @@ void GDBBreakpointWidget::slotToggleBreakpoint(const QString &fileName, int line /***************************************************************************/ -void GDBBreakpointWidget::slotToggleBreakpointEnabled(const QString &fileName, int lineNum) +void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -520,7 +520,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const QString &fileName, i /***************************************************************************/ -void GDBBreakpointWidget::slotToggleWatchpoint(const QString &varName) +void GDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName) { Watchpoint *watchpoint = new Watchpoint(varName, false, true); BreakpointTableRow* btr = find(watchpoint); @@ -557,7 +557,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) if (b.hasField("cond")) bp->setConditional(b["cond"].literal()); else - bp->setConditional(QString::null); + bp->setConditional(TQString::null); btr->setRow(); emit publishBPState(*bp); } @@ -565,7 +565,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) { // It's a breakpoint added outside, most probably // via gdb console. Add it now. - QString type = b["type"].literal(); + TQString type = b["type"].literal(); if (type == "breakpoint" || type == "hw breakpoint") { @@ -580,7 +580,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) bp->setPending(false); new BreakpointTableRow(m_table, - QTableItem::WhenCurrent, + TQTableItem::WhenCurrent, bp); emit publishBPState(*bp); @@ -607,7 +607,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) } } -void GDBBreakpointWidget::handleTracingPrintf(const QValueVector<QString>& s) +void GDBBreakpointWidget::handleTracingPrintf(const TQValueVector<TQString>& s) { // The first line of output is the command itself, which we don't need. for(unsigned i = 1; i < s.size(); ++i) @@ -684,7 +684,7 @@ void GDBBreakpointWidget::slotRemoveAllBreakpoints() /***************************************************************************/ -void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const QPoint &) +void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const TQPoint &) { if ( btn == Qt::LeftButton ) { @@ -703,7 +703,7 @@ void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const } } -void GDBBreakpointWidget::slotContextMenuShow( int row, int /*col*/, const QPoint &mousePos ) +void GDBBreakpointWidget::slotContextMenuShow( int row, int /*col*/, const TQPoint &mousePos ) { BreakpointTableRow *btr = (BreakpointTableRow *)m_table->item(row, Control ); @@ -813,7 +813,7 @@ void GDBBreakpointWidget::slotContextMenuSelect( int item ) /***************************************************************************/ -void GDBBreakpointWidget::slotEditRow(int row, int col, const QPoint &) +void GDBBreakpointWidget::slotEditRow(int row, int col, const TQPoint &) { // kdDebug(9012) << "in slotEditRow row=" << row << endl; BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); @@ -830,7 +830,7 @@ void GDBBreakpointWidget::slotNewValue(int row, int col) { BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); - QString new_value = m_table->text(row, col); + TQString new_value = m_table->text(row, col); if (btr) { @@ -839,8 +839,8 @@ void GDBBreakpointWidget::slotNewValue(int row, int col) { case Enable: { - QCheckTableItem *item = - (QCheckTableItem*)m_table->item ( row, Enable ); + TQCheckTableItem *item = + (TQCheckTableItem*)m_table->item ( row, Enable ); bp->setEnabled(item->isChecked()); } break; @@ -913,7 +913,7 @@ void GDBBreakpointWidget::slotNewValue(int row, int col) /***************************************************************************/ -void GDBBreakpointWidget::slotEditBreakpoint(const QString &fileName, int lineNum) +void GDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -922,7 +922,7 @@ void GDBBreakpointWidget::slotEditBreakpoint(const QString &fileName, int lineNu if (btr) { - QTableSelection ts; + TQTableSelection ts; ts.init(btr->row(), 0); ts.expandTo(btr->row(), numCols); m_table->addSelection(ts); @@ -1019,7 +1019,7 @@ void GDBBreakpointWidget::slotEditBreakpoint() } -void GDBBreakpointWidget::editTracing(QTableItem* item) +void GDBBreakpointWidget::editTracing(TQTableItem* item) { BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(item->row(), Control); @@ -1032,7 +1032,7 @@ void GDBBreakpointWidget::editTracing(QTableItem* item) // Note: change cell text here and explicitly call slotNewValue here. // We want this signal to be emitted when we close the tracing dialog // and not when we select some other cell, as happens in Qt by default. - if (r == QDialog::Accepted) + if (r == TQDialog::Accepted) { // The dialog has modified "btr->breakpoint()" already. // Calling 'slotNewValue' will flush the changes back @@ -1046,42 +1046,42 @@ void GDBBreakpointWidget::editTracing(QTableItem* item) /***************************************************************************/ -void GDBBreakpointWidget::savePartialProjectSession(QDomElement* el) +void GDBBreakpointWidget::savePartialProjectSession(TQDomElement* el) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if (domDoc.isNull()) return; - QDomElement breakpointListEl = domDoc.createElement("breakpointList"); + TQDomElement breakpointListEl = domDoc.createElement("breakpointList"); for ( int row = 0; row < m_table->numRows(); row++ ) { BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); Breakpoint* bp = btr->breakpoint(); - QDomElement breakpointEl = - domDoc.createElement("breakpoint"+QString::number(row)); + TQDomElement breakpointEl = + domDoc.createElement("breakpoint"+TQString::number(row)); breakpointEl.setAttribute("type", bp->type()); breakpointEl.setAttribute("location", bp->location(false)); breakpointEl.setAttribute("enabled", bp->isEnabled()); breakpointEl.setAttribute("condition", bp->conditional()); breakpointEl.setAttribute("tracingEnabled", - QString::number(bp->tracingEnabled())); + TQString::number(bp->tracingEnabled())); breakpointEl.setAttribute("traceFormatStringEnabled", - QString::number(bp->traceFormatStringEnabled())); + TQString::number(bp->traceFormatStringEnabled())); breakpointEl.setAttribute("tracingFormatString", bp->traceFormatString()); - QDomElement tracedExpressions = + TQDomElement tracedExpressions = domDoc.createElement("tracedExpressions"); - QStringList::const_iterator i, e; + TQStringList::const_iterator i, e; for(i = bp->tracedExpressions().begin(), e = bp->tracedExpressions().end(); i != e; ++i) { - QDomElement expr = domDoc.createElement("expression"); + TQDomElement expr = domDoc.createElement("expression"); expr.setAttribute("value", *i); tracedExpressions.appendChild(expr); } @@ -1097,7 +1097,7 @@ void GDBBreakpointWidget::savePartialProjectSession(QDomElement* el) /***************************************************************************/ -void GDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) +void GDBBreakpointWidget::restorePartialProjectSession(const TQDomElement* el) { /** Eventually, would be best to make each breakpoint type handle loading/ saving it's data. The only problem is that on load, we need to allocate @@ -1106,10 +1106,10 @@ void GDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) KDE (Boost.Serialization is too much dependency, and rolling my own is boring). */ - QDomElement breakpointListEl = el->namedItem("breakpointList").toElement(); + TQDomElement breakpointListEl = el->namedItem("breakpointList").toElement(); if (!breakpointListEl.isNull()) { - QDomElement breakpointEl; + TQDomElement breakpointEl; for (breakpointEl = breakpointListEl.firstChild().toElement(); !breakpointEl.isNull(); breakpointEl = breakpointEl.nextSibling().toElement()) @@ -1155,17 +1155,17 @@ void GDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) breakpointEl.attribute("traceFormatStringEnabled", "0") .toInt()); - QDomNode tracedExpr = + TQDomNode tracedExpr = breakpointEl.namedItem("tracedExpressions"); if (!tracedExpr.isNull()) { - QStringList l; + TQStringList l; - for(QDomNode c = tracedExpr.firstChild(); !c.isNull(); + for(TQDomNode c = tracedExpr.firstChild(); !c.isNull(); c = c.nextSibling()) { - QDomElement el = c.toElement(); + TQDomElement el = c.toElement(); l.push_back(el.attribute("value", "")); } bp->setTracedExpressions(l); @@ -1186,11 +1186,11 @@ void GDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) /***************************************************************************/ -void GDBBreakpointWidget::focusInEvent( QFocusEvent */* e*/ ) +void GDBBreakpointWidget::focusInEvent( TQFocusEvent */* e*/ ) { // Without the following 'if', when we first open the breakpoints // widget, the background is all black. This happens only with - // m_table->setFocusStyle(QTable::FollowStyle); + // m_table->setFocusStyle(TQTable::FollowStyle); // in constructor, so I suspect Qt bug. But anyway, without // current cell keyboard actions like Enter for edit won't work, // so keyboard focus does not makes much sense. @@ -1203,42 +1203,42 @@ void GDBBreakpointWidget::focusInEvent( QFocusEvent */* e*/ ) } ComplexEditCell:: -ComplexEditCell(QTable* table) -: QTableItem(table, QTableItem::WhenCurrent) +ComplexEditCell(TQTable* table) +: TQTableItem(table, TQTableItem::WhenCurrent) { } -QWidget* ComplexEditCell::createEditor() const +TQWidget* ComplexEditCell::createEditor() const { - QHBox* box = new QHBox( table()->viewport() ); + TQHBox* box = new TQHBox( table()->viewport() ); box->setPaletteBackgroundColor( table()->palette().active().highlight()); - label_ = new QLabel(text(), box, "label"); + label_ = new TQLabel(text(), box, "label"); label_->setBackgroundMode(Qt::PaletteHighlight); // Sorry for hardcode, but '2' is already hardcoded in - // Qt source, in QTableItem::paint. Since I don't want the + // Qt source, in TQTableItem::paint. Since I don't want the // text to jump 2 pixels to the right when editor is activated, // need to set the same indent for label. label_->setIndent(2); - QPalette p = label_->palette(); + TQPalette p = label_->palette(); - p.setColor(QPalette::Active, QColorGroup::Foreground, + p.setColor(TQPalette::Active, TQColorGroup::Foreground, table()->palette().active().highlightedText()); - p.setColor(QPalette::Inactive, QColorGroup::Foreground, + p.setColor(TQPalette::Inactive, TQColorGroup::Foreground, table()->palette().active().highlightedText()); label_->setPalette(p); - QPushButton* b = new QPushButton("...", box); + TQPushButton* b = new TQPushButton("...", box); // This is exactly what is done in QDesigner source in the // similar context. Haven't had any success making the good look // with layout, I suppose that sizeHint for button is always larger // than 20. b->setFixedWidth( 20 ); - connect(b, SIGNAL(clicked()), this, SLOT(slotEdit())); + connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit())); return box; } diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index 91dc40a5..42d1286d 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -16,11 +16,11 @@ #ifndef _GDBBreakpointWidget_H_ #define _GDBBreakpointWidget_H_ -#include <qhbox.h> -#include <qpopupmenu.h> -#include <qtable.h> -#include <qguardedptr.h> -#include <qvaluevector.h> +#include <tqhbox.h> +#include <tqpopupmenu.h> +#include <tqtable.h> +#include <tqguardedptr.h> +#include <tqvaluevector.h> #include "mi/gdbmi.h" #include "gdbcontroller.h" @@ -47,24 +47,24 @@ class GDBBreakpointWidget : public QHBox public: GDBBreakpointWidget( GDBController* controller, - QWidget* parent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); virtual ~GDBBreakpointWidget(); void reset(); - void savePartialProjectSession(QDomElement* el); - void restorePartialProjectSession(const QDomElement* el); + void savePartialProjectSession(TQDomElement* el); + void restorePartialProjectSession(const TQDomElement* el); bool hasWatchpointForAddress(unsigned long long address) const; public slots: // Connected to from the editor widget: - void slotToggleBreakpoint(const QString &filename, int lineNum); - void slotToggleBreakpointEnabled(const QString &fileName, int lineNum); + void slotToggleBreakpoint(const TQString &filename, int lineNum); + void slotToggleBreakpointEnabled(const TQString &fileName, int lineNum); // Connected to from the variable widget: - void slotToggleWatchpoint(const QString &varName); + void slotToggleWatchpoint(const TQString &varName); void slotBreakpointSet(Breakpoint*); @@ -74,33 +74,33 @@ public slots: protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); friend class BreakpointActionCell; // for access to slotNewValue private slots: void slotRemoveBreakpoint(); void slotRemoveAllBreakpoints(); - void slotEditBreakpoint(const QString &fileName, int lineNum); + void slotEditBreakpoint(const TQString &fileName, int lineNum); void slotEditBreakpoint(); void slotAddBlankBreakpoint(int idx); - void slotRowDoubleClicked(int row, int col, int button, const QPoint & mousePos); - void slotContextMenuShow( int row, int col, const QPoint &mousePos ); + void slotRowDoubleClicked(int row, int col, int button, const TQPoint & mousePos); + void slotContextMenuShow( int row, int col, const TQPoint &mousePos ); void slotContextMenuSelect( int item ); - void slotEditRow(int row, int col, const QPoint & mousePos); + void slotEditRow(int row, int col, const TQPoint & mousePos); void slotNewValue(int row, int col); - void editTracing(QTableItem* item); + void editTracing(TQTableItem* item); void slotBreakpointModified(Breakpoint*); void slotEvent(GDBController::event_t); void slotWatchpointHit(int id, - const QString& oldValue, - const QString& newValue); + const TQString& oldValue, + const TQString& newValue); signals: void publishBPState(const Breakpoint& brkpt); void refreshBPState(const Breakpoint& brkpt); - void gotoSourcePosition(const QString &fileName, int lineNum); + void gotoSourcePosition(const TQString &fileName, int lineNum); // Emitted when output from yet another passed tracepoint is available. void tracingOutput(const char*); @@ -116,13 +116,13 @@ private: void sendToGdb(Breakpoint &); void handleBreakpointList(const GDBMI::ResultRecord&); - void handleTracingPrintf(const QValueVector<QString>& s); + void handleTracingPrintf(const TQValueVector<TQString>& s); private: GDBController* controller_; GDBTable* m_table; - QPopupMenu* m_ctxMenu; + TQPopupMenu* m_ctxMenu; }; class BreakpointTableRow; @@ -135,12 +135,12 @@ class BreakpointTableRow; When editing is done, the receiver of 'edit' should change the value in the table, and then call the 'updateValue' method. */ -class ComplexEditCell : public QObject, public QTableItem +class ComplexEditCell : public TQObject, public QTableItem { Q_OBJECT public: - ComplexEditCell(QTable* table); + ComplexEditCell(TQTable* table); /** Called by Qt when the current cell should become editable. In our case, when the item becomes current. Creates a widget @@ -148,7 +148,7 @@ public: content. In our case -- text plus "..." button that invokes action dialog. */ - QWidget* createEditor() const; + TQWidget* createEditor() const; void updateValue(); @@ -158,10 +158,10 @@ private slots: void slotEdit(); signals: - void edit(QTableItem*); + void edit(TQTableItem*); private: - mutable QGuardedPtr<QLabel> label_; + mutable TQGuardedPtr<TQLabel> label_; }; diff --git a/languages/cpp/debugger/gdbcommand.cpp b/languages/cpp/debugger/gdbcommand.cpp index de5aeb9d..bf8d5bc4 100644 --- a/languages/cpp/debugger/gdbcommand.cpp +++ b/languages/cpp/debugger/gdbcommand.cpp @@ -20,17 +20,17 @@ namespace GDBDebugger { -GDBCommand::GDBCommand(const QString &command) +GDBCommand::GDBCommand(const TQString &command) : command_(command), run(false), handler_this(0) { } -QString GDBCommand::cmdToSend() +TQString GDBCommand::cmdToSend() { return initialString() + "\n"; } -QString GDBCommand::initialString() const +TQString GDBCommand::initialString() const { return command_; } @@ -52,12 +52,12 @@ GDBCommand::invokeHandler(const GDBMI::ResultRecord& r) } } -void GDBCommand::newOutput(const QString& line) +void GDBCommand::newOutput(const TQString& line) { lines.push_back(line); } -const QValueVector<QString>& GDBCommand::allStreamOutput() const +const TQValueVector<TQString>& GDBCommand::allStreamOutput() const { return lines; } @@ -82,7 +82,7 @@ void GDBCommand::setRun(bool run) } -UserCommand::UserCommand(const QString& s) +UserCommand::UserCommand(const TQString& s) : GDBCommand(s) { } @@ -94,7 +94,7 @@ bool UserCommand::isUserCommand() const ModifyBreakpointCommand::ModifyBreakpointCommand( - const QString& command, const Breakpoint* bp) + const TQString& command, const Breakpoint* bp) : GDBCommand(command.local8Bit()), bp_(bp) {} @@ -104,7 +104,7 @@ ModifyBreakpointCommand::cmdToSend() { if (bp_->dbgId() > 0) { - QString s(initialString()); + TQString s(initialString()); s = s.arg(bp_->dbgId()) + "\n"; return s.local8Bit(); } diff --git a/languages/cpp/debugger/gdbcommand.h b/languages/cpp/debugger/gdbcommand.h index 8c928394..946bc3aa 100644 --- a/languages/cpp/debugger/gdbcommand.h +++ b/languages/cpp/debugger/gdbcommand.h @@ -16,12 +16,12 @@ #ifndef _GDBCOMMAND_H_ #define _GDBCOMMAND_H_ -#include <qobject.h> -#include <qstring.h> -#include <qvaluevector.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqvaluevector.h> #include "mi/gdbmi.h" -#include <qguardedptr.h> +#include <tqguardedptr.h> namespace GDBDebugger { @@ -38,10 +38,10 @@ class ValueCallback; class GDBCommand { public: - GDBCommand(const QString& command); + GDBCommand(const TQString& command); template<class Handler> - GDBCommand(const QString& command, + GDBCommand(const TQString& command, Handler* handler_this, void (Handler::* handler_method)(const GDBMI::ResultRecord&), bool handlesError = false); @@ -51,7 +51,7 @@ public: dynamically, possibly using results of the previous commands. If the empty string is returned, nothing is sent. */ - virtual QString cmdToSend(); + virtual TQString cmdToSend(); /* Returns the initial string that was specified in ctor invocation. The actual command will be @@ -59,7 +59,7 @@ public: value of this method is only used in various diagnostic messages emitted before actually sending the command. */ - QString initialString() const; + TQString initialString() const; /* Returns true if this is command entered by the user and so should be always shown in the gdb output window. */ @@ -78,9 +78,9 @@ public: // Called by gdbcontroller for each new output string // gdb emits for this command. In MI mode, this includes // all "stream" messages, but does not include MI responses. - void newOutput(const QString&); + void newOutput(const TQString&); - const QValueVector<QString>& allStreamOutput() const; + const TQValueVector<TQString>& allStreamOutput() const; // True if this command run then target for // unspecified period of time -- that is either 'run' or @@ -90,11 +90,11 @@ public: void setRun(bool run); private: - QString command_; - QGuardedPtr<QObject> handler_this; - typedef void (QObject::* handler_t)(const GDBMI::ResultRecord&); + TQString command_; + TQGuardedPtr<TQObject> handler_this; + typedef void (TQObject::* handler_t)(const GDBMI::ResultRecord&); handler_t handler_method; - QValueVector<QString> lines; + TQValueVector<TQString> lines; bool run; protected: // FIXME: should be private, after I kill the first ctor @@ -106,7 +106,7 @@ protected: // FIXME: should be private, after I kill the first ctor class UserCommand : public GDBCommand { public: - UserCommand(const QString& s); + UserCommand(const TQString& s); bool isUserCommand() const; }; @@ -125,10 +125,10 @@ public: /** The 'comamnd' should include a single format specifier "%1" that will be replaced with the id of breakpoint. */ - ModifyBreakpointCommand(const QString& command, const Breakpoint* bp); + ModifyBreakpointCommand(const TQString& command, const Breakpoint* bp); public: // DbgCommand overrides - virtual QString cmdToSend(); + virtual TQString cmdToSend(); private: const Breakpoint* bp_; @@ -142,9 +142,9 @@ class CliCommand : public GDBCommand { public: template<class Handler> - CliCommand(const QString& command, + CliCommand(const TQString& command, Handler* handler_this, - void (Handler::* handler_method)(const QValueVector<QString>&), + void (Handler::* handler_method)(const TQValueVector<TQString>&), bool handlesError = false); @@ -153,8 +153,8 @@ public: // GDBCommand overrides bool invokeHandler(const GDBMI::ResultRecord& r); private: - QGuardedPtr<QObject> cli_handler_this; - typedef void (QObject::* cli_handler_t)(const QValueVector<QString>&); + TQGuardedPtr<TQObject> cli_handler_this; + typedef void (TQObject::* cli_handler_t)(const TQValueVector<TQString>&); cli_handler_t cli_handler_method; }; @@ -165,7 +165,7 @@ private: class SentinelCommand : public GDBCommand { public: - typedef void (QObject::*handler_method_t)(); + typedef void (TQObject::*handler_method_t)(); template<class Handler> SentinelCommand(Handler* handler_this, @@ -180,22 +180,22 @@ public: (handler_this->*handler_method)(); } - QString cmdToSend() + TQString cmdToSend() { return ""; } private: - QGuardedPtr<QObject> handler_this; + TQGuardedPtr<TQObject> handler_this; handler_method_t handler_method; }; /* Command for which we don't want any reply. */ -class ResultlessCommand : public QObject, public GDBCommand +class ResultlessCommand : public TQObject, public GDBCommand { public: - ResultlessCommand(const QString& command, bool handlesError = false) + ResultlessCommand(const TQString& command, bool handlesError = false) : GDBCommand(command, this, &ResultlessCommand::handle, handlesError) {} @@ -204,16 +204,16 @@ private: {} }; -class ExpressionValueCommand : public QObject, public GDBCommand +class ExpressionValueCommand : public TQObject, public GDBCommand { public: - typedef void (QObject::*handler_method_t)(const QString&); + typedef void (TQObject::*handler_method_t)(const TQString&); template<class Handler> ExpressionValueCommand( - const QString& expression, + const TQString& expression, Handler* handler_this, - void (Handler::* handler_method)(const QString&)) + void (Handler::* handler_method)(const TQString&)) : GDBCommand(("-data-evaluate-expression " + expression).ascii(), this, &ExpressionValueCommand::handleResponse), handler_this(handler_this), @@ -226,7 +226,7 @@ public: } private: - QGuardedPtr<QObject> handler_this; + TQGuardedPtr<TQObject> handler_this; handler_method_t handler_method; }; @@ -234,7 +234,7 @@ private: template<class Handler> GDBCommand::GDBCommand( - const QString& command, + const TQString& command, Handler* handler_this, void (Handler::* handler_method)(const GDBMI::ResultRecord&), bool handlesError) @@ -248,9 +248,9 @@ GDBCommand::GDBCommand( template<class Handler> CliCommand::CliCommand( - const QString& command, + const TQString& command, Handler* handler_this, - void (Handler::* handler_method)(const QValueVector<QString>&), + void (Handler::* handler_method)(const TQValueVector<TQString>&), bool handlesError) : GDBCommand(command.latin1()), cli_handler_this(handler_this), diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index 05954069..3fd912ec 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -33,13 +33,13 @@ #include <kprocess.h> #include <kwin.h> -#include <qdatetime.h> -#include <qfileinfo.h> -#include <qregexp.h> -#include <qstring.h> -#include <qdir.h> -#include <qvaluevector.h> -#include <qeventloop.h> +#include <tqdatetime.h> +#include <tqfileinfo.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqdir.h> +#include <tqvaluevector.h> +#include <tqeventloop.h> #include <iostream> #include <ctype.h> @@ -82,7 +82,7 @@ using namespace std; // output the final echo. Hence the data will be thrown away. // (certain "info locals" will generate this error. // -// queueCmd(new GDBCommand(QString().sprintf("define printlocal\n" +// queueCmd(new GDBCommand(TQString().sprintf("define printlocal\n" // "echo \32%c\ninfo locals\necho \32%c\n" // "end", // LOCALS, LOCALS))); @@ -130,14 +130,14 @@ namespace GDBDebugger int debug_controllerExists = false; -GDBController::GDBController(QDomDocument &projectDom) +GDBController::GDBController(TQDomDocument &projectDom) : DbgController(), currentFrame_(0), viewedThread_(-1), holdingZone_(), currentCmd_(0), tty_(0), - badCore_(QString()), + badCore_(TQString()), state_(s_dbgNotStarted|s_appNotStarted), programHasExited_(false), dom(projectDom), @@ -232,7 +232,7 @@ void GDBController::configure() // Disabled for MI port. if (old_outputRadix != config_outputRadix_) { - queueCmd(new GDBCommand(QCString().sprintf("set output-radix %d", + queueCmd(new GDBCommand(TQCString().sprintf("set output-radix %d", config_outputRadix_))); // FIXME: should do this in variable widget anyway. @@ -256,7 +256,7 @@ void GDBController::addCommand(GDBCommand* cmd) queueCmd(cmd); } -void GDBController::addCommand(const QString& str) +void GDBController::addCommand(const TQString& str) { queueCmd(new GDBCommand(str)); } @@ -352,9 +352,9 @@ void GDBController::executeCmd() return; } - QString commandText = currentCmd_->cmdToSend(); + TQString commandText = currentCmd_->cmdToSend(); bool bad_command = false; - QString message; + TQString message; unsigned length = commandText.length(); // No i18n for message since it's mainly for debugging. @@ -400,8 +400,8 @@ void GDBController::executeCmd() commandText.length()); setStateOn(s_waitForWrite); - QString prettyCmd = currentCmd_->cmdToSend(); - prettyCmd.replace( QRegExp("set prompt \032.\n"), "" ); + TQString prettyCmd = currentCmd_->cmdToSend(); + prettyCmd.replace( TQRegExp("set prompt \032.\n"), "" ); prettyCmd = "(gdb) " + prettyCmd; if (currentCmd_->isUserCommand()) @@ -456,7 +456,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) bool shared_library_load = false; if (currentCmd_) { - const QValueVector<QString>& lines = currentCmd_->allStreamOutput(); + const TQValueVector<TQString>& lines = currentCmd_->allStreamOutput(); for(unsigned int i = 0; i < lines.count(); ++i) { if (lines[i].startsWith("Stopped due to shared library event")) @@ -488,7 +488,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) return; } - QString reason = r["reason"].literal(); + TQString reason = r["reason"].literal(); if (reason == "exited-normally" || reason == "exited") { programNoApp("Exited normally", false); @@ -509,7 +509,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) if (reason == "watchpoint-scope") { - QString number = r["wpnum"].literal(); + TQString number = r["wpnum"].literal(); // FIXME: shuld remove this watchpoint // But first, we should consider if removing all @@ -524,8 +524,8 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) if (reason == "signal-received") { - QString name = r["signal-name"].literal(); - QString user_name = r["signal-meaning"].literal(); + TQString name = r["signal-name"].literal(); + TQString user_name = r["signal-meaning"].literal(); // SIGINT is a "break into running program". // We do this when the user set/mod/clears a breakpoint but the @@ -613,7 +613,7 @@ void GDBController::reloadProgramState() // an invalid program specified or ... // gdb is still running though, but only the run command (may) make sense // all other commands are disabled. -void GDBController::programNoApp(const QString &msg, bool msgBox) +void GDBController::programNoApp(const TQString &msg, bool msgBox) { setState(s_appNotStarted|s_programExited|(state_&s_shuttingDown)); @@ -637,7 +637,7 @@ void GDBController::programNoApp(const QString &msg, bool msgBox) // Tty is no longer usable, delete it. Without this, QSocketNotifier // will continiously bomd STTY with signals, so we need to either disable - // QSocketNotifier, or delete STTY. The latter is simpler, since we can't + // TQSocketNotifier, or delete STTY. The latter is simpler, since we can't // reuse it for future debug sessions anyway. delete tty_; @@ -654,7 +654,7 @@ void GDBController::programNoApp(const QString &msg, bool msgBox) emit gdbUserCommandStdout(msg.ascii()); } -void GDBController::parseCliLine(const QString& line) +void GDBController::parseCliLine(const TQString& line) { if (line.startsWith("The program no longer exists") || line.startsWith("Program exited") @@ -694,7 +694,7 @@ void GDBController::parseCliLine(const QString& line) strncmp(buf, "ptrace: Operation not permitted.", 32)==0 || strncmp(buf, "No executable file specified.", 29)==0) { - programNoApp(QString(buf), true); + programNoApp(TQString(buf), true); kdDebug(9012) << "Bad file <" << buf << ">" << endl; return; } @@ -723,7 +723,7 @@ void GDBController::handleMiFileListExecSourceFile(const GDBMI::ResultRecord& r) #endif } - QString fullname = ""; + TQString fullname = ""; if (r.hasField("fullname")) fullname = r["fullname"].literal(); @@ -744,7 +744,7 @@ void GDBController::maybeAnnounceWatchpointHit() gdb does not report any reason at all. */ if ((*last_stop_result).hasField("reason")) { - QString last_stop_reason = (*last_stop_result)["reason"].literal(); + TQString last_stop_reason = (*last_stop_result)["reason"].literal(); if (last_stop_reason == "watchpoint-trigger") { @@ -766,7 +766,7 @@ void GDBController::handleMiFrameSwitch(const GDBMI::ResultRecord& r) const GDBMI::Value& frame = r["frame"]; - QString file; + TQString file; if (frame.hasField("fullname")) file = frame["fullname"].literal(); else if (frame.hasField("file")) @@ -789,31 +789,31 @@ void GDBController::handleMiFrameSwitch(const GDBMI::ResultRecord& r) // ************************************************************************** -bool GDBController::start(const QString& shell, const DomUtil::PairList& run_envvars, const QString& run_directory, const QString &application, const QString& run_arguments) +bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_envvars, const TQString& run_directory, const TQString &application, const TQString& run_arguments) { kdDebug(9012) << "Starting debugger controller\n"; - badCore_ = QString(); + badCore_ = TQString(); Q_ASSERT (!dbgProcess_ && !tty_); dbgProcess_ = new KProcess; - connect( dbgProcess_, SIGNAL(receivedStdout(KProcess *, char *, int)), - this, SLOT(slotDbgStdout(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + this, TQT_SLOT(slotDbgStdout(KProcess *, char *, int)) ); - connect( dbgProcess_, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(slotDbgStderr(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(slotDbgStderr(KProcess *, char *, int)) ); - connect( dbgProcess_, SIGNAL(wroteStdin(KProcess *)), - this, SLOT(slotDbgWroteStdin(KProcess *)) ); + connect( dbgProcess_, TQT_SIGNAL(wroteStdin(KProcess *)), + this, TQT_SLOT(slotDbgWroteStdin(KProcess *)) ); - connect( dbgProcess_, SIGNAL(processExited(KProcess*)), - this, SLOT(slotDbgProcessExited(KProcess*)) ); + connect( dbgProcess_, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotDbgProcessExited(KProcess*)) ); application_ = application; - QString gdb = "gdb"; - // Prepend path to gdb, if needed. Using QDir, + TQString gdb = "gdb"; + // Prepend path to gdb, if needed. Using TQDir, // path can either end with slash, or not. if (!config_gdbPath_.isEmpty()) { @@ -825,7 +825,7 @@ bool GDBController::start(const QString& shell, const DomUtil::PairList& run_env *dbgProcess_ << "/bin/sh" << "-c" << shell + " " + gdb + + " " + application + " --interpreter=mi2 -quiet"; emit gdbUserCommandStdout( - QString( "/bin/sh -c " + shell + " " + gdb + TQString( "/bin/sh -c " + shell + " " + gdb + " " + application + " --interpreter=mi2 -quiet\n" ).latin1()); } @@ -834,7 +834,7 @@ bool GDBController::start(const QString& shell, const DomUtil::PairList& run_env *dbgProcess_ << gdb << application << "-interpreter=mi2" << "-quiet"; emit gdbUserCommandStdout( - QString( gdb + " " + application + + TQString( gdb + " " + application + " --interpreter=mi2 -quiet\n" ).latin1()); } @@ -888,23 +888,23 @@ bool GDBController::start(const QString& shell, const DomUtil::PairList& run_env queueCmd(new GDBCommand("set print asm-demangle off")); // make sure output radix is always set to users view. - queueCmd(new GDBCommand(QCString().sprintf("set output-radix %d", config_outputRadix_))); + queueCmd(new GDBCommand(TQCString().sprintf("set output-radix %d", config_outputRadix_))); // Change the "Working directory" to the correct one - QCString tmp( "cd " + QFile::encodeName( run_directory )); + TQCString tmp( "cd " + TQFile::encodeName( run_directory )); queueCmd(new GDBCommand(tmp)); // Set the run arguments if (!run_arguments.isEmpty()) queueCmd( - new GDBCommand(QCString("set args ") + run_arguments.local8Bit())); + new GDBCommand(TQCString("set args ") + run_arguments.local8Bit())); // Get the run environment variables pairs into the environstr string // in the form of: "ENV_VARIABLE=ENV_VALUE" and send to gdb using the // "set enviroment" command // Note that we quote the variable value due to the possibility of // embedded spaces - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = run_envvars.begin(); it != run_envvars.end(); ++it) { @@ -972,8 +972,8 @@ void GDBController::slotStopDebugger() setStateOn(s_shuttingDown); kdDebug(9012) << "GDBController::slotStopDebugger() executing" << endl; - QTime start; - QTime now; + TQTime start; + TQTime now; // Get gdb's attention if it's busy. We need gdb to be at the // command line so we can stop it. @@ -981,11 +981,11 @@ void GDBController::slotStopDebugger() { kdDebug(9012) << "gdb busy on shutdown - stopping gdb (SIGINT)" << endl; dbgProcess_->kill(SIGINT); - start = QTime::currentTime(); + start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput, 20 ); - now = QTime::currentTime(); + kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + now = TQTime::currentTime(); if (!stateIsOn(s_dbgBusy) || start.msecsTo( now ) > 2000) break; } @@ -999,11 +999,11 @@ void GDBController::slotStopDebugger() if (!dbgProcess_->writeStdin(detach, strlen(detach))) kdDebug(9012) << "failed to write 'detach' to gdb" << endl; emit gdbUserCommandStdout("(gdb) detach\n"); - start = QTime::currentTime(); + start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput, 20 ); - now = QTime::currentTime(); + kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + now = TQTime::currentTime(); if (!stateIsOn(s_attached) || start.msecsTo( now ) > 2000) break; } @@ -1015,11 +1015,11 @@ void GDBController::slotStopDebugger() kdDebug(9012) << "failed to write 'quit' to gdb" << endl; emit gdbUserCommandStdout("(gdb) quit"); - start = QTime::currentTime(); + start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput, 20 ); - now = QTime::currentTime(); + kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; } @@ -1050,12 +1050,12 @@ void GDBController::slotStopDebugger() // ************************************************************************** -void GDBController::slotCoreFile(const QString &coreFile) +void GDBController::slotCoreFile(const TQString &coreFile) { setStateOff(s_programExited|s_appNotStarted); setStateOn(s_core); - queueCmd(new GDBCommand(QCString("core ") + coreFile.latin1())); + queueCmd(new GDBCommand(TQCString("core ") + coreFile.latin1())); raiseEvent(connected_to_program); raiseEvent(program_state_changed); @@ -1074,12 +1074,12 @@ void GDBController::slotAttachTo(int pid) // We can't omit application name from gdb invocation // because for libtool binaries, we have no way to guess // real binary name. - queueCmd(new GDBCommand(QString("file"))); + queueCmd(new GDBCommand(TQString("file"))); // The MI interface does not implements -target-attach yet, // and we don't recognize whatever gibberish 'attach' pours out, so... queueCmd(new GDBCommand( - QCString().sprintf("attach %d", pid))); + TQCString().sprintf("attach %d", pid))); raiseEvent(connected_to_program); @@ -1101,11 +1101,11 @@ void GDBController::slotRun() tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, SIGNAL(OutOutput(const char*)), SIGNAL(ttyStdout(const char*)) ); - connect( tty_, SIGNAL(ErrOutput(const char*)), SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); } - QString tty(tty_->getSlave()); + TQString tty(tty_->getSlave()); if (tty.isEmpty()) { KMessageBox::information(0, i18n("GDB cannot use the tty* or pty* devices.\n" @@ -1119,12 +1119,12 @@ void GDBController::slotRun() return; } - queueCmd(new GDBCommand(QCString("tty ")+tty.latin1())); + queueCmd(new GDBCommand(TQCString("tty ")+tty.latin1())); if (!config_runShellScript_.isEmpty()) { // Special for remote debug... - QCString tty(tty_->getSlave().latin1()); - QCString options = QCString(">") + tty + QCString(" 2>&1 <") + tty; + TQCString tty(tty_->getSlave().latin1()); + TQCString options = TQCString(">") + tty + TQCString(" 2>&1 <") + tty; KProcess *proc = new KProcess; @@ -1148,7 +1148,7 @@ void GDBController::slotRun() } else { - QFileInfo app(application_); + TQFileInfo app(application_); if (!app.exists()) { @@ -1214,7 +1214,7 @@ void GDBController::slotKill() // ************************************************************************** -void GDBController::slotRunUntil(const QString &fileName, int lineNum) +void GDBController::slotRunUntil(const TQString &fileName, int lineNum) { if (stateIsOn(s_dbgBusy|s_dbgNotStarted|s_shuttingDown)) return; @@ -1223,23 +1223,23 @@ void GDBController::slotRunUntil(const QString &fileName, int lineNum) if (fileName.isEmpty()) queueCmd(new GDBCommand( - QCString().sprintf("-exec-until %d", lineNum))); + TQCString().sprintf("-exec-until %d", lineNum))); else queueCmd(new GDBCommand( - QCString(). + TQCString(). sprintf("-exec-until %s:%d", fileName.latin1(), lineNum))); } // ************************************************************************** -void GDBController::slotJumpTo(const QString &fileName, int lineNum) +void GDBController::slotJumpTo(const TQString &fileName, int lineNum) { if (stateIsOn(s_dbgBusy|s_dbgNotStarted|s_shuttingDown)) return; if (!fileName.isEmpty()) { - queueCmd(new GDBCommand(QCString().sprintf("tbreak %s:%d", fileName.latin1(), lineNum))); - queueCmd(new GDBCommand(QCString().sprintf("jump %s:%d", fileName.latin1(), lineNum))); + queueCmd(new GDBCommand(TQCString().sprintf("tbreak %s:%d", fileName.latin1(), lineNum))); + queueCmd(new GDBCommand(TQCString().sprintf("jump %s:%d", fileName.latin1(), lineNum))); } } @@ -1324,11 +1324,11 @@ void GDBController::selectFrame(int frameNo, int threadNo) { if (viewedThread_ != threadNo) queueCmd(new GDBCommand( - QString("-thread-select %1").arg(threadNo).ascii())); + TQString("-thread-select %1").arg(threadNo).ascii())); } queueCmd(new GDBCommand( - QString("-stack-select-frame %1").arg(frameNo).ascii())); + TQString("-stack-select-frame %1").arg(frameNo).ascii())); // Will emit the 'thread_or_frame_changed' event. queueCmd(new GDBCommand("-stack-info-frame", @@ -1347,7 +1347,7 @@ void GDBController::selectFrame(int frameNo, int threadNo) void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result) { - QString msg = result["msg"].literal(); + TQString msg = result["msg"].literal(); if (msg.contains("No such process")) { @@ -1425,11 +1425,11 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) { static bool parsing = false; - QCString msg(buf, buflen+1); + TQCString msg(buf, buflen+1); // Copy the data out of the KProcess buffer before it gets overwritten // Append to the back of the holding zone. - holdingZone_ += QCString(buf, buflen+1); + holdingZone_ += TQCString(buf, buflen+1); // Already parsing? then get out quick. // VP, 2006-01-30. I'm not sure how this could happen, since @@ -1451,7 +1451,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) { got_any_command = true; - QCString reply(holdingZone_.left(i)); + TQCString reply(holdingZone_.left(i)); holdingZone_ = holdingZone_.mid(i+1); kdDebug(9012) << "REPLY: " << reply << "\n"; @@ -1561,7 +1561,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) parseCliLine(s.message); - static QRegExp print_output("^\\$(\\d+) = "); + static TQRegExp print_output("^\\$(\\d+) = "); if (print_output.search(s.message) != -1) { kdDebug(9012) << "Found 'print' output: " << s.message << "\n"; @@ -1688,7 +1688,7 @@ void GDBController::raiseEvent(event_t e) void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen) { // At the moment, just drop a message out and redirect - kdDebug(9012) << "STDERR: " << QString::fromLatin1(buf, buflen+1) << endl; + kdDebug(9012) << "STDERR: " << TQString::fromLatin1(buf, buflen+1) << endl; slotDbgStdout(proc, buf, buflen); } @@ -1729,7 +1729,7 @@ void GDBController::slotDbgProcessExited(KProcess* process) // ************************************************************************** -void GDBController::slotUserGDBCmd(const QString& cmd) +void GDBController::slotUserGDBCmd(const TQString& cmd) { queueCmd(new UserCommand(cmd.latin1())); @@ -1745,7 +1745,7 @@ void GDBController::slotUserGDBCmd(const QString& cmd) void GDBController::explainDebuggerStatus() { - QString information("%1 commands in queue\n" + TQString information("%1 commands in queue\n" "%2 commands being processed by gdb\n" "Debugger state: %3\n"); information = @@ -1754,7 +1754,7 @@ void GDBController::explainDebuggerStatus() if (currentCmd_) { - QString extra("Current command class: '%1'\n" + TQString extra("Current command class: '%1'\n" "Current command text: '%2'\n" "Current command origianl text: '%3'\n"); @@ -1795,7 +1795,7 @@ void GDBController::debugStateChange(int oldState, int newState) int delta = oldState ^ newState; if (delta) { - QString out = "STATE: "; + TQString out = "STATE: "; for(unsigned i = 1; i < s_lastDbgState; i <<= 1) { if (delta & i) @@ -1824,7 +1824,7 @@ void GDBController::debugStateChange(int oldState, int newState) #undef STATE_CHECK if (!found) - out += QString::number(i); + out += TQString::number(i); out += " "; } @@ -1840,7 +1840,7 @@ int GDBController::qtVersion( ) const void GDBController::demandAttention() const { - if ( QWidget * w = kapp->mainWidget() ) + if ( TQWidget * w = kapp->mainWidget() ) { KWin::demandAttention( w->winId(), true ); } diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index 6a9e3385..a8b6bd2b 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -22,13 +22,13 @@ #include "mi/gdbmi.h" #include "mi/miparser.h" -#include <qcstring.h> -#include <qdom.h> -#include <qobject.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qmap.h> -#include <qdatetime.h> +#include <tqcstring.h> +#include <tqdom.h> +#include <tqobject.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqdatetime.h> #include <memory> #include <set> @@ -54,7 +54,7 @@ class GDBController : public DbgController Q_OBJECT public: - GDBController(QDomDocument &projectDom); + GDBController(TQDomDocument &projectDom); ~GDBController(); enum event_t { program_state_changed = 1, program_exited, debugger_exited, @@ -82,7 +82,7 @@ public: /** Same as above, but internally constructs new GDBCommand instance from the string. */ - void addCommand(const QString& cmd); + void addCommand(const TQString& cmd); /** Adds command to the front of the commands queue. It will be executed next. @@ -127,11 +127,11 @@ public: int currentFrame() const; - bool start(const QString& shell, + bool start(const TQString& shell, const DomUtil::PairList& run_envvars, - const QString& run_directory, - const QString &application, - const QString& run_arguments); + const TQString& run_directory, + const TQString &application, + const TQString& run_arguments); int qtVersion() const; @@ -161,7 +161,7 @@ private: run "continue" there will be no MI message if the application has exited. */ - void parseCliLine (const QString&); + void parseCliLine (const TQString&); /** Handles a result response from a MI command -- that is all MI responses except for Stream and Prompt responses. @@ -188,7 +188,7 @@ private: */ void reloadProgramState(); - void programNoApp(const QString &msg, bool msgBox); + void programNoApp(const TQString &msg, bool msgBox); void setStateOn(int stateOn); void setStateOff(int stateOff); @@ -226,16 +226,16 @@ public slots: void configure(); - //void slotStart(const QString& shell, const QString &application); - void slotCoreFile(const QString &coreFile); + //void slotStart(const TQString& shell, const TQString &application); + void slotCoreFile(const TQString &coreFile); void slotAttachTo(int pid); void slotStopDebugger(); void slotRun(); void slotKill(); - void slotRunUntil(const QString &filename, int lineNum); - void slotJumpTo(const QString &filename, int lineNum); + void slotRunUntil(const TQString &filename, int lineNum); + void slotJumpTo(const TQString &filename, int lineNum); void slotStepInto(); void slotStepOver(); void slotStepIntoIns(); @@ -244,7 +244,7 @@ public slots: void slotBreakInto(); - void slotUserGDBCmd(const QString&); + void slotUserGDBCmd(const TQString&); // Pops up a dialog box with some hopefully // detailed information about which state debugger @@ -276,14 +276,14 @@ signals: void breakpointHit(int id); /** Emitted for watchpoint hit, after line indicator is shown. */ void watchpointHit(int id, - const QString& oldValue, const QString& newValue); + const TQString& oldValue, const TQString& newValue); private: int currentFrame_; int viewedThread_; // The output from gdb that was not parsed yet - QCString gdbOutput_; + TQCString gdbOutput_; // The output from gdb that arrived where we was // parsing the previous output. To avoid messing // things up, it's not directly added to @@ -291,35 +291,35 @@ private: // VP: It's not clear why the previous code was doing // this, and holdingZone_ won't be processed until // next output arrives, so probably should be just removed. - QCString holdingZone_; + TQCString holdingZone_; - QPtrList<GDBCommand> cmdList_; + TQPtrList<GDBCommand> cmdList_; GDBCommand* currentCmd_; STTY* tty_; - QString badCore_; - QString application_; + TQString badCore_; + TQString application_; // Gdb command that should be issued when we stop on breakpoint // with the given gdb breakpoint id. - QMap<int, const Breakpoint*> tracedBreakpoints_; + TQMap<int, const Breakpoint*> tracedBreakpoints_; // Some state variables int state_; bool programHasExited_; // Configuration values - QDomDocument &dom; + TQDomDocument &dom; bool config_breakOnLoadingLibrary_; bool config_forceBPSet_; bool config_displayStaticMembers_; bool config_asmDemangle_; bool config_dbgTerminal_; - QString config_gdbPath_; - QString config_dbgShell_; - QCString config_configGdbScript_; - QCString config_runShellScript_; - QCString config_runGdbScript_; + TQString config_gdbPath_; + TQString config_dbgShell_; + TQCString config_configGdbScript_; + TQCString config_runShellScript_; + TQCString config_runGdbScript_; int config_outputRadix_; MIParser mi_parser_; @@ -335,11 +335,11 @@ private: // so the only way it can work is via the "print" command. As gdb // outputs things, we'll grep for lines that look like output from // print, and store such lines in this variable, so later use. - QCString print_command_result; + TQCString print_command_result; bool state_reload_needed; - QTime commandExecutionTime; + TQTime commandExecutionTime; bool stateReloadInProgress_; diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index 817f8692..836886bb 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -24,14 +24,14 @@ #include <klocale.h> #include <kpopupmenu.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtextedit.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qapplication.h> -#include <qclipboard.h> -#include <qdom.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtextedit.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqapplication.h> +#include <tqclipboard.h> +#include <tqdom.h> namespace GDBDebugger @@ -39,8 +39,8 @@ namespace GDBDebugger /***************************************************************************/ -GDBOutputWidget::GDBOutputWidget( QWidget *parent, const char *name) : - QWidget(parent, name), +GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : + TQWidget(parent, name), m_userGDBCmdEditor(0), m_Interrupt(0), m_gdbView(0), @@ -49,40 +49,40 @@ GDBOutputWidget::GDBOutputWidget( QWidget *parent, const char *name) : { m_gdbView = new OutputText(this); - m_gdbView->setTextFormat(QTextEdit::LogText); + m_gdbView->setTextFormat(TQTextEdit::LogText); - QBoxLayout *userGDBCmdEntry = new QHBoxLayout(); + TQBoxLayout *userGDBCmdEntry = new TQHBoxLayout(); m_userGDBCmdEditor = new KHistoryCombo (this, "gdb-user-cmd-editor"); - QLabel *label = new QLabel(i18n("&GDB cmd:"), this); + TQLabel *label = new TQLabel(i18n("&GDB cmd:"), this); label->setBuddy(m_userGDBCmdEditor); userGDBCmdEntry->addWidget(label); userGDBCmdEntry->addWidget(m_userGDBCmdEditor); userGDBCmdEntry->setStretchFactor(m_userGDBCmdEditor, 1); - m_Interrupt = new QToolButton( this, "add breakpoint" ); - m_Interrupt->setSizePolicy ( QSizePolicy ( (QSizePolicy::SizeType)0, - ( QSizePolicy::SizeType)0, + m_Interrupt = new TQToolButton( this, "add breakpoint" ); + m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, + ( TQSizePolicy::SizeType)0, 0, 0, m_Interrupt->sizePolicy().hasHeightForWidth()) ); m_Interrupt->setPixmap ( SmallIcon ( "player_pause" ) ); userGDBCmdEntry->addWidget(m_Interrupt); - QToolTip::add ( m_Interrupt, i18n ( "Pause execution of the app to enter gdb commands" ) ); + TQToolTip::add ( m_Interrupt, i18n ( "Pause execution of the app to enter gdb commands" ) ); - QVBoxLayout *topLayout = new QVBoxLayout(this, 2); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 2); topLayout->addWidget(m_gdbView, 10); topLayout->addLayout(userGDBCmdEntry); slotDbgStatus( "", s_dbgNotStarted); - connect( m_userGDBCmdEditor, SIGNAL(returnPressed()), SLOT(slotGDBCmd()) ); - connect( m_Interrupt, SIGNAL(clicked()), SIGNAL(breakInto())); + connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) ); + connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); - connect( &updateTimer_, SIGNAL(timeout()), - this, SLOT(flushPending())); + connect( &updateTimer_, TQT_SIGNAL(timeout()), + this, TQT_SLOT(flushPending())); } /***************************************************************************/ @@ -117,7 +117,7 @@ void GDBOutputWidget::slotUserCommandStdout(const char* line) } namespace { - QString colorify(QString text, const QString& color) + TQString colorify(TQString text, const TQString& color) { // Make sure the newline is at the end of the newly-added // string. This is so that we can always correctly remove @@ -133,10 +133,10 @@ namespace { } -void GDBOutputWidget::newStdoutLine(const QString& line, +void GDBOutputWidget::newStdoutLine(const TQString& line, bool internal) { - QString s = html_escape(line); + TQString s = html_escape(line); if (s.startsWith("(gdb)")) { s = colorify(s, "blue"); @@ -160,7 +160,7 @@ void GDBOutputWidget::newStdoutLine(const QString& line, } -void GDBOutputWidget::showLine(const QString& line) +void GDBOutputWidget::showLine(const TQString& line) { pendingOutput_ += line; @@ -171,7 +171,7 @@ void GDBOutputWidget::showLine(const QString& line) } } -void GDBOutputWidget::trimList(QStringList& l, unsigned max_size) +void GDBOutputWidget::trimList(TQStringList& l, unsigned max_size) { unsigned int length = l.count(); if (length > max_size) @@ -192,10 +192,10 @@ void GDBOutputWidget::setShowInternalCommands(bool show) // Set of strings to show changes, text edit still has old // set. Refresh. m_gdbView->clear(); - QStringList& newList = + TQStringList& newList = showInternalCommands_ ? allCommands_ : userCommands_; - QStringList::iterator i = newList.begin(), e = newList.end(); + TQStringList::iterator i = newList.begin(), e = newList.end(); for(; i != e; ++i) { // Note that color formatting is already applied to '*i'. @@ -208,7 +208,7 @@ void GDBOutputWidget::setShowInternalCommands(bool show) void GDBOutputWidget::slotReceivedStderr(const char* line) { - QString colored = colorify(html_escape(line), "red"); + TQString colored = colorify(html_escape(line), "red"); // Errors are shown inside user commands too. allCommands_.append(colored); trimList(allCommands_, maxLines_); @@ -227,7 +227,7 @@ void GDBOutputWidget::slotReceivedStderr(const char* line) void GDBOutputWidget::slotGDBCmd() { - QString GDBCmd(m_userGDBCmdEditor->currentText()); + TQString GDBCmd(m_userGDBCmdEditor->currentText()); if (!GDBCmd.isEmpty()) { m_userGDBCmdEditor->addToHistory(GDBCmd); @@ -240,7 +240,7 @@ void GDBOutputWidget::flushPending() { m_gdbView->setUpdatesEnabled(false); - // QTextEdit adds newline after paragraph automatically. + // TQTextEdit adds newline after paragraph automatically. // So, remove trailing newline to avoid double newlines. if (pendingOutput_.endsWith("\n")) pendingOutput_.remove(pendingOutput_.length()-1, 1); @@ -257,7 +257,7 @@ void GDBOutputWidget::flushPending() /***************************************************************************/ -void GDBOutputWidget::slotDbgStatus(const QString &, int statusFlag) +void GDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag) { if (statusFlag & s_dbgNotStarted) { @@ -282,33 +282,33 @@ void GDBOutputWidget::slotDbgStatus(const QString &, int statusFlag) /***************************************************************************/ -void GDBOutputWidget::focusInEvent(QFocusEvent */*e*/) +void GDBOutputWidget::focusInEvent(TQFocusEvent */*e*/) { m_gdbView->scrollToBottom(); m_userGDBCmdEditor->setFocus(); } -QString GDBOutputWidget::html_escape(const QString& s) +TQString GDBOutputWidget::html_escape(const TQString& s) { - QString r(s); + TQString r(s); r.replace("<", "<"); r.replace(">", ">"); return r; } -void GDBOutputWidget::savePartialProjectSession(QDomElement* el) +void GDBOutputWidget::savePartialProjectSession(TQDomElement* el) { - QDomDocument doc = el->ownerDocument(); + TQDomDocument doc = el->ownerDocument(); - QDomElement showInternal = doc.createElement("showInternalCommands"); - showInternal.setAttribute("value", QString::number(showInternalCommands_)); + TQDomElement showInternal = doc.createElement("showInternalCommands"); + showInternal.setAttribute("value", TQString::number(showInternalCommands_)); el->appendChild(showInternal); } -void GDBOutputWidget::restorePartialProjectSession(const QDomElement* el) +void GDBOutputWidget::restorePartialProjectSession(const TQDomElement* el) { - QDomElement showInternal = + TQDomElement showInternal = el->namedItem("showInternalCommands").toElement(); if (!showInternal.isNull()) @@ -318,14 +318,14 @@ void GDBOutputWidget::restorePartialProjectSession(const QDomElement* el) } -//void OutputText::contextMenuEvent(QContextMenuEvent* e) -QPopupMenu* OutputText::createPopupMenu(const QPoint&) +//void OutputText::contextMenuEvent(TQContextMenuEvent* e) +TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) { KPopupMenu* popup = new KPopupMenu; int id = popup->insertItem(i18n("Show Internal Commands"), this, - SLOT(toggleShowInternalCommands())); + TQT_SLOT(toggleShowInternalCommands())); popup->setItemChecked(id, parent_->showInternalCommands_); popup->setWhatsThis( @@ -338,7 +338,7 @@ QPopupMenu* OutputText::createPopupMenu(const QPoint&) popup->insertItem(i18n("Copy All"), this, - SLOT(copyAll())); + TQT_SLOT(copyAll())); return popup; @@ -348,16 +348,16 @@ void OutputText::copyAll() { /* See comments for allCommandRaw_ for explanations of this complex logic, as opposed to calling text(). */ - QStringList& raw = parent_->showInternalCommands_ ? + TQStringList& raw = parent_->showInternalCommands_ ? parent_->allCommandsRaw_ : parent_->userCommandsRaw_; - QString text; + TQString text; for (unsigned i = 0; i < raw.size(); ++i) text += raw[i]; // Make sure the text is pastable both with Ctrl-C and with // middle click. - QApplication::clipboard()->setText(text, QClipboard::Clipboard); - QApplication::clipboard()->setText(text, QClipboard::Selection); + TQApplication::clipboard()->setText(text, QClipboard::Clipboard); + TQApplication::clipboard()->setText(text, QClipboard::Selection); } void OutputText::toggleShowInternalCommands() diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index ddf79823..0b14b599 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -18,10 +18,10 @@ #ifndef _GDBOUTPUTWIDGET_H_ #define _GDBOUTPUTWIDGET_H_ -#include <qwidget.h> -#include <qtextedit.h> -#include <qtimer.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqtextedit.h> +#include <tqtimer.h> +#include <tqstringlist.h> class KHistoryCombo; @@ -37,11 +37,11 @@ class GDBOutputWidget : public QWidget Q_OBJECT public: - GDBOutputWidget( QWidget *parent=0, const char *name=0 ); + GDBOutputWidget( TQWidget *parent=0, const char *name=0 ); ~GDBOutputWidget(); - void savePartialProjectSession(QDomElement* el); - void restorePartialProjectSession(const QDomElement* el); + void savePartialProjectSession(TQDomElement* el); + void restorePartialProjectSession(const TQDomElement* el); void clear(); @@ -49,38 +49,38 @@ public slots: void slotInternalCommandStdout(const char* line); void slotUserCommandStdout(const char* line); void slotReceivedStderr(const char* line); - void slotDbgStatus (const QString &status, int statusFlag); + void slotDbgStatus (const TQString &status, int statusFlag); void slotGDBCmd(); void flushPending(); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); signals: - void userGDBCmd(const QString &cmd); + void userGDBCmd(const TQString &cmd); void breakInto(); private: - QString html_escape(const QString& s); + TQString html_escape(const TQString& s); - void newStdoutLine(const QString& line, bool internal); + void newStdoutLine(const TQString& line, bool internal); /** Arranges for 'line' to be shown to the user. Adds 'line' to pendingOutput_ and makes sure updateTimer_ is running. */ - void showLine(const QString& line); + void showLine(const TQString& line); /** Makes 'l' no longer then 'max_size' by removing excessive elements from the top. */ - void trimList(QStringList& l, unsigned max_size); + void trimList(TQStringList& l, unsigned max_size); KHistoryCombo* m_userGDBCmdEditor; - QToolButton* m_Interrupt; - QTextEdit* m_gdbView; + TQToolButton* m_Interrupt; + TQTextEdit* m_gdbView; void setShowInternalCommands(bool); friend class OutputText; @@ -90,39 +90,39 @@ private: "Show internal commands" on, we can show previous internal commands. */ - QStringList userCommands_, allCommands_; + TQStringList userCommands_, allCommands_; /** Same output, without any fancy formatting. Keeping it here because I can't find any way to extract raw text, - without formatting, out of QTextEdit except for + without formatting, out of TQTextEdit except for selecting everything and calling 'copy()'. The latter approach is just ugly. */ - QStringList userCommandsRaw_, allCommandsRaw_; + TQStringList userCommandsRaw_, allCommandsRaw_; /** For performance reasons, we don't immediately add new text to QTExtEdit. Instead we add it to pendingOutput_ and flush it on timer. */ - QString pendingOutput_; - QTimer updateTimer_; + TQString pendingOutput_; + TQTimer updateTimer_; bool showInternalCommands_; int maxLines_; }; -/** Add popup menu specific to gdb output window to QTextEdit. +/** Add popup menu specific to gdb output window to TQTextEdit. */ class OutputText : public QTextEdit { Q_OBJECT public: OutputText(GDBOutputWidget* parent) - : QTextEdit(parent), + : TQTextEdit(parent), parent_(parent) {} - QPopupMenu* createPopupMenu(const QPoint& pos); + TQPopupMenu* createPopupMenu(const TQPoint& pos); private slots: void copyAll(); diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp index 79057af5..5a8588b1 100644 --- a/languages/cpp/debugger/gdbparser.cpp +++ b/languages/cpp/debugger/gdbparser.cpp @@ -17,7 +17,7 @@ #include "variablewidget.h" #include <kdebug.h> -#include <qregexp.h> +#include <tqregexp.h> #include <ctype.h> #include <stdlib.h> @@ -62,32 +62,32 @@ GDBParser::~GDBParser() // ************************************************************************** -QString GDBParser::getName(const char **buf) +TQString GDBParser::getName(const char **buf) { const char *start = skipNextTokenStart(*buf); if (*start) { *buf = skipTokenValue(start); - return QCString(start, *buf - start + 1); + return TQCString(start, *buf - start + 1); } else *buf = start; - return QString(); + return TQString(); } // ************************************************************************** -QString GDBParser::getValue(const char **buf) +TQString GDBParser::getValue(const char **buf) { const char *start = skipNextTokenStart(*buf); *buf = skipTokenValue(start); - QString value(QCString(start, *buf - start + 1).data()); + TQString value(TQCString(start, *buf - start + 1).data()); return value; } -QString GDBParser::undecorateValue(DataType type, const QString& s) +TQString GDBParser::undecorateValue(DataType type, const TQString& s) { - QCString l8 = s.local8Bit(); + TQCString l8 = s.local8Bit(); const char* start = l8; const char* end = start + s.length(); @@ -106,7 +106,7 @@ QString GDBParser::undecorateValue(DataType type, const QString& s) else { // Looks like composite, strip the braces and return. - return QCString(start+1, end - start -1); + return TQCString(start+1, end - start -1); } } else if (*start == '(') @@ -131,7 +131,7 @@ QString GDBParser::undecorateValue(DataType type, const QString& s) start = skipDelim(start, '(', ')'); } - QString value(QCString(start, end - start + 1).data()); + TQString value(TQCString(start, end - start + 1).data()); value = value.stripWhiteSpace(); @@ -155,10 +155,10 @@ QString GDBParser::undecorateValue(DataType type, const QString& s) return value.stripWhiteSpace(); } -QString GDBParser::undecorateValue(const QString& s) +TQString GDBParser::undecorateValue(const TQString& s) { DataType dataType = determineType(s.local8Bit()); - QString r = undecorateValue(dataType, s.local8Bit()); + TQString r = undecorateValue(dataType, s.local8Bit()); return r; } diff --git a/languages/cpp/debugger/gdbparser.h b/languages/cpp/debugger/gdbparser.h index 8972e5df..a56c082d 100644 --- a/languages/cpp/debugger/gdbparser.h +++ b/languages/cpp/debugger/gdbparser.h @@ -25,7 +25,7 @@ class GDBParser { public: DataType determineType(const char *buf) const; - QString undecorateValue(const QString& s); + TQString undecorateValue(const TQString& s); const char *skipString(const char *buf) const; const char *skipQuotes(const char *buf, char quote) const; @@ -41,12 +41,12 @@ private: const char *skipTokenValue(const char *buf) const; const char *skipNextTokenStart(const char *buf) const; - QString getName(const char **buf); + TQString getName(const char **buf); /** Assuming 'buf' points to a value, return a pointer to the position right after the value. */ - QString getValue(const char **buf); - QString undecorateValue(DataType type, const QString& s); + TQString getValue(const char **buf); + TQString undecorateValue(DataType type, const TQString& s); protected: GDBParser(); diff --git a/languages/cpp/debugger/gdbtable.cpp b/languages/cpp/debugger/gdbtable.cpp index c4d75f3a..c9c1bf2f 100644 --- a/languages/cpp/debugger/gdbtable.cpp +++ b/languages/cpp/debugger/gdbtable.cpp @@ -11,13 +11,13 @@ namespace GDBDebugger { -GDBTable::GDBTable(QWidget *parent, const char *name) - : QTable(parent, name) +GDBTable::GDBTable(TQWidget *parent, const char *name) + : TQTable(parent, name) { } -GDBTable::GDBTable(int nr, int nc, QWidget * parent, const char * name) - : QTable(nr, nc, parent, name) +GDBTable::GDBTable(int nr, int nc, TQWidget * parent, const char * name) + : TQTable(nr, nc, parent, name) { } @@ -25,7 +25,7 @@ GDBTable::~GDBTable() { } -void GDBTable::keyPressEvent( QKeyEvent * e ) +void GDBTable::keyPressEvent( TQKeyEvent * e ) { emit keyPressed(e->key()); @@ -33,12 +33,12 @@ void GDBTable::keyPressEvent( QKeyEvent * e ) emit returnPressed(); else if (e->key() == Key_F2) emit f2Pressed(); - else if ((e->text() == QString("a")) && (e->state() == AltButton)) + else if ((e->text() == TQString("a")) && (e->state() == AltButton)) { emit insertPressed(); return; } - else if ((e->text() == QString("A")) && (e->state() == AltButton)) + else if ((e->text() == TQString("A")) && (e->state() == AltButton)) { emit insertPressed(); return; @@ -46,7 +46,7 @@ void GDBTable::keyPressEvent( QKeyEvent * e ) else if (e->key() == Key_Delete) emit deletePressed(); - QTable::keyPressEvent(e); + TQTable::keyPressEvent(e); } } diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h index f8741e26..78c45055 100644 --- a/languages/cpp/debugger/gdbtable.h +++ b/languages/cpp/debugger/gdbtable.h @@ -10,7 +10,7 @@ #ifndef GDBDEBUGGERGDBTABLE_H #define GDBDEBUGGERGDBTABLE_H -#include <qtable.h> +#include <tqtable.h> namespace GDBDebugger { @@ -18,11 +18,11 @@ class GDBTable : public QTable { Q_OBJECT public: - GDBTable(QWidget *parent = 0, const char *name = 0); - GDBTable( int numRows, int numCols, QWidget * parent = 0, const char * name = 0 ); + GDBTable(TQWidget *parent = 0, const char *name = 0); + GDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 ); ~GDBTable(); - virtual void keyPressEvent ( QKeyEvent * e ); + virtual void keyPressEvent ( TQKeyEvent * e ); signals: void keyPressed(int key); diff --git a/languages/cpp/debugger/label_with_double_click.cpp b/languages/cpp/debugger/label_with_double_click.cpp index a0a2014b..f08c7358 100644 --- a/languages/cpp/debugger/label_with_double_click.cpp +++ b/languages/cpp/debugger/label_with_double_click.cpp @@ -1,11 +1,11 @@ #include "label_with_double_click.h" -LabelWithDoubleClick::LabelWithDoubleClick(const QString& s, QWidget* parent) -: QLabel(s, parent) +LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* parent) +: TQLabel(s, parent) {} -void LabelWithDoubleClick::mouseDoubleClickEvent(QMouseEvent*) +void LabelWithDoubleClick::mouseDoubleClickEvent(TQMouseEvent*) { emit doubleClicked(); } diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h index 11dec898..35ade271 100644 --- a/languages/cpp/debugger/label_with_double_click.h +++ b/languages/cpp/debugger/label_with_double_click.h @@ -2,19 +2,19 @@ #ifndef LABEL_WITH_DOUBLE_CLICK_HPP_VP_2006_04_04 #define LABEL_WITH_DOUBLE_CLICK_HPP_VP_2006_04_04 -#include <qlabel.h> +#include <tqlabel.h> class LabelWithDoubleClick : public QLabel { Q_OBJECT public: - LabelWithDoubleClick(const QString& s, QWidget* parent); + LabelWithDoubleClick(const TQString& s, TQWidget* parent); signals: void doubleClicked(); protected: - void mouseDoubleClickEvent(QMouseEvent*); + void mouseDoubleClickEvent(TQMouseEvent*); }; #endif diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 5316aa91..6d700233 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -26,15 +26,15 @@ #include <kdebug.h> #include <kiconloader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qmultilineedit.h> -#include <qpushbutton.h> -#include <qvariant.h> -#include <qpopupmenu.h> -#include <qhbox.h> -#include <qtoolbox.h> -#include <qtextedit.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqmultilineedit.h> +#include <tqpushbutton.h> +#include <tqvariant.h> +#include <tqpopupmenu.h> +#include <tqhbox.h> +#include <tqtoolbox.h> +#include <tqtextedit.h> #include <kmessagebox.h> @@ -76,28 +76,28 @@ namespace GDBDebugger public: KLineEdit* startAddressLineEdit; KLineEdit* amountLineEdit; - QPushButton* okButton; - QPushButton* cancelButton; + TQPushButton* okButton; + TQPushButton* cancelButton; - MemoryRangeSelector(QWidget* parent) - : QWidget(parent) + MemoryRangeSelector(TQWidget* parent) + : TQWidget(parent) { - QVBoxLayout* l = new QVBoxLayout(this); + TQVBoxLayout* l = new TQVBoxLayout(this); // Grid layout: labels + address field - QGridLayout* gl = new QGridLayout(l); + TQGridLayout* gl = new TQGridLayout(l); gl->setColSpacing(0, 2); gl->setColSpacing(1, 4); gl->setRowSpacing(1, 2); - QLabel* l1 = new QLabel(i18n("Start"), this); + TQLabel* l1 = new TQLabel(i18n("Start"), this); gl->addWidget(l1, 0, 1); startAddressLineEdit = new KLineEdit(this); gl->addWidget(startAddressLineEdit, 0, 3); - QLabel* l2 = new QLabel(i18n("Amount"), this); + TQLabel* l2 = new TQLabel(i18n("Amount"), this); gl->addWidget(l2, 2, 1); amountLineEdit = new KLineEdit(this); @@ -105,30 +105,30 @@ namespace GDBDebugger l->addSpacing(2); - QHBoxLayout* hb = new QHBoxLayout(l); + TQHBoxLayout* hb = new TQHBoxLayout(l); hb->addStretch(); - okButton = new QPushButton(i18n("OK"), this); + okButton = new TQPushButton(i18n("OK"), this); hb->addWidget(okButton); - cancelButton = new QPushButton(i18n("Cancel"), this); + cancelButton = new TQPushButton(i18n("Cancel"), this); hb->addWidget(cancelButton); l->addSpacing(2); - connect(startAddressLineEdit, SIGNAL(returnPressed()), - okButton, SLOT(animateClick())); + connect(startAddressLineEdit, TQT_SIGNAL(returnPressed()), + okButton, TQT_SLOT(animateClick())); - connect(amountLineEdit, SIGNAL(returnPressed()), - okButton, SLOT(animateClick())); + connect(amountLineEdit, TQT_SIGNAL(returnPressed()), + okButton, TQT_SLOT(animateClick())); } }; MemoryView::MemoryView(GDBController* controller, - QWidget* parent, const char* name) - : QWidget(parent, name), + TQWidget* parent, const char* name) + : TQWidget(parent, name), controller_(controller), // New memory view can be created only when debugger is active, // so don't set s_appNotStarted here. @@ -147,7 +147,7 @@ namespace GDBDebugger void MemoryView::initWidget() { - QVBoxLayout *l = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); khexedit2_widget = KHE::createBytesEditWidget(this); @@ -155,22 +155,22 @@ namespace GDBDebugger if (khexedit2_widget) { - QWidget* real_widget = (QWidget*) + TQWidget* real_widget = (TQWidget*) khexedit2_widget->child("BytesEdit"); if (real_widget) { ok_ = true; - connect(real_widget, SIGNAL(bufferChanged(int, int)), - this, SLOT(memoryEdited(int, int))); + connect(real_widget, TQT_SIGNAL(bufferChanged(int, int)), + this, TQT_SLOT(memoryEdited(int, int))); khexedit2_real_widget = real_widget; - QVariant resize_style(2); // full size usage. + TQVariant resize_style(2); // full size usage. real_widget->setProperty("ResizeStyle", resize_style); - //QVariant group(8); + //TQVariant group(8); //real_widget->setProperty("StartOffset", start); //real_widget->setProperty("NoOfBytesPerLine", group); @@ -179,10 +179,10 @@ namespace GDBDebugger // 3 -- binary // 1 -- decimal // 0 -- hex - //QVariant coding(3); + //TQVariant coding(3); //real_widget->setProperty("Coding", coding); - //QVariant gap(32); + //TQVariant gap(32); //real_widget->setProperty("BinaryGapWidth", gap); } @@ -197,28 +197,28 @@ namespace GDBDebugger rangeSelector_ = new MemoryRangeSelector(this); l->addWidget(rangeSelector_); - connect(rangeSelector_->okButton, SIGNAL(clicked()), - this, SLOT(slotChangeMemoryRange())); + connect(rangeSelector_->okButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotChangeMemoryRange())); - connect(rangeSelector_->cancelButton, SIGNAL(clicked()), - this, SLOT(slotHideRangeDialog())); + connect(rangeSelector_->cancelButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotHideRangeDialog())); connect(rangeSelector_->startAddressLineEdit, - SIGNAL(textChanged(const QString&)), + TQT_SIGNAL(textChanged(const TQString&)), this, - SLOT(slotEnableOrDisable())); + TQT_SLOT(slotEnableOrDisable())); connect(rangeSelector_->amountLineEdit, - SIGNAL(textChanged(const QString&)), + TQT_SIGNAL(textChanged(const TQString&)), this, - SLOT(slotEnableOrDisable())); + TQT_SLOT(slotEnableOrDisable())); l->addWidget(khexedit2_widget); } else { - QTextEdit* edit = new QTextEdit(this); + TQTextEdit* edit = new TQTextEdit(this); l->addWidget(edit); edit->setText( @@ -257,12 +257,12 @@ namespace GDBDebugger this, &MemoryView::sizeComputed)); } - void MemoryView::sizeComputed(const QString& size) + void MemoryView::sizeComputed(const TQString& size) { controller_->addCommand( new GDBCommand( - QString("-data-read-memory %1 x 1 1 %2") + TQString("-data-read-memory %1 x 1 1 %2") .arg(rangeSelector_->startAddressLineEdit->text()) .arg(size).ascii(), this, @@ -279,7 +279,7 @@ namespace GDBDebugger amountAsString_ = rangeSelector_->amountLineEdit->text(); start_ = startAsString_.toUInt(0, 0); - setCaption(QString("%1 (%2 bytes)") + setCaption(TQString("%1 (%2 bytes)") .arg(startAsString_).arg(amount_)); emit captionChanged(caption()); @@ -302,10 +302,10 @@ namespace GDBDebugger // inserting new data. bytesEditor->setOverwriteOnly( true ); - QVariant start_v(start_); + TQVariant start_v(start_); khexedit2_real_widget->setProperty("FirstLineOffset", start_v); - //QVariant bsw(0); + //TQVariant bsw(0); //khexedit2_real_widget->setProperty("ByteSpacingWidth", bsw); // HACK: use hardcoded constant taht should match @@ -313,7 +313,7 @@ namespace GDBDebugger // 3 -- binary // 1 -- decimal // 0 -- hex - //QVariant coding(1); + //TQVariant coding(1); //khexedit2_real_widget->setProperty("Coding", coding); @@ -327,19 +327,19 @@ namespace GDBDebugger { controller_->addCommand( new GDBCommand( - QString("set *(char*)(%1 + %2) = %3") + TQString("set *(char*)(%1 + %2) = %3") .arg(start_) .arg(i) - .arg(QString::number(data_[i])))); + .arg(TQString::number(data_[i])))); } } - void MemoryView::contextMenuEvent ( QContextMenuEvent * e ) + void MemoryView::contextMenuEvent ( TQContextMenuEvent * e ) { if (!isOk()) return; - QPopupMenu menu; + TQPopupMenu menu; bool app_running = !(debuggerState_ & s_appNotStarted); @@ -373,7 +373,7 @@ namespace GDBDebugger controller_->addCommand( new GDBCommand( - QString("-data-read-memory %1 x 1 1 %2") + TQString("-data-read-memory %1 x 1 1 %2") .arg(start_).arg(amount_).ascii(), this, &MemoryView::memoryRead)); @@ -403,16 +403,16 @@ namespace GDBDebugger ViewerWidget::ViewerWidget(GDBController* controller, - QWidget* parent, + TQWidget* parent, const char* name) - : QWidget(parent, name), + : TQWidget(parent, name), controller_(controller) { setIcon(SmallIcon("math_brace")); - QVBoxLayout *l = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); - toolBox_ = new QToolBox(this); + toolBox_ = new TQToolBox(this); l->addWidget(toolBox_); } @@ -436,14 +436,14 @@ namespace GDBDebugger toolBox_->setCurrentItem(widget); memoryViews_.push_back(widget); - connect(widget, SIGNAL(captionChanged(const QString&)), - this, SLOT(slotChildCaptionChanged(const QString&))); + connect(widget, TQT_SIGNAL(captionChanged(const TQString&)), + this, TQT_SLOT(slotChildCaptionChanged(const TQString&))); - connect(widget, SIGNAL(destroyed(QObject*)), - this, SLOT(slotChildDestroyed(QObject*))); + connect(widget, TQT_SIGNAL(destroyed(TQObject*)), + this, TQT_SLOT(slotChildDestroyed(TQObject*))); } - void ViewerWidget::slotDebuggerState(const QString&, int state) + void ViewerWidget::slotDebuggerState(const TQString&, int state) { for(unsigned i = 0; i < memoryViews_.size(); ++i) { @@ -451,19 +451,19 @@ namespace GDBDebugger } } - void ViewerWidget::slotChildCaptionChanged(const QString& caption) + void ViewerWidget::slotChildCaptionChanged(const TQString& caption) { - const QWidget* s = static_cast<const QWidget*>(sender()); - QWidget* ncs = const_cast<QWidget*>(s); - QString cap = caption; + const TQWidget* s = static_cast<const TQWidget*>(sender()); + TQWidget* ncs = const_cast<TQWidget*>(s); + TQString cap = caption; // Prevent intepreting '&' as accelerator specifier. cap.replace("&", "&&"); toolBox_->setItemLabel(toolBox_->indexOf(ncs), cap); } - void ViewerWidget::slotChildDestroyed(QObject* child) + void ViewerWidget::slotChildDestroyed(TQObject* child) { - QValueVector<MemoryView*>::iterator i, e; + TQValueVector<MemoryView*>::iterator i, e; for(i = memoryViews_.begin(), e = memoryViews_.end(); i != e; ++i) { if (*i == child) diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h index a29de924..7008fb48 100644 --- a/languages/cpp/debugger/memviewdlg.h +++ b/languages/cpp/debugger/memviewdlg.h @@ -20,7 +20,7 @@ #include <kdialog.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> class KLineEdit; class QMultiLineEdit; @@ -36,7 +36,7 @@ namespace GDBDebugger Q_OBJECT public: ViewerWidget(GDBController* controller, - QWidget* parent, const char* name); + TQWidget* parent, const char* name); public slots: /** Adds a new memory view to *this, initially showing @@ -45,20 +45,20 @@ namespace GDBDebugger /** Informs *this about change in debugger state. Should always be connected to, so that *this can disable itself when debugger is not running. */ - void slotDebuggerState(const QString&, int state); + void slotDebuggerState(const TQString&, int state); signals: void setViewShown(bool shown); private slots: - void slotChildCaptionChanged(const QString& caption); - void slotChildDestroyed(QObject* child); + void slotChildCaptionChanged(const TQString& caption); + void slotChildDestroyed(TQObject* child); private: // Data GDBController* controller_; - QToolBox* toolBox_; - QValueVector<MemoryView*> memoryViews_; + TQToolBox* toolBox_; + TQValueVector<MemoryView*> memoryViews_; }; class MemoryView : public QWidget @@ -66,15 +66,15 @@ namespace GDBDebugger Q_OBJECT public: MemoryView(GDBController* controller, - QWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = 0); void debuggerStateChanged(int state); signals: - void captionChanged(const QString& caption); + void captionChanged(const TQString& caption); private: // Callbacks - void sizeComputed(const QString& value); + void sizeComputed(const TQString& value); void memoryRead(const GDBMI::ResultRecord& r); @@ -95,8 +95,8 @@ namespace GDBDebugger void slotHideRangeDialog(); void slotEnableOrDisable(); - private: // QWidget overrides - void contextMenuEvent(QContextMenuEvent* e); + private: // TQWidget overrides + void contextMenuEvent(TQContextMenuEvent* e); private: void initWidget(); @@ -104,11 +104,11 @@ namespace GDBDebugger private: GDBController* controller_; class MemoryRangeSelector* rangeSelector_; - QWidget* khexedit2_widget; - QWidget* khexedit2_real_widget; + TQWidget* khexedit2_widget; + TQWidget* khexedit2_real_widget; uint start_, amount_; - QString startAsString_, amountAsString_; + TQString startAsString_, amountAsString_; char* data_; int debuggerState_; diff --git a/languages/cpp/debugger/mi/gdbmi.cpp b/languages/cpp/debugger/mi/gdbmi.cpp index fa27355f..27f90284 100644 --- a/languages/cpp/debugger/mi/gdbmi.cpp +++ b/languages/cpp/debugger/mi/gdbmi.cpp @@ -28,7 +28,7 @@ type_error::type_error() : std::logic_error("MI type error") {} -QString Value::literal() const +TQString Value::literal() const { throw type_error(); } @@ -38,12 +38,12 @@ int Value::toInt(int /*base*/) const throw type_error(); } -bool Value::hasField(const QString&) const +bool Value::hasField(const TQString&) const { throw type_error(); } -const Value& Value::operator[](const QString&) const +const Value& Value::operator[](const TQString&) const { throw type_error(); } @@ -64,7 +64,7 @@ const Value& Value::operator[](unsigned) const throw type_error(); } -QString StringLiteralValue::literal() const +TQString StringLiteralValue::literal() const { return literal_; } @@ -80,16 +80,16 @@ int StringLiteralValue::toInt(int base) const TupleValue::~TupleValue() { - for (QValueListIterator<Result*> it=results.begin(); it!=results.end(); ++it) + for (TQValueListIterator<Result*> it=results.begin(); it!=results.end(); ++it) delete *it; } -bool TupleValue::hasField(const QString& variable) const +bool TupleValue::hasField(const TQString& variable) const { return results_by_name.count(variable); } -const Value& TupleValue::operator[](const QString& variable) const +const Value& TupleValue::operator[](const TQString& variable) const { if (results_by_name.count(variable)) return *results_by_name[variable]->value; @@ -99,7 +99,7 @@ const Value& TupleValue::operator[](const QString& variable) const ListValue::~ListValue() { - for (QValueListIterator<Result*> it=results.begin(); it!=results.end(); ++it) + for (TQValueListIterator<Result*> it=results.begin(); it!=results.end(); ++it) delete *it; } diff --git a/languages/cpp/debugger/mi/gdbmi.h b/languages/cpp/debugger/mi/gdbmi.h index 667246a0..64252ee5 100644 --- a/languages/cpp/debugger/mi/gdbmi.h +++ b/languages/cpp/debugger/mi/gdbmi.h @@ -22,9 +22,9 @@ #ifndef GDBMI_H #define GDBMI_H -#include <qstring.h> -#include <qvaluelist.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqmap.h> #include <stdexcept> @@ -94,7 +94,7 @@ namespace GDBMI /** If this value is a string literals, returns the string value. Othewise, throws type_error. */ - virtual QString literal() const; + virtual TQString literal() const; /** If the value is a string literal, converts it to int and returns. If conversion fails, or the value cannot be @@ -106,7 +106,7 @@ namespace GDBMI has a field named 'variable'. Otherwise, throws type_error. */ - virtual bool hasField(const QString& variable) const; + virtual bool hasField(const TQString& variable) const; /** If this value is a tuple, and contains named field 'variable', returns it. Otherwise, throws 'type_error'. @@ -114,7 +114,7 @@ namespace GDBMI we can save on casting, when we know for sure that instance is TupleValue, or ListValue. */ - virtual const Value& operator[](const QString& variable) const; + virtual const Value& operator[](const TQString& variable) const; /** If this value is a list, returns true if the list is empty. If this value is not a list, throws 'type_error'. @@ -140,22 +140,22 @@ namespace GDBMI Result() : value(0) {} ~Result() { delete value; value = 0; } - QString variable; + TQString variable; Value *value; }; struct StringLiteralValue : public Value { - StringLiteralValue(const QString &lit) + StringLiteralValue(const TQString &lit) : literal_(lit) { Value::kind = StringLiteral; } public: // Value overrides - QString literal() const; + TQString literal() const; int toInt(int base) const; private: - QString literal_; + TQString literal_; }; struct TupleValue : public Value @@ -163,12 +163,12 @@ namespace GDBMI TupleValue() { Value::kind = Tuple; } ~TupleValue(); - bool hasField(const QString&) const; - const Value& operator[](const QString& variable) const; + bool hasField(const TQString&) const; + const Value& operator[](const TQString& variable) const; - QValueList<Result*> results; - QMap<QString, GDBMI::Result*> results_by_name; + TQValueList<Result*> results; + TQMap<TQString, GDBMI::Result*> results_by_name; }; struct ListValue : public Value @@ -182,14 +182,14 @@ namespace GDBMI const Value& operator[](unsigned index) const; - QValueList<Result*> results; + TQValueList<Result*> results; }; struct Record { virtual ~Record() {} - virtual QString toString() const { Q_ASSERT( 0 ); return QString::null; } + virtual TQString toString() const { Q_ASSERT( 0 ); return TQString::null; } enum { Prompt, Stream, Result } kind; }; @@ -198,14 +198,14 @@ namespace GDBMI { ResultRecord() { Record::kind = Result; } - QString reason; + TQString reason; }; struct PromptRecord : public Record { inline PromptRecord() { Record::kind = Prompt; } - virtual QString toString() const + virtual TQString toString() const { return "(prompt)\n"; } }; @@ -214,7 +214,7 @@ namespace GDBMI inline StreamRecord() : reason(0) { Record::kind = Stream; } char reason; - QString message; + TQString message; }; } diff --git a/languages/cpp/debugger/mi/milexer.cpp b/languages/cpp/debugger/mi/milexer.cpp index 847733ad..7813d091 100644 --- a/languages/cpp/debugger/mi/milexer.cpp +++ b/languages/cpp/debugger/mi/milexer.cpp @@ -281,10 +281,10 @@ void TokenStream::positionAt(int position, int *line, int *column) const Q_ASSERT( *column >= 0 ); } -QCString TokenStream::tokenText(int index) const +TQCString TokenStream::tokenText(int index) const { Token *t = index < 0 ? m_currentToken : m_firstToken + index; const char* data = m_contents; - return QCString(data + t->position, t->length+1); + return TQCString(data + t->position, t->length+1); } diff --git a/languages/cpp/debugger/mi/milexer.h b/languages/cpp/debugger/mi/milexer.h index 8f39820c..8f07ba58 100644 --- a/languages/cpp/debugger/mi/milexer.h +++ b/languages/cpp/debugger/mi/milexer.h @@ -20,9 +20,9 @@ #ifndef MILEXER_H #define MILEXER_H -#include <qmemarray.h> -#include <qmap.h> -#include <qstring.h> +#include <tqmemarray.h> +#include <tqmap.h> +#include <tqstring.h> class MILexer; class TokenStream; @@ -38,7 +38,7 @@ struct Token struct FileSymbol { - QCString contents; + TQCString contents; TokenStream *tokenStream; inline FileSymbol() @@ -55,10 +55,10 @@ struct TokenStream inline int currentToken() const { return m_currentToken->kind; } - inline QCString currentTokenText() const + inline TQCString currentTokenText() const { return tokenText(-1); } - QCString tokenText(int index = 0) const; + TQCString tokenText(int index = 0) const; inline int lineOffset(int line) const { return m_lines.at(line); } @@ -84,12 +84,12 @@ struct TokenStream { m_currentToken++; m_cursor++; } //private: - QCString m_contents; + TQCString m_contents; - QMemArray<int> m_lines; + TQMemArray<int> m_lines; int m_line; - QMemArray<Token> m_tokens; + TQMemArray<Token> m_tokens; int m_tokensCount; Token *m_firstToken; @@ -123,15 +123,15 @@ private: static bool s_initialized; static scan_fun_ptr s_scan_table[128 + 1]; - QCString m_contents; + TQCString m_contents; int m_ptr; // Cached 'm_contents.length()' int m_length; - QMemArray<int> m_lines; + TQMemArray<int> m_lines; int m_line; - QMemArray<Token> m_tokens; + TQMemArray<Token> m_tokens; int m_tokensCount; int m_cursor; diff --git a/languages/cpp/debugger/mi/miparser.cpp b/languages/cpp/debugger/mi/miparser.cpp index 252c4e1b..fdd16137 100644 --- a/languages/cpp/debugger/mi/miparser.cpp +++ b/languages/cpp/debugger/mi/miparser.cpp @@ -125,7 +125,7 @@ bool MIParser::parseResultRecord(Record *&record) lex->nextToken(); MATCH(Token_identifier); - QString reason = lex->currentTokenText(); + TQString reason = lex->currentTokenText(); lex->nextToken(); std::auto_ptr<ResultRecord> res(new ResultRecord); @@ -148,7 +148,7 @@ bool MIParser::parseResultRecord(Record *&record) bool MIParser::parseResult(Result *&result) { MATCH(Token_identifier); - QString variable = lex->currentTokenText(); + TQString variable = lex->currentTokenText(); lex->nextToken(); std::auto_ptr<Result> res(new Result); @@ -289,12 +289,12 @@ bool MIParser::parseCSV(GDBMI::TupleValue& value, } -QString MIParser::parseStringLiteral() +TQString MIParser::parseStringLiteral() { - QCString message = lex->currentTokenText(); + TQCString message = lex->currentTokenText(); unsigned int length = message.length(); - QString message2; + TQString message2; message2.setLength(length); // The [1,length-1] range removes quotes without extra // call to 'mid' diff --git a/languages/cpp/debugger/mi/miparser.h b/languages/cpp/debugger/mi/miparser.h index b11ba504..9bea70b2 100644 --- a/languages/cpp/debugger/mi/miparser.h +++ b/languages/cpp/debugger/mi/miparser.h @@ -23,8 +23,8 @@ #include "milexer.h" #include "gdbmi.h" -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> /** @author Roberto Raggi @@ -70,7 +70,7 @@ protected: // rules in the string. @pre lex->lookAhead(0) == Token_string_literal */ - QString parseStringLiteral(); + TQString parseStringLiteral(); diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index f0bc2627..cdf4c81e 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -59,10 +59,10 @@ #include <bsdtty.h> #endif -#include <qintdict.h> -#include <qsocketnotifier.h> -#include <qstring.h> -#include <qfile.h> +#include <tqintdict.h> +#include <tqsocketnotifier.h> +#include <tqstring.h> +#include <tqfile.h> #include <klocale.h> #include <kstandarddirs.h> @@ -92,8 +92,8 @@ static int chownpty(int fd, int grant) if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ::exit(1); - QString path = locate("exe", BASE_CHOWN); - execle(QFile::encodeName(path), BASE_CHOWN, grant?"--grant":"--revoke", (void *)0, NULL); + TQString path = locate("exe", BASE_CHOWN); + execle(TQFile::encodeName(path), BASE_CHOWN, grant?"--grant":"--revoke", (void *)0, NULL); ::exit(1); // should not be reached } if (pid > 0) { @@ -118,8 +118,8 @@ static int chownpty(int fd, int grant) // ************************************************************************** -STTY::STTY(bool ext, const QString &termAppName) - : QObject(), +STTY::STTY(bool ext, const TQString &termAppName) + : TQObject(), out(0), ttySlave(""), pid_(0), @@ -130,9 +130,9 @@ STTY::STTY(bool ext, const QString &termAppName) } else { fout = findTTY(); if (fout >= 0) { - ttySlave = QString(tty_slave); - out = new QSocketNotifier(fout, QSocketNotifier::Read, this); - connect( out, SIGNAL(activated(int)), this, SLOT(OutReceived(int)) ); + ttySlave = TQString(tty_slave); + out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); + connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); } } } @@ -281,9 +281,9 @@ void STTY::readRemaining() #define FIFO_FILE "/tmp/debug_tty.XXXXXX" -bool STTY::findExternalTTY(const QString &termApp) +bool STTY::findExternalTTY(const TQString &termApp) { - QString appName(termApp.isEmpty() ? QString("xterm") : termApp); + TQString appName(termApp.isEmpty() ? TQString("xterm") : termApp); if ( KStandardDirs::findExe( termApp ).isEmpty() ) { @@ -319,8 +319,8 @@ bool STTY::findExternalTTY(const QString &termApp) */ const char* prog = appName.latin1(); - QString script = QString("tty>") + QString(fifo) + - QString(";" // fifo name + TQString script = TQString("tty>") + TQString(fifo) + + TQString(";" // fifo name "trap \"\" INT QUIT TSTP;" // ignore various signals "exec<&-;exec>&-;" // close stdin and stdout "while :;do sleep 3600;done"); diff --git a/languages/cpp/debugger/stty.h b/languages/cpp/debugger/stty.h index 639e8417..7c026251 100644 --- a/languages/cpp/debugger/stty.h +++ b/languages/cpp/debugger/stty.h @@ -27,8 +27,8 @@ class QSocketNotifier; -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> namespace GDBDebugger { @@ -38,10 +38,10 @@ class STTY : public QObject Q_OBJECT public: - STTY(bool ext=false, const QString &termAppName=QString()); + STTY(bool ext=false, const TQString &termAppName=TQString()); ~STTY(); - QString getSlave() { return ttySlave; }; + TQString getSlave() { return ttySlave; }; void readRemaining(); private slots: @@ -53,13 +53,13 @@ signals: private: int findTTY(); - bool findExternalTTY(const QString &termApp); + bool findExternalTTY(const TQString &termApp); private: int fout; int ferr; - QSocketNotifier *out; - QString ttySlave; + TQSocketNotifier *out; + TQString ttySlave; int pid_; bool external_; diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.cpp b/languages/cpp/debugger/tests/print_pointers/print_pointers.cpp index 09053b51..cc03679f 100644 --- a/languages/cpp/debugger/tests/print_pointers/print_pointers.cpp +++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.cpp @@ -1,5 +1,5 @@ -#include <qstring.h> +#include <tqstring.h> #include <vector> struct B { int i; int j; static int k; }; @@ -17,7 +17,7 @@ void func2() printf("func2\n"); } -void func(QString& xs) +void func(TQString& xs) { int ac = 10; std::string s; @@ -30,7 +30,7 @@ void func(QString& xs) class Test { public: - QString n; + TQString n; int b; }; @@ -67,9 +67,9 @@ int test_main(int ac, char* av[]) wchar_t* p15 = L"test1"; - QString s = "test test test test"; - QString* sp = &s; - const QString& sr = s; + TQString s = "test test test test"; + TQString* sp = &s; + const TQString& sr = s; func(s); i = 15; diff --git a/languages/cpp/debugger/tests/two_module/src/foo.cpp b/languages/cpp/debugger/tests/two_module/src/foo.cpp index b66f9924..f0e30f15 100644 --- a/languages/cpp/debugger/tests/two_module/src/foo.cpp +++ b/languages/cpp/debugger/tests/two_module/src/foo.cpp @@ -1,10 +1,10 @@ #include <stdio.h> -#include <qstring.h> +#include <tqstring.h> void foo(int a) { - QString s = "foo"; + TQString s = "foo"; int i = 10; int i2 = 12; int i3 = i + i2; diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 263afdf9..163c2024 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -24,19 +24,19 @@ #include <kdeversion.h> #include <kiconloader.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qhbox.h> -#include <qpainter.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qcursor.h> -#include <qwhatsthis.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqpainter.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqcursor.h> +#include <tqwhatsthis.h> #include <klocale.h> -#include <qpoint.h> -#include <qclipboard.h> +#include <tqpoint.h> +#include <tqclipboard.h> #include <kapplication.h> #include <kmessagebox.h> @@ -77,8 +77,8 @@ namespace GDBDebugger VariableWidget::VariableWidget(GDBController* controller, GDBBreakpointWidget* breakpointWidget, - QWidget *parent, const char *name) -: QWidget(parent, name) + TQWidget *parent, const char *name) +: TQWidget(parent, name) { setIcon(SmallIcon("math_brace")); setCaption(i18n("Variable Tree")); @@ -88,35 +88,35 @@ VariableWidget::VariableWidget(GDBController* controller, watchVarEditor_ = new KHistoryCombo( this, "var-to-watch editor"); - QHBoxLayout* buttons = new QHBoxLayout(); + TQHBoxLayout* buttons = new TQHBoxLayout(); buttons->addStretch(); - QPushButton *evalButton = new QPushButton(i18n("&Evaluate"), this ); + TQPushButton *evalButton = new TQPushButton(i18n("&Evaluate"), this ); buttons->addWidget(evalButton); - QPushButton *addButton = new QPushButton(i18n("&Watch"), this ); + TQPushButton *addButton = new TQPushButton(i18n("&Watch"), this ); buttons->addWidget(addButton); - QVBoxLayout *topLayout = new QVBoxLayout(this, 2); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 2); topLayout->addWidget(varTree_, 10); topLayout->addWidget(watchVarEditor_); topLayout->addItem(buttons); - connect( addButton, SIGNAL(clicked()), SLOT(slotAddWatchVariable()) ); - connect( evalButton, SIGNAL(clicked()), SLOT(slotEvaluateExpression()) ); + connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchVariable()) ); + connect( evalButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEvaluateExpression()) ); - connect( watchVarEditor_, SIGNAL(returnPressed()), - SLOT(slotEvaluateExpression()) ); + connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), + TQT_SLOT(slotEvaluateExpression()) ); - connect(controller, SIGNAL(event(GDBController::event_t)), - varTree_, SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQT_SIGNAL(event(GDBController::event_t)), + varTree_, TQT_SLOT(slotEvent(GDBController::event_t))); // Setup help items. - QWhatsThis::add(this, i18n( + TQWhatsThis::add(this, i18n( "<b>Variable tree</b><p>" "The variable tree allows you to see the values of local " "variables and arbitrary expressions." @@ -130,22 +130,22 @@ VariableWidget::VariableWidget(GDBController* controller, "<p>To change the value of a variable or an expression, " "click on the value.")); - QWhatsThis::add(watchVarEditor_, + TQWhatsThis::add(watchVarEditor_, i18n("<b>Expression entry</b>" "<p>Type in expression to evaluate.")); - QWhatsThis::add(evalButton, + TQWhatsThis::add(evalButton, i18n("Evaluate the expression.")); - QWhatsThis::add(addButton, + TQWhatsThis::add(addButton, i18n("Evaluate the expression and " "auto-update the value when stepping.")); } void VariableWidget::slotAddWatchVariable() { -// QString watchVar(watchVarEntry_->text()); - QString watchVar(watchVarEditor_->currentText()); +// TQString watchVar(watchVarEntry_->text()); + TQString watchVar(watchVarEditor_->currentText()); if (!watchVar.isEmpty()) { slotAddWatchVariable(watchVar); @@ -154,7 +154,7 @@ void VariableWidget::slotAddWatchVariable() // ************************************************************************** -void VariableWidget::slotAddWatchVariable(const QString &ident) +void VariableWidget::slotAddWatchVariable(const TQString &ident) { if (!ident.isEmpty()) { @@ -166,14 +166,14 @@ void VariableWidget::slotAddWatchVariable(const QString &ident) void VariableWidget::slotEvaluateExpression() { - QString exp(watchVarEditor_->currentText()); + TQString exp(watchVarEditor_->currentText()); if (!exp.isEmpty()) { slotEvaluateExpression(exp); } } -void VariableWidget::slotEvaluateExpression(const QString &ident) +void VariableWidget::slotEvaluateExpression(const TQString &ident) { if (!ident.isEmpty()) { @@ -185,7 +185,7 @@ void VariableWidget::slotEvaluateExpression(const QString &ident) // ************************************************************************** -void VariableWidget::focusInEvent(QFocusEvent */*e*/) +void VariableWidget::focusInEvent(TQFocusEvent */*e*/) { varTree_->setFocus(); } @@ -202,7 +202,7 @@ VariableTree::VariableTree(VariableWidget *parent, GDBBreakpointWidget* breakpointWidget, const char *name) : KListView(parent, name), - QToolTip( viewport() ), + TQToolTip( viewport() ), controller_(controller), breakpointWidget_(breakpointWidget), activeFlag_(0), @@ -213,7 +213,7 @@ VariableTree::VariableTree(VariableWidget *parent, setRootIsDecorated(true); setAllColumnsShowFocus(true); setSorting(-1); - QListView::setSelectionMode(QListView::Single); + TQListView::setSelectionMode(TQListView::Single); // Note: it might be reasonable to set width of value // column to 10 characters ('0x12345678'), and rely on @@ -223,10 +223,10 @@ VariableTree::VariableTree(VariableWidget *parent, addColumn(i18n("Value")); // setResizeMode(AllColumns); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - SLOT(slotContextMenu(KListView*, QListViewItem*)) ); - connect( this, SIGNAL(itemRenamed( QListViewItem*, int, const QString&)), - this, SLOT(slotItemRenamed( QListViewItem*, int, const QString&))); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), + this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); } // ************************************************************************** @@ -237,7 +237,7 @@ VariableTree::~VariableTree() // ************************************************************************** -void VariableTree::slotContextMenu(KListView *, QListViewItem *item) +void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (!item) return; @@ -293,7 +293,7 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) } - QListViewItem* root = findRoot(item); + TQListViewItem* root = findRoot(item); if (root != recentExpressions_) { @@ -337,14 +337,14 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) if (var && var->isAlive() && !controller()->stateIsOn(s_dbgNotStarted)) controller_->addCommand( new GDBCommand( - QString("-data-evaluate-expression &%1") + TQString("-data-evaluate-expression &%1") .arg(var->gdbExpression()), this, &VariableTree::handleAddressComputed, true /*handles error*/)); - int res = popup.exec(QCursor::pos()); + int res = popup.exec(TQCursor::pos()); activePopup_ = 0; @@ -401,7 +401,7 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) SmallIcon("reload"), i18n("Reevaluate All")); if (controller()->stateIsOn(s_dbgNotStarted)) popup.setItemEnabled(idReevaluate, false); - int res = popup.exec(QCursor::pos()); + int res = popup.exec(TQCursor::pos()); if (res == idRemove) { @@ -410,7 +410,7 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) } else if (res == idReevaluate) { - for(QListViewItem* child = recentExpressions_->firstChild(); + for(TQListViewItem* child = recentExpressions_->firstChild(); child; child = child->nextSibling()) { static_cast<VarItem*>(child)->recreate(); @@ -427,10 +427,10 @@ void VariableTree::slotEvent(GDBController::event_t event) case GDBController::debugger_exited: { // Remove all locals. - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); while (child) { - QListViewItem *nextChild = child->nextSibling(); + TQListViewItem *nextChild = child->nextSibling(); // don't remove the watch root, or 'recent expressions' root. if (!(dynamic_cast<WatchRoot*> (child)) @@ -444,7 +444,7 @@ void VariableTree::slotEvent(GDBController::event_t event) if (recentExpressions_) { - for(QListViewItem* child = recentExpressions_->firstChild(); + for(TQListViewItem* child = recentExpressions_->firstChild(); child; child = child->nextSibling()) { static_cast<VarItem*>(child)->unhookFromGdb(); @@ -453,7 +453,7 @@ void VariableTree::slotEvent(GDBController::event_t event) if (WatchRoot* w = findWatch()) { - for(QListViewItem* child = w->firstChild(); + for(TQListViewItem* child = w->firstChild(); child; child = child->nextSibling()) { static_cast<VarItem*>(child)->unhookFromGdb(); @@ -504,7 +504,7 @@ void VariableTree::updateCurrentFrame() // We'll fetch values separately: controller_->addCommand( - new GDBCommand(QString("-stack-list-arguments 0 %1 %2") + new GDBCommand(TQString("-stack-list-arguments 0 %1 %2") .arg(controller_->currentFrame()) .arg(controller_->currentFrame()) .ascii(), @@ -522,13 +522,13 @@ void VariableTree::updateCurrentFrame() // ************************************************************************** -void VariableTree::slotAddWatchVariable(const QString &watchVar) +void VariableTree::slotAddWatchVariable(const TQString &watchVar) { VarItem *varItem = 0; varItem = new VarItem(findWatch(), watchVar); } -void VariableTree::slotEvaluateExpression(const QString &expression) +void VariableTree::slotEvaluateExpression(const TQString &expression) { if (recentExpressions_ == 0) { @@ -545,7 +545,7 @@ void VariableTree::slotEvaluateExpression(const QString &expression) // ************************************************************************** -QListViewItem *VariableTree::findRoot(QListViewItem *item) const +TQListViewItem *VariableTree::findRoot(TQListViewItem *item) const { while (item->parent()) item = item->parent(); @@ -557,7 +557,7 @@ QListViewItem *VariableTree::findRoot(QListViewItem *item) const VarFrameRoot *VariableTree::findFrame(int frameNo, int threadNo) const { - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); // frames only exist on th top level so we only need to // check the siblings @@ -576,7 +576,7 @@ VarFrameRoot *VariableTree::findFrame(int frameNo, int threadNo) const WatchRoot *VariableTree::findWatch() { - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); while (sibling) { if (WatchRoot *watch = dynamic_cast<WatchRoot*> (sibling)) @@ -590,11 +590,11 @@ WatchRoot *VariableTree::findWatch() // ************************************************************************** -QListViewItem *VariableTree::lastChild() const +TQListViewItem *VariableTree::lastChild() const { - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); if (child) - while (QListViewItem *nextChild = child->nextSibling()) + while (TQListViewItem *nextChild = child->nextSibling()) child = nextChild; return child; @@ -602,21 +602,21 @@ QListViewItem *VariableTree::lastChild() const // ************************************************************************** -void VariableTree::maybeTip(const QPoint &p) +void VariableTree::maybeTip(const TQPoint &p) { VarItem * item = dynamic_cast<VarItem*>( itemAt( p ) ); if ( item ) { - QRect r = itemRect( item ); + TQRect r = itemRect( item ); if ( r.isValid() ) tip( r, item->tipText() ); } } -class ValueSpecialRepresentationCommand : public QObject, public CliCommand +class ValueSpecialRepresentationCommand : public TQObject, public CliCommand { public: - ValueSpecialRepresentationCommand(VarItem* item, const QString& command) + ValueSpecialRepresentationCommand(VarItem* item, const TQString& command) : CliCommand(command.ascii(), this, &ValueSpecialRepresentationCommand::handleReply, @@ -628,9 +628,9 @@ private: VarItem* item_; - void handleReply(const QValueVector<QString>& lines) + void handleReply(const TQValueVector<TQString>& lines) { - QString s; + TQString s; for(unsigned i = 1; i < lines.count(); ++i) s += lines[i]; item_->updateSpecialRepresentation(s.local8Bit()); @@ -638,7 +638,7 @@ private: }; void VariableTree::slotVarobjNameChanged( - const QString& from, const QString& to) + const TQString& from, const TQString& to) { if (!from.isEmpty()) varobj2varitem.erase(from); @@ -686,7 +686,7 @@ void VariableTree::localsReady(const GDBMI::ResultRecord& r) for(unsigned i = 0; i < locals.size(); ++i) { - QString val = locals[i].literal(); + TQString val = locals[i].literal(); // Check ada internal variables like <R45b>, <L23R> ... bool is_ada_variable = (val[0] == '<' && val[val.length() - 1] == '>'); @@ -702,19 +702,19 @@ void VariableTree::localsReady(const GDBMI::ResultRecord& r) &VariableTree::frameIdReady)); } -void VariableTree::frameIdReady(const QValueVector<QString>& lines) +void VariableTree::frameIdReady(const TQValueVector<TQString>& lines) { //kdDebug(9012) << "localAddresses: " << lines[1] << "\n"; - QString frame_info; + TQString frame_info; for(unsigned i = 1; i < lines.size(); ++i) frame_info += lines[i]; kdDebug(9012) << "frame info: " << frame_info << "\n"; frame_info.replace('\n', ""); - static QRegExp frame_base_rx("frame at 0x([0-9a-fA-F]*)"); - static QRegExp frame_code_rx("saved [a-zA-Z0-9]* 0x([0-9a-fA-F]*)"); + static TQRegExp frame_base_rx("frame at 0x([0-9a-fA-F]*)"); + static TQRegExp frame_code_rx("saved [a-zA-Z0-9]* 0x([0-9a-fA-F]*)"); int i = frame_base_rx.search(frame_info); int i2 = frame_code_rx.search(frame_info); @@ -741,12 +741,12 @@ void VariableTree::frameIdReady(const QValueVector<QString>& lines) frame_base_rx.cap(1).toULongLong(0, 16); unsigned long long new_code_address = frame_code_rx.cap(1).toULongLong(0, 16); - kdDebug(9012) << "Frame base = " << QString::number(new_frame_base, 16) - << " code = " << QString::number(new_code_address, 16) + kdDebug(9012) << "Frame base = " << TQString::number(new_frame_base, 16) + << " code = " << TQString::number(new_code_address, 16) << "\n"; kdDebug(9012) << "Previous frame " << - QString::number(frame->currentFrameBase, 16) - << " code = " << QString::number( + TQString::number(frame->currentFrameBase, 16) + << " code = " << TQString::number( frame->currentFrameCodeAddress, 16) << "\n"; @@ -770,8 +770,8 @@ void VariableTree::frameIdReady(const QValueVector<QString>& lines) { // Remove all variables. // FIXME: probably, need to do this in all frames. - QListViewItem* child = frame->firstChild(); - QListViewItem* next; + TQListViewItem* child = frame->firstChild(); + TQListViewItem* next; for(; child; child = next) { next = child->nextSibling(); @@ -781,15 +781,15 @@ void VariableTree::frameIdReady(const QValueVector<QString>& lines) setUpdatesEnabled(false); - std::set<QListViewItem*> alive; + std::set<TQListViewItem*> alive; for(unsigned i = 0; i < locals_and_arguments.size(); ++i) { - QString name = locals_and_arguments[i]; + TQString name = locals_and_arguments[i]; // See if we've got VarItem for this one already. VarItem* var = 0; - for(QListViewItem *child = frame->firstChild(); + for(TQListViewItem *child = frame->firstChild(); child; child = child->nextSibling()) { @@ -811,9 +811,9 @@ void VariableTree::frameIdReady(const QValueVector<QString>& lines) // Remove VarItems that don't correspond to any local // variables any longer. Perform type/address updates // for others. - for(QListViewItem* child = frame->firstChild(); child;) + for(TQListViewItem* child = frame->firstChild(); child;) { - QListViewItem* current = child; + TQListViewItem* current = child; child = current->nextSibling(); if (!alive.count(current)) delete current; @@ -821,7 +821,7 @@ void VariableTree::frameIdReady(const QValueVector<QString>& lines) static_cast<VarItem*>(current)->recreateLocallyMaybe(); } - for(QListViewItem* child = findWatch()->firstChild(); + for(TQListViewItem* child = findWatch()->firstChild(); child; child = child->nextSibling()) { VarItem* var = static_cast<VarItem*>(child); @@ -848,20 +848,20 @@ void VariableTree::handleVarUpdate(const GDBMI::ResultRecord& r) { const GDBMI::Value& changed = r["changelist"]; - std::set<QString> names_to_update; + std::set<TQString> names_to_update; for(unsigned i = 0; i < changed.size(); ++i) { const GDBMI::Value& c = changed[i]; - QString name = c["name"].literal(); + TQString name = c["name"].literal(); if (c.hasField("in_scope") && c["in_scope"].literal() == "false") continue; names_to_update.insert(name); } - QMap<QString, VarItem*>::iterator i, e; + TQMap<TQString, VarItem*>::iterator i, e; for (i = varobj2varitem.begin(), e = varobj2varitem.end(); i != e; ++i) { if (names_to_update.count(i.key()) @@ -872,16 +872,16 @@ void VariableTree::handleVarUpdate(const GDBMI::ResultRecord& r) } } -void VarItem::handleCliPrint(const QValueVector<QString>& lines) +void VarItem::handleCliPrint(const TQValueVector<TQString>& lines) { - static QRegExp r("(\\$[0-9]+)"); + static TQRegExp r("(\\$[0-9]+)"); if (lines.size() >= 2) { int i = r.search(lines[1]); if (i == 0) { controller_->addCommand( - new GDBCommand(QString("-var-create %1 * \"%2\"") + new GDBCommand(TQString("-var-create %1 * \"%2\"") .arg(varobjName_) .arg(r.cap(1)), this, @@ -907,7 +907,7 @@ void VarItem::handleCliPrint(const QValueVector<QString>& lines) void VariableTree::variablesFetchDone() { // During parsing of fetched variable values, we might have issued - // extra command to handle 'special values', like QString. + // extra command to handle 'special values', like TQString. // We don't want to enable updates just yet, because this will cause // flicker, so add a sentinel command just to enable updates. // @@ -941,7 +941,7 @@ void VariableTree::fetchSpecialValuesDone() } void -VariableTree::slotItemRenamed(QListViewItem* item, int col, const QString& text) +VariableTree::slotItemRenamed(TQListViewItem* item, int col, const TQString& text) { if (col == ValueCol) { @@ -955,11 +955,11 @@ VariableTree::slotItemRenamed(QListViewItem* item, int col, const QString& text) } -void VariableTree::keyPressEvent(QKeyEvent* e) +void VariableTree::keyPressEvent(TQKeyEvent* e) { if (VarItem* item = dynamic_cast<VarItem*>(currentItem())) { - QString text = e->text(); + TQString text = e->text(); if (text == "n" || text == "x" || text == "d" || text == "c" || text == "t") @@ -970,7 +970,7 @@ void VariableTree::keyPressEvent(QKeyEvent* e) if (e->key() == Qt::Key_Delete) { - QListViewItem* root = findRoot(item); + TQListViewItem* root = findRoot(item); if (dynamic_cast<WatchRoot*>(root) || root == recentExpressions_) { @@ -986,10 +986,10 @@ void VariableTree::keyPressEvent(QKeyEvent* e) } -void VariableTree::copyToClipboard(QListViewItem* item) +void VariableTree::copyToClipboard(TQListViewItem* item) { QClipboard *qb = KApplication::clipboard(); - QString text = item->text( 1 ); + TQString text = item->text( 1 ); qb->setText( text, QClipboard::Clipboard ); } @@ -1038,7 +1038,7 @@ TrimmableItem::~TrimmableItem() // ************************************************************************** -void TrimmableItem::paintCell(QPainter *p, const QColorGroup &cg, +void TrimmableItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if ( !p ) @@ -1046,18 +1046,18 @@ void TrimmableItem::paintCell(QPainter *p, const QColorGroup &cg, // make toplevel item (watch and frame items) names bold if (column == 0 && !parent()) { - QFont f = p->font(); + TQFont f = p->font(); f.setBold(true); p->setFont(f); } - QListViewItem::paintCell( p, cg, column, width, align ); + TQListViewItem::paintCell( p, cg, column, width, align ); } -QListViewItem *TrimmableItem::lastChild() const +TQListViewItem *TrimmableItem::lastChild() const { - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); if (child) - while (QListViewItem *nextChild = child->nextSibling()) + while (TQListViewItem *nextChild = child->nextSibling()) child = nextChild; return child; @@ -1070,7 +1070,7 @@ QListViewItem *TrimmableItem::lastChild() const int VarItem::varobjIndex = 0; VarItem::VarItem(TrimmableItem *parent, - const QString& expression, + const TQString& expression, bool frozen) : TrimmableItem (parent), expression_(expression), @@ -1085,9 +1085,9 @@ VarItem::VarItem(TrimmableItem *parent, baseClassMember_(false), alive_(true) { - connect(this, SIGNAL(varobjNameChange(const QString&, const QString&)), + connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - SLOT(slotVarobjNameChanged(const QString&, const QString&))); + TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); // User might have entered format together with expression: like @@ -1098,7 +1098,7 @@ VarItem::VarItem(TrimmableItem *parent, // - detect initial value of format_ // - remove the format specifier from the string. - static QRegExp explicit_format("^\\s*/(.)\\s*(.*)"); + static TQRegExp explicit_format("^\\s*/(.)\\s*(.*)"); if (explicit_format.search(expression_) == 0) { format_ = formatFromGdbModifier(explicit_format.cap(1)[0].latin1()); @@ -1130,9 +1130,9 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, baseClassMember_(baseClassMember), alive_(true) { - connect(this, SIGNAL(varobjNameChange(const QString&, const QString&)), + connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - SLOT(slotVarobjNameChanged(const QString&, const QString&))); + TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); expression_ = varobj["exp"].literal(); varobjName_ = varobj["name"].literal(); @@ -1158,8 +1158,8 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, void VarItem::createVarobj() { - QString old = varobjName_; - varobjName_ = QString("KDEV%1").arg(varobjIndex++); + TQString old = varobjName_; + varobjName_ = TQString("KDEV%1").arg(varobjIndex++); emit varobjNameChange(old, varobjName_); if (frozen_) @@ -1169,7 +1169,7 @@ void VarItem::createVarobj() // variable and we create variable object from that. controller_->addCommand( new CliCommand( - QString("print %1").arg(expression_), + TQString("print %1").arg(expression_), this, &VarItem::handleCliPrint)); } @@ -1177,7 +1177,7 @@ void VarItem::createVarobj() { controller_->addCommand( new CliCommand( - QString("print /x &%1").arg(expression_), + TQString("print /x &%1").arg(expression_), this, &VarItem::handleCurrentAddress, true)); @@ -1185,7 +1185,7 @@ void VarItem::createVarobj() controller_->addCommand( // Need to quote expression, otherwise gdb won't like // spaces inside it. - new GDBCommand(QString("-var-create %1 * \"%2\"") + new GDBCommand(TQString("-var-create %1 * \"%2\"") .arg(varobjName_) .arg(expression_), this, @@ -1205,15 +1205,15 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r) } setAliveRecursively(true); - QString oldType = originalValueType_; + TQString oldType = originalValueType_; originalValueType_ = r["type"].literal(); if (!oldType.isEmpty() && oldType != originalValueType_) { // Type changed, the children might be no longer valid, // so delete them. - for(QListViewItem* child = firstChild(); child; ) + for(TQListViewItem* child = firstChild(); child; ) { - QListViewItem* cur = child; + TQListViewItem* cur = child; child = child->nextSibling(); delete cur; } @@ -1228,7 +1228,7 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r) setVarobjName(varobjName_); } -void VarItem::setVarobjName(const QString& name) +void VarItem::setVarobjName(const TQString& name) { if (varobjName_ != name) emit varobjNameChange(varobjName_, name); @@ -1238,7 +1238,7 @@ void VarItem::setVarobjName(const QString& name) if (format_ != natural) { controller_->addCommand( - new GDBCommand(QString("-var-set-format \"%1\" %2") + new GDBCommand(TQString("-var-set-format \"%1\" %2") .arg(varobjName_).arg(varobjFormatName()))); } @@ -1256,12 +1256,12 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r) { if (r.reason == "done") { - QString s = GDBParser::getGDBParser()->undecorateValue( + TQString s = GDBParser::getGDBParser()->undecorateValue( r["value"].literal()); if (format_ == character) { - QString encoded = s; + TQString encoded = s; bool ok; int value = s.toInt(&ok); if (ok) @@ -1292,11 +1292,11 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r) if (format_ == binary) { // For binary format, split the value at 4-bit boundaries - static QRegExp r("^[01]+$"); + static TQRegExp r("^[01]+$"); int i = r.search(s); if (i == 0) { - QString split; + TQString split; for(unsigned i = 0; i < s.length(); ++i) { // For string 11111, we should split it as @@ -1317,7 +1317,7 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r) } else { - QString s = r["msg"].literal(); + TQString s = r["msg"].literal(); // Error response. if (s.startsWith("Cannot access memory")) { @@ -1344,7 +1344,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, bool structureType = false; if (!children_of_fake && children.size() > 0) { - QString exp = children[0]["exp"].literal(); + TQString exp = children[0]["exp"].literal(); bool ok = false; exp.toInt(&ok); if (!ok || exp[0] != '*') @@ -1355,12 +1355,12 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, for (unsigned i = 0; i < children.size(); ++i) { - QString exp = children[i]["exp"].literal(); + TQString exp = children[i]["exp"].literal(); // For artificial accessibility nodes, // fetch their children. if (exp == "public" || exp == "protected" || exp == "private") { - QString name = children[i]["name"].literal(); + TQString name = children[i]["name"].literal(); controller_->addCommand(new GDBCommand( "-var-list-children \"" + name + "\"", @@ -1374,7 +1374,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, bool baseObject = structureType; VarItem* existing = 0; - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { VarItem* v = static_cast<VarItem*>(child); @@ -1414,12 +1414,12 @@ void VarItem::childrenOfFakesDone(const GDBMI::ResultRecord& r) createChildren(r, true); } -void VarItem::handleCurrentAddress(const QValueVector<QString>& lines) +void VarItem::handleCurrentAddress(const TQValueVector<TQString>& lines) { lastObtainedAddress_ = ""; if (lines.count() > 1) { - static QRegExp r("\\$\\d+ = ([^\n]*)"); + static TQRegExp r("\\$\\d+ = ([^\n]*)"); int i = r.search(lines[1]); if (i == 0) { @@ -1429,7 +1429,7 @@ void VarItem::handleCurrentAddress(const QValueVector<QString>& lines) } } -void VarItem::handleType(const QValueVector<QString>& lines) +void VarItem::handleType(const TQValueVector<TQString>& lines) { bool recreate = false; @@ -1444,7 +1444,7 @@ void VarItem::handleType(const QValueVector<QString>& lines) // FIXME: add error diagnostic. if (lines.count() > 1) { - static QRegExp r("type = ([^\n]*)"); + static TQRegExp r("type = ([^\n]*)"); int i = r.search(lines[1]); if (i == 0) { @@ -1464,7 +1464,7 @@ void VarItem::handleType(const QValueVector<QString>& lines) } } -QString VarItem::displayName() const +TQString VarItem::displayName() const { if (expression_[0] != '*') return expression_; @@ -1485,7 +1485,7 @@ void VarItem::setAliveRecursively(bool enable) setEnabled(enable); alive_ = true; - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { static_cast<VarItem*>(child)->setAliveRecursively(enable); @@ -1498,7 +1498,7 @@ VarItem::~VarItem() unhookFromGdb(); } -QString VarItem::gdbExpression() const +TQString VarItem::gdbExpression() const { // The expression for this item can be either: // - number, for array element @@ -1550,26 +1550,26 @@ QString VarItem::gdbExpression() const // FIXME: we have two method to set VarItem: this one // and updateValue below. That's bad, must have just one. -void VarItem::setText(int column, const QString &data) +void VarItem::setText(int column, const TQString &data) { - QString strData=data; + TQString strData=data; if (column == ValueCol) { - QString oldValue(text(column)); + TQString oldValue(text(column)); if (!oldValue.isEmpty()) // Don't highlight new items { - highlight_ = (oldValue != QString(data)); + highlight_ = (oldValue != TQString(data)); } } - QListViewItem::setText(column, strData); + TQListViewItem::setText(column, strData); } void VarItem::clearHighlight() { highlight_ = false; - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { static_cast<VarItem*>(child)->clearHighlight(); @@ -1600,10 +1600,10 @@ void VarItem::updateValue() true /* handle error */)); } -void VarItem::setValue(const QString& new_value) +void VarItem::setValue(const TQString& new_value) { controller_->addCommand( - new GDBCommand(QString("-var-assign \"%1\" %2").arg(varobjName_) + new GDBCommand(TQString("-var-assign \"%1\" %2").arg(varobjName_) .arg(new_value))); // And immediately reload it from gdb, @@ -1614,9 +1614,9 @@ void VarItem::setValue(const QString& new_value) updateValue(); } -void VarItem::updateSpecialRepresentation(const QString& xs) +void VarItem::updateSpecialRepresentation(const TQString& xs) { - QString s(xs); + TQString s(xs); if (s[0] == '$') { int i = s.find('='); @@ -1624,7 +1624,7 @@ void VarItem::updateSpecialRepresentation(const QString& xs) s = s.mid(i+2); } - // A hack to nicely display QStrings. The content of QString is unicode + // A hack to nicely display QStrings. The content of TQString is unicode // for for ASCII only strings we get ascii character mixed with \000. // Remove those \000 now. @@ -1634,11 +1634,11 @@ void VarItem::updateSpecialRepresentation(const QString& xs) // the data sent by gdb might contain \000 that should not be translated. // // What's even worse, ideally we should convert the string data from - // gdb into a QString again, handling all other escapes and composing - // one QChar from two characters from gdb. But to do that, we *should* + // gdb into a TQString again, handling all other escapes and composing + // one TQChar from two characters from gdb. But to do that, we *should* // now if the data if generic gdb value, and result of request for string // data. Fixing is is for later. - s.replace( QRegExp("\\\\000|\\\\0"), "" ); + s.replace( TQRegExp("\\\\000|\\\\0"), "" ); // FIXME: for now, assume that all special representations are // just strings. @@ -1661,14 +1661,14 @@ void VarItem::recreateLocallyMaybe() { controller_->addCommand( new CliCommand( - QString("print /x &%1").arg(expression_), + TQString("print /x &%1").arg(expression_), this, &VarItem::handleCurrentAddress, true)); controller_->addCommand( new CliCommand( - QString("whatis %1").arg(expression_), + TQString("whatis %1").arg(expression_), this, &VarItem::handleType)); } @@ -1686,7 +1686,7 @@ void VarItem::recreate() void VarItem::setOpen(bool open) { - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); if (open && !childrenFetched_) { @@ -1703,7 +1703,7 @@ bool VarItem::handleSpecialTypes() if (originalValueType_.isEmpty()) return false; - static QRegExp qstring("^(const)?[ ]*QString[ ]*&?$"); + static TQRegExp qstring("^(const)?[ ]*QString[ ]*&?$"); if (qstring.exactMatch(originalValueType_)) { @@ -1711,22 +1711,22 @@ bool VarItem::handleSpecialTypes() if( !varTree->controller() ) return false; varTree->controller()->addCommand( - new ResultlessCommand(QString("print $kdev_d=%1.d") + new ResultlessCommand(TQString("print $kdev_d=%1.d") .arg(gdbExpression()), true /* ignore error */)); if (varTree->controller()->qtVersion() >= 4) varTree->controller()->addCommand( - new ResultlessCommand(QString("print $kdev_s=$kdev_d.size"), + new ResultlessCommand(TQString("print $kdev_s=$kdev_d.size"), true)); else varTree->controller()->addCommand( - new ResultlessCommand(QString("print $kdev_s=$kdev_d.len"), + new ResultlessCommand(TQString("print $kdev_s=$kdev_d.len"), true)); varTree->controller()->addCommand( new ResultlessCommand( - QString("print $kdev_s= ($kdev_s > 0)? ($kdev_s > 100 ? 200 : 2*$kdev_s) : 0"), + TQString("print $kdev_s= ($kdev_s > 0)? ($kdev_s > 100 ? 200 : 2*$kdev_s) : 0"), true)); if (varTree->controller()->qtVersion() >= 4) @@ -1765,7 +1765,7 @@ void VarItem::setFormat(format_t f) // - for arrays, that's clearly right // - for pointers, this can be confusing, but nobody ever wants to // see the pointer in decimal! - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { static_cast<VarItem*>(child)->setFormat(f); @@ -1774,7 +1774,7 @@ void VarItem::setFormat(format_t f) else { controller_->addCommand( - new GDBCommand(QString("-var-set-format \"%1\" %2") + new GDBCommand(TQString("-var-set-format \"%1\" %2") .arg(varobjName_).arg(varobjFormatName()))); updateValue(); @@ -1802,7 +1802,7 @@ VarItem::format_t VarItem::formatFromGdbModifier(char c) const return nf; } -QString VarItem::varobjFormatName() const +TQString VarItem::varobjFormatName() const { switch(format_) { @@ -1836,7 +1836,7 @@ QString VarItem::varobjFormatName() const // ************************************************************************** // Overridden to highlight the changed items -void VarItem::paintCell(QPainter *p, const QColorGroup &cg, +void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if ( !p ) @@ -1853,18 +1853,18 @@ void VarItem::paintCell(QPainter *p, const QColorGroup &cg, if (!alive_) { /* Draw this as disabled. */ - QListViewItem::paintCell(p, varTree()->QWidget::palette().disabled(), + TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(), column, width, align); } else { if (column == ValueCol && highlight_) { - QColorGroup hl_cg( cg.foreground(), cg.background(), cg.light(), + TQColorGroup hl_cg( cg.foreground(), cg.background(), cg.light(), cg.dark(), cg.mid(), red, cg.base()); - QListViewItem::paintCell( p, hl_cg, column, width, align ); + TQListViewItem::paintCell( p, hl_cg, column, width, align ); } else - QListViewItem::paintCell( p, cg, column, width, align ); + TQListViewItem::paintCell( p, cg, column, width, align ); } } @@ -1879,7 +1879,7 @@ void VarItem::unhookFromGdb() // Unhook children first, so that child varitems are deleted // before parent. Strictly speaking, we can avoid calling // -var-delete on child varitems, but that's a bit cheesy, - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { static_cast<VarItem*>(child)->unhookFromGdb(); @@ -1894,7 +1894,7 @@ void VarItem::unhookFromGdb() { controller_->addCommand( new GDBCommand( - QString("-var-delete \"%1\"").arg(varobjName_))); + TQString("-var-delete \"%1\"").arg(varobjName_))); } varobjName_ = ""; @@ -1902,10 +1902,10 @@ void VarItem::unhookFromGdb() // ************************************************************************** -QString VarItem::tipText() const +TQString VarItem::tipText() const { const unsigned int maxTooltipSize = 70; - QString tip = text( ValueCol ); + TQString tip = text( ValueCol ); if (tip.length() > maxTooltipSize) tip = tip.mid(0, maxTooltipSize - 1 ) + " [...]"; @@ -1951,7 +1951,7 @@ VarFrameRoot::~VarFrameRoot() void VarFrameRoot::setOpen(bool open) { bool frameOpened = ( isOpen()==false && open==true ); - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); if (frameOpened && needLocals_) { diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index 369f5748..5c77ea43 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -21,12 +21,12 @@ #include <klistview.h> #include <kcombobox.h> -#include <qwidget.h> -#include <qtooltip.h> -#include <qvaluevector.h> -#include <qdatetime.h> -#include <qguardedptr.h> -#include <qmap.h> +#include <tqwidget.h> +#include <tqtooltip.h> +#include <tqvaluevector.h> +#include <tqdatetime.h> +#include <tqguardedptr.h> +#include <tqmap.h> #include <vector> @@ -56,19 +56,19 @@ class VariableWidget : public QWidget public: VariableWidget( GDBController* controller, GDBBreakpointWidget* breakpointWidget, - QWidget *parent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); VariableTree *varTree() const { return varTree_; } -protected: // QWidget overrides - void focusInEvent(QFocusEvent *e); +protected: // TQWidget overrides + void focusInEvent(TQFocusEvent *e); public slots: void slotAddWatchVariable(); - void slotAddWatchVariable(const QString &ident); + void slotAddWatchVariable(const TQString &ident); void slotEvaluateExpression(); - void slotEvaluateExpression(const QString &ident); + void slotEvaluateExpression(const TQString &ident); private: VariableTree *varTree_; @@ -92,38 +92,38 @@ public: const char *name=0 ); virtual ~VariableTree(); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; - QListViewItem *findRoot(QListViewItem *item) const; + TQListViewItem *findRoot(TQListViewItem *item) const; VarFrameRoot *findFrame(int frameNo, int threadNo) const; WatchRoot *findWatch(); - // (from QToolTip) Display a tooltip when the cursor is over an item - virtual void maybeTip(const QPoint &); + // (from TQToolTip) Display a tooltip when the cursor is over an item + virtual void maybeTip(const TQPoint &); GDBController* controller() const { return controller_; } signals: - void toggleWatchpoint(const QString &varName); + void toggleWatchpoint(const TQString &varName); public slots: - void slotAddWatchVariable(const QString& watchVar); - void slotEvaluateExpression(const QString& expression); + void slotAddWatchVariable(const TQString& watchVar); + void slotEvaluateExpression(const TQString& expression); void slotEvent(GDBController::event_t); - void slotItemRenamed(QListViewItem* item, int col, const QString& text); + void slotItemRenamed(TQListViewItem* item, int col, const TQString& text); private slots: - void slotContextMenu(KListView *, QListViewItem *item); - void slotVarobjNameChanged(const QString& from, const QString& to); + void slotContextMenu(KListView *, TQListViewItem *item); + void slotVarobjNameChanged(const TQString& from, const TQString& to); private: // Callbacks for gdb commands; void argumentsReady(const GDBMI::ResultRecord&); void localsReady(const GDBMI::ResultRecord&); - void frameIdReady(const QValueVector<QString>&); + void frameIdReady(const TQValueVector<TQString>&); void handleVarUpdate(const GDBMI::ResultRecord&); - void handleEvaluateExpression(const QValueVector<QString>&); + void handleEvaluateExpression(const TQValueVector<TQString>&); void variablesFetchDone(); void fetchSpecialValuesDone(); @@ -148,10 +148,10 @@ private: // helper functions /** Copies the value (second column) of the specified item to the clipboard. */ - void copyToClipboard(QListViewItem*); + void copyToClipboard(TQListViewItem*); -private: // QWidget overrides - void keyPressEvent(QKeyEvent* e); +private: // TQWidget overrides + void keyPressEvent(TQKeyEvent* e); private: GDBController* controller_; @@ -165,12 +165,12 @@ private: TrimmableItem* recentExpressions_; VarFrameRoot* currentFrameItem; - QTime fetch_time; + TQTime fetch_time; // Names of locals and arguments as reported by // gdb. - std::vector<QString> locals_and_arguments; + std::vector<TQString> locals_and_arguments; - QMap<QString, VarItem*> varobj2varitem; + TQMap<TQString, VarItem*> varobj2varitem; KPopupMenu* activePopup_; static const int idToggleWatch = 10; @@ -210,11 +210,11 @@ public: virtual ~TrimmableItem(); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; protected: - void paintCell( QPainter *p, const QColorGroup &cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); }; @@ -222,7 +222,7 @@ protected: /***************************************************************************/ /***************************************************************************/ -class VarItem : public QObject, +class VarItem : public TQObject, public TrimmableItem { Q_OBJECT @@ -233,7 +233,7 @@ public: Optionally, alternative display name can be provided. */ VarItem( TrimmableItem *parent, - const QString& expression, + const TQString& expression, bool frozen = false); VarItem( TrimmableItem *parent, const GDBMI::Value& varobj, @@ -242,7 +242,7 @@ public: virtual ~VarItem(); /// Returns the gdb expression for *this. - QString gdbExpression() const; + TQString gdbExpression() const; /** Returns true is this VarItem should be unconditionally updated on each step, not matter what's the result of @@ -251,7 +251,7 @@ public: bool updateUnconditionally() const; void updateValue(); - void updateSpecialRepresentation(const QString& s); + void updateSpecialRepresentation(const TQString& s); /** Creates a fresh gdbs "variable object", if needed. Preconditions: @@ -273,7 +273,7 @@ public: void recreate(); void setOpen(bool open); - void setText (int column, const QString& text); + void setText (int column, const TQString& text); /** Mark the variable as alive, or not alive. Variables that are not alive a shown as "gray", @@ -290,7 +290,7 @@ public: void unhookFromGdb(); // Returns the text to be displayed as tooltip (the value) - QString tipText() const; + TQString tipText() const; format_t format() const; void setFormat(format_t f); @@ -302,7 +302,7 @@ public: /** Sets new top-level textual value of this variable. */ - void setValue(const QString& new_value); + void setValue(const TQString& new_value); bool isAlive() const; @@ -314,7 +314,7 @@ signals: Either 'from' or 'to' can be empty string. */ - void varobjNameChange(const QString& from, const QString& to); + void varobjNameChange(const TQString& from, const TQString& to); private: @@ -332,29 +332,29 @@ private: - gets initial value - if item is open, gets children. */ - void setVarobjName(const QString& name); + void setVarobjName(const TQString& name); /** Handle types that require special dispay, such as - QString. Return true if this is such a type. + TQString. Return true if this is such a type. The 'originalValueType_' is already initialized by the time this method is called. */ bool handleSpecialTypes(); - void paintCell( QPainter *p, const QColorGroup &cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); void varobjCreated(const GDBMI::ResultRecord& r); void valueDone(const GDBMI::ResultRecord& r); void childrenDone(const GDBMI::ResultRecord& r); void childrenOfFakesDone(const GDBMI::ResultRecord& r); - void handleCurrentAddress(const QValueVector<QString>& lines); - void handleType(const QValueVector<QString>& lines); + void handleCurrentAddress(const TQValueVector<TQString>& lines); + void handleType(const TQValueVector<TQString>& lines); void createChildren(const GDBMI::ResultRecord& r, bool children_of_fake); /** Called to handle the output of the cli print command. */ - void handleCliPrint(const QValueVector<QString>& lines); + void handleCliPrint(const TQValueVector<TQString>& lines); // Assuming 'expression_' is already set, returns the // displayName to use when showing this to the user. @@ -362,26 +362,26 @@ private: // gdb expression '$1' and displayName 'P4', we want the child // to show up as *P4, not as '*$1', so we can't uncondionally // use expression gdb reports to us. - QString displayName() const; + TQString displayName() const; VariableTree* varTree() const; - QString varobjFormatName() const; + TQString varobjFormatName() const; private: // The gdb expression for this varItem relatively to // parent VarItem. - QString expression_; + TQString expression_; bool highlight_; GDBController* controller_; - QString varobjName_; + TQString varobjName_; // the non-cast type of the variable - QString originalValueType_; + TQString originalValueType_; bool oldSpecialRepresentationSet_; - QString oldSpecialRepresentation_; + TQString oldSpecialRepresentation_; format_t format_; @@ -390,8 +390,8 @@ private: int numChildren_; bool childrenFetched_; - QString currentAddress_; - QString lastObtainedAddress_; + TQString currentAddress_; + TQString lastObtainedAddress_; bool updateUnconditionally_; bool frozen_; @@ -425,7 +425,7 @@ public: // this item, it will fetch new data. void setDirty(); - void setFrameName(const QString &frameName) + void setFrameName(const TQString &frameName) { setText(VarNameCol, frameName); setText(ValueCol, ""); } bool needLocals() const { return needLocals_; } diff --git a/languages/cpp/declarationinfo.h b/languages/cpp/declarationinfo.h index f1d28f26..8b55557e 100644 --- a/languages/cpp/declarationinfo.h +++ b/languages/cpp/declarationinfo.h @@ -22,16 +22,16 @@ #ifndef DECLARATIONINFO_H #define DECLARATIONINFO_H -#include <qstring.h> +#include <tqstring.h> struct DeclarationInfo { class File { - QString m_file; + TQString m_file; public: - File( const QString& file = "" ) : m_file( file ) { + File( const TQString& file = "" ) : m_file( file ) { } - operator QString() const { + operator TQString() const { return m_file; } }; @@ -43,15 +43,15 @@ struct DeclarationInfo { return !name.isEmpty(); } - QString locationToText() const { - return QString("line %1 col %2 - line %3 col %4\nfile: %5").arg(startLine).arg(startCol).arg(endLine).arg(endCol).arg(file); + TQString locationToText() const { + return TQString("line %1 col %2 - line %3 col %4\nfile: %5").arg(startLine).arg(startCol).arg(endLine).arg(endCol).arg(file); } - QString toText() const { + TQString toText() const { if( name.isEmpty() ) return ""; - QString ret; - ret = QString("name: " + name + "\n" ) + locationToText(); + TQString ret; + ret = TQString("name: " + name + "\n" ) + locationToText(); if( !comment.isEmpty() ) { ret += "\n\"" + comment + "\""; } @@ -62,8 +62,8 @@ struct DeclarationInfo { int endLine, endCol; File file; - QString name; - QString comment; + TQString name; + TQString comment; }; diff --git a/languages/cpp/doxydoc.cpp b/languages/cpp/doxydoc.cpp index bcd36faa..54343b70 100644 --- a/languages/cpp/doxydoc.cpp +++ b/languages/cpp/doxydoc.cpp @@ -11,37 +11,37 @@ #include <list> -#include <qstring.h> -#include <qstringlist.h> -#include <qdom.h> -#include <qdir.h> -#include <qfile.h> -#include <qregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqdom.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqregexp.h> -void DoxyDoc::formatType( QString& str ) +void DoxyDoc::formatType( TQString& str ) { - str.replace( QRegExp( " " ), "" ); + str.replace( TQRegExp( " " ), "" ); } -DoxyDoc::DoxyDoc( const QStringList& dir ) +DoxyDoc::DoxyDoc( const TQStringList& dir ) { for ( uint i = 0; i < dir.count(); ++i ) - m_dirs.push_back( QDir( *( dir.at( i ) ) ) ); + m_dirs.push_back( TQDir( *( dir.at( i ) ) ) ); } //crappy implementation, change later -QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& name, - const QString& tmptype, const QString& tmparguments ) +TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& name, + const TQString& tmptype, const TQString& tmparguments ) { - QString scope = tmpscope; + TQString scope = tmpscope; bool foundfile = false; //produce doxygen conform filenames - QString filename = "/class" + scope.replace( QRegExp( "_" ), "__" ).replace( QRegExp( "::" ), "_1_1" ) + ".xml"; + TQString filename = "/class" + scope.replace( TQRegExp( "_" ), "__" ).replace( TQRegExp( "::" ), "_1_1" ) + ".xml"; //search for file in all directories - for ( std::list<QDir>::const_iterator ci = m_dirs.begin(); !foundfile && ci != m_dirs.end(); ++ci ) + for ( std::list<TQDir>::const_iterator ci = m_dirs.begin(); !foundfile && ci != m_dirs.end(); ++ci ) { - if ( QFile::exists( ci->path() + filename ) ) + if ( TQFile::exists( ci->path() + filename ) ) { if ( m_file.name() != ci->path() + filename ) { @@ -52,7 +52,7 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na m_file.setName( "" ); return ""; } - QDomDocument m_doc; + TQDomDocument m_doc; m_doc.setContent( m_file.readAll() ); m_file.close(); m_list = m_doc.elementsByTagName( "memberdef" ); @@ -64,19 +64,19 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na } } if ( !foundfile ) - return QString::null; + return TQString::null; - QString type = tmptype; + TQString type = tmptype; formatType( type ); for ( uint i = 0; i < m_list.count(); ++i ) { - QDomElement elem = m_list.item( i ).toElement(); + TQDomElement elem = m_list.item( i ).toElement(); if ( elem.elementsByTagName( "name" ).item( 0 ).toElement().text() == name && elem.elementsByTagName( "type" ).item( 0 ).toElement().text() == tmptype ) { - QDomNodeList paramnodes = elem.elementsByTagName( "param" ); - QString nodearguments = "", arguments = tmparguments; + TQDomNodeList paramnodes = elem.elementsByTagName( "param" ); + TQString nodearguments = "", arguments = tmparguments; for ( unsigned int j = 0; j < paramnodes.count(); ++j ) nodearguments += paramnodes.item( j ).childNodes().item( 0 ).toElement().text() + ","; if ( nodearguments != "" ) @@ -87,17 +87,17 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na formatType( arguments ); if ( arguments == nodearguments ) { - QString brief = ""; - QDomNode briefnode = elem.elementsByTagName( "briefdescription" ).item( 0 ); + TQString brief = ""; + TQDomNode briefnode = elem.elementsByTagName( "briefdescription" ).item( 0 ); if ( briefnode.hasChildNodes() ) brief = briefnode.firstChild().toElement().text(); - QString detailstr = "", paramstr = ""; - QDomNode detail = elem.elementsByTagName( "detaileddescription" ).item( 0 ); + TQString detailstr = "", paramstr = ""; + TQDomNode detail = elem.elementsByTagName( "detaileddescription" ).item( 0 ); if ( detail.hasChildNodes() ) detail = detail.firstChild(); - QDomNode descnode = detail.firstChild(); + TQDomNode descnode = detail.firstChild(); while ( !descnode.isNull() ) { if ( descnode.nodeName() == "parameterlist" ) @@ -125,7 +125,7 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na } - QString description = ""; + TQString description = ""; if ( brief != "" ) description += brief + "<p>"; if ( detailstr != "" ) @@ -134,7 +134,7 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na description += "<b>Parameterlist:</b><p>" + paramstr; if ( description == "" ) - return QString::null; + return TQString::null; else return description; } @@ -142,7 +142,7 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na } - return QString::null; + return TQString::null; } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/doxydoc.h b/languages/cpp/doxydoc.h index aca424b2..c36d6ada 100644 --- a/languages/cpp/doxydoc.h +++ b/languages/cpp/doxydoc.h @@ -10,10 +10,10 @@ #ifndef DOXYDOC_H #define DOXYDOC_H -#include <qstring.h> -#include <qdom.h> -#include <qdir.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqdom.h> +#include <tqdir.h> +#include <tqfile.h> #include <list> /** @@ -28,7 +28,7 @@ public: Constructs a new DoxyDoc object. @param dir all directories, which should be searched for files containing the Doxygen-documentation. */ - DoxyDoc( const QStringList& dir ); + DoxyDoc( const TQStringList& dir ); ~DoxyDoc() {} ; @@ -39,19 +39,19 @@ public: @param type Return-type of the function @param arguments String containing the arguments of the function, separated by commas and _without_ the argument names */ - QString functionDescription( const QString& scope, const QString& name, const QString& type, const QString& arguments ); + TQString functionDescription( const TQString& scope, const TQString& name, const TQString& type, const TQString& arguments ); /*not implemented yet, maybe later, if they are useful - QString classDescription(); - QString enumDescription(); - QString namespaceDescription(); - QString memberVarDescription(); + TQString classDescription(); + TQString enumDescription(); + TQString namespaceDescription(); + TQString memberVarDescription(); */ private: - static void formatType( QString& type ); - std::list<QDir> m_dirs; + static void formatType( TQString& type ); + std::list<TQDir> m_dirs; //used for temporary storing/performance reasons - QFile m_file; - QDomNodeList m_list; + TQFile m_file; + TQDomNodeList m_list; }; #endif diff --git a/languages/cpp/expressioninfo.h b/languages/cpp/expressioninfo.h index 836a2292..4b42a2f4 100644 --- a/languages/cpp/expressioninfo.h +++ b/languages/cpp/expressioninfo.h @@ -27,7 +27,7 @@ using namespace StringHelpers; struct ExpressionInfo { private: - QString m_expr; + TQString m_expr; public: @@ -40,15 +40,15 @@ struct ExpressionInfo { Type t; int start, end; - QString expr() { + TQString expr() { return m_expr; } - void setExpr( const QString& str ) { + void setExpr( const TQString& str ) { m_expr = clearComments( str ); } - ExpressionInfo( QString str ) : t( NormalExpression ), start( 0 ), end( str.length() ) { + ExpressionInfo( TQString str ) : t( NormalExpression ), start( 0 ), end( str.length() ) { setExpr( str ); } @@ -76,8 +76,8 @@ struct ExpressionInfo { return t & NormalExpression && !m_expr.isEmpty(); } - QString typeAsString() { - QString res ; + TQString typeAsString() { + TQString res ; if( t & NormalExpression ) res += "NormalExpression, "; if( t & TypeExpression ) diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index 117c7732..ebd536ec 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -28,8 +28,8 @@ #include <unistd.h> #include <memory> #include "kurl.h" /* defines KURL */ -#include "qdir.h" /* defines QDir */ -#include "qregexp.h" /* defines QRegExp */ +#include "tqdir.h" /* defines TQDir */ +#include "tqregexp.h" /* defines TQRegExp */ #include "klocale.h" /* defines [function] i18n */ #include "blockingkprocess.h" /* defines BlockingKProcess */ #include "includepathresolver.h" @@ -62,8 +62,8 @@ namespace CppTools { class FileModificationTimeWrapper { public: ///@param files list of files that should be fake-modified(modtime will be set to current time) - FileModificationTimeWrapper( const QStringList& files = QStringList() ) : m_newTime( time(0) ) { - for( QStringList::const_iterator it = files.begin(); it != files.end(); ++it ) { + FileModificationTimeWrapper( const TQStringList& files = TQStringList() ) : m_newTime( time(0) ) { + for( TQStringList::const_iterator it = files.begin(); it != files.end(); ++it ) { ifTest( cout << "touching " << (*it).ascii() << endl ); struct stat s; if( stat( (*it).local8Bit().data(), &s ) == 0 ) { @@ -85,8 +85,8 @@ namespace CppTools { } //Not used yet, might be used to return LD_PRELOAD=.. FAKE_MODIFIED=.. etc. later - QString commandPrefix() const { - return QString(); + TQString commandPrefix() const { + return TQString(); } ///Undo changed modification-times @@ -120,14 +120,14 @@ namespace CppTools { } private: - typedef QMap<QString, struct stat> StatMap; + typedef TQMap<TQString, struct stat> StatMap; StatMap m_stat; time_t m_newTime; }; class SourcePathInformation { public: - SourcePathInformation( const QString& path ) : m_path( path ), m_isUnsermake(false), m_shouldTouchFiles(false) { + SourcePathInformation( const TQString& path ) : m_path( path ), m_isUnsermake(false), m_shouldTouchFiles(false) { m_isUnsermake = isUnsermakePrivate( path ); ifTest( if( m_isUnsermake ) cout << "unsermake detected" << endl ); @@ -142,7 +142,7 @@ namespace CppTools { m_shouldTouchFiles = b; } - QString getCommand( const QString& sourceFile, const QString& makeParameters ) const { + TQString getCommand( const TQString& sourceFile, const TQString& makeParameters ) const { if( isUnsermake() ) return "unsermake -k --no-real-compare -n " + makeParameters; else @@ -150,7 +150,7 @@ namespace CppTools { } bool hasMakefile() const { - QFileInfo makeFile( m_path, "Makefile" ); + TQFileInfo makeFile( m_path, "Makefile" ); return makeFile.exists(); } @@ -158,8 +158,8 @@ namespace CppTools { return isUnsermake() || m_shouldTouchFiles; } - QStringList possibleTargets( const QString& targetBaseName ) const { - QStringList ret; + TQStringList possibleTargets( const TQString& targetBaseName ) const { + TQStringList ret; if( isUnsermake() ) { //unsermake breaks if the first given target does not exist, so in worst-case 2 calls are necessary ret << targetBaseName + ".lo"; @@ -174,12 +174,12 @@ namespace CppTools { } private: - bool isUnsermakePrivate( const QString& path ) { + bool isUnsermakePrivate( const TQString& path ) { bool ret = false; - QFileInfo makeFile( path, "Makefile" ); - QFile f( makeFile.absFilePath() ); + TQFileInfo makeFile( path, "Makefile" ); + TQFile f( makeFile.absFilePath() ); if( f.open( IO_ReadOnly ) ) { - QString firstLine; + TQString firstLine; f.readLine( firstLine, 1000 ); if( firstLine.find( "generated by unsermake" ) != -1 ) { ret = true; @@ -189,14 +189,14 @@ namespace CppTools { return ret; } - QString m_path; + TQString m_path; bool m_isUnsermake; bool m_shouldTouchFiles; }; }; -bool IncludePathResolver::executeCommandPopen ( const QString& command, const QString& workingDirectory, QString& result ) const +bool IncludePathResolver::executeCommandPopen ( const TQString& command, const TQString& workingDirectory, TQString& result ) const { ifTest( cout << "executing " << command.ascii() << endl ); @@ -207,12 +207,12 @@ bool IncludePathResolver::executeCommandPopen ( const QString& command, const QS const int BUFSIZE = 2048; char buf [BUFSIZE]; - result = QString(); + result = TQString(); int status = 1; if ((fp = popen(command.local8Bit(), "r")) != NULL) { while (fgets(buf, sizeof (buf), fp)) - result += QString(buf); + result += TQString(buf); status = pclose(fp); } @@ -230,12 +230,12 @@ IncludePathResolver::IncludePathResolver( bool continueEventLoop ) : m_isResolvi } ///More efficient solution: Only do exactly one call for each directory. During that call, mark all source-files as changed, and make all targets for those files. -PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& file ) { - QFileInfo fi( file ); +PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& file ) { + TQFileInfo fi( file ); return resolveIncludePath( fi.fileName(), fi.dirPath(true) ); } -PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& file, const QString& workingDirectory ) { +PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& file, const TQString& workingDirectory ) { struct Enabler { bool& b; @@ -253,14 +253,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil Enabler e( m_isResolving ); ///STEP 1: CACHING - QDir dir( workingDirectory ); - dir = QDir( dir.absPath() ); - QFileInfo makeFile( dir, "Makefile" ); + TQDir dir( workingDirectory ); + dir = TQDir( dir.absPath() ); + TQFileInfo makeFile( dir, "Makefile" ); if( !makeFile.exists() ) return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").arg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").arg(file) ); - QStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version - QDateTime makeFileModification = makeFile.lastModified(); + TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version + TQDateTime makeFileModification = makeFile.lastModified(); Cache::iterator it = m_cache.find( dir.path() ); if( it != m_cache.end() ) { cachedPath = (*it).path; @@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil return ret; } else { //We have a cached failed result. We should use that for some time but then try again. Return the failed result if: ( there were too many tries within this folder OR this file was already tried ) AND The last tries have not expired yet - if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( QDateTime::currentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) { + if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::currentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) { PathResolutionResult ret(false); //Fake that the result is ok ret.errorMessage = i18n("Cached: ") + (*it).errorMessage; ret.longErrorMessage = (*it).longErrorMessage; @@ -286,10 +286,10 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil } ///STEP 1: Prepare paths - QString targetName; - QFileInfo fi( file ); + TQString targetName; + TQFileInfo fi( file ); - QString absoluteFile = file; + TQString absoluteFile = file; if( !file.startsWith("/") ) absoluteFile = dir.path() + "/" + file; KURL u( absoluteFile ); @@ -302,9 +302,9 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil targetName = file.left( dot ); - QString wd = dir.path(); + TQString wd = dir.path(); if( !wd.startsWith("/") ) { - wd = QDir::currentDirPath() + "/" + wd; + wd = TQDir::currentDirPath() + "/" + wd; KURL u( wd ); u.cleanPath(); wd = u.path(); @@ -320,7 +320,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil } SourcePathInformation source( wd ); - QStringList possibleTargets = source.possibleTargets( targetName ); + TQStringList possibleTargets = source.possibleTargets( targetName ); source.setShouldTouchFiles(true); //Think about whether this should be always enabled. I've enabled it for now so there's an even bigger chance that everything works. @@ -329,7 +329,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil ///STEP 3.1: Try resolution using the absolute path PathResolutionResult res; //Try for each possible target - for( QStringList::const_iterator it = possibleTargets.begin(); it != possibleTargets.end(); ++it ) { + for( TQStringList::const_iterator it = possibleTargets.begin(); it != possibleTargets.end(); ++it ) { res = resolveIncludePathInternal( absoluteFile, wd, *it, source ); if( res ) break; } @@ -346,8 +346,8 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil ///STEP 3.2: Try resolution using the relative path - QString relativeFile = KURL::relativePath(wd, absoluteFile); - for( QStringList::const_iterator it = possibleTargets.begin(); it != possibleTargets.end(); ++it ) { + TQString relativeFile = KURL::relativePath(wd, absoluteFile); + for( TQStringList::const_iterator it = possibleTargets.begin(); it != possibleTargets.end(); ++it ) { res = resolveIncludePathInternal( relativeFile, wd, *it, source ); if( res ) break; } @@ -365,7 +365,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil ce.failed = true; ce.errorMessage = res.errorMessage; ce.longErrorMessage = res.longErrorMessage; - ce.failTime = QDateTime::currentDateTime(); + ce.failTime = TQDateTime::currentDateTime(); ce.failedFiles[file] = true; } else { ce.failed = false; @@ -375,7 +375,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil return res; } -PathResolutionResult IncludePathResolver::getFullOutput( const QString& command, const QString& workingDirectory, QString& output ) const{ +PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const{ if( m_continueEventLoop ) { BlockingKProcess proc; proc.setWorkingDirectory( workingDirectory ); @@ -397,25 +397,25 @@ PathResolutionResult IncludePathResolver::getFullOutput( const QString& command, return PathResolutionResult(true); } -PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QString& file, const QString& workingDirectory, const QString& makeParameters, const SourcePathInformation& source ) { +PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQString& file, const TQString& workingDirectory, const TQString& makeParameters, const SourcePathInformation& source ) { - QString processStdout; + TQString processStdout; - QStringList touchFiles; + TQStringList touchFiles; if( source.shouldTouchFiles() ) touchFiles << file; FileModificationTimeWrapper touch( touchFiles ); - QString fullOutput; + TQString fullOutput; PathResolutionResult res = getFullOutput( source.getCommand( file, makeParameters ), workingDirectory, fullOutput ); if( !res ) return res; - QRegExp newLineRx("\\\\\\n"); + TQRegExp newLineRx("\\\\\\n"); fullOutput.replace( newLineRx, "" ); ///@todo collect multiple outputs at the same time for performance-reasons - QString firstLine = fullOutput; + TQString firstLine = fullOutput; int lineEnd; if( (lineEnd = fullOutput.find('\n')) != -1 ) firstLine.truncate( lineEnd ); //Only look at the first line of output @@ -428,14 +428,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr ///STEP 1: Test if it is a recursive make-call - QRegExp makeRx( "\\bmake\\s" ); + TQRegExp makeRx( "\\bmake\\s" ); int offset = 0; while( (offset = makeRx.search( firstLine, offset )) != -1 ) { - QString prefix = firstLine.left( offset ).stripWhiteSpace(); + TQString prefix = firstLine.left( offset ).stripWhiteSpace(); if( prefix.endsWith( "&&") || prefix.endsWith( ";" ) || prefix.isEmpty() ) { - QString newWorkingDirectory = workingDirectory; + TQString newWorkingDirectory = workingDirectory; ///Extract the new working-directory if( !prefix.isEmpty() ) { if( prefix.endsWith( "&&" ) ) @@ -452,14 +452,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr newWorkingDirectory = u.path(); } } - QFileInfo d( newWorkingDirectory ); + TQFileInfo d( newWorkingDirectory ); if( d.exists() ) { ///The recursive working-directory exists. - QString makeParams = firstLine.mid( offset+5 ); + TQString makeParams = firstLine.mid( offset+5 ); if( !makeParams.contains( ";" ) && !makeParams.contains( "&&" ) ) { ///Looks like valid parameters ///Make the file-name absolute, so it can be referenced from any directory - QString absoluteFile = file; + TQString absoluteFile = file; if( !absoluteFile.startsWith("/") ) absoluteFile = workingDirectory + "/" + file; KURL u( absoluteFile ); @@ -486,18 +486,18 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr } ///STEP 2: Search the output for include-paths - QRegExp validRx( "\\b([cg]\\+\\+|gcc)" ); + TQRegExp validRx( "\\b([cg]\\+\\+|gcc)" ); if( validRx.search( fullOutput ) == -1 ) return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").arg(workingDirectory).arg( source.getCommand(file, makeParameters) ).arg(fullOutput) ); PathResolutionResult ret( true ); ret.longErrorMessage = fullOutput; - QString includeParameterRx( "\\s(-I|--include-dir=|-I\\s)" ); - QString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc. - QString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include + TQString includeParameterRx( "\\s(-I|--include-dir=|-I\\s)" ); + TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc. + TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include - QRegExp includeRx( QString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) ); + TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) ); includeRx.setMinimal( true ); includeRx.setCaseSensitive( true ); offset = 0; @@ -519,7 +519,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr int start = offset + pathOffset; int end = offset + includeRx.matchedLength(); - QString path = fullOutput.mid( start, end-start ).stripWhiteSpace(); + TQString path = fullOutput.mid( start, end-start ).stripWhiteSpace(); if( path.startsWith( "\"") || path.startsWith( "\'") && path.length() > 2 ) { //probable a quoted path if( path.endsWith(path.left(1)) ) { @@ -542,7 +542,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr return ret; } -void IncludePathResolver::setOutOfSourceBuildSystem( const QString& source, const QString& build ) { +void IncludePathResolver::setOutOfSourceBuildSystem( const TQString& source, const TQString& build ) { m_outOfSource = true; m_source = source; m_build = build; @@ -554,7 +554,7 @@ void IncludePathResolver::setOutOfSourceBuildSystem( const QString& source, cons * */ int main(int argc, char **argv) { - QApplication app(argc,argv); + TQApplication app(argc,argv); IncludePathResolver resolver; if( argc < 3 ) { cout << "params: 1. file-name, 2. working-directory [3. source-directory 4. build-directory]" << endl; diff --git a/languages/cpp/includepathresolver.h b/languages/cpp/includepathresolver.h index c182d52e..33aaecd9 100644 --- a/languages/cpp/includepathresolver.h +++ b/languages/cpp/includepathresolver.h @@ -13,20 +13,20 @@ ***************************************************************************/ #ifndef INCLUDEPATHRESOLVER_H #define INCLUDEPATHRESOLVER_H -#include <qstring.h> /* defines QString */ -#include <qmap.h> +#include <tqstring.h> /* defines TQString */ +#include <tqmap.h> namespace CppTools { class FileModificationTimeWrapper; struct PathResolutionResult { - PathResolutionResult( bool _success = false, const QString& _errorMessage = QString(), const QString& _longErrorMessage = QString() ) : success( _success ), errorMessage( _errorMessage ), longErrorMessage( _longErrorMessage ) { + PathResolutionResult( bool _success = false, const TQString& _errorMessage = TQString(), const TQString& _longErrorMessage = TQString() ) : success( _success ), errorMessage( _errorMessage ), longErrorMessage( _longErrorMessage ) { } bool success; - QString errorMessage; - QString longErrorMessage; + TQString errorMessage; + TQString longErrorMessage; - QStringList path; + TQStringList path; operator bool() const { return success; @@ -41,35 +41,35 @@ namespace CppTools { ///Whether the Qt event-loop should be continued(using BlockingKProcess). This crashes if enabled in a non-foreground thread. IncludePathResolver( bool continueEventLoop = false ); ///Same as below, but uses the directory of the file as working-directory. The argument must be absolute. - PathResolutionResult resolveIncludePath( const QString& file ); + PathResolutionResult resolveIncludePath( const TQString& file ); ///The include-path is only computed once for a whole directory, then it is cached using the modification-time of the Makefile. - PathResolutionResult resolveIncludePath( const QString& file, const QString& workingDirectory ); + PathResolutionResult resolveIncludePath( const TQString& file, const TQString& workingDirectory ); ///source and build must be absolute paths - void setOutOfSourceBuildSystem( const QString& source, const QString& build ); + void setOutOfSourceBuildSystem( const TQString& source, const TQString& build ); private: bool m_isResolving; bool m_continueEventLoop; struct CacheEntry { CacheEntry() : failed(false) { } - QDateTime modificationTime; - QStringList path; - QString errorMessage, longErrorMessage; + TQDateTime modificationTime; + TQStringList path; + TQString errorMessage, longErrorMessage; bool failed; - QMap<QString,bool> failedFiles; - QDateTime failTime; + TQMap<TQString,bool> failedFiles; + TQDateTime failTime; }; - typedef QMap<QString, CacheEntry> Cache; + typedef TQMap<TQString, CacheEntry> Cache; Cache m_cache; ///Executes the command, either using popen or BlockingKProcess - PathResolutionResult getFullOutput( const QString& command, const QString& workingDirectory, QString& output ) const; - bool executeCommandPopen ( const QString& command, const QString& workingDirectory, QString& result ) const; + PathResolutionResult getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const; + bool executeCommandPopen ( const TQString& command, const TQString& workingDirectory, TQString& result ) const; ///file should be the name of the target, without extension(because that may be different) - PathResolutionResult resolveIncludePathInternal( const QString& file, const QString& workingDirectory, const QString& makeParameters, const SourcePathInformation& source ); + PathResolutionResult resolveIncludePathInternal( const TQString& file, const TQString& workingDirectory, const TQString& makeParameters, const SourcePathInformation& source ); bool m_outOfSource; - QString m_source; - QString m_build; + TQString m_source; + TQString m_build; }; }; diff --git a/languages/cpp/kdevdeepcopy.h b/languages/cpp/kdevdeepcopy.h index f006bbce..c29ee1e1 100644 --- a/languages/cpp/kdevdeepcopy.h +++ b/languages/cpp/kdevdeepcopy.h @@ -1,12 +1,12 @@ #ifndef KDEVDEEPCOPY_H #define KDEVDEEPCOPY_H -#include <qstring.h> +#include <tqstring.h> -inline QString deepCopy( const QString& s ) +inline TQString deepCopy( const TQString& s ) { - QCString str = s.utf8(); - return QString::fromUtf8( str, str.length() ); + TQCString str = s.utf8(); + return TQString::fromUtf8( str, str.length() ); } #endif diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index 53cf413e..f240ed36 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -24,18 +24,18 @@ CppSupportPart* KDevDriver::cppSupport() { return m_cppSupport; } void KDevDriver::setupProject() { - QMap<QString, bool> map; + TQMap<TQString, bool> map; - QStringList fileList = m_cppSupport->project() ->allFiles(); - QStringList::ConstIterator it = fileList.begin(); + TQStringList fileList = m_cppSupport->project() ->allFiles(); + TQStringList::ConstIterator it = fileList.begin(); while ( it != fileList.end() ) { - QFileInfo info( *it ); + TQFileInfo info( *it ); ++it; map.insert( info.dirPath( true ), true ); } - QMap<QString, bool>::Iterator mapit = map.begin(); + TQMap<TQString, bool>::Iterator mapit = map.begin(); while ( mapit != map.end() ) { addIncludePath( mapit.key() ); @@ -61,16 +61,16 @@ void KDevDriver::setup() addMacro( Macro("KDEVELOP_PARSER", "3.4") ); bool ok; - QString verboseGccOutput = SetupHelper::getVerboseGccIncludePath( &ok ); - QStringList verboseGccLines = QStringList::split( '\n', verboseGccOutput ); + TQString verboseGccOutput = SetupHelper::getVerboseGccIncludePath( &ok ); + TQStringList verboseGccLines = TQStringList::split( '\n', verboseGccOutput ); if( verboseGccLines.count() > 3 ) { ///Parse the output of gcc. It includes gcc's final include-path when parsing an empty c++-file(including dirs like /usr/include/c++/4.xx/...) //what about order? - for( QStringList::iterator it = verboseGccLines.begin(); it != verboseGccLines.end(); ++it ) { + for( TQStringList::iterator it = verboseGccLines.begin(); it != verboseGccLines.end(); ++it ) { if( (*it).startsWith(" ") && (*it).length() > 2 && (*it)[1] != ' ' ) { //it is a potential include-file - QString path = (*it).stripWhiteSpace(); - QFileInfo info( path ); + TQString path = (*it).stripWhiteSpace(); + TQFileInfo info( path ); if( info.exists() ) { kdDebug( 9007 ) << "Adding include-path from gcc-output: \"" << path << "\" absolute: \"" << info.absFilePath() << "\"" << endl; addIncludePath(info.absFilePath()); @@ -84,10 +84,10 @@ void KDevDriver::setup() addIncludePath( "/usr/local/include" ); bool ok; - QString includePath = SetupHelper::getGccIncludePath(&ok); + TQString includePath = SetupHelper::getGccIncludePath(&ok); if (ok) { - QStringList ls = QStringList::split( "\n", includePath ); - for( QStringList::const_iterator it = ls.begin(); it != ls.end(); ++it ) { + TQStringList ls = TQStringList::split( "\n", includePath ); + for( TQStringList::const_iterator it = ls.begin(); it != ls.end(); ++it ) { if( !(*it).isEmpty() ) addIncludePath( *it ); } @@ -101,15 +101,15 @@ void KDevDriver::setup() addMacro( Macro( "__cplusplus", "1" ) ); ///@todo maybe remove the following? Is there any normal user who has his environment set up correctly so this is of any use? - QString kdedir = getenv( "KDEDIR" ); + TQString kdedir = getenv( "KDEDIR" ); if( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); - QString qmakespec = getenv( "QMAKESPEC" ); + TQString qmakespec = getenv( "QMAKESPEC" ); if ( qmakespec.isNull() ) qmakespec = "linux-g++"; - QString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "QTDIR" ); if( !qtdir.isNull() ) { addIncludePath( qtdir + "/include" ); @@ -119,10 +119,10 @@ void KDevDriver::setup() addIncludePath( qtdir + "/mkspecs/" + qmakespec ); } - QStringList lines = SetupHelper::getGccMacros(&ok); + TQStringList lines = SetupHelper::getGccMacros(&ok); if (!ok) { - for (QStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { - QStringList lst = QStringList::split( ' ', *it ); + for (TQStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { + TQStringList lst = TQStringList::split( ' ', *it ); if ( lst.count() != 3 ) continue; addMacro( Macro( lst[1], lst[2] ) ); @@ -135,7 +135,7 @@ void KDevDriver::setup() addMacro( Macro( "Q_SCRIPTABLE", "" ) ); CppCodeCompletionConfig* cfg = m_cppSupport->codeCompletionConfig(); - QString str = cfg->customIncludePaths(); + TQString str = cfg->customIncludePaths(); int pos = 0; while( pos < str.length() ) { int end = str.find( ';', pos ); @@ -143,7 +143,7 @@ void KDevDriver::setup() end = str.length(); } - QString s = str.mid( pos, end-pos ).stripWhiteSpace(); + TQString s = str.mid( pos, end-pos ).stripWhiteSpace(); if( !s.isEmpty() ) { if( !s.startsWith( "/" ) && m_cppSupport->project() ) { s = m_cppSupport->project()->projectDirectory() + "/" + s; @@ -167,7 +167,7 @@ void KDevDriver::setup() m_shouldParseIncludedFiles = cfg->parseMissingHeaders(); } -QStringList KDevDriver::getCustomIncludePath( const QString& file ) { +TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) { if( !file.startsWith("/") ) kdDebug( 9007 ) << "KDevDriver::getCustomIncludePath(..): given file \"" << file << "\" is not absolute" << endl; if( !m_includePathResolver ) @@ -184,7 +184,7 @@ QStringList KDevDriver::getCustomIncludePath( const QString& file ) { } bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { - QString compoundString = file->fileName() + "||" + QString("%1").arg(file->usedMacros().valueHash()) + "||" + QString("%1").arg(file->usedMacros().idHash()); + TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()); if( !m_shouldParseIncludedFiles ) return false; diff --git a/languages/cpp/kdevdriver.h b/languages/cpp/kdevdriver.h index f46894b4..3a9f0ac6 100644 --- a/languages/cpp/kdevdriver.h +++ b/languages/cpp/kdevdriver.h @@ -10,7 +10,7 @@ #include <cstdlib> #include <unistd.h> -#include <qmap.h> +#include <tqmap.h> class KProcess; namespace CppTools { @@ -40,7 +40,7 @@ protected: void setupLexer( Lexer* lexer ); ///Returns the complete include-path for that file. Not constant because it may add Problem-items to the driver. Must be absolute path. - virtual QStringList getCustomIncludePath( const QString& file ); + virtual TQStringList getCustomIncludePath( const TQString& file ); virtual bool shouldParseIncludedFile( const ParsedFilePointer& /*file*/ ); diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index 079fba37..b3e6bacb 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -7,11 +7,11 @@ #include "tag_creator.h" #include "setuphelper.h" -#include <qdir.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qregexp.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqregexp.h> #include <catalog.h> #include <kdebug.h> @@ -39,7 +39,7 @@ public: m_generateTags = b; } - void addDocDirectory( const QString& dir ) + void addDocDirectory( const TQString& dir ) { m_docDirectoryList.append( dir ); TagCreator::setDocumentationDirectories( m_docDirectoryList ); @@ -48,15 +48,15 @@ public: void fileParsed( const ParsedFile& fileName ) { std::cout << ( m_generateTags ? "generate tags for " : "checking " ) - << QFile::encodeName( fileName.fileName() ).data() << std::endl; + << TQFile::encodeName( fileName.fileName() ).data() << std::endl; - QValueList<Problem> l = problems( fileName.fileName() ); - QValueList<Problem>::Iterator it = l.begin(); + TQValueList<Problem> l = problems( fileName.fileName() ); + TQValueList<Problem>::Iterator it = l.begin(); while ( it != l.end() ) { const Problem & p = *it; ++it; - std::cout << QFile::encodeName( fileName.fileName() ).data() << ":" << p.line() << ":" + std::cout << TQFile::encodeName( fileName.fileName() ).data() << ":" << p.line() << ":" << p.column() << ": " << p.text().latin1() << std::endl; } @@ -82,15 +82,15 @@ public: // code provided by Reginald Stadlbauer <reggie@trolltech.com> void setup() { - QString kdedir = getenv( "KDEDIR" ); + TQString kdedir = getenv( "KDEDIR" ); if ( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); - QString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "QTDIR" ); if ( !qtdir.isNull() ) addIncludePath( qtdir + "/include" ); - QString qmakespec = getenv( "QMAKESPEC" ); + TQString qmakespec = getenv( "QMAKESPEC" ); if ( qmakespec.isNull() ) qmakespec = "linux-g++"; // #### implement other mkspecs and find a better way to find the @@ -104,27 +104,27 @@ public: addIncludePath( "/usr/include" ); addIncludePath( "/ust/local/include" ); bool ok; - QString gccLibPath = SetupHelper::getGccIncludePath(&ok); + TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.replace( QRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); addIncludePath( "/usr/include/g++-3" ); addIncludePath( "/usr/include/g++" ); - QStringList lines = SetupHelper::getGccMacros(&ok); + TQStringList lines = SetupHelper::getGccMacros(&ok); if (!ok) return; - for (QStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { - QStringList lst = QStringList::split( ' ', *it ); + for (TQStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { + TQStringList lst = TQStringList::split( ' ', *it ); if ( lst.count() != 3 ) continue; addMacro( Macro( lst[1], lst[2] ) ); } addMacro( Macro( "__cplusplus", "1" ) ); - QString incl = getenv( "INCLUDE" ); - QStringList includePaths = QStringList::split( ':', incl ); - QStringList::Iterator it = includePaths.begin(); + TQString incl = getenv( "INCLUDE" ); + TQStringList includePaths = TQStringList::split( ':', incl ); + TQStringList::Iterator it = includePaths.begin(); while ( it != includePaths.end() ) { addIncludePath( ( *it ).stripWhiteSpace() ); @@ -134,9 +134,9 @@ public: } else if ( qmakespec == "win32-borland" ) { - QString incl = getenv( "INCLUDE" ); - QStringList includePaths = QStringList::split( ';', incl ); - QStringList::Iterator it = includePaths.begin(); + TQString incl = getenv( "INCLUDE" ); + TQStringList includePaths = TQStringList::split( ';', incl ); + TQStringList::Iterator it = includePaths.begin(); while ( it != includePaths.end() ) { addIncludePath( ( *it ).stripWhiteSpace() ); @@ -151,22 +151,22 @@ public: private: Catalog* catalog; bool m_generateTags; - QStringList m_docDirectoryList; + TQStringList m_docDirectoryList; }; -void parseDirectory( Driver& driver, QDir& dir, bool rec, bool parseAllFiles ) +void parseDirectory( Driver& driver, TQDir& dir, bool rec, bool parseAllFiles ) { - QStringList fileList; + TQStringList fileList; if ( parseAllFiles ) - fileList = dir.entryList( QDir::Files ); + fileList = dir.entryList( TQDir::Files ); else fileList = dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh" ); - QStringList::Iterator it = fileList.begin(); + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { - QString fn = dir.path() + "/" + ( *it ); + TQString fn = dir.path() + "/" + ( *it ); ++it; driver.parseFile( fn ); @@ -174,8 +174,8 @@ void parseDirectory( Driver& driver, QDir& dir, bool rec, bool parseAllFiles ) if ( rec ) { - QStringList fileList = dir.entryList( QDir::Dirs ); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = dir.entryList( TQDir::Dirs ); + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { if ( ( *it ).startsWith( "." ) ) @@ -184,7 +184,7 @@ void parseDirectory( Driver& driver, QDir& dir, bool rec, bool parseAllFiles ) continue; } - QDir subdir( dir.path() + "/" + ( *it ) ); + TQDir subdir( dir.path() + "/" + ( *it ) ); ++it; parseDirectory( driver, subdir, rec, parseAllFiles ); @@ -205,7 +205,7 @@ int main( int argc, char* argv[] ) bool rec = false; bool parseAllFiles = false; - QString datadir = stddir.localkdedir() + "/" + KStandardDirs::kde_default( "data" ); + TQString datadir = stddir.localkdedir() + "/" + KStandardDirs::kde_default( "data" ); if ( ! KStandardDirs::makeDir( datadir + "/kdevcppsupport/pcs/" ) ) { kdWarning() << "*error* " << "could not create " << datadir + "/kdevcppsupport/pcs/" << endl << endl; @@ -213,15 +213,15 @@ int main( int argc, char* argv[] ) } - if ( !QFile::exists( datadir + "/kdevcppsupport/pcs/" ) ) + if ( !TQFile::exists( datadir + "/kdevcppsupport/pcs/" ) ) { kdWarning() << "*error* " << datadir + "/kdevcppsupport/pcs/" << " doesn't exists!!" << endl << endl; return -1; } - QString dbFileName = datadir + "/kdevcppsupport/pcs/" + argv[ 1 ] + ".db"; + TQString dbFileName = datadir + "/kdevcppsupport/pcs/" + argv[ 1 ] + ".db"; // std::cout << "dbFileName = " << dbFileName << std::endl; - if ( QFile::exists( dbFileName ) ) + if ( TQFile::exists( dbFileName ) ) { kdWarning() << "*error* " << "database " << dbFileName << " already exists!" << endl << endl; return -1; @@ -240,7 +240,7 @@ int main( int argc, char* argv[] ) for ( int i = 2; i < argc; ++i ) { - QString s( argv[ i ] ); + TQString s( argv[ i ] ); if ( s == "-r" || s == "--recursive" ) { rec = true; @@ -267,7 +267,7 @@ int main( int argc, char* argv[] ) continue; } - QDir dir( s ); + TQDir dir( s ); if ( !dir.exists() ) { kdWarning() << "*error* " << "the directory " << dir.path() << " doesn't exists!" << endl << endl; diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index c3e5cb43..5551cd02 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -11,15 +11,15 @@ #include "settingsdialog.h" -#include <qvaluestack.h> -#include <qdir.h> +#include <tqvaluestack.h> +#include <tqdir.h> #include <kdebug.h> #include <kgenericfactory.h> K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) ) -KDevCustomImporter::KDevCustomImporter( QObject* parent, const char* name, const QStringList & // args +KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args ) : KDevPCSImporter( parent, name ) {} @@ -29,34 +29,34 @@ KDevCustomImporter::~KDevCustomImporter() {} -QString KDevCustomImporter::dbName() const +TQString KDevCustomImporter::dbName() const { return m_settings->dbName(); } -QStringList KDevCustomImporter::fileList( const QString& path ) +TQStringList KDevCustomImporter::fileList( const TQString& path ) { - QDir dir( path ); + TQDir dir( path ); if ( !dir.exists() ) - return QStringList(); -// QStringList lst = dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh" ); - QStringList lst = dir.entryList( m_settings->filePattern() ); - QStringList fileList; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + return TQStringList(); +// TQStringList lst = dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh" ); + TQStringList lst = dir.entryList( m_settings->filePattern() ); + TQStringList fileList; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { fileList.push_back( dir.absPath() + "/" + ( *it ) ); } return fileList; } -QStringList KDevCustomImporter::fileList() +TQStringList KDevCustomImporter::fileList() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList lst = m_settings->dirs(); - QStringList files; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + TQStringList lst = m_settings->dirs(); + TQStringList files; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( !m_settings->recursive() ) files += fileList( *it ); @@ -67,27 +67,27 @@ QStringList KDevCustomImporter::fileList() return files; } -QStringList KDevCustomImporter::includePaths() +TQStringList KDevCustomImporter::includePaths() { if ( !m_settings ) - return QStringList(); + return TQStringList(); return m_settings->dirs(); } -QWidget* KDevCustomImporter::createSettingsPage( QWidget* parent, const char* name ) +TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; } -void KDevCustomImporter::processDir( const QString path, QStringList & files ) +void KDevCustomImporter::processDir( const TQString path, TQStringList & files ) { - QValueStack<QString> s; + TQValueStack<TQString> s; s.push( path ); files += fileList( path ); - QDir dir; + TQDir dir; do { dir.setPath( s.pop() ); @@ -96,15 +96,15 @@ void KDevCustomImporter::processDir( const QString path, QStringList & files ) kdDebug( 9015 ) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; - QPtrListIterator<QFileInfo> it( *dirEntries ); + TQPtrListIterator<TQFileInfo> it( *dirEntries ); for ( ; dirEntries && it.current(); ++it ) { - QString fileName = it.current() ->fileName(); + TQString fileName = it.current() ->fileName(); if ( fileName == "." || fileName == ".." ) continue; if ( it.current() ->isDir() ) { - QString tmpPath = it.current() ->absFilePath(); + TQString tmpPath = it.current() ->absFilePath(); kdDebug( 9015 ) << "Pushing: " << tmpPath << endl; s.push( tmpPath ); files += fileList( tmpPath ); diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index 5a522785..bca53eeb 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -12,7 +12,7 @@ #include "kdevpcsimporter.h" -#include <qguardedptr.h> +#include <tqguardedptr.h> class SettingsDialog; @@ -20,21 +20,21 @@ class KDevCustomImporter : public KDevPCSImporter { Q_OBJECT public: - KDevCustomImporter(QObject* parent = 0, const char* name = 0, const QStringList &args = QStringList()); + KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~KDevCustomImporter(); - virtual QString dbName() const; - virtual QStringList fileList(); - virtual QStringList includePaths(); - virtual QWidget* createSettingsPage(QWidget* parent, const char* name); + virtual TQString dbName() const; + virtual TQStringList fileList(); + virtual TQStringList includePaths(); + virtual TQWidget* createSettingsPage(TQWidget* parent, const char* name); protected: - QStringList fileList( const QString& path ); - void processDir(const QString path, QStringList &files ); + TQStringList fileList( const TQString& path ); + void processDir(const TQString path, TQStringList &files ); private: - QGuardedPtr<SettingsDialog> m_settings; + TQGuardedPtr<SettingsDialog> m_settings; }; #endif diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index f6df0902..37f2bfef 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -12,7 +12,7 @@ * * ***************************************************************************/ -#include <qdir.h> +#include <tqdir.h> #include <klistbox.h> #include <kcombobox.h> @@ -27,14 +27,14 @@ // should be included after possible KEditListBox redefinition #include "settingsdialog.h" -#include <qfile.h> -#include <qregexp.h> -#include <qlayout.h> -#include <qcheckbox.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqlayout.h> +#include <tqcheckbox.h> #include <cstdlib> -SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { KURLRequester * req = new KURLRequester( this ); @@ -45,27 +45,27 @@ SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) grid->addMultiCellWidget( elb, 3, 3, 0, grid->numCols() ); - // connect( dbName_edit, SIGNAL( textChanged( const QString& ) ), this, SLOT( validate() ) ); - connect( elb->addButton(), SIGNAL( clicked() ), this, SLOT( validate() ) ); - connect( elb->removeButton(), SIGNAL( clicked() ), this, SLOT( validate() ) ); - connect( elb, SIGNAL( added( const QString& ) ), this, SLOT( validateDirectory( const QString& ) ) ); + // connect( dbName_edit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( validate() ) ); + connect( elb->addButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); + connect( elb->removeButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); + connect( elb, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( validateDirectory( const TQString& ) ) ); } SettingsDialog::~SettingsDialog() {} -QString SettingsDialog::dbName( ) const +TQString SettingsDialog::dbName( ) const { - return QString(); + return TQString(); // return dbName_edit->text(); } -QStringList SettingsDialog::dirs( ) const +TQStringList SettingsDialog::dirs( ) const { return elb->items(); } -QString SettingsDialog::filePattern( ) const +TQString SettingsDialog::filePattern( ) const { return pattern_edit->text(); } @@ -81,19 +81,19 @@ void SettingsDialog::validate() emit enabled( elb->listBox()->count() > 0 ); } -void SettingsDialog::validateDirectory( const QString & dir ) +void SettingsDialog::validateDirectory( const TQString & dir ) { - QDir d( dir, QString::null, QDir::DefaultSort, QDir::Dirs ); + TQDir d( dir, TQString::null, TQDir::DefaultSort, TQDir::Dirs ); if ( !d.exists() ) { elb->lineEdit() ->setText( dir ); - if ( QListBoxItem * item = elb->listBox() ->findItem( dir, Qt::ExactMatch ) ) + if ( TQListBoxItem * item = elb->listBox() ->findItem( dir, Qt::ExactMatch ) ) { elb->listBox() ->removeItem( elb->listBox() ->index( item ) ); } - QString errormsg = QString( "<qt><b>%1</b> is not a directory</qt>" ).arg( dir ); + TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).arg( dir ); KMessageBox::error( 0, errormsg, "Couldn't find directory" ); } emit enabled( elb->listBox()->count() > 0 ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h index 309df8ab..02336f98 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h @@ -21,22 +21,22 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); - bool isValidQtDir( const QString& path ) const; + bool isValidQtDir( const TQString& path ) const; - QString qtDir() const; - QString configuration() const; + TQString qtDir() const; + TQString configuration() const; - QString dbName() const; - QStringList dirs() const; + TQString dbName() const; + TQStringList dirs() const; bool recursive() const; - QString filePattern() const; + TQString filePattern() const; private slots: void validate(); - void validateDirectory( const QString & dir ); + void validateDirectory( const TQString & dir ); private: KEditListBox *elb; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp index 341256b7..a52da5d7 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp @@ -16,26 +16,26 @@ #include <kdebug.h> #include <kgenericfactory.h> -#include <qvaluestack.h> -#include <qlabel.h> -#include <qdir.h> -#include <qcombobox.h> +#include <tqvaluestack.h> +#include <tqlabel.h> +#include <tqdir.h> +#include <tqcombobox.h> K_EXPORT_COMPONENT_FACTORY( libkdevkdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevkdelibsimporter" ) ) -KDevKDELibsImporter::KDevKDELibsImporter( QObject * parent, const char * name, const QStringList& ) +KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) : KDevPCSImporter( parent, name ) {} KDevKDELibsImporter::~KDevKDELibsImporter() {} -QStringList KDevKDELibsImporter::fileList( const QString& path ) +TQStringList KDevKDELibsImporter::fileList( const TQString& path ) { - QDir dir( path ); - QStringList lst = dir.entryList( "*.h" ); - QStringList fileList; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + TQDir dir( path ); + TQStringList lst = dir.entryList( "*.h" ); + TQStringList fileList; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { fileList.push_back( dir.absPath() + "/" + ( *it ) ); } @@ -43,12 +43,12 @@ QStringList KDevKDELibsImporter::fileList( const QString& path ) } -QStringList KDevKDELibsImporter::fileList() +TQStringList KDevKDELibsImporter::fileList() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList files; + TQStringList files; int scope = m_settings->cbParsingScope->currentItem(); if ( scope == 0 ) { @@ -67,24 +67,24 @@ QStringList KDevKDELibsImporter::fileList() } else if ( scope == 1 ) { - QValueStack<QString> s; + TQValueStack<TQString> s; s.push( m_settings->kdeDir() ); files += fileList( m_settings->kdeDir() ); - QDir dir; + TQDir dir; do { dir.setPath( s.pop() ); kdDebug( 9015 ) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; - QPtrListIterator<QFileInfo> it( *dirEntries ); + TQPtrListIterator<TQFileInfo> it( *dirEntries ); for ( ; it.current(); ++it ) { - QString fileName = it.current() ->fileName(); + TQString fileName = it.current() ->fileName(); if ( fileName == "." || fileName == ".." ) continue; - QString path = it.current() ->absFilePath(); + TQString path = it.current() ->absFilePath(); if ( it.current() ->isDir() ) { kdDebug( 9015 ) << "Pushing: " << path << endl; @@ -99,17 +99,17 @@ QStringList KDevKDELibsImporter::fileList() return files; } -QStringList KDevKDELibsImporter::includePaths() +TQStringList KDevKDELibsImporter::includePaths() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList includePaths; + TQStringList includePaths; includePaths.push_back( m_settings->kdeDir() ); return includePaths; } -QWidget * KDevKDELibsImporter::createSettingsPage( QWidget * parent, const char * name ) +TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h index 9514f287..45cf470a 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h @@ -13,7 +13,7 @@ #define KDEVQTIMPORTER_H #include <kdevpcsimporter.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class SettingsDialog; @@ -21,20 +21,20 @@ class KDevKDELibsImporter : public KDevPCSImporter { Q_OBJECT public: - KDevKDELibsImporter( QObject* parent=0, const char* name=0, const QStringList& args=QStringList() ); + KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevKDELibsImporter(); - virtual QString dbName() const { return QString::fromLatin1("KDElibs"); } - virtual QStringList fileList(); - virtual QStringList includePaths(); + virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); } + virtual TQStringList fileList(); + virtual TQStringList includePaths(); - virtual QWidget* createSettingsPage( QWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: - QStringList fileList( const QString& path ); + TQStringList fileList( const TQString& path ); private: - QGuardedPtr<SettingsDialog> m_settings; + TQGuardedPtr<SettingsDialog> m_settings; }; #endif diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp index 29ef96e9..a0763380 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp @@ -22,30 +22,30 @@ #include <kmessagebox.h> #include <klocale.h> -#include <qfile.h> -#include <qdir.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqregexp.h> #include <cstdlib> #include "settingsdialog.h" -QListBoxItem* QListBox_selectedItem( QListBox* cpQListBox ) +TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox ) { - if ( cpQListBox->selectionMode() != QListBox::Single ) + if ( cpQListBox->selectionMode() != TQListBox::Single ) return 0; if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) return cpQListBox->item( cpQListBox->currentItem() ); return 0; } -SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { KApplication::kApplication()->dirs()->addResourceType("include","include"); - QStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); - for( QStringList::Iterator it=kdedirs.begin(); it!=kdedirs.end(); ++it ) + TQStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); + for( TQStringList::Iterator it=kdedirs.begin(); it!=kdedirs.end(); ++it ) { - QString kdedir = *it; + TQString kdedir = *it; if ( !kdedir.isEmpty() && isValidKDELibsDir( kdedir ) ) if ( !kdeListBox->findItem( kdedir, ExactMatch ) ) kdeListBox->insertItem( kdedir ); @@ -53,23 +53,23 @@ SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) kdeUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, SIGNAL(clicked()), this, SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() {} -void SettingsDialog::slotSelectionChanged( QListBoxItem* ) +void SettingsDialog::slotSelectionChanged( TQListBoxItem* ) { emit enabled( kdeListBox->selectedItem() != 0 ); } -bool SettingsDialog::isValidKDELibsDir( const QString & path ) const +bool SettingsDialog::isValidKDELibsDir( const TQString & path ) const { - return QFile::exists( path + "/kapplication.h" ); + return TQFile::exists( path + "/kapplication.h" ); } -QString SettingsDialog::kdeDir( ) const +TQString SettingsDialog::kdeDir( ) const { return kdeListBox->currentText(); } @@ -81,7 +81,7 @@ void SettingsDialog::addUrlButton_clicked() if ( isValidKDELibsDir( kdeUrl->url() ) ) { kdeListBox->insertItem( kdeUrl->url() ); - if ( QListBoxItem * item = kdeListBox->findItem( kdeUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = kdeListBox->findItem( kdeUrl->url(), ExactMatch ) ) { kdeListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h index ba15019b..4a06dd12 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h @@ -19,17 +19,17 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidKDELibsDir( const QString& path ) const; + bool isValidKDELibsDir( const TQString& path ) const; - QString kdeDir() const; + TQString kdeDir() const; public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(QListBoxItem*); + virtual void slotSelectionChanged(TQListBoxItem*); protected: /*$PROTECTED_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index f4fedea0..d4635ba4 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -18,13 +18,13 @@ #include <kprocess.h> #include <kdebug.h> -#include <qtextstream.h> -#include <qlabel.h> -#include <qdir.h> +#include <tqtextstream.h> +#include <tqlabel.h> +#include <tqdir.h> K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) ) -KDevQt4Importer::KDevQt4Importer( QObject * parent, const char * name, const QStringList& ) +KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) : KDevPCSImporter( parent, name ) { m_qtfile = 0; @@ -38,16 +38,16 @@ KDevQt4Importer::~KDevQt4Importer() m_qtfile = 0; } -QStringList KDevQt4Importer::fileList() +TQStringList KDevQt4Importer::fileList() { if( !m_settings ) - return QStringList(); + return TQStringList(); if (m_qtfile) delete m_qtfile; KTempFile ifile; - QTextStream &is = *ifile.textStream(); + TQTextStream &is = *ifile.textStream(); is << "#include <QtCore/qobjectdefs.h>\n" << "#undef Q_SLOTS\n#undef Q_SIGNALS\n#undef slots\n#undef signals" @@ -70,13 +70,13 @@ QStringList KDevQt4Importer::fileList() m_qtfile = new KTempFile(); // include paths - QStringList paths = includePaths(); - for (QStringList::Iterator it = paths.begin(); it != paths.end(); ++it) + TQStringList paths = includePaths(); + for (TQStringList::Iterator it = paths.begin(); it != paths.end(); ++it) proc << "-I" << *it; ifile.close(); - QString o; + TQString o; o += "-o"; o += m_qtfile->name(); @@ -86,12 +86,12 @@ QStringList KDevQt4Importer::fileList() return m_qtfile->name(); } -QStringList KDevQt4Importer::includePaths() +TQStringList KDevQt4Importer::includePaths() { if( !m_settings || !m_qtfile) - return QStringList(); + return TQStringList(); - QStringList includePaths; + TQStringList includePaths; includePaths.push_back( m_settings->qtDir() ); includePaths.push_back( m_settings->qtDir() + "/Qt" ); @@ -99,7 +99,7 @@ QStringList KDevQt4Importer::includePaths() return includePaths; } -QWidget * KDevQt4Importer::createSettingsPage( QWidget * parent, const char * name ) +TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index 821e6fef..c430db19 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -13,7 +13,7 @@ #define KDEVQTIMPORTER_H #include <kdevpcsimporter.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class SettingsDialog; class KTempFile; @@ -22,17 +22,17 @@ class KDevQt4Importer : public KDevPCSImporter { Q_OBJECT public: - KDevQt4Importer( QObject* parent=0, const char* name=0, const QStringList& args=QStringList() ); + KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQt4Importer(); - virtual QString dbName() const { return QString::fromLatin1("Qt4"); } - virtual QStringList fileList(); - virtual QStringList includePaths(); + virtual TQString dbName() const { return TQString::fromLatin1("Qt4"); } + virtual TQStringList fileList(); + virtual TQStringList includePaths(); - virtual QWidget* createSettingsPage( QWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: - QGuardedPtr<SettingsDialog> m_settings; + TQGuardedPtr<SettingsDialog> m_settings; KTempFile *m_qtfile; }; diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index cc59c6e9..755b14c4 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -20,34 +20,34 @@ #include <kmessagebox.h> #include <klocale.h> -#include <qfile.h> -#include <qdir.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqregexp.h> #include <cstdlib> #include "settingsdialog.h" -QListBoxItem* QListBox_selectedItem(QListBox* cpQListBox) +TQListBoxItem* QListBox_selectedItem(TQListBox* cpQListBox) { - if ( cpQListBox->selectionMode() != QListBox::Single ) + if ( cpQListBox->selectionMode() != TQListBox::Single ) return 0; if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) return cpQListBox->item(cpQListBox->currentItem()); return 0; } -SettingsDialog::SettingsDialog(QWidget* parent, const char* name, WFlags fl) +SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) : SettingsDialogBase(parent,name,fl) { - QStringList qtdirs; - qtdirs.push_back( ::getenv("QTDIR") + QString("/include") ); - qtdirs.push_back( QString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); - qtdirs.push_back( QString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); + TQStringList qtdirs; + qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") ); + qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); + qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); qtdirs.push_back( "/usr/qt/4/include" ); - for( QStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) + for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) if (!qtListBox->findItem(qtdir, ExactMatch)) qtListBox->insertItem( qtdir ); @@ -55,14 +55,14 @@ SettingsDialog::SettingsDialog(QWidget* parent, const char* name, WFlags fl) qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, SIGNAL(clicked()), this, SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() { } -void SettingsDialog::slotSelectionChanged(QListBoxItem* item) +void SettingsDialog::slotSelectionChanged(TQListBoxItem* item) { if( !qtListBox->selectedItem() ) { @@ -74,17 +74,17 @@ void SettingsDialog::slotSelectionChanged(QListBoxItem* item) emit enabled( true ); } -bool SettingsDialog::isValidQtDir( const QString & path ) const +bool SettingsDialog::isValidQtDir( const TQString & path ) const { - return QFile::exists( path + "/QtCore/QtCore" ); + return TQFile::exists( path + "/QtCore/QtCore" ); } -QString SettingsDialog::qtDir( ) const +TQString SettingsDialog::qtDir( ) const { return qtListBox->currentText(); } -QString SettingsDialog::configuration( ) const +TQString SettingsDialog::configuration( ) const { return ""; } @@ -96,7 +96,7 @@ void SettingsDialog::addUrlButton_clicked( ) if ( isValidQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( QListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h index 1ec5663e..118564fb 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h @@ -19,18 +19,18 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidQtDir( const QString& path ) const; + bool isValidQtDir( const TQString& path ) const; - QString qtDir() const; - QString configuration() const; + TQString qtDir() const; + TQString configuration() const; public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(QListBoxItem*); + virtual void slotSelectionChanged(TQListBoxItem*); protected: /*$PROTECTED_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index add8574a..62eb38fd 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -15,27 +15,27 @@ #include <kgenericfactory.h> -#include <qlabel.h> -#include <qdir.h> +#include <tqlabel.h> +#include <tqdir.h> K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) ) -KDevQtImporter::KDevQtImporter( QObject * parent, const char * name, const QStringList& ) +KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) : KDevPCSImporter( parent, name ) {} KDevQtImporter::~KDevQtImporter() {} -QStringList KDevQtImporter::fileList() +TQStringList KDevQtImporter::fileList() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QDir dir( m_settings->qtDir() ); - QStringList lst = dir.entryList( "*.h" ); - QStringList fileList; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + TQDir dir( m_settings->qtDir() ); + TQStringList lst = dir.entryList( "*.h" ); + TQStringList fileList; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( ( *it ).startsWith( "qconfig-" ) ) { @@ -50,12 +50,12 @@ QStringList KDevQtImporter::fileList() return fileList; } -QStringList KDevQtImporter::includePaths() +TQStringList KDevQtImporter::includePaths() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList includePaths; + TQStringList includePaths; includePaths.push_back( m_settings->qtDir() ); includePaths.push_back( m_settings->qtDir() + "/private" ); includePaths.push_back( m_settings->qtDir() + "/default" ); @@ -64,7 +64,7 @@ QStringList KDevQtImporter::includePaths() return includePaths; } -QWidget * KDevQtImporter::createSettingsPage( QWidget * parent, const char * name ) +TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index c53b0a8a..3ae35b96 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -13,7 +13,7 @@ #define KDEVQTIMPORTER_H #include <kdevpcsimporter.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class SettingsDialog; @@ -21,17 +21,17 @@ class KDevQtImporter : public KDevPCSImporter { Q_OBJECT public: - KDevQtImporter( QObject* parent=0, const char* name=0, const QStringList& args=QStringList() ); + KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQtImporter(); - virtual QString dbName() const { return QString::fromLatin1("Qt"); } - virtual QStringList fileList(); - virtual QStringList includePaths(); + virtual TQString dbName() const { return TQString::fromLatin1("Qt"); } + virtual TQStringList fileList(); + virtual TQStringList includePaths(); - virtual QWidget* createSettingsPage( QWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: - QGuardedPtr<SettingsDialog> m_settings; + TQGuardedPtr<SettingsDialog> m_settings; }; #endif diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index b0db10cc..2df475b7 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -20,35 +20,35 @@ #include <kmessagebox.h> #include <klocale.h> -#include <qfile.h> -#include <qdir.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqregexp.h> #include <cstdlib> #include "settingsdialog.h" -QListBoxItem* QListBox_selectedItem( QListBox* cpQListBox ) +TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox ) { - if ( cpQListBox->selectionMode() != QListBox::Single ) + if ( cpQListBox->selectionMode() != TQListBox::Single ) return 0; if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) return cpQListBox->item( cpQListBox->currentItem() ); return 0; } -SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { - QStringList qtdirs; - qtdirs.push_back( ::getenv( "QTDIR" ) + QString("/include") ); + TQStringList qtdirs; + qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") ); qtdirs.push_back( "/usr/lib/qt3/include" ); qtdirs.push_back( "/usr/lib/qt/include" ); qtdirs.push_back( "/usr/share/qt3/include" ); qtdirs.push_back( "/usr/qt/3/include" ); // gentoo style - for ( QStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it ) + for ( TQStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if ( !qtdir.isEmpty() && isValidQtDir( qtdir ) ) if ( !qtListBox->findItem( qtdir, ExactMatch ) ) qtListBox->insertItem( qtdir ); @@ -56,13 +56,13 @@ SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, SIGNAL(clicked()), this, SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() {} -void SettingsDialog::slotSelectionChanged( QListBoxItem* ) +void SettingsDialog::slotSelectionChanged( TQListBoxItem* ) { if ( !qtListBox->selectedItem() ) { @@ -70,11 +70,11 @@ void SettingsDialog::slotSelectionChanged( QListBoxItem* ) return ; } - QDir dir( qtDir() ); - QStringList qconfigFileList = dir.entryList( "qconfig-*.h" ); + TQDir dir( qtDir() ); + TQStringList qconfigFileList = dir.entryList( "qconfig-*.h" ); qtConfiguration->clear(); - QRegExp rx( "qconfig-(\\w+)\\.h" ); - for ( QStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it ) + TQRegExp rx( "qconfig-(\\w+)\\.h" ); + for ( TQStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it ) { ( void ) rx.exactMatch( *it ); qtConfiguration->insertItem( rx.cap( 1 ) ); @@ -83,17 +83,17 @@ void SettingsDialog::slotSelectionChanged( QListBoxItem* ) emit enabled( true ); } -bool SettingsDialog::isValidQtDir( const QString & path ) const +bool SettingsDialog::isValidQtDir( const TQString & path ) const { - return QFile::exists( path + "/qt.h" ); + return TQFile::exists( path + "/tqt.h" ); } -QString SettingsDialog::qtDir( ) const +TQString SettingsDialog::qtDir( ) const { return qtListBox->currentText(); } -QString SettingsDialog::configuration( ) const +TQString SettingsDialog::configuration( ) const { return qtConfiguration->currentText(); } @@ -104,7 +104,7 @@ void SettingsDialog::addUrlButton_clicked( ) if ( isValidQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( QListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h index 1ec5663e..118564fb 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h @@ -19,18 +19,18 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidQtDir( const QString& path ) const; + bool isValidQtDir( const TQString& path ) const; - QString qtDir() const; - QString configuration() const; + TQString qtDir() const; + TQString configuration() const; public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(QListBoxItem*); + virtual void slotSelectionChanged(TQListBoxItem*); protected: /*$PROTECTED_FUNCTIONS$*/ diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 55ca30a8..c7a8e9b6 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -44,30 +44,30 @@ #include <kconfig.h> -#include <qtimer.h> -#include <qregexp.h> -#include <qvbox.h> -#include <qfileinfo.h> -#include <qwhatsthis.h> -#include <qtabbar.h> -#include <qwidgetstack.h> -#include <qlayout.h> -#include <qlineedit.h> +#include <tqtimer.h> +#include <tqregexp.h> +#include <tqvbox.h> +#include <tqfileinfo.h> +#include <tqwhatsthis.h> +#include <tqtabbar.h> +#include <tqwidgetstack.h> +#include <tqlayout.h> +#include <tqlineedit.h> class ProblemItem: public KListViewItem { public: - ProblemItem( QListView* parent, const QString& problem, - const QString& file, const QString& line, const QString& column ) + ProblemItem( TQListView* parent, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, problem, file, line, column ) {} - ProblemItem( QListViewItem* parent, const QString& problem, - const QString& file, const QString& line, const QString& column ) + ProblemItem( TQListViewItem* parent, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, problem, file, line, column ) {} - int compare( QListViewItem* item, int column, bool ascending ) const + int compare( TQListViewItem* item, int column, bool ascending ) const { if ( column == 1 || column == 2 ) { @@ -82,22 +82,22 @@ public: }; -ProblemReporter::ProblemReporter( CppSupportPart* part, QWidget* parent, const char* name ) -: QWidget( parent, name ? name : "problemreporter" ), +ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* parent, const char* name ) +: TQWidget( parent, name ? name : "problemreporter" ), m_cppSupport( part ), // m_document( 0 ), m_markIface( 0 ) { - QWhatsThis::add(this, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. " + TQWhatsThis::add(this, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. " "It displays TODO entries, FIXME's and errors reported by a language parser. " "To add a TODO or FIXME entry, just type<br>" "<tt>//@todo my todo</tt><br>" "<tt>//TODO: my todo</tt><br>" "<tt>//FIXME fix this</tt>")); - m_initCurrentTimer = new QTimer( this ); - connect( m_initCurrentTimer, SIGNAL(timeout()), this, SLOT(initCurrentList()) ); - m_gridLayout = new QGridLayout(this,2,3); + m_initCurrentTimer = new TQTimer( this ); + connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) ); + m_gridLayout = new TQGridLayout(this,2,3); m_errorList = new KListView(this); m_warningList = new KListView(this); @@ -118,7 +118,7 @@ m_markIface( 0 ) InitListView(m_currentList); m_currentList->removeColumn(1); - m_widgetStack = new QWidgetStack(this); + m_widgetStack = new TQWidgetStack(this); m_widgetStack->addWidget(m_currentList,0); m_widgetStack->addWidget(m_errorList,1); m_widgetStack->addWidget(m_warningList,2); @@ -126,38 +126,38 @@ m_markIface( 0 ) m_widgetStack->addWidget(m_todoList,4); m_widgetStack->addWidget(m_filteredList,5); - m_tabBar = new QTabBar(this); - m_tabBar->insertTab(new QTab(i18n("Current")),0); - m_tabBar->insertTab(new QTab(i18n("Errors")),1); - m_tabBar->insertTab(new QTab(i18n("Warnings")),2); - m_tabBar->insertTab(new QTab(i18n("Fixme")),3); - m_tabBar->insertTab(new QTab(i18n("Todo")),4); - m_tabBar->insertTab(new QTab(i18n("Filtered")),5); + m_tabBar = new TQTabBar(this); + m_tabBar->insertTab(new TQTab(i18n("Current")),0); + m_tabBar->insertTab(new TQTab(i18n("Errors")),1); + m_tabBar->insertTab(new TQTab(i18n("Warnings")),2); + m_tabBar->insertTab(new TQTab(i18n("Fixme")),3); + m_tabBar->insertTab(new TQTab(i18n("Todo")),4); + m_tabBar->insertTab(new TQTab(i18n("Filtered")),5); m_tabBar->setTabEnabled(0,false); m_tabBar->setTabEnabled(5,false); m_filterEdit = new KLineEdit(this); - QLabel* m_filterLabel = new QLabel(i18n("Lookup:"),this); + TQLabel* m_filterLabel = new TQLabel(i18n("Lookup:"),this); m_gridLayout->addWidget(m_tabBar,0,0); m_gridLayout->addMultiCellWidget(m_widgetStack,1,1,0,2); m_gridLayout->addWidget(m_filterLabel,0,1,Qt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,Qt::AlignLeft); - connect( m_filterEdit, SIGNAL(returnPressed()), - this, SLOT(slotFilter()) ); - connect( m_filterEdit, SIGNAL(textChanged( const QString & )), - this, SLOT(slotFilter()) ); - connect( m_tabBar, SIGNAL(selected(int)), - this, SLOT(slotTabSelected(int)) ); - connect( part->partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partAdded(KParts::Part*)), - this, SLOT(slotPartAdded(KParts::Part*)) ); + connect( m_filterEdit, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(slotFilter()) ); + connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), + this, TQT_SLOT(slotFilter()) ); + connect( m_tabBar, TQT_SIGNAL(selected(int)), + this, TQT_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), + this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); // any editors that were open when we loaded the project needs to have their markType07 icon set too.. - QPtrListIterator<KParts::Part> it( *m_cppSupport->partController()->parts() ); + TQPtrListIterator<KParts::Part> it( *m_cppSupport->partController()->parts() ); while( it.current() ) { if ( KTextEditor::MarkInterfaceExtension* iface = dynamic_cast<KTextEditor::MarkInterfaceExtension*>( it.current() ) ) @@ -193,9 +193,9 @@ void ProblemReporter::slotFilter() } -void ProblemReporter::filterList(KListView* listview, const QString& level) +void ProblemReporter::filterList(KListView* listview, const TQString& level) { - QListViewItemIterator it( listview ); + TQListViewItemIterator it( listview ); while ( it.current() ) { if ( it.current()->text(3).contains(m_filterEdit->text(),false)) @@ -221,11 +221,11 @@ void ProblemReporter::InitListView(KListView* listview) listview->addColumn( i18n("Problem") ); listview->setAllColumnsShowFocus( TRUE ); - connect( listview, SIGNAL(executed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem*)) ); + connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, SIGNAL(returnPressed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem* )) ); + connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem* )) ); } @@ -255,15 +255,15 @@ void EfficientKListView::limitSize( int size ) { if( m_map.size() <= size + 50 ) return; - QMap<int, HashedString> backMap; + TQMap<int, HashedString> backMap; for( InsertionMap::const_iterator it = m_insertionNumbers.begin(); it != m_insertionNumbers.end(); ++it ) backMap[ (*it).second ] = (*it).first; - for( QMap<int, HashedString>::const_iterator it = backMap.begin(); it != backMap.end() && m_map.size() > size; ++it ) + for( TQMap<int, HashedString>::const_iterator it = backMap.begin(); it != backMap.end() && m_map.size() > size; ++it ) removeAllItems( (*it).str() ); } -void EfficientKListView::removeAllItems( const QString& str ) +void EfficientKListView::removeAllItems( const TQString& str ) { HashedString h(str); m_insertionNumbers.erase( h ) ; @@ -277,9 +277,9 @@ void EfficientKListView::removeAllItems( const QString& str ) m_map.erase( p.first, p.second ); } -void ProblemReporter::removeAllProblems( const QString& filename ) +void ProblemReporter::removeAllProblems( const TQString& filename ) { - QString relFileName = m_cppSupport->project()->relativeProjectFile(filename); + TQString relFileName = m_cppSupport->project()->relativeProjectFile(filename); kdDebug(9007) << "ProblemReporter::removeAllProblems()" << relFileName << endl; @@ -295,8 +295,8 @@ void ProblemReporter::removeAllProblems( const QString& filename ) if( m_markIface ) { - QPtrList<KTextEditor::Mark> marks = m_markIface->marks(); - QPtrListIterator<KTextEditor::Mark> it( marks ); + TQPtrList<KTextEditor::Mark> marks = m_markIface->marks(); + TQPtrListIterator<KTextEditor::Mark> it( marks ); while( it.current() ) { m_markIface->removeMark( it.current()->line, KTextEditor::MarkInterface::markType07 ); @@ -310,7 +310,7 @@ void ProblemReporter::initCurrentList() { m_tabBar->setTabEnabled(0,true); - QString relFileName = m_cppSupport->project()->relativeProjectFile(m_fileName); + TQString relFileName = m_cppSupport->project()->relativeProjectFile(m_fileName); m_currentList->clear(); @@ -322,14 +322,14 @@ void ProblemReporter::initCurrentList() // m_tabBar->setCurrentTab(0); } -void ProblemReporter::updateCurrentWith(EfficientKListView& listview, const QString& level, const QString& filename) +void ProblemReporter::updateCurrentWith(EfficientKListView& listview, const TQString& level, const TQString& filename) { EfficientKListView::Range r = listview.getRange( filename ); for( ; r.first != r.second; ++r.first ) new ProblemItem(m_currentList,level,(*r.first).second->text(1),(*r.first).second->text(2),(*r.first).second->text(3)); } -void ProblemReporter::slotSelected( QListViewItem* item ) +void ProblemReporter::slotSelected( TQListViewItem* item ) { bool is_filtered = false; bool is_current = false; @@ -345,20 +345,20 @@ void ProblemReporter::slotSelected( QListViewItem* item ) m_cppSupport->partController()->editDocument( url, line-1 ); } -bool ProblemReporter::hasErrors( const QString& fileName ) { +bool ProblemReporter::hasErrors( const TQString& fileName ) { return m_errorList.hasItem( fileName ); } -void ProblemReporter::reportProblem( const QString& fileName, const Problem& p ) +void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p ) { int markType = levelToMarkType( p.level() ); if( markType != -1 && m_markIface && m_fileName == fileName ) m_markIface->addMark( p.line(), markType ); - QString msg = p.text(); - msg = msg.replace( QRegExp("\n"), "" ); + TQString msg = p.text(); + msg = msg.replace( TQRegExp("\n"), "" ); - QString relFileName = m_cppSupport->project()->relativeProjectFile(fileName); + TQString relFileName = m_cppSupport->project()->relativeProjectFile(fileName); EfficientKListView* list; @@ -384,8 +384,8 @@ void ProblemReporter::reportProblem( const QString& fileName, const Problem& p ) { list->addItem( relFileName, new ProblemItem( *list, relFileName, - QString::number( p.line() + 1 ), - QString::number( p.column() + 1 ), + TQString::number( p.line() + 1 ), + TQString::number( p.column() + 1 ), msg ) ); } @@ -403,20 +403,20 @@ void ProblemReporter::slotPartAdded( KParts::Part* part ) iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("stop") ); } -QString ProblemReporter::levelToString( int level ) const +TQString ProblemReporter::levelToString( int level ) const { switch( level ) { case Problem::Level_Error: - return QString( i18n("Error") ); + return TQString( i18n("Error") ); case Problem::Level_Warning: - return QString( i18n("Warning") ); + return TQString( i18n("Warning") ); case Problem::Level_Todo: - return QString( i18n("Todo") ); + return TQString( i18n("Todo") ); case Problem::Level_Fixme: - return QString( i18n("Fixme") ); + return TQString( i18n("Fixme") ); default: - return QString::null; + return TQString::null; } } diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index d63c2cda..2d5741f4 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -21,8 +21,8 @@ #include <klistview.h> #include <klineedit.h> -#include <qguardedptr.h> -#include <qdatetime.h> +#include <tqguardedptr.h> +#include <tqdatetime.h> #include <map> #include <ext/hash_map> #include "hashedstring.h" @@ -38,7 +38,7 @@ class KURL; class EfficientKListView { public: - typedef __gnu_cxx::hash_multimap<HashedString, QListViewItem*> Map; + typedef __gnu_cxx::hash_multimap<HashedString, TQListViewItem*> Map; typedef std::pair< Map::const_iterator, Map::const_iterator > Range; EfficientKListView( KListView* list = 0 ) : m_list( list ), m_insertionNumber( 0 ) { } @@ -64,22 +64,22 @@ public: return m_list; } - void addItem( const QString& str, QListViewItem* item ) { + void addItem( const TQString& str, TQListViewItem* item ) { HashedString h( str ); m_insertionNumbers[h] = ++m_insertionNumber; m_map.insert( std::make_pair( h, item ) ); } - Range getRange( const QString& str ) const { + Range getRange( const TQString& str ) const { return m_map.equal_range( HashedString(str) ); } ///If the list has more then size items, the first items are removed until the size fits. void limitSize( int size ); - void removeAllItems( const QString& str ); + void removeAllItems( const TQString& str ); - bool hasItem( const QString& str ) const { + bool hasItem( const TQString& str ) const { Map::const_iterator it = m_map.find( HashedString(str) ); return it != m_map.end(); } @@ -106,36 +106,36 @@ class ProblemReporter: public QWidget { Q_OBJECT public: - ProblemReporter( CppSupportPart* part, QWidget* parent = 0, const char* name = 0 ); + ProblemReporter( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); virtual ~ProblemReporter(); - void removeAllProblems( const QString& filename ); - void reportProblem( const QString& fileName, const Problem& p ); - bool hasErrors(const QString& file); + void removeAllProblems( const TQString& filename ); + void reportProblem( const TQString& fileName, const Problem& p ); + bool hasErrors(const TQString& file); public slots: private slots: void slotPartAdded( KParts::Part* ); void slotActivePartChanged( KParts::Part* ); - void slotSelected( QListViewItem* ); + void slotSelected( TQListViewItem* ); void slotTabSelected( int tabindex ); void slotFilter(); void initCurrentList(); private: - QString levelToString( int level ) const; + TQString levelToString( int level ) const; int levelToMarkType( int level ) const; void InitListView( KListView* listview ); - void filterList( KListView* listview, const QString& level ); - void updateCurrentWith( EfficientKListView& listview, const QString& level, const QString& filename ); + void filterList( KListView* listview, const TQString& level ); + void updateCurrentWith( EfficientKListView& listview, const TQString& level, const TQString& filename ); private: - QGridLayout* m_gridLayout; - QTabBar* m_tabBar; - QWidgetStack* m_widgetStack; + TQGridLayout* m_gridLayout; + TQTabBar* m_tabBar; + TQWidgetStack* m_widgetStack; KListView* m_currentList; - QTimer* m_initCurrentTimer; + TQTimer* m_initCurrentTimer; EfficientKListView m_errorList; EfficientKListView m_fixmeList; EfficientKListView m_todoList; @@ -145,7 +145,7 @@ private: CppSupportPart* m_cppSupport; KTextEditor::MarkInterface* m_markIface; - QString m_fileName; + TQString m_fileName; ///@todo move these to cppsupportpart int m_active; diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index f2972fdd..46fa7897 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -21,14 +21,14 @@ #include <domutil.h> #include <kdebug.h> -#include <qdom.h> +#include <tqdom.h> #include <stdlib.h> -const QString QtBuildConfig::m_configRoot = QString( "/kdevcppsupport/qt" ); +const TQString QtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" ); -QtBuildConfig::QtBuildConfig( CppSupportPart * part, QDomDocument* dom ) - : QObject( part ), m_part( part ), m_dom( dom ) +QtBuildConfig::QtBuildConfig( CppSupportPart * part, TQDomDocument* dom ) + : TQObject( part ), m_part( part ), m_dom( dom ) { init(); } @@ -61,13 +61,13 @@ void QtBuildConfig::init( ) } if( m_qmakePath.isEmpty() || !isExecutable( m_qmakePath ) ) { - m_qmakePath = findExecutable( "qmake-qt"+ QString::number( m_version ) ); + m_qmakePath = findExecutable( "qmake-qt"+ TQString::number( m_version ) ); if( m_qmakePath.isEmpty() || !isExecutable( m_qmakePath ) ) m_qmakePath = findExecutable( "qmake" ); } if( m_designerPath.isEmpty() || !isExecutable( m_designerPath ) ) { - m_designerPath = findExecutable( "designer-qt"+QString::number( m_version ) ); + m_designerPath = findExecutable( "designer-qt"+TQString::number( m_version ) ); if( m_designerPath.isEmpty() || !isExecutable( m_designerPath ) ) m_designerPath = findExecutable( "designer" ); } @@ -83,45 +83,45 @@ void QtBuildConfig::init( ) } } -bool QtBuildConfig::isValidQtDir( const QString& path ) const +bool QtBuildConfig::isValidQtDir( const TQString& path ) const { - QFileInfo inc( path + QString( QChar( QDir::separator() ) )+ - "include"+QString( QChar( QDir::separator() ) )+ - "qt.h" ); + TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ + "include"+TQString( TQChar( TQDir::separator() ) )+ + "tqt.h" ); return ( m_version == 4 || ( m_version != 4 && inc.exists() ) ); } -void QtBuildConfig::buildBinDirs( QStringList & dirs ) const +void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const { if( m_version == 3 ) { if( !m_root.isEmpty() ) - dirs << (m_root + QString( QChar( QDir::separator() ) ) + "bin"); - dirs << (::getenv("QTDIR") + QString( QChar( QDir::separator() ) ) + "bin"); + dirs << (m_root + TQString( TQChar( TQDir::separator() ) ) + "bin"); + dirs << (::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin"); } - QStringList paths = QStringList::split(":",::getenv("PATH")); + TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; - QString binpath = QDir::rootDirPath() + "bin"; + TQString binpath = TQDir::rootDirPath() + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; - binpath = QDir::rootDirPath() + "usr" + QString( QChar( QDir::separator() ) ) + "bin"; + binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; - binpath = QDir::rootDirPath() + "usr" + QString( QChar( QDir::separator() ) ) + "local" + QString( QChar( QDir::separator() ) ) + "bin"; + binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; } -QString QtBuildConfig::findExecutable( const QString& execname ) const +TQString QtBuildConfig::findExecutable( const TQString& execname ) const { - QStringList dirs; + TQStringList dirs; buildBinDirs( dirs ); - for( QStringList::Iterator it=dirs.begin(); it!=dirs.end(); ++it ) + for( TQStringList::Iterator it=dirs.begin(); it!=dirs.end(); ++it ) { - QString designer = *it + QString( QChar( QDir::separator() ) ) + execname; + TQString designer = *it + TQString( TQChar( TQDir::separator() ) ) + execname; if( !designer.isEmpty() && isExecutable( designer ) ) { return designer; @@ -130,26 +130,26 @@ QString QtBuildConfig::findExecutable( const QString& execname ) const return ""; } -bool QtBuildConfig::isExecutable( const QString& path ) const +bool QtBuildConfig::isExecutable( const TQString& path ) const { - QFileInfo fi(path); + TQFileInfo fi(path); return( fi.exists() && fi.isExecutable() ); } void QtBuildConfig::findQtDir() { - QStringList qtdirs; + TQStringList qtdirs; if( m_version == 3 ) qtdirs.push_back( ::getenv("QTDIR") ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt"+QString("%1").arg( m_version ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt"+QString( QChar( QDir::separator() ) )+QString("%1").arg( m_version ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"share"+QString( QChar( QDir::separator() ) )+"qt"+QString("%1").arg( m_version ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr" ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt" ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr" ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" ); - for( QStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) + for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) { m_root = qtdir; @@ -187,27 +187,27 @@ void QtBuildConfig::setIncludeStyle( int style ) m_includeStyle = style; } -void QtBuildConfig::setRoot( const QString& root ) +void QtBuildConfig::setRoot( const TQString& root ) { m_root = root; } -void QtBuildConfig::setQMakePath( const QString& path ) +void QtBuildConfig::setQMakePath( const TQString& path ) { m_qmakePath = path; } -void QtBuildConfig::setDesignerPluginPaths( const QStringList& pfx ) +void QtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx ) { m_designerPluginPaths = pfx; } -void QtBuildConfig::setDesignerPath( const QString& path ) +void QtBuildConfig::setDesignerPath( const TQString& path ) { m_designerPath = path; } -void QtBuildConfig::setDesignerIntegration( const QString& designerIntegration ) +void QtBuildConfig::setDesignerIntegration( const TQString& designerIntegration ) { m_designerIntegration = designerIntegration; } diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h index 6042281d..d9790111 100644 --- a/languages/cpp/qtbuildconfig.h +++ b/languages/cpp/qtbuildconfig.h @@ -18,8 +18,8 @@ #ifndef QTBUILDCONFIG_H #define QTBUILDCONFIG_H -#include <qobject.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstringlist.h> class CppSupportPart; class QDomDocument; @@ -34,26 +34,26 @@ class QtBuildConfig : public QObject Q_OBJECT public: - QtBuildConfig( CppSupportPart* part, QDomDocument* dom ); + QtBuildConfig( CppSupportPart* part, TQDomDocument* dom ); virtual ~QtBuildConfig(); inline bool isUsed() const { return m_used; } inline int version() const { return m_version; } inline int includeStyle() const { return m_includeStyle; } - inline const QString& root() const { return m_root; } - inline const QString& qmakePath() const { return m_qmakePath; } - inline const QString& designerPath() const { return m_designerPath; } - inline const QStringList& designerPluginPaths() const { return m_designerPluginPaths; } - inline const QString& designerIntegration() const { return m_designerIntegration; } + inline const TQString& root() const { return m_root; } + inline const TQString& qmakePath() const { return m_qmakePath; } + inline const TQString& designerPath() const { return m_designerPath; } + inline const TQStringList& designerPluginPaths() const { return m_designerPluginPaths; } + inline const TQString& designerIntegration() const { return m_designerIntegration; } void setUsed( bool used ); void setVersion( int version ); void setIncludeStyle( int style ); - void setRoot( const QString& root ); - void setDesignerPath( const QString& path ); - void setDesignerPluginPaths( const QStringList& pfx ); - void setQMakePath( const QString& path ); - void setDesignerIntegration( const QString& designerIntegration ); + void setRoot( const TQString& root ); + void setDesignerPath( const TQString& path ); + void setDesignerPluginPaths( const TQStringList& pfx ); + void setQMakePath( const TQString& path ); + void setDesignerIntegration( const TQString& designerIntegration ); void init(); public slots: @@ -64,25 +64,25 @@ signals: private: - bool isValidQtDir( const QString& ) const; + bool isValidQtDir( const TQString& ) const; void findQtDir(); - QString findExecutable( const QString& ) const; - void buildBinDirs( QStringList& ) const; - bool isExecutable( const QString& ) const; + TQString findExecutable( const TQString& ) const; + void buildBinDirs( TQStringList& ) const; + bool isExecutable( const TQString& ) const; CppSupportPart* m_part; ///< The cpp support part - QDomDocument* m_dom; ///< The project configuration + TQDomDocument* m_dom; ///< The project configuration bool m_used; ///< Flag if qt is used in this project. int m_version; ///< The major version of the qt library (3 or 4) int m_includeStyle; ///< The type of include style used (qt 3 or 4) - QString m_root; ///< The root directory of the used qt installation for Qt3 - QString m_designerPath; ///< The path including the binary name of Qt Designer - QString m_qmakePath; ///< The path including the binary name of QMake - QStringList m_designerPluginPaths; ///< The Prefix for Designer - QString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer + TQString m_root; ///< The root directory of the used qt installation for Qt3 + TQString m_designerPath; ///< The path including the binary name of Qt Designer + TQString m_qmakePath; ///< The path including the binary name of QMake + TQStringList m_designerPluginPaths; ///< The Prefix for Designer + TQString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer - static const QString m_configRoot; ///< The root path of the configuration + static const TQString m_configRoot; ///< The root path of the configuration }; #endif diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index 420cf38e..9314aceb 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -20,8 +20,8 @@ ***************************************************************************/ #include "qtdesignercppintegration.h" -#include <qpair.h> -#include <qregexp.h> +#include <tqpair.h> +#include <tqregexp.h> #include <klocale.h> #include <kdebug.h> @@ -52,7 +52,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function if ( !editIface ) { /// @todo show messagebox - // QDialog::accept(); + // TQDialog::accept(); return ; } @@ -60,14 +60,14 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function klass->getEndPosition( &line, &column ); // compute the insertion point map - QMap<QString, QPair<int, int> > points; + TQMap<TQString, QPair<int, int> > points; const FunctionList functionList = klass->functionList(); for ( FunctionList::ConstIterator it = functionList.begin(); it != functionList.end(); ++it ) { int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); - QString access = accessID( *it ); + TQString access = accessID( *it ); QPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) @@ -78,9 +78,9 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function int insertedLine = 0; - QString access = function.access + ( function.type == KInterfaceDesigner::ftQtSlot ? " slots" : "" ); + TQString access = function.access + ( function.type == KInterfaceDesigner::ftQtSlot ? " slots" : "" ); - QString str = function.returnType + " " + function.function; + TQString str = function.returnType + " " + function.function; if ( function.specifier == "virtual" ) str = "virtual " + str; else if ( function.specifier == "pure virtual" ) @@ -103,7 +103,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( QChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); CppSupportPart *cppPart = dynamic_cast<CppSupportPart *>( m_part ); cppPart->backgroundParser() ->addFile( klass->fileName() ); @@ -113,18 +113,18 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function //implementation - QString stri = function.returnType + " " + klass->name() + "::" + function.function; + TQString stri = function.returnType + " " + klass->name() + "::" + function.function; if ( function.specifier == "static" ) stri = "static " + stri; stri += "\n{\n}\n"; stri = "\n" + stri; - QFileInfo fi( klass->fileName() ); - QString implementationFile = fi.absFilePath(); + TQFileInfo fi( klass->fileName() ); + TQString implementationFile = fi.absFilePath(); implementationFile.replace( ".h", ".cpp" ); - QFileInfo fileInfo( implementationFile ); - if ( !QFile::exists( fileInfo.absFilePath() ) ) + TQFileInfo fileInfo( implementationFile ); + if ( !TQFile::exists( fileInfo.absFilePath() ) ) { if ( KDevCreateFile * createFileSupp = m_part->extension<KDevCreateFile>( "KDevelop/CreateFile" ) ) createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.fileName() ); @@ -158,7 +158,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function } else { - if ( editIface->textLine( line ).contains( QRegExp( ".*#include .*\\.moc.*" ) ) ) + if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.moc.*" ) ) ) atLine = line; break; } @@ -167,7 +167,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function atColumn = 0; } - // editIface->insertLine( atLine + 1, QString::fromLatin1("") ); + // editIface->insertLine( atLine + 1, TQString::fromLatin1("") ); kdDebug() << "at line in intg: " << atLine << " atCol: " << atColumn << endl; kdDebug() << "text: " << stri << endl; editIface->insertText( atLine, atColumn, stri ); @@ -182,33 +182,33 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function cppPart->backgroundParser() ->addFile( implementationFile ); } -QString QtDesignerCppIntegration::accessID( FunctionDom fun ) const +TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const { if ( fun->isSignal() ) - return QString::fromLatin1( "signals" ); + return TQString::fromLatin1( "signals" ); switch ( fun->access() ) { case CodeModelItem::Public: if ( fun->isSlot() ) - return QString::fromLatin1( "public slots" ); - return QString::fromLatin1( "public" ); + return TQString::fromLatin1( "public slots" ); + return TQString::fromLatin1( "public" ); case CodeModelItem::Protected: if ( fun->isSlot() ) - return QString::fromLatin1( "protected slots" ); - return QString::fromLatin1( "protected" ); + return TQString::fromLatin1( "protected slots" ); + return TQString::fromLatin1( "protected" ); case CodeModelItem::Private: if ( fun->isSlot() ) - return QString::fromLatin1( "private slots" ); - return QString::fromLatin1( "private" ); + return TQString::fromLatin1( "private slots" ); + return TQString::fromLatin1( "private" ); } - return QString::null; + return TQString::null; } -void QtDesignerCppIntegration::processImplementationName( QString &name ) +void QtDesignerCppIntegration::processImplementationName( TQString &name ) { name.replace( ".h", ".cpp" ); } diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h index 93a250a1..6721c9df 100644 --- a/languages/cpp/qtdesignercppintegration.h +++ b/languages/cpp/qtdesignercppintegration.h @@ -30,9 +30,9 @@ public: protected: virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass ); - QString accessID( FunctionDom fun ) const; + TQString accessID( FunctionDom fun ) const; - virtual void processImplementationName( QString &name ); + virtual void processImplementationName( TQString &name ); }; #endif diff --git a/languages/cpp/setuphelper.cpp b/languages/cpp/setuphelper.cpp index deab6135..63b4fd94 100644 --- a/languages/cpp/setuphelper.cpp +++ b/languages/cpp/setuphelper.cpp @@ -16,39 +16,39 @@ #include <kdebug.h> #include "ktempfile.h" /* defines [function] KTempDir */ #include "kstandarddirs.h" /* defines [function] locateLocal */ -#include "qdir.h" /* defines QDir */ +#include "tqdir.h" /* defines TQDir */ #include <stdio.h> namespace SetupHelper { -QString getGccIncludePath(bool *ok) +TQString getGccIncludePath(bool *ok) { *ok = true; - QString processStdout; + TQString processStdout; BlockingKProcess proc; proc << "gcc" ; proc << "-print-file-name=include" ; if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; - return QString(); + return TQString(); } processStdout = proc.stdOut(); return processStdout; } -QString getVerboseGccIncludePath(bool *ok) +TQString getVerboseGccIncludePath(bool *ok) { *ok = false; ///Create temp file KTempFile tempFile(locateLocal("tmp", "kdevelop_temp"), ".cpp"); tempFile.setAutoDelete(true); if( tempFile.status() != 0 ) - return QString();//Failed to create temp file + return TQString();//Failed to create temp file - QString path = tempFile.name(); - QFileInfo pathInfo( path ); + TQString path = tempFile.name(); + TQFileInfo pathInfo( path ); char fileText[] = "//This source-file is empty"; fwrite(fileText, strlen(fileText), 1, tempFile.fstream() ); @@ -61,16 +61,16 @@ QString getVerboseGccIncludePath(bool *ok) if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; - return QString(); + return TQString(); } *ok = true; return proc.stdOut(); } -QStringList getGccMacros(bool *ok) +TQStringList getGccMacros(bool *ok) { *ok = true; - QString processStdout; + TQString processStdout; BlockingKProcess proc; proc << "gcc"; proc << "-E"; @@ -80,11 +80,11 @@ QStringList getGccMacros(bool *ok) if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; - return QStringList(); + return TQStringList(); } proc.closeStdin(); processStdout = proc.stdOut(); - QStringList lines = QStringList::split('\n', processStdout); + TQStringList lines = TQStringList::split('\n', processStdout); return lines; } diff --git a/languages/cpp/setuphelper.h b/languages/cpp/setuphelper.h index 380994b4..aa95296a 100644 --- a/languages/cpp/setuphelper.h +++ b/languages/cpp/setuphelper.h @@ -13,7 +13,7 @@ #ifndef SETUPHELPER_H #define SETUPHELPER_H -#include <qstringlist.h> +#include <tqstringlist.h> /** A helper methods for setting up the various Driver derivates. @@ -24,19 +24,19 @@ namespace SetupHelper { /** Get the include paths returned by gcc. * @param ok false if there was a problem running gcc */ - QString getGccIncludePath(bool *ok); + TQString getGccIncludePath(bool *ok); /** Get the include-path return by gcc -v * this path includes the path from the environment, * the c++-include-path, etc., and of couse it also includes the above path. * @param ok false if there was a problem running gcc * */ - QString getVerboseGccIncludePath(bool* ok); + TQString getVerboseGccIncludePath(bool* ok); /** Get the predefined macros returned by gcc * @param ok false if there was a problem running gcc */ - QStringList getGccMacros(bool *ok); + TQStringList getGccMacros(bool *ok); }; #endif diff --git a/languages/cpp/simplecontext.cpp b/languages/cpp/simplecontext.cpp index 08af929d..225bfc84 100644 --- a/languages/cpp/simplecontext.cpp +++ b/languages/cpp/simplecontext.cpp @@ -34,7 +34,7 @@ SimpleType getGlobal( SimpleType t ) { } void SimpleContext::offset( int lineOffset, int colOffset ) { - for( QValueList<SimpleVariable>::iterator it = m_vars.begin(); it != m_vars.end(); ++it ) { + for( TQValueList<SimpleVariable>::iterator it = m_vars.begin(); it != m_vars.end(); ++it ) { if( (*it).endLine != (*it).startLine || (*it).endCol != (*it).startCol) { if( (*it).startLine == 0 ) { (*it).startCol += colOffset; @@ -48,12 +48,12 @@ void SimpleContext::offset( int lineOffset, int colOffset ) { } } -SimpleVariable SimpleContext::findVariable( const QString& varname ) +SimpleVariable SimpleContext::findVariable( const TQString& varname ) { SimpleContext * ctx = this; while ( ctx ) { - const QValueList<SimpleVariable>& vars = ctx->vars(); + const TQValueList<SimpleVariable>& vars = ctx->vars(); for ( int i = vars.count() - 1; i >= 0; --i ) { SimpleVariable v = vars[ i ]; diff --git a/languages/cpp/simplecontext.h b/languages/cpp/simplecontext.h index 310d4f4d..d1fde70a 100644 --- a/languages/cpp/simplecontext.h +++ b/languages/cpp/simplecontext.h @@ -22,8 +22,8 @@ #ifndef SIMPLECONTEXT_H #define SIMPLECONTEXT_H -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include "declarationinfo.h" #include "typedesc.h" @@ -65,14 +65,14 @@ public: return *this; } - QString name; - QString comment; + TQString name; + TQString comment; int startLine, startCol; int endLine, endCol; TypeDesc type; - QStringList ptrList; + TQStringList ptrList; - DeclarationInfo toDeclarationInfo( QString activeFileName ) { + DeclarationInfo toDeclarationInfo( TQString activeFileName ) { DeclarationInfo decl; decl.name = name; decl.file = activeFileName; @@ -118,7 +118,7 @@ class SimpleContext m_prev = 0; } - const QValueList<SimpleVariable>& vars() const + const TQValueList<SimpleVariable>& vars() const { return m_vars; } @@ -128,24 +128,24 @@ class SimpleContext m_vars.append( v ); } - void add( const QValueList<SimpleVariable>& vars ) + void add( const TQValueList<SimpleVariable>& vars ) { m_vars += vars; } //First the new name, aka "" for real imports, second the name to be imported - void addImport( const QPair<QString, QString>& import ) { + void addImport( const QPair<TQString, TQString>& import ) { m_imports << import; } //Key the new name, aka "" for real imports, second the name to be imported - QValueList<QPair<QString, QString> > imports() { + TQValueList<QPair<TQString, TQString> > imports() { return m_imports; } void offset( int lineOffset, int colOffset ); - SimpleVariable findVariable( const QString& varname ); + SimpleVariable findVariable( const TQString& varname ); SimpleType global() { return getGlobal( container() ); @@ -161,8 +161,8 @@ class SimpleContext } private: - QValueList<SimpleVariable> m_vars; - QValueList<QPair<QString, QString> > m_imports; + TQValueList<SimpleVariable> m_vars; + TQValueList<QPair<TQString, TQString> > m_imports; SimpleContext* m_prev; SimpleType m_container; }; diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index e4334ae5..5111a2a0 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -17,7 +17,7 @@ #include "simpletypefunction.h" #include <klocale.h> -QMap<QString, QString> BuiltinTypes::m_types; +TQMap<TQString, TQString> BuiltinTypes::m_types; BuiltinTypes builtin; //Needed so BuiltinTypes::BuiltinTypes is called and the types are initialized BuiltinTypes::BuiltinTypes() { @@ -42,12 +42,12 @@ bool BuiltinTypes::isBuiltin( const TypeDesc& desc ) { return m_types.find( desc.name() ) != m_types.end(); } -QString BuiltinTypes::comment( const TypeDesc& desc ) { - QMap<QString, QString>::iterator it = m_types.find( desc.name() ); +TQString BuiltinTypes::comment( const TypeDesc& desc ) { + TQMap<TQString, TQString>::iterator it = m_types.find( desc.name() ); if( it != m_types.end() ) { return *it; } else { - return QString::null; + return TQString::null; } } @@ -56,7 +56,7 @@ extern SafetyCounter safetyCounter; TypePointer SimpleType::m_globalNamespace; SimpleType::TypeStore SimpleType::m_typeStore; SimpleType::TypeStore SimpleType::m_destroyedStore; -QString globalCurrentFile = ""; +TQString globalCurrentFile = ""; //SimpleType implementation @@ -178,15 +178,15 @@ void SimpleType::makePrivate() { m_type = m_type->clone(); } -const QStringList& SimpleType::scope() const { +const TQStringList& SimpleType::scope() const { return m_type -> scope(); } -const QString SimpleType::str() const { +const TQString SimpleType::str() const { return m_type -> str(); } -void SimpleType::init( const QStringList& scope, const HashedStringSet& files, Repository rep ) { +void SimpleType::init( const TQStringList& scope, const HashedStringSet& files, Repository rep ) { m_includeFiles = files; m_type = TypePointer( new SimpleTypeImpl( scope ) ); @@ -204,10 +204,10 @@ SimpleType::SimpleType( Tag tag ) : m_resolved(true) { // //SimpleTypeImpl implementation -QValueList<LocateResult> SimpleTypeImpl::getBases() { -QValueList<LocateResult> ret; - QStringList bases = getBaseStrings(); - for( QStringList::const_iterator it = bases.begin(); it != bases.end(); ++it ) { +TQValueList<LocateResult> SimpleTypeImpl::getBases() { +TQValueList<LocateResult> ret; + TQStringList bases = getBaseStrings(); + for( TQStringList::const_iterator it = bases.begin(); it != bases.end(); ++it ) { TypeDesc d( *it ); d.setIncludeFiles( m_findIncludeFiles ); LocateResult res = locateDecType( d, LocateBase ); @@ -286,7 +286,7 @@ SimpleTypeFunctionInterface* SimpleTypeImpl::asFunction() { return dynamic_cast<SimpleTypeFunctionInterface*> ( this ); } -QString SimpleTypeImpl::operatorToString( Operator op ) { +TQString SimpleTypeImpl::operatorToString( Operator op ) { switch ( op ) { case NoOp: return "NoOp"; @@ -301,11 +301,11 @@ QString SimpleTypeImpl::operatorToString( Operator op ) { case ParenOp: return "paren-operator"; default: - return QString( "%1" ).arg( ( long ) op ); + return TQString( "%1" ).arg( ( long ) op ); }; } -LocateResult SimpleTypeImpl::getFunctionReturnType( QString functionName, QValueList<LocateResult> params ) { +LocateResult SimpleTypeImpl::getFunctionReturnType( TQString functionName, TQValueList<LocateResult> params ) { LocateResult t = typeOf( functionName, MemberInfo::Function ).type; if ( t->resolved() && t->resolved() ->asFunction() ) { return t->resolved() ->applyOperator( ParenOp, params ); @@ -315,7 +315,7 @@ LocateResult SimpleTypeImpl::getFunctionReturnType( QString functionName, QValue } } -LocateResult SimpleTypeImpl::applyOperator( Operator op , QValueList<LocateResult> params ) { +LocateResult SimpleTypeImpl::applyOperator( Operator op , TQValueList<LocateResult> params ) { Debug d( "#applyn#" ); if ( !d || !safetyCounter ) return LocateResult(); @@ -540,7 +540,7 @@ class TemplateParamMatch { private: TypePointer m_candidate; SimpleTypeImpl::TemplateParamInfo m_candidateParams; - QMap<QString, LocateResult> m_hadParameters; + TQMap<TQString, LocateResult> m_hadParameters; bool m_matched; int m_maxDepth; }; @@ -562,7 +562,7 @@ void SimpleTypeImpl::chooseSpecialization( MemberInfo& member ) { if ( m_masterProxy ) t = m_masterProxy; - QValueList<TypePointer> classes = t->getMemberClasses( type->desc() ); + TQValueList<TypePointer> classes = t->getMemberClasses( type->desc() ); //Find the specialization that fits the given template-parameters the best @@ -591,7 +591,7 @@ void SimpleTypeImpl::chooseSpecialization( MemberInfo& member ) { TemplateParamMatch bestMatch; - for ( QValueList<TypePointer>::iterator it = classes.begin(); it != classes.end(); ++it ) { + for ( TQValueList<TypePointer>::iterator it = classes.begin(); it != classes.end(); ++it ) { if ( ( *it ) ->specialization().isEmpty() ) continue; TemplateParamMatch match( ( *it ), member.type.desc() ); @@ -776,11 +776,11 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ///Ask bases but only on this level if ( ! ( mode & ExcludeBases ) ) { - QValueList<LocateResult> bases = getBases(); + TQValueList<LocateResult> bases = getBases(); if ( !bases.isEmpty() ) { TypeDesc nameInBase = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration - for ( QValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { + for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; LocateResult t = ( *it ) ->resolved() ->locateType( nameInBase, addFlag( addFlag( mode, ExcludeTemplates ), ExcludeParents ), dir ); ///The searched Type cannot directly be a template-param in the base-class, so ExcludeTemplates. It's forgotten early enough. @@ -806,9 +806,9 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ///Ask the bases and allow them to search in their parents. if ( ! ( mode & ExcludeBases ) ) { TypeDesc baseName = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration - QValueList<LocateResult> bases = getBases(); + TQValueList<LocateResult> bases = getBases(); if ( !bases.isEmpty() ) { - for ( QValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { + for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; LocateResult t = ( *it ) ->resolved() ->locateType( baseName, addFlag( mode, ExcludeTemplates ), dir ); ///The searched Type cannot directly be a template-param in the base-class, so ExcludeTemplates. It's forgotten early enough. @@ -849,7 +849,7 @@ SimpleType SimpleTypeImpl::parent() { } else { ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl ); invalidateSecondaryCache(); - QStringList sc = scope(); + TQStringList sc = scope(); if ( !sc.isEmpty() ) { sc.pop_back(); @@ -880,11 +880,11 @@ TypeDesc& SimpleTypeImpl::descForEdit() { return m_desc; } -QString SimpleTypeImpl::describeWithParams() { +TQString SimpleTypeImpl::describeWithParams() { TemplateParamInfo pinfo = getTemplateParamInfo(); int num = 0; TemplateParamInfo::TemplateParam param; - QString str = desc().name(); + TQString str = desc().name(); if ( desc().hasTemplateParams() ) { str += "< "; @@ -904,7 +904,7 @@ QString SimpleTypeImpl::describeWithParams() { return str; } -QString SimpleTypeImpl::fullTypeResolved( int depth ) { +TQString SimpleTypeImpl::fullTypeResolved( int depth ) { Debug d( "#tre#" ); TypeDesc t = desc(); @@ -924,7 +924,7 @@ QString SimpleTypeImpl::fullTypeResolved( int depth ) { } -QString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { +TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { if ( m_parent && !m_parent->scope().isEmpty() ) { return m_parent->fullTypeUnresolvedWithScope() + "::" + m_desc.fullNameChain(); } else { @@ -932,7 +932,7 @@ QString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { } } -QString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { +TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { Q_UNUSED( depth ); if ( !m_scope.isEmpty() && parent() ) { return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); @@ -944,7 +944,7 @@ QString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { void SimpleTypeImpl::checkTemplateParams () { invalidateCache(); if ( ! m_scope.isEmpty() ) { - QString str = m_scope.back(); + TQString str = m_scope.back(); m_desc = str; if ( !m_desc.name().isEmpty() ) { m_scope.pop_back(); @@ -955,18 +955,18 @@ void SimpleTypeImpl::checkTemplateParams () { } } -void SimpleTypeImpl::setScope( const QStringList& scope ) { +void SimpleTypeImpl::setScope( const TQStringList& scope ) { invalidateCache(); m_scope = scope; if ( m_scope.count() == 1 && m_scope.front().isEmpty() ) { //kdDebug() << "bad scope set " << kdBacktrace() << endl; - m_scope = QStringList(); + m_scope = TQStringList(); } } SimpleTypeImpl::TypeOfResult SimpleTypeImpl::searchBases ( const TypeDesc& name /*option!!*/ ) { - QValueList<LocateResult> parents = getBases(); - for ( QValueList<LocateResult>::iterator it = parents.begin(); it != parents.end(); ++it ) { + TQValueList<LocateResult> parents = getBases(); + for ( TQValueList<LocateResult>::iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; TypeOfResult type = ( *it ) ->resolved() ->typeOf( name ); @@ -997,8 +997,8 @@ void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) { //SimpleTypeImpl::TemplateParamInfo implementation -bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, QString name ) const { - QMap<QString, TemplateParam>::const_iterator it = m_paramsByName.find( name ); +bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQString name ) const { + TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.find( name ); if ( it != m_paramsByName.end() ) { target = *it; return true; @@ -1007,7 +1007,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, QString } bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int number ) const { - QMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.find( number ); + TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.find( number ); if ( it != m_paramsByNumber.end() ) { target = *it; return true; @@ -1016,7 +1016,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int num } void SimpleTypeImpl::TemplateParamInfo::removeParam( int number ) { - QMap<int, TemplateParam>::iterator it = m_paramsByNumber.find( number ); + TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.find( number ); if ( it != m_paramsByNumber.end() ) { m_paramsByName.remove( ( *it ).name ); m_paramsByNumber.remove( it ); @@ -1029,7 +1029,7 @@ void SimpleTypeImpl::TemplateParamInfo::addParam( const TemplateParam& param ) { } int SimpleTypeImpl::TemplateParamInfo::count() const { - QMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.end(); + TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.end(); if ( it != m_paramsByNumber.begin() ) { --it; return ( *it ).number + 1; diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index 3e6f82d3..19fb22cc 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -23,14 +23,14 @@ #include "completiondebug.h" #include "typedesc.h" #include "declarationinfo.h" -#include <qpair.h> +#include <tqpair.h> #include "cpp_tags.h" #include "codemodel.h" #define NOBACKTRACE -extern QString globalCurrentFile; +extern TQString globalCurrentFile; using namespace CompletionDebug; using namespace BitHelpers; @@ -58,10 +58,10 @@ class BuiltinTypes { ///This should be used for checking whether a type is builtin static bool isBuiltin( const TypeDesc& desc ); ///If it is a builtin type this returns a short description of the type - static QString comment( const TypeDesc& desc ); + static TQString comment( const TypeDesc& desc ); BuiltinTypes(); private: - static QMap<QString, QString> m_types; + static TQMap<TQString, TQString> m_types; }; @@ -82,16 +82,16 @@ class SimpleType { *this = rhs; } - SimpleType( const QStringList& scope, const HashedStringSet& files, Repository rep = RepoUndefined ) : m_resolved( false ) { + SimpleType( const TQStringList& scope, const HashedStringSet& files, Repository rep = RepoUndefined ) : m_resolved( false ) { init( scope, files, rep ); } - SimpleType( const QString& text,const HashedStringSet& files, Repository rep = RepoUndefined ) : m_resolved( false ) { + SimpleType( const TQString& text,const HashedStringSet& files, Repository rep = RepoUndefined ) : m_resolved( false ) { init( splitType( text ), files, rep ); }; SimpleType( Repository rep = RepoUndefined ) : m_resolved( false ) { - init( QStringList(), HashedStringSet(), rep ); + init( TQStringList(), HashedStringSet(), rep ); }; SimpleType( SimpleTypeImpl* ip ) : m_type( TypePointer( ip ) ), m_resolved( true ) {} @@ -132,14 +132,14 @@ class SimpleType { void makePrivate(); - operator QString() const { + operator TQString() const { return str(); } ///lazily returns the scope - const QStringList& scope() const; + const TQStringList& scope() const; - const QString str() const; + const TQString str() const; ///valid() does not check whether the type was found in some model, ///it just checks whether this theoretically represents a type. @@ -168,7 +168,7 @@ class SimpleType { private: - void init( const QStringList& scope, const HashedStringSet& files, Repository rep ); + void init( const TQStringList& scope, const HashedStringSet& files, Repository rep ); void resolve( Repository rep = RepoUndefined ) const ; @@ -201,7 +201,7 @@ class SimpleType { class SimpleTypeConfiguration { bool m_invalid; public: - SimpleTypeConfiguration( QString currentFileName = "" ) : m_invalid( false ) { + SimpleTypeConfiguration( TQString currentFileName = "" ) : m_invalid( false ) { globalCurrentFile = currentFileName; dbgState.clearCounter(); } @@ -231,7 +231,7 @@ class SimpleTypeImpl : public KShared { public: typedef KSharedPtr<SimpleTypeImpl> TypePointer; - SimpleTypeImpl( const QStringList& scope ) : m_resolutionCount( 0 ), m_resolutionFlags( NoFlag ), m_scope( scope ) { + SimpleTypeImpl( const TQStringList& scope ) : m_resolutionCount( 0 ), m_resolutionFlags( NoFlag ), m_scope( scope ) { setScope( m_scope ); checkTemplateParams(); reg(); @@ -250,14 +250,14 @@ class SimpleTypeImpl : public KShared { }; ///Returns the template-specialization-string for classes - virtual QString specialization() const { - return QString::null; + virtual TQString specialization() const { + return TQString::null; } class TemplateParamInfo { public: struct TemplateParam { - QString name; + TQString name; TypeDesc def; TypeDesc value; int number; @@ -267,7 +267,7 @@ class SimpleTypeImpl : public KShared { TemplateParamInfo( ) {} - bool getParam( TemplateParam& target, QString name ) const; + bool getParam( TemplateParam& target, TQString name ) const; bool getParam( TemplateParam& target, int number ) const; @@ -278,8 +278,8 @@ class SimpleTypeImpl : public KShared { int count() const; private: - QMap<int, TemplateParam> m_paramsByNumber; - QMap<QString, TemplateParam> m_paramsByName; + TQMap<int, TemplateParam> m_paramsByNumber; + TQMap<TQString, TemplateParam> m_paramsByName; }; int resolutionCount() { @@ -317,7 +317,7 @@ class SimpleTypeImpl : public KShared { return false; }; - virtual QString comment() const { + virtual TQString comment() const { return ""; }; @@ -334,7 +334,7 @@ class SimpleTypeImpl : public KShared { } ///@todo remove this and use getTemplateParamInfo instead - virtual const LocateResult findTemplateParam( const QString& /*name*/ ) { + virtual const LocateResult findTemplateParam( const TQString& /*name*/ ) { return LocateResult(); } @@ -386,10 +386,10 @@ class SimpleTypeImpl : public KShared { m_resolutionCount = val; } #ifndef NOBACKTRACE - QString create_bt; + TQString create_bt; #endif - inline QString createInfo() const { + inline TQString createInfo() const { #ifndef NOBACKTRACE return "\n" + create_bt + "\n"; #endif @@ -424,15 +424,15 @@ class SimpleTypeImpl : public KShared { ///when the object pointed to changes virtual void invalidatePrimaryCache( bool onlyNegative = false ) {} - static QString operatorToString( Operator op ); + static TQString operatorToString( Operator op ); public: /* - operator QString() const { + operator TQString() const { return str(); } - inline operator QStringList() const { + inline operator TQStringList() const { return m_scope; }*/ @@ -458,22 +458,22 @@ class SimpleTypeImpl : public KShared { ///returns the scope(including own name) as string - QString str() const { + TQString str() const { if ( m_scope.isEmpty() ) return ""; return m_scope.join( "::" ); } ///returns the scope(including own name) as string-list - inline const QStringList& scope() const { + inline const TQStringList& scope() const { return m_scope; } ///Returns the scope including template-specialization - QStringList specializedScope() const { - QStringList ts = m_scope; + TQStringList specializedScope() const { + TQStringList ts = m_scope; if( !ts.isEmpty() ) { - QString s = ts.back() + specialization(); + TQString s = ts.back() + specialization(); ts.pop_back(); ts.push_back( s ); } @@ -554,7 +554,7 @@ class SimpleTypeImpl : public KShared { memberType = NotFound; } - QString memberTypeToString() { + TQString memberTypeToString() { switch ( memberType ) { case Namespace: return "namespace"; @@ -599,7 +599,7 @@ class SimpleTypeImpl : public KShared { return memberType != NotFound; } - QString name; + TQString name; LocateResult type; ///This member is only filles for variables, typedefs and template-params! @@ -651,17 +651,17 @@ class SimpleTypeImpl : public KShared { public: - LocateResult getFunctionReturnType( QString functionName, QValueList<LocateResult> params = QValueList<LocateResult>() ); + LocateResult getFunctionReturnType( TQString functionName, TQValueList<LocateResult> params = TQValueList<LocateResult>() ); ///Tries to apply the operator and returns the new type. If it fails, it returns an invalid type. - virtual LocateResult applyOperator( Operator op , QValueList<LocateResult> params = QValueList<LocateResult>() ); + virtual LocateResult applyOperator( Operator op , TQValueList<LocateResult> params = TQValueList<LocateResult>() ); /** In case of a class, returns all base-types */ - virtual QValueList<LocateResult> getBases(); + virtual TQValueList<LocateResult> getBases(); - virtual QStringList getBaseStrings() { - return QStringList(); + virtual TQStringList getBaseStrings() { + return TQStringList(); }; ///This pair contains the found type, and additionally the member-information that helped finding the type @@ -708,8 +708,8 @@ class SimpleTypeImpl : public KShared { }; ///Should return all specializations of a specific class-name - virtual QValueList<TypePointer> findSpecializations( const QString& name ) { - return QValueList<TypePointer>(); + virtual TQValueList<TypePointer> findSpecializations( const TQString& name ) { + return TQValueList<TypePointer>(); } /**TypeDescs and SimpleTypeImpls usually have a cross-reference, which creates a circular dependency so that they are never freed using KShared. This function breaks the loop, and also breaks all other possible dependency-loops. After this function was called, the type still contains its private information, but can not not be used to resolve anything anymore. This function is called automatically while the destruction of SimpleTypeConfiguration */ @@ -727,37 +727,37 @@ class SimpleTypeImpl : public KShared { TypeDesc& descForEdit(); ///short version - QString fullType() const { + TQString fullType() const { return m_desc.fullName(); } ///Similar to fullTypeResolved, except that it also shows addition information about template-params - QString describeWithParams() ; + TQString describeWithParams() ; ///returns all information that is available constantly - QString describe() const { - QString description = m_desc.fullName() + " (" + m_scope.join( "::" ) + ")" + createInfo(); + TQString describe() const { + TQString description = m_desc.fullName() + " (" + m_scope.join( "::" ) + ")" + createInfo(); return description; } ///this completely evaluates everything - QString fullTypeResolved( int depth = 0 ); + TQString fullTypeResolved( int depth = 0 ); ///this completely evaluates everything - QString fullTypeResolvedWithScope( int depth = 0 ); + TQString fullTypeResolvedWithScope( int depth = 0 ); - QString fullTypeUnresolvedWithScope(); + TQString fullTypeUnresolvedWithScope(); - virtual QValueList<TypePointer> getMemberClasses( const TypeDesc& name ) { - return QValueList<TypePointer>(); + virtual TQValueList<TypePointer> getMemberClasses( const TypeDesc& name ) { + return TQValueList<TypePointer>(); } ///Returns the include-file-set used for resolving this type IncludeFiles getFindIncludeFiles(); private: - QStringList m_scope; + TQStringList m_scope; TypePointer m_parent; IncludeFiles m_findIncludeFiles; //Set of include-files used for finding this object @@ -771,7 +771,7 @@ class SimpleTypeImpl : public KShared { /** Tries to extract template-parameters from the scope, resets the params-list */ virtual void checkTemplateParams (); - void setScope( const QStringList& scope ); + void setScope( const TQStringList& scope ); ///Searches the item IN the bases TypeOfResult searchBases ( const TypeDesc& name ); @@ -786,10 +786,10 @@ class SimpleTypeImpl : public KShared { class TypeTrace { - QValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> > m_trace; + TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> > m_trace; public: - QValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> >& trace() { + TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> >& trace() { return m_trace; }; @@ -799,9 +799,9 @@ class TypeTrace { void prepend( const TypeTrace& trace, int indent = 0 ) { /* if( indent != 0 ) { - QString ind; + TQString ind; for( int a = 0; a < indent; a++ ) ind += " "; - for( QValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> >::const_iterator it = trace.m_trace.end(); it != trace.m_trace.begin(); ) { + for( TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> >::const_iterator it = trace.m_trace.end(); it != trace.m_trace.begin(); ) { --it; QPair<SimpleTypeImpl::MemberInfo, TypeDesc> item = *it; item.second.prependDecoration( ind ); diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h index 0cc5e2b0..3f950cbf 100644 --- a/languages/cpp/simpletypecachebinder.h +++ b/languages/cpp/simpletypecachebinder.h @@ -41,7 +41,7 @@ class SimpleTypeCacheBinder : public Base { struct LocateDesc { TypeDesc mname; - //QString fullName; + //TQString fullName; SimpleTypeImpl::LocateMode mmode; int mdir; SimpleTypeImpl::MemberInfo::MemberType mtypeMask; @@ -120,7 +120,7 @@ class SimpleTypeCacheBinder : public Base { struct MemberFindDesc { TypeDesc m_desc; - QString fullName; + TQString fullName; SimpleTypeImpl::MemberInfo::MemberType findType; size_t m_hashKey; //in time check why it is necessary to cache this key size_t m_hashKey2; @@ -134,8 +134,8 @@ class SimpleTypeCacheBinder : public Base { int compare( const MemberFindDesc& rhs ) const { if ( fullName.isEmpty() ) const_cast<MemberFindDesc*>(this)->fullName = m_desc.fullNameChain(); if ( rhs.fullName.isEmpty() ) const_cast<MemberFindDesc*>(&rhs)->fullName = rhs.m_desc.fullNameChain(); - const QString& a = fullName; //m_desc.fullNameChain(); - const QString& b = rhs.fullName; //m_desc.fullNameChain(); + const TQString& a = fullName; //m_desc.fullNameChain(); + const TQString& b = rhs.fullName; //m_desc.fullNameChain(); if ( a != b ) { if ( a < b ) return -1; @@ -179,7 +179,7 @@ class SimpleTypeCacheBinder : public Base { typedef __gnu_cxx::hash_map<LocateDesc, LocateResult, typename LocateDesc::hash > LocateMap; typedef __gnu_cxx::hash_map<MemberFindDesc, SimpleTypeImpl::MemberInfo, typename MemberFindDesc::hash > MemberMap; - typedef __gnu_cxx::hash_map<MemberFindDesc, QValueList<TypePointer>, typename MemberFindDesc::hash > ClassListMap; + typedef __gnu_cxx::hash_map<MemberFindDesc, TQValueList<TypePointer>, typename MemberFindDesc::hash > ClassListMap; virtual SimpleTypeImpl::MemberInfo findMember( TypeDesc name, SimpleTypeImpl::MemberInfo::MemberType type ) { if ( !primaryActive ) @@ -211,7 +211,7 @@ class SimpleTypeCacheBinder : public Base { } } - virtual QValueList<TypePointer> getMemberClasses( const TypeDesc& name ) { + virtual TQValueList<TypePointer> getMemberClasses( const TypeDesc& name ) { if ( !primaryActive ) return Base::getMemberClasses( name ); MemberFindDesc key( name, Base::MemberInfo::NestedType ); @@ -221,7 +221,7 @@ class SimpleTypeCacheBinder : public Base { /*ifVerbose( dbg() << "\"" << Base::str() << "\" took member-info for \"" << name.fullNameChain() << "\" from the cache: " << (*it).second. << endl );*/ return (*it).second; } else { - QValueList<TypePointer> mem; + TQValueList<TypePointer> mem; m_classListCache.insert( std::make_pair( key, mem ) ); @@ -267,7 +267,7 @@ class SimpleTypeCacheBinder : public Base { } } - virtual QValueList<LocateResult> getBases() { + virtual TQValueList<LocateResult> getBases() { ///@todo this needs a lookup for different includeFiles.. if ( m_haveBasesCache ) { ifVerbose( dbg() << "\"" << Base::str() << "\" took base-info from the cache" << endl ); @@ -283,7 +283,7 @@ class SimpleTypeCacheBinder : public Base { LocateMap m_locateCache; MemberMap m_memberCache; ClassListMap m_classListCache; - QValueList<LocateResult> m_basesCache; + TQValueList<LocateResult> m_basesCache; bool m_haveBasesCache; bool secondaryActive, primaryActive; diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp index 2b02cd9e..f662acc5 100644 --- a/languages/cpp/simpletypecatalog.cpp +++ b/languages/cpp/simpletypecatalog.cpp @@ -24,21 +24,21 @@ TypePointer SimpleTypeCatalog::clone() { return new SimpleTypeCachedCatalog( this ); } -QString SimpleTypeCatalog::specialization() const { +TQString SimpleTypeCatalog::specialization() const { return m_tag.getSpecializationDeclaration(); } void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { if ( m_tag.kind() != Tag::Kind_Namespace ) return; - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; ///Insert all namespace-imports args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "kind", Tag::Kind_UsingDirective ); - QValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); - for ( QValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { TypeDesc d( (*it).name() ); d.setIncludeFiles( HashedString((*it).fileName()) ); ///@todo implement the include-file-logic ns->addAliasMap( TypeDesc(), d, HashedString((*it).fileName()), true, false, bigContainer() ); @@ -50,9 +50,9 @@ void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { tags = cppCompletionInstance->m_repository->query( args ); - for ( QValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { - QVariant v = (*it).attribute( "alias" ); - if ( v.type() == QVariant::String ) { + for ( TQValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { + TQVariant v = (*it).attribute( "alias" ); + if ( v.type() == TQVariant::String ) { TypeDesc d( v.asString() ); d.setIncludeFiles( HashedString((*it).fileName()) ); ns->addAliasMap( (*it).name(), d, HashedString((*it).fileName()), true, false, bigContainer() ); @@ -61,17 +61,17 @@ void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { } } -QValueList<TypePointer> SimpleTypeCatalog::getMemberClasses( const TypeDesc& name ) { - QValueList<TypePointer> ret; +TQValueList<TypePointer> SimpleTypeCatalog::getMemberClasses( const TypeDesc& name ) { + TQValueList<TypePointer> ret; - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name.name() ); - QValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); - for ( QValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { if ( (*it).kind() == Tag::Kind_Class ) { ///It would be better to return all matched class-names from within findMember and use them from there so all this will be cached too. CatalogBuildInfo b( *it, name, TypePointer( this ) ); @@ -101,17 +101,17 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT } } - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name.name() ); - QValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); if ( tags.isEmpty() ) return ret; ///skip all using-directives - QValueList<Tag>::iterator it = tags.begin(); + TQValueList<Tag>::iterator it = tags.begin(); while ( ( (*it).kind() == Tag::Kind_UsingDirective || (*it).kind() == Tag::Kind_NamespaceAlias ) && it != tags.end() ) ++it; @@ -148,7 +148,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT bool hasSpecializationDeclaration = tag.hasSpecializationDeclaration(); bool isIncluded = name.includeFiles()[tag.fileName()]; if ( hasSpecializationDeclaration || !isIncluded ) { - for ( QValueList<Tag>::const_iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList<Tag>::const_iterator it = tags.begin(); it != tags.end(); ++it ) { if ( (*it).kind() == Tag::Kind_Class && !(*it).hasSpecializationDeclaration() ) { if ( name.includeFiles()[(*it).fileName()] ) { tag = *it; @@ -212,17 +212,17 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT return ret; } -Tag SimpleTypeCatalog::findSubTag( const QString& name ) { +Tag SimpleTypeCatalog::findSubTag( const TQString& name ) { if ( name.isEmpty() ) return Tag(); - QValueList<Catalog::QueryArgument> args; - QTime t; + TQValueList<Catalog::QueryArgument> args; + TQTime t; t.start(); args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name ); - QValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); if ( ! tags.isEmpty() ) { //ifVerbose( dbg() << "findTag: \"" << str() << "\": tag \"" << name << "\" found " << endl ); return tags.front(); @@ -232,22 +232,22 @@ Tag SimpleTypeCatalog::findSubTag( const QString& name ) { } } -QValueList<Tag> SimpleTypeCatalog::getBaseClassList( ) { +TQValueList<Tag> SimpleTypeCatalog::getBaseClassList( ) { if ( scope().isEmpty() ) - return QValueList<Tag>(); + return TQValueList<Tag>(); return cppCompletionInstance->m_repository->getBaseClassList( scope().join("::") + specialization() ); } void SimpleTypeCatalog::initFromTag() { - QStringList l = m_tag.scope(); + TQStringList l = m_tag.scope(); l << m_tag.name(); setScope( l ); } void SimpleTypeCatalog::init() { if ( !scope().isEmpty() ) { - QStringList l = scope(); - QStringList cp = l; + TQStringList l = scope(); + TQStringList cp = l; cp.pop_back(); setScope( cp ); m_tag = findSubTag( l.back() ); @@ -270,21 +270,21 @@ DeclarationInfo SimpleTypeCatalog::getDeclarationInfo() { return ret; } -QStringList SimpleTypeCatalog::getBaseStrings() { +TQStringList SimpleTypeCatalog::getBaseStrings() { Debug d( "#getbases#" ); if ( !d || !safetyCounter ) { //ifVerbose( dbg() << "\"" << str() << "\": recursion to deep while getting bases" << endl ); - return QStringList(); + return TQStringList(); } - QStringList ret; - QMap<QString, bool> bases; + TQStringList ret; + TQMap<TQString, bool> bases; // try with parentsc - QTime t; + TQTime t; t.restart(); - QValueList<Tag> parents( getBaseClassList() ); + TQValueList<Tag> parents( getBaseClassList() ); - QValueList<Tag>::Iterator it = parents.begin(); + TQValueList<Tag>::Iterator it = parents.begin(); while ( it != parents.end() ) { Tag & tag = *it; ++it; @@ -301,11 +301,11 @@ SimpleTypeImpl::TemplateParamInfo SimpleTypeCatalog::getTemplateParamInfo() { if ( m_tag ) { if ( m_tag.hasAttribute( "tpl" ) ) { - QStringList l = m_tag.attribute( "tpl" ).asStringList(); + TQStringList l = m_tag.attribute( "tpl" ).asStringList(); TypeDesc::TemplateParams templateParams = m_desc.templateParams(); uint pi = 0; - QStringList::const_iterator it = l.begin(); + TQStringList::const_iterator it = l.begin(); while ( it != l.end() ) { TemplateParamInfo::TemplateParam curr; curr.name = *it; @@ -326,14 +326,14 @@ SimpleTypeImpl::TemplateParamInfo SimpleTypeCatalog::getTemplateParamInfo() { return ret; } -const LocateResult SimpleTypeCatalog::findTemplateParam( const QString& name ) { +const LocateResult SimpleTypeCatalog::findTemplateParam( const TQString& name ) { if ( m_tag ) { if ( m_tag.hasAttribute( "tpl" ) ) { - QStringList l = m_tag.attribute( "tpl" ).asStringList(); + TQStringList l = m_tag.attribute( "tpl" ).asStringList(); ///we need the index, so count the items through uint pi = 0; - QStringList::const_iterator it = l.begin(); + TQStringList::const_iterator it = l.begin(); while ( it != l.end() && *it != name ) { ++pi; ++it; diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h index ecfdb833..e22a3fcf 100644 --- a/languages/cpp/simpletypecatalog.h +++ b/languages/cpp/simpletypecatalog.h @@ -35,7 +35,7 @@ public: } /** empty scope means global scope */ - SimpleTypeCatalog( const QStringList& scope ) : SimpleTypeImpl( scope ) { + SimpleTypeCatalog( const TQStringList& scope ) : SimpleTypeImpl( scope ) { init(); } @@ -48,7 +48,7 @@ public: initFromTag(); } - virtual QString comment() const { + virtual TQString comment() const { return m_tag.comment(); }; @@ -62,29 +62,29 @@ public: return (bool)m_tag; }; - virtual QStringList getBaseStrings(); + virtual TQStringList getBaseStrings(); virtual TemplateParamInfo getTemplateParamInfo(); - virtual const LocateResult findTemplateParam( const QString& name ); + virtual const LocateResult findTemplateParam( const TQString& name ); - virtual QString specialization() const; + virtual TQString specialization() const; virtual void addAliasesTo( SimpleTypeNamespace* ns ); private: Tag m_tag; - int pointerDepthFromString( const QString& str ) { - QRegExp ptrRx( "(\\*|\\&)" ); - QString ptr = str.mid( str.find( ptrRx ) ); - QStringList ptrList = QStringList::split( "", ptr ); + int pointerDepthFromString( const TQString& str ) { + TQRegExp ptrRx( "(\\*|\\&)" ); + TQString ptr = str.mid( str.find( ptrRx ) ); + TQStringList ptrList = TQStringList::split( "", ptr ); return ptrList.size(); } - Tag findSubTag( const QString& name ); + Tag findSubTag( const TQString& name ); - QValueList<Tag> getBaseClassList(); + TQValueList<Tag> getBaseClassList(); void initFromTag(); @@ -108,7 +108,7 @@ protected: virtual MemberInfo findMember( TypeDesc name, MemberInfo::MemberType type = MemberInfo::AllTypes); - virtual QValueList<TypePointer> getMemberClasses( const TypeDesc& name ) ; + virtual TQValueList<TypePointer> getMemberClasses( const TypeDesc& name ) ; }; diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp index 898228bb..3fc1ce52 100644 --- a/languages/cpp/simpletypefunction.cpp +++ b/languages/cpp/simpletypefunction.cpp @@ -40,24 +40,24 @@ HashedStringSet getIncludeFiles( const ItemDom& item ) { //SimpleTypeFunctionInterface implementation -QString SimpleTypeFunctionInterface::signature() { - QString sig = "( "; +TQString SimpleTypeFunctionInterface::signature() { + TQString sig = "( "; SimpleTypeImpl* asType = dynamic_cast<SimpleTypeImpl*>( this ); - QStringList argDefaults = getArgumentDefaults(); - QStringList argNames = getArgumentNames(); - QValueList<TypeDesc> argTypes = getArgumentTypes(); - QValueList<LocateResult> argRealTypes; + TQStringList argDefaults = getArgumentDefaults(); + TQStringList argNames = getArgumentNames(); + TQValueList<TypeDesc> argTypes = getArgumentTypes(); + TQValueList<LocateResult> argRealTypes; if ( asType ) { - for ( QValueList<TypeDesc>::iterator it = argTypes.begin(); it != argTypes.end(); ++it ) { + for ( TQValueList<TypeDesc>::iterator it = argTypes.begin(); it != argTypes.end(); ++it ) { argRealTypes << asType->locateDecType( *it ); } } - QStringList::iterator def = argDefaults.begin(); - QStringList::iterator name = argNames.begin(); - QValueList<LocateResult>::iterator realType = argRealTypes.begin(); + TQStringList::iterator def = argDefaults.begin(); + TQStringList::iterator name = argNames.begin(); + TQValueList<LocateResult>::iterator realType = argRealTypes.begin(); while ( realType != argRealTypes.end() ) { if ( sig != "( " ) @@ -128,9 +128,9 @@ void SimpleTypeFunctionInterface::resolveImplicitTypes( TypeDesc::TemplateParams } } -void SimpleTypeFunctionInterface::resolveImplicitTypes( QValueList<TypeDesc>& argTypes, QValueList<TypeDesc>& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ) { - QValueList<TypeDesc>::iterator it = argTypes.begin(); - QValueList<TypeDesc>::iterator it2 = gottenArgTypes.begin(); +void SimpleTypeFunctionInterface::resolveImplicitTypes( TQValueList<TypeDesc>& argTypes, TQValueList<TypeDesc>& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ) { + TQValueList<TypeDesc>::iterator it = argTypes.begin(); + TQValueList<TypeDesc>::iterator it2 = gottenArgTypes.begin(); while ( it != argTypes.end() && it2 != gottenArgTypes.end() ) { resolveImplicitTypes( *it, *it2, paramInfo ); @@ -191,13 +191,13 @@ SimpleTypeCodeModel::SimpleTypeCodeModel( ItemDom& item ) : m_item( item ) { FunctionModel* m = dynamic_cast<FunctionModel*>( i ); ClassModel* c = dynamic_cast<ClassModel*>( i ); if ( m ) { - QStringList l = m->scope(); + TQStringList l = m->scope(); l << m->name(); setScope( l ); return; } if ( c ) { - QStringList l = c->scope(); + TQStringList l = c->scope(); l << c->name(); setScope( l ); return; @@ -237,7 +237,7 @@ ItemDom SimpleTypeCodeModel::locateModelContainer( class CodeModel* m, TypeDesc } ///Until header-parsing is implemented, this tries to find the class that is most related to this item -/*ClassDom SimpleTypeCodeModel::pickMostRelated( ClassList lst, QString fn ) { +/*ClassDom SimpleTypeCodeModel::pickMostRelated( ClassList lst, TQString fn ) { if( lst.isEmpty() ) return ClassDom(); ClassDom best = lst.front(); @@ -247,7 +247,7 @@ ItemDom SimpleTypeCodeModel::locateModelContainer( class CodeModel* m, TypeDesc for( ClassList::iterator it = lst.begin(); it != lst.end(); ++it ) { if( !(*it)->getSpecializationDeclaration().isEmpty() ) continue; ///Don't consider specialized classes //kdDebug() << "comparing " << (*it)->fileName() << endl; - QString str = (*it)->fileName(); + TQString str = (*it)->fileName(); uint len = str.length(); if( fn.length() < len ) len = fn.length(); @@ -271,11 +271,11 @@ ItemDom SimpleTypeCodeModel::locateModelContainer( class CodeModel* m, TypeDesc return best; }*/ -/*QValueList<TypePointer> SimpleTypeCodeModel::findSpecializations( const QString& name ) { +/*TQValueList<TypePointer> SimpleTypeCodeModel::findSpecializations( const TQString& name ) { ClassModel* klass = dynamic_cast<ClassModel*> ( & (*m_item) ); if( !klass ) { ifVerbose( dbg() << "\"" << str() << "\": search for member " << name.name() << " unsuccessful because the own type is invalid" << endl ); - return QValueList<TypePointer>(); + return TQValueList<TypePointer>(); } ClassList l = klass->classByName( name.name() ); @@ -290,12 +290,12 @@ ItemDom SimpleTypeCodeModel::locateModelContainer( class CodeModel* m, TypeDesc } } - return QValueList<TypePointer>(); + return TQValueList<TypePointer>(); }*/ -QValueList<TypePointer> SimpleTypeCodeModel::getMemberClasses( const TypeDesc& name ) { - QValueList<TypePointer> ret; +TQValueList<TypePointer> SimpleTypeCodeModel::getMemberClasses( const TypeDesc& name ) { + TQValueList<TypePointer> ret; if ( !m_item ) return ret; @@ -319,10 +319,10 @@ QValueList<TypePointer> SimpleTypeCodeModel::getMemberClasses( const TypeDesc& n } template<class Item> -Item pickMostRelated( const HashedStringSet& includeFiles, const QValueList<Item>& list ) { +Item pickMostRelated( const HashedStringSet& includeFiles, const TQValueList<Item>& list ) { if ( list.isEmpty() ) return Item(); - for ( typename QValueList<Item>::const_iterator it = list.begin(); it != list.end(); ++it ) { + for ( typename TQValueList<Item>::const_iterator it = list.begin(); it != list.end(); ++it ) { if ( includeFiles[( *it )->fileName()] ) return *it; } @@ -330,10 +330,10 @@ Item pickMostRelated( const HashedStringSet& includeFiles, const QValueList<Item } template<> -ClassDom pickMostRelated( const HashedStringSet& includeFiles, const QValueList<ClassDom>& list ) { +ClassDom pickMostRelated( const HashedStringSet& includeFiles, const TQValueList<ClassDom>& list ) { if ( list.isEmpty() ) return ClassDom(); ///@todo the current file must be preferred - for ( QValueList<ClassDom>::const_iterator it = list.begin(); it != list.end(); ++it ) { + for ( TQValueList<ClassDom>::const_iterator it = list.begin(); it != list.end(); ++it ) { if ( !( *it )->getSpecializationDeclaration().isEmpty() ) continue; ///Don't consider specialized classes if ( includeFiles[( *it )->fileName()] ) return *it; @@ -466,7 +466,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCodeModel::findMember( TypeDesc name , Memb } bool SimpleTypeCodeModel::findItem() { - QString key = str(); + TQString key = str(); m_item = locateModelContainer( cppCompletionInstance->m_pSupport->codeModel(), str() ); return ( bool ) m_item; } @@ -492,9 +492,9 @@ DeclarationInfo SimpleTypeCodeModel::getDeclarationInfo() { return ret; } -QString SimpleTypeCodeModel::specialization() const { +TQString SimpleTypeCodeModel::specialization() const { const ClassModel* klass = dynamic_cast<const ClassModel*>( m_item.data() ); - if ( !klass ) return QString::null; + if ( !klass ) return TQString::null; return klass->getSpecializationDeclaration(); } @@ -520,7 +520,7 @@ SimpleTypeImpl::TemplateParamInfo SimpleTypeCodeModel::getTemplateParamInfo() { return ret; } -const LocateResult SimpleTypeCodeModel::findTemplateParam( const QString& name ) { +const LocateResult SimpleTypeCodeModel::findTemplateParam( const TQString& name ) { if ( m_item ) { TemplateModelItem* ti = dynamic_cast<TemplateModelItem*>( & ( *m_item ) ); TypeDesc::TemplateParams& templateParams = m_desc.templateParams(); @@ -529,7 +529,7 @@ const LocateResult SimpleTypeCodeModel::findTemplateParam( const QString& name ) return *templateParams[pi]; } else { if ( pi != -1 && !ti->getParam( pi ).second.isEmpty() ) { - QString def = ti->getParam( pi ).second; + TQString def = ti->getParam( pi ).second; ifVerbose( dbg() << "\"" << str() << "\": using default-template-parameter \"" << def << "\" for " << name << endl ); return TypeDesc( def ); } else if ( pi != -1 ) { @@ -540,21 +540,21 @@ const LocateResult SimpleTypeCodeModel::findTemplateParam( const QString& name ) return LocateResult(); } -QStringList SimpleTypeCodeModel::getBaseStrings() { +TQStringList SimpleTypeCodeModel::getBaseStrings() { Debug d( "#getbases#" ); if ( !d || !safetyCounter ) { //ifVerbose( dbg() << "\"" << str() << "\": recursion to deep while getting bases" << endl ); - return QStringList(); + return TQStringList(); } - QStringList ret; + TQStringList ret; ClassModel* klass; if ( !m_item || ( klass = dynamic_cast<ClassModel*>( & ( *m_item ) ) ) == 0 ) return ret; - QStringList parents = klass->baseClassList(); - for ( QStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) { + TQStringList parents = klass->baseClassList(); + for ( TQStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) { ret << *it; } @@ -592,8 +592,8 @@ bool SimpleTypeCodeModelFunction::isConst() { } -QValueList<TypeDesc> SimpleTypeCodeModelFunction::getArgumentTypes() { - QValueList<TypeDesc> ret; +TQValueList<TypeDesc> SimpleTypeCodeModelFunction::getArgumentTypes() { + TQValueList<TypeDesc> ret; if ( item() ) { IncludeFiles files; @@ -611,8 +611,8 @@ QValueList<TypeDesc> SimpleTypeCodeModelFunction::getArgumentTypes() { return ret; } -QStringList SimpleTypeCodeModelFunction::getArgumentNames() { - QStringList ret; +TQStringList SimpleTypeCodeModelFunction::getArgumentNames() { + TQStringList ret; if ( item() ) { if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) { @@ -625,8 +625,8 @@ QStringList SimpleTypeCodeModelFunction::getArgumentNames() { return ret; } -QStringList SimpleTypeCodeModelFunction::getArgumentDefaults() { - QStringList ret; +TQStringList SimpleTypeCodeModelFunction::getArgumentDefaults() { + TQStringList ret; if ( item() ) { if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) { @@ -650,7 +650,7 @@ SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildI } TypePointer SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::build() { - QValueList<TypePointer> ret; + TQValueList<TypePointer> ret; TypePointer last; for ( FunctionList::iterator it = m_items.begin(); it != m_items.end(); ++it ) { TypePointer tp = new SimpleTypeCodeModelFunction( model_cast<ItemDom> ( *it ) ); @@ -684,19 +684,19 @@ bool SimpleTypeCatalogFunction::isConst() { return tagInfo.isConst(); } -QStringList SimpleTypeCatalogFunction::getArgumentNames() { - QStringList ret; +TQStringList SimpleTypeCatalogFunction::getArgumentNames() { + TQStringList ret; Tag t = tag(); CppFunction<Tag> tagInfo( t ); return tagInfo.argumentNames(); } -QValueList<TypeDesc> SimpleTypeCatalogFunction::getArgumentTypes() { - QValueList<TypeDesc> ret; +TQValueList<TypeDesc> SimpleTypeCatalogFunction::getArgumentTypes() { + TQValueList<TypeDesc> ret; Tag t = tag(); CppFunction<Tag> tagInfo( t ); - QStringList arguments = tagInfo.arguments(); - for ( QStringList::iterator it = arguments.begin(); it != arguments.end(); ++it ) + TQStringList arguments = tagInfo.arguments(); + for ( TQStringList::iterator it = arguments.begin(); it != arguments.end(); ++it ) ret << TypeDesc( *it ); return ret; } @@ -704,9 +704,9 @@ QValueList<TypeDesc> SimpleTypeCatalogFunction::getArgumentTypes() { //SimpleTypeCatalogFunction::CatalogFunctionBuildInfo implementation TypePointer SimpleTypeCatalogFunction::CatalogFunctionBuildInfo::build() { - QValueList<TypePointer> ret; + TQValueList<TypePointer> ret; TypePointer last; - for ( QValueList<Tag>::iterator it = m_tags.begin(); it != m_tags.end(); ++it ) { + for ( TQValueList<Tag>::iterator it = m_tags.begin(); it != m_tags.end(); ++it ) { TypePointer tp = new SimpleTypeCatalogFunction( *it ); tp->takeTemplateParams( m_desc ); tp->descForEdit().increaseFunctionDepth(); diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h index a0bd34fc..90b5fcab 100644 --- a/languages/cpp/simpletypefunction.h +++ b/languages/cpp/simpletypefunction.h @@ -46,20 +46,20 @@ class SimpleTypeFunctionInterface { ///Returns the totally unresolved return-type virtual TypeDesc getReturnType() = 0; - virtual QValueList<TypeDesc> getArgumentTypes() = 0; + virtual TQValueList<TypeDesc> getArgumentTypes() = 0; - virtual QStringList getArgumentDefaults() = 0; + virtual TQStringList getArgumentDefaults() = 0; - virtual QStringList getArgumentNames() = 0; + virtual TQStringList getArgumentNames() = 0; virtual bool isConst() = 0; - virtual QString signature(); + virtual TQString signature(); ///TODO: This function should locate the correct overloaded method in the chain, fitting the parameters ///should also moved into another class then - SimpleTypeImpl* match( const QValueList<LocateResult>& /*params*/ ) { - // QValueList<TypeDesc> args = getArgumentTypes(); + SimpleTypeImpl* match( const TQValueList<LocateResult>& /*params*/ ) { + // TQValueList<TypeDesc> args = getArgumentTypes(); return dynamic_cast<SimpleTypeImpl*>( this ); } @@ -80,7 +80,7 @@ class SimpleTypeFunctionInterface { void resolveImplicitTypes( TypeDesc::TemplateParams& argTypes, TypeDesc::TemplateParams& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ); ///Tries to match the types, filling implicit template-params into paramInfo - void resolveImplicitTypes( QValueList<TypeDesc>& argTypes, QValueList<TypeDesc>& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ); + void resolveImplicitTypes( TQValueList<TypeDesc>& argTypes, TQValueList<TypeDesc>& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ); }; template <class Base=SimpleTypeImpl> @@ -114,7 +114,7 @@ public: return ret; } - virtual LocateResult applyOperator( typename Base::Operator op , QValueList<LocateResult> params ) { + virtual LocateResult applyOperator( typename Base::Operator op , TQValueList<LocateResult> params ) { Debug d("#apply#"); if( !d ) return LocateResult(); @@ -131,9 +131,9 @@ public: /** This is the place where implicit template-function-instatiation takes place. * Match the given param-types with the argument-types to resolve new template-params. */ - QValueList<TypeDesc> args = getArgumentTypes(); - QValueList<TypeDesc> paramDescs; - for( QValueList<LocateResult>::iterator it = params.begin(); it != params.end(); ++it ) + TQValueList<TypeDesc> args = getArgumentTypes(); + TQValueList<TypeDesc> paramDescs; + for( TQValueList<LocateResult>::iterator it = params.begin(); it != params.end(); ++it ) paramDescs << (TypeDesc)(*it); resolveImplicitTypes( args, paramDescs, paramInfo ); ///paramInfo now contains the information for all implicit types @@ -167,7 +167,7 @@ public: init(); } - SimpleTypeCodeModel( const QStringList& scope ) : SimpleTypeImpl( scope ) { + SimpleTypeCodeModel( const TQStringList& scope ) : SimpleTypeImpl( scope ) { init(); } @@ -175,7 +175,7 @@ public: return (bool)m_item; }; - virtual QString comment() const { + virtual TQString comment() const { if( m_item ) { return m_item->comment(); } else { @@ -209,14 +209,14 @@ public: virtual TemplateParamInfo getTemplateParamInfo(); - virtual const LocateResult findTemplateParam( const QString& name ); + virtual const LocateResult findTemplateParam( const TQString& name ); /** In case of a class, returns all base-types */ - virtual QStringList getBaseStrings(); + virtual TQStringList getBaseStrings(); ItemDom locateModelContainer( class CodeModel* m, TypeDesc t, ClassDom cnt = ClassDom() ); - virtual QString specialization() const; + virtual TQString specialization() const; virtual void addAliasesTo( SimpleTypeNamespace* ns ); @@ -227,7 +227,7 @@ private: void init(); - //ClassDom pickMostRelated( ClassList lst, QString fn ); + //ClassDom pickMostRelated( ClassList lst, TQString fn ); protected: SimpleTypeCodeModel() : SimpleTypeImpl() { @@ -247,7 +247,7 @@ protected: virtual MemberInfo findMember( TypeDesc name , MemberInfo::MemberType type = MemberInfo::AllTypes) ; - virtual QValueList<TypePointer> getMemberClasses( const TypeDesc& name ) ; + virtual TQValueList<TypePointer> getMemberClasses( const TypeDesc& name ) ; }; @@ -270,11 +270,11 @@ public: virtual bool isConst(); - virtual QValueList<TypeDesc> getArgumentTypes(); + virtual TQValueList<TypeDesc> getArgumentTypes(); - virtual QStringList getArgumentNames(); + virtual TQStringList getArgumentNames(); - virtual QStringList getArgumentDefaults(); + virtual TQStringList getArgumentDefaults(); struct CodeModelFunctionBuildInfo : public TypeBuildInfo { FunctionList m_items; @@ -313,11 +313,11 @@ public: } struct CatalogFunctionBuildInfo : public TypeBuildInfo { - QValueList<Tag> m_tags; + TQValueList<Tag> m_tags; TypeDesc m_desc; TypePointer m_parent; - CatalogFunctionBuildInfo( QValueList<Tag> tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) { + CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) { } virtual TypePointer build(); @@ -327,13 +327,13 @@ public: virtual bool isConst (); - virtual QStringList getArgumentDefaults() { - return QStringList(); + virtual TQStringList getArgumentDefaults() { + return TQStringList(); } - virtual QStringList getArgumentNames(); + virtual TQStringList getArgumentNames(); - virtual QValueList<TypeDesc> getArgumentTypes(); + virtual TQValueList<TypeDesc> getArgumentTypes(); }; diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp index 2ae35401..f7937db1 100644 --- a/languages/cpp/simpletypenamespace.cpp +++ b/languages/cpp/simpletypenamespace.cpp @@ -11,7 +11,7 @@ email : david.nolden.kdevelop@art-master.de * (at your option) any later version. * * * ***************************************************************************/ -#include <qtl.h> +#include <tqtl.h> #include <typeinfo> #include "simpletypenamespace.h" #include "simpletypecachebinder.h" @@ -30,7 +30,7 @@ TypePointer SimpleTypeNamespace::clone() { return new SimpleTypeCachedNamespace( this ); } -SimpleTypeNamespace::SimpleTypeNamespace( const QStringList& fakeScope, const QStringList& realScope ) : SimpleTypeImpl( fakeScope ), m_currentSlaveId(0) { +SimpleTypeNamespace::SimpleTypeNamespace( const TQStringList& fakeScope, const TQStringList& realScope ) : SimpleTypeImpl( fakeScope ), m_currentSlaveId(0) { ifVerbose( dbg() << "\"" << str() << "\": created namespace-proxy with real scope \"" << realScope.join( "::" ) << "\"" << endl ); SimpleType cm = SimpleType( realScope, HashedStringSet(), RepoCodeModel ); SimpleType ct = SimpleType( realScope, HashedStringSet(), RepoCatalog ); @@ -42,7 +42,7 @@ SimpleTypeNamespace::SimpleTypeNamespace( const QStringList& fakeScope, const QS addImport( ct->desc() ); } -SimpleTypeNamespace::SimpleTypeNamespace( const QStringList& fakeScope ) : SimpleTypeImpl( fakeScope ), m_currentSlaveId(0) { +SimpleTypeNamespace::SimpleTypeNamespace( const TQStringList& fakeScope ) : SimpleTypeImpl( fakeScope ), m_currentSlaveId(0) { ifVerbose( dbg() << "\"" << str() << "\": created namespace-proxy" << endl ); } @@ -67,20 +67,20 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe return ret; } -QValueList<TypePointer> SimpleTypeNamespace::getMemberClasses( const TypeDesc& name ) { +TQValueList<TypePointer> SimpleTypeNamespace::getMemberClasses( const TypeDesc& name ) { std::set<HashedString> ignore; return getMemberClasses( name, ignore ); } -QValueList<TypePointer> SimpleTypeNamespace::getMemberClasses( const TypeDesc& name, std::set<HashedString>& ignore ) { +TQValueList<TypePointer> SimpleTypeNamespace::getMemberClasses( const TypeDesc& name, std::set<HashedString>& ignore ) { HashedString myName = HashedString( scope().join( "::" ) +"%"+typeid( *this ).name() ); if ( ignore.find( myName ) != ignore.end() || !safetyCounter ) - return QValueList<TypePointer>(); + return TQValueList<TypePointer>(); ignore.insert( myName ); - QValueList<TypePointer> ret; + TQValueList<TypePointer> ret; SlaveList l = getSlaves( name.includeFiles() ); for ( SlaveList::iterator it = l.begin(); it != l.end(); ++it ) { @@ -198,11 +198,11 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe // } // } -SimpleTypeImpl::MemberInfo SimpleTypeNamespace::setupMemberInfo( const QStringList& subName, const ImportList& imports ) { +SimpleTypeImpl::MemberInfo SimpleTypeNamespace::setupMemberInfo( const TQStringList& subName, const ImportList& imports ) { MemberInfo mem; mem.name = subName.join( "::" ); mem.memberType = MemberInfo::NotFound; - QStringList sc = scope(); + TQStringList sc = scope(); sc += subName; mem.type = sc.join( "::" ); mem.memberType = MemberInfo::Namespace; @@ -318,7 +318,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/* } -void SimpleTypeNamespace::addAliases( QString map, const IncludeFiles& files ) { +void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) { while ( !map.isEmpty() ) { int mid = map.find( "=" ); int mid2 = map.find( "<<" ); diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h index 169c4548..b465cfb6 100644 --- a/languages/cpp/simpletypenamespace.h +++ b/languages/cpp/simpletypenamespace.h @@ -62,9 +62,9 @@ class SimpleTypeNamespace : public SimpleTypeImpl { typedef std::multiset<Import> ImportList; - SimpleTypeNamespace( const QStringList& fakeScope, const QStringList& realScope ); + SimpleTypeNamespace( const TQStringList& fakeScope, const TQStringList& realScope ); - SimpleTypeNamespace( const QStringList& fakeScope ); + SimpleTypeNamespace( const TQStringList& fakeScope ); SimpleTypeNamespace( SimpleTypeNamespace* ns ); @@ -87,13 +87,13 @@ class SimpleTypeNamespace : public SimpleTypeImpl { /**Takes a map of multiple aliases in form "A=B;C=D;....;" similar to the C++ "namespace A=B;" statement * @param files Set of files that must be included for this alias-map to be active. If the set is empty, the alias will be used globally. */ - void addAliases( QString map, const IncludeFiles& files = IncludeFiles() ); + void addAliases( TQString map, const IncludeFiles& files = IncludeFiles() ); private: SlaveMap m_activeSlaves; size_t m_currentSlaveId; HashedStringSetGroup m_activeSlaveGroups; - typedef QMap<QString, ImportList> AliasMap; + typedef TQMap<TQString, ImportList> AliasMap; AliasMap m_aliases; //Inserts all aliases necessary fo handling a request using the given IncludeFiles @@ -106,12 +106,12 @@ class SimpleTypeNamespace : public SimpleTypeImpl { friend class NamespaceBuildInfo; struct NamespaceBuildInfo : public TypeBuildInfo { - QStringList m_fakeScope; + TQStringList m_fakeScope; ImportList m_imports; TypePointer m_built; - NamespaceBuildInfo( QStringList fakeScope, const ImportList& imports ) { + NamespaceBuildInfo( TQStringList fakeScope, const ImportList& imports ) { m_fakeScope = fakeScope; m_imports = imports; } @@ -139,7 +139,7 @@ class SimpleTypeNamespace : public SimpleTypeImpl { virtual MemberInfo findMember( TypeDesc name, MemberInfo::MemberType type = MemberInfo::AllTypes ); - virtual QValueList<TypePointer> getMemberClasses( const TypeDesc& name ) ; + virtual TQValueList<TypePointer> getMemberClasses( const TypeDesc& name ) ; private: struct HashedStringHasher { @@ -150,9 +150,9 @@ class SimpleTypeNamespace : public SimpleTypeImpl { //Maps from HashedStringSet to the count of slaves when the item was cached, and the SlaveList // typedef __gnu_cxx::hash_map<HashedStringSet, std::pair<size_t, SlaveList>, HashedStringHasher> SlavesCache; //SlavesCache m_slavesCache; - QValueList<TypePointer> getMemberClasses( const TypeDesc& name, std::set<HashedString>& ignore ) ; + TQValueList<TypePointer> getMemberClasses( const TypeDesc& name, std::set<HashedString>& ignore ) ; - MemberInfo setupMemberInfo( const QStringList& subName, const ImportList& imports ); + MemberInfo setupMemberInfo( const TQStringList& subName, const ImportList& imports ); //TypePointer locateNamespace( const TypeDesc& alias ); diff --git a/languages/cpp/store_walker.cpp b/languages/cpp/store_walker.cpp index cd66dd23..bcea1a05 100644 --- a/languages/cpp/store_walker.cpp +++ b/languages/cpp/store_walker.cpp @@ -15,10 +15,10 @@ #include "driver.h" #include <kdebug.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqfileinfo.h> +#include <tqdir.h> -StoreWalker::StoreWalker( const QString& fileName, CodeModel* store ) +StoreWalker::StoreWalker( const TQString& fileName, CodeModel* store ) : m_store( store ), m_anon( 0 ) { m_fileName = URLUtil::canonicalPath( fileName ); @@ -53,7 +53,7 @@ void StoreWalker::parseTranslationUnit( const ParsedFile& ast ) m_anon = 0; m_imports.clear(); - m_imports << QPair<QMap<QString, ClassDom>, QStringList>(QMap<QString, ClassDom>(), QStringList()); + m_imports << QPair<TQMap<TQString, ClassDom>, TQStringList>(TQMap<TQString, ClassDom>(), TQStringList()); TreeParser::parseTranslationUnit( ast ); m_imports.pop_back(); } @@ -84,11 +84,11 @@ void StoreWalker::parseNamespace( NamespaceAST* ast ) ast->getStartPosition( &startLine, &startColumn ); ast->getEndPosition( &endLine, &endColumn ); - QString nsName; + TQString nsName; if ( !ast->namespaceName() || ast->namespaceName()->text().isEmpty() ) { - QFileInfo fileInfo( m_fileName ); - QString shortFileName = fileInfo.baseName(); + TQFileInfo fileInfo( m_fileName ); + TQString shortFileName = fileInfo.baseName(); nsName.sprintf( "(%s_%d)", shortFileName.local8Bit().data(), m_anon++ ); } @@ -110,8 +110,8 @@ void StoreWalker::parseNamespace( NamespaceAST* ast ) void StoreWalker::parseNamespaceAlias( NamespaceAliasAST* ast ) { - QString nsName; - QString aliasName; + TQString nsName; + TQString aliasName; if( !ast->namespaceName() || ast->namespaceName()->text().isEmpty() ) { @@ -145,7 +145,7 @@ void StoreWalker::parseUsing( UsingAST* ast ) void StoreWalker::parseUsingDirective( UsingDirectiveAST* ast ) { - QString name; + TQString name; if( ast->name() ) name = ast->name()->text(); @@ -169,7 +169,7 @@ void StoreWalker::parseTypedef( TypedefAST* ast ) if ( ast && ast->initDeclaratorList() && ast->initDeclaratorList() ->initDeclaratorList().count() > 0 ) { - QPtrList<InitDeclaratorAST> lst( ast->initDeclaratorList() ->initDeclaratorList() ); + TQPtrList<InitDeclaratorAST> lst( ast->initDeclaratorList() ->initDeclaratorList() ); m_currentDeclarator = lst.at( 0 ) ->declarator(); } @@ -186,19 +186,19 @@ void StoreWalker::parseTypedef( TypedefAST* ast ) if ( typeSpec && declarators ) { - QString typeId; + TQString typeId; if ( typeSpec->name() ) typeId = typeSpec->name() ->text(); - QPtrList<InitDeclaratorAST> l( declarators->initDeclaratorList() ); - QPtrListIterator<InitDeclaratorAST> it( l ); + TQPtrList<InitDeclaratorAST> l( declarators->initDeclaratorList() ); + TQPtrListIterator<InitDeclaratorAST> it( l ); InitDeclaratorAST* initDecl = 0; while ( 0 != ( initDecl = it.current() ) ) { - QString type, id; + TQString type, id; if ( initDecl->declarator() ) { type = typeOfDeclaration( typeSpec, initDecl->declarator() ); @@ -283,9 +283,9 @@ void StoreWalker::parseSimpleDeclaration( SimpleDeclarationAST* ast ) if ( declarators ) { - QPtrList<InitDeclaratorAST> l = declarators->initDeclaratorList(); + TQPtrList<InitDeclaratorAST> l = declarators->initDeclaratorList(); - QPtrListIterator<InitDeclaratorAST> it( l ); + TQPtrListIterator<InitDeclaratorAST> it( l ); while ( it.current() ) { parseDeclaration( ast->functionSpecifier(), ast->storageSpecifier(), @@ -296,11 +296,11 @@ void StoreWalker::parseSimpleDeclaration( SimpleDeclarationAST* ast ) } -QStringList StoreWalker::findScope( const QStringList& scope ) { +TQStringList StoreWalker::findScope( const TQStringList& scope ) { ClassDom d = findClassFromScope( scope ); if( d ) { - QStringList ret = d->scope(); + TQStringList ret = d->scope(); ret << d->name(); return ret; } @@ -330,11 +330,11 @@ void StoreWalker::parseFunctionDefinition( FunctionDefinitionAST* ast ) if ( funSpec ) { - QPtrList<AST> l = funSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = funSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "virtual" ) isVirtual = true; else if ( text == "inline" ) @@ -345,11 +345,11 @@ void StoreWalker::parseFunctionDefinition( FunctionDefinitionAST* ast ) if ( storageSpec ) { - QPtrList<AST> l = storageSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = storageSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -363,9 +363,9 @@ void StoreWalker::parseFunctionDefinition( FunctionDefinitionAST* ast ) ast->getStartPosition( &startLine, &startColumn ); ast->getEndPosition( &endLine, &endColumn ); - QString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace(); + TQString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace(); - QStringList scope = scopeOfDeclarator( d, m_currentScope ); + TQStringList scope = scopeOfDeclarator( d, m_currentScope ); ClassDom c; ///c should be nonzero if it is a function-definition for a function within another class if( !m_currentClass.top() ) { ///It is not a local definition within a class, so search the scope so it can be corrected using imports @@ -383,7 +383,7 @@ void StoreWalker::parseFunctionDefinition( FunctionDefinitionAST* ast ) parseFunctionArguments( d, model_cast<FunctionDom>( method ) ); - QString text = typeOfDeclaration( typeSpec, d ); + TQString text = typeOfDeclaration( typeSpec, d ); if ( !text.isEmpty() ) method->setResultType( text ); @@ -437,11 +437,11 @@ void StoreWalker::parseTypeSpecifier( TypeSpecifierAST* ast ) void StoreWalker::takeTemplateParams( TemplateModelItem& target, TemplateDeclarationAST* ast) { TemplateParameterListAST* pl = ast->templateParameterList(); if( pl ) { - QPtrList<TemplateParameterAST> list = pl->templateParameterList(); + TQPtrList<TemplateParameterAST> list = pl->templateParameterList(); TemplateParameterAST* curr = list.first(); while( curr != 0 ) { - QString a, b; + TQString a, b; if( curr->typeParameter() && curr->typeParameter()->name() ) { a = curr->typeParameter()->name()->text(); if( curr->typeParameter()->typeId() ) @@ -450,7 +450,7 @@ void StoreWalker::takeTemplateParams( TemplateModelItem& target, TemplateDeclara target.addTemplateParam( a, b ); CodeModelItem* cmi = dynamic_cast<CodeModelItem*>(&target); - QString nm = "0"; + TQString nm = "0"; if(cmi) nm = cmi->name(); kdDebug() << "item " << nm << " taking template-parameters " << a << ", default=" << b << "\n"; curr = list.next(); @@ -471,7 +471,7 @@ void StoreWalker::checkTemplateDeclarator( TemplateModelItem* item ) { int StoreWalker::mergeGroups( int g1, int g2 ) { int ng = m_store->mergeGroups( g1, g2 ); - for( QMap<QString, FileDom>::iterator it = m_overrides.begin(); it != m_overrides.end(); ++it ) { + for( TQMap<TQString, FileDom>::iterator it = m_overrides.begin(); it != m_overrides.end(); ++it ) { int g =(*it)->groupId(); if( g == g1 || g == g2 ) (*it)->setGroupId( ng ); @@ -490,7 +490,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) bool oldInSlots = m_inSlots; bool oldInSignals = m_inSignals; - QString kind = ast->classKey() ->text(); + TQString kind = ast->classKey() ->text(); if ( kind == "class" ) m_currentAccess = CodeModelItem::Private; else @@ -498,15 +498,15 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) m_inSlots = false; m_inSignals = false; - QString className; + TQString className; if ( !ast->name() && m_currentDeclarator && m_currentDeclarator->declaratorId() ) { className = m_currentDeclarator->declaratorId() ->text().stripWhiteSpace(); } else if ( !ast->name() ) { - QFileInfo fileInfo( m_fileName ); - QString shortFileName = fileInfo.baseName(); + TQFileInfo fileInfo( m_fileName ); + TQString shortFileName = fileInfo.baseName(); className.sprintf( "(%s_%d)", shortFileName.local8Bit().data(), m_anon++ ); } else @@ -530,13 +530,13 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) checkTemplateDeclarator( &(*klass) ); - bool embed = !scopeOfName( ast->name(), QStringList() ).isEmpty(); + bool embed = !scopeOfName( ast->name(), TQStringList() ).isEmpty(); - QStringList oldScope; + TQStringList oldScope; if( embed ) { - ClassDom embedderClass = findClassFromScope( m_currentScope + scopeOfName( ast->name(), QStringList() )); + ClassDom embedderClass = findClassFromScope( m_currentScope + scopeOfName( ast->name(), TQStringList() )); if(embedderClass) { if(embedderClass->fileName() != klass->fileName()) { @@ -556,7 +556,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) //m_file->addClass( klass );//experiment }else{ - kdDebug( 9007 ) << "could not find embedding class " << QStringList(m_currentScope + scopeOfName( ast->name(), QStringList() )).join("::") << " for " << className << endl; + kdDebug( 9007 ) << "could not find embedding class " << TQStringList(m_currentScope + scopeOfName( ast->name(), TQStringList() )).join("::") << " for " << className << endl; embed = false; } } @@ -577,7 +577,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) m_currentScope.push_back( className ); m_currentClass.push( klass ); - //m_imports.push_back( QStringList() ); + //m_imports.push_back( TQStringList() ); TreeParser::parseClassSpecifier( ast ); @@ -621,8 +621,8 @@ void StoreWalker::parseEnumSpecifier( EnumSpecifierAST* ast ) m_file->addTypeAlias( typeAlias ); } - QPtrList<EnumeratorAST> l = ast->enumeratorList(); - QPtrListIterator<EnumeratorAST> it( l ); + TQPtrList<EnumeratorAST> l = ast->enumeratorList(); + TQPtrListIterator<EnumeratorAST> it( l ); while ( it.current() ) { VariableDom attr = m_store->create<VariableModel>(); @@ -688,13 +688,13 @@ void StoreWalker::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, while ( t && t->subDeclarator() ) t = t->subDeclarator(); - QString id; + TQString id; if ( t && t->declaratorId() && t->declaratorId() ->unqualifiedName() ) id = t->declaratorId() ->unqualifiedName() ->text(); - if ( !scopeOfDeclarator( d, QStringList() ).isEmpty() ) + if ( !scopeOfDeclarator( d, TQStringList() ).isEmpty() ) { - kdDebug( 9007 ) << "skip declaration of " << QStringList(scopeOfDeclarator( d, QStringList() )).join("::") << "::" << id << endl; + kdDebug( 9007 ) << "skip declaration of " << TQStringList(scopeOfDeclarator( d, TQStringList() )).join("::") << "::" << id << endl; return ; } @@ -712,7 +712,7 @@ void StoreWalker::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, attr->setAccess( m_currentAccess ); - QString text = typeOfDeclaration( typeSpec, d ); + TQString text = typeOfDeclaration( typeSpec, d ); if ( !text.isEmpty() ) { attr->setType( text ); } @@ -725,11 +725,11 @@ void StoreWalker::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, if ( storageSpec ) { - QPtrList<AST> l = storageSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = storageSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -750,9 +750,9 @@ void StoreWalker::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, void StoreWalker::parseAccessDeclaration( AccessDeclarationAST * access ) { - QPtrList<AST> l = access->accessList(); + TQPtrList<AST> l = access->accessList(); - QString accessStr = l.at( 0 ) ->text(); + TQString accessStr = l.at( 0 ) ->text(); if ( accessStr == "public" ) m_currentAccess = CodeModelItem::Public; else if ( accessStr == "protected" ) @@ -768,7 +768,7 @@ void StoreWalker::parseAccessDeclaration( AccessDeclarationAST * access ) m_inSignals = l.count() >= 1 ? l.at( 0 ) ->text() == "signals" : false; } -NamespaceDom StoreWalker::findOrInsertNamespace( NamespaceAST* ast, const QString & name ) +NamespaceDom StoreWalker::findOrInsertNamespace( NamespaceAST* ast, const TQString & name ) { if ( m_currentNamespace.top() && m_currentNamespace.top() ->hasNamespace( name ) ) return m_currentNamespace.top() ->namespaceByName( name ); @@ -809,11 +809,11 @@ void StoreWalker::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storage if ( funSpec ) { - QPtrList<AST> l = funSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = funSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "virtual" ) isVirtual = true; else if ( text == "inline" ) @@ -824,11 +824,11 @@ void StoreWalker::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storage if ( storageSpec ) { - QPtrList<AST> l = storageSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = storageSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -843,7 +843,7 @@ void StoreWalker::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storage decl->getEndPosition( &endLine, &endColumn ); DeclaratorAST* d = decl->declarator(); - QString id = d->declaratorId() ->unqualifiedName() ->text(); + TQString id = d->declaratorId() ->unqualifiedName() ->text(); FunctionDom method = m_store->create<FunctionModel>(); method->setName( id ); @@ -867,7 +867,7 @@ void StoreWalker::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storage if ( m_inSlots ) method->setSlot( true ); - QString text = typeOfDeclaration( typeSpec, d ); + TQString text = typeOfDeclaration( typeSpec, d ); if ( !text.isEmpty() ) method->setResultType( text ); @@ -889,8 +889,8 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom if ( clause && clause->parameterDeclarationList() ) { ParameterDeclarationListAST * params = clause->parameterDeclarationList(); - QPtrList<ParameterDeclarationAST> l( params->parameterList() ); - QPtrListIterator<ParameterDeclarationAST> it( l ); + TQPtrList<ParameterDeclarationAST> l( params->parameterList() ); + TQPtrListIterator<ParameterDeclarationAST> it( l ); while ( it.current() ) { ParameterDeclarationAST * param = it.current(); @@ -900,12 +900,12 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom if ( param->declarator() ) { - QString text = declaratorToString( param->declarator(), QString::null, true ); + TQString text = declaratorToString( param->declarator(), TQString::null, true ); if ( !text.isEmpty() ) arg->setName( text ); } - QString tp = typeOfDeclaration( param->typeSpec(), param->declarator() ); + TQString tp = typeOfDeclaration( param->typeSpec(), param->declarator() ); if ( !tp.isEmpty() ) arg->setType( tp ); @@ -914,17 +914,17 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom } } -QString StoreWalker::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) +TQString StoreWalker::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) { if ( !typeSpec || !declarator ) - return QString::null; + return TQString::null; - QString text; + TQString text; text += typeSpec->text(); - QPtrList<AST> ptrOpList = declarator->ptrOpList(); - for ( QPtrListIterator<AST> it( ptrOpList ); it.current(); ++it ) + TQPtrList<AST> ptrOpList = declarator->ptrOpList(); + for ( TQPtrListIterator<AST> it( ptrOpList ); it.current(); ++it ) { text += it.current() ->text(); } @@ -938,13 +938,13 @@ QString StoreWalker::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAS void StoreWalker::parseBaseClause( BaseClauseAST * baseClause, ClassDom klass ) { - QPtrList<BaseSpecifierAST> l = baseClause->baseSpecifierList(); - QPtrListIterator<BaseSpecifierAST> it( l ); + TQPtrList<BaseSpecifierAST> l = baseClause->baseSpecifierList(); + TQPtrListIterator<BaseSpecifierAST> it( l ); while ( it.current() ) { BaseSpecifierAST * baseSpecifier = it.current(); - QString baseName; + TQString baseName; if ( baseSpecifier->name() ) baseName = baseSpecifier->name() ->text(); @@ -954,15 +954,15 @@ void StoreWalker::parseBaseClause( BaseClauseAST * baseClause, ClassDom klass ) } } -QStringList StoreWalker::scopeOfName( NameAST* id, const QStringList& startScope ) +TQStringList StoreWalker::scopeOfName( NameAST* id, const TQStringList& startScope ) { - QStringList scope = startScope; + TQStringList scope = startScope; if ( id && id->classOrNamespaceNameList().count() ) { if ( id->isGlobal() ) scope.clear(); - QPtrList<ClassOrNamespaceNameAST> l = id->classOrNamespaceNameList(); - QPtrListIterator<ClassOrNamespaceNameAST> it( l ); + TQPtrList<ClassOrNamespaceNameAST> l = id->classOrNamespaceNameList(); + TQPtrListIterator<ClassOrNamespaceNameAST> it( l ); while ( it.current() ) { if ( it.current() ->name() ) @@ -978,11 +978,11 @@ QStringList StoreWalker::scopeOfName( NameAST* id, const QStringList& startScope ///@todo respect the imports that result from the headers etc. -ClassDom StoreWalker::findClassFromScope( const QStringList& scope ) +ClassDom StoreWalker::findClassFromScope( const TQStringList& scope ) { - QString scopeText = scope.join("::"); + TQString scopeText = scope.join("::"); if( !m_imports.isEmpty() ) { - QMapIterator<QString, ClassDom> it = m_imports.back().first.find( scopeText ); + TQMapIterator<TQString, ClassDom> it = m_imports.back().first.find( scopeText ); if( it != m_imports.back().first.end() ) { return *it; } @@ -997,9 +997,9 @@ ClassDom StoreWalker::findClassFromScope( const QStringList& scope ) if(!m_imports.isEmpty() && !m_imports.back().second.isEmpty()) { ///try the same using one of the imports(performance-wise this is not good, but simple) - QStringList::iterator it = m_imports.back().second.begin(); + TQStringList::iterator it = m_imports.back().second.begin(); while(it != m_imports.back().second.end()) { - QStringList scp = QStringList::split("::", *it) + m_currentScope + scope; + TQStringList scp = TQStringList::split("::", *it) + m_currentScope + scope; c = classFromScope( scp ); if( c ) { if( !m_imports.isEmpty() ) m_imports.back().first[ scopeText ] = c; @@ -1011,12 +1011,12 @@ ClassDom StoreWalker::findClassFromScope( const QStringList& scope ) return c; } -ClassDom findScopeInFile( const QStringList& scope, NamespaceModel* glob ) { +ClassDom findScopeInFile( const TQStringList& scope, NamespaceModel* glob ) { if( !glob ) return ClassDom(); ClassModel* curr = glob ; - QStringList::const_iterator mit = scope.begin(); + TQStringList::const_iterator mit = scope.begin(); while(curr->isNamespace() && mit != scope.end() && ((NamespaceModel*)curr)->hasNamespace( *mit )) { curr = &(*( ((NamespaceModel*)curr)->namespaceByName( *mit ) )); @@ -1036,7 +1036,7 @@ ClassDom findScopeInFile( const QStringList& scope, NamespaceModel* glob ) { } } -ClassDom StoreWalker::classFromScope(const QStringList& scope) { +ClassDom StoreWalker::classFromScope(const TQStringList& scope) { if(scope.isEmpty())return ClassDom(0); //Since another instance of the current file may still be in the code-model this must be testede BEFORE the code-model @@ -1048,7 +1048,7 @@ ClassDom StoreWalker::classFromScope(const QStringList& scope) { c = findScopeInFile( scope, glob ); - QMap<QString, FileDom>::const_iterator it; + TQMap<TQString, FileDom>::const_iterator it; if( c ) { ///Check the file that overrides the code-model file @@ -1062,7 +1062,7 @@ ClassDom StoreWalker::classFromScope(const QStringList& scope) { } } else { ///Search in all overrides, because they will be added later all at once - for( QMap<QString, FileDom>::const_iterator it = m_overrides.begin(); it != m_overrides.end(); ++it ) { + for( TQMap<TQString, FileDom>::const_iterator it = m_overrides.begin(); it != m_overrides.end(); ++it ) { c = findScopeInFile( scope, *it ); if( c ) return c; @@ -1073,7 +1073,7 @@ ClassDom StoreWalker::classFromScope(const QStringList& scope) { } -QStringList StoreWalker::scopeOfDeclarator( DeclaratorAST* d, const QStringList& startScope ) +TQStringList StoreWalker::scopeOfDeclarator( DeclaratorAST* d, const TQStringList& startScope ) { return scopeOfName( d->declaratorId(), startScope ); } diff --git a/languages/cpp/store_walker.h b/languages/cpp/store_walker.h index 488e692b..49c4bb8f 100644 --- a/languages/cpp/store_walker.h +++ b/languages/cpp/store_walker.h @@ -14,14 +14,14 @@ #include "tree_parser.h" #include <codemodel.h> -#include <qstringlist.h> -#include <qvaluestack.h> +#include <tqstringlist.h> +#include <tqvaluestack.h> #include <hashedstring.h> class StoreWalker: public TreeParser { public: - StoreWalker( const QString& fileName, CodeModel* store ); + StoreWalker( const TQString& fileName, CodeModel* store ); virtual ~StoreWalker(); FileDom file() @@ -61,19 +61,19 @@ public: virtual void parseBaseClause( BaseClauseAST* baseClause, ClassDom klass ); private: - NamespaceDom findOrInsertNamespace( NamespaceAST* ast, const QString& name ); - QString typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ); - QStringList scopeOfName( NameAST* id, const QStringList& scope ); - QStringList scopeOfDeclarator( DeclaratorAST* d, const QStringList& scope ); - ClassDom classFromScope(const QStringList& scope); - ClassDom findClassFromScope(const QStringList& scope); + NamespaceDom findOrInsertNamespace( NamespaceAST* ast, const TQString& name ); + TQString typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ); + TQStringList scopeOfName( NameAST* id, const TQStringList& scope ); + TQStringList scopeOfDeclarator( DeclaratorAST* d, const TQStringList& scope ); + ClassDom classFromScope(const TQStringList& scope); + ClassDom findClassFromScope(const TQStringList& scope); void checkTemplateDeclarator( TemplateModelItem* item ); private: class CommentPusher { StoreWalker& m_ref; public: - CommentPusher( StoreWalker& ref, QString comment ) : m_ref( ref ) { + CommentPusher( StoreWalker& ref, TQString comment ) : m_ref( ref ) { m_ref.pushComment( comment ); } ~CommentPusher() { @@ -81,9 +81,9 @@ private: } }; - QStringList m_comments; + TQStringList m_comments; - QString comment() { + TQString comment() { if( m_comments.isEmpty() ) { return ""; } else { @@ -95,7 +95,7 @@ private: int mergeGroups( int g1, int g2 ); public: - void pushComment( QString comm ) { + void pushComment( TQString comm ) { m_comments.push_front( comm ); } @@ -103,19 +103,19 @@ public: m_comments.pop_front(); } - void setOverrides( const QMap<QString, FileDom>& overrides ) { + void setOverrides( const TQMap<TQString, FileDom>& overrides ) { m_overrides = overrides; } private: - QMap<QString, FileDom> m_overrides; + TQMap<TQString, FileDom> m_overrides; FileDom m_file; - QString m_fileName; + TQString m_fileName; HashedString m_hashedFileName; - QStringList m_currentScope; + TQStringList m_currentScope; CodeModel* m_store; - QValueList<QPair<QMap<QString, ClassDom>, QStringList> > m_imports; + TQValueList<QPair<TQMap<TQString, ClassDom>, TQStringList> > m_imports; int m_currentAccess; bool m_inSlots; bool m_inSignals; @@ -124,11 +124,11 @@ private: bool m_inTypedef; DeclaratorAST* m_currentDeclarator; - QValueStack<TemplateDeclarationAST*> m_currentTemplateDeclarator; - QValueStack<NamespaceDom> m_currentNamespace; - QValueStack<ClassDom> m_currentClass; + TQValueStack<TemplateDeclarationAST*> m_currentTemplateDeclarator; + TQValueStack<NamespaceDom> m_currentNamespace; + TQValueStack<ClassDom> m_currentClass; - QStringList findScope( const QStringList& scope ); + TQStringList findScope( const TQStringList& scope ); private: diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp index 3569bdea..6ad55925 100644 --- a/languages/cpp/storeconverter.cpp +++ b/languages/cpp/storeconverter.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "storeconverter.h" -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kdebug.h> @@ -25,20 +25,20 @@ StoreConverter::StoreConverter(CppSupportPart *part, CodeModel *model) { } -void StoreConverter::PCSClassToCodeModel(const QString &className, const QStringList &/*classScope*/) +void StoreConverter::PCSClassToCodeModel(const TQString &className, const TQStringList &/*classScope*/) { - QValueList<Catalog*> catalogs = m_part->codeRepository()->registeredCatalogs(); - for (QValueList<Catalog*>::iterator it = catalogs.begin(); + TQValueList<Catalog*> catalogs = m_part->codeRepository()->registeredCatalogs(); + for (TQValueList<Catalog*>::iterator it = catalogs.begin(); it != catalogs.end(); ++it) { Catalog *catalog = *it; kdDebug() << "looking in catalog: " << catalog->dbName() << endl; - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "kind", Tag::Kind_Class ); args << Catalog::QueryArgument( "name", className ); - QValueList<Tag> tags = catalog->query(args); - for (QValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) + TQValueList<Tag> tags = catalog->query(args); + for (TQValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { Tag& tag = *it; kdDebug() << "TAG: " << tag.name() << " in file " << tag.fileName() << endl; @@ -67,13 +67,13 @@ void StoreConverter::parseClass(Tag &classTag, FileDom file) klass->setName(classTag.name()); klass->setFileName(classTag.fileName()); - QStringList scope; + TQStringList scope; scope.append(classTag.name()); - QValueList<Tag> symbolTags = m_part->codeCompletion()->repository()-> + TQValueList<Tag> symbolTags = m_part->codeCompletion()->repository()-> getTagsInScope(scope, false); // kdDebug() << "got tags: " << endl; - for (QValueList<Tag>::iterator sit = symbolTags.begin(); sit != symbolTags.end(); ++sit ) + for (TQValueList<Tag>::iterator sit = symbolTags.begin(); sit != symbolTags.end(); ++sit ) { Tag &symbol = *sit; // kdDebug() << symbol.name() << endl; @@ -88,8 +88,8 @@ void StoreConverter::parseClass(Tag &classTag, FileDom file) } } - QValueList<Tag> baseClassTags = m_part->codeCompletion()->repository()->getBaseClassList(classTag.name()); - for (QValueList<Tag>::iterator bit = baseClassTags.begin(); + TQValueList<Tag> baseClassTags = m_part->codeCompletion()->repository()->getBaseClassList(classTag.name()); + for (TQValueList<Tag>::iterator bit = baseClassTags.begin(); bit != baseClassTags.end(); ++bit) klass->addBaseClass((*bit).name()); @@ -135,8 +135,8 @@ void StoreConverter::parseVariable(Tag &var, ClassDom klass) void StoreConverter::parseArguments(FunctionDom function, CppFunction<Tag> &cppFun) { - QStringList args = cppFun.arguments(); - for (QStringList::const_iterator it = args.constBegin(); it != args.constEnd(); ++it) + TQStringList args = cppFun.arguments(); + for (TQStringList::const_iterator it = args.constBegin(); it != args.constEnd(); ++it) { ArgumentDom arg = m_model->create<ArgumentModel>(); arg->setType(*it); diff --git a/languages/cpp/storeconverter.h b/languages/cpp/storeconverter.h index 34a5d3d3..1aa48e6b 100644 --- a/languages/cpp/storeconverter.h +++ b/languages/cpp/storeconverter.h @@ -11,7 +11,7 @@ #ifndef STORECONVERTER_H #define STORECONVERTER_H -#include <qstringlist.h> +#include <tqstringlist.h> #include <tag.h> #include <catalog.h> @@ -26,7 +26,7 @@ class StoreConverter public: StoreConverter( CppSupportPart *part, CodeModel *model ); - void PCSClassToCodeModel( const QString &className, const QStringList &classScope ); + void PCSClassToCodeModel( const TQString &className, const TQStringList &classScope ); protected: /**Parses class from PCS and adds it into a file dom.*/ diff --git a/languages/cpp/stringhelpers.cpp b/languages/cpp/stringhelpers.cpp index d380fd64..13a39de2 100644 --- a/languages/cpp/stringhelpers.cpp +++ b/languages/cpp/stringhelpers.cpp @@ -19,17 +19,17 @@ k copyright : (C) 2006 by David Nolden namespace StringHelpers { -void clearStr( QString& str, int start, int end ) { +void clearStr( TQString& str, int start, int end ) { for( int a = start; a < end; a++) str[a] = ' '; } -bool isValidIdentifierSign( const QChar& c ) { +bool isValidIdentifierSign( const TQChar& c ) { if( c.isLetter() || c.isDigit() || c == '_' ) return true; else return false; } -QString clearComments( QString str ) { +TQString clearComments( TQString str ) { if( str.isEmpty() ) return ""; SafetyCounter s( 1000 ); @@ -64,7 +64,7 @@ QString clearComments( QString str ) { return str; } -QString cutTemplateParams( QString str ) { +TQString cutTemplateParams( TQString str ) { int p; if( (p = str.find('<') ) != -1) { return str.left( p ); @@ -73,8 +73,8 @@ QString cutTemplateParams( QString str ) { return str.stripWhiteSpace().replace('*',""); } -QPair<QString, QString> splitTemplateParams( QString str ) { - QPair<QString, QString> ret; +QPair<TQString, TQString> splitTemplateParams( TQString str ) { + QPair<TQString, TQString> ret; int p; if( (p = str.find('<') ) != -1) { ret.first = str.left( p ).stripWhiteSpace(); @@ -86,7 +86,7 @@ QPair<QString, QString> splitTemplateParams( QString str ) { return ret; } -bool parenFits( QChar c1, QChar c2 ) { +bool parenFits( TQChar c1, TQChar c2 ) { if( c1 == '<' && c2 == '>' ) return true; else if( c1 == '(' && c2 == ')' ) return true; else if( c1 == '[' && c2 == ']' ) return true; @@ -95,7 +95,7 @@ bool parenFits( QChar c1, QChar c2 ) { return false; } -bool isParen( QChar c1 ) { +bool isParen( TQChar c1 ) { if( c1 == '<' || c1 == '>' ) return true; else if( c1 == '(' || c1 == ')' ) return true; else if( c1 == '[' || c1 == ']' ) return true; @@ -104,25 +104,25 @@ bool isParen( QChar c1 ) { return false; } -bool isTypeParen( QChar c1 ) { +bool isTypeParen( TQChar c1 ) { if( c1 == '<' || c1 == '>' ) return true; else return false; } -bool isTypeOpenParen( QChar c1 ) { +bool isTypeOpenParen( TQChar c1 ) { if( c1 == '<' ) return true; else return false; } -bool isTypeCloseParen( QChar c1 ) { +bool isTypeCloseParen( TQChar c1 ) { if( c1 == '>' ) return true; else return false; } -bool isLeftParen( QChar c1 ) { +bool isLeftParen( TQChar c1 ) { if( c1 == '<' ) return true; else if( c1 == '(' ) return true; else if( c1 == '[' ) return true; @@ -131,10 +131,10 @@ bool isLeftParen( QChar c1 ) { return false; } -int findClose( const QString& str , int pos ) { +int findClose( const TQString& str , int pos ) { int depth = 0; - QValueList<QChar> st; - QChar last = ' '; + TQValueList<TQChar> st; + TQChar last = ' '; for( int a = pos; a < (int)str.length(); a++) { switch(str[a]) { @@ -176,23 +176,23 @@ int findClose( const QString& str , int pos ) { return -1; } -QString tagType( const Tag& tag ) +TQString tagType( const Tag& tag ) { if ( tag.hasAttribute( "t" ) ) { - QString type = tag.attribute( "t" ).toString(); + TQString type = tag.attribute( "t" ).toString(); return type; } else if ( tag.kind() == Tag::Kind_Class || tag.kind() == Tag::Kind_Namespace ) { - QStringList l = tag.scope(); + TQStringList l = tag.scope(); l << tag.name(); return l.join("::"); } - return QString(); + return TQString(); } -int findCommaOrEnd( const QString& str , int pos, QChar validEnd) { +int findCommaOrEnd( const TQString& str , int pos, TQChar validEnd) { for( int a = pos; a < (int)str.length(); a++) { switch(str[a]) { @@ -218,7 +218,7 @@ int findCommaOrEnd( const QString& str , int pos, QChar validEnd) { return str.length(); } -int countExtract( QChar c, const QString& str ) { +int countExtract( TQChar c, const TQString& str ) { int ret = 0; for( int a = 0; a < (int)str.length(); a++) { if( str[a] == c ) ++ret; @@ -236,7 +236,7 @@ int countExtract( QChar c, const QString& str ) { return ret; } -QString templateParamFromString( int num, QString str ) { +TQString templateParamFromString( int num, TQString str ) { if( str.endsWith("::") ) str.truncate( str.length() - 2 ); int begin = str.find('<'); int end = str.findRev('>'); @@ -257,8 +257,8 @@ QString templateParamFromString( int num, QString str ) { return str.mid( begin, end - begin ).stripWhiteSpace(); } -QStringList splitType( QString str ) { - QStringList ret; +TQStringList splitType( TQString str ) { + TQStringList ret; int currentStart = 0; bool was = false; for( int a = 0; a < (int)str.length(); ++a ) { @@ -287,8 +287,8 @@ QStringList splitType( QString str ) { return ret; } -QString stringMult( int count, QString str ){ - QString ret; +TQString stringMult( int count, TQString str ){ + TQString ret; for( int a = 0; a < count; a++ ) ret += str; return ret; } diff --git a/languages/cpp/stringhelpers.h b/languages/cpp/stringhelpers.h index d15f57aa..c8783413 100644 --- a/languages/cpp/stringhelpers.h +++ b/languages/cpp/stringhelpers.h @@ -23,46 +23,46 @@ namespace StringHelpers { -void clearStr( QString& str, int start, int end ); +void clearStr( TQString& str, int start, int end ); ///Fills all comments with whitespaces -QString clearComments( QString str ); +TQString clearComments( TQString str ); -QString cutTemplateParams( QString str ); +TQString cutTemplateParams( TQString str ); -QPair<QString, QString> splitTemplateParams( QString str ); +QPair<TQString, TQString> splitTemplateParams( TQString str ); -bool parenFits( QChar c1, QChar c2 ); +bool parenFits( TQChar c1, TQChar c2 ); -bool isParen( QChar c1 ); +bool isParen( TQChar c1 ); -bool isTypeParen( QChar c1 ); +bool isTypeParen( TQChar c1 ); -bool isTypeOpenParen( QChar c1 ); +bool isTypeOpenParen( TQChar c1 ); -bool isTypeCloseParen( QChar c1 ); +bool isTypeCloseParen( TQChar c1 ); -bool isLeftParen( QChar c1 ); +bool isLeftParen( TQChar c1 ); /*only from left to right searches a fitting closing sign ( a ')' for a '(', ']' for '[' ignores quoted text comments are currently not allowed */ -int findClose( const QString& str , int pos ); //todo: make this respect strings +int findClose( const TQString& str , int pos ); //todo: make this respect strings -QString tagType( const Tag& tag ); +TQString tagType( const Tag& tag ); -int findCommaOrEnd( const QString& str , int pos, QChar validEnd = ' ' ); +int findCommaOrEnd( const TQString& str , int pos, TQChar validEnd = ' ' ); -int countExtract( QChar c, const QString& str ); +int countExtract( TQChar c, const TQString& str ); -QString templateParamFromString( int num, QString str ); +TQString templateParamFromString( int num, TQString str ); -QStringList splitType( QString str ) ; +TQStringList splitType( TQString str ) ; class ParamIterator { public: - ParamIterator( QString parens, QString source ) : m_source( source ), m_parens( parens ), m_cur( 0 ), m_curEnd ( 0 ) { + ParamIterator( TQString parens, TQString source ) : m_source( source ), m_parens( parens ), m_cur( 0 ), m_curEnd ( 0 ) { int begin = m_source.find( m_parens[ 0 ] ); int end = m_source.findRev( m_parens[ 1 ] ); m_prefix = m_source.left( begin ); @@ -83,7 +83,7 @@ class ParamIterator { return *this; } - QString operator *() { + TQString operator *() { return m_source.mid( m_cur, m_curEnd - m_cur ).stripWhiteSpace(); } @@ -91,14 +91,14 @@ class ParamIterator { return m_cur < ( int ) m_source.length(); } - QString prefix() const { + TQString prefix() const { return m_prefix; } private: - QString m_prefix; - QString m_source; - QString m_parens; + TQString m_prefix; + TQString m_source; + TQString m_parens; int m_cur; int m_curEnd; @@ -108,9 +108,9 @@ class ParamIterator { }; -bool isValidIdentifierSign( const QChar& c ); +bool isValidIdentifierSign( const TQChar& c ); -QString stringMult( int count, QString str ); +TQString stringMult( int count, TQString str ); } diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.cpp b/languages/cpp/subclassing_template/subclass_qt4_template.cpp index 6c008d43..c7b3e1f1 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.cpp +++ b/languages/cpp/subclassing_template/subclass_qt4_template.cpp @@ -2,7 +2,7 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(QWidget* parent, Qt::WFlags fl) +$NEWCLASS$::$NEWCLASS$(TQWidget* parent, Qt::WFlags fl) : $QTBASECLASS$( parent, fl ), Ui::$BASECLASS$() { setupUi(this); diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.h b/languages/cpp/subclassing_template/subclass_qt4_template.h index a8a02303..a84cf0d0 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.h +++ b/languages/cpp/subclassing_template/subclass_qt4_template.h @@ -10,7 +10,7 @@ class $NEWCLASS$ : public $QTBASECLASS$, private Ui::$BASECLASS$ Q_OBJECT public: - $NEWCLASS$(QWidget* parent = 0, Qt::WFlags fl = 0 ); + $NEWCLASS$(TQWidget* parent = 0, Qt::WFlags fl = 0 ); ~$NEWCLASS$(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/subclassing_template/subclass_template.cpp b/languages/cpp/subclassing_template/subclass_template.cpp index 19269531..adc89082 100644 --- a/languages/cpp/subclassing_template/subclass_template.cpp +++ b/languages/cpp/subclassing_template/subclass_template.cpp @@ -2,7 +2,7 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(QWidget* parent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) +$NEWCLASS$::$NEWCLASS$(TQWidget* parent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) : $BASECLASS$(parent,name$CAN_BE_MODAL_CPP2$,fl) { } diff --git a/languages/cpp/subclassing_template/subclass_template.h b/languages/cpp/subclassing_template/subclass_template.h index 18846cc6..8e238bae 100644 --- a/languages/cpp/subclassing_template/subclass_template.h +++ b/languages/cpp/subclassing_template/subclass_template.h @@ -9,7 +9,7 @@ class $NEWCLASS$ : public $BASECLASS$ Q_OBJECT public: - $NEWCLASS$(QWidget* parent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); + $NEWCLASS$(TQWidget* parent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); ~$NEWCLASS$(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index fa5aece9..562cd010 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -22,20 +22,20 @@ #include "filetemplate.h" #include "codemodel.h" -#include <qradiobutton.h> -#include <qstringlist.h> -#include <qcheckbox.h> -#include <qmessagebox.h> +#include <tqradiobutton.h> +#include <tqstringlist.h> +#include <tqcheckbox.h> +#include <tqmessagebox.h> #include <kfiledialog.h> #include <klineedit.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <domutil.h> -#include <qdom.h> +#include <tqdom.h> #include <kstandarddirs.h> #include <kdebug.h> #include <klocale.h> -#include <qfile.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqregexp.h> #include <kconfig.h> @@ -54,17 +54,17 @@ #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true) -SlotItem::SlotItem(QListView *parent,const QString &methodName, - const QString &specifier, - const QString &access, const QString &returnType, +SlotItem::SlotItem(TQListView *parent,const TQString &methodName, + const TQString &specifier, + const TQString &access, const TQString &returnType, bool isFunc,bool callBaseClass) -: QCheckListItem(parent,methodName,QCheckListItem::CheckBox) +: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox) { setOn(true); m_methodName = methodName; - m_access = access.isEmpty() ? (const QString) "public" : access; - m_specifier = specifier.isEmpty() ? (const QString) "virtual" : specifier; - m_returnType = returnType.isEmpty() ? (const QString) "void" : returnType; + m_access = access.isEmpty() ? (const TQString) "public" : access; + m_specifier = specifier.isEmpty() ? (const TQString) "virtual" : specifier; + m_returnType = returnType.isEmpty() ? (const TQString) "void" : returnType; m_isFunc = isFunc; m_callBaseClass = callBaseClass; setText(0,m_methodName); @@ -93,8 +93,8 @@ void SlotItem::setAllreadyInSubclass() } -SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const QString &formFile, - QStringList &newFileNames, QWidget* parent, +SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, + TQStringList &newFileNames, TQWidget* parent, const char* name,bool modal, WFlags fl) : SubclassingDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames), m_cppSupport( cppSupport ) @@ -115,9 +115,9 @@ m_newFileNames(newFileNames), m_cppSupport( cppSupport ) } -SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const QString &formFile, - const QString &filename, QStringList &dummy, - QWidget* parent, const char* name, bool modal, WFlags fl) +SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, + const TQString &filename, TQStringList &dummy, + TQWidget* parent, const char* name, bool modal, WFlags fl) : SubclassingDlgBase(parent, name, modal, fl), m_newFileNames(dummy), m_cppSupport( cppSupport ) @@ -135,12 +135,12 @@ m_newFileNames(dummy), m_cppSupport( cppSupport ) reformat_box->setChecked(true); } - QStringList pathsplit(QStringList::split('/',filename)); + TQStringList pathsplit(TQStringList::split('/',filename)); - QString baseClass = readBaseClassName(); - if (!cppSupport->codeModel()->hasFile(filename+QString(".h"))) + TQString baseClass = readBaseClassName(); + if (!cppSupport->codeModel()->hasFile(filename+TQString(".h"))) return; - ClassList myClasses = cppSupport->codeModel()->fileByName(filename+QString(".h"))->classList(); + ClassList myClasses = cppSupport->codeModel()->fileByName(filename+TQString(".h"))->classList(); for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt) { kdDebug() << "base class " << baseClass << " class " << (*classIt)->name() @@ -163,7 +163,7 @@ m_newFileNames(dummy), m_cppSupport( cppSupport ) m_btnOk->setEnabled(true); } -bool SubclassingDlg::alreadyInSubclass(const QString &method) +bool SubclassingDlg::alreadyInSubclass(const TQString &method) { for (uint i=0;i<m_parsedMethods.count();i++) { @@ -175,13 +175,13 @@ bool SubclassingDlg::alreadyInSubclass(const QString &method) void SubclassingDlg::readUiFile() { - QStringList splitPath = QStringList::split('/',m_formFile); - m_formName = QStringList::split('.',splitPath[splitPath.count()-1])[0]; // "somedlg.ui" = "somedlg" + TQStringList splitPath = TQStringList::split('/',m_formFile); + m_formName = TQStringList::split('.',splitPath[splitPath.count()-1])[0]; // "somedlg.ui" = "somedlg" splitPath.pop_back(); m_formPath = "/" + splitPath.join("/"); // join path to ui-file m_btnOk->setEnabled(false); - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc,m_formFile); m_baseClassName = DomUtil::elementByPathExt(doc,WIDGET_CLASS_NAME).text(); @@ -191,13 +191,13 @@ void SubclassingDlg::readUiFile() // Special widget specific slots SlotItem *newSlot; - m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","QDialog"); + m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog"); - if ( (m_qtBaseClassName=="QMainWindow") || (m_qtBaseClassName=="QWidget") ) + if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") ) m_canBeModal = false; else m_canBeModal = true; - if (m_qtBaseClassName != "QWidget") + if (m_qtBaseClassName != "TQWidget") { newSlot = new SLOT_ACCEPT; newSlot->setOn(false); @@ -214,7 +214,7 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - if (m_qtBaseClassName == "QWizard") + if (m_qtBaseClassName == "TQWizard") { newSlot = new SLOT_NEXT; m_slotView->insertItem(newSlot); @@ -234,12 +234,12 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - QDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); - QDomNodeList slotnodes = slotsElem.childNodes(); + TQDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); + TQDomNodeList slotnodes = slotsElem.childNodes(); for (unsigned int i=0; i<slotnodes.count();i++) { - QDomElement slotelem = slotnodes.item(i).toElement(); + TQDomElement slotelem = slotnodes.item(i).toElement(); newSlot = new SlotItem(m_slotView,slotelem.text(), slotelem.attributeNode("specifier").value(), slotelem.attributeNode("access").value(), @@ -250,12 +250,12 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - QDomElement funcsElem = DomUtil::elementByPathExt(doc,WIDGET_FUNCTIONS); - QDomNodeList funcnodes = funcsElem.childNodes(); + TQDomElement funcsElem = DomUtil::elementByPathExt(doc,WIDGET_FUNCTIONS); + TQDomNodeList funcnodes = funcsElem.childNodes(); SlotItem *newFunc; for (unsigned int i=0; i<funcnodes.count();i++) { - QDomElement funcelem = funcnodes.item(i).toElement(); + TQDomElement funcelem = funcnodes.item(i).toElement(); newFunc = new SlotItem(m_slotView,funcelem.text(), funcelem.attributeNode("specifier").value(), funcelem.attributeNode("access").value(), @@ -276,7 +276,7 @@ void SubclassingDlg::updateDlg() { } -void SubclassingDlg::replace(QString &string, const QString& search, const QString& replace) +void SubclassingDlg::replace(TQString &string, const TQString& search, const TQString& replace) { int nextPos = string.find(search); unsigned int searchLength = search.length(); @@ -287,10 +287,10 @@ void SubclassingDlg::replace(QString &string, const QString& search, const QStri } } -bool SubclassingDlg::loadBuffer(QString &buffer, const QString& filename) +bool SubclassingDlg::loadBuffer(TQString &buffer, const TQString& filename) { // open file and buffer it - QFile dataFile(filename); + TQFile dataFile(filename); if (!dataFile.open(IO_ReadOnly)) return false; char *temp = new char[dataFile.size()+1]; @@ -302,7 +302,7 @@ bool SubclassingDlg::loadBuffer(QString &buffer, const QString& filename) return true; } -bool SubclassingDlg::replaceKeywords(QString &buffer,bool canBeModal) +bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) { replace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper()); replace(buffer,"$BASEFILENAMELC$",m_formName.lower()); @@ -327,11 +327,11 @@ bool SubclassingDlg::replaceKeywords(QString &buffer,bool canBeModal) return true; } -bool SubclassingDlg::saveBuffer(QString &buffer, const QString& filename) +bool SubclassingDlg::saveBuffer(TQString &buffer, const TQString& filename) { // save buffer - QFile dataFile(filename); + TQFile dataFile(filename); if (!dataFile.open(IO_WriteOnly | IO_Truncate)) return false; dataFile.writeBlock((buffer+"\n").ascii(),(buffer+"\n").length()); @@ -353,19 +353,19 @@ void SubclassingDlg::accept() // h - file - QString public_slot = + TQString public_slot = "/*$PUBLIC_SLOTS$*/\n "; - QString protected_slot = + TQString protected_slot = "/*$PROTECTED_SLOTS$*/\n "; - QString public_func = + TQString public_func = "/*$PUBLIC_FUNCTIONS$*/\n "; - QString protected_func = + TQString protected_func = "/*$PROTECTED_FUNCTIONS$*/\n "; - QString buffer; + TQString buffer; int qtVersion = DomUtil::readIntEntry( *m_cppSupport->project()->projectDom(), "/kdevcppsupport/qt/version", 3 ); if (m_creatingNewSubclass) { @@ -375,11 +375,11 @@ void SubclassingDlg::accept() loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.h")); buffer = FileTemplate::read(m_cppSupport, "h") + buffer; - QFileInfo fi(m_filename + ".h"); - QString module = fi.baseName(); - QString basefilename = fi.baseName(true); - buffer.replace(QRegExp("\\$MODULE\\$"),module); - buffer.replace(QRegExp("\\$FILENAME\\$"),basefilename); + TQFileInfo fi(m_filename + ".h"); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName(true); + buffer.replace(TQRegExp("\\$MODULE\\$"),module); + buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); } else loadBuffer(buffer,m_filename+".h"); @@ -391,7 +391,7 @@ void SubclassingDlg::accept() if (!slitem->isOn() || slitem->m_alreadyInSubclass) continue; - QString declBuild; + TQString declBuild; if (slitem->m_access=="public") if (!slitem->m_isFunc) declBuild = public_slot; @@ -405,7 +405,7 @@ void SubclassingDlg::accept() if (!(slitem->m_specifier=="non virtual")) declBuild += "virtual "; declBuild += slitem->m_returnType + " "; - QString spacer; + TQString spacer; if (slitem->m_access=="public") { if (!slitem->m_isFunc) @@ -448,13 +448,13 @@ void SubclassingDlg::accept() // cpp - file - QString implementation = + TQString implementation = "/*$SPECIALIZATION$*/\n" "$RETURNTYPE$ $NEWCLASS$::$METHOD$\n" "{\n" "}\n"; - QString implementation_callbase = + TQString implementation_callbase = "/*$SPECIALIZATION$*/\n" "$RETURNTYPE$ $NEWCLASS$::$METHOD$\n" "{\n" @@ -470,11 +470,11 @@ void SubclassingDlg::accept() loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.cpp")); buffer = FileTemplate::read(m_cppSupport, "cpp") + buffer; - QFileInfo fi(m_filename + ".cpp"); - QString module = fi.baseName(); - QString basefilename = fi.baseName(true); - buffer.replace(QRegExp("\\$MODULE\\$"),module); - buffer.replace(QRegExp("\\$FILENAME\\$"),basefilename); + TQFileInfo fi(m_filename + ".cpp"); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName(true); + buffer.replace(TQRegExp("\\$MODULE\\$"),module); + buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem)) buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n"; } @@ -488,7 +488,7 @@ void SubclassingDlg::accept() if (!slitem->isOn() || slitem->m_alreadyInSubclass) continue; - QString impl = slitem->m_callBaseClass ? implementation_callbase : implementation; + TQString impl = slitem->m_callBaseClass ? implementation_callbase : implementation; replace(impl,"$RETURNTYPE$",slitem->m_returnType); replace(impl,"$NEWCLASS$",m_edClassName->text()); replace(impl,"$METHOD$", slitem->m_methodName); @@ -526,9 +526,9 @@ void SubclassingDlg::onChangedClassName() m_btnOk->setEnabled(true); } -QString SubclassingDlg::readBaseClassName() +TQString SubclassingDlg::readBaseClassName() { - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc,m_formFile); return DomUtil::elementByPathExt(doc,WIDGET_CLASS_NAME).text(); } diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index 2f645f09..2e2e9e95 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -12,7 +12,7 @@ #ifndef SUBCLASSINGDLG_H #define SUBCLASSINGDLG_H -#include <qlistview.h> +#include <tqlistview.h> #include "subclassingdlgbase.h" @@ -23,15 +23,15 @@ class CppSupportPart; class SlotItem : public QCheckListItem { public: - SlotItem( QListView *parent, const QString &text, - const QString &specifier, const QString &Access, - const QString &returnType, bool isFunc, + SlotItem( TQListView *parent, const TQString &text, + const TQString &specifier, const TQString &Access, + const TQString &returnType, bool isFunc, bool callBaseClass = false ); void setAllreadyInSubclass(); - QString m_access; - QString m_methodName; - QString m_returnType; - QString m_specifier; + TQString m_access; + TQString m_methodName; + TQString m_returnType; + TQString m_specifier; bool m_isFunc; bool m_callBaseClass; bool m_alreadyInSubclass; @@ -41,23 +41,23 @@ public: class SubclassingDlg : public SubclassingDlgBase { public: - SubclassingDlg( CppSupportPart* cppSupport, const QString &formFile, QStringList &newFileNames, - QWidget* parent = 0, const char* name = 0, + SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); - SubclassingDlg( CppSupportPart* cppSupport, const QString &formFile, const QString &filename, QStringList &dummy, - QWidget* parent = 0, const char* name = 0, + SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassingDlg(); private: void readUiFile(); - QString readBaseClassName(); + TQString readBaseClassName(); void updateDlg(); - bool replaceKeywords( QString &buffer, bool canBeModal = true ); - void replace( QString &string, const QString& search, const QString& replace ); - bool saveBuffer( QString &buffer, const QString& filename ); - bool loadBuffer( QString &buffer, const QString& filename ); - bool alreadyInSubclass( const QString &method ); + bool replaceKeywords( TQString &buffer, bool canBeModal = true ); + void replace( TQString &string, const TQString& search, const TQString& replace ); + bool saveBuffer( TQString &buffer, const TQString& filename ); + bool loadBuffer( TQString &buffer, const TQString& filename ); + bool alreadyInSubclass( const TQString &method ); bool m_creatingNewSubclass; public slots: @@ -65,18 +65,18 @@ public slots: virtual void onChangedClassName(); protected: - QStringList &m_newFileNames; - QString m_filename; - QString m_formFile; - QString m_baseClassName; - QString m_qtBaseClassName; - QString m_baseCaption; - QString m_formName; - QString m_formPath; - QStringList m_parsedMethods; + TQStringList &m_newFileNames; + TQString m_filename; + TQString m_formFile; + TQString m_baseClassName; + TQString m_qtBaseClassName; + TQString m_baseCaption; + TQString m_formName; + TQString m_formPath; + TQStringList m_parsedMethods; bool m_canBeModal; - QValueList<SlotItem*> m_slots; - QValueList<SlotItem*> m_functions; + TQValueList<SlotItem*> m_slots; + TQValueList<SlotItem*> m_functions; CppSupportPart* m_cppSupport; }; diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp index 8ad22d38..15849ad1 100644 --- a/languages/cpp/tag_creator.cpp +++ b/languages/cpp/tag_creator.cpp @@ -17,12 +17,12 @@ #include "driver.h" #include <kdebug.h> -#include <qfileinfo.h> -#include <qregexp.h> +#include <tqfileinfo.h> +#include <tqregexp.h> -DoxyDoc* TagCreator::m_documentation = new DoxyDoc( QStringList() ); +DoxyDoc* TagCreator::m_documentation = new DoxyDoc( TQStringList() ); -TagCreator::TagCreator( const QString& fileName, Catalog* c ) +TagCreator::TagCreator( const TQString& fileName, Catalog* c ) : m_catalog( c ), m_fileName( fileName ), m_anon( 0 ) { } @@ -36,7 +36,7 @@ void TagCreator::destroyDocumentation() delete m_documentation; } -void TagCreator::setDocumentationDirectories( const QStringList& str ) +void TagCreator::setDocumentationDirectories( const TQStringList& str ) { if ( m_documentation ) delete m_documentation; @@ -59,28 +59,28 @@ void TagCreator::parseDeclaration( DeclarationAST* ast ) void TagCreator::parseTranslationUnit( const ParsedFile& ast ) { m_currentScope.clear(); - m_currentAccess = QString::null; + m_currentAccess = TQString::null; m_inSlots = false; m_inSignals = false; m_anon = 0; m_imports.clear(); m_inClass = false; - m_imports << QStringList(); + m_imports << TQStringList(); Tag tag; tag.setKind( Tag::Kind_TranslationUnit ); tag.setFileName( m_fileName ); tag.setName( m_fileName ); - QByteArray data; - QDataStream stream(data, IO_WriteOnly ); + TQByteArray data; + TQDataStream stream(data, IO_WriteOnly ); ast.write( stream ); tag.setAttribute( "cppparsedfile", data ); tag.setAttribute( "includedFrom", ast.includedFrom() ); - tag.setAttribute( "skippedLines", QString("%1").arg( ast.skippedLines()) ); - tag.setAttribute( "macroValueHash", QString("%1").arg( ast.usedMacros().valueHash()) ); - tag.setAttribute( "macroIdHash", QString("%1").arg( ast.usedMacros().idHash() ) ); + tag.setAttribute( "skippedLines", TQString("%1").arg( ast.skippedLines()) ); + tag.setAttribute( "macroValueHash", TQString("%1").arg( ast.usedMacros().valueHash()) ); + tag.setAttribute( "macroIdHash", TQString("%1").arg( ast.usedMacros().idHash() ) ); tag.setScope( m_currentScope ); if( !ast->comment().isEmpty() ) @@ -93,8 +93,8 @@ void TagCreator::parseTranslationUnit( const ParsedFile& ast ) } void TagCreator::parseNamespaceAlias( NamespaceAliasAST* ast ) { - QString nsName; - QString aliasName; + TQString nsName; + TQString aliasName; if( !ast->namespaceName() || ast->namespaceName()->text().isEmpty() ) { @@ -129,7 +129,7 @@ void TagCreator::parseNamespaceAlias( NamespaceAliasAST* ast ) { void TagCreator::parseNamespace( NamespaceAST* ast ) { - QString nsName; + TQString nsName; if( !ast->namespaceName() || ast->namespaceName()->text().isEmpty() ) { // anonymous namespace @@ -166,7 +166,7 @@ void TagCreator::parseElaboratedTypeSpecifier( ElaboratedTypeSpecifierAST* ast ) void TagCreator::parseUsingDirective( UsingDirectiveAST* ast ) { - QString name; + TQString name; if( ast->name() ) name = ast->name()->text(); @@ -196,19 +196,19 @@ void TagCreator::parseTypedef( TypedefAST* ast ) InitDeclaratorListAST* declarators = ast->initDeclaratorList(); if( typeSpec && declarators ){ - QString typeId; + TQString typeId; if( typeSpec->name() ) typeId = typeSpec->name()->text(); - QPtrList<InitDeclaratorAST> l( declarators->initDeclaratorList() ); - QPtrListIterator<InitDeclaratorAST> it( l ); + TQPtrList<InitDeclaratorAST> l( declarators->initDeclaratorList() ); + TQPtrListIterator<InitDeclaratorAST> it( l ); InitDeclaratorAST* initDecl = 0; while( 0 != (initDecl = it.current()) ) { - QString type, id; + TQString type, id; if( initDecl->declarator() ) { type = typeOfDeclaration( typeSpec, initDecl->declarator() ); @@ -272,9 +272,9 @@ void TagCreator::parseSimpleDeclaration( SimpleDeclarationAST* ast ) if( declarators ) { - QPtrList<InitDeclaratorAST> l = declarators->initDeclaratorList(); + TQPtrList<InitDeclaratorAST> l = declarators->initDeclaratorList(); - QPtrListIterator<InitDeclaratorAST> it( l ); + TQPtrListIterator<InitDeclaratorAST> it( l ); while( it.current() ) { parseMyDeclaration( ast->functionSpecifier(), ast->storageSpecifier(), typeSpec, it.current() ); @@ -304,11 +304,11 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) if ( funSpec ) { - QPtrList<AST> l = funSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = funSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "virtual" ) isVirtual = true; else if ( text == "inline" ) @@ -319,11 +319,11 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) if ( storageSpec ) { - QPtrList<AST> l = storageSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = storageSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -333,8 +333,8 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) } - QString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace(); - QString scopeStr = scopeOfDeclarator( d ); + TQString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace(); + TQString scopeStr = scopeOfDeclarator( d ); Tag tag; if( !comment() ) @@ -345,7 +345,7 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) tag.setFileName( m_fileName ); tag.setName( id ); - tag.setScope( QStringList::split( ".", scopeStr ) ); + tag.setScope( TQStringList::split( ".", scopeStr ) ); if( !ast->comment().isEmpty() ) tag.setComment( ast->comment() ); @@ -361,8 +361,8 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) parseFunctionArguments( tag, d ); checkTemplateDeclarator( tag ); - QString arguments = tag.attribute( "a" ).toStringList().join( "," ); -tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.replace( QRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) ); + TQString arguments = tag.attribute( "a" ).toStringList().join( "," ); +tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.replace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) ); tagBuilder.setAccess( TagUtils::stringToAccess( m_currentAccess ) ); @@ -386,8 +386,8 @@ tag.setAttribute( "description", m_documentation->functionDescription( scopeStr. void TagCreator::parseLinkageBody( LinkageBodyAST* ast ) { - QPtrList<DeclarationAST> l = ast->declarationList(); - QPtrListIterator<DeclarationAST> it( l ); + TQPtrList<DeclarationAST> l = ast->declarationList(); + TQPtrListIterator<DeclarationAST> it( l ); while ( it.current() ) { parseDeclaration( it.current() ); @@ -411,11 +411,11 @@ void TagCreator::checkTemplateDeclarator( Tag& tag ) { void TagCreator::takeTemplateParams( Tag& target, TemplateDeclarationAST* ast) { TemplateParameterListAST* pl = ast->templateParameterList(); if( pl ) { - QPtrList<TemplateParameterAST> list = pl->templateParameterList(); + TQPtrList<TemplateParameterAST> list = pl->templateParameterList(); TemplateParameterAST* curr = list.first(); while( curr != 0 ) { - QString a, b; + TQString a, b; if( curr->typeParameter() ) { if( curr->typeParameter()->name() ) a = curr->typeParameter()->name()->text(); @@ -437,11 +437,11 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast ) ast->getStartPosition( &startLine, &startColumn ); ast->getEndPosition( &endLine, &endColumn ); - QString oldAccess = m_currentAccess; + TQString oldAccess = m_currentAccess; bool oldInSlots = m_inSlots; bool oldInSignals = m_inSignals; - QString kind = ast->classKey() ->text(); + TQString kind = ast->classKey() ->text(); if ( kind == "class" ) m_currentAccess = "private"; else @@ -449,11 +449,11 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast ) m_inSlots = false; m_inSignals = false; - QString className; + TQString className; if ( !ast->name() ) { - //QFileInfo fileInfo( m_fileName ); - //QString shortFileName = fileInfo.baseName(); + //TQFileInfo fileInfo( m_fileName ); + //TQString shortFileName = fileInfo.baseName(); //className.sprintf( "(%s_%d)", shortFileName.local8Bit(), m_anon++ ); } else @@ -470,7 +470,7 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast ) tag.setFileName( m_fileName ); int i = className.find( '<' ); - QString specialization; + TQString specialization; if( i != -1 ) { specialization = className.mid( i ); @@ -529,11 +529,11 @@ void TagCreator::parseEnumSpecifier( EnumSpecifierAST* ast ) m_catalog->addItem( tag ); - QPtrList<EnumeratorAST> l = ast->enumeratorList(); - QPtrListIterator<EnumeratorAST> it( l ); + TQPtrList<EnumeratorAST> l = ast->enumeratorList(); + TQPtrListIterator<EnumeratorAST> it( l ); while ( it.current() ) { - QString name = it.current() ->id() ->text(); + TQString name = it.current() ->id() ->text(); Tag tag; tag.setKind( Tag::Kind_Enumerator ); @@ -578,13 +578,13 @@ void TagCreator::parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, T while ( t && t->subDeclarator() ) t = t->subDeclarator(); - QString id; + TQString id; if ( t && t->declaratorId() && t->declaratorId() ->unqualifiedName() ) id = t->declaratorId() ->unqualifiedName() ->text(); - QString scopeStr = scopeOfDeclarator( d ); + TQString scopeStr = scopeOfDeclarator( d ); - QString type = typeOfDeclaration( typeSpec, d ); + TQString type = typeOfDeclaration( typeSpec, d ); bool isFriend = false; @@ -595,11 +595,11 @@ void TagCreator::parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, T if ( storageSpec ) { - QPtrList<AST> l = storageSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = storageSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -614,7 +614,7 @@ void TagCreator::parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, T tag.setKind( Tag::Kind_Variable ); tag.setFileName( m_fileName ); tag.setName( id ); - tag.setScope( QStringList::split( ".", scopeStr ) ); + tag.setScope( TQStringList::split( ".", scopeStr ) ); if( !comment().isEmpty() ) tag.setComment( comment() ); @@ -635,7 +635,7 @@ void TagCreator::parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, T void TagCreator::parseAccessDeclaration( AccessDeclarationAST * access ) { - QPtrList<AST> l = access->accessList(); + TQPtrList<AST> l = access->accessList(); m_currentAccess = l.at( 0 )->text(); if( m_currentAccess == "signals" ) @@ -656,11 +656,11 @@ void TagCreator::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageS if ( funSpec ) { - QPtrList<AST> l = funSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = funSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "virtual" ) isVirtual = true; else if ( text == "inline" ) @@ -671,11 +671,11 @@ void TagCreator::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageS if ( storageSpec ) { - QPtrList<AST> l = storageSpec->nodeList(); - QPtrListIterator<AST> it( l ); + TQPtrList<AST> l = storageSpec->nodeList(); + TQPtrListIterator<AST> it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -690,9 +690,9 @@ void TagCreator::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageS decl->getEndPosition( &endLine, &endColumn ); DeclaratorAST* d = decl->declarator(); - QString id = d->declaratorId() ->unqualifiedName() ->text(); + TQString id = d->declaratorId() ->unqualifiedName() ->text(); - QString type = typeOfDeclaration( typeSpec, d ); + TQString type = typeOfDeclaration( typeSpec, d ); Tag tag; CppFunction<Tag> tagBuilder( tag ); @@ -724,8 +724,8 @@ void TagCreator::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageS parseFunctionArguments( tag, d ); checkTemplateDeclarator( tag ); - QString arguments = tag.attribute( "a" ).toStringList().join( "," ); - QString scopeStr = m_currentScope.join( "::" ); + TQString arguments = tag.attribute( "a" ).toStringList().join( "," ); + TQString scopeStr = m_currentScope.join( "::" ); tag.setAttribute( "description", m_documentation->functionDescription( scopeStr, id, type, arguments ) ); m_catalog->addItem( tag ); @@ -735,23 +735,23 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator ) { ParameterDeclarationClauseAST* clause = declarator->parameterDeclarationClause(); - QStringList types; - QStringList args; + TQStringList types; + TQStringList args; if( clause && clause->parameterDeclarationList() ){ ParameterDeclarationListAST* params = clause->parameterDeclarationList(); - QPtrList<ParameterDeclarationAST> l( params->parameterList() ); - QPtrListIterator<ParameterDeclarationAST> it( l ); + TQPtrList<ParameterDeclarationAST> l( params->parameterList() ); + TQPtrListIterator<ParameterDeclarationAST> it( l ); while( it.current() ){ ParameterDeclarationAST* param = it.current(); ++it; - QString name; + TQString name; if( param->declarator() ){ - name = declaratorToString(param->declarator(), QString::null, true ); + name = declaratorToString(param->declarator(), TQString::null, true ); } - QString type = typeOfDeclaration( param->typeSpec(), param->declarator() ); + TQString type = typeOfDeclaration( param->typeSpec(), param->declarator() ); types << type; args << name; @@ -770,18 +770,18 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator ) tagBuilder.setArgumentNames( args ); } -QString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) +TQString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) { if( !typeSpec || !declarator ) - return QString::null; + return TQString::null; - QString text; + TQString text; text += typeSpec->text(); text = text.simplifyWhiteSpace(); - QPtrList<AST> ptrOpList = declarator->ptrOpList(); - for( QPtrListIterator<AST> it(ptrOpList); it.current(); ++it ) + TQPtrList<AST> ptrOpList = declarator->ptrOpList(); + for( TQPtrListIterator<AST> it(ptrOpList); it.current(); ++it ) text += it.current()->text(); for( int a = 0; a < declarator->arrayDimensionList().count(); a++ ) @@ -790,22 +790,22 @@ QString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST return text; } -void TagCreator::parseBaseClause( const QString& className, BaseClauseAST * baseClause ) +void TagCreator::parseBaseClause( const TQString& className, BaseClauseAST * baseClause ) { - QPtrList<BaseSpecifierAST> l = baseClause->baseSpecifierList(); - QPtrListIterator<BaseSpecifierAST> it( l ); + TQPtrList<BaseSpecifierAST> l = baseClause->baseSpecifierList(); + TQPtrListIterator<BaseSpecifierAST> it( l ); while ( it.current() ) { BaseSpecifierAST * baseSpecifier = it.current(); - QString access; + TQString access; if ( baseSpecifier->access() ) access = baseSpecifier->access() ->text(); bool isVirtual = baseSpecifier->isVirtual() != 0; if( baseSpecifier->name() == 0 ) return; ///Workaround for some bug elsewhere - QString baseName; + TQString baseName; if ( baseSpecifier->name() ) baseName = baseSpecifier->name() ->text(); @@ -834,15 +834,15 @@ void TagCreator::parseBaseClause( const QString& className, BaseClauseAST * base } } -QString TagCreator::scopeOfDeclarator( DeclaratorAST* d ) +TQString TagCreator::scopeOfDeclarator( DeclaratorAST* d ) { - QStringList scope = m_currentScope; + TQStringList scope = m_currentScope; if ( d && d->declaratorId() && d->declaratorId() ->classOrNamespaceNameList().count() ) { if ( d->declaratorId() ->isGlobal() ) scope.clear(); - QPtrList<ClassOrNamespaceNameAST> l = d->declaratorId() ->classOrNamespaceNameList(); - QPtrListIterator<ClassOrNamespaceNameAST> it( l ); + TQPtrList<ClassOrNamespaceNameAST> l = d->declaratorId() ->classOrNamespaceNameList(); + TQPtrListIterator<ClassOrNamespaceNameAST> it( l ); while ( it.current() ) { if ( it.current() ->name() ) @@ -855,9 +855,9 @@ QString TagCreator::scopeOfDeclarator( DeclaratorAST* d ) return scope.join( "." ); } -int TagUtils::stringToAccess( const QString & access ) +int TagUtils::stringToAccess( const TQString & access ) { - QStringList l = QStringList() + TQStringList l = TQStringList() << "public" << "protected" << "private" << "public slots" << "protected slots" << "private slots" << "signals"; @@ -866,11 +866,11 @@ int TagUtils::stringToAccess( const QString & access ) return idx == -1 ? 0 : idx+1; } -QString TagUtils::accessToString( int id ) +TQString TagUtils::accessToString( int id ) { if( id == 0 ) return "unknown"; - QStringList l = QStringList() + TQStringList l = TQStringList() << "public" << "protected" << "private" << "public slots" << "protected slots" << "private slots" << "signals"; @@ -878,7 +878,7 @@ QString TagUtils::accessToString( int id ) if( l.at(id-1) != l.end() ) return l[ id-1 ]; - return QString::null; + return TQString::null; } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/tag_creator.h b/languages/cpp/tag_creator.h index 47d0b66f..425d7135 100644 --- a/languages/cpp/tag_creator.h +++ b/languages/cpp/tag_creator.h @@ -14,22 +14,22 @@ #include "tree_parser.h" -#include <qstringlist.h> -#include <qvaluestack.h> +#include <tqstringlist.h> +#include <tqvaluestack.h> class Catalog; class Tag; namespace TagUtils { - int stringToAccess( const QString& access ); - QString accessToString( int id ); + int stringToAccess( const TQString& access ); + TQString accessToString( int id ); } class TagCreator: public TreeParser { public: - TagCreator( const QString& fileName, Catalog* c ); + TagCreator( const TQString& fileName, Catalog* c ); virtual ~TagCreator(); // translation-unit @@ -55,7 +55,7 @@ public: virtual void parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, TypeSpecifierAST* typeSpec, InitDeclaratorAST* decl ); virtual void parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageSpec, TypeSpecifierAST* typeSpec, InitDeclaratorAST* decl ); virtual void parseFunctionArguments( Tag& tag, DeclaratorAST* declarator ); - virtual void parseBaseClause( const QString& className, BaseClauseAST* baseClause ); + virtual void parseBaseClause( const TQString& className, BaseClauseAST* baseClause ); /** call this function after the last use of a TagCreator object, to do cleanup work @@ -64,14 +64,14 @@ public: /** This sets the directories, where the doxygen documentation should be searched in. - @param dirs QStringList containing strings, which define the pathes, where documentation is searched in + @param dirs TQStringList containing strings, which define the pathes, where documentation is searched in */ - static void setDocumentationDirectories( const QStringList& dirs ); + static void setDocumentationDirectories( const TQStringList& dirs ); private: - QString scopeOfDeclarator( DeclaratorAST* d ); - QString typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ); + TQString scopeOfDeclarator( DeclaratorAST* d ); + TQString typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ); private: @@ -81,7 +81,7 @@ private: class CommentPusher { TagCreator& m_ref; public: - CommentPusher( TagCreator& ref, QString comment ) : m_ref( ref ) { + CommentPusher( TagCreator& ref, TQString comment ) : m_ref( ref ) { m_ref.pushComment( comment ); } ~CommentPusher() { @@ -89,9 +89,9 @@ private: } }; - QStringList m_comments; + TQStringList m_comments; - QString comment() { + TQString comment() { if( m_comments.isEmpty() ) { return ""; } else { @@ -99,7 +99,7 @@ private: } } - void pushComment( QString comm ) { + void pushComment( TQString comm ) { m_comments.push_front( comm ); } @@ -108,16 +108,16 @@ private: } Catalog* m_catalog; - QString m_fileName; - QStringList m_currentScope; - QValueList<QStringList> m_imports; - QString m_currentAccess; + TQString m_fileName; + TQStringList m_currentScope; + TQValueList<TQStringList> m_imports; + TQString m_currentAccess; bool m_inClass; bool m_inSlots; bool m_inSignals; int m_anon; - QValueStack<TemplateDeclarationAST*> m_currentTemplateDeclarator; + TQValueStack<TemplateDeclarationAST*> m_currentTemplateDeclarator; static class DoxyDoc* m_documentation; diff --git a/languages/cpp/typedecoration.h b/languages/cpp/typedecoration.h index 3d2e8382..e142d837 100644 --- a/languages/cpp/typedecoration.h +++ b/languages/cpp/typedecoration.h @@ -23,21 +23,21 @@ class TypeDecoration { } ///Removes the decoration from the given string - TypeDecoration( QString& str ) { + TypeDecoration( TQString& str ) { init( str ); } ~TypeDecoration() {} ///Removes the decoration from the assigned - TypeDecoration& operator = ( QString& str ) { + TypeDecoration& operator = ( TQString& str ) { clear(); init( str ); return *this; } - QString apply( const QString& str ) const { - QString ret = str; + TQString apply( const TQString& str ) const { + TQString ret = str; if ( !ret.startsWith( m_decoration_front ) ) ret = m_decoration_front + ret; @@ -54,11 +54,11 @@ class TypeDecoration { } void clear() { - m_decoration_front = QString(); - m_decoration_back = QString(); + m_decoration_front = TQString(); + m_decoration_back = TQString(); } - void prepend( const QString& str ) { + void prepend( const TQString& str ) { m_decoration_front = str + m_decoration_front; } @@ -70,11 +70,11 @@ class TypeDecoration { }*/ private: - void init( QString& str ) { + void init( TQString& str ) { str = str.stripWhiteSpace(); - static const QString cnst = "const"; - static const QString ref = "&"; + static const TQString cnst = "const"; + static const TQString ref = "&"; if ( str.startsWith( cnst ) ) { str.remove( 0, cnst.length() ); if( str.isEmpty() || ( !str[0].isLetterOrNumber() && str[0] != '_' ) ) { @@ -111,7 +111,7 @@ class TypeDecoration { } } - QString m_decoration_front, m_decoration_back; + TQString m_decoration_front, m_decoration_back; }; #endif diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp index 2e4e28a0..89d32931 100644 --- a/languages/cpp/typedesc.cpp +++ b/languages/cpp/typedesc.cpp @@ -21,7 +21,7 @@ #include "driver.h" #include "lexer.h" #include "parser.h" -#include <qtextstream.h> +#include <tqtextstream.h> #include <kglobal.h> @@ -139,7 +139,7 @@ TypeTrace* LocateResult::trace() { TypeDesc::TypeDesc() {} -TypeDesc::TypeDesc( const QString& name ) { +TypeDesc::TypeDesc( const TQString& name ) { init( name ); } @@ -169,7 +169,7 @@ TypeDesc& TypeDesc::operator = ( const TypeDesc& rhs ) { return *this; } -void TypeDesc::prependDecoration( const QString& str ) { +void TypeDesc::prependDecoration( const TQString& str ) { makePrivate(); m_data->m_dec.prepend( str ); } @@ -350,13 +350,13 @@ int TypeDesc::compare ( const TypeDesc& rhs ) const { } #ifdef USE_TEXT_STREAM -QString TypeDesc::nameWithParams() const { +TQString TypeDesc::nameWithParams() const { if ( !m_data ) return ""; - QString ret; + TQString ret; { - QTextStream s( &ret, IO_WriteOnly ); + TQTextStream s( &ret, IO_WriteOnly ); s << m_data->m_cleanName; if ( !m_data->m_templateParams.isEmpty() ) { s << "<"; @@ -375,14 +375,14 @@ QString TypeDesc::nameWithParams() const { #else -QString TypeDesc::nameWithParams() const { +TQString TypeDesc::nameWithParams() const { if( compare( *this ) != 0 ) { compare( *this ); } if ( !m_data ) return ""; - QString ret = m_data->m_cleanName; + TQString ret = m_data->m_cleanName; if ( !m_data->m_templateParams.isEmpty() ) { ret += "<"; bool first = true; @@ -399,13 +399,13 @@ QString TypeDesc::nameWithParams() const { #endif -QString TypeDesc::fullName( ) const { +TQString TypeDesc::fullName( ) const { if ( !m_data ) return ""; - QString ret = nameWithParams(); + TQString ret = nameWithParams(); for ( int a = 0; a < m_data->m_functionDepth; ++a ) - ret = QString( functionMark ) + ret; + ret = TQString( functionMark ) + ret; for ( int a = 0; a < m_data->m_pointerDepth; ++a ) ret += "*"; return m_data->m_dec.apply( ret ); @@ -427,21 +427,21 @@ size_t TypeDesc::hashKey2() const { return ret; } -QString TypeDesc::fullNameChain( ) const { +TQString TypeDesc::fullNameChain( ) const { if ( !m_data ) return ""; - QString ret = fullName(); + TQString ret = fullName(); if ( m_data->m_nextType ) { ret += "::" + m_data->m_nextType->fullNameChain(); } return m_data->m_dec.apply( ret ); } -QString TypeDesc::fullTypeStructure() const { +TQString TypeDesc::fullTypeStructure() const { if ( !m_data ) return ""; - QString ret = m_data->m_cleanName; + TQString ret = m_data->m_cleanName; if ( !m_data->m_templateParams.isEmpty() ) { ret += "<"; for ( TemplateParams::const_iterator it = m_data->m_templateParams.begin(); it != m_data->m_templateParams.end(); ++it ) { @@ -455,10 +455,10 @@ QString TypeDesc::fullTypeStructure() const { } -QStringList TypeDesc::fullNameList( ) const { +TQStringList TypeDesc::fullNameList( ) const { if ( !m_data ) return ""; - QStringList ret; + TQStringList ret; ret << fullName(); if ( m_data->m_nextType ) { ret += m_data->m_nextType->fullNameList(); @@ -575,7 +575,7 @@ void TypeDesc::clearInstanceInfo() { m_data->m_dec.clear(); } -void TypeDesc::takeTemplateParams( const QString& string ) { +void TypeDesc::takeTemplateParams( const TQString& string ) { makeDataPrivate(); m_data->m_templateParams.clear(); for ( ParamIterator it( "<>", string ); it; ++it ) @@ -650,7 +650,7 @@ int TypeDesc::decorationDepth() { return m_data->m_dec.depth(); }*/ -void TypeDesc::init( QString stri ) { +void TypeDesc::init( TQString stri ) { m_data = 0; maybeInit(); @@ -659,8 +659,8 @@ void TypeDesc::init( QString stri ) { m_data->m_dec = stri; ///Store the decoration - QStringList ls = splitType( stri ); - QString str = ls.front().stripWhiteSpace(); + TQStringList ls = splitType( stri ); + TQString str = ls.front().stripWhiteSpace(); ///Extract multiple types that may be written as a scope and put them to the next-types-list if ( !ls.isEmpty() ) { @@ -670,7 +670,7 @@ void TypeDesc::init( QString stri ) { } } - while ( str.startsWith( QString( functionMark ) ) ) { + while ( str.startsWith( TQString( functionMark ) ) ) { m_data->m_functionDepth++; str = str.mid( strlen( functionMark ) ).stripWhiteSpace(); } @@ -678,7 +678,7 @@ void TypeDesc::init( QString stri ) { //Little hack done for performance-reasons, to do less comparing if( str.length() >= 4 ) { - QChar c = str[0]; + TQChar c = str[0]; switch( c.latin1() ) { case 's': if( str[1] == 'h' ) { @@ -735,10 +735,10 @@ void TypeDesc::init( QString stri ) { if ( parser.parseTypeSpecifier( typeSpec ) ) { NameAST * name = typeSpec->name(); - QPtrList<ClassOrNamespaceNameAST> l = name->classOrNamespaceNameList(); - QPtrListIterator<ClassOrNamespaceNameAST> it( l ); + TQPtrList<ClassOrNamespaceNameAST> l = name->classOrNamespaceNameList(); + TQPtrListIterator<ClassOrNamespaceNameAST> it( l ); - QString type; + TQString type; while ( it.current() ) { if ( it.current() ->name() ) { type += it.current() ->name() ->text() + "::"; @@ -766,11 +766,11 @@ void TypeDesc::init( QString stri ) { } -void TypeDesc::takeData( const QString& string ) { +void TypeDesc::takeData( const TQString& string ) { makeDataPrivate(); m_data->m_templateParams.clear(); ParamIterator it( "<>", string ); - QString name = it.prefix(); + TQString name = it.prefix(); name.remove( "*" ); name.remove( "&" ); m_data->m_cleanName = name.stripWhiteSpace(); diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h index 924372df..ddb072d2 100644 --- a/languages/cpp/typedesc.h +++ b/languages/cpp/typedesc.h @@ -145,8 +145,8 @@ enum TypeDescFlags { struct TypeDescData : public KShared { - typedef QValueList<LocateResult> TemplateParams; - QString m_cleanName; + typedef TQValueList<LocateResult> TemplateParams; + TQString m_cleanName; int m_pointerDepth; int m_functionDepth; TemplateParams m_templateParams; @@ -175,11 +175,11 @@ private: class TypeDesc { public: - typedef QValueList<LocateResult> TemplateParams; + typedef TQValueList<LocateResult> TemplateParams; TypeDesc(); - TypeDesc( const QString& str ); + TypeDesc( const TQString& str ); TypeDesc( const TypeDesc& rhs ); @@ -193,7 +193,7 @@ class TypeDesc { TypeDesc& operator = ( const TypeDesc& rhs ); - TypeDesc& operator = ( const QString& rhs ) { + TypeDesc& operator = ( const TQString& rhs ) { init( rhs ); return *this; } @@ -243,19 +243,19 @@ class TypeDesc { void addIncludeFiles( const HashedStringSet& files ); - QString nameWithParams() const; + TQString nameWithParams() const; ///returns the type including template-parameters and pointer-depth - QString fullName( ) const; + TQString fullName( ) const; /**returns the type include template-parameters, pointer-depth, and possible sub-types. Example "A::B": A is the type, and B is the subtype */ - QString fullNameChain( ) const ; + TQString fullNameChain( ) const ; ///Returns the type-structure(full name-chain without any instance-info) - QString fullTypeStructure() const; + TQString fullTypeStructure() const; - void prependDecoration( const QString& str ); + void prependDecoration( const TQString& str ); ///Since the pointer-depth of a resolved type is always stored in the last element of its chain, this gives fast access to that depth int totalPointerDepth() const; @@ -283,22 +283,22 @@ class TypeDesc { }*/ ///returns a list include the full name of this type, and all subtypes - QStringList fullNameList( ) const; + TQStringList fullNameList( ) const; - QString decoratedName() const { + TQString decoratedName() const { if( !m_data ) return ""; - QString ret = m_data->m_dec.apply( name() ); + TQString ret = m_data->m_dec.apply( name() ); for( int a = 0; a < pointerDepth(); a++ ) ret += "*"; return ret; } - QString name() const { + TQString name() const { if( !m_data ) return ""; return m_data->m_cleanName; }; - void setName( QString name ) { + void setName( TQString name ) { makeDataPrivate(); m_data->m_cleanName = name; } @@ -310,7 +310,7 @@ class TypeDesc { const TemplateParams& templateParams() const; ///clears the current template-parameters, and extracts those from the given string - void takeTemplateParams( const QString& string ); + void takeTemplateParams( const TQString& string ); /**makes all references/pointers private, so everything about this structure may be changed without side-effects*/ TypeDesc& makePrivate(); @@ -370,12 +370,12 @@ class TypeDesc { private: - void takeData( const QString& string ); + void takeData( const TQString& string ); void makeDataPrivate(); KSharedPtr<TypeDescData> m_data; void maybeInit(); - void init( QString stri ); + void init( TQString stri ); }; @@ -392,7 +392,7 @@ class TypeDescShared : public TypeDesc, public KShared { return *this; } - TypeDescShared( const QString& name ) : TypeDesc( name ) {} + TypeDescShared( const TQString& name ) : TypeDesc( name ) {} TypeDescShared() : TypeDesc() {} } ; |