diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
| commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
| tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /languages/cpp | |
| parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
| download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip | |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/cpp')
337 files changed, 2828 insertions, 2742 deletions
diff --git a/languages/cpp/KDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h index 8aed7e94..39ed4a43 100644 --- a/languages/cpp/KDevCppSupportIface.h +++ b/languages/cpp/KDevCppSupportIface.h @@ -10,6 +10,7 @@ class CppSupportPart; class KDevCppSupportIface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: KDevCppSupportIface( CppSupportPart* cppSupport ); diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox index ba1fbc05..3078ec53 100644 --- a/languages/cpp/README.dox +++ b/languages/cpp/README.dox @@ -16,7 +16,7 @@ and if you want play with the c++ parser go to lib/cppparser/, the best is to st \feature can do code completion \feature has presistent class store \feature code highlight -\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=cppsupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cppsupport component at Bugzilla database</a> diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 42031f59..70dd27b3 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -41,8 +41,8 @@ #include <tqtextstream.h> AddAttributeDialog::AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent, const char* name, bool modal, WFlags fl ) -: AddAttributeDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) + TQWidget* tqparent, const char* name, bool modal, WFlags fl ) +: AddAttributeDialogBase( tqparent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { access->insertStringList( TQStringList() << "Public" << "Protected" << "Private" ); @@ -91,7 +91,7 @@ void AddAttributeDialog::accept() m_klass->getEndPosition( &line, &column ); // compute the insertion point map - TQMap<TQString, QPair<int, int> > points; + TQMap<TQString, TQPair<int, int> > points; TQStringList accessList; const VariableList variableList = m_klass->variableList(); @@ -100,9 +100,9 @@ void AddAttributeDialog::accept() int varEndLine, varEndColumn; ( *it ) ->getEndPosition( &varEndLine, &varEndColumn ); TQString access = accessID( *it ); - QPair<int, int> varEndPoint = qMakePair( varEndLine, varEndColumn ); + TQPair<int, int> varEndPoint = tqMakePair( varEndLine, varEndColumn ); - if ( !points.contains( access ) || points[ access ] < varEndPoint ) + if ( !points.tqcontains( access ) || points[ access ] < varEndPoint ) { accessList.remove( access ); accessList.push_back( access ); // move 'access' at the end of the list @@ -131,20 +131,20 @@ void AddAttributeDialog::accept() TQString str = variableDeclaration( currentItem ); - QPair<int, int> pt; - if ( points.contains( *it ) ) + TQPair<int, int> pt; + if ( points.tqcontains( *it ) ) { pt = points[ *it ]; } else { str.prepend( access + ":\n" ); - points[ *it ] = qMakePair( line - 1, 0 ); + points[ *it ] = tqMakePair( line - 1, 0 ); pt = points[ *it ]; // end of class declaration } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( TQChar( '\n' ) ); + insertedLine += str.tqcontains( TQChar( '\n' ) ); } } @@ -194,7 +194,7 @@ void AddAttributeDialog::updateGUI() void AddAttributeDialog::addAttribute() { TQListViewItem * item = new TQListViewItem( attributes, "Protected", "Normal", - "int", TQString( "attribute_%1" ).arg( ++m_count ) ); + "int", TQString( "attribute_%1" ).tqarg( ++m_count ) ); attributes->setCurrentItem( item ); attributes->setSelected( item, true ); @@ -236,7 +236,7 @@ TQStringList AddAttributeDialog::newAccessList( const TQStringList& accessList ) item = item->nextSibling(); TQString access = currentItem->text( 0 ); - if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) ) + if ( !( accessList.tqcontains( access ) || newAccessList.tqcontains( access ) ) ) newAccessList.push_back( access ); } @@ -248,16 +248,16 @@ TQString AddAttributeDialog::accessID( VariableDom var ) const switch ( var->access() ) { case CodeModelItem::Public: - return TQString::fromLatin1( "Public" ); + return TQString::tqfromLatin1( "Public" ); case CodeModelItem::Protected: - return TQString::fromLatin1( "Protected" ); + return TQString::tqfromLatin1( "Protected" ); case CodeModelItem::Private: - return TQString::fromLatin1( "Private" ); + return TQString::tqfromLatin1( "Private" ); } - return TQString::null; + return TQString(); } #include "addattributedialog.moc" diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index 54d917b1..ffe2a92d 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -29,9 +29,10 @@ class CppSupportPart; class AddAttributeDialog : public AddAttributeDialogBase { Q_OBJECT + TQ_OBJECT public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddAttributeDialog(); virtual void addAttribute(); diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index eabd89fe..27ad6d5a 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddAttributeDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddAttributeDialogBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Access</string> @@ -77,9 +77,9 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -95,14 +95,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addAttributeButton</cstring> </property> @@ -110,7 +110,7 @@ <string>&Add Attribute</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>deleteAttributeButton</cstring> </property> @@ -120,7 +120,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -131,15 +131,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -150,7 +150,7 @@ <cstring>returnType</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <property name="name"> <cstring>returnType</cstring> </property> @@ -163,7 +163,7 @@ <cstring>declarator</cstring> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -176,20 +176,20 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>storage</cstring> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -200,7 +200,7 @@ <cstring>storage</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -211,7 +211,7 @@ <cstring>access</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <property name="name"> <cstring>access</cstring> </property> @@ -220,7 +220,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -244,14 +244,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -268,7 +268,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -313,9 +313,9 @@ </connection> <connection> <sender>attributes</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>AddAttributeDialogBase</receiver> - <slot>currentChanged(QListViewItem*)</slot> + <slot>currentChanged(TQListViewItem*)</slot> </connection> <connection> <sender>returnType</sender> @@ -362,14 +362,14 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addAttribute()</slot> <slot>deleteCurrentAttribute()</slot> - <slot>currentChanged(QListViewItem*)</slot> + <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index ae4e1738..71f03b5d 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -44,8 +44,8 @@ #include <tqtextstream.h> AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent, const char* name, bool modal, WFlags fl ) -: AddMethodDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) + TQWidget* tqparent, const char* name, bool modal, WFlags fl ) +: AddMethodDialogBase( tqparent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { TQString fileName = m_klass->fileName(); @@ -75,7 +75,7 @@ AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, while ( it != m.end() ) { TQString ext = TQFileInfo( it.key() ).extension(); - if ( !headers.contains( ext ) ) + if ( !headers.tqcontains( ext ) ) sourceFile->insertItem( it.key() ); ++it; } @@ -119,27 +119,27 @@ void AddMethodDialog::reject() TQString AddMethodDialog::accessID( FunctionDom fun ) const { if ( fun->isSignal() ) - return TQString::fromLatin1( "Signals" ); + return TQString::tqfromLatin1( "Signals" ); switch ( fun->access() ) { case CodeModelItem::Public: if ( fun->isSlot() ) - return TQString::fromLatin1( "Public Slots" ); - return TQString::fromLatin1( "Public" ); + return TQString::tqfromLatin1( "Public Slots" ); + return TQString::tqfromLatin1( "Public" ); case CodeModelItem::Protected: if ( fun->isSlot() ) - return TQString::fromLatin1( "Protected Slots" ); - return TQString::fromLatin1( "Protected" ); + return TQString::tqfromLatin1( "Protected Slots" ); + return TQString::tqfromLatin1( "Protected" ); case CodeModelItem::Private: if ( fun->isSlot() ) - return TQString::fromLatin1( "Private Slots" ); - return TQString::fromLatin1( "Private" ); + return TQString::tqfromLatin1( "Private Slots" ); + return TQString::tqfromLatin1( "Private" ); } - return TQString::null; + return TQString(); } void AddMethodDialog::accept() @@ -157,7 +157,7 @@ void AddMethodDialog::accept() m_klass->getEndPosition( &line, &column ); // compute the insertion point map - TQMap<TQString, QPair<int, int> > points; + TQMap<TQString, TQPair<int, int> > points; TQStringList accessList; const FunctionList functionList = m_klass->functionList(); @@ -166,9 +166,9 @@ void AddMethodDialog::accept() int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); TQString access = accessID( *it ); - QPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); + TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); - if ( !points.contains( access ) || points[ access ] < funEndPoint ) + if ( !points.tqcontains( access ) || points[ access ] < funEndPoint ) { accessList.remove( access ); accessList.push_back( access ); // move 'access' at the end of the list @@ -198,20 +198,20 @@ void AddMethodDialog::accept() bool isInline = currentItem->text( 0 ) == "True"; TQString str = isInline ? functionDefinition( currentItem ) : functionDeclaration( currentItem ); - QPair<int, int> pt; - if ( points.contains( *it ) ) + TQPair<int, int> pt; + if ( points.tqcontains( *it ) ) { pt = points[ *it ]; } else { str.prepend( access + ":\n" ); - points[ *it ] = qMakePair( line - 1, 0 ); + points[ *it ] = tqMakePair( line - 1, 0 ); pt = points[ *it ]; // end of class declaration } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( TQChar( '\n' ) ); + insertedLine += str.tqcontains( TQChar( '\n' ) ); } } @@ -248,7 +248,7 @@ void AddMethodDialog::accept() bool isInline = currentItem->text( 0 ) == "True"; if ( !isInline ) { - editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) ); + editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) ); editIface->insertText( editIface->numLines() - 1, 0, str ); m_cppSupport->backgroundParser() ->addFile( implementationFile ); } @@ -293,7 +293,7 @@ void AddMethodDialog::updateGUI() void AddMethodDialog::addMethod() { TQListViewItem * item = new TQListViewItem( methods, "False", "Public", "Normal", - "void", TQString( "method_%1()" ).arg( ++m_count ), + "void", TQString( "method_%1()" ).tqarg( ++m_count ), sourceFile->currentText() ); methods->setCurrentItem( item ); methods->setSelected( item, true ); @@ -363,7 +363,7 @@ TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const if ( item->text( 1 ) == "Signals" || item->text( 2 ) == "Pure Virtual" || item->text( 2 ) == "Friend" ) { - return TQString::null; + return TQString(); } TQString className = m_klass->name(); @@ -387,7 +387,7 @@ TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const << ind << " */\n"; stream - << ind << item->text( 3 ) << " " << ( isInline ? TQString::fromLatin1( "" ) : fullName + "::" ) + << ind << item->text( 3 ) << " " << ( isInline ? TQString::tqfromLatin1( "" ) : fullName + "::" ) << item->text( 4 ) << "\n" << ind << "{\n" << ind << " /// @todo implement me\n" @@ -408,7 +408,7 @@ TQStringList AddMethodDialog::newAccessList( const TQStringList& accessList ) co item = item->nextSibling(); TQString access = currentItem->text( 1 ); - if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) ) + if ( !( accessList.tqcontains( access ) || newAccessList.tqcontains( access ) ) ) newAccessList.push_back( access ); } diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index badfe537..70ab9958 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -29,9 +29,10 @@ class CppSupportPart; class AddMethodDialog : public AddMethodDialogBase { Q_OBJECT + TQ_OBJECT public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddMethodDialog(); virtual void addMethod(); diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index 5ab3f769..3518b3a0 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddMethodDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddMethodDialogBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Inline</string> @@ -88,9 +88,9 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -106,14 +106,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addMethodButton</cstring> </property> @@ -121,7 +121,7 @@ <string>&Add Method</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>deleteMethodButton</cstring> </property> @@ -131,7 +131,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -142,15 +142,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -161,7 +161,7 @@ <cstring>returnType</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <property name="name"> <cstring>returnType</cstring> </property> @@ -174,7 +174,7 @@ <cstring>declarator</cstring> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -187,20 +187,20 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>storage</cstring> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -211,7 +211,7 @@ <cstring>storage</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>isInline</cstring> </property> @@ -219,7 +219,7 @@ <string>&Inline</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -230,7 +230,7 @@ <cstring>access</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <property name="name"> <cstring>access</cstring> </property> @@ -239,7 +239,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -250,7 +250,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>sourceFile</cstring> </property> @@ -266,7 +266,7 @@ <bool>true</bool> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>browseButton</cstring> </property> @@ -279,7 +279,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -300,14 +300,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -324,7 +324,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -369,9 +369,9 @@ </connection> <connection> <sender>methods</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>AddMethodDialogBase</receiver> - <slot>currentChanged(QListViewItem*)</slot> + <slot>currentChanged(TQListViewItem*)</slot> </connection> <connection> <sender>returnType</sender> @@ -445,15 +445,15 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addMethod()</slot> <slot>deleteCurrentMethod()</slot> - <slot>currentChanged(QListViewItem*)</slot> + <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> <slot>browseImplementationFile()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate index cd3783f7..5240b2ee 100644 --- a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate +++ b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate @@ -51,11 +51,11 @@ Comment[ja]=共有ライブラリã®ãƒ†ãƒ³ãƒ—レートを作æˆã—ã¾ã™ã€‚åŒæ™ Comment[nds]=Stellt en Vörlaag för en deelt Bibliotheek mit en Testprogramm in C op. Dat Kompileren bruukt ansteed vun de "automake/autoconf/libtool"-Kombinatschoon "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav). Comment[ne]=C मा परीकà¥à¤·à¤£ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— सहितको साà¤à¥‡à¤¦à¤¾à¤°à¥€ टेमà¥à¤ªà¥à¤²à¥‡à¤Ÿ उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¦à¤› । यसले automake/autoconf/libtool संयोजनको सटà¥à¤Ÿà¤¾à¤®à¤¾ CMake निरà¥à¤®à¤¾à¤£ उपकरण पà¥à¤°à¤¯à¥‹à¤— गरेर कमà¥à¤ªà¤¾à¤‡à¤² गरà¥à¤¦à¤› । यसका लागि cmake 2.1 (cmake cvs बाट उपलबà¥à¤§ हà¥à¤¨à¥à¤›) वा अब आउने cmake 2.2 उतà¥à¤ªà¤¾à¤¦à¤¨ आवशà¥à¤¯à¤• परà¥à¤¦à¤› । Comment[nl]=Genereert een gedeelde-bibliotheek-sjabloon inclusief een testtoepassing in C. Het compileert met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (beschikbaar in het cvs van cmake) of de aankomende cmake 2.2-uitgave. -Comment[pl]=Generuje szablon współdzielonej biblioteki zawierajÄ…cy także program testowy w jÄ™zyku C. Kompilacja odbywa sie za pomocÄ… narzÄ™dzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostÄ™pnego z cvs-u cmake) lub nadchodzÄ…cej wersji 2.2. +Comment[pl]=Generuje szablon współdzielonej biblioteki zawierajÄ…cy także program testowy w jÄ™zyku C. Kompilacja odbywa sie za potqmocÄ… narzÄ™dzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostÄ™pnego z cvs-u cmake) lub nadchodzÄ…cej wersji 2.2. Comment[pt]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponÃvel no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[pt_BR]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponÃvel no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[ru]=Создание шаблона разделÑемой библиотеки, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ñ‚ÐµÑтовую программу на C. Ð”Ð»Ñ Ñборки потребуетÑÑ CMake вмеÑто комбинации automake/autoconf/libtool. ПотребуетÑÑ cmake 2.1 (из CVS cmake) или релиз cmake 2.2. -Comment[sk]=Vygeneruje Å¡ablónu pre zdieľanú knižnicu vrátane testovacej aplikácie v C.Kompiluje sa pomocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release. +Comment[sk]=Vygeneruje Å¡ablónu pre zdieľanú knižnicu vrátane testovacej aplikácie v C.Kompiluje sa potqmocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release. Comment[sl]=Ustvari predlogo za deljeno knjižnico in testni program v C. Za prevajanje se namesto kombinacije automake/autoconf/libtool uporabi orodje za gradnjo CMake. Potreben je CMake 2.1 ali CMake 2.2. Comment[sr]=Прави шаблон дељене библиотеке, укључујући и пробни програм у C-у. Преводи Ñе помоћу алата CMake умеÑто комбинације Automake/Autoconf/Libtool. Захтева CMake 2.1 (доÑтупан у CVS-у CMake-а) или надолазеће издање CMake 2.2. Comment[sr@Latn]=Pravi Å¡ablon deljene biblioteke, ukljuÄujući i probni program u C-u. Prevodi se pomoću alata CMake umesto kombinacije Automake/Autoconf/Libtool. Zahteva CMake 2.1 (dostupan u CVS-u CMake-a) ili nadolazeće izdanje CMake 2.2. diff --git a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate index e6e6ac44..8f3d0cf9 100644 --- a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate +++ b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate @@ -51,11 +51,11 @@ Comment[ja]=共有ライブラリã®ãƒ†ãƒ³ãƒ—レートを作æˆã—ã¾ã™ã€‚åŒæ™ Comment[nds]=Stellt en Vörlaag för en deelt Bibliotheek mit en Testprogramm in C++ op. Dat Kompileren bruukt ansteed vun de "automake/autoconf/libtool"-Kombinatschoon "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav). Comment[ne]=C++ मा परीकà¥à¤·à¤£ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— सहितको साà¤à¥‡à¤¦à¤¾à¤°à¥€ टेमà¥à¤ªà¥à¤²à¥‡à¤Ÿ उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¦à¤› । यसले automake/autoconf/libtool संयोजनको सटà¥à¤Ÿà¤¾à¤®à¤¾ CMake निरà¥à¤®à¤¾à¤£ उपकरण पà¥à¤°à¤¯à¥‹à¤— गरेर कमà¥à¤ªà¤¾à¤‡à¤² गरà¥à¤¦à¤› । यसका लागि cmake 2.1 (cmake cvs बाट उपलबà¥à¤§ हà¥à¤¨à¥à¤›) वा अब आउने cmake 2.2 उतà¥à¤ªà¤¾à¤¦à¤¨ आवशà¥à¤¯à¤• परà¥à¤¦à¤› । Comment[nl]=Genereert een gedeelde-bibliotheek-sjabloon inclusief een testtoepassing in C++. Het compileert met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (uit het cvs van cmake) of de aankomende cmake 2.2-uitgave. -Comment[pl]=Generuje szablon współdzielonej biblioteki zawierajÄ…cy także program testowy w jÄ™zyku C++. Kompilacja odbywa sie za pomocÄ… narzÄ™dzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostÄ™pnego z cvs-u cmake) lub nadchodzÄ…cej wersji 2.2. +Comment[pl]=Generuje szablon współdzielonej biblioteki zawierajÄ…cy także program testowy w jÄ™zyku C++. Kompilacja odbywa sie za potqmocÄ… narzÄ™dzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostÄ™pnego z cvs-u cmake) lub nadchodzÄ…cej wersji 2.2. Comment[pt]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C++. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponÃvel no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[pt_BR]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C++. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponÃvel no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[ru]=Создание шаблона разделÑемой библиотеки, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ñ‚ÐµÑтовую программу на C++. Ð”Ð»Ñ Ñборки потребуетÑÑ CMake вмеÑто комбинации automake/autoconf/libtool. ПотребуетÑÑ cmake 2.1 (из CVS cmake) или релиз cmake 2.2. -Comment[sk]=Vygeneruje Å¡ablónu zdieľanej knižnice vrátane testovacej aplikácie v C++.Kompiluje sa pomocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release. +Comment[sk]=Vygeneruje Å¡ablónu zdieľanej knižnice vrátane testovacej aplikácie v C++.Kompiluje sa potqmocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release. Comment[sl]=Ustvari predlogo za deljeno knjižnico in testni program v C++. Za prevajanje se namesto kombinacije automake/autoconf/libtool uporabi orodje za gradnjo CMake. Potreben je CMake 2.1 ali CMake 2.2. Comment[sr]=Прави шаблон дељене библиотеке укључујући и пробни програм у C++-у. Преводи Ñе помоћу алата CMake умеÑто комбинације Automake/Autoconf/Libtool. Захтева CMake 2.1 (доÑтупан у CVS-у CMake-а) или надолазеће издање CMake 2.2. Comment[sr@Latn]=Pravi Å¡ablon deljene biblioteke ukljuÄujući i probni program u C++-u. Prevodi se pomoću alata CMake umesto kombinacije Automake/Autoconf/Libtool. Zahteva CMake 2.1 (dostupan u CVS-u CMake-a) ili nadolazeće izdanje CMake 2.2. diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index f3c5f7f2..4b78645a 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -11,7 +11,7 @@ #include <tqtextedit.h> #include <tqfile.h> #include <tqfiledialog.h> -#include <tqstatusbar.h> +#include <statusbar.h> #include <tqmessagebox.h> #include <tqprinter.h> #include <tqapplication.h> @@ -36,17 +36,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen - = new TQToolButton( openIcon, tr("Open File"), TQString::null, + = new TQToolButton( openIcon, tr("Open File"), TQString(), this, TQT_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave - = new TQToolButton( saveIcon, tr("Save File"), TQString::null, + = new TQToolButton( saveIcon, tr("Save File"), TQString(), this, TQT_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint - = new TQToolButton( printIcon, tr("Print File"), TQString::null, + = new TQToolButton( printIcon, tr("Print File"), TQString(), this, TQT_SLOT(print()), fileTools, "print file" ); @@ -103,7 +103,7 @@ file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); @@ -111,7 +111,7 @@ menuBar()->insertItem( tr("&Help"), help ); help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) ); + help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); help->insertSeparator(); help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); @@ -134,13 +134,13 @@ void %{APPNAME}::newDoc() { %{APPNAME} *ed = new %{APPNAME}; - ed->setCaption(tr("Qt Example - Application")); + ed->setCaption(tr("TQt Example - Application")); ed->show(); } void %{APPNAME}::choose() { - TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, + TQString fn = TQFileDialog::getOpenFileName( TQString(), TQString(), this); if ( !fn.isEmpty() ) load( fn ); @@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName ) e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); - statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); + statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); } @@ -173,7 +173,7 @@ void %{APPNAME}::save() TQString text = e->text(); TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { - statusBar()->message( tr("Could not write to %1").arg(filename), + statusBar()->message( tr("Could not write to %1").tqarg(filename), 2000 ); return; } @@ -186,13 +186,13 @@ void %{APPNAME}::save() setCaption( filename ); - statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 ); + statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); } void %{APPNAME}::saveAs() { - TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, + TQString fn = TQFileDialog::getSaveFileName( TQString(), TQString(), this ); if ( !fn.isEmpty() ) { filename = fn; @@ -249,7 +249,7 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce ) return; } - switch( TQMessageBox::information( this, tr("Qt Application Example"), + switch( TQMessageBox::information( this, tr("TQt 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( TQCloseEvent* ce ) void %{APPNAME}::about() { - TQMessageBox::about( this, tr("Qt Application Example"), + TQMessageBox::about( this, tr("TQt Application Example"), tr("This example demonstrates simple use of " - "TQMainWindow,\nQMenuBar and TQToolBar.")); + "TQMainWindow,\nTQMenuBar and TQToolBar.")); } -void %{APPNAME}::aboutQt() +void %{APPNAME}::aboutTQt() { - TQMessageBox::aboutQt( this, tr("Qt Application Example") ); + TQMessageBox::aboutTQt( this, tr("TQt Application Example") ); } diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h index af12e1eb..bc8a2b93 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h @@ -7,9 +7,10 @@ class TQTextEdit; -class %{APPNAME}: public QMainWindow +class %{APPNAME}: public TQMainWindow { Q_OBJECT + TQ_OBJECT public: %{APPNAME}(); @@ -27,7 +28,7 @@ private slots: void print(); void about(); - void aboutQt(); + void aboutTQt(); private: TQPrinter *printer; diff --git a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate index 2e6032e8..a80c8079 100644 --- a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate +++ b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate @@ -44,7 +44,7 @@ Comment[it]=Genera un semplice programma di "Hello world" in C++ che usa CMake i Comment[ja]=ビルド㫠automake/autoconf/libtool ã§ã¯ãªã CMake を使ã£ãŸç°¡å˜ãª Hello World プãƒã‚°ãƒ©ãƒ ã‚’ C++ ã§ä½œæˆã—ã¾ã™ã€‚CMake 2.1 ã¾ãŸã¯ 2.2 ãŒå¿…è¦ã§ã™ã€‚ Comment[nds]=Stellt en eenfach "Moin Welt"-Programm in C++ op, mit "CMake" ansteed vun de "automake/autoconf/libtool"-Reeg. Nödig is Verschoon 2.1 oder 2.2 vun CMake. Comment[nl]=Genereert een eenvoudig Hello World-programma in C++ met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 of cmake 2.2. -Comment[pl]=Generuje prosty program 'Witaj Å›wiecie' w jÄ™zyku C++. Kompilacja odbywa sie za pomocÄ… narzÄ™dzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake w wersji 2.1 lub 2.2. +Comment[pl]=Generuje prosty program 'Witaj Å›wiecie' w jÄ™zyku C++. Kompilacja odbywa sie za potqmocÄ… narzÄ™dzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake w wersji 2.1 lub 2.2. Comment[pt]=Gera um programa simples Olá Mundo em C++, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 ou do cmake 2.2. Comment[pt_BR]=Gera um programa simples Olá Mundo em C++, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 ou do cmake 2.2. Comment[ru]=Создание проÑтого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Hello world на C++. Ð”Ð»Ñ Ñборки потребуетÑÑ CMake вмеÑто комбинации automake/autoconf/libtool. ПотребуетÑÑ cmake верÑии 2.1 или 2.2. diff --git a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate index 3fc09047..3068fdd3 100644 --- a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate +++ b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate @@ -49,7 +49,7 @@ Comment[ja]=ビルド㫠automake/autoconf/libtool ã§ã¯ãªã CMake を使ã£ã Comment[nds]=Stellt en eenfach "Moin Welt"-Programm in C op mit "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav) ansteed vun de "automake/autoconf/libtool"-Kombinatschoon. Comment[ne]= automake/autoconf/libtool संयोजनको सटà¥à¤Ÿà¤¾à¤®à¤¾ CMake निरà¥à¤®à¤¾à¤£ उपकरण पà¥à¤°à¤¯à¥‹à¤— गरेर C मा साधारण हेलà¥à¤²à¥‹ वोलà¥à¤¡ कारà¥à¤¯à¤•à¥à¤°à¤® उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¦à¤› । यसलाई cmake 2.1 (cmake cvs बाट उपलबà¥à¤§ हà¥à¤¨à¥à¤›) वा आउदै गरेको cmake 2.2 उतà¥à¤ªà¤¾à¤¦à¤¨ आवशà¥à¤¯à¤• हà¥à¤¨à¥à¤› । Comment[nl]=Genereert een eenvoudig Hello World-programma in C met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (uit het cvs van cmake) of de aankomende cmake 2.2-uitgave. -Comment[pl]=Generuje prosty program 'Witaj Å›wiecie' w jÄ™zyku C. Kompilacja odbywa sie za pomocÄ… narzÄ™dzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostÄ™pnego z cvs-u cmake) lub nadchodzÄ…cej wersji 2.2. +Comment[pl]=Generuje prosty program 'Witaj Å›wiecie' w jÄ™zyku C. Kompilacja odbywa sie za potqmocÄ… narzÄ™dzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostÄ™pnego z cvs-u cmake) lub nadchodzÄ…cej wersji 2.2. Comment[pt]=Gera um programa simples Olá Mundo em C, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponÃvel no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[pt_BR]=Gera um programa simples Olá Mundo em C, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponÃvel no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[ru]=Создание проÑтого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Hello world на C. Ð”Ð»Ñ Ñборки потребуетÑÑ CMake вмеÑто комбинации automake/autoconf/libtool. ПотребуетÑÑ cmake 2.1 (из CVS cmake) или релиз cmake 2.2. diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp index 32f32c65..2f569f3c 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp +++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp @@ -33,7 +33,7 @@ void %{APPNAME}::add(TQString arg) bool %{APPNAME}::remove(TQString arg) { - TQStringList::Iterator it = m_List.find(arg); + TQStringList::Iterator it = m_List.tqfind(arg); if (it != m_List.end()) { m_List.remove(it); diff --git a/languages/cpp/app_templates/generichello/generichello.kdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate index 787140ff..2c71b0ad 100644 --- a/languages/cpp/app_templates/generichello/generichello.kdevtemplate +++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate @@ -18,7 +18,7 @@ Name[ja]=C++ プãƒã‚°ãƒ©ãƒ (シェルスクリプトベースã®ãƒ“ルドシ゠Name[nds]=C++-Programm (Konsoolskript-Opstellsystem) Name[ne]=C++ कारà¥à¤¯à¤•à¥à¤°à¤® (शेल सà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ निरà¥à¤®à¤¾à¤£ पà¥à¤°à¤£à¤¾à¤²à¥€) Name[nl]=C++-programma (shellscript build system) -Name[pl]=Program w C++ (system budowania za pomocÄ… skryptów powÅ‚oki) +Name[pl]=Program w C++ (system budowania za potqmocÄ… skryptów powÅ‚oki) Name[pt]=Programa em C++ (sistema de compilação em 'shell script') Name[pt_BR]=Programa em C++ (sistema de compilação em 'shell script') Name[ru]=Приложение C++ (Ñборка на Ñкриптах командной оболочки) diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.hh b/languages/cpp/app_templates/gnome2mmapp/main_window.hh index ae93336b..7b356a27 100644 --- a/languages/cpp/app_templates/gnome2mmapp/main_window.hh +++ b/languages/cpp/app_templates/gnome2mmapp/main_window.hh @@ -2,7 +2,7 @@ // newer (non customized) versions of this file go to main_window.hh_new -// you might replace +// you might tqreplace // class foo : public foo_glade { ... }; // by // typedef foo_glade foo; diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.hh index 640e1461..6f9405d0 100644 --- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh +++ b/languages/cpp/app_templates/gtk2mmapp/main_window.hh @@ -2,7 +2,7 @@ // newer (non customized) versions of this file go to main_window.hh_new -// you might replace +// you might tqreplace // class foo : public foo_glade { ... }; // by // typedef foo_glade foo; diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 6388f452..10046641 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -141,7 +141,7 @@ void %{APPNAME}::dragEnterEvent(TQDragEnterEvent *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* + // will only accept a dropped URL. the TQt dnd code can do *much* // much more, so please read the docs there KURL::List urls; @@ -173,10 +173,10 @@ void %{APPNAME}::fileOpen() // button is clicked /* // this brings up the generic open dialog - KURL url = KURLRequesterDlg::getURL(TQString::null, this, i18n("Open Location") ); + KURL url = KURLRequesterDlg::getURL(TQString(), this, i18n("Open Location") ); */ // standard filedialog - KURL url = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Open Location")); + KURL url = KFileDialog::getOpenURL(TQString(), TQString(), this, i18n("Open Location")); if (!url.isEmpty()) m_view->openURL(url); } @@ -208,7 +208,7 @@ void %{APPNAME}::filePrint() if (!m_printer) m_printer = new KPrinter; if (m_printer->setup(this)) { - // setup the printer. with Qt, you always "print" to a + // setup the printer. with TQt, you always "print" to a // TQPainter.. whether the output medium is a pixmap, a screen, // or paper TQPainter p; diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 1c92feb8..762d8791 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -26,6 +26,7 @@ class KURL; class %{APPNAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -44,7 +45,7 @@ public: protected: /** - * Overridden virtuals for Qt drag 'n drop (XDND) + * Overridden virtuals for TQt drag 'n drop (XDND) */ virtual void dragEnterEvent(TQDragEnterEvent *event); virtual void dropEvent(TQDropEvent *event); diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 32afca2e..5b42a36a 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -13,11 +13,11 @@ #include <krun.h> #include <klocale.h> -%{APPNAME}View::%{APPNAME}View(TQWidget *parent) - : TQWidget(parent), +%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent) + : TQWidget(tqparent), DCOPObject("%{APPNAME}Iface") { - // setup our layout manager to automatically add our widgets + // setup our tqlayout manager to automatically add our widgets TQHBoxLayout *top_layout = new TQHBoxLayout(this); top_layout->setAutoAdd(true); diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index a4f0b2e6..2eab2322 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -24,11 +24,12 @@ class KURL; class %{APPNAME}View : public TQWidget, public %{APPNAME}Iface { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAME}View(TQWidget *parent); + %{APPNAME}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index ff83190f..3d720a65 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -22,20 +22,20 @@ m_pageTwo = new %{APPNAME}PrefPageTwo(frame); } -%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) - : TQFrame(parent) +%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *tqparent) + : TQFrame(tqparent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } -%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) - : TQFrame(parent) +%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *tqparent) + : TQFrame(tqparent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index 93859cfd..23798000 100644 --- a/languages/cpp/app_templates/kapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h @@ -12,6 +12,7 @@ class %{APPNAME}PrefPageTwo; class %{APPNAME}Preferences : public KDialogBase { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Preferences(); @@ -20,18 +21,20 @@ private: %{APPNAME}PrefPageTwo *m_pageTwo; }; -class %{APPNAME}PrefPageOne : public QFrame +class %{APPNAME}PrefPageOne : public TQFrame { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}PrefPageOne(TQWidget *parent = 0); + %{APPNAME}PrefPageOne(TQWidget *tqparent = 0); }; -class %{APPNAME}PrefPageTwo : public QFrame +class %{APPNAME}PrefPageTwo : public TQFrame { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}PrefPageTwo(TQWidget *parent = 0); + %{APPNAME}PrefPageTwo(TQWidget *tqparent = 0); }; #endif // _%{APPNAMEUC}PREF_H_ diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am index 51cb1973..f118ee10 100644 --- a/languages/cpp/app_templates/kapp/src-Makefile.am +++ b/languages/cpp/app_templates/kapp/src-Makefile.am @@ -25,11 +25,11 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h %{APPNAMELC}_client_LDADD = $(LIB_KDECORE) %{APPNAMELC}_client_SOURCES = %{APPNAMELC}_client.cpp -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 1a40df32..8c729f72 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -33,15 +33,15 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new KatePlugin%{APPNAME}( parent, name ); + return new KatePlugin%{APPNAME}( tqparent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { } diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 879ff967..2183e88e 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -17,12 +17,13 @@ class KatePluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -31,9 +32,10 @@ class KatePluginFactory : public KLibFactory class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); diff --git a/languages/cpp/app_templates/kateplugin/src-Makefile.am b/languages/cpp/app_templates/kateplugin/src-Makefile.am index 88ba33a8..42a3cec8 100644 --- a/languages/cpp/app_templates/kateplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kateplugin/src-Makefile.am @@ -16,5 +16,5 @@ plugins_DATA = plugin_%{APPNAMELC}.rc kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 18595d10..9ee7b8b5 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -37,15 +37,15 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new KatePlugin%{APPNAME}( parent, name ); + return new KatePlugin%{APPNAME}( tqparent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { } @@ -114,8 +114,8 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) /** * %{APPNAME}ConfigPage */ -%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) - : Kate::PluginConfigPage( parentWidget ) +%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/) + : Kate::PluginConfigPage( tqparentWidget ) { TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" ); lo->setSpacing(KDialogBase::spacingHint()); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index 6ad068d4..3082884e 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -21,12 +21,13 @@ class %{APPNAME}ConfigPage; class KatePluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -35,9 +36,10 @@ private: class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); @@ -65,10 +67,11 @@ private: class %{APPNAME}ConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class KatePlugin%{APPNAME}; public: - %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); + %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~%{APPNAME}ConfigPage (); /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ). */ diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am index 2dbd9367..14a5dd2a 100644 --- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am +++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am @@ -16,6 +16,6 @@ plugins_DATA = plugin_%{APPNAMELC}.rc kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp index bb15b923..4e9d3ca5 100644 --- a/languages/cpp/app_templates/kcmodule/module.cpp +++ b/languages/cpp/app_templates/kcmodule/module.cpp @@ -11,8 +11,8 @@ typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}")) -%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&) - : KCModule(parent, name), myAboutData(0) +%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name, const TQStringList&) + : KCModule(tqparent, name), myAboutData(0) { // place widgets here load(); diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h index 7f539c60..57542aae 100644 --- a/languages/cpp/app_templates/kcmodule/module.h +++ b/languages/cpp/app_templates/kcmodule/module.h @@ -9,9 +9,10 @@ class %{APPNAME}: public KCModule { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); + %{APPNAME}( TQWidget *tqparent=0, const char *name=0, const TQStringList& = TQStringList() ); ~%{APPNAME}(); virtual void load(); diff --git a/languages/cpp/app_templates/kcmodule/src-Makefile.am b/languages/cpp/app_templates/kcmodule/src-Makefile.am index e5d30776..6efe685a 100644 --- a/languages/cpp/app_templates/kcmodule/src-Makefile.am +++ b/languages/cpp/app_templates/kcmodule/src-Makefile.am @@ -13,5 +13,5 @@ xdg_apps_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcm%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kconfig35/app.h b/languages/cpp/app_templates/kconfig35/app.h index 0174aa1b..b8ec3f1e 100644 --- a/languages/cpp/app_templates/kconfig35/app.h +++ b/languages/cpp/app_templates/kconfig35/app.h @@ -26,6 +26,7 @@ class KURL; class %{APPNAMELC} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp index 30d627fe..0c82dd25 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/kconfig35/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) - : %{APPNAMELC}view_base(parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) + : %{APPNAMELC}view_base(tqparent) { settingsChanged(); } @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/kconfig35/appview.h index e0738ebe..897072a6 100644 --- a/languages/cpp/app_templates/kconfig35/appview.h +++ b/languages/cpp/app_templates/kconfig35/appview.h @@ -22,11 +22,12 @@ class KURL; class %{APPNAMELC}View : public %{APPNAMELC}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *parent); + %{APPNAMELC}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kconfig35/appview_base.ui b/languages/cpp/app_templates/kconfig35/appview_base.ui index 626d95df..5852f806 100644 --- a/languages/cpp/app_templates/kconfig35/appview_base.ui +++ b/languages/cpp/app_templates/kconfig35/appview_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>%{APPNAMELC}view_base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>%{APPNAMELC}view_base</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> -<widget class="QLabel" row="0" column="0"> +<widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>sillyLabel</cstring> </property> @@ -29,5 +29,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui index 5c0fc860..8c8b9012 100644 --- a/languages/cpp/app_templates/kconfig35/prefs-base.ui +++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>Prefs_base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Prefs_base</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -32,7 +32,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -40,7 +40,7 @@ <string>Project age:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -83,14 +83,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>kcfg_val_time</cstring> </property> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -120,7 +120,7 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/kconfig35/src-Makefile.am index 5f7936da..2a04da7e 100644 --- a/languages/cpp/app_templates/kconfig35/src-Makefile.am +++ b/languages/cpp/app_templates/kconfig35/src-Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC} # set the include path for X, qt and KDE INCLUDES = $(all_includes) -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO # the library search path. @@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index b73c02cb..bb91d42e 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/TQDropEvent> -#include <QtGui/TQPainter> +#include <TQtGui/TQDropEvent> +#include <TQtGui/TQPainter> #include <kconfigdialog.h> #include <kstatusbar.h> @@ -48,13 +48,13 @@ void %{APPNAME}::setupActions() { KStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStandardAction::quit(qApp, TQT_SLOT(quit()), actionCollection()); + KStandardAction::quit(tqApp, TQT_SLOT(quit()), 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 ); + actionCollection()->addAction( TQLatin1String("switch_action"), custom ); connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors())); } @@ -83,7 +83,7 @@ void %{APPNAME}::optionsPreferences() ui_prefs_base.setupUi(generalSettingsDlg); dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting"); connect(dialog, TQT_SIGNAL(settingsChanged(TQString)), m_view, TQT_SLOT(settingsChanged())); - dialog->setAttribute( Qt::WA_DeleteOnClose ); + dialog->setAttribute( TQt::WA_DeleteOnClose ); dialog->show(); } diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h index fb059fde..1a15a7c7 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.h +++ b/languages/cpp/app_templates/kde4app/kapp4.h @@ -23,6 +23,7 @@ class KUrl; class %{APPNAME} : public KXmlGuiWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp index 785a6858..9d9e482a 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4view.cpp @@ -3,7 +3,7 @@ #include "settings.h" #include <klocale.h> -#include <QtGui/TQLabel> +#include <TQtGui/TQLabel> %{APPNAME}View::%{APPNAME}View(TQWidget *) { diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h index 40749696..c4ce6517 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/TQWidget> +#include <TQtGui/TQWidget> #include "ui_%{APPNAMELC}view_base.h" @@ -22,11 +22,12 @@ class KUrl; class %{APPNAME}View : public TQWidget, public Ui::%{APPNAMELC}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAME}View(TQWidget *parent); + %{APPNAME}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui index eb6a254a..92a83f43 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui +++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui @@ -1,6 +1,6 @@ <ui version="4.0" > <class>%{APPNAMELC}view_base</class> -<widget class="QWidget" name="%{APPNAMELC}view_base" > +<widget class="TQWidget" name="%{APPNAMELC}view_base" > <property name="geometry" > <rect> <x>0</x> @@ -15,7 +15,7 @@ <property name="autoFillBackground" > <bool>true</bool> </property> - <layout class="QGridLayout" > + <tqlayout class="TQGridLayout" > <property name="leftMargin" > <number>11</number> </property> @@ -35,7 +35,7 @@ <number>6</number> </property> <item row="0" column="0" > - <widget class="QLabel" name="kcfg_sillyLabel" > + <widget class="TQLabel" name="kcfg_sillyLabel" > <property name="palette" > <palette> <active> @@ -196,7 +196,7 @@ <property name="scaledContents" > <bool>true</bool> </property> - <property name="alignment" > + <property name="tqalignment" > <set>Qt::AlignCenter</set> </property> <property name="wordWrap" > @@ -204,9 +204,9 @@ </property> </widget> </item> - </layout> + </tqlayout> </widget> - <layoutdefault spacing="6" margin="11" /> + <tqlayoutdefault spacing="6" margin="11" /> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <resources/> <connections/> diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt index 2544a271..c29d33da 100644 --- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt +++ b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt @@ -9,7 +9,7 @@ set(%{APPNAMELC}_SRCS %{APPNAMELC}view.cpp ) -#kde4_automoc(${%{APPNAMELC}_SRCS}) +#kde4_autotqmoc(${%{APPNAMELC}_SRCS}) kde4_add_ui_files(%{APPNAMELC}_SRCS %{APPNAMELC}view_base.ui prefs_base.ui) diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui index ea400f02..98bf5f19 100644 --- a/languages/cpp/app_templates/kde4app/prefs_base.ui +++ b/languages/cpp/app_templates/kde4app/prefs_base.ui @@ -1,6 +1,6 @@ <ui version="4.0" > <class>prefs_base</class> - <widget class="QWidget" name="prefs_base" > + <widget class="TQWidget" name="prefs_base" > <property name="geometry" > <rect> <x>0</x> @@ -9,9 +9,9 @@ <height>156</height> </rect> </property> - <layout class="QGridLayout" > + <tqlayout class="TQGridLayout" > <item row="0" column="0" > - <widget class="QLabel" name="textLabel2_2" > + <widget class="TQLabel" name="textLabel2_2" > <property name="text" > <string>Background color:</string> </property> @@ -37,7 +37,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="2" column="0" > - <widget class="QLabel" name="textLabel1" > + <widget class="TQLabel" name="textLabel1" > <property name="text" > <string>Project age:</string> </property> @@ -47,7 +47,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="1" column="0" > - <widget class="QLabel" name="textLabel2" > + <widget class="TQLabel" name="textLabel2" > <property name="text" > <string>Foreground color:</string> </property> @@ -80,7 +80,7 @@ p, li { white-space: pre-wrap; } <property name="sizeType" > <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" > + <property name="tqsizeHint" > <size> <width>41</width> <height>20</height> @@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; } <property name="sizeType" > <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" > + <property name="tqsizeHint" > <size> <width>41</width> <height>20</height> @@ -105,7 +105,7 @@ p, li { white-space: pre-wrap; } </spacer> </item> <item row="2" column="1" > - <widget class="QSpinBox" name="kcfg_val_time" > + <widget class="TQSpinBox" name="kcfg_val_time" > <property name="toolTip" > <string>Set the project age (in days)</string> </property> @@ -128,7 +128,7 @@ p, li { white-space: pre-wrap; } <property name="sizeType" > <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" > + <property name="tqsizeHint" > <size> <width>41</width> <height>20</height> @@ -136,9 +136,9 @@ p, li { white-space: pre-wrap; } </property> </spacer> </item> - </layout> + </tqlayout> </widget> - <layoutdefault spacing="6" margin="11" /> + <tqlayoutdefault spacing="6" margin="11" /> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <customwidgets> <customwidget> diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h index b908b62c..77914d1c 100644 --- a/languages/cpp/app_templates/kdedcop/app.h +++ b/languages/cpp/app_templates/kdedcop/app.h @@ -19,6 +19,7 @@ class %{APPNAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am index dc26ec93..9b32fb8f 100644 --- a/languages/cpp/app_templates/kdedcop/src-Makefile.am +++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am @@ -6,11 +6,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.h -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot # this is the program that gets installed. it's name is used for all diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 364ec0d7..e6b82e21 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -21,8 +21,8 @@ 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(TQObject *parent, const char *name, const TQStringList& ) -: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) +%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList& ) +: KDevLanguageSupport(&data, tqparent, name ? name : "%{APPNAME}Part" ) { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdevlang_%{APPNAMELC}.rc"); @@ -91,7 +91,7 @@ void %{APPNAME}Part::savedFile(const KURL &fileName) { - if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) + if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { kdDebug(9014) << "parse file " << fileName.path() << endl; emit addedSourceInfo( fileName.path() ); diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index d6d92ff6..234107bb 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -18,8 +18,9 @@ class KAction; class %{APPNAME}Part : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &); + %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &); ~%{APPNAME}Part(); protected: virtual Features features(); diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp index cddf3e7e..54e56426 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index aea1cbea..f08bd1bd 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui index c16bd90d..7cba9a36 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>%{APPNAME}GlobalConfigBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>%{APPNAME}GlobalConfigBase</cstring> </property> @@ -16,5 +16,5 @@ <string>%{APPNAME}</string> </property> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 082549c4..96ddb6ca 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index b73e61da..ddedde17 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -19,8 +19,9 @@ Please read the README.dox file for more info about this part class %{APPNAME}Part: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h index 308c3e7e..f7c0290f 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h @@ -8,9 +8,10 @@ class KDevProject; class %{APPNAME}Part; -class %{APPNAME}Widget: public QWidget +class %{APPNAME}Widget: public TQWidget { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); ~%{APPNAME}Widget(); diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp index 42a9f3e7..a3bc8b8c 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index 0ab0cb35..2d13ce14 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui index c733a774..140e8df4 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>%{APPNAME}ProjectConfigBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>%{APPNAME}ProjectConfigBase</cstring> </property> @@ -16,5 +16,5 @@ <string>%{APPNAME}</string> </property> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp index cddf3e7e..54e56426 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index aea1cbea..f08bd1bd 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui index c16bd90d..7cba9a36 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>%{APPNAME}GlobalConfigBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>%{APPNAME}GlobalConfigBase</cstring> </property> @@ -16,5 +16,5 @@ <string>%{APPNAME}</string> </property> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 082549c4..96ddb6ca 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index b73e61da..ddedde17 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -19,8 +19,9 @@ Please read the README.dox file for more info about this part class %{APPNAME}Part: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index 308c3e7e..f7c0290f 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -8,9 +8,10 @@ class KDevProject; class %{APPNAME}Part; -class %{APPNAME}Widget: public QWidget +class %{APPNAME}Widget: public TQWidget { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); ~%{APPNAME}Widget(); diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp index 42a9f3e7..a3bc8b8c 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index 0ab0cb35..2d13ce14 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui index c733a774..140e8df4 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>%{APPNAME}ProjectConfigBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>%{APPNAME}ProjectConfigBase</cstring> </property> @@ -16,5 +16,5 @@ <string>%{APPNAME}</string> </property> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp index db259cb3..5ccbec50 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp @@ -13,9 +13,9 @@ typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" )) -%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name, +%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { //add the mimetype here - example: //KFileMimeTypeInfo* info = addMimeTypeInfo( "text/html" ); diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h index 94776938..93303359 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h @@ -13,9 +13,10 @@ class TQStringList; class %{APPNAME}Plugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Plugin( TQObject *parent, const char *name, const TQStringList& args ); + %{APPNAME}Plugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/languages/cpp/app_templates/kfileplugin/src-Makefile.am b/languages/cpp/app_templates/kfileplugin/src-Makefile.am index 48ac1c66..4bfee32a 100644 --- a/languages/cpp/app_templates/kfileplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kfileplugin/src-Makefile.am @@ -11,12 +11,12 @@ kfile_%{APPNAMELC}_la_SOURCES = kfile_%{APPNAMELC}.cpp kfile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kfile_%{APPNAMELC}_la_LIBADD = $(LIB_KIO) -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO services_DATA = kfile_%{APPNAMELC}.desktop servicesdir = $(kde_servicesdir) messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kfile_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h index 678df7a3..fd0ca00b 100644 --- a/languages/cpp/app_templates/khello/app.h +++ b/languages/cpp/app_templates/khello/app.h @@ -17,6 +17,7 @@ class %{APPNAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am index d9ac7c7a..820f292a 100644 --- a/languages/cpp/app_templates/khello/src-Makefile.am +++ b/languages/cpp/app_templates/khello/src-Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.h -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h index 678df7a3..fd0ca00b 100644 --- a/languages/cpp/app_templates/khello2/app.h +++ b/languages/cpp/app_templates/khello2/app.h @@ -17,6 +17,7 @@ class %{APPNAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am index 4664fe84..7f9d7125 100644 --- a/languages/cpp/app_templates/khello2/src-Makefile.am +++ b/languages/cpp/app_templates/khello2/src-Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.h -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp index 266e894f..40e2d2bb 100644 --- a/languages/cpp/app_templates/khello2/widget.cpp +++ b/languages/cpp/app_templates/khello2/widget.cpp @@ -4,8 +4,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl) - : %{APPNAME}WidgetBase(parent,name,fl) +%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* tqparent, const char* name, WFlags fl) + : %{APPNAME}WidgetBase(tqparent,name,fl) {} %{APPNAME}Widget::~%{APPNAME}Widget() diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 50d7a721..3773456b 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -8,9 +8,10 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}Widget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}Widget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui index e6f5be3d..4540c922 100644 --- a/languages/cpp/app_templates/khello2/widgetbase.ui +++ b/languages/cpp/app_templates/khello2/widgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>%{APPNAME}WidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>%{APPNAMELC}widgetbase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>button</cstring> </property> @@ -27,7 +27,7 @@ <string>Click Me!</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>label</cstring> </property> @@ -45,8 +45,8 @@ <slot>button_clicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>button_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index 29ec3d1d..d609fa26 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -10,8 +10,8 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name) +%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name) { // Get the current application configuration handle ksConfig = config(); @@ -62,11 +62,11 @@ void %{APPNAME}::resizeEvent(TQResizeEvent *e) extern "C" { - KPanelApplet* init( TQWidget *parent, const TQString& configFile) + KPanelApplet* init( TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, - parent, "%{APPNAMELC}"); + tqparent, "%{APPNAMELC}"); } } diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index ba4d6cd4..b11b1aa9 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -15,6 +15,7 @@ class %{APPNAME} : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: /** @@ -23,11 +24,11 @@ public: * @param configFile The configFile handed over in the factory function. * @param Type The applet @ref type(). * @param actions Standard RMB menu actions supported by the applet (see @ref action() ). - * @param parent The pointer to the parent widget handed over in the factory function. - * @param name A Qt object name for your applet. + * @param tqparent The pointer to the tqparent widget handed over in the factory function. + * @param name A TQt object name for your applet. **/ %{APPNAME}(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am index 424062d1..8a46f24d 100644 --- a/languages/cpp/app_templates/kicker/src-Makefile.am +++ b/languages/cpp/app_templates/kicker/src-Makefile.am @@ -11,5 +11,5 @@ kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la %{APPNAMELC}dir = $(kde_datadir)/kicker/applets messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp index c8dc5d81..ad5d7991 100644 --- a/languages/cpp/app_templates/kioslave/slave.cpp +++ b/languages/cpp/app_templates/kioslave/slave.cpp @@ -48,7 +48,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) int remotePort = url.port(); kdDebug() << "myURL: " << url.prettyURL() << endl; - infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); // Send the mimeType as soon as it is known mimeType("text/plain"); // Send the data diff --git a/languages/cpp/app_templates/kioslave/src-Makefile.am b/languages/cpp/app_templates/kioslave/src-Makefile.am index 957ec330..b73354f1 100644 --- a/languages/cpp/app_templates/kioslave/src-Makefile.am +++ b/languages/cpp/app_templates/kioslave/src-Makefile.am @@ -10,5 +10,5 @@ protocol_DATA = %{APPNAMELC}.protocol protocoldir = $(kde_servicesdir) messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kio_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index fea02def..2aefef82 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MainView</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -35,7 +35,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>helloLabel</cstring> </property> @@ -45,7 +45,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -69,8 +69,8 @@ <slot>slotHelloButtonClicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotHelloButtonClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp index 8a0de706..5e953b0d 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.cpp +++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp @@ -3,8 +3,8 @@ #include <tqlabel.h> #include <klocale.h> -MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl) -: MainView(parent,name,fl) +MainViewImp::MainViewImp(TQWidget* tqparent, const char* name, WFlags fl) +: MainView(tqparent,name,fl) { } diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h index 190a26e3..1a8af0b8 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.h +++ b/languages/cpp/app_templates/kmake/mainviewimp.h @@ -6,9 +6,10 @@ class MainViewImp : public MainView { Q_OBJECT + TQ_OBJECT public: - MainViewImp(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + MainViewImp(TQWidget* tqparent = 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 86287a3f..034e2fb3 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -23,8 +23,8 @@ extern "C" KInstance* %{APPNAME}Factory::s_global = 0L; KAboutData* %{APPNAME}Factory::s_aboutData = 0L; -%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name ) - : KoFactory( parent, name ) +%{APPNAME}Factory::%{APPNAME}Factory( TQObject* tqparent, const char* name ) + : KoFactory( tqparent, name ) { global(); } @@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L; s_global = 0L; } -KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, 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. bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. - %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, parent, name, !bWantKoDocument ); + // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. + %{APPNAME}Part *part = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument ); if ( !bWantKoDocument ) part->setReadWrite( false ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 58061af3..149b4b50 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -14,11 +14,12 @@ class KAboutData; class %{APPNAME}Factory : public KoFactory { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 ); + %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 ); ~%{APPNAME}Factory(); - 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() ); + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 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 c12b5fd7..389fb431 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -8,20 +8,20 @@ #include <tqpainter.h> -%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) - : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) + : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ) { } -bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) +bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* tqparentWidget ) { // If nothing is loaded, do initialize here return TRUE; } -KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) +KoView* %{APPNAME}Part::createViewInstance( TQWidget* tqparent, const char* name ) { - return new %{APPNAME}View( this, parent, name ); + return new %{APPNAME}View( this, tqparent, name ); } bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ) @@ -32,13 +32,13 @@ bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisS bool %{APPNAME}Part::loadXML( TQIODevice *, const TQDomDocument & ) { - /// @todo load the document from the QDomDocument + /// @todo load the document from the TQDomDocument return true; } TQDomDocument %{APPNAME}Part::saveXML() { - /// @todo save the document into a QDomDocument + /// @todo save the document into a TQDomDocument return TQDomDocument(); } diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 95ebb3f6..0ec011ae 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -11,12 +11,13 @@ class %{APPNAME}Part : public KoDocument { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); + %{APPNAME}Part( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); - virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 ); + virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget = 0 ); virtual bool loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ); virtual bool loadXML( TQIODevice *, const TQDomDocument & ); @@ -24,7 +25,7 @@ public: virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); protected: - virtual KoView* createViewInstance( TQWidget* parent, const char* name ); + virtual KoView* createViewInstance( TQWidget* tqparent, 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 f32707a8..240251f9 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -13,8 +13,8 @@ #include <klocale.h> #include <kdebug.h> -%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name ) - : KoView( part, parent, name ) +%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent, const char* name ) + : KoView( part, tqparent, name ) { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index 63f5127b..bcaac2e1 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -16,8 +16,9 @@ class %{APPNAME}Part; class %{APPNAME}View : public KoView { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 ); + %{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent = 0, const char* name = 0 ); protected slots: void cut(); diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am index 19d38267..a0f702f6 100644 --- a/languages/cpp/app_templates/kofficepart/src-Makefile.am +++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am @@ -37,5 +37,5 @@ rc_DATA = %{APPNAMELC}.rc rcdir = $(kde_datadir)/%{APPNAMELC} messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp %{APPNAMELC}_aboutdata.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index ae9a85a6..4f0d7557 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -7,8 +7,8 @@ #include "%{APPNAMELC}.h" #include "%{APPNAMELC}.moc" -%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) +%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) { widget=new TQLabel("Init Value",widgetParent); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index 9599b530..b219619b 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -14,18 +14,19 @@ class %{APPNAME} : public KonqSidebarPlugin { Q_OBJECT + TQ_OBJECT public: /** * Construct a @ref KonqSidebarPlugin. * * @param inst The sidebar's kinstance class. - * @param parent The sidebar internal button info class responsible for this plugin. + * @param tqparent The sidebar internal button info class responsible for this plugin. * @param widgetParent The container which will contain the plugins widget. * @param desktopName The filename of the configuration file. - * @param name A Qt object name for your plugin. + * @param name A TQt object name for your plugin. **/ - %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + %{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 3a8a2274..39bb7108 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -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( TQString::null, TQString::null, this ); + KFileDialog::getOpenURL( TQString(), TQString(), this ); if (url.isEmpty() == false) { diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h index 25cd63bf..9bc577cb 100644 --- a/languages/cpp/app_templates/kpartapp/app.h +++ b/languages/cpp/app_templates/kpartapp/app.h @@ -22,6 +22,7 @@ class KToggleAction; class %{APPNAME} : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 809d642a..45a8116a 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -12,15 +12,15 @@ #include <tqtextstream.h> #include <tqmultilineedit.h> -%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name ) - : KParts::ReadWritePart(parent, name) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name ) + : KParts::ReadWritePart(tqparent, name) { // we need an instance setInstance( %{APPNAME}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new TQMultiLineEdit( parentWidget, widgetName ); + m_widget = new TQMultiLineEdit( tqparentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); @@ -74,7 +74,7 @@ void %{APPNAME}Part::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our parent to do it's thing + // in any event, we want our tqparent to do it's thing ReadWritePart::setModified(modified); } @@ -86,7 +86,7 @@ bool %{APPNAME}Part::openFile() return false; // our example widget is text-based, so we use TQTextStream instead - // of a raw QDataStream + // of a raw TQDataStream TQTextStream stream(&file); TQString str; while (!stream.eof()) @@ -109,7 +109,7 @@ bool %{APPNAME}Part::saveFile() if (isReadWrite() == false) return false; - // m_file is always local, so we use QFile + // m_file is always local, so we use TQFile TQFile file(m_file); if (file.open(IO_WriteOnly) == false) return false; @@ -164,12 +164,12 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L; s_instance = 0L; } -KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, +KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, 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 ); + %{APPNAME}Part* obj = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 1ebc7825..8d5417ad 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -21,12 +21,13 @@ class TQMultiLineEdit; class %{APPNAME}Part : public KParts::ReadWritePart { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name); + %{APPNAME}Part(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name); /** * Destructor @@ -70,11 +71,12 @@ class KAboutData; class %{APPNAME}PartFactory : public KParts::Factory { Q_OBJECT + TQ_OBJECT public: %{APPNAME}PartFactory(); virtual ~%{APPNAME}PartFactory(); - virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, + virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am index 357e2d0b..9b1a14b4 100644 --- a/languages/cpp/app_templates/kpartapp/src-Makefile.am +++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}_part.h -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index 61e3ca0e..dac6dc20 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -8,8 +8,8 @@ #include <klocale.h> #include <kglobal.h> -Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) - : Plugin( parent, name ) +Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* tqparent, const char* name ) + : Plugin( tqparent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. @@ -27,7 +27,7 @@ void Plugin%{APPNAME}::slotAction() // This plugin assumes KHTMLPart. If your plugin can handle more // than this or a different Part than this, simply delete or // change the following block. - if ( !parent()->inherits("KHTMLPart") ) + if ( !tqparent()->inherits("KHTMLPart") ) { TQString title( i18n( "Cannot Translate Source" ) ); TQString text( i18n( "You cannot translate anything except web pages " @@ -37,9 +37,9 @@ void Plugin%{APPNAME}::slotAction() return; } - // Get a handle on our parent so we may get the necessary data for + // Get a handle on our tqparent so we may get the necessary data for // processing - KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); + KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent()); // This plugin only uses the URL. You may use whatever data you // need. @@ -83,9 +83,9 @@ void Plugin%{APPNAME}::slotAction() s_instance = 0; } -TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* %{APPNAME}Factory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new Plugin%{APPNAME}( parent, name ); + return new Plugin%{APPNAME}( tqparent, name ); } KInstance *%{APPNAME}Factory::instance() diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 7c7bfc0c..3d637d1b 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -8,8 +8,9 @@ class Plugin%{APPNAME} : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); + Plugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); virtual ~Plugin%{APPNAME}(); public slots: @@ -19,11 +20,12 @@ public slots: class %{APPNAME}Factory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Factory(); virtual ~%{APPNAME}Factory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am index 52e29c09..81242777 100644 --- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am @@ -18,5 +18,5 @@ pluginsdir = $(kde_datadir)/khtml/kpartplugins plugins_DATA = plugin_%{APPNAMELC}.rc messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART index ceaf1bda..0ba306bb 100644 --- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART @@ -12,7 +12,7 @@ http://freehackers.org/~tnagy/bksys_manual.html CONFIGURING AND COMPILING THE PROJECT(S) SCONS TIPS -MOC PROCESSING +TQMOC PROCESSING SCONS MINIMUM DISTRIBUTION MORE TIPS @@ -61,20 +61,20 @@ checkinstall --fstrans=no --nodoc scons install To make scons run (much) faster, consult ./addons/README in bksys ------------------------------------------ -MOC PROCESSING +TQMOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -signals and slots, then 'foo.h' must contain the macro Q_OBJECT -in order to compile. foo_moc.cpp is usually generated, and is -used to produce foo_moc.o which is linked with the +Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +in order to compile. foo_tqmoc.cpp is usually generated, and is +used to produce foo_tqmoc.o which is linked with the program or the library. -In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, +In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, and it must be included at the very end of foo.cpp (add #include "foo.moc" : this increases the speed of compilation a *lot* and makes less object files. -Both modes are provided though, see test6-mocfiesta/ +Both modes are provided though, see test6-tqmocfiesta/ ------------------------------------------ MINIMUM SCONS DISTRIBUTION @@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags among others), so when you can work without libtool (small projects especially), just do it. -** moc processing ** +** tqmoc processing ** As stated above, you should always add #include "foo.moc" for your qt classes (Q_OBJECT) to save precious compilation time. diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_kmdi/SConscript-src index 746cdf98..9850e2ae 100644 --- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src +++ b/languages/cpp/app_templates/kscons_kmdi/SConscript-src @@ -1,6 +1,6 @@ #! /usr/bin/env python ## This script is a quick test to demonstrate (and test) -## the bksys moc handling '#include "file.moc"' can be added .. or not +## the bksys tqmoc handling '#include "file.moc"' can be added .. or not ## ## Thomas Nagy, 2005 ## This file can be reused freely for any project (see COPYING) diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_kmdi/SConstruct index b82de4e1..238a05b8 100644 --- a/languages/cpp/app_templates/kscons_kmdi/SConstruct +++ b/languages/cpp/app_templates/kscons_kmdi/SConstruct @@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS: shutil.copytree(startdir, FOLDER) ## remove our object files first - os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f") + os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f") #os.popen("pushd %s && scons -c " % FOLDER) # TODO ## CVS cleanup - os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") ## Subversion cleanup - os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER) + os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER) ## GNU Arch cleanup - os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") ## Create the tarball (coloured output) print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m" @@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS: import os, shutil if os.path.isdir(env['CACHEDIR']): shutil.rmtree(env['CACHEDIR']) - os.popen("find . -name \"*.pyc\" | xargs rm -rf") + os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf") env.Default(None) env.Exit(0) diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index a851f02a..1f27cee4 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -17,15 +17,15 @@ typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); -%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & /*args*/) - : KParts::ReadWritePart(parent) +%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/) + : KParts::ReadWritePart(tqparent) { // we need an instance setInstance( %{APPNAMELC}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new TQMultiLineEdit( parentWidget, widgetName ); + m_widget = new TQMultiLineEdit( tqparentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); @@ -88,7 +88,7 @@ void %{APPNAMELC}Part::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our parent to do it's thing + // in any event, we want our tqparent to do it's thing ReadWritePart::setModified(modified); } @@ -100,7 +100,7 @@ bool %{APPNAMELC}Part::openFile() return false; // our example widget is text-based, so we use TQTextStream instead - // of a raw QDataStream + // of a raw TQDataStream TQTextStream stream(&file); TQString str; while (!stream.eof()) @@ -123,7 +123,7 @@ bool %{APPNAMELC}Part::saveFile() if (isReadWrite() == false) return false; - // m_file is always local, so we use QFile + // m_file is always local, so we use TQFile TQFile file(m_file); if (file.open(IO_WriteOnly) == false) return false; diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h index 3fa9beb5..39509adf 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h @@ -23,12 +23,13 @@ class KAboutData; class %{APPNAMELC}Part : public KParts::ReadWritePart { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & /*args*/); + %{APPNAMELC}Part(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/); /** * Destructor diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp index 4286053a..efb41c1d 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp @@ -4,7 +4,7 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> #include <tqdragobject.h> -#include <tqstatusbar.h> +#include <statusbar.h> #include <tqtoolbutton.h> #include <kdebug.h> @@ -146,7 +146,7 @@ void %{APPNAMELC}kmdi::setupActions() void %{APPNAMELC}kmdi::showTip() { - KTipDialog::showTip(this,TQString::null,true); + KTipDialog::showTip(this,TQString(),true); } void %{APPNAMELC}kmdi::showTipOnStart() @@ -204,7 +204,7 @@ void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current ) } // switch to the corresponding document - if ( m_views.contains( (%{APPNAMELC}kmdiView*) current ) ) + if ( m_views.tqcontains( (%{APPNAMELC}kmdiView*) current ) ) { %{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) current; //view->updateCaption(); @@ -243,7 +243,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v) } %{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) v; - if ( m_views.contains( view ) ) + if ( m_views.tqcontains( view ) ) { m_views.remove( view ); if ( view->part()->queryClose() ) diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h index 8e80ab29..ca78c895 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h @@ -28,6 +28,7 @@ class MiscProperties; class %{APPNAMELC}kmdi : public KMdiMainFrm { Q_OBJECT + TQ_OBJECT public: %{APPNAMELC}kmdi( KMdi::MdiMode mode ); virtual ~%{APPNAMELC}kmdi(); diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp index d7c00001..232d6b44 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp @@ -13,8 +13,8 @@ #include "%{APPNAMELC}kmdiView.h" - %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name ) -: KMdiChildView( parentWidget, name ) + %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *tqparentWidget, const char *name ) +: KMdiChildView( tqparentWidget, name ) { m_part = NULL; @@ -35,9 +35,9 @@ part()->widget()->setFocus(); setFocusProxy(part()->widget()); - TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); + TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" ); part()->widget()->reparent( this, TQPoint(0, 0) ); - layout->addWidget( part()->widget() ); + tqlayout->addWidget( part()->widget() ); // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); } diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h index af05df48..31167035 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h @@ -15,8 +15,9 @@ class %{APPNAMELC}kmdiView : public KMdiChildView { Q_OBJECT + TQ_OBJECT public: - %{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L ); + %{APPNAMELC}kmdiView( TQWidget *tqparentWidget=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 5bd6b949..d0c856ec 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp @@ -12,7 +12,7 @@ #include "kmdikonsole.h" -kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name) +kmdikonsole::kmdikonsole(TQWidget *tqparent, const char *name) : TQVBox(tqparent, name) { m_haskonsole = false; respawn(); diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h index ef5a2c1e..e97175c1 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h @@ -5,12 +5,13 @@ #include <tqvbox.h> -class kmdikonsole : public QVBox +class kmdikonsole : public TQVBox { Q_OBJECT + TQ_OBJECT public: - kmdikonsole( TQWidget* parent, const char* name=0); + kmdikonsole( TQWidget* tqparent, const char* name=0); ~kmdikonsole(); public slots: diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh index a36f5c93..7df00263 100755 --- a/languages/cpp/app_templates/kscons_kmdi/messages.sh +++ b/languages/cpp/app_templates/kscons_kmdi/messages.sh @@ -34,14 +34,14 @@ fi echo "extracting the strings" # process the .ui and .rc files -$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp -$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp +$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp +$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp # process the tips - $SRCDIR is supposed to be where the tips are living pushd $TIPSDIR; preparetips >tips.cpp; popd -$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot +$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot # remove the intermediate files rm -f $TIPSDIR/tips.cpp diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_kmdi/prefs.ui index 5de638ef..8b3346de 100644 --- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui +++ b/languages/cpp/app_templates/kscons_kmdi/prefs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>prefs</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>prefs</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> -<widget class="QCheckBox" row="0" column="0"> +<widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_showCloseTabsButton</cstring> </property> @@ -26,5 +26,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART index ceaf1bda..0ba306bb 100644 --- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART @@ -12,7 +12,7 @@ http://freehackers.org/~tnagy/bksys_manual.html CONFIGURING AND COMPILING THE PROJECT(S) SCONS TIPS -MOC PROCESSING +TQMOC PROCESSING SCONS MINIMUM DISTRIBUTION MORE TIPS @@ -61,20 +61,20 @@ checkinstall --fstrans=no --nodoc scons install To make scons run (much) faster, consult ./addons/README in bksys ------------------------------------------ -MOC PROCESSING +TQMOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -signals and slots, then 'foo.h' must contain the macro Q_OBJECT -in order to compile. foo_moc.cpp is usually generated, and is -used to produce foo_moc.o which is linked with the +Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +in order to compile. foo_tqmoc.cpp is usually generated, and is +used to produce foo_tqmoc.o which is linked with the program or the library. -In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, +In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, and it must be included at the very end of foo.cpp (add #include "foo.moc" : this increases the speed of compilation a *lot* and makes less object files. -Both modes are provided though, see test6-mocfiesta/ +Both modes are provided though, see test6-tqmocfiesta/ ------------------------------------------ MINIMUM SCONS DISTRIBUTION @@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags among others), so when you can work without libtool (small projects especially), just do it. -** moc processing ** +** tqmoc processing ** As stated above, you should always add #include "foo.moc" for your qt classes (Q_OBJECT) to save precious compilation time. diff --git a/languages/cpp/app_templates/kscons_kxt/SConscript-src b/languages/cpp/app_templates/kscons_kxt/SConscript-src index 02432be5..bc91cc0b 100644 --- a/languages/cpp/app_templates/kscons_kxt/SConscript-src +++ b/languages/cpp/app_templates/kscons_kxt/SConscript-src @@ -33,7 +33,7 @@ myenv.KDEprogram( "%{APPNAMELC}", %{APPNAMELC}_sources ) ## Customization ## Additional include paths for compiling the source files -## Always add '../' (top-level directory) because moc makes code that needs it +## Always add '../' (top-level directory) because tqmoc makes code that needs it myenv.KDEaddpaths_includes( "./ ../" ) ## Necessary libraries to link against diff --git a/languages/cpp/app_templates/kscons_kxt/SConstruct b/languages/cpp/app_templates/kscons_kxt/SConstruct index b82de4e1..238a05b8 100644 --- a/languages/cpp/app_templates/kscons_kxt/SConstruct +++ b/languages/cpp/app_templates/kscons_kxt/SConstruct @@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS: shutil.copytree(startdir, FOLDER) ## remove our object files first - os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f") + os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f") #os.popen("pushd %s && scons -c " % FOLDER) # TODO ## CVS cleanup - os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") ## Subversion cleanup - os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER) + os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER) ## GNU Arch cleanup - os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") ## Create the tarball (coloured output) print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m" @@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS: import os, shutil if os.path.isdir(env['CACHEDIR']): shutil.rmtree(env['CACHEDIR']) - os.popen("find . -name \"*.pyc\" | xargs rm -rf") + os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf") env.Default(None) env.Exit(0) diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 2a696ea0..ec892c11 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -158,7 +158,7 @@ void %{APPNAME}::changeCaption(const TQString& text) void %{APPNAME}::showTip() { - KTipDialog::showTip(this,TQString::null,true); + KTipDialog::showTip(this,TQString(),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 e812716d..afc6d642 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.h +++ b/languages/cpp/app_templates/kscons_kxt/app.h @@ -29,6 +29,7 @@ class %{APPNAME} : public KMainWindow, public DCOPObject { K_DCOP Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp index 2bcc9c6a..a474e605 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.cpp +++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAME}View::%{APPNAME}View(TQWidget *parent) - : %{APPNAME}view_base(parent) +%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent) + : %{APPNAME}view_base(tqparent) { settingsChanged(); } @@ -33,7 +33,7 @@ void %{APPNAME}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h index 8cd02bef..8d4517bd 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.h +++ b/languages/cpp/app_templates/kscons_kxt/appview.h @@ -22,11 +22,12 @@ class KURL; class %{APPNAME}View : public %{APPNAME}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAME}View(TQWidget *parent); + %{APPNAME}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kscons_kxt/appview_base.ui b/languages/cpp/app_templates/kscons_kxt/appview_base.ui index 6cd36d2c..4604ca4b 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview_base.ui +++ b/languages/cpp/app_templates/kscons_kxt/appview_base.ui @@ -2,7 +2,7 @@ <class>%{APPNAME}view_base</class> <comment>%{CPP_TEMPLATE}</comment> <author>%{AUTHOR} <%{EMAIL}></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>%{APPNAME}view_base</cstring> </property> @@ -21,7 +21,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>sillyLabel</cstring> </property> @@ -31,5 +31,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh index a36f5c93..7df00263 100755 --- a/languages/cpp/app_templates/kscons_kxt/messages.sh +++ b/languages/cpp/app_templates/kscons_kxt/messages.sh @@ -34,14 +34,14 @@ fi echo "extracting the strings" # process the .ui and .rc files -$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp -$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp +$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp +$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp # process the tips - $SRCDIR is supposed to be where the tips are living pushd $TIPSDIR; preparetips >tips.cpp; popd -$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot +$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot # remove the intermediate files rm -f $TIPSDIR/tips.cpp diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui index 43ef8a5f..59403c40 100644 --- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui @@ -2,7 +2,7 @@ <class>Prefs_base</class> <comment>%{CPP_TEMPLATE}</comment> <author>%{AUTHOR} <%{EMAIL}></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Prefs_base</cstring> </property> @@ -18,7 +18,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -34,7 +34,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -42,7 +42,7 @@ <string>Project age:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -85,14 +85,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>kcfg_val_time</cstring> </property> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -122,7 +122,7 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp index efdbf40b..855fb657 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp @@ -33,8 +33,8 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters -%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) - : %{APPNAME}UI( parent, name, TRUE ) +%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *tqparent, const char *name ) + : %{APPNAME}UI( tqparent, name, TRUE ) { /// @todo //Connect your signals and slots here to configure the screen saver. diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h index a5d252a5..c8511d34 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.h @@ -9,6 +9,7 @@ class %{APPNAME} : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: %{APPNAME}( WId drawable ); virtual ~%{APPNAME}(); @@ -20,8 +21,9 @@ private: class %{APPNAME}Setup : public %{APPNAME}UI { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); + %{APPNAME}Setup( TQWidget *tqparent = NULL, const char *name = NULL ); private slots: void slotOkPressed(); diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui index c4a843d0..da84ab28 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui +++ b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui @@ -2,7 +2,7 @@ <class>%{APPNAME}UI</class> <comment>This is the main UI for setting up your screen saver.</comment> <author>Ian Reinhart Geiser</author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>%{APPNAMELC}cfg</cstring> </property> @@ -17,7 +17,7 @@ <property name="caption"> <string>Screen Saver Config</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -41,7 +41,7 @@ <string>Set some setting</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -50,7 +50,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>OkayPushButton</cstring> </property> @@ -58,7 +58,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>CancelPushButton</cstring> </property> @@ -74,6 +74,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/kscreensaver/src-Makefile.am index e19ffb77..e11ec0dc 100644 --- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am +++ b/languages/cpp/app_templates/kscreensaver/src-Makefile.am @@ -20,5 +20,5 @@ desktopdir = $(kde_appsdir)/System/ScreenSavers EXTRA_DIST = $(desktop_DATA) messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 09f031c4..6ed2ab3d 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -27,6 +27,7 @@ class KURL; class %{APPNAMELC} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 30d627fe..0c82dd25 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) - : %{APPNAMELC}view_base(parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) + : %{APPNAMELC}view_base(tqparent) { settingsChanged(); } @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index e0738ebe..897072a6 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -22,11 +22,12 @@ class KURL; class %{APPNAMELC}View : public %{APPNAMELC}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *parent); + %{APPNAMELC}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kxt/appview_base.ui b/languages/cpp/app_templates/kxt/appview_base.ui index 626d95df..5852f806 100644 --- a/languages/cpp/app_templates/kxt/appview_base.ui +++ b/languages/cpp/app_templates/kxt/appview_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>%{APPNAMELC}view_base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>%{APPNAMELC}view_base</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> -<widget class="QLabel" row="0" column="0"> +<widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>sillyLabel</cstring> </property> @@ -29,5 +29,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui index 5c0fc860..8c8b9012 100644 --- a/languages/cpp/app_templates/kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kxt/prefs-base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>Prefs_base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Prefs_base</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -32,7 +32,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -40,7 +40,7 @@ <string>Project age:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -83,14 +83,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>kcfg_val_time</cstring> </property> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -120,7 +120,7 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am index 5f7936da..2a04da7e 100644 --- a/languages/cpp/app_templates/kxt/src-Makefile.am +++ b/languages/cpp/app_templates/kxt/src-Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC} # set the include path for X, qt and KDE INCLUDES = $(all_includes) -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO # the library search path. @@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 7f4cda15..508f7cc9 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -74,9 +74,9 @@ connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); - mVolume=new L33tSlider(0,100,10,0, Horizontal, this); + mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this); mVolume->setValue(napp->player()->volume()); - mSeeker=new L33tSlider(0,1000,10,0, Horizontal, this); + mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this); mStatusBar=new KStatusBar(this); @@ -86,7 +86,7 @@ l->addWidget(mStop,0,1); l->addWidget(mPlay,0,2); l->addWidget(mForward,0,3); - l->addWidget(mPlaylist,0,4, Qt::AlignLeft); + l->addWidget(mPlaylist,0,4, TQt::AlignLeft); l->addWidget(mLoop,0,5); l->addWidget(mPopup,0,6); l->addColSpacing(4, buttonSize+8); @@ -124,7 +124,7 @@ connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) + for (TQPtrListIterator<TQObject> i(*tqchildren()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -132,7 +132,7 @@ show(); // What it is now, stay. - setFixedSize(minimumSize()); + setFixedSize(tqminimumSize()); } %{APPNAME}UI::~%{APPNAME}UI() @@ -189,7 +189,7 @@ void %{APPNAME}UI::changeCaption(const TQString& text) void %{APPNAME}UI::popup() { NoatunStdAction::ContextMenu::showContextMenu( - mapToGlobal(mPopup->geometry().bottomLeft()) ); + mapToGlobal(mPopup->tqgeometry().bottomLeft()) ); } void %{APPNAME}UI::slotPlaying() diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.h b/languages/cpp/app_templates/noatunui/plugin_impl.h index 476530f2..498864c6 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.h +++ b/languages/cpp/app_templates/noatunui/plugin_impl.h @@ -26,6 +26,7 @@ class KStatusBar; class %{APPNAME}UI : public TQWidget, public UserInterface { Q_OBJECT + TQ_OBJECT public: %{APPNAME}UI(); virtual ~%{APPNAME}UI(); diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am index 95506569..f7c7b349 100644 --- a/languages/cpp/app_templates/noatunui/src-Makefile.am +++ b/languages/cpp/app_templates/noatunui/src-Makefile.am @@ -20,5 +20,5 @@ plugins_DATA = %{APPNAMELC}.plugin # kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp index a25f1fd2..f84a4fd3 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp @@ -117,7 +117,7 @@ void Bitmap<Type>::fadeStar() d++; x++; } - repaint(); + tqrepaint(); } } @@ -211,7 +211,7 @@ void %{APPNAME}View::checkInput() } break; - case SDL_QUIT: + case SDL_TQUIT: exit(0); break; } @@ -220,7 +220,7 @@ void %{APPNAME}View::checkInput() #define output2 ((unsigned char*)outputBmp.data) -void %{APPNAME}View::repaint() +void %{APPNAME}View::tqrepaint() { SDL_LockSurface(surface); TEST(); diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.h b/languages/cpp/app_templates/noatunvisual/plugin_impl.h index 2a7de7b1..a95845c9 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.h +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.h @@ -58,7 +58,7 @@ protected: void setupPalette(double dummy=0.0); /** Draw everything. */ - void repaint(); + void tqrepaint(); private: /** used for pipelining */ diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am index 207fd8a8..8f649499 100644 --- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am +++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am @@ -15,5 +15,5 @@ plugins_DATA = %{APPNAMELC}.plugin # kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/opieapp/app.pro b/languages/cpp/app_templates/opieapp/app.pro index f4111696..74323c7c 100644 --- a/languages/cpp/app_templates/opieapp/app.pro +++ b/languages/cpp/app_templates/opieapp/app.pro @@ -9,8 +9,8 @@ QMAKE_LIBDIR = $(OPIEDIR)/lib OPIE-SPEC=6 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index ebb4233c..6636116e 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -6,11 +6,11 @@ typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory; OPIE_EXPORT_APP( %{APPNAME}Factory ) /* - * Constructs a %{APPNAME} which is a child of 'parent', with the + * Constructs a %{APPNAME} which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) - : %{APPNAME}Base( parent, name, fl ) +%{APPNAME}::%{APPNAME}( TQWidget* tqparent, const char* name, WFlags fl ) + : %{APPNAME}Base( tqparent, name, fl ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } @@ -20,7 +20,7 @@ OPIE_EXPORT_APP( %{APPNAME}Factory ) */ %{APPNAME}::~%{APPNAME}() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 2a9c9efa..0a8320c9 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -5,12 +5,13 @@ class %{APPNAME} : public %{APPNAME}Base { Q_OBJECT + TQ_OBJECT public: static TQString appName() { - return TQString::fromLatin1("%{APPNAMELC}" ); + return TQString::tqfromLatin1("%{APPNAMELC}" ); } - %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui index b6b81b11..1243c341 100644 --- a/languages/cpp/app_templates/opieapp/examplebase.ui +++ b/languages/cpp/app_templates/opieapp/examplebase.ui @@ -7,7 +7,7 @@ <cstring>%{APPNAME}Base</cstring> </property> <property stdset="1"> - <name>geometry</name> + <name>tqgeometry</name> <rect> <x>0</x> <y>0</y> @@ -45,5 +45,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/opieapplet/app.pro b/languages/cpp/app_templates/opieapplet/app.pro index e1cc1e3b..696082d0 100644 --- a/languages/cpp/app_templates/opieapplet/app.pro +++ b/languages/cpp/app_templates/opieapplet/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp index 3264314c..cc2a6a17 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp @@ -2,14 +2,14 @@ #include <tqpainter.h> #include <tqmessagebox.h> -#include <qpe/applnk.h> // for AppLnk -#include <qpe/resource.h> // for Resource loading +#include <tqpe/applnk.h> // for AppLnk +#include <tqpe/resource.h> // for Resource loading #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(TQWidget *parent) - : TQWidget( parent, "%{APPNAME} Applet" ) { +%{APPNAME}::%{APPNAME}(TQWidget *tqparent) + : TQWidget( tqparent, "%{APPNAME} Applet" ) { /* * we will load an Image, scale it for the right usage * remember your applet might be used by different @@ -79,7 +79,7 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) { %{APPNAME}Impl::~%{APPNAME}Impl() { /* * we will delete our applets as well - * setAUtoDelete makes the QList free + * setAUtoDelete makes the TQList free * the objects behind the pointers */ m_applets.setAutoDelete( true ); @@ -89,12 +89,12 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) { /* * For the taskbar interface return a Widget */ -TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) { +TQWidget* %{APPNAME}Impl::applet( TQWidget* tqparent ) { /* * There are problems with ownership. So we add * our ownlist and clear this; */ - %{APPNAME}* ap = new %{APPNAME}( parent ); + %{APPNAME}* ap = new %{APPNAME}( tqparent ); m_applets.append( ap ); return ap; @@ -109,12 +109,12 @@ int %{APPNAME}Impl::position()const { /* - * Now the important QUnkownInterface method without + * Now the important TQUnkownInterface method without * this one your applet won't load * @param uuid The uuid of the interface * @param iface The pointer to the interface ptr */ -QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** iface) { +TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid& uuid, TQUnknownInterface** iface) { /* set the pointer to the interface to 0 */ *iface = 0; @@ -128,24 +128,24 @@ QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** i * Now the caller knows that the Interface Pointer * is valid and the interface supported */ - if ( uuid == IID_QUnknown ) + if ( uuid == IID_TQUnknown ) *iface = this; else if ( uuid == IID_TaskbarApplet ) *iface = this; else - return QS_FALSE; + return TQS_FALSE; if ( *iface ) (*iface)->addRef(); - return QS_OK; + return TQS_OK; } /* * Finally we need to export the Interface. * CREATE_INSTANCE creates a interface and calls - * queryInterface for the QUnknownInterface once + * queryInterface for the TQUnknownInterface once * With out this function the applet can't be loaded. * * NOTE: If your applet does not load it's likely you've an @@ -156,7 +156,7 @@ QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** i * The main(int argc, char* argv[] ) does not need to be * included in a library so it's ok that the linker complains */ -Q_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( %{APPNAME}Impl ) +TQ_EXPORT_INTERFACE() { + TQ_CREATE_INSTANCE( %{APPNAME}Impl ) } diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h index 7cca8ee7..855aed57 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.h +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h @@ -3,18 +3,18 @@ /** - * Opie and Qtopia uses a component system called QCOM - * which was first part of the Qt 3.0 API but was made - * prviate during the betas. Opie and Qtopia still use it + * Opie and TQtopia uses a component system called TQCOM + * which was first part of the TQt 3.0 API but was made + * prviate during the betas. Opie and TQtopia still use it * and we're happy with it. - * Every starts with the QUnknownInterface. It supports functions + * Every starts with the TQUnknownInterface. It supports functions * for reference counting and the most important one - * is for a query. Every QCOM interface got a global unique id ( GUID,UUID ) + * is for a query. Every TQCOM interface got a global unique id ( GUID,UUID ) * query is used to see if a interface is supported by * a dynamic shared object ( dso / plugin ) * For tasks like loading Applications, InputMethods, Today, MenuButton, * Taskbar, Style, Email Client there are specefic Interfaces you - * need to implement. The interfaces inherits from QUnknownInterface and + * need to implement. The interfaces inherits from TQUnknownInterface and * you'll need inherit from the interface. * As example we will use the Taskbar interface */ @@ -22,26 +22,27 @@ /* * The taskbar applet interfaces wants us to implement position() and applet() - * additionally we need to implement add(), release() and queryInterface for QUnknownInterface + * additionally we need to implement add(), release() and queryInterface for TQUnknownInterface * luckiy there is a macro for the reference counting * We provide an Implementation of the interface. */ #include <tqwidget.h> #include <tqptrlist.h> -#include <qpe/taskbarappletinterface.h> +#include <tqpe/taskbarappletinterface.h> /* * Because we only draw an Icon in a fixed width and height - * we declare and define %{APPNAME} here and you could use QLabel + * we declare and define %{APPNAME} here and you could use TQLabel * setPixmap or use TQWidget and draw yourself. * You might also want to reimplement mouse*Event to use some simple actions */ class %{APPNAME} : public TQWidget { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}(TQWidget *parent); + %{APPNAME}(TQWidget *tqparent); ~%{APPNAME}(); private: void mousePressEvent( TQMouseEvent* ); @@ -55,9 +56,9 @@ public: %{APPNAME}Impl(); virtual ~%{APPNAME}Impl(); - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); + TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); - TQWidget *applet( TQWidget* parent ); + TQWidget *applet( TQWidget* tqparent ); int position()const; /* @@ -65,10 +66,10 @@ public: * if reference drops to zero * delete this is called */ - Q_REFCOUNT + TQ_REFCOUNT private: - QList<%{APPNAME}> m_applets; + TQList<%{APPNAME}> m_applets; }; diff --git a/languages/cpp/app_templates/opieinput/app.pro b/languages/cpp/app_templates/opieinput/app.pro index 1711c78f..5a3a7a40 100644 --- a/languages/cpp/app_templates/opieinput/app.pro +++ b/languages/cpp/app_templates/opieinput/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index db2e4285..ea178e59 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -3,7 +3,7 @@ #include <tqlabel.h> #include <tqsignalmapper.h> #include <tqpushbutton.h> -#include <qpe/resource.h> +#include <tqpe/resource.h> #include "%{APPNAMELC}.h" @@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){ /* * Send the key - * ke is the unicode + * ke is the tqunicode * _ke + 0x41 is the keycode * m_state Normally the state * down/up @@ -102,10 +102,10 @@ void %{APPNAME}::slotCtrl(bool b){ delete m_icn; } -TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, Qt::WFlags f ) +TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *tqparent, TQt::WFlags f ) { if ( !m_pickboard ) - m_pickboard = new %{APPNAME}( parent, f ); + m_pickboard = new %{APPNAME}( tqparent, f ); return m_pickboard; } @@ -133,25 +133,25 @@ void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot ) TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); } -#ifndef QT_NO_COMPONENT -QRESULT %{APPNAME}Impl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) +#ifndef TQT_NO_COMPONENT +TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( uuid == IID_QUnknown ) + if ( uuid == IID_TQUnknown ) *iface = this; else if ( uuid == IID_InputMethod ) *iface = this; else - return QS_FALSE; + return TQS_FALSE; if ( *iface ) (*iface)->addRef(); - return QS_OK; + return TQS_OK; } -Q_EXPORT_INTERFACE() +TQ_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( %{APPNAME}Impl ) + TQ_CREATE_INSTANCE( %{APPNAME}Impl ) } #endif diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h index 6d7033f0..76af8138 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.h +++ b/languages/cpp/app_templates/opieinput/simpleimpl.h @@ -3,12 +3,13 @@ #include <tqhbox.h> -#include <qpe/inputmethodinterface.h> +#include <tqpe/inputmethodinterface.h> class TQPixmap; class TQCheckBox; class %{APPNAME} : public TQHBox { Q_OBJECT + TQ_OBJECT public: %{APPNAME}( TQWidget *par, WFlags f ); ~%{APPNAME}(); @@ -31,12 +32,12 @@ public: %{APPNAME}Impl(); virtual ~%{APPNAME}Impl(); -#ifndef QT_NO_COMPONENT - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - Q_REFCOUNT +#ifndef TQT_NO_COMPONENT + TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); + TQ_REFCOUNT #endif - virtual TQWidget *inputMethod( TQWidget *parent, Qt::WFlags f ); + virtual TQWidget *inputMethod( TQWidget *tqparent, TQt::WFlags f ); virtual void resetState(); virtual TQPixmap *icon(); virtual TQString name(); diff --git a/languages/cpp/app_templates/opiemenu/app.pro b/languages/cpp/app_templates/opiemenu/app.pro index 71bc208c..f9600bf4 100644 --- a/languages/cpp/app_templates/opiemenu/app.pro +++ b/languages/cpp/app_templates/opiemenu/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp index 17b59a3e..9d953663 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp @@ -1,7 +1,7 @@ #include "%{APPNAMELC}.h" -#include <qpe/applnk.h> -#include <qpe/resource.h> +#include <tqpe/applnk.h> +#include <tqpe/resource.h> /* QT */ #include <tqiconset.h> @@ -57,22 +57,22 @@ void %{APPNAME}::activated() } -QRESULT %{APPNAME}::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) +TQRESULT %{APPNAME}::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( uuid == IID_QUnknown ) + if ( uuid == IID_TQUnknown ) *iface = this; else if ( uuid == IID_MenuApplet ) *iface = this; else - return QS_FALSE; + return TQS_FALSE; if ( *iface ) (*iface)->addRef(); - return QS_OK; + return TQS_OK; } -Q_EXPORT_INTERFACE() +TQ_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( %{APPNAME} ) + TQ_CREATE_INSTANCE( %{APPNAME} ) } diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h index b384ee2d..61c3cc5b 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.h +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h @@ -1,7 +1,7 @@ #ifndef %{APPNAME}_MENU_APPLET_H #define %{APPNAME}_MENU_APPLET_H -#include <qpe/menuappletinterface.h> +#include <tqpe/menuappletinterface.h> #include <tqobject.h> @@ -9,13 +9,14 @@ class %{APPNAME} : public TQObject, public MenuAppletInterface { Q_OBJECT + TQ_OBJECT public: %{APPNAME} ( ); virtual ~%{APPNAME} ( ); - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - Q_REFCOUNT + TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); + TQ_REFCOUNT virtual int position() const; @@ -25,7 +26,7 @@ public: /* virtual TQString tr( const char* ) const; virtual TQString tr( const char*, const char* ) const; */ - virtual TQPopupMenu *popup ( TQWidget *parent ) const; + virtual TQPopupMenu *popup ( TQWidget *tqparent ) const; virtual void activated ( ); }; diff --git a/languages/cpp/app_templates/opienet/app.pro b/languages/cpp/app_templates/opienet/app.pro index 53fb6eea..df87650c 100644 --- a/languages/cpp/app_templates/opienet/app.pro +++ b/languages/cpp/app_templates/opienet/app.pro @@ -7,8 +7,8 @@ LIBS += -linterfaces QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h index 7a8882b4..5c928ec9 100644 --- a/languages/cpp/app_templates/opienet/simmplemodule.h +++ b/languages/cpp/app_templates/opienet/simmplemodule.h @@ -12,19 +12,19 @@ public: VirtualModule(); ~VirtualModule(); - const TQString type() {return TQString::fromLatin1("vpn" );} + const TQString type() {return TQString::tqfromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); TQWidget *information( Interface* ); - QList<Interface> getInterfaces(); + TQList<Interface> getInterfaces(); void possibleNewInterfaces( TQMap<TQString, TQString>& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: - QList<Interface> m_interfaces; + TQList<Interface> m_interfaces; }; extern "C" { diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index bbabcbda..9b38bc77 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -1,9 +1,9 @@ #include "%{APPNAMELC}iface.h" -%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent, +%{APPNAME}Interface::%{APPNAME}Interface( TQObject* tqparent, const char* name, bool status ) - : Interface(parent, name, status ) + : Interface(tqparent, name, status ) { } @@ -31,13 +31,13 @@ bool %{APPNAME}Interface::refresh() { void %{APPNAME}Interface::start() { // call pptp - setStatus(true); + settqStatus(true); refresh(); emit updateMessage("VPN started"); } void %{APPNAME}Interface::stop() { - setStatus(false ); + settqStatus(false ); refresh(); emit updateMessage("VPN halted"); } diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index ef514697..c38d884f 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -5,9 +5,10 @@ class %{APPNAME}Interface : public Interface { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false ); + %{APPNAME}Interface(TQObject* tqparent, 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 0a96c844..f8e963bd 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.cpp +++ b/languages/cpp/app_templates/opienet/simplemodule.cpp @@ -29,7 +29,7 @@ */ bool %{APPNAME}Module::isOwner( Interface* iface ) { /* check if it is our device */ - return m_interfaces.find( iface ) != -1; + return m_interfaces.tqfind( iface ) != -1; } TQWidget* %{APPNAME}Module::configure( Interface* ) { @@ -41,7 +41,7 @@ TQWidget* %{APPNAME}Module::information( Interface* iface ) { return new InterfaceInformationImp(0, "Interface info", iface ); } -QList<Interface> %{APPNAME}Module::getInterfaces() { +TQList<Interface> %{APPNAME}Module::getInterfaces() { return m_interfaces; } diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h index 4120d811..327c1d43 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.h +++ b/languages/cpp/app_templates/opienet/simplemodule.h @@ -12,19 +12,19 @@ public: %{APPNAME}Module(); ~%{APPNAME}Module(); - const TQString type() {return TQString::fromLatin1("vpn" );} + const TQString type() {return TQString::tqfromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); TQWidget *information( Interface* ); - QList<Interface> getInterfaces(); + TQList<Interface> getInterfaces(); void possibleNewInterfaces( TQMap<TQString, TQString>& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: - QList<Interface> m_interfaces; + TQList<Interface> m_interfaces; }; extern "C" { diff --git a/languages/cpp/app_templates/opietoday/app.pro b/languages/cpp/app_templates/opietoday/app.pro index 152dc6f6..73e03efb 100644 --- a/languages/cpp/app_templates/opietoday/app.pro +++ b/languages/cpp/app_templates/opietoday/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp index c7df8069..d3dc37ab 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp +++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp @@ -19,7 +19,7 @@ double %{APPNAME}::versionNumber() const { // this sets the image that will be shown on the left side of the plugin TQString %{APPNAME}::pixmapNameWidget() const { - return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}"); + return TQString::tqfromLatin1("%{APPNAMELC}/%{APPNAMELC}"); } TQWidget* %{APPNAME}::widget( TQWidget * wid ) { @@ -36,13 +36,13 @@ TQString %{APPNAME}::pixmapNameConfig() const { } // No config widget yet, look at the datebook plugin for an example of that -TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) { +TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*tqparent*/ ) { return 0l; } // add the binary name of the app to launch here TQString %{APPNAME}::appName() const { - return TQString::null; + return TQString(); } // 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/examplepluginimpl.cpp b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp index 3a9481f1..a4896308 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp @@ -14,17 +14,17 @@ TodayPluginObject* %{APPNAME}Impl::guiPart() { return examplePlugin; } -QRESULT %{APPNAME}Impl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { +TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid & uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { + if ( ( uuid == IID_TQUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { *iface = this, (*iface)->addRef(); }else - return QS_FALSE; + return TQS_FALSE; - return QS_OK; + return TQS_OK; } -Q_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( %{APPNAME}Impl ); +TQ_EXPORT_INTERFACE() { + TQ_CREATE_INSTANCE( %{APPNAME}Impl ); } diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.h b/languages/cpp/app_templates/opietoday/examplepluginimpl.h index ccb7c3b3..ddc63bc2 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginimpl.h +++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.h @@ -11,8 +11,8 @@ public: %{APPNAME}Impl(); virtual ~%{APPNAME}Impl(); - QRESULT queryInterface( const QUuid &, QUnknownInterface** ); - Q_REFCOUNT + TQRESULT queryInterface( const TQUuid &, TQUnknownInterface** ); + TQ_REFCOUNT virtual TodayPluginObject *guiPart(); diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index a80dad81..98b19f9a 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -1,10 +1,10 @@ -#include <qpe/config.h> -#include <qpe/qcopenvelope_qws.h> +#include <tqpe/config.h> +#include <tqpe/tqcopenvelope_qws.h> #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent, const char* name) - : TQWidget(parent, name ) { +%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *tqparent, const char* name) + : TQWidget(tqparent, name ) { m_exampleLabel = 0l; m_layout = 0l; diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index 53a67b18..f5e35d4e 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -8,9 +8,10 @@ class %{APPNAME}Widget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Widget( TQWidget *parent, const char *name ); + %{APPNAME}Widget( TQWidget *tqparent, const char *name ); ~%{APPNAME}Widget(); void refresh(); diff --git a/languages/cpp/app_templates/prc-tool/palmhello.c b/languages/cpp/app_templates/prc-tool/palmhello.c index 0a34b6c4..e0317932 100644 --- a/languages/cpp/app_templates/prc-tool/palmhello.c +++ b/languages/cpp/app_templates/prc-tool/palmhello.c @@ -22,7 +22,7 @@ static Boolean MainFormHandleEvent (EventPtr e) break; case menuEvent: - MenuEraseStatus(NULL); + MenuErasetqStatus(NULL); switch(e->data.menu.itemID) { } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index f3c5f7f2..4b78645a 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -11,7 +11,7 @@ #include <tqtextedit.h> #include <tqfile.h> #include <tqfiledialog.h> -#include <tqstatusbar.h> +#include <statusbar.h> #include <tqmessagebox.h> #include <tqprinter.h> #include <tqapplication.h> @@ -36,17 +36,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen - = new TQToolButton( openIcon, tr("Open File"), TQString::null, + = new TQToolButton( openIcon, tr("Open File"), TQString(), this, TQT_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave - = new TQToolButton( saveIcon, tr("Save File"), TQString::null, + = new TQToolButton( saveIcon, tr("Save File"), TQString(), this, TQT_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint - = new TQToolButton( printIcon, tr("Print File"), TQString::null, + = new TQToolButton( printIcon, tr("Print File"), TQString(), this, TQT_SLOT(print()), fileTools, "print file" ); @@ -103,7 +103,7 @@ file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); @@ -111,7 +111,7 @@ menuBar()->insertItem( tr("&Help"), help ); help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) ); + help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); help->insertSeparator(); help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); @@ -134,13 +134,13 @@ void %{APPNAME}::newDoc() { %{APPNAME} *ed = new %{APPNAME}; - ed->setCaption(tr("Qt Example - Application")); + ed->setCaption(tr("TQt Example - Application")); ed->show(); } void %{APPNAME}::choose() { - TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, + TQString fn = TQFileDialog::getOpenFileName( TQString(), TQString(), this); if ( !fn.isEmpty() ) load( fn ); @@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName ) e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); - statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); + statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); } @@ -173,7 +173,7 @@ void %{APPNAME}::save() TQString text = e->text(); TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { - statusBar()->message( tr("Could not write to %1").arg(filename), + statusBar()->message( tr("Could not write to %1").tqarg(filename), 2000 ); return; } @@ -186,13 +186,13 @@ void %{APPNAME}::save() setCaption( filename ); - statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 ); + statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); } void %{APPNAME}::saveAs() { - TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, + TQString fn = TQFileDialog::getSaveFileName( TQString(), TQString(), this ); if ( !fn.isEmpty() ) { filename = fn; @@ -249,7 +249,7 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce ) return; } - switch( TQMessageBox::information( this, tr("Qt Application Example"), + switch( TQMessageBox::information( this, tr("TQt 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( TQCloseEvent* ce ) void %{APPNAME}::about() { - TQMessageBox::about( this, tr("Qt Application Example"), + TQMessageBox::about( this, tr("TQt Application Example"), tr("This example demonstrates simple use of " - "TQMainWindow,\nQMenuBar and TQToolBar.")); + "TQMainWindow,\nTQMenuBar and TQToolBar.")); } -void %{APPNAME}::aboutQt() +void %{APPNAME}::aboutTQt() { - TQMessageBox::aboutQt( this, tr("Qt Application Example") ); + TQMessageBox::aboutTQt( this, tr("TQt Application Example") ); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.h b/languages/cpp/app_templates/qmakeapp/qmakeapp.h index af12e1eb..bc8a2b93 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.h +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.h @@ -7,9 +7,10 @@ class TQTextEdit; -class %{APPNAME}: public QMainWindow +class %{APPNAME}: public TQMainWindow { Q_OBJECT + TQ_OBJECT public: %{APPNAME}(); @@ -27,7 +28,7 @@ private slots: void print(); void about(); - void aboutQt(); + void aboutTQt(); private: TQPrinter *printer; diff --git a/languages/cpp/app_templates/qt4hello/main.cpp b/languages/cpp/app_templates/qt4hello/main.cpp index cbff1d3c..59ee17d7 100644 --- a/languages/cpp/app_templates/qt4hello/main.cpp +++ b/languages/cpp/app_templates/qt4hello/main.cpp @@ -1,11 +1,11 @@ %{CPP_TEMPLATE} -#include <QCoreApplication> +#include <TQCoreApplication> int main(int argc, char *argv[]) { - QCoreApplication app(argc, argv); - qDebug("Hello from Qt 4!"); + TQCoreApplication app(argc, argv); + qDebug("Hello from TQt 4!"); return 0; } diff --git a/languages/cpp/app_templates/qt4makeapp/main.cpp b/languages/cpp/app_templates/qt4makeapp/main.cpp index 4f6295a2..55f24795 100644 --- a/languages/cpp/app_templates/qt4makeapp/main.cpp +++ b/languages/cpp/app_templates/qt4makeapp/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(application); + TQ_INIT_RESOURCE(application); TQApplication app(argc, argv); %{APPNAME} * mw = new %{APPNAME}(); mw->show(); diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp index cdf18174..f2178d9d 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include <QtGui> +#include <TQtGui> #include "%{APPNAMELC}.h" #include <TQTextEdit> @@ -75,7 +75,7 @@ void %{APPNAME}::about() { 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, " + "write modern GUI applications using TQt, with a menu bar, " "toolbars, and a status bar.")); } @@ -86,17 +86,17 @@ void %{APPNAME}::documentWasModified() void %{APPNAME}::createActions() { - newAct = new TQAction(QIcon(":/filenew.xpm"), tr("&New"), this); + newAct = new TQAction(TQIcon(":/filenew.xpm"), tr("&New"), this); newAct->setShortcut(tr("Ctrl+N")); newAct->setStatusTip(tr("Create a new file")); connect(newAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(newFile())); - openAct = new TQAction(QIcon(":/fileopen.xpm"), tr("&Open..."), this); + openAct = new TQAction(TQIcon(":/fileopen.xpm"), tr("&Open..."), this); openAct->setShortcut(tr("Ctrl+O")); openAct->setStatusTip(tr("Open an existing file")); connect(openAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(open())); - saveAct = new TQAction(QIcon(":/filesave.xpm"), tr("&Save"), this); + saveAct = new TQAction(TQIcon(":/filesave.xpm"), tr("&Save"), this); saveAct->setShortcut(tr("Ctrl+S")); saveAct->setStatusTip(tr("Save the document to disk")); connect(saveAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(save())); @@ -110,19 +110,19 @@ void %{APPNAME}::createActions() exitAct->setStatusTip(tr("Exit the application")); connect(exitAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(close())); - cutAct = new TQAction(QIcon(":/editcut.xpm"), tr("Cu&t"), this); + cutAct = new TQAction(TQIcon(":/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, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(cut())); - copyAct = new TQAction(QIcon(":/editcopy.xpm"), tr("&Copy"), this); + copyAct = new TQAction(TQIcon(":/editcopy.xpm"), tr("&Copy"), this); copyAct->setShortcut(tr("Ctrl+C")); copyAct->setStatusTip(tr("Copy the current selection's contents to the " "clipboard")); connect(copyAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(copy())); - pasteAct = new TQAction(QIcon(":/editpaste.xpm"), tr("&Paste"), this); + pasteAct = new TQAction(TQIcon(":/editpaste.xpm"), tr("&Paste"), this); pasteAct->setShortcut(tr("Ctrl+V")); pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " "selection")); @@ -132,9 +132,9 @@ void %{APPNAME}::createActions() aboutAct->setStatusTip(tr("Show the application's About box")); connect(aboutAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(about())); - aboutQtAct = new TQAction(tr("About &Qt"), this); - aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); - connect(aboutQtAct, TQT_SIGNAL(triggered()), qApp, TQT_SLOT(aboutQt())); + aboutTQtAct = new TQAction(tr("About &TQt"), this); + aboutTQtAct->setStatusTip(tr("Show the TQt library's About box")); + connect(aboutTQtAct, TQT_SIGNAL(triggered()), tqApp, TQT_SLOT(aboutTQt())); cutAct->setEnabled(false); copyAct->setEnabled(false); @@ -163,7 +163,7 @@ void %{APPNAME}::createMenus() helpMenu = menuBar()->addMenu(tr("&Help")); helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutQtAct); + helpMenu->addAction(aboutTQtAct); } void %{APPNAME}::createToolBars() @@ -223,13 +223,13 @@ void %{APPNAME}::loadFile(const TQString &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())); + .tqarg(fileName) + .tqarg(file.errorString())); return; } TQTextStream in(&file); - TQApplication::setOverrideCursor(Qt::WaitCursor); + TQApplication::setOverrideCursor(TQt::WaitCursor); textEdit->setPlainText(in.readAll()); TQApplication::restoreOverrideCursor(); @@ -243,13 +243,13 @@ bool %{APPNAME}::saveFile(const TQString &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())); + .tqarg(fileName) + .tqarg(file.errorString())); return false; } TQTextStream out(&file); - TQApplication::setOverrideCursor(Qt::WaitCursor); + TQApplication::setOverrideCursor(TQt::WaitCursor); out << textEdit->toPlainText(); TQApplication::restoreOverrideCursor(); @@ -270,7 +270,7 @@ void %{APPNAME}::setCurrentFile(const TQString &fileName) else shownName = strippedName(curFile); - setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); + setWindowTitle(tr("%1[*] - %2").tqarg(shownName).tqarg(tr("Application"))); } TQString %{APPNAME}::strippedName(const TQString &fullFileName) diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h index 14a40d99..65402c85 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h @@ -7,12 +7,13 @@ #include <TQCloseEvent> class TQAction; -class QMenu; +class TQMenu; class TQTextEdit; -class %{APPNAME}:public QMainWindow +class %{APPNAME}:public TQMainWindow { Q_OBJECT + TQ_OBJECT public: %{APPNAME}(); @@ -45,9 +46,9 @@ private: TQTextEdit *textEdit; TQString curFile; - QMenu *fileMenu; - QMenu *editMenu; - QMenu *helpMenu; + TQMenu *fileMenu; + TQMenu *editMenu; + TQMenu *helpMenu; TQToolBar *fileToolBar; TQToolBar *editToolBar; TQAction *newAct; @@ -59,7 +60,7 @@ private: TQAction *copyAct; TQAction *pasteAct; TQAction *aboutAct; - TQAction *aboutQtAct; + TQAction *aboutTQtAct; }; #endif diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp index 45331649..12c3f634 100644 --- a/languages/cpp/app_templates/qtopia4app/example.cpp +++ b/languages/cpp/app_templates/qtopia4app/example.cpp @@ -2,8 +2,8 @@ #include "%{APPNAMELC}.h" #include <tqpushbutton.h> -%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, Qt::WFlags f ) - : TQWidget( parent, f ) +%{APPNAME}Base::%{APPNAME}Base( TQWidget *tqparent, TQt::WFlags f ) + : TQWidget( tqparent, f ) { setupUi( this ); } @@ -13,11 +13,11 @@ } /* - * Constructs a %{APPNAME} which is a child of 'parent', with the + * Constructs a %{APPNAME} which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget *parent, Qt::WFlags f ) - : %{APPNAME}Base( parent, f ) +%{APPNAME}::%{APPNAME}( TQWidget *tqparent, TQt::WFlags f ) + : %{APPNAME}Base( tqparent, f ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } @@ -27,7 +27,7 @@ */ %{APPNAME}::~%{APPNAME}() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h index 5bfc69ba..e4c44a8f 100644 --- a/languages/cpp/app_templates/qtopia4app/example.h +++ b/languages/cpp/app_templates/qtopia4app/example.h @@ -6,15 +6,16 @@ class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base { public: - %{APPNAME}Base( TQWidget *parent = 0, Qt::WFlags f = 0 ); + %{APPNAME}Base( TQWidget *tqparent = 0, TQt::WFlags f = 0 ); virtual ~%{APPNAME}Base(); }; class %{APPNAME} : public %{APPNAME}Base { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}( TQWidget *parent = 0, Qt::WFlags f = 0 ); + %{APPNAME}( TQWidget *tqparent = 0, TQt::WFlags f = 0 ); virtual ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/qtopia4app/example.html b/languages/cpp/app_templates/qtopia4app/example.html index 279a6106..9bcae99d 100644 --- a/languages/cpp/app_templates/qtopia4app/example.html +++ b/languages/cpp/app_templates/qtopia4app/example.html @@ -6,10 +6,10 @@ <p>To user this application: <ol> - <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the Qtopia launcher. + <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the TQtopia launcher. <li>Read the label. <li>Press the button. <li>Read the source code provided. </ol> -Now you know how to make a Qtopia application! +Now you know how to make a TQtopia application! diff --git a/languages/cpp/app_templates/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui index 17d6bc20..76e7d49f 100644 --- a/languages/cpp/app_templates/qtopia4app/examplebase.ui +++ b/languages/cpp/app_templates/qtopia4app/examplebase.ui @@ -3,7 +3,7 @@ <comment></comment> <exportmacro></exportmacro> <class>%{APPNAME}Base</class> - <widget class="QWidget" name="%{APPNAME}Base" > + <widget class="TQWidget" name="%{APPNAME}Base" > <property name="geometry" > <rect> <x>0</x> @@ -15,7 +15,7 @@ <property name="windowTitle" > <string>%{APPNAME}</string> </property> - <layout class="QVBoxLayout" > + <tqlayout class="TQVBoxLayout" > <property name="margin" > <number>11</number> </property> @@ -23,7 +23,7 @@ <number>6</number> </property> <item> - <widget class="QLabel" name="TextLabel1" > + <widget class="TQLabel" name="TextLabel1" > <property name="text" > <string>This is just an %{APPNAME}. It doesn't do anything interesting at all.</string> </property> @@ -33,12 +33,12 @@ </widget> </item> <item> - <widget class="QPushButton" name="quit" > + <widget class="TQPushButton" name="quit" > <property name="text" > <string>Quit</string> </property> </widget> </item> - </layout> + </tqlayout> </widget> </ui> diff --git a/languages/cpp/app_templates/qtopia4app/main.cpp b/languages/cpp/app_templates/qtopia4app/main.cpp index 43dbb4ac..b4ccc5ca 100644 --- a/languages/cpp/app_templates/qtopia4app/main.cpp +++ b/languages/cpp/app_templates/qtopia4app/main.cpp @@ -1,7 +1,7 @@ #include "%{APPNAMELC}.h" -#include <qtopia/qtopiaapplication.h> +#include <tqtopia/tqtopiaapplication.h> -QTOPIA_ADD_APPLICATION("%{APPNAMELC}", %{APPNAME}) -QTOPIA_MAIN +TQTOPIA_ADD_APPLICATION("%{APPNAMELC}", %{APPNAME}) +TQTOPIA_MAIN diff --git a/languages/cpp/app_templates/qtopiaapp/example.control b/languages/cpp/app_templates/qtopiaapp/example.control index d04f87ec..666968a3 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.control +++ b/languages/cpp/app_templates/qtopiaapp/example.control @@ -7,5 +7,5 @@ Arch: $DEVICE_ARCH Version: 1.0.0 License: Public Domain Description: %{APPNAME} program - An %{APPNAMELC} program for the Qtopia environment. + An %{APPNAMELC} program for the TQtopia environment. Does nothing interesting. diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index a849977d..85082508 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -3,11 +3,11 @@ #include <tqpushbutton.h> /* - * Constructs a %{APPNAME} which is a child of 'parent', with the + * Constructs a %{APPNAME} which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) - : %{APPNAME}Base( parent, name, fl ) +%{APPNAME}::%{APPNAME}( TQWidget* tqparent, const char* name, WFlags fl ) + : %{APPNAME}Base( tqparent, name, fl ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } @@ -17,7 +17,7 @@ */ %{APPNAME}::~%{APPNAME}() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h index 42dfc2dd..64abf97c 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.h +++ b/languages/cpp/app_templates/qtopiaapp/example.h @@ -6,9 +6,10 @@ class %{APPNAME} : public %{APPNAME}Base { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/qtopiaapp/example.html b/languages/cpp/app_templates/qtopiaapp/example.html index 279a6106..9bcae99d 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.html +++ b/languages/cpp/app_templates/qtopiaapp/example.html @@ -6,10 +6,10 @@ <p>To user this application: <ol> - <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the Qtopia launcher. + <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the TQtopia launcher. <li>Read the label. <li>Press the button. <li>Read the source code provided. </ol> -Now you know how to make a Qtopia application! +Now you know how to make a TQtopia application! diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui index b6b81b11..1243c341 100644 --- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui +++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui @@ -7,7 +7,7 @@ <cstring>%{APPNAME}Base</cstring> </property> <property stdset="1"> - <name>geometry</name> + <name>tqgeometry</name> <rect> <x>0</x> <y>0</y> @@ -45,5 +45,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/qtopiaapp/main.cpp b/languages/cpp/app_templates/qtopiaapp/main.cpp index 0311a32e..ce7161b1 100644 --- a/languages/cpp/app_templates/qtopiaapp/main.cpp +++ b/languages/cpp/app_templates/qtopiaapp/main.cpp @@ -1,10 +1,10 @@ #include "%{APPNAMELC}.h" -#include <qpe/qpeapplication.h> +#include <tqpe/tqpeapplication.h> int main( int argc, char ** argv ) { - QPEApplication a( argc, argv ); + TQPEApplication a( argc, argv ); %{APPNAME} mw; a.showMainWidget( &mw ); diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp index a6ef1a2b..4c9d63d1 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -40,8 +40,8 @@ AST* findNodeAt( AST* node, int line, int column ) ( line < endLine || ( line == endLine && column < endColumn ) ) ) { - TQPtrList<AST> children = node->children(); - TQPtrListIterator<AST> it( children ); + TQPtrList<AST> tqchildren = node->tqchildren(); + TQPtrListIterator<AST> it( tqchildren ); while ( it.current() ) { AST * a = it.current(); @@ -63,8 +63,8 @@ void scopeOfNode( AST* ast, TQStringList& scope ) if ( !ast ) return ; - if ( ast->parent() ) - scopeOfNode( ast->parent(), scope ); + if ( ast->tqparent() ) + scopeOfNode( ast->tqparent(), scope ); TQString s; switch ( ast->nodeType() ) @@ -73,7 +73,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) if ( ( ( ClassSpecifierAST* ) ast ) ->name() ) { s = ( ( ClassSpecifierAST* ) ast ) ->name() ->text(); - s = s.isEmpty() ? TQString::fromLatin1( "<unnamed>" ) : s; + s = s.isEmpty() ? TQString::tqfromLatin1( "<unnamed>" ) : s; scope.push_back( s ); } break; @@ -81,7 +81,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) case NodeType_Namespace: { AST* namespaceName = ( ( NamespaceAST* ) ast ) ->namespaceName(); - s = namespaceName ? namespaceName->text() : TQString::fromLatin1( "<unnamed>" ); + s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1( "<unnamed>" ); scope.push_back( s ); } break; @@ -116,15 +116,15 @@ void scopeOfNode( AST* ast, TQStringList& scope ) TQString typeSpecToString( TypeSpecifierAST* typeSpec ) /// @todo remove { if ( !typeSpec ) - return TQString::null; + return TQString(); - return typeSpec->text().replace( TQRegExp( " :: " ), "::" ); + return typeSpec->text().tqreplace( TQRegExp( " :: " ), "::" ); } TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, bool skipPtrOp ) { if ( !declarator ) - return TQString::null; + return TQString(); TQString text; @@ -141,7 +141,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += scope; if ( declarator->subDeclarator() ) - text += TQString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::fromLatin1( ")" ); + text += TQString::tqfromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::tqfromLatin1( ")" ); if ( declarator->declaratorId() ) text += declarator->declaratorId() ->text(); @@ -185,6 +185,6 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += " const"; } - return text.replace( TQRegExp( " :: " ), "::" ).simplifyWhiteSpace(); + return text.tqreplace( 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 7e6d44e3..a960abad 100644 --- a/languages/cpp/ast_utils.h +++ b/languages/cpp/ast_utils.h @@ -27,7 +27,7 @@ namespace KTextEditor AST* findNodeAt( AST* unit, int line, int column ); void scopeOfNode( AST* ast, TQStringList& ); TQString typeSpecToString( TypeSpecifierAST* typeSpec ); -TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString::null, bool skipPtrOp = false ); +TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString(), 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 d3f9c2ee..4e22dcc7 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -53,7 +53,7 @@ private: class KDevSourceProvider: public SourceProvider { public: - //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) + //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 TQApplication-mutex and tries to lock the given mutex, while the thread that calls contents(..) and holds the given mutex and tries to lock the TQApplication-mutex, cannot happen) KDevSourceProvider( CppSupportPart* cppSupport, TQMutex& deadlock ) : m_cppSupport( cppSupport ), m_readFromDisk( false ), @@ -71,7 +71,7 @@ public: virtual TQString contents( const TQString& fileName ) { - TQString contents = TQString::null; + TQString contents = TQString(); if ( !m_readFromDisk ) { @@ -105,7 +105,7 @@ public: //kdDebug(9007) << "-------> kapp unlocked" << endl; } - if( m_readFromDisk || contents == TQString::null ) + if( m_readFromDisk || contents == TQString() ) { TQFile f( fileName ); if ( f.open( IO_ReadOnly ) ) @@ -149,7 +149,7 @@ typedef std::string SafeString; class SynchronizedFileList { - typedef std::list< QPair<SafeString, bool> > ListType; + typedef std::list< TQPair<SafeString, bool> > ListType; public: SynchronizedFileList() {} @@ -166,7 +166,7 @@ public: return m_fileList.size(); } - QPair<SafeString, bool> front() const + TQPair<SafeString, bool> front() const { TQMutexLocker locker( &m_mutex ); return m_fileList.front(); @@ -182,14 +182,14 @@ public: { SafeString s( fileName.ascii() ); TQMutexLocker locker( &m_mutex ); - m_fileList.push_front( qMakePair( s, readFromDisk ) ); + m_fileList.push_front( tqMakePair( s, readFromDisk ) ); } void push_back( const TQString& fileName, bool readFromDisk = false ) { SafeString s( fileName.ascii() ); TQMutexLocker locker( &m_mutex ); - m_fileList.push_back( qMakePair( s, readFromDisk ) ); + m_fileList.push_back( tqMakePair( s, readFromDisk ) ); } void pop_front() @@ -212,15 +212,15 @@ public: return c; } - QPair<SafeString, bool> takeFront() + TQPair<SafeString, bool> takeFront() { TQMutexLocker locker( &m_mutex ); - QPair<SafeString, bool> ret = m_fileList.front(); + TQPair<SafeString, bool> ret = m_fileList.front(); m_fileList.pop_front(); return ret; } - bool contains( const TQString& fileName ) const + bool tqcontains( const TQString& fileName ) const { TQMutexLocker locker( &m_mutex ); ListType::const_iterator it = m_fileList.begin(); @@ -283,7 +283,7 @@ void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk ) TQString fn = deepCopy( fileName ); //bool added = false; - /*if ( !m_fileList->contains( fn ) ) + /*if ( !m_fileList->tqcontains( fn ) ) { m_fileList->push_back( fn, readFromDisk ); added = true; @@ -299,7 +299,7 @@ void BackgroundParser::addFileFront( const TQString& fileName, bool readFromDisk TQString fn = deepCopy( fileName ); bool added = false; - /*if ( m_fileList->contains( fn ) ) + /*if ( m_fileList->tqcontains( fn ) ) m_fileList->remove( fn );*/ m_fileList->push_front( fn, readFromDisk ); @@ -387,15 +387,15 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { ParsedFilePointer translationUnitUnsafe = m_driver->takeTranslationUnit( file.fileName() ); //now file and translationUnitUnsafe are the same 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 + //Since the lexer-cache keeps many TQStrings 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) TQMemArray<char> data; { - TQDataStream stream( data, IO_WriteOnly ); + TQDataStream stream( TQByteArray(data), IO_WriteOnly ); translationUnitUnsafe->write( stream ); } { - TQDataStream stream( data, IO_ReadOnly ); + TQDataStream stream( TQByteArray(data), IO_ReadOnly ); translationUnit = new ParsedFile( stream ); } @@ -410,7 +410,7 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { static_cast<KDevSourceProvider*>( m_driver->sourceProvider() ) ->setReadFromDisk( false ); - if ( m_unitDict.find( file.fileName() ) != m_unitDict.end() ) + if ( m_unitDict.tqfind( file.fileName() ) != m_unitDict.end() ) { Unit * u = m_unitDict[ file.fileName() ]; m_unitDict.remove( file.fileName() ); @@ -422,7 +422,7 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { KApplication::postEvent( m_cppSupport, new FileParsedEvent( file.fileName(), unit->problems, m_readFromDisk ) ); - m_currentFile = TQString::null; + m_currentFile = TQString(); if ( m_fileList->isEmpty() ) m_isEmpty.wakeAll(); @@ -430,12 +430,12 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { Unit* BackgroundParser::findUnit( const TQString& fileName ) { - TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName ); + TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName ); return it != m_unitDict.end() ? *it : 0; } bool BackgroundParser::hasTranslationUnit( const TQString& fileName ) { - TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName ); + TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName ); return it != m_unitDict.end(); } @@ -526,7 +526,7 @@ void BackgroundParser::run() if ( m_close ) break; - QPair<SafeString, bool> entry = m_fileList->takeFront(); + TQPair<SafeString, bool> entry = m_fileList->takeFront(); TQString fileName = entry.first.c_str(); bool readFromDisk = entry.second; m_currentFile = deepCopy(fileName); @@ -534,7 +534,7 @@ void BackgroundParser::run() ( void ) parseFile( fileName, readFromDisk, true ); - m_currentFile = TQString::null; + m_currentFile = TQString(); } kdDebug( 9007 ) << "!!!!!!!!!!!!!!!!!! BG PARSER DESTROYED !!!!!!!!!!!!" << endl; diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h index 6bbec3fc..f3cd86fd 100644 --- a/languages/cpp/backgroundparser.h +++ b/languages/cpp/backgroundparser.h @@ -44,7 +44,7 @@ protected: void operator = ( const Unit& source ); }; -class BackgroundParser: public QThread +class BackgroundParser: public TQThread { public: BackgroundParser( CppSupportPart*, TQWaitCondition* consumed ); diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 44ce91c2..f3400a28 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -60,8 +60,8 @@ using namespace std; -CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const char* name ) - : CCConfigWidgetBase( parent, name ) +CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* tqparent, const char* name ) + : CCConfigWidgetBase( tqparent, name ) { m_pPart = part; connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), @@ -70,12 +70,12 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const ch this, TQT_SLOT( catalogUnregistered( Catalog* ) ) ); connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(isValidQtDir(const TQString &))); + this, TQT_SLOT(isValidTQtDir(const TQString &))); connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(isValidQtDir(const TQString &))); + this, TQT_SLOT(isValidTQtDir(const TQString &))); initGeneralTab( ); - initQtTab(); + initTQtTab(); initCodeCompletionTab( ); initGetterSetterTab( ); initSplitTab(); @@ -104,7 +104,7 @@ CCConfigWidget::~CCConfigWidget( ) void CCConfigWidget::accept( ) { saveFileTemplatesTab(); - saveQtTab(); + saveTQtTab(); saveCodeCompletionTab(); saveGetterSetterTab(); saveSplitTab(); @@ -230,7 +230,7 @@ void CCConfigWidget::slotRemovePCS() return ; TQString db = advancedOptions->selectedItem() ->text( 0 ); - TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db ); + TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).tqarg( db ); KStandardDirs *dirs = m_pPart->instance() ->dirs(); TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db"; @@ -314,7 +314,7 @@ void CCConfigWidget::slotGetterSetterValuesChanged( ) m_edtExampleSet->setPaletteForegroundColor( TQColor( "black" ) ); } - TQStringList prefixes = TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ); + TQStringList prefixes = TQStringList::split( ",", m_edtRemovePrefix->text().tqreplace( " ", "" ) ); unsigned int len = 0; TQStringList::ConstIterator theend = prefixes.end(); for ( TQStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) @@ -355,7 +355,7 @@ void CCConfigWidget::saveGetterSetterTab( ) config->setPrefixGet( m_edtGet->text() ); config->setPrefixSet( m_edtSet->text() ); - config->setPrefixVariable( TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ) ); + config->setPrefixVariable( TQStringList::split( ",", m_edtRemovePrefix->text().tqreplace( " ", "" ) ) ); config->setParameterName( m_edtParameterName->text() ); config->store(); } @@ -393,11 +393,11 @@ void CCConfigWidget::saveSplitTab( ) config->store(); } -void CCConfigWidget::initQtTab() +void CCConfigWidget::initTQtTab() { m_qtDir->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly); - QtBuildConfig* c = m_pPart->qtBuildConfig(); + TQtBuildConfig* c = m_pPart->qtBuildConfig(); c->init(); m_qtUsed->setChecked( c->isUsed() ); @@ -435,7 +435,7 @@ void CCConfigWidget::initQtTab() m_qtStyleVersion3->setChecked( true ); } m_qtDir->setURL( c->root() ); - isValidQtDir(m_qtDir->url()); + isValidTQtDir(m_qtDir->url()); m_qmakePath->setURL( c->qmakePath() ); isExecutable( m_qmakePath->url() ); m_designerPath->setURL( c->designerPath() ); @@ -460,7 +460,7 @@ bool CCConfigWidget::isExecutable( const TQString& path ) return ( fi.exists() && fi.isExecutable() ); } -void CCConfigWidget::isQMakeExecutable( const TQString& path ) +void CCConfigWidget::isTQMakeExecutable( const TQString& path ) { if( !isExecutable( path ) ) { @@ -482,9 +482,9 @@ void CCConfigWidget::isDesignerExecutable( const TQString& path ) } } -void CCConfigWidget::saveQtTab() +void CCConfigWidget::saveTQtTab() { - QtBuildConfig* c = m_pPart->qtBuildConfig(); + TQtBuildConfig* c = m_pPart->qtBuildConfig(); c->setUsed( m_qtUsed->isChecked() ); if( m_versionQt4->isChecked() ) @@ -503,7 +503,7 @@ void CCConfigWidget::saveQtTab() c->setIncludeStyle( 3 ); } c->setRoot( m_qtDir->url() ); - c->setQMakePath( m_qmakePath->url() ); + c->setTQMakePath( m_qmakePath->url() ); c->setDesignerPath( m_designerPath->url() ); if( m_kdevembedded->isChecked() ) { @@ -519,7 +519,7 @@ void CCConfigWidget::saveQtTab() c->store(); } -void CCConfigWidget::isValidQtDir( const TQString &dir ) +void CCConfigWidget::isValidTQtDir( const TQString &dir ) { TQFileInfo inc( dir + TQString( TQChar( TQDir::separator() ) )+ "include"+TQString( TQChar( TQDir::separator() ) )+ @@ -533,7 +533,7 @@ void CCConfigWidget::isValidQtDir( const TQString &dir ) } } -void CCConfigWidget::toggleQtVersion( bool ) +void CCConfigWidget::toggleTQtVersion( bool ) { if ( m_versionQt3->isChecked() ) { @@ -551,17 +551,17 @@ void CCConfigWidget::toggleQtVersion( bool ) m_kdevexternal->setEnabled( false ); pluginPaths->setEnabled( true ); } - isValidQtDir( m_qtDir->url() ); - isQMakeExecutable( m_qmakePath->url() ); + isValidTQtDir( m_qtDir->url() ); + isTQMakeExecutable( m_qmakePath->url() ); isDesignerExecutable( m_designerPath->url() ); } void CCConfigWidget::openPluginPaths() { kdDebug(9024) << "Plugin paths opened" << endl; - QtBuildConfig* c = m_pPart->qtBuildConfig(); + TQtBuildConfig* c = m_pPart->qtBuildConfig(); KDialog d( this ); - TQVBoxLayout* mainlayout = new TQVBoxLayout( &d ); + TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d ); connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept())); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d ); @@ -571,13 +571,13 @@ void CCConfigWidget::openPluginPaths() btns->addWidget(ok); btns->addWidget(cancel); - d.setCaption( i18n( "Edit Qt4 Designer Plugin Paths" ) ); + d.setCaption( i18n( "Edit TQt4 Designer Plugin Paths" ) ); KURLRequester * req = new KURLRequester( &d ); req->setMode( KFile::Directory ); KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d ); p->insertStringList( c->designerPluginPaths() ); - mainlayout->addWidget( p ); - mainlayout->addLayout( btns ); + maintqlayout->addWidget( p ); + maintqlayout->addLayout( btns ); d.resize( 450, 250 ); if( d.exec() == TQDialog::Accepted) { diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h index ea6c6d4a..3cf2f89b 100644 --- a/languages/cpp/ccconfigwidget.h +++ b/languages/cpp/ccconfigwidget.h @@ -23,9 +23,10 @@ class KEditListBox; class CCConfigWidget : public CCConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - CCConfigWidget( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); + CCConfigWidget( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0 ); virtual ~CCConfigWidget( ); public slots: @@ -39,10 +40,10 @@ protected slots: private slots: void catalogRegistered( Catalog* c ); void catalogUnregistered( Catalog* c ); - void isValidQtDir( const TQString & ); + void isValidTQtDir( const TQString & ); void isDesignerExecutable( const TQString& ); - void isQMakeExecutable( const TQString& ); - void toggleQtVersion( bool ); + void isTQMakeExecutable( const TQString& ); + void toggleTQtVersion( bool ); void openPluginPaths( ); private: @@ -51,8 +52,8 @@ private: void initGeneralTab(); void saveFileTemplatesTab(); - void initQtTab(); - void saveQtTab(); + void initTQtTab(); + void saveTQtTab(); void initCodeCompletionTab(); void saveCodeCompletionTab(); diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index b7efc7d0..5b7e5aa5 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CCConfigWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CCConfigWidgetBase</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>cpp_options</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>codeCompletionPage</cstring> </property> @@ -34,15 +34,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -53,7 +53,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkAutomaticCodeCompletion</cstring> </property> @@ -75,9 +75,9 @@ <string>Offer options to complete what you are typing.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -116,7 +116,7 @@ <string>How long after a key press to offer suggestions</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -134,7 +134,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkListGlobalItems</cstring> </property> @@ -161,7 +161,7 @@ This may bloat the completion-list and create a significant delay.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkCompleteReturnType</cstring> </property> @@ -183,7 +183,7 @@ of member-functions) in the completion-box.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkCompleteArgumentType</cstring> </property> @@ -203,7 +203,7 @@ completion-box.</string> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8_2</cstring> </property> @@ -214,7 +214,7 @@ completion-box.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkAutomaticArgumentsHint</cstring> </property> @@ -225,9 +225,9 @@ completion-box.</string> <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -243,7 +243,7 @@ completion-box.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -263,7 +263,7 @@ completion-box.</string> </sizepolicy> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -281,7 +281,7 @@ completion-box.</string> </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkShowCommentInArgumentHint</cstring> </property> @@ -297,15 +297,15 @@ argument hint</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup6</cstring> </property> @@ -316,7 +316,7 @@ argument hint</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioButton13</cstring> </property> @@ -327,7 +327,7 @@ argument hint</string> <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>checkParseMissingHeaders</cstring> </property> @@ -341,7 +341,7 @@ into a special completion-database. To reparse the headers delete the database and reopen the project.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>checkPreprocessIncludedHeaders</cstring> </property> @@ -359,7 +359,7 @@ Note: Parsing may become very slow when this is enabled </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -373,7 +373,7 @@ Note: Parsing may become very slow when this is enabled <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Column 1</string> @@ -395,9 +395,9 @@ Note: Parsing may become very slow when this is enabled <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -413,14 +413,14 @@ Note: Parsing may become very slow when this is enabled <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>newPCSButton</cstring> </property> @@ -431,7 +431,7 @@ Note: Parsing may become very slow when this is enabled <string>Click to start the Code Completion database creation wizard.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removePCSButton</cstring> </property> @@ -449,7 +449,7 @@ Note: Parsing may become very slow when this is enabled <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -462,7 +462,7 @@ Note: Parsing may become very slow when this is enabled </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox9_2</cstring> </property> @@ -473,7 +473,7 @@ Note: Parsing may become very slow when this is enabled <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkResolveIncludePaths</cstring> </property> @@ -496,7 +496,7 @@ This also works with cmake, and maybe some other build-systems that build on mak The project needs to be compiled or at least configured before this system may work.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkShowTypeEvaluationInStatusBar</cstring> </property> @@ -530,7 +530,7 @@ example: "std<<_GLIBCXX_STD;NewNamespaceName=OldNamespaceName; << So if they were one("a=b" is equivalent to "a<<b;b<<a")</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_6</cstring> </property> @@ -538,7 +538,7 @@ if they were one("a=b" is equivalent to "a<<b;b<<a")</string> <string>Custom include paths:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -558,7 +558,7 @@ if they were one("a=b" is equivalent to "a<<b;b<<a")</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -567,7 +567,7 @@ if they were one("a=b" is equivalent to "a<<b;b<<a")</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>navigationTab</cstring> </property> @@ -578,7 +578,7 @@ if they were one("a=b" is equivalent to "a<<b;b<<a")</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox12</cstring> </property> @@ -589,7 +589,7 @@ if they were one("a=b" is equivalent to "a<<b;b<<a")</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_splitEnable</cstring> </property> @@ -603,15 +603,15 @@ if they were one("a=b" is equivalent to "a<<b;b<<a")</string> <string>Check to have header and source appear in the same page.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_splitSync</cstring> </property> @@ -632,7 +632,7 @@ navigate the header and vice versa</string> </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_splitOrientationBox</cstring> </property> @@ -640,7 +640,7 @@ navigate the header and vice versa</string> <bool>false</bool> </property> <property name="title"> - <string>Orientation</string> + <string>Qt::Orientation</string> </property> <property name="exclusive"> <bool>true</bool> @@ -652,7 +652,7 @@ navigate the header and vice versa</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_splitVertical</cstring> </property> @@ -666,7 +666,7 @@ navigate the header and vice versa</string> <string>Select this if your project is using Qt version 3.x.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_splitHorizontal</cstring> </property> @@ -691,14 +691,14 @@ navigate the header and vice versa</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>400</height> </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox21</cstring> </property> @@ -709,7 +709,7 @@ navigate the header and vice versa</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_switchShouldMatch</cstring> </property> @@ -732,7 +732,7 @@ cursor with the matching declaration/definition. </string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_showContextMenuExplosion</cstring> </property> @@ -754,7 +754,7 @@ for the current file and its matching header/implementation file.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox18</cstring> </property> @@ -776,7 +776,7 @@ plugin enabled to have use all options.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>classWizardPage</cstring> </property> @@ -787,7 +787,7 @@ plugin enabled to have use all options.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>options</cstring> </property> @@ -819,7 +819,7 @@ plugin enabled to have use all options.</string> <cstring>implementation_suffix</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -830,7 +830,7 @@ plugin enabled to have use all options.</string> <cstring>interface_suffix</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -853,7 +853,7 @@ plugin enabled to have use all options.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>337</height> @@ -862,7 +862,7 @@ plugin enabled to have use all options.</string> </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>qtPage</cstring> </property> @@ -873,7 +873,7 @@ plugin enabled to have use all options.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_qtUsed</cstring> </property> @@ -881,7 +881,7 @@ plugin enabled to have use all options.</string> <string>Enable Qt opt&ions</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_qtVersionDirectoryBox</cstring> </property> @@ -903,15 +903,15 @@ This option only applies to QMake projects.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_versionQt3</cstring> </property> @@ -928,7 +928,7 @@ This option only applies to QMake projects.</string> <string>Select this if your project is using Qt version 3.x.<br>When this is changed the project needs to be closed and re-opened.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_versionQt4</cstring> </property> @@ -942,14 +942,14 @@ This option only applies to QMake projects.</string> <string>Select this if your project is using Qt version 4.x.<br>When this is changed the project needs to be closed and re-opened.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> </property> <property name="text"> <string>(After changing the project needs to be re-opened)</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -963,7 +963,7 @@ This option only applies to QMake projects.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>470</width> <height>20</height> @@ -972,15 +972,15 @@ This option only applies to QMake projects.</string> </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_txtQtDir</cstring> </property> @@ -1004,15 +1004,15 @@ This option only applies to QMake projects.</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_txtQMake</cstring> </property> @@ -1032,7 +1032,7 @@ This option only applies to QMake projects.</string> </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_qtStyleBox</cstring> </property> @@ -1052,7 +1052,7 @@ This option only applies to QMake projects.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_qtStyleVersion3</cstring> </property> @@ -1069,7 +1069,7 @@ This option only applies to QMake projects.</string> <string>Select this if your project is using include style as known from Qt version 3.x.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_qtStyleVersion4</cstring> </property> @@ -1085,7 +1085,7 @@ This option only applies to QMake projects.</string> </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_designerBox</cstring> </property> @@ -1105,7 +1105,7 @@ This option only applies to QMake projects.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_kdevembedded</cstring> </property> @@ -1119,7 +1119,7 @@ This option only applies to QMake projects.</string> <string>KDevelop comes with its own UI designer that can either be embedded or be run as a separate program. Check this button if you wish to integrate the UI designer into KDevelop.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_kdevexternal</cstring> </property> @@ -1133,7 +1133,7 @@ This option only applies to QMake projects.</string> <string>KDevelop comes with its own UI designer that can either be embedded or be run as a separate program. Check this button if you wish to run KDevelop's UI designer as a separate program.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_qtdesigner</cstring> </property> @@ -1147,15 +1147,15 @@ This option only applies to QMake projects.</string> <string>Check this button if you wish to use Qt Designer rather than KDevelop's integrated designer.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_txtDesigner</cstring> </property> @@ -1176,15 +1176,15 @@ This option only applies to QMake projects.</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -1217,7 +1217,7 @@ This option only applies to QMake projects.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -1226,7 +1226,7 @@ This option only applies to QMake projects.</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>accessorPage</cstring> </property> @@ -1237,7 +1237,7 @@ This option only applies to QMake projects.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -1248,15 +1248,15 @@ This option only applies to QMake projects.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5_2</cstring> + <cstring>tqlayout5_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_lblVariableName</cstring> </property> @@ -1282,7 +1282,7 @@ This option only applies to QMake projects.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -1313,7 +1313,7 @@ This option only applies to QMake projects.</string> <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -1321,7 +1321,7 @@ This option only applies to QMake projects.</string> <string>Get method:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -1331,7 +1331,7 @@ This option only applies to QMake projects.</string> </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox9</cstring> </property> @@ -1367,7 +1367,7 @@ right mouse button context menu only when you right click on a variable in a header file.</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_lblGet</cstring> </property> @@ -1393,7 +1393,7 @@ right mouse button context menu only when you right click on a variable in a header file.</string> </property> </widget> - <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>m_lblSet</cstring> </property> @@ -1409,7 +1409,7 @@ you right click on a variable in a header file.</string> <string>m_</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_lblRemovePrefix</cstring> </property> @@ -1435,14 +1435,14 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>87</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="2" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>m_lblParameterName</cstring> </property> @@ -1460,7 +1460,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>87</width> <height>20</height> @@ -1477,7 +1477,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>92</width> <height>20</height> @@ -1494,7 +1494,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>92</width> <height>20</height> @@ -1513,7 +1513,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>91</height> @@ -1758,7 +1758,7 @@ you right click on a variable in a header file.</string> <include location="global" impldecl="in implementation">kurlrequester.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">implementationFile()</slot> <slot access="protected">interfaceFile()</slot> <slot access="protected">slotAddPPPath()</slot> @@ -1779,9 +1779,9 @@ you right click on a variable in a header file.</string> <slot>isQMakeExecutable(const QString&)</slot> <slot>isValidQtDir(const QString&)</slot> <slot>openPluginPaths()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index 70ad5d10..963faa71 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -21,8 +21,8 @@ #include "cppsupportfactory.h" #include "classgeneratorconfig.h" -ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* parent, const char* name, WFlags fl ) - : ClassGeneratorConfigBase( parent, name, fl ) +ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* tqparent, const char* name, WFlags fl ) + : ClassGeneratorConfigBase( tqparent, name, fl ) { readConfig(); currTemplate = &cppHeaderText; @@ -34,8 +34,8 @@ ClassGeneratorConfig::ClassGeneratorConfig( TQString v_cppHeaderText, TQString v TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - TQWidget* parent, const char* name, WFlags fl ) - : ClassGeneratorConfigBase( parent, name, fl ), + TQWidget* tqparent, const char* name, WFlags fl ) + : ClassGeneratorConfigBase( tqparent, name, fl ), cppHeaderText( v_cppHeaderText ), cppSourceText( v_cppSourceText ), objcHeaderText( v_objcHeaderText ), objcSourceText( v_objcSourceText ), gtkHeaderText( v_gtkHeaderText ), gtkSourceText( v_gtkSourceText ) diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h index 783934d4..f9a82752 100644 --- a/languages/cpp/classgeneratorconfig.h +++ b/languages/cpp/classgeneratorconfig.h @@ -17,18 +17,19 @@ class ClassGeneratorConfig : public ClassGeneratorConfigBase { Q_OBJECT + TQ_OBJECT public: enum NameCase { LowerCase, UpperCase, SameAsClassCase, SameAsFileCase }; - ClassGeneratorConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ClassGeneratorConfig( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); 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, - TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~ClassGeneratorConfig(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui index 566e9eb2..1bb25fe6 100644 --- a/languages/cpp/classgeneratorconfigbase.ui +++ b/languages/cpp/classgeneratorconfigbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ClassGeneratorConfigBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ClassGeneratorConfigBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox7_2</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="0"> + <widget class="TQComboBox" row="0" column="0"> <item> <property name="text"> <string>Cpp Header</string> @@ -65,14 +65,14 @@ <cstring>templatename_box</cstring> </property> </widget> - <widget class="QTextEdit" row="1" column="0"> + <widget class="TQTextEdit" row="1" column="0"> <property name="name"> <cstring>template_edit</cstring> </property> </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -91,7 +91,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -102,7 +102,7 @@ <cstring>defcase_box</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -113,7 +113,7 @@ <cstring>filecase_box</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <item> <property name="text"> <string>Lowercase</string> @@ -133,7 +133,7 @@ <cstring>filecase_box</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Lowercase</string> @@ -161,7 +161,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="2"> + <widget class="TQComboBox" row="1" column="2"> <item> <property name="text"> <string>Lowercase</string> @@ -181,7 +181,7 @@ <cstring>supercase_box</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -194,7 +194,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox9</cstring> </property> @@ -205,7 +205,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>author_box</cstring> </property> @@ -213,7 +213,7 @@ <string>Include &author name in class documentation</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>doc_box</cstring> </property> @@ -223,7 +223,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>reformat_box</cstring> </property> @@ -253,9 +253,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">templateTypeChanged(int type)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index e71f3a66..3533dd73 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -30,7 +30,7 @@ my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList ) e.text + " " + e.prefix + " " + e.postfix + " "; - if ( map.find( key ) == map.end() ) + if ( map.tqfind( key ) == map.end() ) { map[ key ] = TRUE; l << e; @@ -265,7 +265,7 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC { TQString argName = argumentNames[ i ]; if ( !argName.isEmpty() ) - signature += TQString::fromLatin1( " " ) + argName; + signature += TQString::tqfromLatin1( " " ) + argName; } @@ -286,12 +286,12 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC if ( completionMode == CppCodeCompletion::VirtualDeclCompletion ) { entry.text += entry.postfix + ";"; - entry.postfix = TQString::null; + entry.postfix = TQString(); } else if ( completionMode != CppCodeCompletion::NormalCompletion ) { entry.text += entry.postfix; - entry.postfix = TQString::null; + entry.postfix = TQString(); } TQString comment = tag.attribute( "description" ).toString(); diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h index 2c5f4cb2..e7e2c649 100644 --- a/languages/cpp/codeinformationrepository.h +++ b/languages/cpp/codeinformationrepository.h @@ -20,7 +20,7 @@ struct TypeProcessor { virtual TQString processType( const TQString& type ) = 0; - virtual TQString parentType() = 0; + virtual TQString tqparentType() = 0; }; class KDevCodeRepository; diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index 8f632d69..3d7ff152 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -26,10 +26,10 @@ K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory<GccOptionsPlugin>( "kdevgccoptions" ) ) -class GeneralTab : public QWidget +class GeneralTab : public TQWidget { public: - GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); + GeneralTab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); ~GeneralTab(); void readFlags( TQStringList *str ); @@ -40,10 +40,10 @@ private: }; -class OptimizationTab : public QWidget +class OptimizationTab : public TQWidget { public: - OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); + OptimizationTab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); ~OptimizationTab(); void readFlags( TQStringList *str ); @@ -55,10 +55,10 @@ private: }; -class G77Tab : public QWidget +class G77Tab : public TQWidget { public: - G77Tab( TQWidget *parent = 0, const char *name = 0 ); + G77Tab( TQWidget *tqparent = 0, const char *name = 0 ); ~G77Tab(); void readFlags( TQStringList *str ); @@ -69,10 +69,10 @@ private: }; -class Warnings1Tab : public QWidget +class Warnings1Tab : public TQWidget { public: - Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); + Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); ~Warnings1Tab(); void readFlags( TQStringList *str ); @@ -84,10 +84,10 @@ private: }; -class Warnings2Tab : public QWidget +class Warnings2Tab : public TQWidget { public: - Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); + Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); ~Warnings2Tab(); void readFlags( TQStringList *str ); @@ -98,12 +98,12 @@ private: }; -GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), controller( new FlagCheckBoxController ) +GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - layout->setAutoAdd( true ); - layout->addSpacing( 10 ); + TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + tqlayout->setAutoAdd( true ); + tqlayout->addSpacing( 10 ); TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this ); new FlagCheckBox( output_group, controller, @@ -114,7 +114,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha "-save-temps", i18n( "Do not delete intermediate output like assembler files" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - layout->addSpacing( 10 ); + tqlayout->addSpacing( 10 ); TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); if ( type != GccOptionsPlugin::GPP ) @@ -142,7 +142,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha "-short-double", i18n( "Make 'double' the same as 'float'" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - layout->addStretch(); + tqlayout->addStretch(); } @@ -164,11 +164,11 @@ void GeneralTab::writeFlags( TQStringList *list ) } -OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { - TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - layout->setAutoAdd( true ); + TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + tqlayout->setAutoAdd( true ); TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this ); Odefault = new TQRadioButton( i18n( "Default" ), group ); @@ -211,7 +211,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, } TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - layout->addStretch(); + tqlayout->addStretch(); } @@ -224,21 +224,21 @@ void OptimizationTab::readFlags( TQStringList *list ) optBox->readFlags( list ); TQStringList::Iterator sli; - sli = list->find( "-O0" ); + sli = list->tqfind( "-O0" ); if ( sli != list->end() ) { O0->setChecked( true ); list->remove ( sli ); } - sli = list->find( "-O1" ); + sli = list->tqfind( "-O1" ); if ( sli != list->end() ) { O1->setChecked( true ); list->remove ( sli ); } - sli = list->find( "-O2" ); + sli = list->tqfind( "-O2" ); if ( sli != list->end() ) { O2->setChecked( true ); @@ -261,12 +261,12 @@ void OptimizationTab::writeFlags( TQStringList *list ) } -G77Tab::G77Tab( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), controller( new FlagCheckBoxController ) +G77Tab::G77Tab( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - layout->setAutoAdd( true ); - layout->addSpacing( 10 ); + TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + tqlayout->setAutoAdd( true ); + tqlayout->addSpacing( 10 ); TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this ); new FlagCheckBox( dialect_group, controller, @@ -283,7 +283,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name ) "-fonetrip", i18n( "DO loops are executed at least once" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - layout->addSpacing( 10 ); + tqlayout->addSpacing( 10 ); TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); new FlagCheckBox( codegen_group, controller, @@ -294,7 +294,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name ) "-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - layout->addStretch(); + tqlayout->addStretch(); } @@ -316,11 +316,11 @@ void G77Tab::writeFlags( TQStringList *list ) } -Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), controller( new FlagCheckBoxController ) +Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - layout->setAutoAdd( true ); + TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + tqlayout->setAutoAdd( true ); new FlagCheckBox( this, controller, "-w", i18n( "Inhibit all warnings" ) ); @@ -366,7 +366,7 @@ Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const new FlagListItem( wallBox, "-Wmissing-braces", i18n( "<qt>Warn if an aggregate or union initializer is not fully bracketed</qt>" ) ); new FlagListItem( wallBox, - "-Wparentheses", i18n( "<qt>Warn when parentheses are omitted in certain contexts</qt>" ) ); + "-Wtqparentheses", i18n( "<qt>Warn when tqparentheses are omitted in certain contexts</qt>" ) ); new FlagListItem( wallBox, "-Wsequence-point", i18n( "<qt>Warn about code that may have undefined semantics because of\n" "violations of sequence point rules in the C standard</qt>" ) ); @@ -414,11 +414,11 @@ void Warnings1Tab::writeFlags( TQStringList *list ) } -Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { - TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - layout->setAutoAdd( true ); + TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + tqlayout->setAutoAdd( true ); wrestBox = new FlagListBox( this ); @@ -438,7 +438,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const "qualifier from the target type</qt>" ) ); new FlagListItem( wrestBox, "-Wcast-align", i18n( "<qt>Warn whenever a pointer is cast such that the required\n" - "alignment of the target is increased</qt>" ) ); + "tqalignment of the target is increased</qt>" ) ); new FlagListItem( wrestBox, "-Wwrite-strings", i18n( "<qt>Warn when the address of a string constant is cast\n" "into a non-const <i>char *</i> pointer</qt>" ) ); @@ -463,7 +463,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const "deprecated by using the 'deprecated' attribute</qt>" ) ); new FlagListItem( wrestBox, "-Wpacked", i18n( "<qt>Warn if a structure is given the packed attribute, but the packed\n" - "attribute has no effect on the layout or size of the structure</qt>" ) ); + "attribute has no effect on the tqlayout or size of the structure</qt>" ) ); new FlagListItem( wrestBox, "-Wpadded", i18n( "<qt>Warn if padding is included in a structure, either to align an\n" "element of the structure or to align the whole structure</qt>" ) ); @@ -572,8 +572,8 @@ void Warnings2Tab::writeFlags( TQStringList *list ) // Last but not least... :-) -GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) - : KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, parent, name, true ) +GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) + : KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, tqparent, name, true ) { TQVBox * vbox; @@ -649,8 +649,8 @@ TQString GccOptionsDialog::flags() const } -GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : KDevCompilerOptions( parent, name ) +GccOptionsPlugin::GccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) + : KDevCompilerOptions( tqparent, name ) { gcctype = Unknown; @@ -683,16 +683,16 @@ TQString GccOptionsPlugin::captionForType( Type type ) case G77: return i18n( "GNU Fortran 77 Compiler Options" ); default: - return TQString::null; + return TQString(); } } -TQString GccOptionsPlugin::exec( TQWidget *parent, const TQString &flags ) +TQString GccOptionsPlugin::exec( TQWidget *tqparent, const TQString &flags ) { if ( gcctype == Unknown ) - return TQString::null; - GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, parent, "gcc options dialog" ); + return TQString(); + GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, tqparent, "gcc options dialog" ); TQString newFlags = flags; dlg->setFlags( flags ); if ( dlg->exec() == TQDialog::Accepted ) diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index e5144e01..0ac93c23 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -27,15 +27,16 @@ class Warnings2Tab; class GccOptionsPlugin : public KDevCompilerOptions { Q_OBJECT + TQ_OBJECT public: enum Type { GCC, GPP, G77, Unknown }; - GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ); + GccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~GccOptionsPlugin(); static TQString captionForType(Type type); - virtual TQString exec(TQWidget *parent, const TQString &flags); + virtual TQString exec(TQWidget *tqparent, const TQString &flags); private: Type gcctype; @@ -45,7 +46,7 @@ private: class GccOptionsDialog : public KDialogBase { public: - GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); + GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 ); ~GccOptionsDialog(); void setFlags(const TQString &flags); diff --git a/languages/cpp/computerecoverypoints.h b/languages/cpp/computerecoverypoints.h index 4e2056d5..a7cfaea5 100644 --- a/languages/cpp/computerecoverypoints.h +++ b/languages/cpp/computerecoverypoints.h @@ -31,7 +31,7 @@ static TQString toSimpleName( NameAST* name ) { if ( !name ) - return TQString::null; + return TQString(); TQString s; TQPtrList<ClassOrNamespaceNameAST> l = name->classOrNamespaceNameList(); diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui index 164d6693..6a2ab252 100644 --- a/languages/cpp/configproblemreporter.ui +++ b/languages/cpp/configproblemreporter.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigureProblemReporter</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigureProblemReporter</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3_2</cstring> </property> @@ -31,7 +31,7 @@ They will be displayed in the 'Problems' output view and as markers in the edito <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>problemReporterCheckbox</cstring> </property> @@ -41,7 +41,7 @@ They will be displayed in the 'Problems' output view and as markers in the edito </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -60,15 +60,15 @@ If disabled, the parser will typically only run when the file is saved.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>bgParserCheckbox</cstring> </property> @@ -76,7 +76,7 @@ If disabled, the parser will typically only run when the file is saved.</string> <string>Enable &background parsing</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>delayLabel</cstring> </property> @@ -91,13 +91,13 @@ If disabled, the parser will typically only run when the file is saved.</string> <property name="text"> <string>msec</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> </hbox> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>delaySlider</cstring> </property> @@ -125,7 +125,7 @@ If disabled, the parser will typically only run when the file is saved.</string> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -139,7 +139,7 @@ If disabled, the parser will typically only run when the file is saved.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>specialHeader</cstring> </property> @@ -176,14 +176,14 @@ If disabled, the parser will typically only run when the file is saved.</string> <variables> <variable>CppSupportPart* m_part;</variable> </variables> -<slots> +<Q_SLOTS> <slot>init()</slot> <slot>destroy()</slot> <slot>setPart( CppSupportPart * part )</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> <slot access="protected">setDelayLabel( int delay )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index 842e0c69..1931c66f 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ @@ -92,7 +92,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) void ConfigureProblemReporter::setDelayLabel( int delay ) { - delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) ); + delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) ); } // kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cpp_tags.h b/languages/cpp/cpp_tags.h index a82ac758..12a0199f 100644 --- a/languages/cpp/cpp_tags.h +++ b/languages/cpp/cpp_tags.h @@ -46,7 +46,7 @@ public: static TQString format( const Tag& tag ) { - return TQString::null; + return TQString(); } int access() const @@ -137,7 +137,7 @@ public: static TQString format( const Tag& tag ) { - return TQString::null; + return TQString(); } int access() const @@ -241,7 +241,7 @@ public: static TQString format( const Tag& tag ) { - return TQString::null; + return TQString(); } int access() const diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 266c3878..08f6aa1e 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -134,7 +134,7 @@ CppCodeCompletion* cppCompletionInstance = 0; //file global functions, must be before any "using namespace" TQString cleanForMenu( TQString txt ) { - return txt.replace( "&", "&&" ).replace( " ", " " ); + return txt.tqreplace( "&", "&&" ).tqreplace( " ", " " ); } TQString buildSignature( TypePointer currType ) { @@ -254,7 +254,7 @@ static TQValueList<ItemType> unique( const TQValueList<ItemType>& entryList ) { e.prefix + " " + e.text + " " + e.postfix + " " ).simplifyWhiteSpace().stripWhiteSpace(); - if ( map.find( key ) == map.end() ) { + if ( map.tqfind( key ) == map.end() ) { map[ key ] = TRUE; l << e; } @@ -269,7 +269,7 @@ static TQStringList unique( const TQStringList& entryList ) { TQStringList::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { TQString e = *it++; - if ( map.find( e ) == map.end() ) { + if ( map.tqfind( e ) == map.end() ) { map[ e ] = TRUE; l << e; } @@ -285,7 +285,7 @@ static TQStringList unique( const TQValueList<TQStringList>& entryList ) { while ( it != entryList.end() ) { TQStringList li = ( *it++ ); TQString e = li.join( "\n" ); - if ( map.find( e ) == map.end() ) { + if ( map.tqfind( e ) == map.end() ) { map[ e ] = TRUE; l += li; } @@ -348,7 +348,7 @@ struct PopupFillerHelpStruct { TQMap<TQString, TQPopupMenu*> m_namespacePopupCache; - void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { + void insertItem( TQPopupMenu* tqparent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); TQString memType = d.memberTypeToString(); @@ -356,13 +356,13 @@ struct PopupFillerHelpStruct { if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) memType = "enum"; - TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); + TQString txt = i18n( "Jump to %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); + int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } - void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { + void insertItem ( TQPopupMenu* tqparent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); TQString txt1, txt2; @@ -374,14 +374,14 @@ 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() ) { - TQPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); TQString scope = cm->scope().join("::"); - TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.find( scope ); + TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.tqfind( scope ); if( it != m_namespacePopupCache.end() ) { - parent->insertItem( "Imported Namespace " + scope, *it ); + tqparent->insertItem( "Imported Namespace " + scope, *it ); delete m; } else { - parent->insertItem( "Imported Namespace " + scope, m ); + tqparent->insertItem( "Imported Namespace " + scope, m ); insertItem( m, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); m_namespacePopupCache.insert( scope, m ); @@ -390,7 +390,7 @@ struct PopupFillerHelpStruct { SimpleTypeNamespace* cn = dynamic_cast<SimpleTypeNamespace*>( ( *it ).first.first.resolved().data() ); if( cn ) { TypePointer t = new SimpleTypeNamespace( cn ); //To avoid endless recursion, this needs to be done(the dynamic-cast above fails) - insertItem( parent, t->desc(), prefix ); + insertItem( tqparent, t->desc(), prefix ); } } } @@ -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() + TQString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. + insertItem( tqparent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. } } @@ -434,10 +434,10 @@ struct PopupFillerHelpStruct { if ( d.resolved() ) { if ( d.resolved() ->asFunction() ) { - txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) ); - txt2 = prefix + i18n( "Jump to definition of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) ); + txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) ); + txt2 = prefix + i18n( "Jump to definition of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) ); } else { - txt1 = prefix + i18n( "Jump to %1" ).arg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) ); + txt1 = prefix + i18n( "Jump to %1" ).tqarg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) ); } } else { if( !BuiltinTypes::isBuiltin( d ) ) { @@ -447,12 +447,12 @@ struct PopupFillerHelpStruct { } } - int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = tqparent->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, TQT_SLOT( popupDefinitionAction( int ) ) ); + int id2 = tqparent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } @@ -523,7 +523,7 @@ struct PopupClassViewFillerHelpStruct { return false; } - void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { + void insertItem( TQPopupMenu* tqparent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); FileDom f = receiver->m_pSupport->codeModel() ->fileByName( d.decl.file ); if ( !f ) @@ -536,13 +536,13 @@ struct PopupClassViewFillerHelpStruct { if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) memType = "enum"; - TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + TQString txt = i18n( "Show %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); + int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } - void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { + void insertItem ( TQPopupMenu* tqparent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); TQString txt; @@ -565,12 +565,12 @@ struct PopupClassViewFillerHelpStruct { 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() ) { - insertItem( parent, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); + insertItem( tqparent, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); } else { SimpleTypeNamespace* cn = dynamic_cast<SimpleTypeNamespace*>( ( *it ).first.first.resolved().data() ); if( cn ) { TypePointer t = new SimpleTypeNamespace( cn ); //to avoid endless recursion (caching would be better) - insertItem( parent, t->desc(), prefix ); + insertItem( tqparent, t->desc(), prefix ); } } } @@ -583,7 +583,7 @@ struct PopupClassViewFillerHelpStruct { if ( d.resolved() ->asFunction() ) { n = buildSignature( d.resolved() ); } - txt = prefix + i18n( "Show %1" ).arg( cleanForMenu( n ) ); + txt = prefix + i18n( "Show %1" ).tqarg( cleanForMenu( n ) ); } else { txt = prefix + d.name() + " not in code-model"; } @@ -596,7 +596,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -612,13 +612,13 @@ class PopupFiller { PopupFiller( HelpStruct str , TQString dAdd, int maxCount = 100 ) : struk( str ), depthAdd( dAdd ), s( maxCount ) {} - void fillIncludes( const DeclarationInfo& decl, TQPopupMenu* parent, bool& needSeparator ) { + void fillIncludes( const DeclarationInfo& decl, TQPopupMenu* tqparent, bool& needSeparator ) { if( !struk.receiver->getIncludeFiles()[ HashedString( decl.file ) ] ) { TQString file = decl.file; //The include-file seems to be missing if( needSeparator ) { needSeparator = false; - parent->insertSeparator(); + tqparent->insertSeparator(); } TQString includeFile = file; @@ -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, TQT_SLOT( popupAction( int ) ) ); + int id = tqparent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( 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( TQPopupMenu * parent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { + void fill( TQPopupMenu * tqparent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { Debug dbg( "#fl# ", 10 ) ; @@ -670,32 +670,32 @@ 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, TQT_SLOT( popupAction( int ) ) ); + /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ - struk.insertItem( parent, f, prefix ); + struk.insertItem( tqparent, f, prefix ); - parent->insertSeparator(); + tqparent->insertSeparator(); if ( !sourceVariable.comment.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m ); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m ); 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(); + tqparent->insertSeparator(); } } - struk.insertItem( parent, d, prefix ); + struk.insertItem( tqparent, d, prefix ); if( d->resolved() && !d->resolved()->specialization().isEmpty() ) { - SimpleType p = d->resolved()->parent(); + SimpleType p = d->resolved()->tqparent(); LocateResult r = p->locateDecType( d->name() ); if( r ) { - TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Specialized from \"%1\"" ).arg( cleanForMenu( r->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m ); fill( m, r ); } } @@ -703,11 +703,11 @@ class PopupFiller { TypeDesc::TemplateParams p = d->templateParams(); for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) { //if( (*it)->resolved() ) { - TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Template-param \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, **it ); /*} else { - fill( parent, **it, prefix + depthAdd ); + fill( tqparent, **it, prefix + depthAdd ); }*/ } @@ -715,16 +715,16 @@ class PopupFiller { if ( d->resolved() ->asFunction() ) { LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() ); if ( rt ) { - TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Return-type \"%1\"" ).arg( cleanForMenu( rt->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m ); fill( m, rt ); } TQValueList<TypeDesc> args = d->resolved() ->asFunction() ->getArgumentTypes(); TQStringList argNames = d->resolved() ->asFunction() ->getArgumentNames(); if ( !args.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Argument-types" ), m ); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Argument-types" ), m ); TQStringList::iterator it2 = argNames.begin(); for ( TQValueList<TypeDesc>::iterator it = args.begin(); it != args.end(); ++it ) { LocateResult at = d->resolved() ->locateDecType( *it ); @@ -734,7 +734,7 @@ class PopupFiller { ++it2; } TQPopupMenu * mo = PopupTracker::createPopup( m ); - m->insertItem( i18n( "Argument \"%1\"" ).arg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo ); + m->insertItem( i18n( "Argument \"%1\"" ).tqarg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo ); fill( mo, at ); } @@ -743,17 +743,17 @@ class PopupFiller { } #ifndef DISABLE_TRACING if ( d.trace() ) { - TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); + TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); if ( !trace.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Trace" ), m ); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Trace" ), m ); - for ( TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { + for ( TQValueList<TQPair<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 ); + m->insertItem( i18n( "%1 -> %2" ).tqarg( cleanForMenu( ( *it ).first.name + tail ) ).tqarg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo ); struk.insertItem( mo, ( *it ).first, prefix ); @@ -778,21 +778,21 @@ class PopupFiller { if ( d->resolved() ) { 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 ); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, *it ); } - if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) { - 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() ->tqparent() && d->resolved() ->tqparent() ->desc() ) { + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->tqparent() ->fullTypeResolved() ) ), m ); + fill( m, d->resolved() ->tqparent() ->desc() ); } if ( !d->resolved() ->comment().isEmpty() ) { - parent->insertSeparator(); - TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m ); + tqparent->insertSeparator(); + TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + tqparent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m ); 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,18 +805,18 @@ 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() ) { - TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); + TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); if ( !trace.isEmpty() ) { - for ( TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { + for ( TQValueList<TQPair<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 ); + fillIncludes( (*it).first.decl, tqparent, needSeparator ); } } } //Show the include-file for the item itself if( d->resolved() && !d->resolved()->isNamespace() && struk.receiver->cppSupport() ) { - fillIncludes( d->resolved()->getDeclarationInfo(), parent, needSeparator ); + fillIncludes( d->resolved()->getDeclarationInfo(), tqparent, needSeparator ); } } } @@ -828,7 +828,7 @@ struct CompTypeProcessor : public TypeProcessor { CompTypeProcessor( SimpleType scope, bool processArguments ) : m_scope( scope ), m_processArguments( processArguments ) {} - virtual TQString parentType() { + virtual TQString tqparentType() { return m_scope->fullType(); } @@ -855,14 +855,14 @@ struct CppCodeCompletionData { if ( recoveryPoints.count() == 0 ) return 0; - QPair<int, int> pt = qMakePair( line, column ); + TQPair<int, int> pt = tqMakePair( line, column ); TQPtrListIterator<RecoveryPoint> it( recoveryPoints ); RecoveryPoint* recPt = 0; while ( it.current() ) { - QPair<int, int> startPt = qMakePair( it.current() ->startLine, it.current() ->startColumn ); - QPair<int, int> endPt = qMakePair( it.current() ->endLine, it.current() ->endColumn ); + TQPair<int, int> startPt = tqMakePair( it.current() ->startLine, it.current() ->startColumn ); + TQPair<int, int> endPt = tqMakePair( it.current() ->endLine, it.current() ->endColumn ); if ( pt < startPt ) { break; @@ -969,7 +969,7 @@ CppCodeCompletion::~CppCodeCompletion( ) { } void CppCodeCompletion::addStatusText( TQString text, int timeout ) { - m_statusTextList.append( QPair<int, TQString>( timeout, text ) ); + m_statusTextList.append( TQPair<int, TQString>( timeout, text ) ); if ( !m_showStatusTextTimer->isActive() ) { slotStatusTextTimeout(); } @@ -1055,7 +1055,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { kdDebug( 9007 ) << k_funcinfo << endl; - m_activeFileName = TQString::null; + m_activeFileName = TQString(); KTextEditor::Document* doc = dynamic_cast<KTextEditor::Document*>( part ); if ( !doc ) @@ -1121,7 +1121,7 @@ void CppCodeCompletion::slotTextChanged() { // !!WARNING!! This is very hackish, but KTE doesn't offer a way // to tell the completion box to _go_away_ if ( ch.simplifyWhiteSpace().isEmpty() && - !strCurLine.simplifyWhiteSpace().contains( "virtual" ) && + !strCurLine.simplifyWhiteSpace().tqcontains( "virtual" ) && m_bCompletionBoxShow ) { TQValueList<KTextEditor::CompletionEntry> entryList; m_bCompletionBoxShow = true; @@ -1139,7 +1139,7 @@ void CppCodeCompletion::slotTextChanged() { // m_codeCompleteCh2Rx completes on "->" and "::" if ( ( argsHint && ch == "(" ) || - ( codeComplete && strCurLine.simplifyWhiteSpace().contains( "virtual" ) ) || + ( codeComplete && strCurLine.simplifyWhiteSpace().tqcontains( "virtual" ) ) || ( codeComplete && ( m_codeCompleteChRx.search( ch ) != -1 || m_codeCompleteCh2Rx.search( ch2 ) != -1 ) ) || ( headComplete && ( ch == "\"" || ch == "<" ) && m_includeRx.search( strCurLine ) != -1 ) ) { @@ -1238,7 +1238,7 @@ TQString CppCodeCompletion::replaceCppComments( const TQString& contents ) { after.fill( ' ', before.length() - 5 ); after.prepend( "/*" ); after.append( "*/" ); - text.replace( pos, before.length() - 1, after ); + text.tqreplace( pos, before.length() - 1, after ); pos += after.length(); } else { pos += m_cppCodeCommentsRx.matchedLength(); @@ -1444,12 +1444,12 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column , } void CppCodeCompletion::popupAction( int number ) { - PopupActions::iterator it = m_popupActions.find( number ); + PopupActions::iterator it = m_popupActions.tqfind( number ); if ( it != m_popupActions.end() ) { 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, TQString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) ); + m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").tqarg( fileName ).tqarg( (*it).name ) ); } else { m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine ); } @@ -1459,7 +1459,7 @@ void CppCodeCompletion::popupAction( int number ) { } void CppCodeCompletion::popupDefinitionAction( int number ) { - PopupActions::iterator it = m_popupDefinitionActions.find( number ); + PopupActions::iterator it = m_popupDefinitionActions.tqfind( number ); if ( it != m_popupDefinitionActions.end() ) { TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); if ( !m_pSupport->switchHeaderImpl( fileName, ( *it ).startLine, ( *it ).startCol ) ) @@ -1481,7 +1481,7 @@ void CppCodeCompletion::selectItem( ItemDom item ) { } void CppCodeCompletion::popupClassViewAction( int number ) { - PopupClassViewActions::iterator it = m_popupClassViewActions.find( number ); + PopupClassViewActions::iterator it = m_popupClassViewActions.tqfind( number ); if ( it != m_popupClassViewActions.end() ) { if ( ( *it ) ) selectItem( *it ); @@ -1532,11 +1532,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte 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++ ); + gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ ); else - gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m ); + gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); TQPopupMenu * b = PopupTracker::createPopup( m ); m->insertItem( i18n( "Body" ), b ); @@ -1564,11 +1564,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte int gid; TQPopupMenu * m = PopupTracker::createPopup( popup ); if ( contextMenuEntriesAtTop ) - gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m, 5, cpos++ ); + gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m, 5, cpos++ ); else - gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m ); + gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo i; i.file = includeFilePath; @@ -1585,9 +1585,9 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte } else { ///Could not find include-file if ( contextMenuEntriesAtTop ) - popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ), 5, cpos++ ); + popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ), 5, cpos++ ); else - popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ) ); + popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ) ); } } @@ -1609,14 +1609,14 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) - gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m, 5, cpos++ ); + gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 5, cpos++ ); else - gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m ); + gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m ); - popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) ); + popup->tqsetWhatsThis( 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, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable ); }*/ @@ -1629,11 +1629,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) - gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m, 6, cpos++ ); + gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 6, cpos++ ); else - gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m ); + gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m ); - popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) ); + popup->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) ); PopupClassViewFillerHelpStruct h( this ); PopupFiller<PopupClassViewFillerHelpStruct> filler( h, "" ); @@ -1691,7 +1691,7 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) { } text += "type: \"" + type.resultType->fullTypeResolved() + "\""; } - if( type.resultType->parent()) text += "\nnested in: \"" + type.resultType->parent()->fullTypeResolvedWithScope() + "\""; + if( type.resultType->tqparent()) text += "\nnested in: \"" + type.resultType->tqparent()->fullTypeResolvedWithScope() + "\""; DeclarationInfo i = type.resultType->getDeclarationInfo(); if( i ) text += "\n" + i.locationToText(); @@ -1703,27 +1703,27 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) { const int timeout = 2000; if ( type->resolved() ) { - addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), timeout ); + addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), timeout ); if ( type.sourceVariable && !type.sourceVariable.comment.isEmpty() ) { - addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).arg( type.sourceVariable.name ).arg( type.sourceVariable.comment ) , 10000 ); + addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).tqarg( type.sourceVariable.name ).tqarg( type.sourceVariable.comment ) , 10000 ); } if ( !type->resolved() ->comment().isEmpty() ) { - addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).arg( type->name() ).arg( type->resolved() ->comment() ) , 10000 ); + addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).tqarg( type->name() ).tqarg( type->resolved() ->comment() ) , 10000 ); } if ( type->resolved() ->comment().isEmpty() ) { - addStatusText( i18n( "\"%1\" has no comment" ).arg( type->name() ) , timeout ); + addStatusText( i18n( "\"%1\" has no comment" ).tqarg( type->name() ) , timeout ); } } else { if ( type ) { if( !BuiltinTypes::isBuiltin( type.resultType ) ) { - addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), 2 * timeout ); + addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), 2 * timeout ); } else { - addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).arg( type.expr.expr() ).arg( type->fullNameChain() ).arg(BuiltinTypes::comment( type.resultType )), 2 * timeout ); + addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ).tqarg(BuiltinTypes::comment( type.resultType )), 2 * timeout ); } } else { - addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).arg( type.expr.expr() ).arg( type.expr.typeAsString() ), 2 * timeout ); + addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type.expr.typeAsString() ), 2 * timeout ); } } @@ -1744,7 +1744,7 @@ bool CppCodeCompletion::isTypeExpression( const TQString& expr ) { 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", " " ); + tail.tqreplace( "\n", " " ); SafetyCounter s ( 100 ); bool hadSpace = false; while ( !tail.isEmpty() && s ) { @@ -1830,7 +1830,7 @@ ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int st //make this a regexp TQString e = ret.expr(); - if ( e.contains( "." ) || e.contains( "->" ) || e.contains( "(" ) || e.contains( ")" ) || e.contains( "=" ) || e.contains( "-" ) ) + if ( e.tqcontains( "." ) || e.tqcontains( "->" ) || e.tqcontains( "(" ) || e.tqcontains( ")" ) || e.tqcontains( "=" ) || e.tqcontains( "-" ) ) mayBeType = false; if ( mayBeType ) { @@ -1904,26 +1904,26 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin if ( !scope.isEmpty() ) { - SimpleType parentType; + SimpleType tqparentType; /* if( !m_cachedFromContext ) { TypePointer t = SimpleType(TQStringList())->locateDecType( scope.join("") ).desc().resolved();; if( t ) - parentType = SimpleType( t.data() ); + tqparentType = SimpleType( t.data() ); else - parentType = SimpleType( scope ); + tqparentType = SimpleType( scope ); } else {*/ - parentType = SimpleType( scope, getIncludeFiles() ); + tqparentType = SimpleType( scope, getIncludeFiles() ); //} - parentType->descForEdit().setTotalPointerDepth( 1 ); - ctx->setContainer( parentType ); + tqparentType->descForEdit().setTotalPointerDepth( 1 ); + ctx->setContainer( tqparentType ); } SimpleType global = ctx->global(); if( dynamic_cast<SimpleTypeNamespace*>( &(*global) ) ) { SimpleTypeNamespace* globalNs = static_cast <SimpleTypeNamespace*>( &(*global) ); - TQValueList<QPair<TQString, TQString> > localImports = ctx->imports(); - for( TQValueList<QPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) + TQValueList<TQPair<TQString, TQString> > localImports = ctx->imports(); + for( TQValueList<TQPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) globalNs->addAliasMap( (*it).first, (*it).second ); } @@ -1988,8 +1988,8 @@ bool CppCodeCompletion::functionContains( FunctionDom f , int line, int col ) { if ( t.isEmpty() ) return false; - //int i = t.find( '{' ); - int i = t.find( '(' ); //This now includes the argument-list + //int i = t.tqfind( '{' ); + int i = t.tqfind( '(' ); //This now includes the argument-list if ( i == -1 ) return false; int lineCols = 0; @@ -2017,7 +2017,7 @@ void CppCodeCompletion::getFunctionBody( FunctionDom f , int& line, int& col ) { if ( t.isEmpty() ) return; - int i = t.find( '{' ); + int i = t.tqfind( '{' ); if ( i == -1 ) return; i++; @@ -2059,14 +2059,14 @@ void CppCodeCompletion::needRecoveryPoints() { if ( !ast ) { kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl; m_pSupport->parseFileAndDependencies( m_activeFileName, true ); -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).arg( m_activeFileName ), 2000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).tqarg( m_activeFileName ), 2000 ); return; } else { computeRecoveryPointsLocked(); } if ( this->d->recoveryPoints.isEmpty() ) { kdDebug( 9007 ) << "Failed to compute recovery-points for " << m_activeFileName << endl; -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).arg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).tqarg( m_activeFileName ), 1000 ); } else { kdDebug( 9007 ) << "successfully computed recovery-points for " << m_activeFileName << endl; } @@ -2080,7 +2080,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName ); if ( !file ) { -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 ); kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n"; return SimpleType(); } @@ -2113,7 +2113,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column c = strCurLine[ --pos ]; if ( !( c.isLetterOrNumber() || c == '_' || c == ')' || c == ']' || c == '>' ) ) { - conf.invalidate(); + conf.tqinvalidate(); return SimpleType(); } } @@ -2280,7 +2280,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column CppCodeCompletionConfig * cfg = m_pSupport->codeCompletionConfig(); if( cfg->usePermanentCaching() && contextItem ) { - conf.invalidate(); + conf.tqinvalidate(); m_cachedFromContext = contextItem; } @@ -2323,7 +2323,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName ); if ( !file ) { -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 ); kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n"; return ; } @@ -2508,7 +2508,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { --end_expr; if ( contents[ end_expr ] != ',' ) { - expr = TQString::null; + expr = TQString(); } else { start_expr = expressionAt( contents, end_expr ); expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); @@ -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() ); - TQValueList<QPair<TQString, TQString> > localImports = ctx->imports(); - for( TQValueList<QPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) + TQValueList<TQPair<TQString, TQString> > localImports = ctx->imports(); + for( TQValueList<TQPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) globalNs->addAliasMap( (*it).first, (*it).second ); } } else { @@ -2564,7 +2564,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if ( !scope.isEmpty() ) { - SimpleType parentType; + SimpleType tqparentType; /*if( !m_cachedFromContext ) { TypePointer t = createGlobalNamespace(); @@ -2584,14 +2584,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { d.setIncludeFiles( getIncludeFiles() ); SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); if ( i ) { - parentType = i; + tqparentType = i; } else { - parentType = SimpleType( scope, getIncludeFiles() ); + tqparentType = SimpleType( scope, getIncludeFiles() ); } } else { - parentType = SimpleType( scope, getIncludeFiles() ); + tqparentType = SimpleType( scope, getIncludeFiles() ); } - this_type = parentType; + this_type = tqparentType; this_type->descForEdit().setTotalPointerDepth( 1 ); ctx->setContainer( this_type ); } @@ -2673,7 +2673,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { kdDebug(9007) << "------> found virtual keyword for class specifier '" << clazz->text() << "'" << endl; }*/ - } else if ( TQString( "virtual" ).find( keyword ) != -1 ) + } else if ( TQString( "virtual" ).tqfind( keyword ) != -1 ) m_blockForKeyword = true; else m_blockForKeyword = false; @@ -2713,7 +2713,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { --end_expr; if ( contents[ end_expr ] != ',' ) { - expr = TQString::null; + expr = TQString(); } else { start_expr = expressionAt( contents, end_expr ); expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); @@ -2756,7 +2756,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( ch2 == "::" ) { TQString str = clearComments( expr ); - if ( !str.contains( '.' ) && !str.contains( "->" ) ) ///Necessary, because the expression may also be like user->BaseUser:: + if ( !str.tqcontains( '.' ) && !str.tqcontains( "->" ) ) ///Necessary, because the expression may also be like user->BaseUser:: isInstance = false; } @@ -2790,7 +2790,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if( !t->isNamespace() || invokedOnDemand || alwaysIncludeNamespaces ) computeCompletionEntryList( t, entryList, t->scope(), false, depth ); - t = t->parent(); + t = t->tqparent(); depth++; } } @@ -2807,7 +2807,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if ( ( (t->isNamespace() && invokedOnDemand) || alwaysIncludeNamespaces ) || ( first && isInstance ) ) computeCompletionEntryList( t, entryList, t->scope(), t->isNamespace() ? true : isInstance, depth ); - t = t->parent(); + t = t->tqparent(); depth++; first = false; } @@ -2890,7 +2890,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( method ) signatureList += computeSignatureList( method ); if ( t ) - t = t->parent(); + t = t->tqparent(); } while ( !ready && s ); if ( !signatureList.isEmpty() ) { @@ -2905,7 +2905,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { ctx = 0; if ( cfg->usePermanentCaching() ) { - conf.invalidate(); + conf.tqinvalidate(); m_cachedFromContext = contextItem; } } @@ -2972,7 +2972,7 @@ void CppCodeCompletion::slotCodeModelUpdated( const TQString& fileName ) { if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) return ; -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).arg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).tqarg( m_activeFileName ), 1000 ); computeRecoveryPointsLocked(); } @@ -2981,7 +2981,7 @@ void CppCodeCompletion::slotFileParsed( const TQString& fileName ) { if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) return ; -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).arg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).tqarg( m_activeFileName ), 1000 ); emptyCache(); ///The cache has to be emptied, because the code-model changed. @todo Better: Only refresh the code-model(tell all code-model-types to refresh themselves on demand) @@ -3016,7 +3016,7 @@ SimpleContext* CppCodeCompletion::computeContext( FunctionDefinitionAST * ast, i var.ptrList = ptrList; var.type = param->typeSpec() ->text() + ptrList.join( "" ); - var.name = declaratorToString( param->declarator(), TQString::null, true ); + var.name = declaratorToString( param->declarator(), TQString(), true ); var.comment = param->comment(); param->getStartPosition( &var.startLine, &var.startCol ); param->getEndPosition( &var.endLine, &var.endCol ); @@ -3173,7 +3173,7 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen name = usingDecl->name()->text(); if( !name.isNull() ) - ctx->addImport( QPair<TQString, TQString>( "", name ) ); + ctx->addImport( TQPair<TQString, TQString>( "", name ) ); } } @@ -3182,7 +3182,7 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen TQString name; if( namespaceAlias ->namespaceName() && namespaceAlias->aliasName() ) { - ctx->addImport( QPair<TQString, TQString>( namespaceAlias->namespaceName()->text(), namespaceAlias->aliasName()->text() ) ); + ctx->addImport( TQPair<TQString, TQString>( namespaceAlias->namespaceName()->text(), namespaceAlias->aliasName()->text() ) ); } } @@ -3293,7 +3293,7 @@ FunctionDefinitionAST * CppCodeCompletion::functionDefinition( AST* node ) { while ( node ) { if ( node->nodeType() == NodeType_FunctionDefinition ) return static_cast<FunctionDefinitionAST*>( node ); - node = node->parent(); + node = node->tqparent(); } return 0; } @@ -3360,7 +3360,7 @@ TQString codeModelAccessToString( CodeModelItem::Access access ) { #define MAXCOMMENTCOLUMNS 45 -TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const ItemDom& item ) { +TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const ItemDom& item ) { --m_maxComments; static TQString maxReached = " "; if( m_maxComments < 0 ) { @@ -3371,8 +3371,8 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite item->getStartPosition( &line, &col ); - if ( !parent->scope().isEmpty() ) { - ret += "Container: " + parent->fullTypeResolvedWithScope(); + if ( !tqparent->scope().isEmpty() ) { + ret += "Container: " + tqparent->fullTypeResolvedWithScope(); } if ( item->isEnum() ) { @@ -3451,7 +3451,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite ret += "\nKind: Typedef"; if ( t ) { ret += "\nType: " + t->type(); - LocateResult r = parent->locateDecType( t->type() ); + LocateResult r = tqparent->locateDecType( t->type() ); if ( r.desc().resolved() ) ret += "\nResolved type: " + r.desc().resolved() ->fullTypeResolvedWithScope(); else @@ -3463,13 +3463,13 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite ret += "\nKind: Class"; } - ret += TQString( "\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" ).tqarg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col ); if ( !item->comment().isEmpty() ) ret += "\n\n" + prepareTextForMenu( item->comment(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ); return ret; } -TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) { +TQString CppCodeCompletion::commentFromTag( const SimpleType& tqparent, Tag& tag ) { --m_maxComments; static TQString maxReached = " "; if( m_maxComments < 0 ) { @@ -3480,8 +3480,8 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) tag.getStartPosition( &line, &col ); TQString ret; // = tag.comment(); - if ( !parent->scope().isEmpty() ) { - ret += "Container: " + parent->fullTypeResolvedWithScope(); + if ( !tqparent->scope().isEmpty() ) { + ret += "Container: " + tqparent->fullTypeResolvedWithScope(); } /* if( tag.kind() == Tag::Kind_Enum ) { @@ -3571,7 +3571,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) if ( tag.kind() == Tag::Kind_Typedef ) { ret += "\nKind: Typedef"; ret += "\nType: " + tagType( tag ); - LocateResult r = parent->locateDecType( tagType( tag ) ); + LocateResult r = tqparent->locateDecType( tagType( tag ) ); if ( r.desc().resolved() ) ret += "\nResolved type: " + r.desc().resolved() ->fullTypeResolvedWithScope(); else @@ -3585,7 +3585,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) ret += "\nKind: Struct"; } - ret += TQString( "\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" ).tqarg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col ); if ( !tag.comment().isEmpty() ) { ret += "\n\n" + prepareTextForMenu( tag.comment(), 20, MAXCOMMENTCOLUMNS ).join( "\n" ); } @@ -3687,8 +3687,8 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueLis args << Catalog::QueryArgument( "name", fullname ); - TQValueList<LocateResult> parents = typeR->getBases( ); - for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { + TQValueList<LocateResult> tqparents = typeR->getBases( ); + for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; SimpleType tp = SimpleType( ( *it ) ->resolved() ); @@ -3807,14 +3807,14 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList break; } - e.userdata = TQString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting ); + e.userdata = TQString( "%1%2%3%4%5" ).tqarg( num ).tqarg( depth ).tqarg( className ).tqarg( sortPosition ).tqarg( subSorting ); if ( m_completionMode != SignalCompletion ) { if ( !type->isNamespace() ) { if ( num == 1 ) - e.postfix += "; (protected)"; // in " + proc.parentType() + ")"; + e.postfix += "; (protected)"; // in " + proc.tqparentType() + ")"; if ( num == 2 ) - e.postfix += "; (private)"; // in " + proc.parentType() + ")"; + e.postfix += "; (private)"; // in " + proc.tqparentType() + ")"; } } @@ -3930,9 +3930,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList computeCompletionEntryList( klass->name(), type, entryList, klass->typeAliasList(), isInstance, depth ); } - TQValueList<LocateResult> parents = type->getBases( ); + TQValueList<LocateResult> tqparents = type->getBases( ); - for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { + for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; @@ -3962,7 +3962,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList computeCompletionEntryList( type, entryList, scope->namespaceList(), isInstance, depth ); } -void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, 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( TQString parent, SimpleType if ( isInstance ) continue; - entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 ); + entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( tqparent ).tqarg( 6 ); entryList << entry; @@ -3993,7 +3993,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType } } -void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -4015,7 +4015,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); entry.text = klass->name(); entry.comment = commentFromItem( type, klass.data() ); - entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 ); + entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( tqparent ).tqarg( 5 ); entryList << entry; } } @@ -4136,7 +4136,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList if ( meth->isStatic() ) subSorting = 5; - entry.userdata += TQString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting ); + entry.userdata += TQString( "%1%2%3%4%5" ).tqarg( meth->access() ).tqarg( depth ).tqarg( className ).tqarg( 1 ).tqarg( subSorting ); if ( m_completionMode == VirtualDeclCompletion ) entry.text += text + ";"; @@ -4187,7 +4187,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList CodeCompletionEntry entry; entry.text = attr->name(); entry.comment = commentFromItem( type, model_cast<ItemDom>( attr ) ); - entry.userdata += TQString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 ); + entry.userdata += TQString( "%1%2%3%4" ).tqarg( attr->access() ).tqarg( depth ).tqarg( className ).tqarg( 2 ); if ( !attr->isEnumeratorVariable() ) { @@ -4261,7 +4261,7 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim } } - addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).arg( expr.expr() ).arg( res->fullNameChain() ).arg( resolutionType ), 5000 ); + addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).tqarg( expr.expr() ).tqarg( res->fullNameChain() ).tqarg( resolutionType ), 5000 ); return res; } @@ -4386,7 +4386,7 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) } // Unresolved, maybe its a named enumeration? else if ( type && type.trace() ) { - TQValueList< QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = type.trace()->trace(); + TQValueList< TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = type.trace()->trace(); if ( !trace.isEmpty() ) { if ( trace.begin() != trace.end() ) { d = ( *trace.begin() ).first.decl; @@ -4417,7 +4417,7 @@ TQString CppCodeCompletion::createTypeInfoString( int line, int column ) if ( type->resolved() ) { TQString scope = type->resolved()->scope().join("::"); - int pos = scope.findRev("::"); + int pos = scope.tqfindRev("::"); if ( scope.isEmpty() || pos == -1 ) { scope = "::"; @@ -4467,7 +4467,7 @@ bool CppCodeCompletion::getIncludeInfo( int line, TQString& includeFileName, TQS //It is an include-directive. The regular expression captures the string, and the closing sign('"' or '>'). isIncludeDirective = true; usedProjectFiles = false; - TQStringList captured = includeRx.capturedTexts(); + TQStringList captured = includeRx.tqcapturedTexts(); if( captured.size() == 3 ) { Dependence d; d.first = captured[1]; diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 67f7b10b..4b619984 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -46,14 +46,15 @@ #include <tqpopupmenu.h> class PopupTracker : public TQObject { Q_OBJECT + TQ_OBJECT public: static PopupTracker* pt; static uint pendingPopups; - static TQPopupMenu* createPopup( TQWidget* parent ) { + static TQPopupMenu* createPopup( TQWidget* tqparent ) { if( !pt ) pt = new PopupTracker(); - TQPopupMenu* m = new TQPopupMenu( parent ); + TQPopupMenu* m = new TQPopupMenu( tqparent ); ++pendingPopups; connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); return m; @@ -91,9 +92,10 @@ struct ExpressionInfo; typedef KSharedPtr<SimpleTypeImpl> TypePointer; -class CppCodeCompletion : public QObject +class CppCodeCompletion : public TQObject { Q_OBJECT + TQ_OBJECT public: friend class SimpleType; enum CompletionMode @@ -187,8 +189,8 @@ private: bool functionContains( FunctionDom f , int line, int col ); void getFunctionBody( FunctionDom f , int& line, int& col ); void selectItem( ItemDom item ); - void addTypePopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); - void addTypeClassPopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypePopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypeClassPopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); TQValueList<TQStringList> computeSignatureList( CppEvaluation::EvaluationResult function ); void integratePart( KParts::Part* part ); void setupCodeInformationRepository(); @@ -233,8 +235,8 @@ private: 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( TQString tqparent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString tqparent, 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 ); @@ -266,7 +268,7 @@ private: TQGuardedPtr<CppSupportPart> m_pSupport; TQTimer* m_ccTimer; TQTimer* m_showStatusTextTimer; - TQValueList<QPair<int, TQString> > m_statusTextList; + TQValueList<TQPair<int, TQString> > m_statusTextList; void fitContextItem( int nLine, int nColumn ); void needRecoveryPoints(); @@ -296,8 +298,8 @@ private: //If more then the given count of comments were requested, all following ones will be blank.(Performance-reasons) void setMaxComments( int count ); - TQString commentFromItem( const SimpleType& parent, const ItemDom& item ); - TQString commentFromTag( const SimpleType& parent, Tag& tag ); + TQString commentFromItem( const SimpleType& tqparent, const ItemDom& item ); + TQString commentFromTag( const SimpleType& tqparent, 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. diff --git a/languages/cpp/cppcodecompletionconfig.cpp b/languages/cpp/cppcodecompletionconfig.cpp index 9ecca5f4..104f422c 100644 --- a/languages/cpp/cppcodecompletionconfig.cpp +++ b/languages/cpp/cppcodecompletionconfig.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <tqdom.h> -TQString CppCodeCompletionConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/codecompletion" ); +TQString CppCodeCompletionConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/codecompletion" ); CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, TQDomDocument* dom ) : TQObject( part ), m_part( part ), m_dom( dom ) diff --git a/languages/cpp/cppcodecompletionconfig.h b/languages/cpp/cppcodecompletionconfig.h index 75f0d570..924f674d 100644 --- a/languages/cpp/cppcodecompletionconfig.h +++ b/languages/cpp/cppcodecompletionconfig.h @@ -22,9 +22,10 @@ class TQDomDocument; /** @author Roberto Raggi */ -class CppCodeCompletionConfig : public QObject +class CppCodeCompletionConfig : public TQObject { Q_OBJECT + TQ_OBJECT public: CppCodeCompletionConfig( CppSupportPart* part, TQDomDocument* dom ); virtual ~CppCodeCompletionConfig(); diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp index b84185f5..a20c2339 100644 --- a/languages/cpp/cppevaluation.cpp +++ b/languages/cpp/cppevaluation.cpp @@ -102,7 +102,7 @@ OperatorIdentification UnaryOperator::identify( TQString& str ) { EvaluationResult UnaryOperator::apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ) { if( !checkParams( params ) ) { - log( TQString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) ); + log( TQString("parameter-check failed: %1 params: ").tqarg( params.size() ) + printTypeList( params ) ); return EvaluationResult(); } else { EvaluationResult t = unaryApply( params.front(), innerParams ); @@ -433,7 +433,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, } depth++; - if( !ready ) current = current->parent(); + if( !ready ) current = current->tqparent(); } } /* @@ -455,7 +455,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, if( !bestRet || /** Did we find a constructor within a class? */ - (type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->parent()->desc() && bestRet->resolved()->asFunction() ) ) ) { + (type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->tqparent()->desc() && bestRet->resolved()->asFunction() ) ) ) { /*if ( type && type->resolved() ) {*/ EvaluationResult ret = type; diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index 7b2d98cd..b67597e6 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -37,27 +37,27 @@ #include <filetemplate.h> CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, - TQWidget *parent, const char *name, bool modal ) - : ImplementationWidget( part, parent, name, modal ) + TQWidget *tqparent, const char *name, bool modal ) + : ImplementationWidget( part, tqparent, name, modal ) {} TQStringList CppImplementationWidget::createClassFiles() { - 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"; + TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *tqparent = 0, const char *name = 0);\n};\n\n#endif\n"; + TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *tqparent, const char *name)\n :$BASECLASSNAME$(tqparent, name)\n{\n}\n"; if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) - template_cpp += "\n#include \"$MOCINCLUDE$\"\n"; + template_cpp += "\n#include \"$TQMOCINCLUDE$\"\n"; 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_h.tqreplace( TQRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" ); + template_h.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); + template_h.tqreplace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); + template_h.tqreplace( TQRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() ); - 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_cpp.tqreplace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" ); + template_cpp.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); + template_cpp.tqreplace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); + template_cpp.tqreplace( TQRegExp( "\\$TQMOCINCLUDE\\$" ), fileNameEdit->text() + ".tqmoc" ); template_h = FileTemplate::read( m_part, "h" ) + template_h; template_cpp = FileTemplate::read( m_part, "cpp" ) + template_cpp; diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index b79b0aff..da1ef71b 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -30,8 +30,9 @@ class CppSupportPart; class CppImplementationWidget : public ImplementationWidget { Q_OBJECT + TQ_OBJECT public: - CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); + CppImplementationWidget( KDevLanguageSupport *part, TQWidget* tqparent = 0, const char* name = 0, bool modal = false ); protected: virtual TQStringList createClassFiles(); diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index fc338900..773f36ae 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -52,28 +52,13 @@ #include "classgeneratorconfig.h" -TQString QRegExp_escape( const TQString& str ) +TQString TQRegExp_escape( const TQString& str ) { -#if QT_VERSION >= 0x030100 return TQRegExp::escape( str ); -#else - // this block is copyrighted by Trolltech AS (GPL) - static const char meta[] = "$()*+.?[\\]^{|}"; - TQString quoted = str; - int i = 0; - - while ( i < ( int ) quoted.length() ) - { - if ( strchr( meta, quoted[ i ].latin1() ) != 0 ) - quoted.insert( i++, "\\" ); - i++; - } - return quoted; -#endif } -CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, const char *name ) - : CppNewClassDialogBase( parent, name ), myModel( 0 ) +CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent, const char *name ) + : CppNewClassDialogBase( tqparent, name ), myModel( 0 ) { headerModified = false; baseincludeModified = false; @@ -161,7 +146,7 @@ TQStringList& gres( TQStringList &list, const TQRegExp & rx, const TQString & af TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { - ( *it ).replace( rx, after ); + ( *it ).tqreplace( rx, after ); ++it; } return list; @@ -175,13 +160,7 @@ void CppNewClassDialog::addCompletionBasenameNamespacesRecursive( const Namespac if ( ! namespaceParent.isEmpty() ) { -#if QT_VERSION >= 0x030200 classList.gres( TQRegExp( "^" ), namespaceParent + "::" ); -#else - - gres( classList, TQRegExp( "^" ), namespaceParent + "::" ); -#endif - } compBasename -> insertItems( classList ); @@ -247,13 +226,13 @@ void CppNewClassDialog::classNameChanged( const TQString &text ) default: ; } - header = header.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); + header = header.tqreplace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); header_edit->setText( header ); } if ( !implementationModified ) { TQString implementation; - if ( str.contains( "template" ) ) + if ( str.tqcontains( "template" ) ) implementation = str + "_impl" + interface_suffix; else implementation = str + implementation_suffix; @@ -268,7 +247,7 @@ void CppNewClassDialog::classNameChanged( const TQString &text ) default: ; } - implementation = implementation.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); + implementation = implementation.tqreplace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); implementation_edit->setText( implementation ); } } @@ -286,7 +265,7 @@ void CppNewClassDialog::baseclassname_changed( const TQString &text ) { TQString header = text; - // handle Qt classes in a special way. + // handle TQt classes in a special way. if( m_part->qtBuildConfig()->isUsed() && header.startsWith( "Q" ) ) { if( m_part->qtBuildConfig()->version() == 3 ) @@ -300,9 +279,9 @@ void CppNewClassDialog::baseclassname_changed( const TQString &text ) } else { - if ( header.contains( TQRegExp( "::" ) ) ) - header = header.mid( header.findRev( TQRegExp( "::" ) ) + 2 ); - header = header.replace( TQRegExp( " *<.*>" ), "" ); + if ( header.tqcontains( TQRegExp( "::" ) ) ) + header = header.mid( header.tqfindRev( TQRegExp( "::" ) ) + 2 ); + header = header.tqreplace( TQRegExp( " *<.*>" ), "" ); header += interface_suffix; switch ( gen_config->superCase() ) @@ -369,7 +348,7 @@ void CppNewClassDialog::checkObjCInheritance( int val ) objc_box->setChecked( false ); } -void CppNewClassDialog::checkQWidgetInheritance( int val ) +void CppNewClassDialog::checkTQWidgetInheritance( int val ) { if ( val ) { @@ -395,11 +374,11 @@ void CppNewClassDialog::checkQWidgetInheritance( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( "TQWidget" ); + basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + - "(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");*/ + "(TQWidget *tqparent, const char *name):\n TQWidget(tqparent, name)\n{\n}\n"); + constructors_h_edit->append(classname_edit->text() + "(TQWidget *tqparent, const char *name);\n");*/ } if ( val && ( baseclasses_view->childCount() > 1 ) ) @@ -417,7 +396,7 @@ void CppNewClassDialog::qobject_box_stateChanged( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( "TQObject" ); + basename_edit->setText( TQOBJECT_OBJECT_NAME_STRING ); } @@ -482,11 +461,11 @@ void CppNewClassDialog::addBaseClass() if ( baseclasses_view->selectedItem() ) baseclasses_view->selectedItem() ->setSelected( false ); TQListViewItem* it = new TQListViewItem( baseclasses_view, baseclasses_view->lastItem(), - TQString::null, "public", TQString( "%1" ).arg( scope_box->currentItem() ), TQString::null, "false" ); + TQString(), "public", TQString( "%1" ).tqarg( scope_box->currentItem() ), TQString(), "false" ); setStateOfInheritanceEditors( true ); public_button->setChecked( true ); virtual_box->setChecked( false ); - basename_edit->setText( TQString::null ); + basename_edit->setText( TQString() ); basename_edit->setFocus(); baseclasses_view->setSelected( it, true ); } @@ -537,23 +516,23 @@ void CppNewClassDialog::remBaseClassOnly() void CppNewClassDialog::remClassFromAdv( TQString text ) { // Strip off namespace qualification - if ( text.contains( "::" ) ) - text = text.mid( text.findRev( "::" ) + 2 ); + if ( text.tqcontains( "::" ) ) + text = text.mid( text.tqfindRev( "::" ) + 2 ); removeTemplateParams( text ); TQListViewItem *it = 0; - if ( ( it = access_view->findItem( text, 0 ) ) ) + if ( ( it = access_view->tqfindItem( text, 0 ) ) ) delete it; - if ( ( it = methods_view->findItem( text, 0 ) ) ) + if ( ( it = methods_view->tqfindItem( text, 0 ) ) ) delete it; - if ( ( it = constructors_view->findItem( text, 0 ) ) ) + if ( ( it = constructors_view->tqfindItem( text, 0 ) ) ) { /// @todo changing constructors text in constructors_cpp_edit // and constructors_h_edit must be implemented /* int *para = new int(1); int *index = new int(1); - if (constructors_cpp_edit->find(text + "(", true, false, true, para, index)) + if (constructors_cpp_edit->tqfind(text + "(", true, false, true, para, index)) { qWarning("%s( found", text.latin1()); if (para) constructors_cpp_edit->removeParagraph(*para); @@ -610,7 +589,7 @@ void CppNewClassDialog::scopeboxActivated( int value ) { if ( baseclasses_view->selectedItem() ) { - baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).arg( value ) ); + baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).tqarg( value ) ); } } @@ -636,19 +615,19 @@ void CppNewClassDialog::currBaseSelected( TQListViewItem *it ) basename_edit->setText( it->text( 0 ) ); baseinclude_edit->setText( it->text( 3 ) ); scope_box->setCurrentItem( it->text( 2 ).toInt() ); - if ( it->text( 1 ).contains( "private" ) ) + if ( it->text( 1 ).tqcontains( "private" ) ) private_button->setChecked( true ); else private_button->setChecked( false ); - if ( it->text( 1 ).contains( "protected" ) ) + if ( it->text( 1 ).tqcontains( "protected" ) ) protected_button->setChecked( true ); else protected_button->setChecked( false ); - if ( it->text( 1 ).contains( "public" ) ) + if ( it->text( 1 ).tqcontains( "public" ) ) public_button->setChecked( true ); else public_button->setChecked( false ); - if ( it->text( 1 ).contains( "virtual" ) ) + if ( it->text( 1 ).tqcontains( "virtual" ) ) virtual_box->setChecked( true ); else virtual_box->setChecked( false ); @@ -725,7 +704,7 @@ void CppNewClassDialog::updateConstructorsOrder() while ( it.current() ) { - if ( ( c_it = constructors_view->findItem( it.current() ->text( 0 ), 0 ) ) ) + if ( ( c_it = constructors_view->tqfindItem( it.current() ->text( 0 ), 0 ) ) ) { c_it->moveItem( fc_it ); fc_it = c_it; @@ -776,7 +755,7 @@ void CppNewClassDialog::changeToPublic() void CppNewClassDialog::changeToInherited() { if ( access_view->selectedItem() ) - access_view->selectedItem() ->setText( 2, TQString::null ); + access_view->selectedItem() ->setText( 2, TQString() ); } void CppNewClassDialog::newTabSelected( const TQString& /*text*/ ) @@ -817,11 +796,11 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) TQStringList clNamespace = currNamespace; bool clFullQualified = false; - if ( clName.contains( "::" ) ) + if ( clName.tqcontains( "::" ) ) { // Full qualified, override imported namespace clFullQualified = true; - int splitpoint = clName.findRev( "::" ); + int splitpoint = clName.tqfindRev( "::" ); clNamespace = TQStringList::split( "::", clName.left( splitpoint ) ); clName = clName.mid( splitpoint + 2 ); } @@ -870,10 +849,10 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) PListViewItem<ClassDom> *over = new PListViewItem<ClassDom>( *classIt, methods_view, ( *classIt ) ->name() ); over->templateAddition = templateAdd; TQListViewItem *over_methods = new TQListViewItem( over, i18n( "Methods" ) ); - TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (TQt-specific)" ) ); PListViewItem<ClassDom> *access = new PListViewItem<ClassDom>( *classIt, access_view, ( *classIt ) ->name() ); TQListViewItem *access_methods = new TQListViewItem( access, i18n( "Methods" ) ); - TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (TQt-specific)" ) ); TQListViewItem *access_attrs = new TQListViewItem( access, i18n( "Attributes" ) ); FunctionList functionList = ( *classIt ) ->functionList(); @@ -896,13 +875,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) TQString inhModifier; //protected inheritance gives protected attributes - if ( inheritance.contains( "protected" ) ) + if ( inheritance.tqcontains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private attributes - else if ( inheritance.contains( "private" ) ) + else if ( inheritance.tqcontains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public attributes - else if ( inheritance.contains( "public" ) ) + else if ( inheritance.tqcontains( "public" ) ) inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_slots, *methodIt, inhModifier ); } @@ -917,13 +896,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) // see what modifier is given for the base class TQString inhModifier; //protected inheritance gives protected methods - if ( inheritance.contains( "protected" ) ) + if ( inheritance.tqcontains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private methods - else if ( inheritance.contains( "private" ) ) + else if ( inheritance.tqcontains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public methods - else if ( inheritance.contains( "public" ) ) + else if ( inheritance.tqcontains( "public" ) ) inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_methods, *methodIt, inhModifier ); } @@ -938,13 +917,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) { TQString inhModifier; //protected inheritance gives protected attributes - if ( inheritance.contains( "protected" ) ) + if ( inheritance.tqcontains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private attributes - else if ( inheritance.contains( "private" ) ) + else if ( inheritance.tqcontains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public attributes - else if ( inheritance.contains( "public" ) ) + else if ( inheritance.tqcontains( "public" ) ) inhModifier = ( *varIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_attrs, *varIt, inhModifier ); } @@ -958,8 +937,8 @@ bool CppNewClassDialog::isConstructor( TQString className, const FunctionDom &me if ( ( className == method->name() ) ) { qWarning( "1x" ); - 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)) ) + if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).tqcontains( TQRegExp( " *(const)? *" + className + " *& *" ) ) ) ) + // if ( method->asString().tqcontains(TQRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) ) return false; else return true; @@ -973,21 +952,21 @@ void CppNewClassDialog::addToConstructorsList( TQCheckListItem *myClass, Functio new PCheckListItem<FunctionDom>( method, myClass, m_part->formatModelItem( method.data() ), TQCheckListItem::RadioButton ); } -void CppNewClassDialog::addToMethodsList( TQListViewItem *parent, FunctionDom method ) +void CppNewClassDialog::addToMethodsList( TQListViewItem *tqparent, FunctionDom method ) { - 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" ) ); + PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); + method->isAbstract() ? it->setText( 1, i18n( "tqreplace" ) ) : it->setText( 1, i18n( "extend" ) ); } -void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier ) { - PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ) ); + PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ) ); it->setText( 1, modifier ); } -void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier ) { - PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, parent, m_part->formatModelItem( attr.data() ) ); + PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, tqparent, m_part->formatModelItem( attr.data() ) ); it->setText( 1, modifier ); } @@ -998,11 +977,11 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) TQStringList clNamespace = currNamespace; bool clFullQualified = false; - if ( clName.contains( "::" ) ) + if ( clName.tqcontains( "::" ) ) { // Full qualified, override imported namespace clFullQualified = true; - int splitpoint = clName.findRev( "::" ); + int splitpoint = clName.tqfindRev( "::" ); clNamespace = TQStringList::split( "::", clName.left( splitpoint ) ); clName = clName.mid( splitpoint + 2 ); } @@ -1029,10 +1008,10 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) PListViewItem<ClassDom> *over = new PListViewItem<ClassDom>( *classIt, methods_view, ( *classIt ) ->name() ); over->templateAddition = templateAdd; TQListViewItem *over_methods = new TQListViewItem( over, i18n( "Methods" ) ); - TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (TQt-specific)" ) ); PListViewItem<ClassDom> *access = new PListViewItem<ClassDom>( *classIt, access_view, ( *classIt ) ->name() ); TQListViewItem *access_methods = new TQListViewItem( access, i18n( "Methods" ) ); - TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (TQt-specific)" ) ); TQListViewItem *access_attrs = new TQListViewItem( access, i18n( "Attributes" ) ); FunctionList functionList = ( *classIt ) ->functionList(); @@ -1055,13 +1034,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) TQString inhModifier; //protected inheritance gives protected attributes - if ( inheritance.contains( "protected" ) ) + if ( inheritance.tqcontains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private attributes - else if ( inheritance.contains( "private" ) ) + else if ( inheritance.tqcontains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public attributes - else if ( inheritance.contains( "public" ) ) + else if ( inheritance.tqcontains( "public" ) ) inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_slots, *methodIt, inhModifier ); } @@ -1076,13 +1055,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) //see what modifier is given for the base class TQString inhModifier; //protected inheritance gives protected methods - if ( inheritance.contains( "protected" ) ) + if ( inheritance.tqcontains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private methods - else if ( inheritance.contains( "private" ) ) + else if ( inheritance.tqcontains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public methods - else if ( inheritance.contains( "public" ) ) + else if ( inheritance.tqcontains( "public" ) ) inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_methods, *methodIt, inhModifier ); } @@ -1097,13 +1076,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) { TQString inhModifier; //protected inheritance gives protected attributes - if ( inheritance.contains( "protected" ) ) + if ( inheritance.tqcontains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private attributes - else if ( inheritance.contains( "private" ) ) + else if ( inheritance.tqcontains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public attributes - else if ( inheritance.contains( "public" ) ) + else if ( inheritance.tqcontains( "public" ) ) inhModifier = ( *varIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_attrs, *varIt, inhModifier ); } @@ -1132,7 +1111,7 @@ void CppNewClassDialog::clearConstructorsList( bool clean ) TQListViewItemIterator it( constructors_view ); while ( it.current() ) { - if ( ! currBaseClasses.contains(it.current().text(0)) ) + if ( ! currBaseClasses.tqcontains(it.current().text(0)) ) delete it.current(); ++it; } @@ -1160,9 +1139,9 @@ void CppNewClassDialog::setAccessForItem( TQListViewItem *curr, TQString newAcce if ( !curr->text( 2 ).isEmpty() ) { if ( ( curr->text( 2 ) == "private" ) && ( ( newAccess == "public" ) || ( newAccess == "protected" ) ) ) - curr->setText( 2, TQString::null ); + curr->setText( 2, TQString() ); if ( ( curr->text( 2 ) == "protected" ) && ( ( newAccess == "public" ) && ( isPublic ) ) ) - curr->setText( 2, TQString::null ); + curr->setText( 2, TQString() ); } } @@ -1170,7 +1149,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess { TQListViewItem * base; - if ( ( base = access_view->findItem( baseclass, 0 ) ) ) + if ( ( base = access_view->tqfindItem( baseclass, 0 ) ) ) { TQListViewItemIterator it( base ); while ( it.current() ) @@ -1192,7 +1171,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int /*c*/ ) { - if ( item && ( ( button == LeftButton ) || ( button == RightButton ) ) && ( item->depth() > 1 ) ) + if ( item && ( ( button == Qt::LeftButton ) || ( button == Qt::RightButton ) ) && ( item->depth() > 1 ) ) { accessMenu->setItemEnabled( 1, true ); accessMenu->setItemEnabled( 2, true ); @@ -1217,7 +1196,7 @@ void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewIt 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() ) ) + if ( item && ( button == Qt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) { overMenu->exec( p ); } @@ -1232,7 +1211,7 @@ void CppNewClassDialog::extendFunctionality() void CppNewClassDialog::replaceFunctionality() { if ( methods_view->selectedItem() ) - methods_view->selectedItem() ->setText( 1, i18n( "replace" ) ); + methods_view->selectedItem() ->setText( 1, i18n( "tqreplace" ) ); } void CppNewClassDialog::selectall_button_clicked() @@ -1249,7 +1228,7 @@ void CppNewClassDialog::selectall_button_clicked() void CppNewClassDialog::to_constructors_list_clicked() { - TQString templateAdd = templateStrFormatted().isEmpty() ? TQString::null : templateStrFormatted() + "\n"; + TQString templateAdd = templateStrFormatted().isEmpty() ? TQString() : templateStrFormatted() + "\n"; TQString constructor_h = classNameFormatted(); TQString constructor_cpp = templateAdd + classNameFormatted() + templateParamsFormatted() + "::" + classNameFormatted(); constructor_h += "("; @@ -1265,13 +1244,13 @@ void CppNewClassDialog::to_constructors_list_clicked() PCheckListItem<FunctionDom> *curr; if ( ( curr = dynamic_cast<PCheckListItem<FunctionDom>* >( it.current() ) ) ) { - if ( curr->isOn() && curr->parent() ) + if ( curr->isOn() && curr->tqparent() ) { //fill the base classes list base += base.isEmpty() ? ": " : ", "; - base += curr->parent() ->text( 0 ); + base += curr->tqparent() ->text( 0 ); PCheckListItem<ClassDom> *p; - if ( ( p = dynamic_cast<PCheckListItem<ClassDom>* >( curr->parent() ) ) ) + if ( ( p = dynamic_cast<PCheckListItem<ClassDom>* >( curr->tqparent() ) ) ) { base += p->templateAddition; } @@ -1289,8 +1268,8 @@ void CppNewClassDialog::to_constructors_list_clicked() cparams += ( *argIt ) ->type() + " "; if ( ( *argIt ) ->name().isEmpty() ) { - cparams += TQString( "arg%1" ).arg( unnamed ); - bparams += TQString( "arg%1" ).arg( unnamed++ ); + cparams += TQString( "arg%1" ).tqarg( unnamed ); + bparams += TQString( "arg%1" ).tqarg( unnamed++ ); } else { @@ -1334,13 +1313,13 @@ bool CppNewClassDialog::ClassGenerator::validateInput() { className = dlg.classname_edit->text().simplifyWhiteSpace(); TQString temp = className; - className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); - templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( TQRegExp( " *class *$" ), "" ); + className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" ); + templateStr.tqreplace( TQRegExp( " *class *$" ), "" ); templateParams = templateStr; - templateParams.replace( TQRegExp( "^ *template *" ), "" ); - templateParams.replace( TQRegExp( " *class *" ), "" ); + templateParams.tqreplace( TQRegExp( "^ *template *" ), "" ); + templateParams.tqreplace( TQRegExp( " *class *" ), "" ); templateParams.simplifyWhiteSpace(); if ( className.isEmpty() ) @@ -1363,7 +1342,7 @@ bool CppNewClassDialog::ClassGenerator::validateInput() } /// \FIXME - if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesQMakeBuildSystem) ) + if ( ( header.tqfind( '/' ) != -1 || implementation.tqfind( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) ) { KMessageBox::error( &dlg, i18n( "Generated files will always be added to the " "active directory, so you must not give an " @@ -1397,7 +1376,7 @@ bool CppNewClassDialog::ClassGenerator::generate() return false; } - if( ( dlg.m_part->project() ->options() & KDevProject::UsesQMakeBuildSystem) ) + if( ( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) ) { 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; @@ -1458,7 +1437,7 @@ void CppNewClassDialog::ClassGenerator::common_text() headeronly = dlg.headeronly_box->isChecked(); if ( ( dlg.baseclasses_view->childCount() == 0 ) && childClass ) - new TQListViewItem( dlg.baseclasses_view, "TQWidget", "public" ); + new TQListViewItem( dlg.baseclasses_view, TQWIDGET_OBJECT_NAME_STRING, "public" ); if ( objc && ( dlg.baseclasses_view->childCount() == 0 ) ) new TQListViewItem( dlg.baseclasses_view, "NSObject", "public" ); @@ -1476,7 +1455,7 @@ void CppNewClassDialog::ClassGenerator::common_text() TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); if( !email.isEmpty() ) - author += TQString( " <%1>" ).arg( email ); + author += TQString( " <%1>" ).tqarg( email ); if ( dlg.gen_config->author_box->isChecked() ) doc.append( "\t@author " + author + "\n" ); @@ -1498,29 +1477,29 @@ void CppNewClassDialog::ClassGenerator::common_text() //advanced constructor creation - advConstructorsHeader = TQString::null; - advConstructorsSource = TQString::null; + advConstructorsHeader = TQString(); + advConstructorsSource = TQString(); if ( !dlg.constructors_h_edit->text().isEmpty() ) { advConstructorsHeader = " " + dlg.constructors_h_edit->text(); - advConstructorsHeader.replace( TQRegExp( "\n" ), "\n " ); + advConstructorsHeader.tqreplace( TQRegExp( "\n" ), "\n " ); } if ( !dlg.constructors_cpp_edit->text().isEmpty() ) { advConstructorsSource = dlg.constructors_cpp_edit->text(); } - advConstructorsHeader.replace( TQRegExp( "[\\n ]*$" ), TQString::null ); - advConstructorsSource.replace( TQRegExp( "[\\n ]*$" ), TQString::null ); + advConstructorsHeader.tqreplace( TQRegExp( "[\\n ]*$" ), TQString() ); + advConstructorsSource.tqreplace( TQRegExp( "[\\n ]*$" ), TQString() ); //advanced method overriding - 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; + advH_public = TQString(); + advH_public_slots = TQString(); + advH_protected = TQString(); + advH_protected_slots = TQString(); + advH_private = TQString(); + advH_private_slots = TQString(); + advCpp = TQString(); TQListViewItemIterator it( dlg.methods_view ); while ( it.current() ) @@ -1528,7 +1507,7 @@ void CppNewClassDialog::ClassGenerator::common_text() PCheckListItem<FunctionDom> *curr; if ( ( curr = dynamic_cast<PCheckListItem<FunctionDom>* >( it.current() ) ) ) { - if ( curr->isOn() && ( curr->parent() ) && ( curr->parent() ->parent() ) ) + if ( curr->isOn() && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) ) { TQString * adv_h = 0; if ( curr->item() ->access() == CodeModelItem::Private ) @@ -1540,9 +1519,9 @@ void CppNewClassDialog::ClassGenerator::common_text() // if (advCpp.isEmpty()) advCpp += "\n\n"; - TQString bcName = curr->parent() ->parent() ->text( 0 ); + TQString bcName = curr->tqparent() ->tqparent() ->text( 0 ); PListViewItem<ClassDom> *bc; - if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->parent() ->parent() ) ) ) + if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->tqparent() ->tqparent() ) ) ) { bcName += bc->templateAddition; } @@ -1561,7 +1540,7 @@ void CppNewClassDialog::ClassGenerator::common_text() PListViewItem<FunctionDom> *curr_m; if ( ( curr = dynamic_cast<PListViewItem<VariableDom>* >( ita.current() ) ) ) { - if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->parent() ) && ( curr->parent() ->parent() ) ) + if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) ) { TQString * adv_h = 0; if ( curr->text( 2 ) == "private" ) @@ -1574,12 +1553,12 @@ void CppNewClassDialog::ClassGenerator::common_text() /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ if ( adv_h ) - *adv_h += TQString( " using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; + *adv_h += TQString( " using " ) + curr->tqparent() ->tqparent() ->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() ) ) + if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->tqparent() ) && ( curr_m->tqparent() ->tqparent() ) ) { TQString * adv_h = 0; if ( curr_m->text( 2 ) == "private" ) @@ -1593,22 +1572,22 @@ void CppNewClassDialog::ClassGenerator::common_text() *adv_h += "\n\n";*/ TQString methodName = curr_m->item() ->name(); - if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) + if ( !methodName.tqcontains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; - *adv_h += " using " + curr_m->parent() ->parent() ->text( 0 ) + "::" + methodName + ";\n"; + *adv_h += " using " + curr_m->tqparent() ->tqparent() ->text( 0 ) + "::" + methodName + ";\n"; } } ++ita; } 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 ); + advH_public.tqreplace( e, TQString() ); + advH_public_slots.tqreplace( e, TQString() ); + advH_protected.tqreplace( e, TQString() ); + advH_protected_slots.tqreplace( e, TQString() ); + advH_private.tqreplace( e, TQString() ); + advH_private_slots.tqreplace( e, TQString() ); + advCpp.tqreplace( e, TQString() ); } void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method, @@ -1617,7 +1596,7 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ TQString methodName = method->name(); - if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) + if ( !methodName.tqcontains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; *adv_h += " " + ( method->isVirtual() ? TQString( "virtual " ) : TQString( "" ) ) + ( method->isStatic() ? TQString( "static " ) : TQString( "" ) ) @@ -1639,8 +1618,8 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method cparams += ( *argIt ) ->type() + " "; if ( ( *argIt ) ->name().isEmpty() ) { - cparams += TQString( "arg%1" ).arg( unnamed ); - bparams += TQString( "arg%1" ).arg( unnamed++ ); + cparams += TQString( "arg%1" ).tqarg( unnamed ); + bparams += TQString( "arg%1" ).tqarg( unnamed++ ); } else { @@ -1678,8 +1657,8 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() classImpl = FileTemplate::read( dlg.m_part, fi.extension( true ) ); } - classImpl.replace( TQRegExp( "\\$MODULE\\$" ), module ); - classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); + classImpl.tqreplace( TQRegExp( "\\$MODULE\\$" ), module ); + classImpl.tqreplace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); if ( objc ) { @@ -1710,7 +1689,7 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() } TQString relPath; - for ( int i = implementation.findRev( '/' ); i != -1; i = implementation.findRev( '/', --i ) ) + for ( int i = implementation.tqfindRev( '/' ); i != -1; i = implementation.tqfindRev( '/', --i ) ) relPath += "../"; TQString constructors = ( advConstructorsSource.isEmpty() ? TQString( "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::$CLASSNAME$($ARGS$)\n" @@ -1728,26 +1707,26 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "TQWidget *parent = 0, const char *name = 0"; - argsCpp = "TQWidget *parent, const char *name"; + argsH = "TQWidget *tqparent = 0, const char *name = 0"; + argsCpp = "TQWidget *tqparent, const char *name"; } else { - argsH = "TQWidget *parent = 0"; - argsCpp = "TQWidget *parent"; + argsH = "TQWidget *tqparent = 0"; + argsCpp = "TQWidget *tqparent"; } } else if ( qobject ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "TQObject *parent = 0, const char *name = 0"; - argsCpp = "TQObject *parent, const char *name"; + argsH = "TQObject *tqparent = 0, const char *name = 0"; + argsCpp = "TQObject *tqparent, const char *name"; } else { - argsH = "TQObject *parent = 0"; - argsCpp = "TQObject *parent"; + argsH = "TQObject *tqparent = 0"; + argsCpp = "TQObject *tqparent"; } } else @@ -1760,16 +1739,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( childClass && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : TQWidget(parent, name)"; + baseInitializer = " : TQWidget(tqparent, name)"; else - baseInitializer = " : TQWidget(parent)"; + baseInitializer = " : TQWidget(tqparent)"; } else if ( qobject && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : TQObject(parent, name)"; + baseInitializer = " : TQObject(tqparent, name)"; else - baseInitializer = " : TQObject(parent)"; + baseInitializer = " : TQObject(tqparent)"; } else if ( dlg.baseclasses_view->childCount() != 0 ) { @@ -1787,16 +1766,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( childClass && ( baseInitializer == " : " ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer += it.current()->text( 0 ) + "(parent, name)"; + baseInitializer += it.current()->text( 0 ) + "(tqparent, name)"; else - baseInitializer += it.current()->text( 0 ) + "(parent)"; + baseInitializer += it.current()->text( 0 ) + "(tqparent)"; } else if ( qobject && ( baseInitializer == " : " ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer += it.current()->text( 0 ) + "(parent, name)"; + baseInitializer += it.current()->text( 0 ) + "(tqparent, name)"; else - baseInitializer += it.current()->text( 0 ) + "(parent)"; + baseInitializer += it.current()->text( 0 ) + "(tqparent)"; } else { @@ -1808,22 +1787,22 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() baseInitializer += "\n"; } - constructors.replace( TQRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer ); - constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + constructors.tqreplace( TQRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer ); + constructors.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className ); // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); if ( templateStr.isEmpty() ) { - constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$\\n" ), "" ); - constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), "" ); + constructors.tqreplace( TQRegExp( "\\$TEMPLATESTR\\$\\n" ), "" ); + constructors.tqreplace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), "" ); } else { - constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$" ), templateStr ); - constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams ); - classImpl.replace( TQRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" ); + constructors.tqreplace( TQRegExp( "\\$TEMPLATESTR\\$" ), templateStr ); + constructors.tqreplace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams ); + classImpl.tqreplace( TQRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" ); } // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); - constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsCpp ); + constructors.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsCpp ); // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); @@ -1831,19 +1810,19 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() TQString hp = relPath + header; beautifySource( classImpl, hp, className, namespaceBeg, constructors, advCpp, namespaceEnd, 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 ); + classImpl.tqreplace( TQRegExp( "\\$HEADER\\$" ), relPath + header ); + classImpl.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + classImpl.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); + classImpl.tqreplace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors ); + classImpl.tqreplace( TQRegExp( "\\$DEFINITIONS\\$" ), advCpp ); + classImpl.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); + classImpl.tqreplace( TQRegExp( "\\$FILENAME\\$" ), implementation ); if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) ) { - TQString moc = header; - moc.replace( TQRegExp( "\\..*" ), ".moc" ); - classImpl += "#include \"" + moc + "\"\n"; + TQString tqmoc = header; + tqmoc.tqreplace( TQRegExp( "\\..*" ), ".tqmoc" ); + classImpl += "#include \"" + tqmoc + "\"\n"; } if ( dlg.gen_config->reformat_box->isChecked() ) @@ -1889,8 +1868,8 @@ void CppNewClassDialog::ClassGenerator::gen_interface() classIntf = FileTemplate::read( dlg.m_part, fi.extension( true ) ); } - classIntf.replace( TQRegExp( "\\$MODULE\\$" ), module ); - classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); + classIntf.tqreplace( TQRegExp( "\\$MODULE\\$" ), module ); + classIntf.tqreplace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); if ( objc ) { @@ -1912,16 +1891,16 @@ void CppNewClassDialog::ClassGenerator::gen_interface() + namespaceBeg + TQString("class $CLASSNAME$$INHERITANCE$\n" "{\n" - "$QOBJECT$" + "$TQOBJECT$" "public:\n") + ( advConstructorsHeader.isEmpty() ? TQString(" $CLASSNAME$($ARGS$);\n") : advConstructorsHeader ) + TQString("\n ~$CLASSNAME$();\n") + advH_public - + (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)) + + (advH_public_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\npublic slots:" + advH_public_slots)) + + (advH_protected.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected:" + advH_protected)) + + (advH_protected_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots)) + + (advH_private.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate:" + advH_private)) + + (advH_private_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate slots:" + advH_private_slots)) + TQString("};\n" "\n") + namespaceEnd @@ -1932,21 +1911,21 @@ void CppNewClassDialog::ClassGenerator::gen_interface() switch ( dlg.gen_config->defCase() ) { case ClassGeneratorConfig::UpperCase: - headerGuard = namespaceStr.upper() + header.mid( header.findRev( "/" )+1 ).upper(); + headerGuard = namespaceStr.upper() + header.mid( header.tqfindRev( "/" )+1 ).upper(); break; case ClassGeneratorConfig::LowerCase: - headerGuard = namespaceStr.lower() + header.mid( header.findRev( "/" )+1 ).lower(); + headerGuard = namespaceStr.lower() + header.mid( header.tqfindRev( "/" )+1 ).lower(); break; case ClassGeneratorConfig::SameAsFileCase: - headerGuard = dlg.header_edit->text().mid( dlg.header_edit->text().findRev( "/" )+1 ); + headerGuard = dlg.header_edit->text().mid( dlg.header_edit->text().tqfindRev( "/" )+1 ); break; case ClassGeneratorConfig::SameAsClassCase: - headerGuard = namespaceStr + header.mid( header.findRev( "/" )+1 ); + headerGuard = namespaceStr + header.mid( header.tqfindRev( "/" )+1 ); break; } - headerGuard.replace( TQRegExp( "\\." ), "_" ); - headerGuard.replace( TQRegExp( "::" ), "_" ); + headerGuard.tqreplace( TQRegExp( "\\." ), "_" ); + headerGuard.tqreplace( TQRegExp( "::" ), "_" ); TQString includeBaseHeader; if( dlg.m_part->qtBuildConfig()->isUsed() ) { @@ -1983,8 +1962,8 @@ void CppNewClassDialog::ClassGenerator::gen_interface() { if ( !it.current() ->text( 0 ).isEmpty() ) if ( !it.current() ->text( 3 ).isEmpty() ) - // if ((!childClass) || (it.current()->text(0) != "TQWidget")) - includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) + + // if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING)) + includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::tqfromLatin1( "#include " ) + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) ) + it.current() ->text( 3 ) + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) ); @@ -1995,7 +1974,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); if( !email.isEmpty() ) - author += TQString( " <%1>" ).arg( email ); + author += TQString( " <%1>" ).tqarg( email ); TQString inheritance; if ( dlg.baseclasses_view->childCount() > 0 ) @@ -2009,13 +1988,13 @@ void CppNewClassDialog::ClassGenerator::gen_interface() { if ( inheritance != " : " ) inheritance += ", "; - if ( it.current() ->text( 1 ).contains( "virtual" ) ) + if ( it.current() ->text( 1 ).tqcontains( "virtual" ) ) inheritance += "virtual "; - if ( it.current() ->text( 1 ).contains( "public" ) ) + if ( it.current() ->text( 1 ).tqcontains( "public" ) ) inheritance += "public "; - if ( it.current() ->text( 1 ).contains( "protected" ) ) + if ( it.current() ->text( 1 ).tqcontains( "protected" ) ) inheritance += "protected "; - if ( it.current() ->text( 1 ).contains( "private" ) ) + if ( it.current() ->text( 1 ).tqcontains( "private" ) ) inheritance += "private "; inheritance += it.current() ->text( 0 ); } @@ -2029,12 +2008,12 @@ void CppNewClassDialog::ClassGenerator::gen_interface() TQString( " $CLASSNAME$($ARGS$);" ) : advConstructorsHeader ) + TQString( "\n\n ~$CLASSNAME$();" ); - constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); - constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsH ); + constructors.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + constructors.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsH ); TQString qobjectStr; if ( childClass || qobject ) - qobjectStr = "Q_OBJECT"; + qobjectStr = "TQ_OBJECT"; TQString baseclass; @@ -2047,30 +2026,30 @@ void CppNewClassDialog::ClassGenerator::gen_interface() advH_protected, advH_protected_slots, advH_private, advH_private_slots, namespaceEnd ); - 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 ); + classIntf.tqreplace( TQRegExp( "\\$HEADERGUARD\\$" ), headerGuard ); + classIntf.tqreplace( TQRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader ); + classIntf.tqreplace( TQRegExp( "\\$AUTHOR\\$" ), author ); + classIntf.tqreplace( TQRegExp( "\\$DOC\\$" ), doc ); + classIntf.tqreplace( TQRegExp( "\\$TEMPLATE\\$" ), templateStr ); + classIntf.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className ); if ( dlg.baseclasses_view->childCount() > 0 ) - 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 ); + classIntf.tqreplace( TQRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) ); + classIntf.tqreplace( TQRegExp( "\\$INHERITANCE\\$" ), inheritance ); + classIntf.tqreplace( TQRegExp( "\\$TQOBJECT\\$" ), qobjectStr ); + classIntf.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsH ); + classIntf.tqreplace( TQRegExp( "\\$FILENAME\\$" ), header ); + classIntf.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); + classIntf.tqreplace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors ); + classIntf.tqreplace( TQRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public ); + classIntf.tqreplace( TQRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots ); + classIntf.tqreplace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), TQString( "protected:\n" ) + advH_protected ); + classIntf.tqreplace( TQRegExp( "\\$PROTECTEDSLOTS\\$" ), TQString( "protected slots:\n" ) + advH_protected_slots ); + classIntf.tqreplace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$" ), TQString( "private:\n" ) + advH_private ); + classIntf.tqreplace( TQRegExp( "\\$PRIVATESLOTS\\$" ), TQString( "private slots:\n" ) + advH_private_slots ); + classIntf.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); if ( !templateStr.isEmpty() && (!headeronly) ) - classIntf.replace( TQRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" ); + classIntf.tqreplace( TQRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" ); if ( dlg.gen_config->reformat_box->isChecked() ) { @@ -2102,45 +2081,45 @@ void CppNewClassDialog::ClassGenerator::beautifyHeader( TQString &templ, TQStrin TQString &namespaceEnd ) { if ( headerGuard.isEmpty() ) - templ.replace( TQRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), TQString() ); if ( includeBaseHeader.isEmpty() ) - templ.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), TQString() ); if ( author.isEmpty() ) - templ.replace( TQRegExp( "\\$AUTHOR\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$AUTHOR\\$[\\n ]*" ), TQString() ); if ( doc.isEmpty() ) - templ.replace( TQRegExp( "\\$DOC\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$DOC\\$[\\n ]*" ), TQString() ); if ( className.isEmpty() ) - templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString() ); if ( templateStr.isEmpty() ) - templ.replace( TQRegExp( "\\$TEMPLATE\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$TEMPLATE\\$[\\n ]*" ), TQString() ); if ( baseclass.isEmpty() ) - templ.replace( TQRegExp( "\\$BASECLASS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$BASECLASS\\$[\\n ]*" ), TQString() ); if ( inheritance.isEmpty() ) - templ.replace( TQRegExp( "\\$INHERITANCE\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$INHERITANCE\\$[\\n ]*" ), TQString() ); if ( qobjectStr.isEmpty() ) - templ.replace( TQRegExp( "\\$QOBJECT\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$TQOBJECT\\$[\\n ]*" ), TQString() ); if ( args.isEmpty() ) - templ.replace( TQRegExp( "\\$ARGS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$ARGS\\$[\\n ]*" ), TQString() ); if ( header.isEmpty() ) - templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString() ); if ( namespaceBeg.isEmpty() ) - templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString() ); if ( constructors.isEmpty() ) - templ.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), TQString() ); if ( advH_public.isEmpty() ) - templ.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), TQString() ); if ( advH_public_slots.isEmpty() ) - templ.replace( TQRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), TQString() ); if ( advH_protected.isEmpty() ) - templ.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), TQString() ); if ( advH_protected_slots.isEmpty() ) - templ.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), TQString() ); if ( advH_private.isEmpty() ) - templ.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), TQString() ); if ( advH_private_slots.isEmpty() ) - templ.replace( TQRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), TQString() ); if ( namespaceEnd.isEmpty() ) - templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString() ); } @@ -2148,19 +2127,19 @@ void CppNewClassDialog::ClassGenerator::beautifySource( TQString &templ, TQStrin TQString &constructors, TQString &advCpp, TQString &namespaceEnd, TQString &implementation ) { if ( header.isEmpty() ) - templ.replace( TQRegExp( "\\$HEADER\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$HEADER\\$[\\n ]*" ), TQString() ); if ( className.isEmpty() ) - templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString() ); if ( namespaceBeg.isEmpty() ) - templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString() ); if ( constructors.isEmpty() ) - templ.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), TQString() ); if ( advCpp.isEmpty() ) - templ.replace( TQRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), TQString() ); if ( namespaceEnd.isEmpty() ) - templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString() ); if ( implementation.isEmpty() ) - templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString::null ); + templ.tqreplace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString() ); } TQString CppNewClassDialog::classNameFormatted( ) @@ -2171,7 +2150,7 @@ TQString CppNewClassDialog::classNameFormatted( ) TQString CppNewClassDialog::classNameFormatted( const TQString &name ) { TQString temp = name.simplifyWhiteSpace(); - return temp.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + return temp.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" ); } @@ -2184,9 +2163,9 @@ TQString CppNewClassDialog::templateStrFormatted( const TQString &name ) { TQString className = name.simplifyWhiteSpace(); TQString temp = className; - className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); - TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( TQRegExp( " *class *$" ), "" ); + className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" ); + templateStr.tqreplace( TQRegExp( " *class *$" ), "" ); return templateStr; } @@ -2199,13 +2178,13 @@ TQString CppNewClassDialog::templateParamsFormatted( const TQString &name ) { TQString className = name.simplifyWhiteSpace(); TQString temp = className; - className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); - TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( TQRegExp( " *class *$" ), "" ); + className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" ); + templateStr.tqreplace( TQRegExp( " *class *$" ), "" ); TQString templateParams = templateStr; - templateParams.replace( TQRegExp( "^ *template *" ), "" ); - templateParams.replace( TQRegExp( " *class *" ), "" ); + templateParams.tqreplace( TQRegExp( "^ *template *" ), "" ); + templateParams.tqreplace( TQRegExp( " *class *" ), "" ); templateParams.simplifyWhiteSpace(); return templateParams; @@ -2215,19 +2194,19 @@ TQString CppNewClassDialog::templateActualParamsFormatted( const TQString & name { TQString className = name.simplifyWhiteSpace(); TQString temp = className; - className.replace( TQRegExp( "<.*> *" ), "" ); - TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); + className.tqreplace( TQRegExp( "<.*> *" ), "" ); + TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" ); return templateStr; } void CppNewClassDialog::removeTemplateParams( TQString & name ) { - name.replace( TQRegExp( "<.*> *" ), "" ); + name.tqreplace( TQRegExp( "<.*> *" ), "" ); } bool CppNewClassDialog::isDestructor( TQString className, const FunctionDom &method ) { - if ( m_part->formatModelItem( method.data() ).contains( TQRegExp( " *~ *" + className ) ) ) + if ( m_part->formatModelItem( method.data() ).tqcontains( TQRegExp( " *~ *" + className ) ) ) return true; return false; } @@ -2239,4 +2218,4 @@ void CppNewClassDialog::headeronly_box_stateChanged(int val) #include "cppnewclassdlg.moc" -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on +//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index fcff0bd0..39e9e458 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -31,40 +31,40 @@ class CodeModel; template <class T> -class PCheckListItem: public QCheckListItem +class PCheckListItem: public TQCheckListItem { public: - PCheckListItem ( T item, TQCheckListItem * parent, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( parent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * tqparent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( tqparent, 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, TQCheckListItem * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( tqparent, after, 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, TQListViewItem * tqparent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( tqparent, 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, TQListViewItem * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( tqparent, after, 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, TQListView * tqparent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( tqparent, 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, TQListView * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( tqparent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, const TQPixmap & p ) : - TQCheckListItem ( parent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * tqparent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( tqparent, text, p ), m_item( item ) {} - PCheckListItem ( T item, TQListView * parent, const TQString & text, const TQPixmap & p ) : - TQCheckListItem ( parent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListView * tqparent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( tqparent, text, p ), m_item( item ) {} T item() @@ -79,24 +79,24 @@ private: }; template <class T> -class PListViewItem: public QListViewItem +class PListViewItem: public TQListViewItem { public: - PListViewItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text ) : - TQListViewItem ( parent, after, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * tqparent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( tqparent, after, text ), m_item( item ) {} - PListViewItem ( T item, TQListViewItem * parent, const TQString & text ) : - TQListViewItem ( parent, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * tqparent, const TQString & text ) : + TQListViewItem ( tqparent, text ), m_item( item ) {} - PListViewItem ( T item, TQListView * parent, const TQString & text ) : - TQListViewItem ( parent, text ), m_item( item ) + PListViewItem ( T item, TQListView * tqparent, const TQString & text ) : + TQListViewItem ( tqparent, text ), m_item( item ) {} - PListViewItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text ) : - TQListViewItem ( parent, after, text ), m_item( item ) + PListViewItem ( T item, TQListView * tqparent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( tqparent, after, text ), m_item( item ) {} T item() @@ -113,9 +113,10 @@ private: class CppNewClassDialog : public CppNewClassDialogBase { Q_OBJECT + TQ_OBJECT public: - CppNewClassDialog( CppSupportPart *part, TQWidget *parent = 0, const char *name = 0 ); + CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent = 0, const char *name = 0 ); ~CppNewClassDialog(); protected: @@ -140,7 +141,7 @@ protected: virtual void scopeboxActivated( int value ); virtual void checkObjCInheritance( int val ); - virtual void checkQWidgetInheritance( int val ); + virtual void checkTQWidgetInheritance( int val ); virtual void upbaseclass_button_clicked(); virtual void downbaseclass_button_clicked(); @@ -167,9 +168,9 @@ protected: 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 addToMethodsList( TQListViewItem *tqparent, FunctionDom method ); + void addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier ); + void addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier ); void clearConstructorsList( bool clean = false ); void clearMethodsList( bool clean = false ); void clearUpgradeList( bool clean = false ); diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 4f443eaf..5d1580e4 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CppNewClassDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CppNewClassDlgBase</cstring> </property> @@ -22,11 +22,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>class_tabs</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab1</cstring> </property> @@ -47,14 +47,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>10</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -65,7 +65,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>documentation_label_</cstring> </property> @@ -76,7 +76,7 @@ <cstring>documentation_edit</cstring> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>documentation_edit</cstring> </property> @@ -89,7 +89,7 @@ doxygen or similar tools.</string> </widget> </vbox> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>filenames_group</cstring> </property> @@ -100,7 +100,7 @@ doxygen or similar tools.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>header_label</cstring> </property> @@ -122,7 +122,7 @@ you select the classname, but you can still edit it afterwards.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>implementation_label</cstring> </property> @@ -144,7 +144,7 @@ you select the classname, but you can still edit it afterwards.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>headeronly_box</cstring> </property> @@ -154,7 +154,7 @@ still edit it afterwards.</string> </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -165,7 +165,7 @@ still edit it afterwards.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>classname_label</cstring> </property> @@ -194,7 +194,7 @@ You can also define template classes by specifying template <params> classname</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>namespace_label</cstring> </property> @@ -225,7 +225,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> </hbox> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>inheritance_group</cstring> </property> @@ -236,7 +236,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>addbaseclass_button</cstring> </property> @@ -255,7 +255,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="3" column="0"> + <widget class="TQPushButton" row="3" column="0"> <property name="name"> <cstring>rembaseclass_button</cstring> </property> @@ -270,7 +270,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -283,7 +283,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>upbaseclass_button</cstring> </property> @@ -305,7 +305,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="5" column="0"> + <widget class="TQPushButton" row="5" column="0"> <property name="name"> <cstring>downbaseclass_button</cstring> </property> @@ -320,7 +320,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -333,7 +333,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>basename_label</cstring> </property> @@ -352,7 +352,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <cstring>basename_edit</cstring> </property> </widget> - <widget class="QListView" row="2" column="1" rowspan="4" colspan="2"> + <widget class="TQListView" row="2" column="1" rowspan="4" colspan="2"> <column> <property name="text"> <string>Baseclass Name</string> @@ -403,7 +403,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -413,7 +413,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <enum>StrongFocus</enum> </property> <property name="whatsThis" stdset="0"> - <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a parent class. You can also use template classes here (like BaseClass<int, int>)</string> + <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a tqparent class. You can also use template classes here (like BaseClass<int, int>)</string> </property> </widget> <widget class="KLineEdit" row="0" column="2"> @@ -431,7 +431,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -444,15 +444,15 @@ Namespace1::Namespace2::...::NamespaceN</string> <string></string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Global</string> @@ -478,7 +478,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </sizepolicy> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>virtual_box</cstring> </property> @@ -489,7 +489,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <string>Virtual</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>public_button</cstring> </property> @@ -503,7 +503,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>protected_button</cstring> </property> @@ -514,7 +514,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <string>Protected</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>private_button</cstring> </property> @@ -529,7 +529,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="1"> + <widget class="TQGroupBox" row="2" column="1"> <property name="name"> <cstring>optionsBox</cstring> </property> @@ -540,7 +540,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>filetemplate_box</cstring> </property> @@ -551,7 +551,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>qobject_box</cstring> </property> @@ -559,7 +559,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <string>Generate QOb&ject child class</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>childclass_box</cstring> </property> @@ -567,7 +567,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <string>Generate Q&Widget child class</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>gtk_box</cstring> </property> @@ -575,7 +575,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <string>Generate G&TK+ class</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>objc_box</cstring> </property> @@ -587,7 +587,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab2</cstring> </property> @@ -598,11 +598,11 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget4</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -613,7 +613,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Base Class Constructors</string> @@ -638,15 +638,15 @@ Namespace1::Namespace2::...::NamespaceN</string> <enum>AllColumns</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>to_constructors_list</cstring> </property> @@ -658,7 +658,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>125</width> <height>0</height> @@ -668,7 +668,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <string>C&reate Constructor >></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>clear_selection_button</cstring> </property> @@ -680,7 +680,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>125</width> <height>0</height> @@ -700,7 +700,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>20</height> @@ -709,11 +709,11 @@ Namespace1::Namespace2::...::NamespaceN</string> </spacer> </hbox> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget3</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab_header</cstring> </property> @@ -727,7 +727,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="margin"> <number>2</number> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>constructors_h_edit</cstring> </property> @@ -748,7 +748,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab_source</cstring> </property> @@ -762,7 +762,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="margin"> <number>2</number> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>constructors_cpp_edit</cstring> </property> @@ -786,7 +786,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -797,7 +797,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Methods</string> @@ -841,7 +841,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -852,7 +852,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Methods & Attributes</string> @@ -915,7 +915,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -937,7 +937,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </grid> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -958,14 +958,14 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>ok_button</cstring> </property> @@ -976,7 +976,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancel_button</cstring> </property> @@ -1092,9 +1092,9 @@ Namespace1::Namespace2::...::NamespaceN</string> </connection> <connection> <sender>baseclasses_view</sender> - <signal>currentChanged(QListViewItem*)</signal> + <signal>currentChanged(TQListViewItem*)</signal> <receiver>CppNewClassDlgBase</receiver> - <slot>currBaseSelected(QListViewItem*)</slot> + <slot>currBaseSelected(TQListViewItem*)</slot> </connection> <connection> <sender>upbaseclass_button</sender> @@ -1134,15 +1134,15 @@ Namespace1::Namespace2::...::NamespaceN</string> </connection> <connection> <sender>access_view</sender> - <signal>mouseButtonPressed(int,QListViewItem*,const QPoint&,int)</signal> + <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</signal> <receiver>CppNewClassDlgBase</receiver> - <slot>access_view_mouseButtonPressed(int,QListViewItem*,const QPoint&,int)</slot> + <slot>access_view_mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</slot> </connection> <connection> <sender>methods_view</sender> - <signal>mouseButtonPressed(int,QListViewItem*,const QPoint&,int)</signal> + <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</signal> <receiver>CppNewClassDlgBase</receiver> - <slot>methods_view_mouseButtonPressed(int,QListViewItem*,const QPoint&,int)</slot> + <slot>methods_view_mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</slot> </connection> <connection> <sender>clear_selection_button</sender> @@ -1239,9 +1239,9 @@ Namespace1::Namespace2::...::NamespaceN</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">updateClassStore()</slot> - <slot access="protected">access_view_mouseButtonPressed( int button, QListViewItem * item, const QPoint & p, int c )</slot> + <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const QPoint & p, int c )</slot> <slot access="protected">classNameChanged( const QString & text )</slot> <slot access="protected">headerChanged()</slot> <slot access="protected">implementationChanged()</slot> @@ -1253,7 +1253,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">currBaseProtectedSet()</slot> <slot access="protected">currBasePublicSet()</slot> <slot access="protected">currBaseVirtualChanged( int val )</slot> - <slot access="protected">currBaseSelected( QListViewItem * it )</slot> + <slot access="protected">currBaseSelected( TQListViewItem * it )</slot> <slot access="protected">checkObjCInheritance( int val )</slot> <slot access="protected">checkQWidgetInheritance( int val )</slot> <slot access="protected">newTabSelected( const QString & text )</slot> @@ -1261,7 +1261,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">changeToProtected()</slot> <slot access="protected">changeToPublic()</slot> <slot access="protected">changeToInherited()</slot> - <slot access="protected">methods_view_mouseButtonPressed( int, QListViewItem *, const QPoint &, int )</slot> + <slot access="protected">methods_view_mouseButtonPressed( int, TQListViewItem *, const QPoint &, int )</slot> <slot access="protected">newTabSelected( QWidget * w )</slot> <slot access="protected">extendFunctionality()</slot> <slot access="protected">replaceFunctionality()</slot> @@ -1281,9 +1281,9 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">scopeboxActivated( int )</slot> <slot access="protected">classNamespaceChanged( const QString & )</slot> <slot access="protected">headeronly_box_stateChanged(int val)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>classgeneratorconfig.h</includehint> </includehints> diff --git a/languages/cpp/cppsplitheadersourceconfig.cpp b/languages/cpp/cppsplitheadersourceconfig.cpp index 7298354b..a9edc315 100644 --- a/languages/cpp/cppsplitheadersourceconfig.cpp +++ b/languages/cpp/cppsplitheadersourceconfig.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tqdom.h> -TQString CppSplitHeaderSourceConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/splitheadersource" ); +TQString CppSplitHeaderSourceConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/splitheadersource" ); CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, TQDomDocument* dom ) : TQObject( part ), m_part( part ), m_dom( dom ) diff --git a/languages/cpp/cppsplitheadersourceconfig.h b/languages/cpp/cppsplitheadersourceconfig.h index 20c0f94d..049d3236 100644 --- a/languages/cpp/cppsplitheadersourceconfig.h +++ b/languages/cpp/cppsplitheadersourceconfig.h @@ -26,9 +26,10 @@ class CppSupportPart; class TQDomDocument; -class CppSplitHeaderSourceConfig : public QObject +class CppSplitHeaderSourceConfig : public TQObject { Q_OBJECT + TQ_OBJECT public: CppSplitHeaderSourceConfig( CppSupportPart* part, TQDomDocument* dom ); virtual ~CppSplitHeaderSourceConfig(); diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h index 2dbac39a..b40fc0ec 100644 --- a/languages/cpp/cppsupport_events.h +++ b/languages/cpp/cppsupport_events.h @@ -17,11 +17,7 @@ #include <tqevent.h> #include <tqvaluelist.h> -#if QT_VERSION < 0x030100 -#include <kdevmutex.h> -#else #include <tqmutex.h> -#endif enum { @@ -29,7 +25,7 @@ enum }; -class FileParsedEvent: public QCustomEvent +class FileParsedEvent: public TQCustomEvent { public: FileParsedEvent( const TQString& fileName, const TQValueList<Problem>& problems, bool fromDisk = false ) diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index 338fa724..b4be045d 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -75,7 +75,7 @@ TQMap<TQString, TQString> typedefMap( const CodeModel* model ) TQMap<TQString, TQString>::iterator it = map.begin(); for ( ; it != map.end(); ++it ) { - while ( map.contains( map[ it.key() ] ) && + while ( map.tqcontains( map[ it.key() ] ) && it.key() != map[ it.key() ] ) { map[ it.key() ] = map[ map[ it.key() ] ]; diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 334c7d6c..2fa5e2d8 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -191,8 +191,8 @@ public: }; -CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ) -: KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), +CppSupportPart::CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args ) +: KDevLanguageSupport( CppSupportFactory::info(), tqparent, 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 ), _jd(0) @@ -205,7 +205,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri this, TQT_SLOT( splitHeaderSourceConfigStored() ) ); connect( m_pCompletionConfig, TQT_SIGNAL( stored() ), this, TQT_SLOT( codeCompletionConfigStored() ) ); - m_qtBuildConfig = new QtBuildConfig( this, projectDom() ); + m_qtBuildConfig = new TQtBuildConfig( this, projectDom() ); m_qtBuildConfig->store(); m_backgroundParserConfig = new BackgroundParserConfig; @@ -480,7 +480,7 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) m_activeSelection = dynamic_cast<KTextEditor::SelectionInterface*>( part ); m_activeViewCursor = dynamic_cast<KTextEditor::ViewCursorInterface*>( m_activeView ); - m_activeFileName = TQString::null; + m_activeFileName = TQString(); if ( m_activeDocument ) { @@ -688,7 +688,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( !text.isEmpty() ) { 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 " + popup->tqsetWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file " "based on the member declaration at the current line." ) ); } @@ -737,7 +737,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { 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 " + popup->tqsetWhatsThis( 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." ) ); FileDom file2 = codeModel() ->fileByName( candidate ); @@ -753,7 +753,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) text += "::"; } text += formatModelItem( *it, true ); - text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); + text = text.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) ); int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); @@ -781,7 +781,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { 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 " + popup->tqsetWhatsThis( 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." ) ); const FileDom file = codeModel() ->fileByName( candidate1 ); @@ -794,7 +794,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) text += "::"; } text += formatModelItem( *it, true ); - text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); + text = text.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) ); int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); @@ -822,7 +822,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { m_activeClass = ( ClassModel* ) mcontext->item(); 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. " + popup->tqsetWhatsThis( 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." ) ); } else if ( mcontext->item() ->isFunction() ) @@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { m_contextFileName = url.path(); 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." ) ); + popup->tqsetWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } } @@ -850,7 +850,7 @@ 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() ) { + if( map.tqfind( *it ) == map.end() ) { ret << *it; map.insert( *it, true ); } @@ -871,14 +871,14 @@ TQStringList CppSupportPart::reorder( const TQStringList &list ) for ( it = list.begin(); it != list.end(); ++it ) { TQString filePath = *it; - // brilliant stuff.. this method is apparently called both with + // brilliant stuff.. this method is aptqparently called both with // relative and absolute paths.. if ( !filePath.startsWith("/") ) { filePath = projectPath + "/" + filePath; } if( !isValidSource( filePath ) ) continue; - if ( headerExtensions.contains( TQFileInfo( filePath ).extension() ) ) + if ( headerExtensions.tqcontains( TQFileInfo( filePath ).extension() ) ) headers << ( filePath ); else others << ( filePath ); @@ -945,7 +945,7 @@ void CppSupportPart::savedFile( const KURL &file ) kdDebug( 9007 ) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl; - if ( m_projectFileList.contains( fileName.mid ( m_projectDirectory.length() + 1 ) ) ) + if ( m_projectFileList.tqcontains( fileName.mid ( m_projectDirectory.length() + 1 ) ) ) { maybeParse( fileName ); emit addedSourceInfo( fileName ); @@ -962,7 +962,7 @@ TQString CppSupportPart::findSourceFile() // extract the base path (full path without '.' and extension) TQString base = path.left( path.length() - ext.length() - 1 ); TQStringList candidates; - if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) + if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).tqcontains( ext ) ) { candidates << ( base + ".c" ); candidates << ( base + ".cc" ); @@ -997,7 +997,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( partController() ->activePart() ); if ( !doc ) - return TQString::null; + return TQString(); urlPath = doc->url().path(); } else @@ -1010,14 +1010,14 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) // extract the exension TQString ext = fi.extension(); if ( ext.isEmpty() ) - return TQString::null; + return TQString(); // extract the base path (full path without '.' and extension) TQString base = path.left( path.length() - ext.length() - 1 ); //kdDebug( 9007 ) << "base: " << base << ", ext: " << ext << endl; // just the filename without the extension TQString fileNameWoExt = fi.fileName(); if ( !ext.isEmpty() ) - fileNameWoExt.replace( "." + ext, "" ); + fileNameWoExt.tqreplace( "." + ext, "" ); TQString possibleExts; // depending on the current extension assemble a list of // candidate files to look for @@ -1026,13 +1026,13 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) if ( path.endsWith( "_impl.h" ) ) { TQString headerpath = path; - headerpath.replace( "_impl.h", ".h" ); + headerpath.tqreplace( "_impl.h", ".h" ); candidates << headerpath; - fileNameWoExt.replace( "_impl", "" ); + fileNameWoExt.tqreplace( "_impl", "" ); possibleExts = "h"; } // if file is a header file search for implementation file - else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) + else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).tqcontains( ext ) ) { candidates << ( base + ".c" ); candidates << ( base + ".cc" ); @@ -1048,7 +1048,7 @@ TQString 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 ( TQStringList::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" ).tqcontains( ext ) ) { candidates << ( base + ".h" ); candidates << ( base + ".H" ); @@ -1059,7 +1059,7 @@ TQString 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 TQString::null if nothing is found. + // candidate file that actually exists or TQString() if nothing is found. TQStringList::ConstIterator it; for ( it = candidates.begin(); it != candidates.end(); ++it ) { @@ -1081,10 +1081,10 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) candidateFileWoExt.setFile(*fileIt); //kdDebug( 9007 ) << "candidate file: " << *fileIt << endl; if( !candidateFileWoExt.extension().isEmpty() ) - candidateFileWoExtString = candidateFileWoExt.fileName().replace( "." + candidateFileWoExt.extension(), "" ); + candidateFileWoExtString = candidateFileWoExt.fileName().tqreplace( "." + candidateFileWoExt.extension(), "" ); if ( candidateFileWoExtString == fileNameWoExt ) { - if ( possibleExtsList.contains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() ) + if ( possibleExtsList.tqcontains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() ) { //kdDebug( 9007 ) << "checking if " << *fileIt << " exists" << endl; if ( TQFileInfo( *fileIt ).exists() ) @@ -1093,7 +1093,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) } } } - return TQString::null; + return TQString(); } void CppSupportPart::slotSaveMemory() { @@ -1354,13 +1354,13 @@ KDevLanguageSupport::Features CppSupportPart::features() TQString CppSupportPart::formatClassName( const TQString &name ) { TQString n = name; - return n.replace( ".", "::" ); + return n.tqreplace( ".", "::" ); } TQString CppSupportPart::unformatClassName( const TQString &name ) { TQString n = name; - return n.replace( "::", "." ); + return n.tqreplace( "::", "." ); } bool CppSupportPart::shouldSplitDocument(const KURL &url) @@ -1506,7 +1506,7 @@ bool CppSupportPart::parseProject( bool force ) uint offset; _jd->stream >> fn >> ts >> offset; - _jd->pcs[ fn ] = qMakePair( ts, offset ); + _jd->pcs[ fn ] = tqMakePair( ts, offset ); } } } @@ -1554,11 +1554,11 @@ void CppSupportPart::slotParseFiles() { TQDateTime t = fileInfo.lastModified(); - if ( ! ( m_timestamp.contains( absFilePath ) && m_timestamp[ absFilePath ] == t ) ) + if ( ! ( m_timestamp.tqcontains( absFilePath ) && m_timestamp[ absFilePath ] == t ) ) { - if ( _jd->pcs.contains( absFilePath ) ) + if ( _jd->pcs.tqcontains( absFilePath ) ) { - _jd->stream.device() ->at( _jd->pcs[ absFilePath ].second ); + _jd->stream.tqdevice() ->at( _jd->pcs[ absFilePath ].second ); FileDom file = codeModel() ->create<FileModel>(); file->read( _jd->stream ); codeModel() ->addFile( file ); @@ -1678,7 +1678,7 @@ void CppSupportPart::maybeParse( const TQString& fn, bool background ) if ( !fileInfo.exists() ) return; - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( path ); if ( codeModel()->hasFile( fn ) && it != m_timestamp.end() && *it == t ) return; @@ -1705,7 +1705,7 @@ void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint { while ( node && node->nodeType() != NodeType_FunctionDefinition ) - node = node->parent(); + node = node->tqparent(); if ( node ) { @@ -1747,11 +1747,11 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum { if ( currentNode->nodeType() == NodeType_Declarator ) declarator = ( DeclaratorAST* ) currentNode; - currentNode = currentNode->parent(); + currentNode = currentNode->tqparent(); } SimpleDeclarationAST* decl = currentNode ? ( SimpleDeclarationAST* ) currentNode : 0; - if ( decl && decl->storageSpecifier() && decl->storageSpecifier()->text().contains("friend") ) + if ( decl && decl->storageSpecifier() && decl->storageSpecifier()->text().tqcontains("friend") ) { kdDebug(9007) << "this is a friend declaration, don't create any definition" << endl; fail = true; @@ -1777,7 +1777,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum TQString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace(); if ( declarator->exceptionSpecification() ) { - declStr += TQString::fromLatin1( " throw( " ); + declStr += TQString::tqfromLatin1( " throw( " ); TQPtrList<AST> l = declarator->exceptionSpecification() ->nodeList(); TQPtrListIterator<AST> type_it( l ); while ( type_it.current() ) @@ -1786,10 +1786,10 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum ++type_it; if ( type_it.current() ) - declStr += TQString::fromLatin1( ", " ); + declStr += TQString::tqfromLatin1( ", " ); } - declStr += TQString::fromLatin1( " )" ); + declStr += TQString::tqfromLatin1( " )" ); } text += "\n\n"; @@ -1903,7 +1903,7 @@ TQStringList CppSupportPart::modifiedFileList() TQDateTime t = fileInfo.lastModified(); - TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path ); + TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.tqfind( path ); if ( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t ) continue; @@ -1983,7 +1983,7 @@ void CppSupportPart::setupCatalog( ) kdDebug( 9007 ) << "CppSupportPart::setupCatalog()2 " << *it << endl; Catalog * catalog = new Catalog(); catalog->open( *it ); - catalog->setEnabled( enabledPCSs.contains( TQFileInfo( *it ).baseName(true) ) ); + catalog->setEnabled( enabledPCSs.tqcontains( TQFileInfo( *it ).baseName(true) ) ); ++it; for ( TQStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) @@ -2034,10 +2034,10 @@ TQString CppSupportPart::formatTag( const Tag & inputTag ) switch ( tag.kind() ) { case Tag::Kind_Namespace: - return TQString::fromLatin1( "namespace " ) + tag.name(); + return TQString::tqfromLatin1( "namespace " ) + tag.name(); case Tag::Kind_Class: - return TQString::fromLatin1( "class " ) + tag.name(); + return TQString::tqfromLatin1( "class " ) + tag.name(); case Tag::Kind_Function: case Tag::Kind_FunctionDeclaration: @@ -2179,25 +2179,25 @@ void CppSupportPart::saveProjectSourceInfo() { const FileDom dom = ( *it ); stream << dom->name() << m_timestamp[ dom->name() ].toTime_t(); - if( m_timestamp.find( dom->name() ) == m_timestamp.end() ) { + if( m_timestamp.tqfind( dom->name() ) == m_timestamp.end() ) { kdDebug( 9007 ) << dom->name() << ": timestamp is missing " << endl; } - offsets.insert( dom->name(), stream.device() ->at() ); + offsets.insert( dom->name(), stream.tqdevice() ->at() ); stream << ( uint ) 0; // dummy offset } for ( FileList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { const FileDom dom = ( *it ); - int offset = stream.device() ->at(); + int offset = stream.tqdevice() ->at(); dom->write( stream ); - int end = stream.device() ->at(); + int end = stream.tqdevice() ->at(); - stream.device() ->at( offsets[ dom->name() ] ); + stream.tqdevice() ->at( offsets[ dom->name() ] ); stream << offset; - stream.device() ->at( end ); + stream.tqdevice() ->at( end ); } TQFile::remove( project() ->projectDirectory() + "/" @@ -2259,7 +2259,7 @@ void CppSupportPart::slotExtractInterface( ) 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 ), + KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).tqarg( ifaceFileName ), i18n( "C++ Support" ) ); } else @@ -2323,7 +2323,7 @@ int CppSupportPart::parseFilesAndDependencies( TQStringList files, bool backgrou int cgroup = nextGroup; nextGroup++; - if( fileGroups.find( *it ) != fileGroups.end() ) + if( fileGroups.tqfind( *it ) != fileGroups.end() ) cgroup = fileGroups[*it]; for( TQStringList::iterator lit = lst.begin(); lit != lst.end(); ++lit ) @@ -2575,19 +2575,19 @@ void CppSupportPart::emitFileParsed( TQStringList l ) bool CppSupportPart::isHeader( const TQString& fileName ) const { /*KMimeType::Ptr ptr = KMimeType::findByPath( fileName ); - if ( ptr && m_headerMimeTypes.contains( ptr->name() ) ) + if ( ptr && m_headerMimeTypes.tqcontains( ptr->name() ) ) return true;*/ - return ( m_headerExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 ); + return ( m_headerExtensions.tqfindIndex( TQFileInfo( fileName ).extension() ) != -1 ); } bool CppSupportPart::isSource( const TQString& fileName ) const { /*KMimeType::Ptr ptr = KMimeType::findByPath( fileName ); - if ( ptr && m_sourceMimeTypes.contains( ptr->name() ) ) + if ( ptr && m_sourceMimeTypes.tqcontains( ptr->name() ) ) return true;*/ - return ( m_sourceExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 ); + return ( m_sourceExtensions.tqfindIndex( TQFileInfo( fileName ).extension() ) != -1 ); } void CppSupportPart::gotoDeclarationLine( int line ) @@ -2759,12 +2759,12 @@ KDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::Designer switch ( type ) { case KInterfaceDesigner::Glade: - case KInterfaceDesigner::QtDesigner: + case KInterfaceDesigner::TQtDesigner: des = m_designers[ type ]; if ( des == 0 ) { CppImplementationWidget * impl = new CppImplementationWidget( this ); - des = new QtDesignerCppIntegration( this, impl ); + des = new TQtDesignerCppIntegration( this, impl ); des->loadSettings( *project() ->projectDom(), "kdevcppsupport/designerintegration" ); m_designers[ type ] = des; } @@ -2791,7 +2791,7 @@ void CppSupportPart::slotCreateSubclass() TQFileInfo fi( m_contextFileName ); if ( fi.extension( false ) != "ui" ) return ; - QtDesignerCppIntegration *des = dynamic_cast<QtDesignerCppIntegration*>( designer( KInterfaceDesigner::QtDesigner ) ); + TQtDesignerCppIntegration *des = dynamic_cast<TQtDesignerCppIntegration*>( designer( KInterfaceDesigner::TQtDesigner ) ); if ( des ) des->selectImplementation( m_contextFileName ); } @@ -2825,7 +2825,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS indentString = sourceFormatter->indentString(); editIface->insertText( findInsertionLineMethod( aClass, accessType ), 0, - finalDeclaration.replace( "\n", "\n\t" ) + "\n" ); + finalDeclaration.tqreplace( "\n", "\n\t" ) + "\n" ); backgroundParser() ->addFile( aClass->fileName() ); if ( isInline || isPureVirtual ) @@ -2856,7 +2856,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS if ( !editIface ) return ; //@fixme errorverdoedelung - editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) ); + editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) ); editIface->insertText( editIface->numLines() - 1, 0, definitionString ); backgroundParser() ->addFile( implementationFile ); } @@ -3118,7 +3118,7 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { w.parseTranslationUnit( *file ); codeRepository()->touchCatalog( catalog ); - m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()) ); + m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()) ); } TQString CppSupportPart::findHeaderSimple( const TQString &header ) @@ -3133,17 +3133,17 @@ TQString CppSupportPart::findHeaderSimple( const TQString &header ) return s; } - return TQString::null; + return TQString(); } -UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : TQThread(), m_parent( parent ), m_stop(false) { +UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& tqparent ) : TQThread(), m_parent( tqparent ), m_stop(false) { } void UIBlockTester::UIBlockTesterThread::run() { while(!m_stop) { msleep( m_parent.m_msecs / 10 ); m_parent.m_timeMutex.lock(); - TQDateTime t = TQDateTime::currentDateTime(); + TQDateTime t = TQDateTime::tqcurrentDateTime(); uint msecs = m_parent.m_lastTime.time().msecsTo( t.time() ); if( msecs > m_parent.m_msecs ) { m_parent.lockup(); @@ -3171,7 +3171,7 @@ UIBlockTester::~UIBlockTester() { void UIBlockTester::timer() { m_timeMutex.lock(); - m_lastTime = TQDateTime::currentDateTime(); + m_lastTime = TQDateTime::tqcurrentDateTime(); m_timeMutex.unlock(); } diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index 00628c94..b9d5a53f 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -39,9 +39,10 @@ ///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 TQObject { Q_OBJECT + TQ_OBJECT class UIBlockTesterThread : public TQThread { public: - UIBlockTesterThread( UIBlockTester& parent ); + UIBlockTesterThread( UIBlockTester& tqparent ); void run(); void stop(); private: @@ -74,7 +75,7 @@ class CppCodeCompletion; class CppCodeCompletionConfig; class CppSplitHeaderSourceConfig; class CreateGetterSetterConfiguration; -class QtBuildConfig; +class TQtBuildConfig; class ProblemReporter; class BackgroundParser; class Catalog; @@ -142,7 +143,7 @@ public: m_fileSet.insert( s ); } - bool contains( const HashedString& str ) const { + bool tqcontains( const HashedString& str ) const { TQMutexLocker locker( &m_mutex ); return m_fileSet.find( str ) != m_fileSet.end(); } @@ -155,9 +156,10 @@ private: class CppSupportPart : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ); + CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args ); virtual ~CppSupportPart(); bool isValid() const @@ -203,10 +205,10 @@ public: } /** - Get a pointer to the QtBuildConfig object - @return A pointer to the QtBuildConfig object. + Get a pointer to the TQtBuildConfig object + @return A pointer to the TQtBuildConfig object. */ - inline QtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; } + inline TQtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; } const TQPtrList<Catalog>& catalogList() const { @@ -415,7 +417,7 @@ private: KAction * m_createGetterSetterAction; KAction * m_switchHeaderSourceAction; - QtBuildConfig* m_qtBuildConfig; + TQtBuildConfig* m_qtBuildConfig; bool withcpp; TQString m_contextFileName; @@ -481,7 +483,7 @@ private: { } }; - //typedef QPair<TQStringList, TQStringList> Item; ///The files we are waiting fore, and the files we already got + //typedef TQPair<TQStringList, TQStringList> Item; ///The files we are waiting fore, and the files we already got typedef TQValueList< Item > List; List m_waiting; @@ -510,7 +512,7 @@ private: ///files that were not requested must not be processed, since they maybe do not respect the group-relationships. bool reject( TQString file ) { for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { - if( (*it).first.find( file ) != (*it).first.end() ) { + if( (*it).first.tqfind( file ) != (*it).first.end() ) { return false; } } @@ -520,7 +522,7 @@ private: 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() ) { + if( (*it).first.tqfind( file ) != (*it).first.end() ) { if( ((Flags)((*it).flags & forbidFlags )) == None ) { hits++; if( hits >= count ) return true; @@ -575,8 +577,8 @@ private: 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() ) { + if( (*it).first.tqfind( file ) != (*it).first.end() ) { + if( (*it).second.tqfind( file ) == (*it).second.end() ) { (*it).flags = (Flags) ((*it).flags | flag); (*it).second << file; if( (*it).second.count() == (*it).first.count() ) { @@ -642,7 +644,7 @@ private: int lastBackgroundState; int backgroundState; TQStringList reparseList; - TQMap< TQString, QPair<uint, uint> > pcs; + TQMap< TQString, TQPair<uint, uint> > pcs; TQDataStream stream; TQFile file; TQTime lastParse; diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui index 0796d4fb..b9a9bca5 100644 --- a/languages/cpp/creategettersetter.ui +++ b/languages/cpp/creategettersetter.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CreateGetterSetterDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CreateGetterSetterDialogBase</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="5"> + <widget class="TQCheckBox" row="0" column="5"> <property name="name"> <cstring>m_chkInlineGet</cstring> </property> @@ -53,7 +53,7 @@ <string>If this is checked the get method will be created inline; otherwise, it will not.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_chkGet</cstring> </property> @@ -70,7 +70,7 @@ <string>If this is checked a getter method will be created.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_chkSet</cstring> </property> @@ -109,7 +109,7 @@ <string>The name of the created set method</string> </property> </widget> - <widget class="QCheckBox" row="1" column="5"> + <widget class="TQCheckBox" row="1" column="5"> <property name="name"> <cstring>m_chkInlineSet</cstring> </property> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -219,10 +219,10 @@ <tabstop>m_btnCancel</tabstop> <tabstop>m_btnOk</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">slotInlineChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp index 7190e796..3bee7f16 100644 --- a/languages/cpp/creategettersetterconfiguration.cpp +++ b/languages/cpp/creategettersetterconfiguration.cpp @@ -17,7 +17,7 @@ #include <tqdom.h> #include <kmessagebox.h> -TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" ); +TQString CreateGetterSetterConfiguration::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/creategettersetter" ); CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part ) : TQObject(part), m_part(part), m_settings(0) diff --git a/languages/cpp/creategettersetterconfiguration.h b/languages/cpp/creategettersetterconfiguration.h index 38bbb72d..50aacd92 100644 --- a/languages/cpp/creategettersetterconfiguration.h +++ b/languages/cpp/creategettersetterconfiguration.h @@ -33,8 +33,9 @@ class TQDomDocument; * The settings are stored per project under /kdevcppsupport/creategettersetter/. * @author Jonas Jacobi <j.jacobi@gmx.de> */ -class CreateGetterSetterConfiguration : public QObject{ +class CreateGetterSetterConfiguration : public TQObject{ Q_OBJECT + TQ_OBJECT public: CreateGetterSetterConfiguration(CppSupportPart* part); ~CreateGetterSetterConfiguration(); diff --git a/languages/cpp/creategettersetterdialog.cpp b/languages/cpp/creategettersetterdialog.cpp index e63fcf23..5b5dae69 100644 --- a/languages/cpp/creategettersetterdialog.cpp +++ b/languages/cpp/creategettersetterdialog.cpp @@ -19,8 +19,8 @@ #include "creategettersetterconfiguration.h" CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassDom aClass, - VariableDom aVar, TQWidget *parent, const char *pName ) -: CreateGetterSetterDialogBase( parent, pName ), m_part( part ), m_class( aClass ), m_var( aVar ) + VariableDom aVar, TQWidget *tqparent, const char *pName ) +: CreateGetterSetterDialogBase( tqparent, pName ), m_part( part ), m_class( aClass ), m_var( aVar ) { TQString name = aVar->name(); setCaption( "Create methods for " + name ); diff --git a/languages/cpp/creategettersetterdialog.h b/languages/cpp/creategettersetterdialog.h index 435002f2..8f609c33 100644 --- a/languages/cpp/creategettersetterdialog.h +++ b/languages/cpp/creategettersetterdialog.h @@ -24,8 +24,9 @@ class CppSupportPart; class CreateGetterSetterDialog: public CreateGetterSetterDialogBase { Q_OBJECT + TQ_OBJECT public: - CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *parent = 0, const char *name = 0); + CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *tqparent = 0, const char *name = 0); protected slots: void accept(); diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index d716bcc2..cb5b25c1 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -102,7 +102,7 @@ public: TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.tqreplace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); //addIncludePath( "/usr/include/g++-3" ); //addIncludePath( "/usr/include/g++" ); @@ -116,8 +116,8 @@ public: addMacro( Macro( lst[1], lst[2] ) ); } addMacro( Macro( "__cplusplus", "1" ) ); - addMacro( Macro( "Q_SIGNALS", "signals" ) ); - addMacro( Macro( "Q_SLOTS", "slots" ) ); + addMacro( Macro( "signals", "signals" ) ); + addMacro( Macro( "slots", "slots" ) ); } private: @@ -132,13 +132,13 @@ private: class PCSListViewItem: public KListViewItem { public: - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent ) - : KListViewItem( parent ), m_importer( importer ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* tqparent ) + : KListViewItem( tqparent ), m_importer( importer ) { init( ptr ); } - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent ) - : KListViewItem( parent ), m_importer( importer ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* tqparent ) + : KListViewItem( tqparent ), m_importer( importer ) { init( ptr ); } @@ -196,8 +196,8 @@ public: -CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : CreatePCSDialogBase( parent, name, modal, fl ), m_part( part ), m_jobData( 0 ) +CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : CreatePCSDialogBase( tqparent, name, modal, fl ), m_part( part ), m_jobData( 0 ) { helpButton()->hide(); @@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const KService::Ptr ptr = *it; int error = 0; - KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, this, ptr->name().latin1(), TQStringList(), &error ); + KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error ); if ( importer ) { new PCSListViewItem( ptr, importer, importerListView ); diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index 87c4818d..e9371434 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -19,9 +19,10 @@ class CppSupportPart; class CreatePCSDialog : public CreatePCSDialogBase { Q_OBJECT + TQ_OBJECT public: - CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreatePCSDialog( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreatePCSDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index 09b59a70..54857eae 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CreatePCSDialogBase</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>CreatePCSDialogBase</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>New Persistant Class Store</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>importerPage</cstring> </property> @@ -47,7 +47,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>settingsPage</cstring> </property> @@ -55,7 +55,7 @@ <string>Select directory</string> </attribute> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>descriptionPage</cstring> </property> @@ -66,7 +66,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>111</height> @@ -98,7 +98,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>finalPage</cstring> </property> @@ -109,12 +109,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>progressBar</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentFile</cstring> </property> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>81</height> @@ -151,16 +151,16 @@ </connection> <connection> <sender>importerListView</sender> - <signal>clicked(QListViewItem*)</signal> + <signal>clicked(TQListViewItem*)</signal> <receiver>CreatePCSDialogBase</receiver> - <slot>slotSelectionChanged(QListViewItem*)</slot> + <slot>slotSelectionChanged(TQListViewItem*)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotSelected(const QString&)</slot> - <slot>slotSelectionChanged(QListViewItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>slotSelectionChanged(TQListViewItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/debugger/TODO.txt b/languages/cpp/debugger/TODO.txt index 38aca109..563cf85c 100644 --- a/languages/cpp/debugger/TODO.txt +++ b/languages/cpp/debugger/TODO.txt @@ -69,7 +69,7 @@ TODO: - Add icons - - Status display column is just ugly + - tqStatus display column is just ugly - Handle "out of breakpoints" message. diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp index c9ed193e..9d1860e4 100644 --- a/languages/cpp/debugger/breakpoint.cpp +++ b/languages/cpp/debugger/breakpoint.cpp @@ -213,7 +213,7 @@ bool Breakpoint::match(const Breakpoint* breakpoint) const TQString Breakpoint::dbgRemoveCommand() const { if (dbgId_>0) - return TQString("-break-delete %1").arg(dbgId_); // gdb command - not translatable + return TQString("-break-delete %1").tqarg(dbgId_); // gdb command - not translatable return TQString(); } @@ -386,7 +386,7 @@ FilePosBreakpoint::FilePosBreakpoint(const TQString &fileName, int lineNum, : Breakpoint(temporary, enabled) { // Sets 'subtype' - setLocation(TQString("%1:%2").arg(fileName).arg(lineNum)); + setLocation(TQString("%1:%2").tqarg(fileName).tqarg(lineNum)); } FilePosBreakpoint::~FilePosBreakpoint() @@ -482,7 +482,7 @@ void FilePosBreakpoint::setLocation(const TQString& location) line_ = regExp1.cap(2).toInt(); - location_ = TQString("%1:%2").arg(fileName_).arg(regExp1.cap(2)); + location_ = TQString("%1:%2").tqarg(fileName_).tqarg(regExp1.cap(2)); } else { @@ -536,7 +536,7 @@ void Watchpoint::setBreakpoint(GDBController* controller) controller->addCommandBeforeRun( new GDBCommand( - TQString("-data-evaluate-expression &%1").arg(varName_), + TQString("-data-evaluate-expression &%1").tqarg(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( - TQString("-break-watch *%1").arg(r["value"].literal()), + TQString("-break-watch *%1").tqarg(r["value"].literal()), static_cast<Breakpoint*>(this), &Watchpoint::handleSet)); } diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h index 8470617c..64db16d5 100644 --- a/languages/cpp/debugger/breakpoint.h +++ b/languages/cpp/debugger/breakpoint.h @@ -44,9 +44,10 @@ enum BP_TYPES BP_TYPE_ReadWatchpoint }; -class Breakpoint : public QObject +class Breakpoint : public TQObject { Q_OBJECT + TQ_OBJECT public: Breakpoint(bool temporary=false, bool enabled=true); virtual ~Breakpoint(); diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h index 7b161313..9c555e51 100644 --- a/languages/cpp/debugger/dbgcontroller.h +++ b/languages/cpp/debugger/dbgcontroller.h @@ -65,9 +65,10 @@ enum DBGStateFlags /***************************************************************************/ /***************************************************************************/ /***************************************************************************/ -class DbgController : public QObject +class DbgController : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -117,7 +118,7 @@ signals: void gdbUserCommandStdout (const char *output); void gdbStderr (const char *output); void showStepInSource (const TQString &fileName, int lineNum, const TQString &address); - void dbgStatus (const TQString &status, int statusFlag); + void dbgtqStatus (const TQString &status, int statusFlag); protected: KProcess *dbgProcess_; diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index e96d7395..e08a1cec 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -50,8 +50,8 @@ 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(TQWidget *parent, const char *name) - : KDialog(parent, name, true), // modal +Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *tqparent, const char *name) + : KDialog(tqparent, name, true), // modal psProc_(0), pids_(new KListView(this)), pidLines_(TQString()) @@ -77,7 +77,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - buttonbox->layout(); + buttonbox->tqlayout(); topLayout->addWidget(buttonbox); connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); @@ -155,14 +155,14 @@ void Dbg_PS_Dialog::slotProcessExited() pidLines_ += '\n'; - int start = pidLines_.find('\n', 0); // Skip the first line (header line) + int start = pidLines_.tqfind('\n', 0); // Skip the first line (header line) int pos; static TQRegExp ps_output_line("^\\s*(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)"); - while ( (pos = pidLines_.find('\n', start)) != -1) { + while ( (pos = pidLines_.tqfind('\n', start)) != -1) { TQString item = pidLines_.mid(start, pos-start); - if (!item.isEmpty() && item.find(pidCmd_) == -1) + if (!item.isEmpty() && item.tqfind(pidCmd_) == -1) { if(ps_output_line.search(item) == -1) { @@ -172,7 +172,7 @@ void Dbg_PS_Dialog::slotProcessExited() // to 'arg'. i18n("<b>Could not parse output from the <tt>ps</tt> command.</b>" "<p>The following line could not be parsed:" - "<b><tt>%1</tt>").arg(item), + "<b><tt>%1</tt>").tqarg(item), i18n("Internal error"), "gdb_error" ); break; } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index 214e67a7..273bb7b8 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -31,9 +31,10 @@ namespace GDBDebugger class Dbg_PS_Dialog : public KDialog { Q_OBJECT + TQ_OBJECT public: - Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 ); + Dbg_PS_Dialog( TQWidget *tqparent=0, const char *name=0 ); ~Dbg_PS_Dialog(); int pidSelected(); diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 3fbef3c4..aaf4476b 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QT_MAC +#ifndef TQT_MAC #include "dbgtoolbar.h" #include "debuggerpart.h" #include "dbgcontroller.h" @@ -65,10 +65,10 @@ namespace GDBDebugger // the iconify, close, etc buttons from the window title but again I kept running // into problems. Instead, I used no decoration and this class. Also this looks // similar to the KToolBar floating style. -class DbgMoveHandle : public QFrame +class DbgMoveHandle : public TQFrame { public: - DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0); + DbgMoveHandle(DbgToolBar *tqparent=0, const char * name=0, WFlags f=0); virtual ~DbgMoveHandle(); virtual void mousePressEvent(TQMouseEvent *e); @@ -83,9 +83,9 @@ private: // ************************************************************************** -DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f) - : TQFrame(parent, name, f), - toolBar_(parent), +DbgMoveHandle::DbgMoveHandle(DbgToolBar *tqparent, const char * name, WFlags f) + : TQFrame(tqparent, name, f), + toolBar_(tqparent), offset_(TQPoint(0,0)), moving_(false) { @@ -107,21 +107,21 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) if (moving_) return; - if (e->button() == RightButton) { + if (e->button() == Qt::RightButton) { KPopupMenu *menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), TQT_SLOT(slotDock())); + tqparent(), TQT_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"), - parent(), TQT_SLOT(slotIconifyAndDock())); + tqparent(), TQT_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; - offset_ = parentWidget()->pos() - e->globalPos(); + offset_ = tqparentWidget()->pos() - e->globalPos(); setFrameStyle(TQFrame::Panel|TQFrame::Sunken); TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); - setPalette(TQPalette(colorGroup().background())); - repaint(); + setPalette(TQPalette(tqcolorGroup().background())); + tqrepaint(); } } @@ -134,8 +134,8 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e) offset_ = TQPoint(0,0); setFrameStyle(TQFrame::Panel|TQFrame::Raised); TQApplication::restoreOverrideCursor(); - setPalette(TQPalette(colorGroup().background())); - repaint(); + setPalette(TQPalette(tqcolorGroup().background())); + tqrepaint(); } // ************************************************************************** @@ -153,16 +153,16 @@ void DbgMoveHandle::mouseMoveEvent(TQMouseEvent *e) // ************************************************************************** // ************************************************************************** -// This class adds text _and_ a pixmap to a button. Why doesn't QPushButton +// This class adds text _and_ a pixmap to a button. Why doesn't TQPushButton // support that? It only allowed text _or_ pixmap. -class DbgButton : public QPushButton +class DbgButton : public TQPushButton { public: DbgButton(const TQPixmap &pixmap, const TQString &text, - DbgToolBar *parent, const char *name=0); + DbgToolBar *tqparent, const char *name=0); virtual ~DbgButton() {}; void drawButtonLabel(TQPainter *painter); - TQSize sizeHint() const; + TQSize tqsizeHint() const; private: TQPixmap pixmap_; @@ -171,8 +171,8 @@ private: // ************************************************************************** DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text, - DbgToolBar* parent, const char* name) - : TQPushButton(parent, name), + DbgToolBar* tqparent, const char* name) + : TQPushButton(tqparent, name), pixmap_(pixmap) { setText(text); @@ -191,21 +191,21 @@ void DbgButton::drawButtonLabel(TQPainter *painter) painter->drawPixmap(x, y, pixmap_); if (hasText) { - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text()); } } // ************************************************************************** -TQSize DbgButton::sizeHint() const +TQSize DbgButton::tqsizeHint() const { if (text().isEmpty()) return pixmap_.size(); else { TQSize ps = pixmap_.size(); - TQSize bs = TQPushButton::sizeHint(); + TQSize bs = TQPushButton::tqsizeHint(); TQSize result; result.setWidth( ps.width() + bs.width()+10 ); result.setHeight( ps.height() > bs.height() ? ps.height() : bs.height() ); @@ -217,8 +217,8 @@ TQSize DbgButton::sizeHint() const // ************************************************************************** // ************************************************************************** -DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) : - KSystemTray(parent, "DbgDocker"), +DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pixmap) : + KSystemTray(tqparent, "DbgDocker"), toolBar_(toolBar) { setPixmap(pixmap); @@ -229,17 +229,17 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!rect().contains( e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos())) return; switch (e->button()) { - case LeftButton: + case Qt::LeftButton: { // Not really a click, but it'll hold for the time being !!! emit clicked(); break; } - case RightButton: + case Qt::RightButton: { KPopupMenu* menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); @@ -258,7 +258,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) // ************************************************************************** DbgToolBar::DbgToolBar(DebuggerPart* part, - TQWidget* parent, const char* name) + TQWidget* tqparent, const char* name) : TQFrame(0, name), part_(part), activeWindow_(0), @@ -268,10 +268,10 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, appIsActive_(false), docked_(false), docker_(0), - dockWindow_(new KSystemTray(parent)) + dockWindow_(new KSystemTray(tqparent)) { - winModule_ = new KWinModule(this); - docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); + winModule_ = new KWinModule(TQT_TQOBJECT(this)); + docker_ = new DbgDocker(tqparent, this, BarIcon("dbgnext")); connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. @@ -285,7 +285,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, // KWin::setType(winId(), NET::Override); // So it has no decoration KWin::setType(winId(), NET::Dock); - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth(4); setMidLineWidth(0); @@ -300,15 +300,15 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, 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* bNext = new DbgButton(BarIcon("dbgnext"), TQString(), this); + TQPushButton* bNexti = new DbgButton(BarIcon("dbgnextinst"), TQString(), this); + TQPushButton* bStep = new DbgButton(BarIcon("dbgstep"), TQString(), this); + TQPushButton* bStepi = new DbgButton(BarIcon("dbgstepinst"), TQString(), 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); + bKDevFocus_ = new DbgButton(BarIcon("kdevelop"), TQString(), this); + bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString(), this); connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); @@ -365,12 +365,12 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, nextLayout->addWidget(bNext); nextLayout->addWidget(bNexti); -// int w = QMAX(bRun->sizeHint().width(), bFinish->sizeHint().width()); -// w = QMAX(w, bInterrupt->sizeHint().width()); -// w = QMAX(w, bView->sizeHint().width()); +// int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width()); +// w = TQMAX(w, bInterrupt->tqsizeHint().width()); +// w = TQMAX(w, bView->tqsizeHint().width()); // they should have the same height, so don't be too fussy -// int h = bFinish->sizeHint().height(); +// int h = bFinish->tqsizeHint().height(); // // bNext->setMinimumHeight(h); // bNexti->setMinimumHeight(h); @@ -404,10 +404,10 @@ void DbgToolBar::slotKdevFocus() // If anyone has a way of determining what window the app is _actually_ running on // then please fix and send a patch. - if (winModule_->activeWindow() != topLevelWidget()->winId()) + if (winModule_->activeWindow() != tqtopLevelWidget()->winId()) activeWindow_ = winModule_->activeWindow(); - KWin::activateWindow(topLevelWidget()->winId()); + KWin::activateWindow(tqtopLevelWidget()->winId()); } // ************************************************************************** @@ -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 TQString&, int state) +void DbgToolBar::slotDbgtqStatus(const TQString&, int state) { bool appIndicator = state & s_dbgBusy; if (appIndicator != appIsActive_) { @@ -435,11 +435,11 @@ void DbgToolBar::slotDbgStatus(const TQString&, int state) void DbgToolBar::setAppIndicator(bool appIndicator) { if (appIndicator) { - bPrevFocus_->setPalette(TQPalette(colorGroup().mid())); - bKDevFocus_->setPalette(TQPalette(colorGroup().background())); + bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid())); + bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background())); } else { - bPrevFocus_->setPalette(TQPalette(colorGroup().background())); - bKDevFocus_->setPalette(TQPalette(colorGroup().mid())); + bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background())); + bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid())); } } @@ -487,7 +487,7 @@ void DbgToolBar::slotActivateAndUndock() if (!docked_) return; - KWin::activateWindow(topLevelWidget()->winId()); + KWin::activateWindow(tqtopLevelWidget()->winId()); slotUndock(); } diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 188862d4..427120d9 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QT_MAC +#ifndef TQT_MAC #ifndef _DBGTOOLBAR_H_ #define _DBGTOOLBAR_H_ @@ -33,9 +33,10 @@ class DebuggerPart; class DbgDocker : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap); + DbgDocker(TQWidget *tqparent, DbgToolBar *toolBar, const TQPixmap &pixmap); virtual ~DbgDocker() {}; virtual void mousePressEvent(TQMouseEvent *e); @@ -47,16 +48,17 @@ private: }; -class DbgToolBar : public QFrame +class DbgToolBar : public TQFrame { Q_OBJECT + TQ_OBJECT public: - DbgToolBar(DebuggerPart *part, TQWidget* parent, const char* name=0); + DbgToolBar(DebuggerPart *part, TQWidget* tqparent, const char* name=0); virtual ~DbgToolBar(); private slots: - void slotDbgStatus(const TQString&, int); + void slotDbgtqStatus(const TQString&, int); void slotDock(); void slotUndock(); void slotIconifyAndDock(); diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp index f2891378..2fbc6a88 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -27,8 +27,8 @@ namespace GDBDebugger { -DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, const char *name) - : DebuggerConfigWidgetBase(parent, name), dom(*part->projectDom()) +DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *tqparent, const char *name) + : DebuggerConfigWidgetBase(tqparent, name), dom(*part->projectDom()) { gdbPath_edit->setMode(KFile::File|KFile::ExistingOnly|KFile::LocalOnly); @@ -37,7 +37,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, TQString shell = DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value"); if( shell == TQString("no_value") ) { - shell = TQString::null; + shell = TQString(); } debuggingShell_edit->setURL( shell ); @@ -78,7 +78,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, // ??? DomUtil::readEntry(dom, "/kdevdebugger/general/allowforcedbpset"); - resize(sizeHint()); + resize(tqsizeHint()); } diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h index 3a8283a2..cdd2479d 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.h +++ b/languages/cpp/debugger/debuggerconfigwidget.h @@ -26,9 +26,10 @@ class DebuggerPart; class DebuggerConfigWidget : public DebuggerConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - DebuggerConfigWidget( DebuggerPart* part, TQWidget *parent=0, const char *name=0 ); + DebuggerConfigWidget( DebuggerPart* part, TQWidget *tqparent=0, const char *name=0 ); ~DebuggerConfigWidget(); public slots: diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui index bf81b2d3..38048f18 100644 --- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui +++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DebuggerConfigWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>debugger_config_widget</cstring> </property> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -34,7 +34,7 @@ or directly in the project manager</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>gdbPath_label</cstring> </property> @@ -64,7 +64,7 @@ <string>To run "gdb" binary from $PATH, leave this field empty. To run custom gdb, for example, for a different architecture, enter the executable name here. You can either run gdb from $PATH, but with a different name (say, "arm-gdb"), by typing the name here, or specify full path to the gdb executable.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>debuggingShell_label</cstring> </property> @@ -100,15 +100,15 @@ <string>If you want gdb to be executed by a special shell or tool insert it here. The main use-case is for Automake based projects where the application is actually only a script and <b>libtool</b> is needed to get it to run inside gdb.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -119,7 +119,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>asmDemangle_box</cstring> </property> @@ -132,7 +132,7 @@ can select to see the methods' mangled names. However, non-mangled names are easier to read.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>breakOnLoadingLibrary_box</cstring> </property> @@ -149,7 +149,7 @@ for more details relating to this behavior. If you are not "dlopen"ing libs then leave this unchecked.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>dbgTerminal_box</cstring> </property> @@ -166,7 +166,7 @@ If you use terminal input in your application then check this option. Otherwise leave it unchecked.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>enableFloatingToolBar_box</cstring> </property> @@ -185,7 +185,7 @@ can also be docked into the panel. This toolbar is in addition to the toolbar in KDevelop.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>displayStaticMembers_box</cstring> </property> @@ -206,15 +206,15 @@ check this option.</string> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>globalOutputRadix</cstring> </property> @@ -225,7 +225,7 @@ check this option.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>outputRadixOctal</cstring> </property> @@ -233,7 +233,7 @@ check this option.</string> <string>Oct&al</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>outputRadixHexadecimal</cstring> </property> @@ -241,7 +241,7 @@ check this option.</string> <string>He&xadecimal</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>outputRadixDecimal</cstring> </property> @@ -251,7 +251,7 @@ check this option.</string> </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -262,7 +262,7 @@ check this option.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioFramestack</cstring> </property> @@ -270,7 +270,7 @@ check this option.</string> <string>Framestack</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioGDB</cstring> </property> @@ -284,7 +284,7 @@ check this option.</string> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -301,15 +301,15 @@ check this option.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>runShellScript_label</cstring> </property> @@ -356,7 +356,7 @@ or if your executable contains the gdb stub 2b) Execute "application" on target.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>runGdbScript_label</cstring> </property> @@ -368,7 +368,7 @@ or if your executable contains the gdb stub <cstring>runGdbScript_edit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>configGdbScript_label</cstring> </property> @@ -404,7 +404,7 @@ or if your executable contains the gdb stub <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -431,8 +431,8 @@ or if your executable contains the gdb stub <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 4842ca84..22621630 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdebugger"); typedef KDevGenericFactory<DebuggerPart> DebuggerFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) ) -DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : - KDevPlugin( &data, parent, name ? name : "DebuggerPart" ), +DebuggerPart::DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ) : + KDevPlugin( &data, tqparent, name ? name : "DebuggerPart" ), controller(0), previousDebuggerState_(s_dbgNotStarted), justRestarted_(false), needRebuild_(true), running_(false) @@ -92,7 +92,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi statusBarIndicator = new LabelWithDoubleClick( " ", mainWindow()->statusBar()); statusBarIndicator->setFixedWidth(15); - statusBarIndicator->setAlignment(Qt::AlignCenter); + statusBarIndicator->tqsetAlignment(TQt::AlignCenter); mainWindow()->statusBar()->addWidget(statusBarIndicator, 0, true); statusBarIndicator->show(); @@ -376,7 +376,7 @@ void DebuggerPart::setupDcop() { QCStringList objects = kapp->dcopClient()->registeredApplications(); for (QCStringList::Iterator it = objects.begin(); it != objects.end(); ++it) - if ((*it).find("drkonqi-") == 0) + if ((*it).tqfind("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); @@ -385,7 +385,7 @@ void DebuggerPart::setupDcop() void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) { - if (appId.find("drkonqi-") == 0) { + if (appId.tqfind("drkonqi-") == 0) { TQByteArray answer; TQCString replyType; @@ -491,7 +491,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) int index = running ? 0 : -1; if (running) { - // Too bad we can't add TQAction to popup menu in Qt3. + // Too bad we can't add TQAction to popup menu in TQt3. KAction* act = actionCollection()->action("debug_runtocursor"); Q_ASSERT(act); if (act) @@ -500,7 +500,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) this, TQT_SLOT(slotRunToCursor()), 0, -1, index); - popup->setWhatsThis(id, act->whatsThis()); + popup->tqsetWhatsThis(id, act->whatsThis()); index += running; } } @@ -510,21 +510,21 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) this, TQT_SLOT(toggleBreakpoint()), 0, -1, index); index += running; - popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); + popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); - int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed), + int id = popup->insertItem( i18n("Evaluate: %1").tqarg(squeezed), 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), + popup->tqsetWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); + int id2 = popup->insertItem( i18n("Watch: %1").tqarg(squeezed), 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.")); + popup->tqsetWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list.")); } if (running) popup->insertSeparator(index); @@ -589,8 +589,8 @@ void DebuggerPart::setupController() disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); // controller -> this - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - this, TQT_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), + this, TQT_SLOT(slottqStatus(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()), @@ -613,16 +613,16 @@ void DebuggerPart::setupController() 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))); + connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), + gdbOutputWidget, TQT_SLOT(slotDbgtqStatus(const TQString&, int))); // controller -> viewerWidget - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int))); connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()), - controller, TQT_SLOT(explainDebuggerStatus())); + controller, TQT_SLOT(explainDebuggertqStatus())); } @@ -659,7 +659,7 @@ bool DebuggerPart::startDebugger() { KMessageBox::information( mainWindow()->main(), - i18n("Could not locate the debugging shell '%1'.").arg( shell_without_args ), + i18n("Could not locate the debugging shell '%1'.").tqarg( shell_without_args ), i18n("Debugging Shell Not Found"), "gdb_error" ); return false; } @@ -697,7 +697,7 @@ bool DebuggerPart::startDebugger() if (DomUtil::readBoolEntry(*projectDom(), "/kdevdebugger/general/floatingtoolbar", false)) { -#ifndef QT_MAC +#ifndef TQT_MAC floatingToolBar = new DbgToolBar(this, mainWindow()->main()); floatingToolBar->show(); #endif @@ -955,7 +955,7 @@ void DebuggerPart::slotExamineCore() if (coreFile.isNull()) return; - mainWindow()->statusBar()->message(i18n("Examining core file %1").arg(coreFile), 1000); + mainWindow()->statusBar()->message(i18n("Examining core file %1").tqarg(coreFile), 1000); startDebugger(); controller->slotCoreFile(coreFile); @@ -976,7 +976,7 @@ void DebuggerPart::slotAttachProcess() bool DebuggerPart::attachProcess(int pid) { - mainWindow()->statusBar()->message(i18n("Attaching to process %1").arg(pid), 1000); + mainWindow()->statusBar()->message(i18n("Attaching to process %1").tqarg(pid), 1000); bool ret = startDebugger(); controller->slotAttachTo(pid); @@ -1092,7 +1092,7 @@ void DebuggerPart::slotRefreshBPState( const Breakpoint& BP) } } -void DebuggerPart::slotStatus(const TQString &msg, int state) +void DebuggerPart::slottqStatus(const TQString &msg, int state) { TQString stateIndicator, stateIndicatorFull; diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index a217cfee..71d56568 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -47,9 +47,10 @@ class ViewerWidget; class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface { Q_OBJECT + TQ_OBJECT public: - DebuggerPart( TQObject *parent, const char *name, const TQStringList & ); + DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ); ~DebuggerPart(); virtual void restorePartialProjectSession(const TQDomElement* el); virtual void savePartialProjectSession(TQDomElement* el); @@ -94,7 +95,7 @@ private slots: void slotRefreshBPState(const Breakpoint&); - void slotStatus(const TQString &msg, int state); + void slottqStatus(const TQString &msg, int state); void slotShowStep(const TQString &fileName, int lineNum); void slotGotoSource(const TQString &fileName, int lineNum); diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 6bf70f3b..0af77613 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -14,8 +14,8 @@ namespace GDBDebugger DebuggerTracingDialog ::DebuggerTracingDialog(Breakpoint* bp, - TQWidget* parent, const char* name) - : DebuggerTracingDialogBase(parent, name), bp_(bp) + TQWidget* tqparent, const char* name) + : DebuggerTracingDialogBase(tqparent, name), bp_(bp) { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h index 916ae912..e0e8dc48 100644 --- a/languages/cpp/debugger/debuggertracingdialog.h +++ b/languages/cpp/debugger/debuggertracingdialog.h @@ -23,9 +23,10 @@ namespace GDBDebugger class DebuggerTracingDialog : public DebuggerTracingDialogBase { Q_OBJECT + TQ_OBJECT public: DebuggerTracingDialog(Breakpoint* bp, - TQWidget* parent, const char* name = 0); + TQWidget* tqparent, const char* name = 0); private slots: void enableOrDisable(int); diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui index 333dc4de..17321999 100644 --- a/languages/cpp/debugger/debuggertracingdialogbase.ui +++ b/languages/cpp/debugger/debuggertracingdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DebuggerTracingDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DebuggerTracingDialogBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>enable</cstring> </property> @@ -31,7 +31,7 @@ <p>Tracing is a mechanism to automatically print values of the choosed expressions and continue execution when breakpoint is hit. You can think of it as printf debugging that does not require modifying the source.</p></string> </property> </widget> - <widget class="QPushButton" row="5" column="2"> + <widget class="TQPushButton" row="5" column="2"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -39,7 +39,7 @@ <string>Cancel</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>enableCustomFormat</cstring> </property> @@ -50,7 +50,7 @@ <string>Custom format string</string> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>okButton</cstring> </property> @@ -71,7 +71,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -103,7 +103,7 @@ If custom format string is not enabled, names and values of all expressions will <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>expressionsLabel</cstring> </property> @@ -130,10 +130,10 @@ If custom format string is not enabled, names and values of all expressions will <slot>reject()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>enableOrDisable()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 562aa1ae..6b848a27 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -35,8 +35,8 @@ namespace GDBDebugger /***************************************************************************/ /***************************************************************************/ -DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent, const char *name) - : TQTextEdit(parent, name), controller_(controller), +DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *tqparent, const char *name) + : TQTextEdit(tqparent, name), controller_(controller), active_(false), lower_(0), upper_(0), diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 55288c0c..33f29da9 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -30,12 +30,13 @@ namespace GDBDebugger class Breakpoint; class GDBController; -class DisassembleWidget : public QTextEdit +class DisassembleWidget : public TQTextEdit { Q_OBJECT + TQ_OBJECT public: - DisassembleWidget( GDBController* controller, TQWidget *parent=0, const char *name=0 ); + DisassembleWidget( GDBController* controller, TQWidget *tqparent=0, const char *name=0 ); virtual ~DisassembleWidget(); public slots: diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index fb0246e6..28fd076e 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -39,9 +39,9 @@ namespace GDBDebugger { FramestackWidget::FramestackWidget(GDBController* controller, - TQWidget *parent, + TQWidget *tqparent, const char *name, WFlags f) - : TQListView(parent, name, f), + : TQListView(tqparent, name, f), viewedThread_(0), controller_(controller), mayUpdate_( false ) @@ -49,9 +49,9 @@ FramestackWidget::FramestackWidget(GDBController* controller, setRootIsDecorated(true); setSorting(-1); setSelectionMode(Single); - addColumn(TQString::null); // Frame number - addColumn(TQString::null); // function name/address - addColumn(TQString::null); // source + addColumn(TQString()); // Frame number + addColumn(TQString()); // function name/address + addColumn(TQString()); // source header()->hide(); @@ -111,7 +111,7 @@ void FramestackWidget::slotSelectionChanged(TQListViewItem *thisItem) if (frame->threadNo() != -1) controller_->addCommand( new GDBCommand(TQString("-thread-select %1") - .arg(frame->threadNo()).ascii())); + .tqarg(frame->threadNo()).ascii())); viewedThread_ = findThread(frame->threadNo()); getBacktrace(frame->frameNo(), frame->frameNo() + frameChunk_); @@ -208,7 +208,7 @@ void FramestackWidget::getBacktrace(int min_frame, int max_frame) maxFrame_ = max_frame; controller_->addCommand( - new GDBCommand(TQString("-stack-info-depth %1").arg(max_frame+1), + new GDBCommand(TQString("-stack-info-depth %1").tqarg(max_frame+1), this, &FramestackWidget::handleStackDepth)); } @@ -224,7 +224,7 @@ void FramestackWidget::handleStackDepth(const GDBMI::ResultRecord& r) //add the following command to the front, so noone switches threads in between controller_->addCommandToFront( new GDBCommand(TQString("-stack-list-frames %1 %2") - .arg(minFrame_).arg(maxFrame_), + .tqarg(minFrame_).tqarg(maxFrame_), this, &FramestackWidget::parseGDBBacktraceList)); } @@ -236,7 +236,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo) // Switch to the target thread. controller_->addCommand( new GDBCommand(TQString("-thread-select %1") - .arg(threadNo).ascii())); + .tqarg(threadNo).ascii())); viewedThread_ = findThread(threadNo); } @@ -248,7 +248,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo) // Switch back to the original thread. controller_->addCommand( new GDBCommand(TQString("-thread-select %1") - .arg(currentThread).ascii())); + .tqarg(currentThread).ascii())); } } @@ -274,13 +274,13 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r) TQString id = ids.results[i]->value->literal(); controller_->addCommand( - new GDBCommand(TQString("-thread-select %1").arg(id).ascii(), + new GDBCommand(TQString("-thread-select %1").tqarg(id).ascii(), this, &FramestackWidget::handleThread)); } controller_->addCommand( new GDBCommand(TQString("-thread-select %1") - .arg(controller_->currentThread()).ascii())); + .tqarg(controller_->currentThread()).ascii())); } // Get backtrace for the current thread. We need to do this @@ -493,10 +493,10 @@ void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy, // ************************************************************************** // ************************************************************************** -FrameStackItem::FrameStackItem(FramestackWidget *parent, +FrameStackItem::FrameStackItem(FramestackWidget *tqparent, unsigned frameNo, const TQString &name) - : TQListViewItem(parent, parent->lastChild()), + : TQListViewItem(tqparent, tqparent->lastChild()), frameNo_(frameNo), threadNo_(-1) { @@ -505,12 +505,12 @@ FrameStackItem::FrameStackItem(FramestackWidget *parent, // ************************************************************************** -FrameStackItem::FrameStackItem(ThreadStackItem *parent, +FrameStackItem::FrameStackItem(ThreadStackItem *tqparent, unsigned frameNo, const TQString &name) - : TQListViewItem(parent, parent->lastChild()), + : TQListViewItem(tqparent, tqparent->lastChild()), frameNo_(frameNo), - threadNo_(parent->threadNo()) + threadNo_(tqparent->threadNo()) { setText(0, name); } @@ -554,11 +554,11 @@ void FrameStackItem::setOpen(bool open) // ************************************************************************** // ************************************************************************** -ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo) -: TQListViewItem(parent), +ThreadStackItem::ThreadStackItem(FramestackWidget *tqparent, unsigned threadNo) +: TQListViewItem(tqparent), threadNo_(threadNo) { - setText(0, i18n("Thread %1").arg(threadNo_)); + setText(0, i18n("Thread %1").tqarg(threadNo_)); setExpandable(true); } diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h index 656d2cdb..5d0b98e7 100644 --- a/languages/cpp/debugger/framestackwidget.h +++ b/languages/cpp/debugger/framestackwidget.h @@ -30,10 +30,10 @@ namespace GDBDebugger class FramestackWidget; -class ThreadStackItem : public QListViewItem +class ThreadStackItem : public TQListViewItem { public: - ThreadStackItem(FramestackWidget *parent, + ThreadStackItem(FramestackWidget *tqparent, unsigned threadNo); virtual ~ThreadStackItem(); @@ -56,13 +56,13 @@ private: /***************************************************************************/ /***************************************************************************/ -class FrameStackItem : public QListViewItem +class FrameStackItem : public TQListViewItem { public: - FrameStackItem(FramestackWidget *parent, + FrameStackItem(FramestackWidget *tqparent, unsigned frameNo, const TQString &name); - FrameStackItem(ThreadStackItem *parent, + FrameStackItem(ThreadStackItem *tqparent, unsigned frameNo, const TQString &name); virtual ~FrameStackItem(); @@ -88,13 +88,14 @@ private: /** * @author John Birch */ -class FramestackWidget : public QListView +class FramestackWidget : public TQListView { Q_OBJECT + TQ_OBJECT public: FramestackWidget( GDBController* controller, - TQWidget *parent=0, + TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); virtual ~FramestackWidget(); @@ -150,10 +151,6 @@ public slots: void slotEvent(GDBController::event_t e); void slotSelectionChanged(TQListViewItem *thisItem); -#if QT_VERSION < 300 -private: - TQListViewItem* findItemWhichBeginsWith(const TQString& text) const; -#endif virtual void showEvent(TQShowEvent*); private: diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index b092a015..38d9e7e8 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -56,7 +56,7 @@ enum Column { Control = 0, Enable = 1, Type = 2, - Status = 3, + tqStatus = 3, Location = 4, Condition = 5, IgnoreCount = 6, @@ -76,7 +76,7 @@ static int m_activeFlag = 0; /***************************************************************************/ /***************************************************************************/ -class BreakpointTableRow : public QTableItem +class BreakpointTableRow : public TQTableItem { public: @@ -100,9 +100,9 @@ private: /***************************************************************************/ /***************************************************************************/ -BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType, +BreakpointTableRow::BreakpointTableRow(TQTable* tqparent, EditType editType, Breakpoint* bp) : - TQTableItem(parent, editType, ""), + TQTableItem(tqparent, editType, ""), m_breakpoint(bp) { appendEmptyRow(); @@ -146,7 +146,7 @@ void BreakpointTableRow::appendEmptyRow() ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), - table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); + table()->tqparent(), TQT_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -161,7 +161,7 @@ void BreakpointTableRow::setRow() TQString status=m_breakpoint->statusDisplay(m_activeFlag); - table()->setText(row(), Status, status); + table()->setText(row(), tqStatus, status); table()->setText(row(), Condition, m_breakpoint->conditional()); table()->setText(row(), IgnoreCount, TQString::number(m_breakpoint->ignoreCount() )); table()->setText(row(), Hits, TQString::number(m_breakpoint->hits() )); @@ -183,7 +183,7 @@ void BreakpointTableRow::setRow() table()->setText(row(), Type, displayType); table()->adjustColumn(Type); - table()->adjustColumn(Status); + table()->adjustColumn(tqStatus); table()->adjustColumn(Location); table()->adjustColumn(Hits); table()->adjustColumn(IgnoreCount); @@ -196,8 +196,8 @@ void BreakpointTableRow::setRow() /***************************************************************************/ GDBBreakpointWidget::GDBBreakpointWidget(GDBController* controller, - TQWidget *parent, const char *name) : -TQHBox(parent, name), + TQWidget *tqparent, const char *name) : +TQHBox(tqparent, name), controller_(controller) { m_table = new GDBTable(0, numCols, this, name); @@ -208,7 +208,7 @@ controller_(controller) m_table->hideColumn(Control); m_table->setColumnReadOnly(Type, true); - m_table->setColumnReadOnly(Status, true); + m_table->setColumnReadOnly(tqStatus, true); m_table->setColumnReadOnly(Hits, true); m_table->setColumnWidth( Enable, 20); @@ -216,7 +216,7 @@ controller_(controller) header->setLabel( Enable, "" ); header->setLabel( Type, i18n("Type") ); - header->setLabel( Status, i18n("Status") ); + header->setLabel( tqStatus, i18n("tqStatus") ); header->setLabel( Location, i18n("Location") ); header->setLabel( Condition, i18n("Condition") ); header->setLabel( IgnoreCount, i18n("Ignore Count") ); @@ -238,12 +238,12 @@ controller_(controller) m_ctxMenu->insertItem( i18n( "Show text" ), BW_ITEM_Show ); int edit_id = m_ctxMenu->insertItem( i18n( "Edit" ), BW_ITEM_Edit ); - m_ctxMenu->setAccel(Qt::Key_Enter, edit_id); + m_ctxMenu->setAccel(TQt::Key_Enter, edit_id); m_ctxMenu->insertItem( i18n( "Disable" ), BW_ITEM_Disable ); int del_id = m_ctxMenu->insertItem( SmallIcon("breakpoint_delete"), i18n( "Delete" ), BW_ITEM_Delete ); - m_ctxMenu->setAccel(Qt::Key_Delete, del_id); + m_ctxMenu->setAccel(TQt::Key_Delete, del_id); m_ctxMenu->insertSeparator(); m_ctxMenu->insertItem( i18n( "Disable all"), BW_ITEM_DisableAll ); m_ctxMenu->insertItem( i18n( "Enable all"), BW_ITEM_EnableAll ); @@ -377,15 +377,15 @@ void GDBBreakpointWidget::slotWatchpointHit(int id, "Address: 0x%2<br>" "Old value: %3<br>" "New value: %4") - .arg(b->varName()) - .arg(b->address(), 0, 16) - .arg(oldValue) - .arg(newValue)); + .tqarg(b->varName()) + .tqarg(b->address(), 0, 16) + .tqarg(oldValue) + .tqarg(newValue)); } /***************************************************************************/ -BreakpointTableRow* GDBBreakpointWidget::find(Breakpoint *breakpoint) +BreakpointTableRow* GDBBreakpointWidget::tqfind(Breakpoint *breakpoint) { // NOTE:- The match doesn't have to be equal. Each type of bp // must decide on the match criteria. @@ -493,7 +493,7 @@ void GDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lin { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = find(fpBP); + BreakpointTableRow* btr = tqfind(fpBP); if (btr) { removeBreakpoint(btr); @@ -508,7 +508,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = find(fpBP); + BreakpointTableRow* btr = tqfind(fpBP); delete fpBP; if (btr) { @@ -523,7 +523,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, void GDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName) { Watchpoint *watchpoint = new Watchpoint(varName, false, true); - BreakpointTableRow* btr = find(watchpoint); + BreakpointTableRow* btr = tqfind(watchpoint); if (btr) { removeBreakpoint(btr); @@ -557,7 +557,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) if (b.hasField("cond")) bp->setConditional(b["cond"].literal()); else - bp->setConditional(TQString::null); + bp->setConditional(TQString()); btr->setRow(); emit publishBPState(*bp); } @@ -917,7 +917,7 @@ void GDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineN { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = find(fpBP); + BreakpointTableRow* btr = tqfind(fpBP); delete fpBP; if (btr) @@ -946,7 +946,7 @@ void GDBBreakpointWidget::slotBreakpointModified(Breakpoint* b) { emit publishBPState(*b); - if (BreakpointTableRow* btr = find(b)) + if (BreakpointTableRow* btr = tqfind(b)) { if (b->isActionDie()) { @@ -1031,7 +1031,7 @@ void GDBBreakpointWidget::editTracing(TQTableItem* 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. + // and not when we select some other cell, as happens in TQt by default. if (r == TQDialog::Accepted) { // The dialog has modified "btr->breakpoint()" already. @@ -1191,7 +1191,7 @@ 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(TQTable::FollowStyle); - // in constructor, so I suspect Qt bug. But anyway, without + // in constructor, so I suspect TQt bug. But anyway, without // current cell keyboard actions like Enter for edit won't work, // so keyboard focus does not makes much sense. if (m_table->currentRow() == -1 || @@ -1213,28 +1213,28 @@ TQWidget* ComplexEditCell::createEditor() const { TQHBox* box = new TQHBox( table()->viewport() ); box->setPaletteBackgroundColor( - table()->palette().active().highlight()); + table()->tqpalette().active().highlight()); label_ = new TQLabel(text(), box, "label"); - label_->setBackgroundMode(Qt::PaletteHighlight); + label_->setBackgroundMode(TQt::PaletteHighlight); // Sorry for hardcode, but '2' is already hardcoded in - // Qt source, in TQTableItem::paint. Since I don't want the + // TQt 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); TQPalette p = label_->palette(); p.setColor(TQPalette::Active, TQColorGroup::Foreground, - table()->palette().active().highlightedText()); + table()->tqpalette().active().highlightedText()); p.setColor(TQPalette::Inactive, TQColorGroup::Foreground, - table()->palette().active().highlightedText()); + table()->tqpalette().active().highlightedText()); label_->setPalette(p); TQPushButton* b = new TQPushButton("...", box); - // This is exactly what is done in QDesigner source in the + // This is exactly what is done in TQDesigner 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 + // with tqlayout, I suppose that tqsizeHint for button is always larger // than 20. b->setFixedWidth( 20 ); diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index c0728dec..f67bb03e 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -41,13 +41,14 @@ class BreakpointTableRow; class GDBTable; class GDBController; -class GDBBreakpointWidget : public QHBox +class GDBBreakpointWidget : public TQHBox { Q_OBJECT + TQ_OBJECT public: GDBBreakpointWidget( GDBController* controller, - TQWidget* parent=0, const char* name=0 ); + TQWidget* tqparent=0, const char* name=0 ); virtual ~GDBBreakpointWidget(); void reset(); @@ -105,7 +106,7 @@ signals: void tracingOutput(const char*); private: - BreakpointTableRow* find(Breakpoint *bp); + BreakpointTableRow* tqfind(Breakpoint *bp); BreakpointTableRow* findId(int id); BreakpointTableRow* findKey(int BPKey); @@ -135,14 +136,15 @@ 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 TQObject, public QTableItem +class ComplexEditCell : public TQObject, public TQTableItem { Q_OBJECT + TQ_OBJECT public: ComplexEditCell(TQTable* table); - /** Called by Qt when the current cell should become editable. + /** Called by TQt when the current cell should become editable. In our case, when the item becomes current. Creates a widget that will be shown in the cell and should be able to edit cell content. In our case -- text plus "..." button that invokes diff --git a/languages/cpp/debugger/gdbcommand.cpp b/languages/cpp/debugger/gdbcommand.cpp index bf8d5bc4..b783b31f 100644 --- a/languages/cpp/debugger/gdbcommand.cpp +++ b/languages/cpp/debugger/gdbcommand.cpp @@ -99,13 +99,13 @@ ModifyBreakpointCommand::ModifyBreakpointCommand( bp_(bp) {} -QString +TQString ModifyBreakpointCommand::cmdToSend() { if (bp_->dbgId() > 0) { TQString s(initialString()); - s = s.arg(bp_->dbgId()) + "\n"; + s = s.tqarg(bp_->dbgId()) + "\n"; return s.local8Bit(); } else diff --git a/languages/cpp/debugger/gdbcommand.h b/languages/cpp/debugger/gdbcommand.h index 946bc3aa..7000235a 100644 --- a/languages/cpp/debugger/gdbcommand.h +++ b/languages/cpp/debugger/gdbcommand.h @@ -91,8 +91,8 @@ public: private: TQString command_; - TQGuardedPtr<TQObject> handler_this; - typedef void (TQObject::* handler_t)(const GDBMI::ResultRecord&); + TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; + typedef void (TQT_BASE_OBJECT_NAME::* handler_t)(const GDBMI::ResultRecord&); handler_t handler_method; TQValueVector<TQString> lines; bool run; @@ -153,8 +153,8 @@ public: // GDBCommand overrides bool invokeHandler(const GDBMI::ResultRecord& r); private: - TQGuardedPtr<TQObject> cli_handler_this; - typedef void (TQObject::* cli_handler_t)(const TQValueVector<TQString>&); + TQGuardedPtr<TQT_BASE_OBJECT_NAME> cli_handler_this; + typedef void (TQT_BASE_OBJECT_NAME::* cli_handler_t)(const TQValueVector<TQString>&); cli_handler_t cli_handler_method; }; @@ -165,7 +165,7 @@ private: class SentinelCommand : public GDBCommand { public: - typedef void (TQObject::*handler_method_t)(); + typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)(); template<class Handler> SentinelCommand(Handler* handler_this, @@ -186,7 +186,7 @@ public: } private: - TQGuardedPtr<TQObject> handler_this; + TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; handler_method_t handler_method; }; @@ -207,7 +207,7 @@ private: class ExpressionValueCommand : public TQObject, public GDBCommand { public: - typedef void (TQObject::*handler_method_t)(const TQString&); + typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)(const TQString&); template<class Handler> ExpressionValueCommand( @@ -226,7 +226,7 @@ public: } private: - TQGuardedPtr<TQObject> handler_this; + TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; handler_method_t handler_method; }; diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index 3fd912ec..93424396 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -179,7 +179,7 @@ void GDBController::configure() config_runShellScript_ = DomUtil::readEntry(dom, "/kdevdebugger/general/runShellScript").latin1(); config_runGdbScript_ = DomUtil::readEntry(dom, "/kdevdebugger/general/runGdbScript").latin1(); -// add macros for reading QStrings? or in configGdbScript? +// add macros for reading TQStrings? or in configGdbScript? config_forceBPSet_ = DomUtil::readBoolEntry(dom, "/kdevdebugger/general/allowforcedbpset", true); config_dbgTerminal_ = DomUtil::readBoolEntry(dom, "/kdevdebugger/general/separatetty", false); config_gdbPath_ = DomUtil::readEntry(dom, "/kdevdebugger/general/gdbpath"); @@ -294,7 +294,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where) KMessageBox::information( 0, i18n("<b>Gdb command sent when debugger is not running</b><br>" - "The command was:<br> %1").arg(cmd->initialString()), + "The command was:<br> %1").tqarg(cmd->initialString()), i18n("Internal error"), "gdb_error"); return; } @@ -316,11 +316,11 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where) cmdList_.insert(i, cmd); } - kdDebug(9012) << "QUEUE: " << cmd->initialString() + kdDebug(9012) << "TQUEUE: " << cmd->initialString() << (stateReloadInProgress_ ? " (state reloading)\n" : "\n"); setStateOn(s_dbgBusy); - emit dbgStatus("", state_); + emit dbgtqStatus("", state_); raiseEvent(debugger_busy); executeCmd(); @@ -401,7 +401,7 @@ void GDBController::executeCmd() setStateOn(s_waitForWrite); TQString prettyCmd = currentCmd_->cmdToSend(); - prettyCmd.replace( TQRegExp("set prompt \032.\n"), "" ); + prettyCmd.tqreplace( TQRegExp("set prompt \032.\n"), "" ); prettyCmd = "(gdb) " + prettyCmd; if (currentCmd_->isUserCommand()) @@ -409,7 +409,7 @@ void GDBController::executeCmd() else emit gdbInternalCommandStdout( prettyCmd.latin1() ); - emit dbgStatus ("", state_); + emit dbgtqStatus ("", state_); } // ************************************************************************** @@ -500,7 +500,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) if (reason == "exited-signalled") { programNoApp(i18n("Exited on signal %1") - .arg(r["signal-name"].literal()), false); + .tqarg(r["signal-name"].literal()), false); // FIXME: figure out why this variable is needed. programHasExited_ = true; state_reload_needed = false; @@ -540,7 +540,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) // or whatever). setStateOff(s_explicitBreakInto); - emit dbgStatus("Application interrupted", state_); + emit dbgtqStatus("Application interrupted", state_); // Will show the source line in the code // handling non-special stop kinds, below. } @@ -554,7 +554,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) // that'll end the program. KMessageBox::information(0, i18n("Program received signal %1 (%2)") - .arg(name).arg(user_name), + .tqarg(name).tqarg(user_name), i18n("Received signal")); } } @@ -592,7 +592,7 @@ void GDBController::reloadProgramState() maybeAnnounceWatchpointHit(); } - emit dbgStatus ("", state_); + emit dbgtqStatus ("", state_); // We're always at frame zero when the program stops // and we must reset the active flag @@ -635,7 +635,7 @@ void GDBController::programNoApp(const TQString &msg, bool msgBox) if (tty_) tty_->readRemaining(); - // Tty is no longer usable, delete it. Without this, QSocketNotifier + // Tty is no longer usable, delete it. Without this, TQSocketNotifier // will continiously bomd STTY with signals, so we need to either disable // TQSocketNotifier, or delete STTY. The latter is simpler, since we can't // reuse it for future debug sessions anyway. @@ -648,7 +648,7 @@ void GDBController::programNoApp(const TQString &msg, bool msgBox) if (msgBox) KMessageBox::information(0, i18n("gdb message:\n")+msg,"Warning", "gdb_error"); - emit dbgStatus (msg, state_); + emit dbgtqStatus (msg, state_); /* Also show message in gdb window, so that users who prefer to look at gdb window know what's up. */ emit gdbUserCommandStdout(msg.ascii()); @@ -716,9 +716,9 @@ void GDBController::handleMiFileListExecSourceFile(const GDBMI::ResultRecord& r) "Command was: %1\n" "Response is: %2\n" "Invalid response kind: \"%3\"") - .arg(currentCmd_->rawDbgCommand()) - .arg(buf) - .arg(r.reason), + .tqarg(currentCmd_->rawDbgCommand()) + .tqarg(buf) + .tqarg(r.reason), i18n("Invalid gdb reply"), "gdb_error"); #endif } @@ -755,7 +755,7 @@ void GDBController::maybeAnnounceWatchpointHit() } else if (last_stop_reason == "read-watchpoint-trigger") { - emit dbgStatus ("Read watchpoint triggered", state_); + emit dbgtqStatus ("Read watchpoint triggered", state_); } } } @@ -846,14 +846,14 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en i18n("<b>Could not start debugger.</b>" "<p>Could not run '%1'. " "Make sure that the path name is specified correctly." - ).arg(dbgProcess_->args()[0]), + ).tqarg(dbgProcess_->args()[0].data()), i18n("Could not start debugger"), "gdb_error"); return false; } setStateOff(s_dbgNotStarted); - emit dbgStatus ("", state_); + emit dbgtqStatus ("", state_); saw_gdb_prompt_ = false; @@ -1043,7 +1043,7 @@ void GDBController::slotStopDebugger() gdbOutput_ = ""; setState(s_dbgNotStarted | s_appNotStarted); - emit dbgStatus (i18n("Debugger stopped"), state_); + emit dbgtqStatus (i18n("Debugger stopped"), state_); raiseEvent(debugger_exited); } @@ -1159,7 +1159,7 @@ void GDBController::slotRun() " %1\n" "<br>does not exist. Check that you have specified " "the right application in the debugger configuration." - ).arg(app.fileName()), + ).tqarg(app.fileName()), i18n("Application does not exist")); // FIXME: after this, KDevelop will still show that debugger @@ -1176,7 +1176,7 @@ void GDBController::slotRun() "<p>The application does not have the executable bit set. " "Try rebuilding the project, or change permissions " "manually." - ).arg(app.fileName()), + ).tqarg(app.fileName()), i18n("Could not run application")); slotStopDebugger(); } @@ -1324,11 +1324,11 @@ void GDBController::selectFrame(int frameNo, int threadNo) { if (viewedThread_ != threadNo) queueCmd(new GDBCommand( - TQString("-thread-select %1").arg(threadNo).ascii())); + TQString("-thread-select %1").tqarg(threadNo).ascii())); } queueCmd(new GDBCommand( - TQString("-stack-select-frame %1").arg(frameNo).ascii())); + TQString("-stack-select-frame %1").tqarg(frameNo).ascii())); // Will emit the 'thread_or_frame_changed' event. queueCmd(new GDBCommand("-stack-info-frame", @@ -1349,10 +1349,10 @@ void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result) { TQString msg = result["msg"].literal(); - if (msg.contains("No such process")) + if (msg.tqcontains("No such process")) { setState(s_appNotStarted|s_programExited); - emit dbgStatus (i18n("Process exited"), state_); + emit dbgtqStatus (i18n("Process exited"), state_); raiseEvent(program_exited); return; } @@ -1433,7 +1433,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) // Already parsing? then get out quick. // VP, 2006-01-30. I'm not sure how this could happen, since - // parsing of gdb reply should not ever execute Qt message loop. Except, + // parsing of gdb reply should not ever execute TQt message loop. Except, // maybe, when we pop up a message box. But even in that case, // it's likely we won't return to slotDbgStdout again. if (parsing) @@ -1447,7 +1447,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) int i; bool got_any_command = false; // For each gdb reply. In MI mode, each reply is one string. - while((i = holdingZone_.find('\n')) != -1) + while((i = holdingZone_.tqfind('\n')) != -1) { got_any_command = true; @@ -1590,7 +1590,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) "<p>The debugger component encountered an internal error while " "processing a reply from gdb. Please submit a bug report."), i18n("The exception is: %1\n" - "The MI response is: %2").arg(e.what()).arg(reply), + "The MI response is: %2").tqarg(e.what()).tqarg(reply.data()), i18n("Internal debugger error")); destroyCurrentCommand(); @@ -1629,7 +1629,7 @@ void GDBController::commandDone() { kdDebug(9012) << "No more commands\n"; setStateOff(s_dbgBusy); - emit dbgStatus("", state_); + emit dbgtqStatus("", state_); raiseEvent(debugger_ready); } } @@ -1650,7 +1650,7 @@ void GDBController::removeStateReloadingCommands() GDBCommand* cmd = cmdList_.at(i); if (stateReloadingCommands_.count(cmd)) { - kdDebug(9012) << "UNQUEUE: " << cmd->initialString() << "\n"; + kdDebug(9012) << "UNTQUEUE: " << cmd->initialString() << "\n"; delete cmdList_.take(i); } } @@ -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: " << TQString::fromLatin1(buf, buflen+1) << endl; + kdDebug(9012) << "STDERR: " << TQString::tqfromLatin1(buf, buflen+1) << endl; slotDbgStdout(proc, buf, buflen); } @@ -1722,7 +1722,7 @@ void GDBController::slotDbgProcessExited(KProcess* process) destroyCmds(); setState(s_dbgNotStarted|s_appNotStarted|s_programExited); - emit dbgStatus (i18n("Process exited"), state_); + emit dbgtqStatus (i18n("Process exited"), state_); emit gdbUserCommandStdout("(gdb) Process exited\n"); } @@ -1743,14 +1743,14 @@ void GDBController::slotUserGDBCmd(const TQString& cmd) // raiseEvent(program_state_changed); } -void GDBController::explainDebuggerStatus() +void GDBController::explainDebuggertqStatus() { TQString information("%1 commands in queue\n" "%2 commands being processed by gdb\n" "Debugger state: %3\n"); information = - information.arg(cmdList_.count()).arg(currentCmd_ ? 1 : 0) - .arg(state_); + information.tqarg(cmdList_.count()).tqarg(currentCmd_ ? 1 : 0) + .tqarg(state_); if (currentCmd_) { @@ -1758,8 +1758,8 @@ void GDBController::explainDebuggerStatus() "Current command text: '%2'\n" "Current command origianl text: '%3'\n"); - extra = extra.arg( - typeid(*currentCmd_).name()).arg(currentCmd_->cmdToSend()). + extra = extra.tqarg( + typeid(*currentCmd_).name()).tqarg(currentCmd_->cmdToSend()). arg(currentCmd_->initialString()); information += extra; } diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index a8b6bd2b..8cbf3b26 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -52,6 +52,7 @@ class STTY; class GDBController : public DbgController { Q_OBJECT + TQ_OBJECT public: GDBController(TQDomDocument &projectDom); @@ -249,7 +250,7 @@ public slots: // Pops up a dialog box with some hopefully // detailed information about which state debugger // is in, which commands were sent and so on. - void explainDebuggerStatus(); + void explainDebuggertqStatus(); protected slots: diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index 836886bb..7877a92c 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -39,8 +39,8 @@ namespace GDBDebugger /***************************************************************************/ -GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : - TQWidget(parent, name), +GDBOutputWidget::GDBOutputWidget( TQWidget *tqparent, const char *name) : + TQWidget(tqparent, name), m_userGDBCmdEditor(0), m_Interrupt(0), m_gdbView(0), @@ -62,7 +62,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : userGDBCmdEntry->setStretchFactor(m_userGDBCmdEditor, 1); m_Interrupt = new TQToolButton( this, "add breakpoint" ); - m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, + m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, ( TQSizePolicy::SizeType)0, 0, 0, @@ -76,7 +76,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : topLayout->addWidget(m_gdbView, 10); topLayout->addLayout(userGDBCmdEntry); - slotDbgStatus( "", s_dbgNotStarted); + slotDbgtqStatus( "", s_dbgNotStarted); connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) ); connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); @@ -257,7 +257,7 @@ void GDBOutputWidget::flushPending() /***************************************************************************/ -void GDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag) +void GDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag) { if (statusFlag & s_dbgNotStarted) { @@ -291,8 +291,8 @@ void GDBOutputWidget::focusInEvent(TQFocusEvent */*e*/) TQString GDBOutputWidget::html_escape(const TQString& s) { TQString r(s); - r.replace("<", "<"); - r.replace(">", ">"); + r.tqreplace("<", "<"); + r.tqreplace(">", ">"); return r; } @@ -327,8 +327,8 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) this, TQT_SLOT(toggleShowInternalCommands())); - popup->setItemChecked(id, parent_->showInternalCommands_); - popup->setWhatsThis( + popup->setItemChecked(id, tqparent_->showInternalCommands_); + popup->tqsetWhatsThis( id, i18n( "Controls if commands issued internally by KDevelop " @@ -348,21 +348,21 @@ void OutputText::copyAll() { /* See comments for allCommandRaw_ for explanations of this complex logic, as opposed to calling text(). */ - TQStringList& raw = parent_->showInternalCommands_ ? - parent_->allCommandsRaw_ : parent_->userCommandsRaw_; + TQStringList& raw = tqparent_->showInternalCommands_ ? + tqparent_->allCommandsRaw_ : tqparent_->userCommandsRaw_; 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. - TQApplication::clipboard()->setText(text, QClipboard::Clipboard); - TQApplication::clipboard()->setText(text, QClipboard::Selection); + TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard); + TQApplication::tqclipboard()->setText(text, TQClipboard::Selection); } void OutputText::toggleShowInternalCommands() { - parent_->setShowInternalCommands(!parent_->showInternalCommands_); + tqparent_->setShowInternalCommands(!tqparent_->showInternalCommands_); } diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index e0ad9c39..ace1c00d 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -32,12 +32,13 @@ class TQDomElement; namespace GDBDebugger { -class GDBOutputWidget : public QWidget +class GDBOutputWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - GDBOutputWidget( TQWidget *parent=0, const char *name=0 ); + GDBOutputWidget( TQWidget *tqparent=0, const char *name=0 ); ~GDBOutputWidget(); void savePartialProjectSession(TQDomElement* el); @@ -49,7 +50,7 @@ public slots: void slotInternalCommandStdout(const char* line); void slotUserCommandStdout(const char* line); void slotReceivedStderr(const char* line); - void slotDbgStatus (const TQString &status, int statusFlag); + void slotDbgtqStatus (const TQString &status, int statusFlag); void slotGDBCmd(); @@ -100,7 +101,7 @@ private: /** For performance reasons, we don't immediately add new text - to QTExtEdit. Instead we add it to pendingOutput_ and + to TQTExtEdit. Instead we add it to pendingOutput_ and flush it on timer. */ TQString pendingOutput_; @@ -113,13 +114,14 @@ private: /** Add popup menu specific to gdb output window to TQTextEdit. */ -class OutputText : public QTextEdit +class OutputText : public TQTextEdit { Q_OBJECT + TQ_OBJECT public: - OutputText(GDBOutputWidget* parent) - : TQTextEdit(parent), - parent_(parent) + OutputText(GDBOutputWidget* tqparent) + : TQTextEdit(tqparent), + tqparent_(tqparent) {} TQPopupMenu* createPopupMenu(const TQPoint& pos); @@ -129,7 +131,7 @@ private slots: void toggleShowInternalCommands(); private: - GDBOutputWidget* parent_; + GDBOutputWidget* tqparent_; }; } diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp index 5a8588b1..d8ae62b8 100644 --- a/languages/cpp/debugger/gdbparser.cpp +++ b/languages/cpp/debugger/gdbparser.cpp @@ -97,7 +97,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) // - composites (arrays and structures) // - pointers to functions. In this case type is // enclosed in "{}". Not sure why it's so, as - // when printing pointer, type is in parenthesis. + // when printing pointer, type is in tqparenthesis. if (type == typePointer) { // Looks like type in braces at the beginning. Strip it. @@ -126,7 +126,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) // We can't find the first ')', because type can contain '(' and ')' // characters if its function pointer. So count opening and closing - // parentheses. + // tqparentheses. start = skipDelim(start, '(', ')'); } @@ -138,7 +138,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) if (value[0] == '@') { // It's a reference, we need to show just the value. - if (int i = value.find(":")) + if (int i = value.tqfind(":")) { value = value.mid(i+2); } @@ -149,7 +149,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) } } - if (value.find("Cannot access memory") == 0) + if (value.tqfind("Cannot access memory") == 0) value = "(inaccessible)"; return value.stripWhiteSpace(); diff --git a/languages/cpp/debugger/gdbparser.h b/languages/cpp/debugger/gdbparser.h index a56c082d..08e5cda7 100644 --- a/languages/cpp/debugger/gdbparser.h +++ b/languages/cpp/debugger/gdbparser.h @@ -35,7 +35,7 @@ public: static void destroy(); private: - void parseArray(TrimmableItem *parent, const char *buf); + void parseArray(TrimmableItem *tqparent, const char *buf); const char *skipTokenEnd(const char *buf) const; const char *skipTokenValue(const char *buf) const; diff --git a/languages/cpp/debugger/gdbtable.cpp b/languages/cpp/debugger/gdbtable.cpp index c9c1bf2f..c4b16da8 100644 --- a/languages/cpp/debugger/gdbtable.cpp +++ b/languages/cpp/debugger/gdbtable.cpp @@ -11,13 +11,13 @@ namespace GDBDebugger { -GDBTable::GDBTable(TQWidget *parent, const char *name) - : TQTable(parent, name) +GDBTable::GDBTable(TQWidget *tqparent, const char *name) + : TQTable(tqparent, name) { } -GDBTable::GDBTable(int nr, int nc, TQWidget * parent, const char * name) - : TQTable(nr, nc, parent, name) +GDBTable::GDBTable(int nr, int nc, TQWidget * tqparent, const char * name) + : TQTable(nr, nc, tqparent, name) { } diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h index 78c45055..55374380 100644 --- a/languages/cpp/debugger/gdbtable.h +++ b/languages/cpp/debugger/gdbtable.h @@ -14,12 +14,13 @@ namespace GDBDebugger { -class GDBTable : public QTable +class GDBTable : public TQTable { Q_OBJECT + TQ_OBJECT public: - GDBTable(TQWidget *parent = 0, const char *name = 0); - GDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 ); + GDBTable(TQWidget *tqparent = 0, const char *name = 0); + GDBTable( int numRows, int numCols, TQWidget * tqparent = 0, const char * name = 0 ); ~GDBTable(); virtual void keyPressEvent ( TQKeyEvent * e ); diff --git a/languages/cpp/debugger/label_with_double_click.cpp b/languages/cpp/debugger/label_with_double_click.cpp index f08c7358..deaab3cc 100644 --- a/languages/cpp/debugger/label_with_double_click.cpp +++ b/languages/cpp/debugger/label_with_double_click.cpp @@ -1,8 +1,8 @@ #include "label_with_double_click.h" -LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* parent) -: TQLabel(s, parent) +LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* tqparent) +: TQLabel(s, tqparent) {} void LabelWithDoubleClick::mouseDoubleClickEvent(TQMouseEvent*) diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h index 35ade271..616ad903 100644 --- a/languages/cpp/debugger/label_with_double_click.h +++ b/languages/cpp/debugger/label_with_double_click.h @@ -4,11 +4,12 @@ #include <tqlabel.h> -class LabelWithDoubleClick : public QLabel +class LabelWithDoubleClick : public TQLabel { Q_OBJECT + TQ_OBJECT public: - LabelWithDoubleClick(const TQString& s, TQWidget* parent); + LabelWithDoubleClick(const TQString& s, TQWidget* tqparent); signals: void doubleClicked(); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 6d700233..44a95b1a 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -71,7 +71,7 @@ namespace GDBDebugger it's not a standalone dialog. However, we want to have easy way to hide/show all controls, so we group them in this class. */ - class MemoryRangeSelector : public QWidget + class MemoryRangeSelector : public TQWidget { public: KLineEdit* startAddressLineEdit; @@ -79,12 +79,12 @@ namespace GDBDebugger TQPushButton* okButton; TQPushButton* cancelButton; - MemoryRangeSelector(TQWidget* parent) - : TQWidget(parent) + MemoryRangeSelector(TQWidget* tqparent) + : TQWidget(tqparent) { TQVBoxLayout* l = new TQVBoxLayout(this); - // Grid layout: labels + address field + // Grid tqlayout: labels + address field TQGridLayout* gl = new TQGridLayout(l); gl->setColSpacing(0, 2); @@ -127,8 +127,8 @@ namespace GDBDebugger MemoryView::MemoryView(GDBController* controller, - TQWidget* parent, const char* name) - : TQWidget(parent, name), + TQWidget* tqparent, const char* name) + : TQWidget(tqparent, name), controller_(controller), // New memory view can be created only when debugger is active, // so don't set s_appNotStarted here. @@ -263,8 +263,8 @@ namespace GDBDebugger new GDBCommand( TQString("-data-read-memory %1 x 1 1 %2") - .arg(rangeSelector_->startAddressLineEdit->text()) - .arg(size).ascii(), + .tqarg(rangeSelector_->startAddressLineEdit->text()) + .tqarg(size).ascii(), this, &MemoryView::memoryRead)); } @@ -280,7 +280,7 @@ namespace GDBDebugger start_ = startAsString_.toUInt(0, 0); setCaption(TQString("%1 (%2 bytes)") - .arg(startAsString_).arg(amount_)); + .tqarg(startAsString_).tqarg(amount_)); emit captionChanged(caption()); KHE::BytesEditInterface* bytesEditor @@ -328,9 +328,9 @@ namespace GDBDebugger controller_->addCommand( new GDBCommand( TQString("set *(char*)(%1 + %2) = %3") - .arg(start_) - .arg(i) - .arg(TQString::number(data_[i])))); + .tqarg(start_) + .tqarg(i) + .tqarg(TQString::number(data_[i])))); } } @@ -374,7 +374,7 @@ namespace GDBDebugger new GDBCommand( TQString("-data-read-memory %1 x 1 1 %2") - .arg(start_).arg(amount_).ascii(), + .tqarg(start_).tqarg(amount_).ascii(), this, &MemoryView::memoryRead)); } @@ -403,9 +403,9 @@ namespace GDBDebugger ViewerWidget::ViewerWidget(GDBController* controller, - TQWidget* parent, + TQWidget* tqparent, const char* name) - : TQWidget(parent, name), + : TQWidget(tqparent, name), controller_(controller) { setIcon(SmallIcon("math_brace")); @@ -457,7 +457,7 @@ namespace GDBDebugger TQWidget* ncs = const_cast<TQWidget*>(s); TQString cap = caption; // Prevent intepreting '&' as accelerator specifier. - cap.replace("&", "&&"); + cap.tqreplace("&", "&&"); toolBox_->setItemLabel(toolBox_->indexOf(ncs), cap); } @@ -466,7 +466,7 @@ namespace GDBDebugger TQValueVector<MemoryView*>::iterator i, e; for(i = memoryViews_.begin(), e = memoryViews_.end(); i != e; ++i) { - if (*i == child) + if (TQT_BASE_OBJECT(*i) == TQT_BASE_OBJECT(child)) { memoryViews_.erase(i); break; diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h index 4febe14a..991efbb3 100644 --- a/languages/cpp/debugger/memviewdlg.h +++ b/languages/cpp/debugger/memviewdlg.h @@ -31,12 +31,13 @@ namespace GDBDebugger class MemoryView; class GDBController; - class ViewerWidget : public QWidget + class ViewerWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: ViewerWidget(GDBController* controller, - TQWidget* parent, const char* name); + TQWidget* tqparent, const char* name); public slots: /** Adds a new memory view to *this, initially showing @@ -61,12 +62,13 @@ namespace GDBDebugger TQValueVector<MemoryView*> memoryViews_; }; - class MemoryView : public QWidget + class MemoryView : public TQWidget { Q_OBJECT + TQ_OBJECT public: MemoryView(GDBController* controller, - TQWidget* parent, const char* name = 0); + TQWidget* tqparent, const char* name = 0); void debuggerStateChanged(int state); diff --git a/languages/cpp/debugger/mi/gdbmi.h b/languages/cpp/debugger/mi/gdbmi.h index 64252ee5..03985958 100644 --- a/languages/cpp/debugger/mi/gdbmi.h +++ b/languages/cpp/debugger/mi/gdbmi.h @@ -189,7 +189,7 @@ namespace GDBMI struct Record { virtual ~Record() {} - virtual TQString toString() const { Q_ASSERT( 0 ); return TQString::null; } + virtual TQString toString() const { Q_ASSERT( 0 ); return TQString(); } enum { Prompt, Stream, Result } kind; }; diff --git a/languages/cpp/debugger/mi/milexer.cpp b/languages/cpp/debugger/mi/milexer.cpp index 7813d091..74b8eda9 100644 --- a/languages/cpp/debugger/mi/milexer.cpp +++ b/languages/cpp/debugger/mi/milexer.cpp @@ -275,7 +275,7 @@ void TokenStream::positionAt(int position, int *line, int *column) const len = half; } - *line = QMAX(first - 1, 0); + *line = TQMAX(first - 1, 0); *column = position - m_lines.at(*line); Q_ASSERT( *column >= 0 ); diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index ac3cd4e1..27bde0aa 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -105,7 +105,7 @@ static int chownpty(int fd, int grant) // { // signal from other child, behave like catchChild. // // guess this gives quite some control chaos... - // Shell* sh = shells.find(rc); + // Shell* sh = shells.tqfind(rc); // if (sh) { shells.remove(rc); sh->doneShell(w); } // goto retry; // } @@ -263,7 +263,7 @@ void STTY::OutReceived(int f) if (n == 0 /* eof */ || (n == -1 && errno != EAGAIN)) { - // Found eof or error. Disable socket notifier, otherwise Qt + // Found eof or error. Disable socket notifier, otherwise TQt // will repeatedly call this method, eating CPU // cycles. out->setEnabled(false); @@ -321,7 +321,7 @@ bool STTY::findExternalTTY(const TQString &termApp) const char* prog = appName.latin1(); TQString script = TQString("tty>") + TQString(fifo) + TQString(";" // fifo name - "trap \"\" INT QUIT TSTP;" // ignore various signals + "trap \"\" INT TQUIT TSTP;" // ignore various signals "exec<&-;exec>&-;" // close stdin and stdout "while :;do sleep 3600;done"); const char* scriptStr = script.latin1(); @@ -346,11 +346,11 @@ bool STTY::findExternalTTY(const TQString &termApp) ::exit(1); } - // parent process + // tqparent process if (pid <= 0) ::exit(1); - // Open the communication between us (the parent) and the + // Open the communication between us (the tqparent) and the // child (the process running on a tty console) fifo_fd = ::open(fifo, O_RDONLY); if (fifo_fd < 0) diff --git a/languages/cpp/debugger/stty.h b/languages/cpp/debugger/stty.h index 9cacf50f..5fd45cc6 100644 --- a/languages/cpp/debugger/stty.h +++ b/languages/cpp/debugger/stty.h @@ -33,9 +33,10 @@ class TQSocketNotifier; namespace GDBDebugger { -class STTY : public QObject +class STTY : public TQObject { Q_OBJECT + TQ_OBJECT public: STTY(bool ext=false, const TQString &termAppName=TQString()); diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop index 03faba9a..af025ba1 100644 --- a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop +++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop @@ -9,7 +9,7 @@ <ignoreparts> <part>kdevsecurity</part> <part>kdevkonsoleview</part> - <part>kdevreplace</part> + <part>kdevtqreplace</part> <part>kdevctags2</part> <part>kdevvalgrind</part> </ignoreparts> diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 163c2024..c5293c8c 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -47,14 +47,14 @@ /** The variables widget is passive, and is invoked by the rest of the code via two main slots: - - slotDbgStatus + - slotDbgtqStatus - slotCurrentFrame The first is received the program status changes and the second is recieved after current frame in the debugger can possibly changes. The widget has a list item for each frame/thread combination, with - variables as children. However, at each moment only one item is shown. + variables as tqchildren. However, at each moment only one item is shown. When handling the slotCurrentFrame, we check if variables for the current frame are available. If yes, we simply show the corresponding item. Otherwise, we fetch the new data from debugger. @@ -77,8 +77,8 @@ namespace GDBDebugger VariableWidget::VariableWidget(GDBController* controller, GDBBreakpointWidget* breakpointWidget, - TQWidget *parent, const char *name) -: TQWidget(parent, name) + TQWidget *tqparent, const char *name) +: TQWidget(tqparent, name) { setIcon(SmallIcon("math_brace")); setCaption(i18n("Variable Tree")); @@ -197,11 +197,11 @@ void VariableWidget::focusInEvent(TQFocusEvent */*e*/) // ************************************************************************** // ************************************************************************** -VariableTree::VariableTree(VariableWidget *parent, +VariableTree::VariableTree(VariableWidget *tqparent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name) - : KListView(parent, name), + : KListView(tqparent, name), TQToolTip( viewport() ), controller_(controller), breakpointWidget_(breakpointWidget), @@ -244,7 +244,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) setSelected(item, true); // Need to select this item. - if (item->parent()) + if (item->tqparent()) { KPopupMenu popup(this); KPopupMenu format(this); @@ -271,19 +271,19 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) format.setCheckable(true); idNatural = format.insertItem(i18n("Natural"), (int)VarItem::natural); - format.setAccel(Qt::Key_N, idNatural); + format.setAccel(TQt::Key_N, idNatural); idHex = format.insertItem(i18n("Hexadecimal"), (int)VarItem::hexadecimal); - format.setAccel(Qt::Key_X, idHex); + format.setAccel(TQt::Key_X, idHex); idDecimal = format.insertItem(i18n("Decimal"), (int)VarItem::decimal); - format.setAccel(Qt::Key_D, idDecimal); + format.setAccel(TQt::Key_D, idDecimal); idCharacter = format.insertItem(i18n("Character"), (int)VarItem::character); - format.setAccel(Qt::Key_C, idCharacter); + format.setAccel(TQt::Key_C, idCharacter); idBinary = format.insertItem(i18n("Binary"), (int)VarItem::binary); - format.setAccel(Qt::Key_T, idBinary); + format.setAccel(TQt::Key_T, idBinary); format.setItemChecked((int)(var->format()), true); @@ -305,7 +305,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) if (dynamic_cast<WatchRoot*>(root)) { idRemove = popup.insertItem( SmallIcon("editdelete"), i18n("Remove Watch Variable") ); - popup.setAccel(Qt::Key_Delete, idRemove); + popup.setAccel(TQt::Key_Delete, idRemove); } else if (root != recentExpressions_) { idWatch = popup.insertItem( i18n("Watch Variable")); @@ -317,7 +317,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) MAYBE_DISABLE(idReevaluate); idRemove = popup.insertItem( SmallIcon("editdelete"), i18n("Remove Expression") ); - popup.setAccel(Qt::Key_Delete, idRemove); + popup.setAccel(TQt::Key_Delete, idRemove); } if (var) @@ -328,7 +328,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) int idCopyToClipboard = popup.insertItem( SmallIcon("editcopy"), i18n("Copy Value") ); - popup.setAccel(Qt::CTRL + Qt::Key_C, idCopyToClipboard); + popup.setAccel(TQt::CTRL + TQt::Key_C, idCopyToClipboard); activePopup_ = &popup; /* This code can be executed when debugger is stopped, @@ -338,7 +338,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) controller_->addCommand( new GDBCommand( TQString("-data-evaluate-expression &%1") - .arg(var->gdbExpression()), + .tqarg(var->gdbExpression()), this, &VariableTree::handleAddressComputed, true /*handles error*/)); @@ -360,7 +360,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (VarItem *item = dynamic_cast<VarItem*>(currentItem())) { - ((VariableWidget*)parent())-> + ((VariableWidget*)tqparent())-> slotEvaluateExpression(item->gdbExpression()); } } @@ -368,7 +368,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (VarItem *item = dynamic_cast<VarItem*>(currentItem())) { - ((VariableWidget*)parent())-> + ((VariableWidget*)tqparent())-> slotAddWatchVariable(item->gdbExpression()); } } @@ -505,8 +505,8 @@ void VariableTree::updateCurrentFrame() controller_->addCommand( new GDBCommand(TQString("-stack-list-arguments 0 %1 %2") - .arg(controller_->currentFrame()) - .arg(controller_->currentFrame()) + .tqarg(controller_->currentFrame()) + .tqarg(controller_->currentFrame()) .ascii(), this, &VariableTree::argumentsReady)); @@ -547,8 +547,8 @@ void VariableTree::slotEvaluateExpression(const TQString &expression) TQListViewItem *VariableTree::findRoot(TQListViewItem *item) const { - while (item->parent()) - item = item->parent(); + while (item->tqparent()) + item = item->tqparent(); return item; } @@ -607,7 +607,7 @@ void VariableTree::maybeTip(const TQPoint &p) VarItem * item = dynamic_cast<VarItem*>( itemAt( p ) ); if ( item ) { - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); if ( r.isValid() ) tip( r, item->tipText() ); } @@ -711,7 +711,7 @@ void VariableTree::frameIdReady(const TQValueVector<TQString>& lines) frame_info += lines[i]; kdDebug(9012) << "frame info: " << frame_info << "\n"; - frame_info.replace('\n', ""); + frame_info.tqreplace('\n', ""); 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]*)"); @@ -882,8 +882,8 @@ void VarItem::handleCliPrint(const TQValueVector<TQString>& lines) { controller_->addCommand( new GDBCommand(TQString("-var-create %1 * \"%2\"") - .arg(varobjName_) - .arg(r.cap(1)), + .tqarg(varobjName_) + .tqarg(r.cap(1)), this, &VarItem::varobjCreated, // On initial create, errors get reported @@ -968,7 +968,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e) item->formatFromGdbModifier(text[0].latin1())); } - if (e->key() == Qt::Key_Delete) + if (e->key() == TQt::Key_Delete) { TQListViewItem* root = findRoot(item); @@ -978,7 +978,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e) } } - if (e->key() == Qt::Key_C && e->state() == Qt::ControlButton) + if (e->key() == TQt::Key_C && e->state() == TQt::ControlButton) { copyToClipboard(item); } @@ -988,10 +988,10 @@ void VariableTree::keyPressEvent(TQKeyEvent* e) void VariableTree::copyToClipboard(TQListViewItem* item) { - QClipboard *qb = KApplication::clipboard(); + TQClipboard *qb = KApplication::tqclipboard(); TQString text = item->text( 1 ); - qb->setText( text, QClipboard::Clipboard ); + qb->setText( text, TQClipboard::Clipboard ); } void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r) @@ -1018,15 +1018,15 @@ void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r) // ************************************************************************** // ************************************************************************** -TrimmableItem::TrimmableItem(VariableTree *parent) - : KListViewItem (parent, parent->lastChild()) +TrimmableItem::TrimmableItem(VariableTree *tqparent) + : KListViewItem (tqparent, tqparent->lastChild()) { } // ************************************************************************** -TrimmableItem::TrimmableItem(TrimmableItem *parent) - : KListViewItem (parent, parent->lastChild()) +TrimmableItem::TrimmableItem(TrimmableItem *tqparent) + : KListViewItem (tqparent, tqparent->lastChild()) { } @@ -1044,7 +1044,7 @@ void TrimmableItem::paintCell(TQPainter *p, const TQColorGroup &cg, if ( !p ) return; // make toplevel item (watch and frame items) names bold - if (column == 0 && !parent()) + if (column == 0 && !tqparent()) { TQFont f = p->font(); f.setBold(true); @@ -1069,16 +1069,16 @@ TQListViewItem *TrimmableItem::lastChild() const int VarItem::varobjIndex = 0; -VarItem::VarItem(TrimmableItem *parent, +VarItem::VarItem(TrimmableItem *tqparent, const TQString& expression, bool frozen) - : TrimmableItem (parent), + : TrimmableItem (tqparent), expression_(expression), highlight_(false), oldSpecialRepresentationSet_(false), format_(natural), numChildren_(0), - childrenFetched_(false), + tqchildrenFetched_(false), updateUnconditionally_(false), frozen_(frozen), initialCreation_(true), @@ -1116,14 +1116,14 @@ VarItem::VarItem(TrimmableItem *parent, createVarobj(); } -VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, +VarItem::VarItem(TrimmableItem *tqparent, const GDBMI::Value& varobj, format_t format, bool baseClassMember) -: TrimmableItem (parent), +: TrimmableItem (tqparent), highlight_(false), oldSpecialRepresentationSet_(false), format_(format), numChildren_(0), - childrenFetched_(false), + tqchildrenFetched_(false), updateUnconditionally_(false), frozen_(false), initialCreation_(false), @@ -1146,7 +1146,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, controller_ = varTree()->controller(); - // Set type and children. + // Set type and tqchildren. originalValueType_ = varobj["type"].literal(); numChildren_ = varobj["numchild"].literal().toInt(); setExpandable(numChildren_ != 0); @@ -1159,7 +1159,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, void VarItem::createVarobj() { TQString old = varobjName_; - varobjName_ = TQString("KDEV%1").arg(varobjIndex++); + varobjName_ = TQString("KDEV%1").tqarg(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( - TQString("print %1").arg(expression_), + TQString("print %1").tqarg(expression_), this, &VarItem::handleCliPrint)); } @@ -1177,7 +1177,7 @@ void VarItem::createVarobj() { controller_->addCommand( new CliCommand( - TQString("print /x &%1").arg(expression_), + TQString("print /x &%1").tqarg(expression_), this, &VarItem::handleCurrentAddress, true)); @@ -1186,8 +1186,8 @@ void VarItem::createVarobj() // Need to quote expression, otherwise gdb won't like // spaces inside it. new GDBCommand(TQString("-var-create %1 * \"%2\"") - .arg(varobjName_) - .arg(expression_), + .tqarg(varobjName_) + .tqarg(expression_), this, &VarItem::varobjCreated, initialCreation_ ? false : true)); @@ -1209,7 +1209,7 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r) originalValueType_ = r["type"].literal(); if (!oldType.isEmpty() && oldType != originalValueType_) { - // Type changed, the children might be no longer valid, + // Type changed, the tqchildren might be no longer valid, // so delete them. for(TQListViewItem* child = firstChild(); child; ) { @@ -1239,7 +1239,7 @@ void VarItem::setVarobjName(const TQString& name) { controller_->addCommand( new GDBCommand(TQString("-var-set-format \"%1\" %2") - .arg(varobjName_).arg(varobjFormatName()))); + .tqarg(varobjName_).tqarg(varobjFormatName()))); } // Get the initial value. @@ -1247,7 +1247,7 @@ void VarItem::setVarobjName(const TQString& name) if (isOpen()) { - // This regets children list. + // This regets tqchildren list. setOpen(true); } } @@ -1333,18 +1333,18 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r) } void VarItem::createChildren(const GDBMI::ResultRecord& r, - bool children_of_fake) + bool tqchildren_of_fake) { - const GDBMI::Value& children = r["children"]; + const GDBMI::Value& tqchildren = r["tqchildren"]; /* In order to figure out which variable objects correspond to base class subobject, we first must detect if *this is a structure type. We use present of 'public'/'private'/'protected' fake child as an indicator. */ bool structureType = false; - if (!children_of_fake && children.size() > 0) + if (!tqchildren_of_fake && tqchildren.size() > 0) { - TQString exp = children[0]["exp"].literal(); + TQString exp = tqchildren[0]["exp"].literal(); bool ok = false; exp.toInt(&ok); if (!ok || exp[0] != '*') @@ -1353,23 +1353,23 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, } } - for (unsigned i = 0; i < children.size(); ++i) + for (unsigned i = 0; i < tqchildren.size(); ++i) { - TQString exp = children[i]["exp"].literal(); + TQString exp = tqchildren[i]["exp"].literal(); // For artificial accessibility nodes, - // fetch their children. + // fetch their tqchildren. if (exp == "public" || exp == "protected" || exp == "private") { - TQString name = children[i]["name"].literal(); + TQString name = tqchildren[i]["name"].literal(); controller_->addCommand(new GDBCommand( - "-var-list-children \"" + + "-var-list-tqchildren \"" + name + "\"", this, - &VarItem::childrenOfFakesDone)); + &VarItem::tqchildrenOfFakesDone)); } else { - /* All children of structures that are not artifical + /* All tqchildren of structures that are not artifical are base subobjects. */ bool baseObject = structureType; @@ -1388,28 +1388,28 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, } if (existing) { - existing->setVarobjName(children[i]["name"].literal()); + existing->setVarobjName(tqchildren[i]["name"].literal()); } else { kdDebug(9012) << "Creating new varobj " << exp << " " << baseObject << "\n"; - // Propagate format from parent. + // Propagate format from tqparent. VarItem* v = 0; - v = new VarItem(this, children[i], format_, baseObject); + v = new VarItem(this, tqchildren[i], format_, baseObject); } } } } -void VarItem::childrenDone(const GDBMI::ResultRecord& r) +void VarItem::tqchildrenDone(const GDBMI::ResultRecord& r) { createChildren(r, false); - childrenFetched_ = true; + tqchildrenFetched_ = true; } -void VarItem::childrenOfFakesDone(const GDBMI::ResultRecord& r) +void VarItem::tqchildrenOfFakesDone(const GDBMI::ResultRecord& r) { createChildren(r, true); } @@ -1469,10 +1469,10 @@ TQString VarItem::displayName() const if (expression_[0] != '*') return expression_; - if (const VarItem* parent = - dynamic_cast<const VarItem*>(TrimmableItem::parent())) + if (const VarItem* tqparent = + dynamic_cast<const VarItem*>(TrimmableItem::tqparent())) { - return "*" + parent->displayName(); + return "*" + tqparent->displayName(); } else { @@ -1504,24 +1504,24 @@ TQString VarItem::gdbExpression() const // - number, for array element // - identifier, for member, // - ***intentifier, for derefenreced pointer. - const VarItem* parent = dynamic_cast<const VarItem*>(TrimmableItem::parent()); + const VarItem* tqparent = dynamic_cast<const VarItem*>(TrimmableItem::tqparent()); bool ok = false; expression_.toInt(&ok); if (ok) { - // Array, parent always exists. - return parent->gdbExpression() + "[" + expression_ + "]"; + // Array, tqparent always exists. + return tqparent->gdbExpression() + "[" + expression_ + "]"; } else if (expression_[0] == '*') { - if (parent) + if (tqparent) { // For MI, expression_ can be "*0" (meaing // references 0-th element of some array). - // So, we really need to get to the parent to computed the right + // So, we really need to get to the tqparent to computed the right // gdb expression. - return "*" + parent->gdbExpression(); + return "*" + tqparent->gdbExpression(); } else { @@ -1532,14 +1532,14 @@ TQString VarItem::gdbExpression() const } else { - if (parent) + if (tqparent) /* This is varitem corresponds to a base suboject, - the expression should cast parent to the base's + the expression should cast tqparent to the base's type. */ if (baseClassMember_) - return "((" + expression_ + ")" + parent->gdbExpression() + ")"; + return "((" + expression_ + ")" + tqparent->gdbExpression() + ")"; else - return parent->gdbExpression() + "." + expression_; + return tqparent->gdbExpression() + "." + expression_; else return expression_; } @@ -1603,8 +1603,8 @@ void VarItem::updateValue() void VarItem::setValue(const TQString& new_value) { controller_->addCommand( - new GDBCommand(TQString("-var-assign \"%1\" %2").arg(varobjName_) - .arg(new_value))); + new GDBCommand(TQString("-var-assign \"%1\" %2").tqarg(varobjName_) + .tqarg(new_value))); // And immediately reload it from gdb, // so that it's display format is the one gdb uses, @@ -1619,12 +1619,12 @@ void VarItem::updateSpecialRepresentation(const TQString& xs) TQString s(xs); if (s[0] == '$') { - int i = s.find('='); + int i = s.tqfind('='); if (i != -1) s = s.mid(i+2); } - // A hack to nicely display QStrings. The content of TQString is unicode + // A hack to nicely display TQStrings. The content of TQString is tqunicode // for for ASCII only strings we get ascii character mixed with \000. // Remove those \000 now. @@ -1638,7 +1638,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs) // 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( TQRegExp("\\\\000|\\\\0"), "" ); + s.tqreplace( 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( - TQString("print /x &%1").arg(expression_), + TQString("print /x &%1").tqarg(expression_), this, &VarItem::handleCurrentAddress, true)); controller_->addCommand( new CliCommand( - TQString("whatis %1").arg(expression_), + TQString("whatis %1").tqarg(expression_), this, &VarItem::handleType)); } @@ -1688,12 +1688,12 @@ void VarItem::setOpen(bool open) { TQListViewItem::setOpen(open); - if (open && !childrenFetched_) + if (open && !tqchildrenFetched_) { controller_->addCommand(new GDBCommand( - "-var-list-children \"" + varobjName_ + "\"", + "-var-list-tqchildren \"" + varobjName_ + "\"", this, - &VarItem::childrenDone)); + &VarItem::tqchildrenDone)); } } @@ -1703,7 +1703,7 @@ bool VarItem::handleSpecialTypes() if (originalValueType_.isEmpty()) return false; - static TQRegExp qstring("^(const)?[ ]*QString[ ]*&?$"); + static TQRegExp qstring("^(const)?[ ]*TQString[ ]*&?$"); if (qstring.exactMatch(originalValueType_)) { @@ -1712,7 +1712,7 @@ bool VarItem::handleSpecialTypes() return false; varTree->controller()->addCommand( new ResultlessCommand(TQString("print $kdev_d=%1.d") - .arg(gdbExpression()), + .tqarg(gdbExpression()), true /* ignore error */)); if (varTree->controller()->qtVersion() >= 4) @@ -1736,7 +1736,7 @@ bool VarItem::handleSpecialTypes() else varTree->controller()->addCommand( new ValueSpecialRepresentationCommand( - this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.unicode[0])@$kdev_s) : \"\"")); + this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.tqunicode[0])@$kdev_s) : \"\"")); return true; } @@ -1760,7 +1760,7 @@ void VarItem::setFormat(format_t f) if (numChildren_) { - // If variable has children, change format for children. + // If variable has tqchildren, change format for tqchildren. // - for structures, that's clearly right // - for arrays, that's clearly right // - for pointers, this can be confusing, but nobody ever wants to @@ -1775,7 +1775,7 @@ void VarItem::setFormat(format_t f) { controller_->addCommand( new GDBCommand(TQString("-var-set-format \"%1\" %2") - .arg(varobjName_).arg(varobjFormatName()))); + .tqarg(varobjName_).tqarg(varobjFormatName()))); updateValue(); } @@ -1853,7 +1853,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg, if (!alive_) { /* Draw this as disabled. */ - TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(), + TQListViewItem::paintCell(p, varTree()->TQWidget::tqpalette().disabled(), column, width, align); } else @@ -1876,8 +1876,8 @@ VariableTree* VarItem::varTree() const void VarItem::unhookFromGdb() { - // Unhook children first, so that child varitems are deleted - // before parent. Strictly speaking, we can avoid calling + // Unhook tqchildren first, so that child varitems are deleted + // before tqparent. Strictly speaking, we can avoid calling // -var-delete on child varitems, but that's a bit cheesy, for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) @@ -1886,7 +1886,7 @@ void VarItem::unhookFromGdb() } alive_ = false; - childrenFetched_ = false; + tqchildrenFetched_ = false; emit varobjNameChange(varobjName_, ""); @@ -1894,7 +1894,7 @@ void VarItem::unhookFromGdb() { controller_->addCommand( new GDBCommand( - TQString("-var-delete \"%1\"").arg(varobjName_))); + TQString("-var-delete \"%1\"").tqarg(varobjName_))); } varobjName_ = ""; @@ -1931,8 +1931,8 @@ bool VarItem::isAlive() const // ************************************************************************** // ************************************************************************** -VarFrameRoot::VarFrameRoot(VariableTree *parent, int frameNo, int threadNo) - : TrimmableItem (parent), +VarFrameRoot::VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo) + : TrimmableItem (tqparent), needLocals_(false), frameNo_(frameNo), threadNo_(threadNo), @@ -1956,8 +1956,8 @@ void VarFrameRoot::setOpen(bool open) if (frameOpened && needLocals_) { needLocals_ = false; - VariableTree* parent = static_cast<VariableTree*>(listView()); - parent->updateCurrentFrame(); + VariableTree* tqparent = static_cast<VariableTree*>(listView()); + tqparent->updateCurrentFrame(); } } @@ -1978,8 +1978,8 @@ void VarFrameRoot::setDirty() // ************************************************************************** // ************************************************************************** -WatchRoot::WatchRoot(VariableTree *parent) - : TrimmableItem(parent) +WatchRoot::WatchRoot(VariableTree *tqparent) + : TrimmableItem(tqparent) { setText(0, i18n("Watch")); setOpen(true); diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index 5c77ea43..d56e8977 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -46,17 +46,18 @@ class GDBBreakpointWidget; enum { VarNameCol = 0, ValueCol = 1, VarTypeCol = 2}; enum DataType { typeUnknown, typeValue, typePointer, typeReference, - typeStruct, typeArray, typeQString, typeWhitespace, + typeStruct, typeArray, typeTQString, typeWhitespace, typeName }; -class VariableWidget : public QWidget +class VariableWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: VariableWidget( GDBController* controller, GDBBreakpointWidget* breakpointWidget, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); VariableTree *varTree() const { return varTree_; } @@ -82,11 +83,12 @@ private: /***************************************************************************/ /***************************************************************************/ -class VariableTree : public KListView, public QToolTip +class VariableTree : public KListView, public TQToolTip { Q_OBJECT + TQ_OBJECT public: - VariableTree(VariableWidget *parent, + VariableTree(VariableWidget *tqparent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name=0 ); @@ -184,16 +186,16 @@ private: /***************************************************************************/ /***************************************************************************/ -/** List view item that can 'trim' outdated children. +/** List view item that can 'trim' outdated tqchildren. - The instances of this class hold a number of children corresponding + The instances of this class hold a number of tqchildren corresponding to variables. When program state changes, such as after a step in source, some variable values can change, and some variables can go out of scope. We need - highlight modified variables - remove gone variables - We could just remove all children and repopulate the list from + We could just remove all tqchildren and repopulate the list from the data from debugger, but then we'd loose information about previous variable values. @@ -205,8 +207,8 @@ private: class TrimmableItem : public KListViewItem { public: - TrimmableItem(VariableTree *parent); - TrimmableItem(TrimmableItem *parent); + TrimmableItem(VariableTree *tqparent); + TrimmableItem(TrimmableItem *tqparent); virtual ~TrimmableItem(); @@ -226,17 +228,18 @@ class VarItem : public TQObject, public TrimmableItem { Q_OBJECT + TQ_OBJECT public: enum format_t { natural, hexadecimal, decimal, character, binary }; /** Creates top-level variable item from the specified expression. Optionally, alternative display name can be provided. */ - VarItem( TrimmableItem *parent, + VarItem( TrimmableItem *tqparent, const TQString& expression, bool frozen = false); - VarItem( TrimmableItem *parent, const GDBMI::Value& varobj, + VarItem( TrimmableItem *tqparent, const GDBMI::Value& varobj, format_t format, bool baseClassMember); virtual ~VarItem(); @@ -283,7 +286,7 @@ public: /** Recursively clears the varobjName_ field, making *this completely disconnected from gdb. - Automatically makes *this and children disables, + Automatically makes *this and tqchildren disables, since there's no possible interaction with unhooked object. */ @@ -297,7 +300,7 @@ public: format_t formatFromGdbModifier(char c) const; /** Clears highliting for this variable and - all its children. */ + all its tqchildren. */ void clearHighlight(); /** Sets new top-level textual value of this variable. @@ -330,7 +333,7 @@ private: - sets varobjName_ to 'name' - sets format, if it's not default one - gets initial value - - if item is open, gets children. + - if item is open, gets tqchildren. */ void setVarobjName(const TQString& name); @@ -345,12 +348,12 @@ private: 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 tqchildrenDone(const GDBMI::ResultRecord& r); + void tqchildrenOfFakesDone(const GDBMI::ResultRecord& r); void handleCurrentAddress(const TQValueVector<TQString>& lines); void handleType(const TQValueVector<TQString>& lines); - void createChildren(const GDBMI::ResultRecord& r, bool children_of_fake); + void createChildren(const GDBMI::ResultRecord& r, bool tqchildren_of_fake); /** Called to handle the output of the cli print command. */ @@ -370,7 +373,7 @@ private: private: // The gdb expression for this varItem relatively to - // parent VarItem. + // tqparent VarItem. TQString expression_; bool highlight_; @@ -388,7 +391,7 @@ private: static int varobjIndex; int numChildren_; - bool childrenFetched_; + bool tqchildrenFetched_; TQString currentAddress_; TQString lastObtainedAddress_; @@ -415,7 +418,7 @@ private: class VarFrameRoot : public TrimmableItem { public: - VarFrameRoot(VariableTree *parent, int frameNo, int threadNo); + VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo); virtual ~VarFrameRoot(); void setOpen(bool open); @@ -453,7 +456,7 @@ private: class WatchRoot : public TrimmableItem { public: - WatchRoot(VariableTree *parent); + WatchRoot(VariableTree *tqparent); virtual ~WatchRoot(); }; diff --git a/languages/cpp/declarationinfo.h b/languages/cpp/declarationinfo.h index 8b55557e..de49dae3 100644 --- a/languages/cpp/declarationinfo.h +++ b/languages/cpp/declarationinfo.h @@ -44,7 +44,7 @@ struct DeclarationInfo { } 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); + return TQString("line %1 col %2 - line %3 col %4\nfile: %5").tqarg(startLine).tqarg(startCol).tqarg(endLine).tqarg(endCol).tqarg(file); } TQString toText() const { diff --git a/languages/cpp/doc/clanlib.toc b/languages/cpp/doc/clanlib.toc index 04ed2041..97e8ec56 100644 --- a/languages/cpp/doc/clanlib.toc +++ b/languages/cpp/doc/clanlib.toc @@ -7,7 +7,7 @@ <tocsect2 name="Display overview" url="overview/display-1.html" /> <tocsect2 name="Resources" url="overview/resources-1.html" /> <tocsect2 name="Sound overview" url="overview/sound_overview.html" /> - <tocsect2 name="Signals & Slots overview" url="overview/signals.html" /> + <tocsect2 name="Signals & Slots overview" url="overview/Q_SIGNALS.html" /> <tocsect2 name="Sprites overview" url="overview/sprites_overview.html" /> <tocsect2 name="Font overview" url="overview/font_overview-1.html" /> <tocsect2 name="Loading graphics overview" url="overview/loading_graphics.html" /> diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc index 081ad646..7acb23a3 100644 --- a/languages/cpp/doc/cppannotations.toc +++ b/languages/cpp/doc/cppannotations.toc @@ -290,7 +290,7 @@ <tocsect2 name="17.4: The Generic Algorithms" url="cplusplus17.html#l227"> <tocsect3 name="17.4.1: accumulate()" url="cplusplus17.html#l228"/> <tocsect3 name="17.4.2: adjacent_difference()" url="cplusplus17.html#l229"/> - <tocsect3 name="17.4.3: adjacent_find()" url="cplusplus17.html#l230"/> + <tocsect3 name="17.4.3: adjacent_tqfind()" url="cplusplus17.html#l230"/> <tocsect3 name="17.4.4: binary_search()" url="cplusplus17.html#l231"/> <tocsect3 name="17.4.5: copy()" url="cplusplus17.html#l232"/> <tocsect3 name="17.4.6: copy_backward()" url="cplusplus17.html#l233"/> @@ -300,7 +300,7 @@ <tocsect3 name="17.4.10: equal_range()" url="cplusplus17.html#l237"/> <tocsect3 name="17.4.11: fill()" url="cplusplus17.html#l238"/> <tocsect3 name="17.4.12: fill_n()" url="cplusplus17.html#l239"/> - <tocsect3 name="17.4.13: find()" url="cplusplus17.html#l240"/> + <tocsect3 name="17.4.13: tqfind()" url="cplusplus17.html#l240"/> <tocsect3 name="17.4.14: find_end()" url="cplusplus17.html#l241"/> <tocsect3 name="17.4.15: find_first_of()" url="cplusplus17.html#l242"/> <tocsect3 name="17.4.16: find_if()" url="cplusplus17.html#l243"/> @@ -331,7 +331,7 @@ <tocsect3 name="17.4.41: remove_copy()" url="cplusplus17.html#l268"/> <tocsect3 name="17.4.42: remove_if()" url="cplusplus17.html#l269"/> <tocsect3 name="17.4.43: remove_copy_if()" url="cplusplus17.html#l270"/> - <tocsect3 name="17.4.44: replace()" url="cplusplus17.html#l271"/> + <tocsect3 name="17.4.44: tqreplace()" url="cplusplus17.html#l271"/> <tocsect3 name="17.4.45: replace_copy()" url="cplusplus17.html#l272"/> <tocsect3 name="17.4.46: replace_if()" url="cplusplus17.html#l273"/> <tocsect3 name="17.4.47: replace_copy_if()" url="cplusplus17.html#l274"/> @@ -427,7 +427,7 @@ <tocsect3 name="19.7.1: The `Daemon' program" url="cplusplus19.html#l349"/> <tocsect3 name="19.7.2: The `Pipe' class" url="cplusplus19.html#l350"/> <tocsect3 name="19.7.3: The `ParentSlurp' class" url="cplusplus19.html#l351"/> - <tocsect3 name="19.7.4: Communicating with multiple children" url="cplusplus19.html#l352"> + <tocsect3 name="19.7.4: Communicating with multiple tqchildren" url="cplusplus19.html#l352"> <tocsect4 name="19.7.4.1: The `Select' class" url="cplusplus19.html#l353"/> <tocsect4 name="19.7.4.2: The `Child' class" url="cplusplus19.html#l354"/> <tocsect4 name="19.7.4.3: The `Monitor' class" url="cplusplus19.html#l355"/> diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc index d996f1a0..e6c13c48 100644 --- a/languages/cpp/doc/gnome1.toc +++ b/languages/cpp/doc/gnome1.toc @@ -124,7 +124,7 @@ <tocsect3 name="Keyboard Accelerators" url="gtk/gtk-keyboard-accelerators.html"/> <tocsect3 name="Selections" url="gtk/gtk-selections.html"/> <tocsect3 name="Drag and Drop" url="gtk/gtk-drag-and-drop.html"/> - <tocsect3 name="Signals" url="gtk/gtk-signals.html"/> + <tocsect3 name="Signals" url="gtk/gtk-Q_SIGNALS.html"/> <tocsect3 name="Signal Marshallers" url="gtk/gtk-signal-marshallers.html"/> <tocsect3 name="Implementation of Object Properties" url="gtk/gtk-object-properties.html"/> <tocsect3 name="Types" url="gtk/gtk-types.html"/> @@ -135,7 +135,7 @@ <tocsect2 name="GTK+ Widgets and Objects" url="gtk/gtkobjects.html"> <tocsect3 name="GtkAccelLabel" url="gtk/gtkaccellabel.html"/> <tocsect3 name="GtkAdjustment" url="gtk/gtkadjustment.html"/> - <tocsect3 name="GtkAlignment" url="gtk/gtkalignment.html"/> + <tocsect3 name="GtkAlignment" url="gtk/gtktqalignment.html"/> <tocsect3 name="GtkArrow" url="gtk/gtkarrow.html"/> <tocsect3 name="GtkAspectFrame" url="gtk/gtkaspectframe.html"/> <tocsect3 name="GtkButtonBox" url="gtk/gtkbuttonbox.html"/> @@ -261,7 +261,7 @@ <tocsect3 name="gnome-canvas-util" url="gnomeui/gnomeui-gnome-canvas-util.html"/> <tocsect3 name="gnome-dialog-util" url="gnomeui/gnomeui-gnome-dialog-util.html"/> <tocsect3 name="gnome-dns" url="gnomeui/gnomeui-gnome-dns.html"/> - <tocsect3 name="gnome-geometry" url="gnomeui/gnomeui-gnome-geometry.html"/> + <tocsect3 name="gnome-tqgeometry" url="gnomeui/gnomeui-gnome-tqgeometry.html"/> <tocsect3 name="gnome-ice" url="gnomeui/gnomeui-gnome-ice.html"/> <tocsect3 name="gnome-icon-text" url="gnomeui/gnomeui-gnome-icon-text.html"/> <tocsect3 name="gnome-init" url="gnomeui/gnomeui-gnome-init.html"/> diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index e7d5f4d2..2c4451a6 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -38,7 +38,7 @@ <tocsect3 name="What It Is For (Look and Feel)" url=""/> <tocsect3 name="Inside the Qt Toolkit" url="ch03lev1sec2.html"/> <tocsect3 name="Signals and Slots" url="ch03lev1sec3.html"/> - <tocsect3 name="Meta Object Compiler (moc)" url="ch03lev1sec4.html"/> + <tocsect3 name="Meta Object Compiler (tqmoc)" url="ch03lev1sec4.html"/> <tocsect3 name="The Utility Classes" url="ch03lev1sec5.html"/> <tocsect3 name="Special Features (ImageIO, OpenGL, Mesa)" url="ch03lev1sec6.html"/> <tocsect3 name="Summary" url="ch03lev1sec7.html"/> @@ -238,7 +238,7 @@ <entry name="actions, editBookmarks" url="ch06.html"/> <entry name="actions, findNext" url="ch06.html"/> <entry name="actions, findPrev" url="ch06.html"/> -<entry name="actions, find" url="ch06.html"/> +<entry name="actions, tqfind" url="ch06.html"/> <entry name="actions, firstPage" url="ch06.html"/> <entry name="actions, fitToHeight" url="ch06.html"/> <entry name="actions, fitToPage" url="ch06.html"/> @@ -266,7 +266,7 @@ <entry name="actions, quit" url="ch06.html"/> <entry name="actions, redisplay" url="ch06.html"/> <entry name="actions, redo" url="ch06.html"/> -<entry name="actions, replace" url="ch06.html"/> +<entry name="actions, tqreplace" url="ch06.html"/> <entry name="actions, reportBug" url="ch06.html"/> <entry name="actions, revert" url="ch06.html"/> <entry name="actions, saveAs" url="ch06.html"/> @@ -405,7 +405,7 @@ <entry name="CDE (Common Desktop Environment)" url="ch01.html"/> <entry name="cgi resource type" url="ch07lev1sec4.html"/> <entry name="CGotoDialog class, modeless dialog box" url="ch08lev1sec3.html"/> -<entry name="CGotoDialog example, layout" url="ch08lev1sec2.html"/> +<entry name="CGotoDialog example, tqlayout" url="ch08lev1sec2.html"/> <entry name="Chapter tag (DocBook)" url="ch15lev1sec2.html"/> <entry name="checking out, applications (CVS)" url="ch17lev1sec5.html"/> <entry name="checking spelling" url="ch10lev1sec3.html"/> @@ -413,11 +413,11 @@ <entry name="check() method" url="ch10lev1sec3.html"/> <entry name="checkWord() method" url="ch10lev1sec3.html"/> <entry name="Child Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/> -<entry name="child widgets, geometry management, QBoxLayout manager" url="ch04lev1sec3.html"/> -<entry name="child widgets, geometry management, QGridLayout manager" url="ch04lev1sec3.html"/> -<entry name="child widgets, geometry management" url="ch04lev1sec3.html"/> -<entry name="child widgets, KChildren example, kchildren.cpp class definition" url="ch04lev1sec3.html"/> -<entry name="child widgets, KChildren example, kchildren.h class declaration" url="ch04lev1sec3.html"/> +<entry name="child widgets, tqgeometry management, QBoxLayout manager" url="ch04lev1sec3.html"/> +<entry name="child widgets, tqgeometry management, QGridLayout manager" url="ch04lev1sec3.html"/> +<entry name="child widgets, tqgeometry management" url="ch04lev1sec3.html"/> +<entry name="child widgets, KChildren example, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> +<entry name="child widgets, KChildren example, ktqchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="child widgets, KChildren example, main() method" url="ch04lev1sec3.html"/> <entry name="child widgets, KChildren example" url="ch04lev1sec3.html"/> <entry name="child widgets" url="ch04lev1sec3.html"/> @@ -472,15 +472,15 @@ <entry name="classes, QWidget, example (listing)" url="ch03lev1sec2.html"/> <entry name="classes, QWidget, functions" url="ch03lev1sec2.html"/> <entry name="classes, QWidget, sample class declaration" url="ch04.html"/> -<entry name="classes, QWidget, signals" url="ch04.html"/> -<entry name="classes, QWidget, slots" url="ch04.html"/> +<entry name="classes, QWidget, Q_SIGNALS" url="ch04.html"/> +<entry name="classes, QWidget, Q_SLOTS" url="ch04.html"/> <entry name="classes, QWidget" url="ch03lev1sec2.html"/> <entry name="classes, QWidget" url="ch04.html"/> <entry name="classes, ReadOnlyPart" url="ch12lev1sec4.html"/> <entry name="classes, ReadWritePart" url="ch12lev1sec4.html"/> <entry name="classes, SelectDialog" url="ch08.html"/> -<entry name="classes, slots in temporary classes" url="ch03lev1sec3.html"/> -<entry name="classes, slots" url="ch03lev1sec3.html"/> +<entry name="classes, Q_SLOTS in temporary classes" url="ch03lev1sec3.html"/> +<entry name="classes, Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="classes, template, QList" url="ch03lev1sec5.html"/> <entry name="classes, template" url="ch03lev1sec5.html"/> <entry name="classes, utility (Qt)" url="ch03lev1sec5.html"/> @@ -667,7 +667,7 @@ <entry name="DCOP, programming interface, transactions" url="ch13lev1sec5.html"/> <entry name="DCOP, programming interface" url="ch13lev1sec5.html"/> <entry name="DCOPRef objects" url="ch13lev1sec6.html"/> -<entry name="DCOP, signals and slots" url="ch13lev1sec6.html"/> +<entry name="DCOP, Q_SIGNALS and Q_SLOTS" url="ch13lev1sec6.html"/> <entry name="DCOP, underlying technologies, data streaming" url="ch13lev1sec3.html"/> <entry name="DCOP, underlying technologies, ICE (Inter-Client Exchange) mechanism" url="ch13lev1sec3.html"/> <entry name="DCOP, underlying technologies" url="ch13lev1sec3.html"/> @@ -729,7 +729,7 @@ <entry name="deleting, CVS (Concurrent Version System) directories" url="ch17lev1sec5.html"/> <entry name="deleting, CVS (Concurrent Version System) files" url="ch17lev1sec5.html"/> <entry name="deprecated (" url="ch15.html"/> -<entry name="design guidelines, dialog boxes, layout issues" url="ch08lev1sec2.html"/> +<entry name="design guidelines, dialog boxes, tqlayout issues" url="ch08lev1sec2.html"/> <entry name="design guidelines, dialog boxes" url="ch08lev1sec7.html"/> <entry name="designing, icons" url="ch06lev1sec3.html"/> <entry name="Desktop Communication Protocol. See DCOP" url="ch13.html"/> @@ -760,13 +760,13 @@ <entry name="dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/> <entry name="dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/> <entry name="dialog boxes, KSpellConfig configuration dialog" url="ch10lev1sec3.html"/> -<entry name="dialog boxes, layout, CGotoDialog example" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, layout, design issues" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, layout, hierarchies of layouts" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, layout, manual placement" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, layout, nested layouts" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, layout, QLayout classes" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, layout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, CGotoDialog example" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, design issues" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, hierarchies of tqlayouts" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, manual placement" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, nested tqlayouts" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, QLayout classes" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> <entry name="dialog boxes, modal, advantages/disadvantages" url="ch08lev1sec3.html"/> <entry name="dialog boxes, modal, modal dialog allocated from the heap" url="ch08lev1sec3.html"/> <entry name="dialog boxes, modal, modal dialog located on the stack" url="ch08lev1sec3.html"/> @@ -897,7 +897,7 @@ <entry name="embedding, parts, multiple parts" url="ch12lev1sec8.html"/> <entry name="embedding, parts" url="ch12lev1sec7.html"/> <entry name="emitDCOPSignal() method" url="ch13lev1sec6.html"/> -<entry name="emitting signals" url="ch03lev1sec3.html"/> +<entry name="emitting Q_SIGNALS" url="ch03lev1sec3.html"/> <entry name="Emphasis tag (DocBook)" url="ch15lev1sec2.html"/> <entry name="enabling, application functions" url="ch09lev1sec3.html"/> <entry name="enabling, debugging, gdb debugger" url="ch18lev1sec6.html"/> @@ -912,7 +912,7 @@ <entry name="event handling, drag events" url="ch07.html"/> <entry name="event handling, drop events" url="ch07.html"/> <entry name="event handling, Qt" url="ch03lev1sec2.html"/> -<entry name="event handling, signals and slots" url="ch03lev1sec3.html"/> +<entry name="event handling, Q_SIGNALS and Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="event handling, widgets, closeEvent()" url="ch04.html"/> <entry name="event handling, widgets, dragEnterEvent()" url="ch04.html"/> <entry name="event handling, widgets, dragLeaveEvent()" url="ch04.html"/> @@ -1061,7 +1061,7 @@ <entry name="functions, slotOpen()" url="ch07lev1sec5.html"/> <entry name="functions, slotSave()" url="ch07lev1sec5.html"/> <entry name="functions, slotSpecialHelp()" url="ch05lev1sec2.html"/> -<entry name="functions, slots" url="ch03lev1sec3.html"/> +<entry name="functions, Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="functions, sorry()" url="ch05lev1sec3.html"/> <entry name="functions, streamEnd()" url="ch14lev1sec3.html"/> <entry name="functions, streamInit()" url="ch14lev1sec3.html"/> @@ -1080,16 +1080,16 @@ <entry name="gdb debugger, running" url="ch18lev1sec6.html"/> <entry name="gdb debugger" url="ch18lev1sec6.html"/> <entry name="gdb (GNU debugger)" url="ch02.html"/> -<entry name="geometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> -<entry name="geometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/> -<entry name="geometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> -<entry name="geometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/> -<entry name="geometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/> -<entry name="geometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> -<entry name="geometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> -<entry name="geometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/> -<entry name="geometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/> -<entry name="geometry management (widgets)" url="ch04lev1sec3.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of tqlayouts" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, nested tqlayouts" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/> +<entry name="tqgeometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/> +<entry name="tqgeometry management (widgets)" url="ch04lev1sec3.html"/> <entry name="getColor() function" url="ch05lev1sec3.html"/> <entry name="getExistingDirectory() function" url="ch05lev1sec3.html"/> <entry name="getFont() function" url="ch05lev1sec3.html"/> @@ -1130,7 +1130,7 @@ <entry name="GUIs, dialog boxes, kdeui (KDE user-interface library)" url="ch08lev1sec4.html"/> <entry name="GUIs, dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/> <entry name="GUIs, dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/> -<entry name="GUIs, dialog boxes, layout" url="ch08lev1sec2.html"/> +<entry name="GUIs, dialog boxes, tqlayout" url="ch08lev1sec2.html"/> <entry name="GUIs, dialog boxes, modal" url="ch08lev1sec3.html"/> <entry name="GUIs, dialog boxes, modeless" url="ch08lev1sec3.html"/> <entry name="GUIs, dialog boxes, simple example" url="ch08.html"/> @@ -1170,8 +1170,8 @@ <entry name="GUIs, widgets, event handlers" url="ch04.html"/> <entry name="GUIs, widgets, painting" url="ch04lev1sec2.html"/> <entry name="GUIs, widgets, sample class declaration" url="ch04.html"/> -<entry name="GUIs, widgets, signals" url="ch04.html"/> -<entry name="GUIs, widgets, slots" url="ch04.html"/> +<entry name="GUIs, widgets, Q_SIGNALS" url="ch04.html"/> +<entry name="GUIs, widgets, Q_SLOTS" url="ch04.html"/> <entry name="GUIs, widgets" url="ch04.html"/> <entry name="GUIs, widgets, user input" url="ch04lev1sec4.html"/> <entry name="Hausmann, Simon" url="ch13lev1sec7.html"/> @@ -1278,10 +1278,10 @@ <entry name="KApplication class" url="ch02lev1sec3.html"/> <entry name="KAudioPlayer class" url="ch14lev1sec6.html"/> <entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/> -<entry name="kchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/> -<entry name="kchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/> -<entry name="KChildren sample widget (child widget), kchildren.cpp class definition" url="ch04lev1sec3.html"/> -<entry name="KChildren sample widget (child widget), kchildren.h class declaration" url="ch04lev1sec3.html"/> +<entry name="ktqchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/> +<entry name="ktqchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/> +<entry name="KChildren sample widget (child widget), ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> +<entry name="KChildren sample widget (child widget), ktqchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/> <entry name="kconfigdemo.cpp file (KConfigDemo widget)" url="ch07lev1sec2.html"/> @@ -1427,7 +1427,7 @@ <entry name="keyReleaseEvent() event handler, widgets" url="ch04.html"/> <entry name="keystrokes, handling, widgets" url="ch04lev1sec4.html"/> <entry name="KeyWordSet tag (DocBook)" url="ch15lev1sec2.html"/> -<entry name="keywords, moc" url="ch03lev1sec4.html"/> +<entry name="keywords, tqmoc" url="ch03lev1sec4.html"/> <entry name="Keyword tag (DocBook)" url="ch15lev1sec2.html"/> <entry name="KFileDialog" url="ch05lev1sec3.html"/> <entry name="KFontDialog" url="ch05lev1sec3.html"/> @@ -1558,9 +1558,9 @@ <entry name="KStdActionsDemo widget" url="ch05.html"/> <entry name="ktictactoe.cpp class definition (KTicTacToe widget)" url="ch04lev1sec3.html"/> <entry name="ktictactoe.h class declaration (KTicTacToe widget)" url="ch04lev1sec3.html"/> -<entry name="KTicTacToe widget (geometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/> -<entry name="KTicTacToe widget (geometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/> -<entry name="KTicTacToe widget (geometry management example), playing the game" url="ch04lev1sec3.html"/> +<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/> +<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/> +<entry name="KTicTacToe widget (tqgeometry management example), playing the game" url="ch04lev1sec3.html"/> <entry name="KTMainWindow class" url="ch02lev1sec3.html"/> <entry name="Kulow, Stephen" url="ch16.html"/> <entry name="KUniqueApplication class, passing command-line parameters" url="ch13lev1sec7.html"/> @@ -1591,15 +1591,15 @@ <entry name="languages, i18n() function" url="ch06lev1sec4.html"/> <entry name="languages, translator files" url="ch06lev1sec4.html"/> <entry name="lastPage action" url="ch06.html"/> -<entry name="layout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> -<entry name="layout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/> -<entry name="layout, dialog boxes, design issues" url="ch08lev1sec2.html"/> -<entry name="layout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> -<entry name="layout, dialog boxes, manual placement" url="ch08lev1sec2.html"/> -<entry name="layout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/> -<entry name="layout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> -<entry name="layout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> -<entry name="layout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/> +<entry name="tqlayout, dialog boxes, design issues" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, hierarchies of tqlayouts" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, manual placement" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, nested tqlayouts" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> +<entry name="tqlayout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> <entry name="leaveEvent() event handler, widgets" url="ch04.html"/> <entry name="legal issues" url="ch01lev1sec6.html"/> <entry name="legal issues" url="ch19.html"/> @@ -1637,7 +1637,7 @@ <entry name="lines, drawing" url="ch04lev1sec2.html"/> <entry name="listing, CVS (Concurrent Version System) modules" url="ch17lev1sec5.html"/> <entry name="listings, application configuration file example" url="ch07lev1sec2.html"/> -<entry name="listings, connecting slots to signals" url="ch03lev1sec3.html"/> +<entry name="listings, connecting Q_SLOTS to Q_SIGNALS" url="ch03lev1sec3.html"/> <entry name="listings, DCOP, client using stub interface" url="ch13lev1sec5.html"/> <entry name="listings, DCOP, DCOPClient call() method" url="ch13lev1sec5.html"/> <entry name="listings, DCOP, DCOPClient send() method" url="ch13lev1sec5.html"/> @@ -1656,12 +1656,12 @@ <entry name="listings, dialog boxes, dialog from kdeui library" url="ch08lev1sec4.html"/> <entry name="listings, dialog boxes, KButtonBox in a dialog" url="ch08lev1sec4.html"/> <entry name="listings, dialog boxes, KEdit dialog code" url="ch08lev1sec6.html"/> -<entry name="listings, dialog boxes, manual geometry strategy and QLayouts classes" url="ch08lev1sec2.html"/> +<entry name="listings, dialog boxes, manual tqgeometry strategy and QLayouts classes" url="ch08lev1sec2.html"/> <entry name="listings, dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modal dialog located on the stack" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modeless dialog example" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modeless dialogs, removing from memory" url="ch08lev1sec3.html"/> -<entry name="listings, dialog boxes, QVBox widget for geometry management" url="ch08lev1sec2.html"/> +<entry name="listings, dialog boxes, QVBox widget for tqgeometry management" url="ch08lev1sec2.html"/> <entry name="listings, dialog boxes, SelectDialog class" url="ch08.html"/> <entry name="listings, Example_ADD interface" url="ch14lev1sec2.html"/> <entry name="listings, Example_ADD module" url="ch14lev1sec2.html"/> @@ -1672,8 +1672,8 @@ <entry name="listings, KabDemo application (address book dialog), kabdemo.cpp class definition" url="ch10lev1sec4.html"/> <entry name="listings, KabDemo application (address book dialog), kabdemo.h class declaration" url="ch10lev1sec4.html"/> <entry name="listings, KabDemo application (address book dialog), main() method" url="ch10lev1sec4.html"/> -<entry name="listings, KChildren widget, kchildren.cpp class definition" url="ch04lev1sec3.html"/> -<entry name="listings, KChildren widget, kchildren.h class declaration" url="ch04lev1sec3.html"/> +<entry name="listings, KChildren widget, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> +<entry name="listings, KChildren widget, ktqchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/> <entry name="listings, KConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/> <entry name="listings, KConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/> @@ -1750,7 +1750,7 @@ <entry name="listings, KXOSquare widget, main() method" url="ch04lev1sec2.html"/> <entry name="listings, Makefile.am" url="ch16lev1sec2.html"/> <entry name="listings, Makefiles, example of" url="ch02lev1sec2.html"/> -<entry name="listings, moc example" url="ch03lev1sec4.html"/> +<entry name="listings, tqmoc example" url="ch03lev1sec4.html"/> <entry name="listings, MyWindow class implementation" url="ch03lev1sec4.html"/> <entry name="listings, network transparency, complete example" url="ch06lev1sec8.html"/> <entry name="listings, network transparency, filenames" url="ch06lev1sec8.html"/> @@ -1829,7 +1829,7 @@ <entry name="managing, sessions, source file example" url="ch06lev1sec2.html"/> <entry name="managing, sessions" url="ch06lev1sec2.html"/> <entry name="managing, sessions" url="ch07lev1sec3.html"/> -<entry name="manual geometry strategy (dialog boxes)" url="ch08lev1sec2.html"/> +<entry name="manual tqgeometry strategy (dialog boxes)" url="ch08lev1sec2.html"/> <entry name="mcopclass files" url="ch14lev1sec2.html"/> <entry name="MCOP, future of, composition/RAD" url="ch14lev1sec7.html"/> <entry name="MCOP, future of, GUIs" url="ch14lev1sec7.html"/> @@ -1886,7 +1886,7 @@ <entry name="Meta Object Compiler, executing programs" url="ch03lev1sec4.html"/> <entry name="Meta Object Compiler, keywords" url="ch03lev1sec4.html"/> <entry name="Meta Object Compiler, main program file example" url="ch03lev1sec4.html"/> -<entry name="Meta Object Compiler (moc)" url="ch03lev1sec2.html"/> +<entry name="Meta Object Compiler (tqmoc)" url="ch03lev1sec2.html"/> <entry name="Meta Object Compiler" url="ch03lev1sec4.html"/> <entry name="methods, attach()" url="ch13lev1sec5.html"/> <entry name="methods, beginTransaction()" url="ch13lev1sec5.html"/> @@ -1937,7 +1937,7 @@ <entry name="methods, remoteFunctions()" url="ch13lev1sec6.html"/> <entry name="methods, remoteInterfaces()" url="ch13lev1sec6.html"/> <entry name="methods, remoteObjects()" url="ch13lev1sec6.html"/> -<entry name="methods, repaint(), QPainter class" url="ch04lev1sec2.html"/> +<entry name="methods, tqrepaint(), QPainter class" url="ch04lev1sec2.html"/> <entry name="methods, resume()" url="ch13lev1sec5.html"/> <entry name="methods, senderId()" url="ch13lev1sec6.html"/> <entry name="methods, send()" url="ch13lev1sec5.html"/> @@ -1962,11 +1962,11 @@ <entry name="MIDI, LibKMid" url="ch14lev1sec6.html"/> <entry name="mime resource type" url="ch07lev1sec4.html"/> <entry name="Mini application template" url="ch18lev1sec2.html"/> -<entry name="moc, executing programs" url="ch03lev1sec4.html"/> -<entry name="moc, keywords" url="ch03lev1sec4.html"/> -<entry name="moc, main program file example" url="ch03lev1sec4.html"/> -<entry name="moc (Meta Object Compiler" url="ch03lev1sec2.html"/> -<entry name="moc" url="ch03lev1sec4.html"/> +<entry name="tqmoc, executing programs" url="ch03lev1sec4.html"/> +<entry name="tqmoc, keywords" url="ch03lev1sec4.html"/> +<entry name="tqmoc, main program file example" url="ch03lev1sec4.html"/> +<entry name="tqmoc (Meta Object Compiler" url="ch03lev1sec2.html"/> +<entry name="tqmoc" url="ch03lev1sec4.html"/> <entry name="modalCheck() method" url="ch10lev1sec3.html"/> <entry name="modal dialog boxes, advantages/disadvantages" url="ch08lev1sec3.html"/> <entry name="modal dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/> @@ -2032,7 +2032,7 @@ <entry name="navigation, drag and drop" url="ch07.html"/> <entry name="navigation, menubars, creating" url="ch02lev1sec4.html"/> <entry name="navigation, toolbars" url="ch02lev1sec4.html"/> -<entry name="nested layouts (dialog boxes)" url="ch08lev1sec2.html"/> +<entry name="nested tqlayouts (dialog boxes)" url="ch08lev1sec2.html"/> <entry name="network transparency, applications, classes" url="ch06lev1sec8.html"/> <entry name="network transparency, applications" url="ch06lev1sec8.html"/> <entry name="network transparency" url="ch01lev1sec2.html"/> @@ -2143,13 +2143,13 @@ <entry name="painting, widgets, invoking paint events" url="ch04lev1sec2.html"/> <entry name="painting, widgets, KXOSquare example" url="ch04lev1sec2.html"/> <entry name="painting, widgets, paintEvent() method" url="ch04lev1sec2.html"/> -<entry name="painting, widgets, repainting" url="ch04lev1sec2.html"/> +<entry name="painting, widgets, tqrepainting" url="ch04lev1sec2.html"/> <entry name="painting, widgets" url="ch04lev1sec2.html"/> <entry name="panel applet (KWeather), kweather.cpp class definition" url="ch11lev1sec3.html"/> <entry name="panel applet (KWeather), kweather.h class definition" url="ch11lev1sec3.html"/> <entry name="panel applet (KWeather), main() method" url="ch11lev1sec3.html"/> <entry name="panel applet (KWeather)" url="ch11lev1sec3.html"/> -<entry name="parameters, signals and slots" url="ch03lev1sec3.html"/> +<entry name="parameters, Q_SIGNALS and Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="param (" url="ch15.html"/> <entry name="Para tag (DocBook)" url="ch15lev1sec2.html"/> <entry name="Parent Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/> @@ -2259,16 +2259,16 @@ <entry name="protocols, DCOP, message redirection technology (referencing)" url="ch13lev1sec6.html"/> <entry name="protocols, DCOP, performance and overhead" url="ch13lev1sec6.html"/> <entry name="protocols, DCOP, programming interface" url="ch13lev1sec5.html"/> -<entry name="protocols, DCOP, signals and slots" url="ch13lev1sec6.html"/> +<entry name="protocols, DCOP, Q_SIGNALS and Q_SLOTS" url="ch13lev1sec6.html"/> <entry name="protocols, DCOP, underlying technologies" url="ch13lev1sec3.html"/> <entry name="protocols, DCOP" url="ch13.html"/> <entry name="protocols, FTP, snapshots" url="ch17lev1sec3.html"/> <entry name="protocols, XDND" url="ch07.html"/> -<entry name="QBoxLayout geometry manager" url="ch04lev1sec3.html"/> +<entry name="QBoxLayout tqgeometry manager" url="ch04lev1sec3.html"/> <entry name="QDataStream objects" url="ch13lev1sec3.html"/> <entry name="QGL widget" url="ch03lev1sec6.html"/> -<entry name="QGridLayout geometry manager" url="ch04lev1sec3.html"/> -<entry name="QHBox widget, layout managers, creating" url="ch08lev1sec2.html"/> +<entry name="QGridLayout tqgeometry manager" url="ch04lev1sec3.html"/> +<entry name="QHBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/> <entry name="QImage class" url="ch10lev1sec2.html"/> <entry name="QLayout classes, code example" url="ch08lev1sec2.html"/> <entry name="QLayout classes, design issues" url="ch08lev1sec2.html"/> @@ -2278,7 +2278,7 @@ <entry name="QPainter class, example usage (listing)" url="ch03lev1sec2.html"/> <entry name="QPainter class, member function" url="ch03lev1sec2.html"/> <entry name="QPainter class, methods, paintEvent()" url="ch04lev1sec2.html"/> -<entry name="QPainter class, methods, repaint()" url="ch04lev1sec2.html"/> +<entry name="QPainter class, methods, tqrepaint()" url="ch04lev1sec2.html"/> <entry name="QPainter class, methods, update()" url="ch04lev1sec2.html"/> <entry name="QPainter class" url="ch03lev1sec2.html"/> <entry name="QPainter class" url="ch04lev1sec2.html"/> @@ -2289,7 +2289,7 @@ <entry name="QPushButton class, listing" url="ch03lev1sec2.html"/> <entry name="QPushButton class, member functions" url="ch03lev1sec2.html"/> <entry name="QPushButton class" url="ch03lev1sec2.html"/> -<entry name="QSplitter" url="ch05.html"/> +<entry name=TQSPLITTER_OBJECT_NAME_STRING url="ch05.html"/> <entry name="Qt, classes, QList" url="ch03lev1sec5.html"/> <entry name="QTDIR environment variable" url="ch02lev1sec2.html"/> <entry name="Qt, event handling" url="ch03lev1sec2.html"/> @@ -2298,11 +2298,11 @@ <entry name="Qt library, supported image formats" url="ch10lev1sec2.html"/> <entry name="Qt, license, FreeQt" url="ch19lev1sec3.html"/> <entry name="Qt, Mesa" url="ch03lev1sec6.html"/> -<entry name="Qt, moc, executing programs" url="ch03lev1sec4.html"/> -<entry name="Qt, moc, keywords" url="ch03lev1sec4.html"/> -<entry name="Qt, moc, main program file example" url="ch03lev1sec4.html"/> -<entry name="Qt, moc (Meta Object Compiler)" url="ch03lev1sec2.html"/> -<entry name="Qt, moc" url="ch03lev1sec4.html"/> +<entry name="Qt, tqmoc, executing programs" url="ch03lev1sec4.html"/> +<entry name="Qt, tqmoc, keywords" url="ch03lev1sec4.html"/> +<entry name="Qt, tqmoc, main program file example" url="ch03lev1sec4.html"/> +<entry name="Qt, tqmoc (Meta Object Compiler)" url="ch03lev1sec2.html"/> +<entry name="Qt, tqmoc" url="ch03lev1sec4.html"/> <entry name="Qt, OpenGL" url="ch03lev1sec6.html"/> <entry name="Qt, paremeters" url="ch03lev1sec3.html"/> <entry name="Qt, QObject class" url="ch03lev1sec2.html"/> @@ -2313,21 +2313,21 @@ <entry name="Qt, QWidget class, example (listing)" url="ch03lev1sec2.html"/> <entry name="Qt, QWidget class, member functions" url="ch03lev1sec2.html"/> <entry name="Qt, QWidget class" url="ch03lev1sec2.html"/> -<entry name="Qt, signals, connecting to slots" url="ch03lev1sec3.html"/> -<entry name="Qt, signals, emitting" url="ch03lev1sec3.html"/> -<entry name="Qt, signals" url="ch03lev1sec3.html"/> -<entry name="Qt, slots, connecting to signals" url="ch03lev1sec3.html"/> -<entry name="Qt, slots, creating" url="ch03lev1sec3.html"/> -<entry name="Qt, slots, parameters" url="ch03lev1sec3.html"/> -<entry name="Qt, slots, temporary classes" url="ch03lev1sec3.html"/> -<entry name="Qt, slots" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SIGNALS, connecting to Q_SLOTS" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SIGNALS, emitting" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SIGNALS" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS, connecting to Q_SIGNALS" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS, creating" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS, parameters" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS, temporary classes" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="Qt, STL" url="ch03lev1sec5.html"/> <entry name="Qt tookit" url="ch03.html"/> <entry name="Qt toolkit, overview" url="ch03lev1sec2.html"/> <entry name="Qt, utility classes" url="ch03lev1sec5.html"/> <entry name="queryClose() function" url="ch07lev1sec3.html"/> <entry name="quit action" url="ch06.html"/> -<entry name="QVBox widget, layout managers, creating" url="ch08lev1sec2.html"/> +<entry name="QVBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/> <entry name="QWidget class, attributes" url="ch04.html"/> <entry name="QWidget class, documentation" url="ch04.html"/> <entry name="QWidget class, event handlers, closeEvent()" url="ch04.html"/> @@ -2353,8 +2353,8 @@ <entry name="QWidget class, event handlers" url="ch04.html"/> <entry name="QWidget class, event handlers, wheelEvent()" url="ch04.html"/> <entry name="QWidget class, sample class declaration" url="ch04.html"/> -<entry name="QWidget class, signals" url="ch04.html"/> -<entry name="QWidget class, slots" url="ch04.html"/> +<entry name="QWidget class, Q_SIGNALS" url="ch04.html"/> +<entry name="QWidget class, Q_SLOTS" url="ch04.html"/> <entry name="QWidget class" url="ch03lev1sec2.html"/> <entry name="QWidget class" url="ch04.html"/> <entry name="raises (" url="ch15.html"/> @@ -2385,8 +2385,8 @@ <entry name="remove option (cvs command)" url="ch17lev1sec5.html"/> <entry name="removing, modeless dialog boxes" url="ch08lev1sec3.html"/> <entry name="rendering, HTML files" url="ch10.html"/> -<entry name="repainting, widgets" url="ch04lev1sec2.html"/> -<entry name="repaint() method, QPainter class" url="ch04lev1sec2.html"/> +<entry name="tqrepainting, widgets" url="ch04lev1sec2.html"/> +<entry name="tqrepaint() method, QPainter class" url="ch04lev1sec2.html"/> <entry name="replace action" url="ch06.html"/> <entry name="reportBug action" url="ch06.html"/> <entry name="resiceGL(int width, int height) function (QGL widget)" url="ch03lev1sec6.html"/> @@ -2463,13 +2463,13 @@ <entry name="show() method" url="ch02lev1sec3.html"/> <entry name="showStatusbar action" url="ch06.html"/> <entry name="showToolbar action" url="ch06.html"/> -<entry name="signals, connecting to slots" url="ch03lev1sec3.html"/> -<entry name="signals (DCOP)" url="ch13lev1sec6.html"/> -<entry name="signals, emitting" url="ch03lev1sec3.html"/> -<entry name="signals, parameters" url="ch03lev1sec3.html"/> -<entry name="signals, (Qt)" url="ch03lev1sec3.html"/> -<entry name="signals" url="ch03lev1sec2.html"/> -<entry name="signals (widgets)" url="ch04.html"/> +<entry name="Q_SIGNALS, connecting to Q_SLOTS" url="ch03lev1sec3.html"/> +<entry name="Q_SIGNALS (DCOP)" url="ch13lev1sec6.html"/> +<entry name="Q_SIGNALS, emitting" url="ch03lev1sec3.html"/> +<entry name="Q_SIGNALS, parameters" url="ch03lev1sec3.html"/> +<entry name="Q_SIGNALS, (Qt)" url="ch03lev1sec3.html"/> +<entry name="Q_SIGNALS" url="ch03lev1sec2.html"/> +<entry name="Q_SIGNALS (widgets)" url="ch04.html"/> <entry name="SimpleSoundServer interface" url="ch14lev1sec4.html"/> <entry name="since (" url="ch15.html"/> <entry name="single-instance application, kunique.cpp call definition" url="ch11lev1sec2.html"/> @@ -2479,17 +2479,17 @@ <entry name="slotButton()" url="ch03lev1sec4.html"/> <entry name="slotOpen() function" url="ch07lev1sec5.html"/> <entry name="slotSave() function" url="ch07lev1sec5.html"/> -<entry name="slots, connecting to signals" url="ch03lev1sec3.html"/> -<entry name="slots, creating" url="ch03lev1sec3.html"/> -<entry name="slots (DCOP)" url="ch13lev1sec6.html"/> -<entry name="slots, parameters" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS, connecting to Q_SIGNALS" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS, creating" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS (DCOP)" url="ch13lev1sec6.html"/> +<entry name="Q_SLOTS, parameters" url="ch03lev1sec3.html"/> <entry name="slotSpecialHelp() function" url="ch05lev1sec2.html"/> <entry name="slotSpellCheck() method" url="ch10lev1sec3.html"/> -<entry name="slots, (Qt)" url="ch03lev1sec3.html"/> -<entry name="slots, slotButton()" url="ch03lev1sec4.html"/> -<entry name="slots, temporary classes" url="ch03lev1sec3.html"/> -<entry name="slots" url="ch03lev1sec2.html"/> -<entry name="slots (widgets)" url="ch04.html"/> +<entry name="Q_SLOTS, (Qt)" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS, slotButton()" url="ch03lev1sec4.html"/> +<entry name="Q_SLOTS, temporary classes" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS" url="ch03lev1sec2.html"/> +<entry name="Q_SLOTS (widgets)" url="ch04.html"/> <entry name="snapshots" url="ch17lev1sec3.html"/> <entry name="socket() method" url="ch13lev1sec6.html"/> <entry name="software development, documentation" url="ch18.html"/> @@ -2789,7 +2789,7 @@ <entry name="widets, KImageView (image viewer/converter), main() method" url="ch10lev1sec2.html"/> <entry name="widets, KImageView (image viewer/converter)" url="ch10lev1sec2.html"/> <entry name="widgets, attributes" url="ch04.html"/> -<entry name="widgets, child widgets, geometry management" url="ch04lev1sec3.html"/> +<entry name="widgets, child widgets, tqgeometry management" url="ch04lev1sec3.html"/> <entry name="widgets, child widgets, KChildren example" url="ch04lev1sec3.html"/> <entry name="widgets, child widgets" url="ch04lev1sec3.html"/> <entry name="widgets, compared to parts" url="ch12.html"/> @@ -2832,12 +2832,12 @@ <entry name="widgets, painting, invoking paint events" url="ch04lev1sec2.html"/> <entry name="widgets, painting, KXOSquare example" url="ch04lev1sec2.html"/> <entry name="widgets, painting, paintEvent() method" url="ch04lev1sec2.html"/> -<entry name="widgets, painting, repainting" url="ch04lev1sec2.html"/> +<entry name="widgets, painting, tqrepainting" url="ch04lev1sec2.html"/> <entry name="widgets, painting" url="ch04lev1sec2.html"/> <entry name="widgets, QGL" url="ch03lev1sec6.html"/> <entry name="widgets, sample class declaration" url="ch04.html"/> -<entry name="widgets, signals" url="ch04.html"/> -<entry name="widgets, slots" url="ch04.html"/> +<entry name="widgets, Q_SIGNALS" url="ch04.html"/> +<entry name="widgets, Q_SLOTS" url="ch04.html"/> <entry name="widgets" url="ch01lev1sec2.html"/> <entry name="widgets" url="ch04.html"/> <entry name="widgets" url="ch04lev1sec3.html"/> diff --git a/languages/cpp/doc/libc.toc b/languages/cpp/doc/libc.toc index a007614d..626558da 100644 --- a/languages/cpp/doc/libc.toc +++ b/languages/cpp/doc/libc.toc @@ -58,7 +58,7 @@ <tocsect4 name="3.2.4.5 Obstack Functions and Macros" url="chapters_3.html#SEC47"/> <tocsect4 name="3.2.4.6 Growing Objects" url="chapters_3.html#SEC48"/> <tocsect4 name="3.2.4.7 Extra Fast Growing Objects" url="chapters_3.html#SEC49"/> - <tocsect4 name="3.2.4.8 Status of an Obstack" url="chapters_3.html#SEC50"/> + <tocsect4 name="3.2.4.8 tqStatus of an Obstack" url="chapters_3.html#SEC50"/> <tocsect4 name="3.2.4.9 Alignment of Data in Obstacks" url="chapters_3.html#SEC51"/> <tocsect4 name="3.2.4.10 Obstack Chunks" url="chapters_3.html#SEC52"/> <tocsect4 name="3.2.4.11 Summary of Obstack Functions" url="chapters_3.html#SEC53"/> @@ -300,7 +300,7 @@ <tocsect2 name="13.9 Synchronizing I/O operations" url="chapters_13.html#SEC250"/> <tocsect2 name="13.10 Perform I/O Operations in Parallel" url="chapters_13.html#SEC251"> <tocsect3 name="13.10.1 Asynchronous Read and Write Operations" url="chapters_13.html#SEC252"/> - <tocsect3 name="13.10.2 Getting the Status of AIO Operations" url="chapters_13.html#SEC253"/> + <tocsect3 name="13.10.2 Getting the tqStatus of AIO Operations" url="chapters_13.html#SEC253"/> <tocsect3 name="13.10.3 Getting into a Consistent State" url="chapters_13.html#SEC254"/> <tocsect3 name="13.10.4 Cancellation of AIO Operations" url="chapters_13.html#SEC255"/> <tocsect3 name="13.10.5 How to optimize the AIO implementation" url="chapters_13.html#SEC256"/> @@ -308,11 +308,11 @@ <tocsect2 name="13.11 Control Operations on Files" url="chapters_13.html#SEC257"/> <tocsect2 name="13.12 Duplicating Descriptors" url="chapters_13.html#SEC258"/> <tocsect2 name="13.13 File Descriptor Flags" url="chapters_13.html#SEC259"/> - <tocsect2 name="13.14 File Status Flags" url="chapters_13.html#SEC260"> + <tocsect2 name="13.14 File tqStatus Flags" url="chapters_13.html#SEC260"> <tocsect3 name="13.14.1 File Access Modes" url="chapters_13.html#SEC261"/> <tocsect3 name="13.14.2 Open-time Flags" url="chapters_13.html#SEC262"/> <tocsect3 name="13.14.3 I/O Operating Modes" url="chapters_13.html#SEC263"/> - <tocsect3 name="13.14.4 Getting and Setting File Status Flags" url="chapters_13.html#SEC264"/> + <tocsect3 name="13.14.4 Getting and Setting File tqStatus Flags" url="chapters_13.html#SEC264"/> </tocsect2> <tocsect2 name="13.15 File Locks" url="chapters_13.html#SEC265"/> <tocsect2 name="13.16 Interrupt-Driven Input" url="chapters_13.html#SEC266"/> @@ -455,7 +455,7 @@ <tocsect3 name="18.2.1 openlog" url="chapters_18.html#SEC385"/> <tocsect3 name="18.2.2 syslog, vsyslog" url="chapters_18.html#SEC386"/> <tocsect3 name="18.2.3 closelog" url="chapters_18.html#SEC387"/> - <tocsect3 name="18.2.4 setlogmask" url="chapters_18.html#SEC388"/> + <tocsect3 name="18.2.4 setlogtqmask" url="chapters_18.html#SEC388"/> <tocsect3 name="18.2.5 Syslog Example" url="chapters_18.html#SEC389"/> </tocsect2> </tocsect1> @@ -666,7 +666,7 @@ <tocsect2 name="25.5 System Calls" url="chapters_25.html#SEC560"/> <tocsect2 name="25.6 Program Termination" url="chapters_25.html#SEC561"> <tocsect3 name="25.6.1 Normal Termination" url="chapters_25.html#SEC562"/> - <tocsect3 name="25.6.2 Exit Status" url="chapters_25.html#SEC563"/> + <tocsect3 name="25.6.2 Exit tqStatus" url="chapters_25.html#SEC563"/> <tocsect3 name="25.6.3 Cleanups on Exit" url="chapters_25.html#SEC564"/> <tocsect3 name="25.6.4 Aborting a Program" url="chapters_25.html#SEC565"/> <tocsect3 name="25.6.5 Termination Internals" url="chapters_25.html#SEC566"/> @@ -679,7 +679,7 @@ <tocsect2 name="26.4 Creating a Process" url="chapters_26.html#SEC571"/> <tocsect2 name="26.5 Executing a File" url="chapters_26.html#SEC572"/> <tocsect2 name="26.6 Process Completion" url="chapters_26.html#SEC573"/> - <tocsect2 name="26.7 Process Completion Status" url="chapters_26.html#SEC574"/> + <tocsect2 name="26.7 Process Completion tqStatus" url="chapters_26.html#SEC574"/> <tocsect2 name="26.8 BSD Process Wait Functions" url="chapters_26.html#SEC575"/> <tocsect2 name="26.9 Process Creation Example" url="chapters_26.html#SEC576"/> </tocsect1> diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-kdev3.toc index e1ed885e..b9e225ec 100644 --- a/languages/cpp/doc/qt-kdev3.toc +++ b/languages/cpp/doc/qt-kdev3.toc @@ -16,9 +16,9 @@ <tocsect2 name="Designing the program" url="design-program.html"/> <tocsect2 name="Adding widgets" url="adding-widgets.html"/> <tocsect2 name="Getting spaced out" url="spaced-out.html"/> - <tocsect2 name="Signals and slots" url="signals-and-slots.html"/> + <tocsect2 name="Signals and Q_SLOTS" url="Q_SIGNALS-and-Q_SLOTS.html"/> <tocsect2 name="Generating the source" url="source.html"/> - <tocsect2 name="Implementing the slot" url="slots.html"/> + <tocsect2 name="Implementing the slot" url="Q_SLOTS.html"/> </tocsect1> <tocsect1 name="In short" url="in-short.html"> </tocsect1> @@ -32,7 +32,7 @@ </tocsect1> <tocsect1 name="Generating the source (alternate)" url="without_subclass.html"> <tocsect2 name="Without using the KDevelop subclassing capability" url="without_subclass.html"/> - <tocsect2 name="Implementing the slot" url="slots2.html"/> + <tocsect2 name="Implementing the slot" url="Q_SLOTS2.html"/> </tocsect1> <tocsect1 name="Credits and License" url="credits.html"> </tocsect1> diff --git a/languages/cpp/doc/stl.toc b/languages/cpp/doc/stl.toc index d86b82b0..a3754311 100644 --- a/languages/cpp/doc/stl.toc +++ b/languages/cpp/doc/stl.toc @@ -109,9 +109,9 @@ <tocsect1 name="Algorithms" url=""> <tocsect2 name="Non-mutating algorithms" url=""> <tocsect3 name="for_each" url="for_each.html"/> - <tocsect3 name="find" url="find.html"/> + <tocsect3 name="tqfind" url="find.html"/> <tocsect3 name="find_if" url="find_if.html"/> - <tocsect3 name="adjacent_find" url="adjacent_find.html"/> + <tocsect3 name="adjacent_tqfind" url="adjacent_find.html"/> <tocsect3 name="find_first_of" url="find_first_of.html"/> <tocsect3 name="count" url="count.html"/> <tocsect3 name="count_if" url="count_if.html"/> @@ -129,7 +129,7 @@ <tocsect3 name="iter_swap" url="iter_swap.html"/> <tocsect3 name="swap_ranges" url="swap_ranges.html"/> <tocsect3 name="transform" url="transform.html"/> - <tocsect3 name="replace" url="replace.html"/> + <tocsect3 name="tqreplace" url="tqreplace.html"/> <tocsect3 name="replace_if" url="replace_if.html"/> <tocsect3 name="replace_copy" url="replace_copy.html"/> <tocsect3 name="replace_copy_if" url="replace_copy_if.html"/> @@ -370,9 +370,9 @@ <entry name="distance, STL function" url="distance.html"/> <entry name="advance, STL function" url="advance.html"/> <entry name="for_each, STL algorithm" url="for_each.html"/> -<entry name="find, STL algorithm" url="find.html"/> +<entry name="tqfind, STL algorithm" url="find.html"/> <entry name="find_if, STL algorithm" url="find_if.html"/> -<entry name="adjacent_find, STL algorithm" url="adjacent_find.html"/> +<entry name="adjacent_tqfind, STL algorithm" url="adjacent_find.html"/> <entry name="find_first_of, STL algorithm" url="find_first_of.html"/> <entry name="count, STL algorithm" url="count.html"/> <entry name="count_if, STL algorithm" url="count_if.html"/> @@ -388,7 +388,7 @@ <entry name="iter_swap, STL algorithm" url="iter_swap.html"/> <entry name="swap_ranges, STL algorithm" url="swap_ranges.html"/> <entry name="transform, STL algorithm" url="transform.html"/> -<entry name="replace, STL algorithm" url="replace.html"/> +<entry name="tqreplace, STL algorithm" url="tqreplace.html"/> <entry name="replace_if, STL algorithm" url="replace_if.html"/> <entry name="replace_copy, STL algorithm" url="replace_copy.html"/> <entry name="fill, STL algorithm" url="fill.html"/> diff --git a/languages/cpp/doxydoc.cpp b/languages/cpp/doxydoc.cpp index 54343b70..1f35708c 100644 --- a/languages/cpp/doxydoc.cpp +++ b/languages/cpp/doxydoc.cpp @@ -20,7 +20,7 @@ void DoxyDoc::formatType( TQString& str ) { - str.replace( TQRegExp( " " ), "" ); + str.tqreplace( TQRegExp( " " ), "" ); } DoxyDoc::DoxyDoc( const TQStringList& dir ) @@ -36,7 +36,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& TQString scope = tmpscope; bool foundfile = false; //produce doxygen conform filenames - TQString filename = "/class" + scope.replace( TQRegExp( "_" ), "__" ).replace( TQRegExp( "::" ), "_1_1" ) + ".xml"; + TQString filename = "/class" + scope.tqreplace( TQRegExp( "_" ), "__" ).tqreplace( TQRegExp( "::" ), "_1_1" ) + ".xml"; //search for file in all directories for ( std::list<TQDir>::const_iterator ci = m_dirs.begin(); !foundfile && ci != m_dirs.end(); ++ci ) @@ -53,7 +53,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& return ""; } TQDomDocument m_doc; - m_doc.setContent( m_file.readAll() ); + m_doc.setContent( TQByteArray(m_file.readAll()) ); m_file.close(); m_list = m_doc.elementsByTagName( "memberdef" ); foundfile = true; @@ -64,7 +64,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& } } if ( !foundfile ) - return TQString::null; + return TQString(); TQString type = tmptype; formatType( type ); @@ -134,7 +134,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& description += "<b>Parameterlist:</b><p>" + paramstr; if ( description == "" ) - return TQString::null; + return TQString(); else return description; } @@ -142,7 +142,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& } - return TQString::null; + return TQString(); } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index ebd536ec..fee9832e 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -18,7 +18,7 @@ * * * unsermake: - * unsermake is detected by reading the first line of the makefile. If it contains "generated by unsermake" the following things are respected: + * unsermake is detected by reading the first line of the makefile. If it tqcontains "generated by unsermake" the following things are respected: * 1. Since unsermake does not have the -W command(which should tell it to recompile the given file no matter whether it has been changed or not), the file-modification-time of the file is changed temporarily and the --no-real-compare option is used to force recompilation. * 2. The targets seem to be called *.lo instead of *.o when using unsermake, so *.lo names are used. * example-(test)command: unsermake --no-real-compare -n myfile.lo @@ -181,7 +181,7 @@ namespace CppTools { if( f.open( IO_ReadOnly ) ) { TQString firstLine; f.readLine( firstLine, 1000 ); - if( firstLine.find( "generated by unsermake" ) != -1 ) { + if( firstLine.tqfind( "generated by unsermake" ) != -1 ) { ret = true; } f.close(); @@ -257,11 +257,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi 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) ); + return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").tqarg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").tqarg(file) ); 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() ); + Cache::iterator it = m_cache.tqfind( dir.path() ); if( it != m_cache.end() ) { cachedPath = (*it).path; if( makeFileModification == (*it).modificationTime ) { @@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi 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( TQDateTime::currentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) { + if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.tqfind( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) { PathResolutionResult ret(false); //Fake that the result is ok ret.errorMessage = i18n("Cached: ") + (*it).errorMessage; ret.longErrorMessage = (*it).longErrorMessage; @@ -297,8 +297,8 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi absoluteFile = u.path(); int dot; - if( (dot = file.findRev( '.' )) == -1 ) - return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).arg(file) ); + if( (dot = file.tqfindRev( '.' )) == -1 ) + return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).tqarg(file) ); targetName = file.left( dot ); @@ -365,7 +365,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi ce.failed = true; ce.errorMessage = res.errorMessage; ce.longErrorMessage = res.longErrorMessage; - ce.failTime = TQDateTime::currentDateTime(); + ce.failTime = TQDateTime::tqcurrentDateTime(); ce.failedFiles[file] = true; } else { ce.failed = false; @@ -387,12 +387,12 @@ PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command output = proc.stdOut(); if( proc.exitStatus() != 0 ) - return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").arg( output ) ); + return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").tqarg( output ) ); } else { bool ret = executeCommandPopen(command, workingDirectory, output); if( !ret ) - return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").arg( output ) ); + return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").tqarg( output ) ); } return PathResolutionResult(true); } @@ -413,11 +413,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt return res; TQRegExp newLineRx("\\\\\\n"); - fullOutput.replace( newLineRx, "" ); + fullOutput.tqreplace( newLineRx, "" ); ///@todo collect multiple outputs at the same time for performance-reasons TQString firstLine = fullOutput; int lineEnd; - if( (lineEnd = fullOutput.find('\n')) != -1 ) + if( (lineEnd = fullOutput.tqfind('\n')) != -1 ) firstLine.truncate( lineEnd ); //Only look at the first line of output /** @@ -443,7 +443,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt else if( prefix.endsWith( ";" ) ) prefix.truncate( prefix.length() - 1 ); ///Now test if what we have as prefix is a simple "cd /foo/bar" call. - if( prefix.startsWith( "cd ") && !prefix.contains( ";") && !prefix.contains("&&") ) { + if( prefix.startsWith( "cd ") && !prefix.tqcontains( ";") && !prefix.tqcontains("&&") ) { newWorkingDirectory = prefix.right( prefix.length() - 3 ).stripWhiteSpace(); if( !newWorkingDirectory.startsWith("/") ) newWorkingDirectory = workingDirectory + "/" + newWorkingDirectory; @@ -456,7 +456,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt if( d.exists() ) { ///The recursive working-directory exists. TQString makeParams = firstLine.mid( offset+5 ); - if( !makeParams.contains( ";" ) && !makeParams.contains( "&&" ) ) { + if( !makeParams.tqcontains( ";" ) && !makeParams.tqcontains( "&&" ) ) { ///Looks like valid parameters ///Make the file-name absolute, so it can be referenced from any directory TQString absoluteFile = file; @@ -471,14 +471,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt return res; return resolveIncludePathInternal( KURL::relativePath(newWorkingDirectory,u.path()), newWorkingDirectory, makeParams , newSource ); }else{ - return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").arg(makeParams).arg(fullOutput) ); + return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").tqarg(makeParams).tqarg(fullOutput) ); } } else { - return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").arg(newWorkingDirectory).arg(fullOutput) ); + return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").tqarg(newWorkingDirectory).tqarg(fullOutput) ); } } else { - return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").arg(fullOutput) ); + return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").tqarg(fullOutput) ); } ++offset; @@ -488,7 +488,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt ///STEP 2: Search the output for include-paths 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) ); + return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").tqarg(workingDirectory).tqarg( source.getCommand(file, makeParameters) ).tqarg(fullOutput) ); PathResolutionResult ret( true ); ret.longErrorMessage = fullOutput; @@ -497,7 +497,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc. TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include - TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) ); + TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).tqarg( includeParameterRx ).tqarg( quotedRx ).tqarg( escapedPathRx ) ); includeRx.setMinimal( true ); includeRx.setCaseSensitive( true ); offset = 0; diff --git a/languages/cpp/includepathresolver.h b/languages/cpp/includepathresolver.h index 33aaecd9..57106e4f 100644 --- a/languages/cpp/includepathresolver.h +++ b/languages/cpp/includepathresolver.h @@ -38,7 +38,7 @@ namespace CppTools { ///One resolution-try can issue up to 4 make-calls in worst case class IncludePathResolver { public: - ///Whether the Qt event-loop should be continued(using BlockingKProcess). This crashes if enabled in a non-foreground thread. + ///Whether the TQt 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 TQString& file ); diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index f240ed36..9e0918b2 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -105,11 +105,11 @@ void KDevDriver::setup() if( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); - TQString qmakespec = getenv( "QMAKESPEC" ); + TQString qmakespec = getenv( "TQMAKESPEC" ); if ( qmakespec.isNull() ) qmakespec = "linux-g++"; - TQString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "TQTDIR" ); if( !qtdir.isNull() ) { addIncludePath( qtdir + "/include" ); @@ -130,15 +130,15 @@ void KDevDriver::setup() } addMacro( Macro( "__cplusplus", "1" ) ); - addMacro( Macro( "Q_SIGNALS", "signals" ) ); - addMacro( Macro( "Q_SLOTS", "slots" ) ); - addMacro( Macro( "Q_SCRIPTABLE", "" ) ); + addMacro( Macro( "signals", "signals" ) ); + addMacro( Macro( "slots", "slots" ) ); + addMacro( Macro( "TQ_SCRIPTABLE", "" ) ); CppCodeCompletionConfig* cfg = m_cppSupport->codeCompletionConfig(); TQString str = cfg->customIncludePaths(); int pos = 0; while( pos < str.length() ) { - int end = str.find( ';', pos ); + int end = str.tqfind( ';', pos ); if( end == -1 ) { end = str.length(); } @@ -175,7 +175,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) { CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file ); if( !res.success ) { - Problem p( i18n( "%1. Message: %2" ).arg( res.errorMessage ).arg( res.longErrorMessage ), 0, 0, Problem::Level_Warning ); + Problem p( i18n( "%1. Message: %2" ).tqarg( res.errorMessage ).tqarg( res.longErrorMessage ), 0, 0, Problem::Level_Warning ); p.setFileName( file ); addProblem( file, p ); } @@ -184,15 +184,15 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) { } bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { - TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()); + TQString compoundString = file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()); if( !m_shouldParseIncludedFiles ) return false; - m_cppSupport->safeFileSet().contains( compoundString ); + m_cppSupport->safeFileSet().tqcontains( compoundString ); - if( m_cppSupport->safeFileSet().contains( file->fileName()) ){ + if( m_cppSupport->safeFileSet().tqcontains( file->fileName()) ){ return false; - } else if( m_cppSupport->safeFileSet().contains( compoundString ) ) { + } else if( m_cppSupport->safeFileSet().tqcontains( compoundString ) ) { //kdDebug( 9007 ) << "ALREADY IN FILE-SET: " << compoundString << endl; return false; } else { diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index b3e6bacb..b29fe2d4 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -86,11 +86,11 @@ public: if ( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); - TQString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "TQTDIR" ); if ( !qtdir.isNull() ) addIncludePath( qtdir + "/include" ); - TQString qmakespec = getenv( "QMAKESPEC" ); + TQString qmakespec = getenv( "TQMAKESPEC" ); if ( qmakespec.isNull() ) qmakespec = "linux-g++"; // #### implement other mkspecs and find a better way to find the @@ -107,7 +107,7 @@ public: TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.tqreplace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); addIncludePath( "/usr/include/g++-3" ); addIncludePath( "/usr/include/g++" ); diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index 5551cd02..930bcfef 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -19,9 +19,9 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) ) -KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args +KDevCustomImporter::KDevCustomImporter( TQObject* tqparent, const char* name, const TQStringList & // args ) - : KDevPCSImporter( parent, name ) + : KDevPCSImporter( tqparent, name ) {} @@ -75,9 +75,9 @@ TQStringList KDevCustomImporter::includePaths() return m_settings->dirs(); } -TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) +TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* tqparent, const char* name ) { - m_settings = new SettingsDialog( parent, name ); + m_settings = new SettingsDialog( tqparent, name ); return m_settings; } @@ -94,7 +94,7 @@ void KDevCustomImporter::processDir( const TQString path, TQStringList & files ) if (!dir.exists()) continue; kdDebug( 9015 ) << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; TQPtrListIterator<TQFileInfo> it( *dirEntries ); for ( ; dirEntries && it.current(); ++it ) diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index bca53eeb..0aea3974 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -19,15 +19,16 @@ class SettingsDialog; class KDevCustomImporter : public KDevPCSImporter { Q_OBJECT + TQ_OBJECT public: - KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + KDevCustomImporter(TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~KDevCustomImporter(); virtual TQString dbName() const; virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage(TQWidget* parent, const char* name); + virtual TQWidget* createSettingsPage(TQWidget* tqparent, const char* name); protected: TQStringList fileList( const TQString& path ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index 37f2bfef..ebef44ed 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -34,8 +34,8 @@ #include <cstdlib> -SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) - : SettingsDialogBase( parent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) + : SettingsDialogBase( tqparent, name, fl ) { KURLRequester * req = new KURLRequester( this ); req->setMode( KFile::Directory ); @@ -83,17 +83,17 @@ void SettingsDialog::validate() void SettingsDialog::validateDirectory( const TQString & dir ) { - TQDir d( dir, TQString::null, TQDir::DefaultSort, TQDir::Dirs ); + TQDir d( dir, TQString(), TQDir::DefaultSort, TQDir::Dirs ); if ( !d.exists() ) { elb->lineEdit() ->setText( dir ); - if ( TQListBoxItem * item = elb->listBox() ->findItem( dir, Qt::ExactMatch ) ) + if ( TQListBoxItem * item = elb->listBox() ->tqfindItem( dir, TQt::ExactMatch ) ) { elb->listBox() ->removeItem( elb->listBox() ->index( item ) ); } - TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).arg( dir ); + TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).tqarg( 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 02336f98..3d683f99 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h @@ -19,12 +19,13 @@ class KEditListBox; class SettingsDialog : public SettingsDialogBase { Q_OBJECT + TQ_OBJECT public: - SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); - bool isValidQtDir( const TQString& path ) const; + bool isValidTQtDir( const TQString& path ) const; TQString qtDir() const; TQString configuration() const; diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui index b9faadb1..a7678844 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SettingsDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsDialogBase</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>grid</cstring> </property> @@ -32,7 +32,7 @@ <string>*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -40,7 +40,7 @@ <string>Filename pattern:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>recursive_box</cstring> </property> @@ -55,8 +55,8 @@ </widget> </vbox> </widget> -<signals> +<Q_SIGNALS> <signal>enabled(int)</signal> -</signals> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp index a52da5d7..d487ab35 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp @@ -23,8 +23,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevkdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevkdelibsimporter" ) ) -KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) - : KDevPCSImporter( parent, name ) +KDevKDELibsImporter::KDevKDELibsImporter( TQObject * tqparent, const char * name, const TQStringList& ) + : KDevPCSImporter( tqparent, name ) {} KDevKDELibsImporter::~KDevKDELibsImporter() @@ -76,7 +76,7 @@ TQStringList KDevKDELibsImporter::fileList() { dir.setPath( s.pop() ); kdDebug( 9015 ) << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; TQPtrListIterator<TQFileInfo> it( *dirEntries ); for ( ; it.current(); ++it ) @@ -109,9 +109,9 @@ TQStringList KDevKDELibsImporter::includePaths() return includePaths; } -TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * tqparent, const char * name ) { - m_settings = new SettingsDialog( parent, name ); + m_settings = new SettingsDialog( tqparent, name ); return m_settings; } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h index 45cf470a..1e2c8254 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#ifndef KDEVQTIMPORTER_H -#define KDEVQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H #include <kdevpcsimporter.h> #include <tqguardedptr.h> @@ -20,15 +20,16 @@ class SettingsDialog; class KDevKDELibsImporter : public KDevPCSImporter { Q_OBJECT + TQ_OBJECT public: - KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); + KDevKDELibsImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevKDELibsImporter(); - virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); } + virtual TQString dbName() const { return TQString::tqfromLatin1("KDElibs"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); private: TQStringList fileList( const TQString& path ); diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp index a0763380..612ff79a 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp @@ -29,17 +29,17 @@ #include "settingsdialog.h" -TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox ) +TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) { - if ( cpQListBox->selectionMode() != TQListBox::Single ) + if ( cpTQListBox->selectionMode() != TQListBox::Single ) return 0; - if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) - return cpQListBox->item( cpQListBox->currentItem() ); + if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) ) + return cpTQListBox->item( cpTQListBox->currentItem() ); return 0; } -SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) -: SettingsDialogBase( parent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) +: SettingsDialogBase( tqparent, name, fl ) { KApplication::kApplication()->dirs()->addResourceType("include","include"); TQStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); @@ -47,7 +47,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) { TQString kdedir = *it; if ( !kdedir.isEmpty() && isValidKDELibsDir( kdedir ) ) - if ( !kdeListBox->findItem( kdedir, ExactMatch ) ) + if ( !kdeListBox->tqfindItem( kdedir, ExactMatch ) ) kdeListBox->insertItem( kdedir ); } @@ -81,7 +81,7 @@ void SettingsDialog::addUrlButton_clicked() if ( isValidKDELibsDir( kdeUrl->url() ) ) { kdeListBox->insertItem( kdeUrl->url() ); - if ( TQListBoxItem * item = kdeListBox->findItem( kdeUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = kdeListBox->tqfindItem( kdeUrl->url(), ExactMatch ) ) { kdeListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h index 4a06dd12..7de31292 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h @@ -17,9 +17,10 @@ class SettingsDialog : public SettingsDialogBase { Q_OBJECT + TQ_OBJECT public: - SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui index 00b8c3ac..de905d40 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SettingsDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsDialogBase</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -25,7 +25,7 @@ Only the selected entry will be used</string> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>KDE Libs Headers</string> @@ -46,7 +46,7 @@ Only the selected entry will be used</string> <string>Decide if you want to restrict the Code Completion database to only the base kdelibs API or the entire KDE include structure</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -65,7 +65,7 @@ Only the selected entry will be used</string> <string>If none of the directories KDevelop found is what you want,you can enter a directory of your choice here</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>addUrlButton</cstring> </property> @@ -96,7 +96,7 @@ Only the selected entry will be used</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>220</width> <height>20</height> @@ -110,18 +110,18 @@ Only the selected entry will be used</string> <connections> <connection> <sender>kdeListBox</sender> - <signal>selectionChanged(QListBoxItem*)</signal> + <signal>selectionChanged(TQListBoxItem*)</signal> <receiver>SettingsDialogBase</receiver> - <slot>slotSelectionChanged(QListBoxItem*)</slot> + <slot>slotSelectionChanged(TQListBoxItem*)</slot> </connection> </connections> -<signals> +<Q_SIGNALS> <signal>enabled(int)</signal> -</signals> -<slots> - <slot>slotSelectionChanged(QListBoxItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<Q_SLOTS> + <slot>slotSelectionChanged(TQListBoxItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index d4635ba4..5864659c 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -22,15 +22,15 @@ #include <tqlabel.h> #include <tqdir.h> -K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevTQt4Importer>( "kdevqt4importer" ) ) -KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) - : KDevPCSImporter( parent, name ) +KDevTQt4Importer::KDevTQt4Importer( TQObject * tqparent, const char * name, const TQStringList& ) + : KDevPCSImporter( tqparent, name ) { m_qtfile = 0; } -KDevQt4Importer::~KDevQt4Importer() +KDevTQt4Importer::~KDevTQt4Importer() { if (m_qtfile) delete m_qtfile; @@ -38,7 +38,7 @@ KDevQt4Importer::~KDevQt4Importer() m_qtfile = 0; } -TQStringList KDevQt4Importer::fileList() +TQStringList KDevTQt4Importer::fileList() { if( !m_settings ) return TQStringList(); @@ -49,18 +49,18 @@ TQStringList KDevQt4Importer::fileList() KTempFile ifile; TQTextStream &is = *ifile.textStream(); - is << "#include <QtCore/qobjectdefs.h>\n" - << "#undef Q_SLOTS\n#undef Q_SIGNALS\n#undef slots\n#undef signals" - << "#define Q_SLOTS slots\n" - << "#define Q_SIGNALS signals\n" - << "#include <QtCore/QtCore>\n" - << "#include <QtGui/QtGui>\n" - << "#include <QtNetwork/QtNetwork>\n" - << "#include <QtXml/QtXml>\n" - << "#include <Qt3Support/Qt3Support>\n" - << "#include <QtSql/QtSql>\n" - << "#include <QtTest/QtTest>\n" - << "#include <QtOpenGL/QtOpenGL>\n"; + is << "#include <TQtCore/tqobjectdefs.h>\n" + << "#undef slots\n#undef signals\n#undef slots\n#undef signals" + << "#define slots slots\n" + << "#define signals signals\n" + << "#include <TQtCore/TQtCore>\n" + << "#include <TQtGui/TQtGui>\n" + << "#include <TQtNetwork/TQtNetwork>\n" + << "#include <TQtXml/TQtXml>\n" + << "#include <TQt3Support/TQt3Support>\n" + << "#include <TQtSql/TQtSql>\n" + << "#include <TQtTest/TQtTest>\n" + << "#include <TQtOpenGL/TQtOpenGL>\n"; @@ -86,22 +86,22 @@ TQStringList KDevQt4Importer::fileList() return m_qtfile->name(); } -TQStringList KDevQt4Importer::includePaths() +TQStringList KDevTQt4Importer::includePaths() { if( !m_settings || !m_qtfile) return TQStringList(); TQStringList includePaths; includePaths.push_back( m_settings->qtDir() ); - includePaths.push_back( m_settings->qtDir() + "/Qt" ); + includePaths.push_back( m_settings->qtDir() + "/TQt" ); /// @todo add mkspec return includePaths; } -TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevTQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name ) { - m_settings = new SettingsDialog( parent, name ); + m_settings = new SettingsDialog( tqparent, name ); return m_settings; } diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index c430db19..5a365bf6 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#ifndef KDEVQTIMPORTER_H -#define KDEVQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H #include <kdevpcsimporter.h> #include <tqguardedptr.h> @@ -18,18 +18,19 @@ class SettingsDialog; class KTempFile; -class KDevQt4Importer : public KDevPCSImporter +class KDevTQt4Importer : public KDevPCSImporter { Q_OBJECT + TQ_OBJECT public: - KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~KDevQt4Importer(); + KDevTQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevTQt4Importer(); - virtual TQString dbName() const { return TQString::fromLatin1("Qt4"); } + virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); private: TQGuardedPtr<SettingsDialog> m_settings; diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index 755b14c4..1b8e46f2 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -27,20 +27,20 @@ #include "settingsdialog.h" -TQListBoxItem* QListBox_selectedItem(TQListBox* cpQListBox) +TQListBoxItem* TQListBox_selectedItem(TQListBox* cpTQListBox) { - if ( cpQListBox->selectionMode() != TQListBox::Single ) + if ( cpTQListBox->selectionMode() != TQListBox::Single ) return 0; - if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) - return cpQListBox->item(cpQListBox->currentItem()); + if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) ) + return cpTQListBox->item(cpTQListBox->currentItem()); return 0; } -SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) - : SettingsDialogBase(parent,name,fl) +SettingsDialog::SettingsDialog(TQWidget* tqparent, const char* name, WFlags fl) + : SettingsDialogBase(tqparent,name,fl) { TQStringList qtdirs; - qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") ); + qtdirs.push_back( ::getenv("TQTDIR") + 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" ); @@ -48,8 +48,8 @@ SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { TQString qtdir = *it; - if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) - if (!qtListBox->findItem(qtdir, ExactMatch)) + if( !qtdir.isEmpty() && isValidTQtDir(qtdir) ) + if (!qtListBox->tqfindItem(qtdir, ExactMatch)) qtListBox->insertItem( qtdir ); } @@ -74,9 +74,9 @@ void SettingsDialog::slotSelectionChanged(TQListBoxItem* item) emit enabled( true ); } -bool SettingsDialog::isValidQtDir( const TQString & path ) const +bool SettingsDialog::isValidTQtDir( const TQString & path ) const { - return TQFile::exists( path + "/QtCore/QtCore" ); + return TQFile::exists( path + "/TQtCore/TQtCore" ); } TQString SettingsDialog::qtDir( ) const @@ -93,10 +93,10 @@ void SettingsDialog::addUrlButton_clicked( ) { kdDebug(9000) << k_funcinfo << endl; - if ( isValidQtDir( qtUrl->url() ) ) + if ( isValidTQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->tqfindItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } @@ -104,7 +104,7 @@ void SettingsDialog::addUrlButton_clicked( ) } else { - KMessageBox::error( this, i18n("This does not appear to be a valid Qt4 include directory.\nPlease select a different directory."), i18n("Invalid Directory") ); + KMessageBox::error( this, i18n("This does not appear to be a valid TQt4 include directory.\nPlease select a different directory."), i18n("Invalid Directory") ); } } diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h index 118564fb..9a28b2ad 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h @@ -17,13 +17,14 @@ class SettingsDialog : public SettingsDialogBase { Q_OBJECT + TQ_OBJECT public: - SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidQtDir( const TQString& path ) const; + bool isValidTQtDir( const TQString& path ) const; TQString qtDir() const; TQString configuration() const; diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui index f655e4f9..d3314b40 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SettingsDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsDialogBase</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -25,7 +25,7 @@ Only the selected entry will be used</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>addUrlButton</cstring> </property> @@ -58,18 +58,18 @@ Only the selected entry will be used</string> <connections> <connection> <sender>qtListBox</sender> - <signal>selectionChanged(QListBoxItem*)</signal> + <signal>selectionChanged(TQListBoxItem*)</signal> <receiver>SettingsDialogBase</receiver> - <slot>slotSelectionChanged(QListBoxItem*)</slot> + <slot>slotSelectionChanged(TQListBoxItem*)</slot> </connection> </connections> -<signals> +<Q_SIGNALS> <signal>enabled(int)</signal> -</signals> -<slots> - <slot>slotSelectionChanged(QListBoxItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<Q_SLOTS> + <slot>slotSelectionChanged(TQListBoxItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index 62eb38fd..25937879 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -18,16 +18,16 @@ #include <tqlabel.h> #include <tqdir.h> -K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevTQtImporter>( "kdevqtimporter" ) ) -KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) - : KDevPCSImporter( parent, name ) +KDevTQtImporter::KDevTQtImporter( TQObject * tqparent, const char * name, const TQStringList& ) + : KDevPCSImporter( tqparent, name ) {} -KDevQtImporter::~KDevQtImporter() +KDevTQtImporter::~KDevTQtImporter() {} -TQStringList KDevQtImporter::fileList() +TQStringList KDevTQtImporter::fileList() { if ( !m_settings ) return TQStringList(); @@ -50,7 +50,7 @@ TQStringList KDevQtImporter::fileList() return fileList; } -TQStringList KDevQtImporter::includePaths() +TQStringList KDevTQtImporter::includePaths() { if ( !m_settings ) return TQStringList(); @@ -64,9 +64,9 @@ TQStringList KDevQtImporter::includePaths() return includePaths; } -TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevTQtImporter::createSettingsPage( TQWidget * tqparent, const char * name ) { - m_settings = new SettingsDialog( parent, name ); + m_settings = new SettingsDialog( tqparent, name ); return m_settings; } diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index 3ae35b96..744a4b67 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -9,26 +9,27 @@ * * ***************************************************************************/ -#ifndef KDEVQTIMPORTER_H -#define KDEVQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H #include <kdevpcsimporter.h> #include <tqguardedptr.h> class SettingsDialog; -class KDevQtImporter : public KDevPCSImporter +class KDevTQtImporter : public KDevPCSImporter { Q_OBJECT + TQ_OBJECT public: - KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~KDevQtImporter(); + KDevTQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevTQtImporter(); - virtual TQString dbName() const { return TQString::fromLatin1("Qt"); } + virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); private: TQGuardedPtr<SettingsDialog> m_settings; diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index 2df475b7..a03ac0d4 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -27,20 +27,20 @@ #include "settingsdialog.h" -TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox ) +TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) { - if ( cpQListBox->selectionMode() != TQListBox::Single ) + if ( cpTQListBox->selectionMode() != TQListBox::Single ) return 0; - if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) - return cpQListBox->item( cpQListBox->currentItem() ); + if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) ) + return cpTQListBox->item( cpTQListBox->currentItem() ); return 0; } -SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) - : SettingsDialogBase( parent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) + : SettingsDialogBase( tqparent, name, fl ) { TQStringList qtdirs; - qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") ); + qtdirs.push_back( ::getenv( "TQTDIR" ) + TQString("/include") ); qtdirs.push_back( "/usr/lib/qt3/include" ); qtdirs.push_back( "/usr/lib/qt/include" ); qtdirs.push_back( "/usr/share/qt3/include" ); @@ -49,8 +49,8 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) for ( TQStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it ) { TQString qtdir = *it; - if ( !qtdir.isEmpty() && isValidQtDir( qtdir ) ) - if ( !qtListBox->findItem( qtdir, ExactMatch ) ) + if ( !qtdir.isEmpty() && isValidTQtDir( qtdir ) ) + if ( !qtListBox->tqfindItem( qtdir, ExactMatch ) ) qtListBox->insertItem( qtdir ); } @@ -71,9 +71,9 @@ void SettingsDialog::slotSelectionChanged( TQListBoxItem* ) } TQDir dir( qtDir() ); - TQStringList qconfigFileList = dir.entryList( "qconfig-*.h" ); + TQStringList qconfigFileList = dir.entryList( "tqconfig-*.h" ); qtConfiguration->clear(); - TQRegExp rx( "qconfig-(\\w+)\\.h" ); + TQRegExp rx( "tqconfig-(\\w+)\\.h" ); for ( TQStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it ) { ( void ) rx.exactMatch( *it ); @@ -83,7 +83,7 @@ void SettingsDialog::slotSelectionChanged( TQListBoxItem* ) emit enabled( true ); } -bool SettingsDialog::isValidQtDir( const TQString & path ) const +bool SettingsDialog::isValidTQtDir( const TQString & path ) const { return TQFile::exists( path + "/tqt.h" ); } @@ -101,10 +101,10 @@ void SettingsDialog::addUrlButton_clicked( ) { kdDebug(9000) << k_funcinfo << endl; - if ( isValidQtDir( qtUrl->url() ) ) + if ( isValidTQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->tqfindItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } @@ -112,7 +112,7 @@ void SettingsDialog::addUrlButton_clicked( ) } else { - KMessageBox::error( this, i18n("This does not appear to be a valid Qt3 include directory.\nPlease select a different directory."), i18n("Invalid Directory") ); + KMessageBox::error( this, i18n("This does not appear to be a valid TQt3 include directory.\nPlease select a different directory."), i18n("Invalid Directory") ); } } diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h index 118564fb..9a28b2ad 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h @@ -17,13 +17,14 @@ class SettingsDialog : public SettingsDialogBase { Q_OBJECT + TQ_OBJECT public: - SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidQtDir( const TQString& path ) const; + bool isValidTQtDir( const TQString& path ) const; TQString qtDir() const; TQString configuration() const; diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index fa485d57..fc28b901 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SettingsDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsDialogBase</cstring> </property> @@ -26,22 +26,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>161</width> <height>21</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -75,7 +75,7 @@ </widget> </hbox> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>addUrlButton</cstring> </property> @@ -96,7 +96,7 @@ <cstring>qtUrl</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -117,18 +117,18 @@ Only the selected entry will be used</string> <connections> <connection> <sender>qtListBox</sender> - <signal>selectionChanged(QListBoxItem*)</signal> + <signal>selectionChanged(TQListBoxItem*)</signal> <receiver>SettingsDialogBase</receiver> - <slot>slotSelectionChanged(QListBoxItem*)</slot> + <slot>slotSelectionChanged(TQListBoxItem*)</slot> </connection> </connections> -<signals> +<Q_SIGNALS> <signal>enabled(int)</signal> -</signals> -<slots> - <slot>slotSelectionChanged(QListBoxItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<Q_SLOTS> + <slot>slotSelectionChanged(TQListBoxItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index c7a8e9b6..32c078e1 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -57,14 +57,14 @@ class ProblemItem: public KListViewItem { public: - ProblemItem( TQListView* parent, const TQString& problem, + ProblemItem( TQListView* tqparent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, problem, file, line, column ) + : KListViewItem( tqparent, problem, file, line, column ) {} - ProblemItem( TQListViewItem* parent, const TQString& problem, + ProblemItem( TQListViewItem* tqparent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, problem, file, line, column ) + : KListViewItem( tqparent, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const @@ -82,8 +82,8 @@ public: }; -ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* parent, const char* name ) -: TQWidget( parent, name ? name : "problemreporter" ), +ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* tqparent, const char* name ) +: TQWidget( tqparent, name ? name : "problemreporter" ), m_cppSupport( part ), // m_document( 0 ), m_markIface( 0 ) @@ -142,8 +142,8 @@ m_markIface( 0 ) 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); + m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight); + m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft); connect( m_filterEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotFilter()) ); @@ -175,7 +175,7 @@ void ProblemReporter::slotFilter() if(!m_tabBar->isTabEnabled(5)) m_tabBar->setTabEnabled(5,true); - m_tabBar->tab(5)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() )); + m_tabBar->tab(5)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() )); m_tabBar->setCurrentTab(5); m_filteredList->clear(); @@ -198,7 +198,7 @@ void ProblemReporter::filterList(KListView* listview, const TQString& level) TQListViewItemIterator it( listview ); while ( it.current() ) { - if ( it.current()->text(3).contains(m_filterEdit->text(),false)) + if ( it.current()->text(3).tqcontains(m_filterEdit->text(),false)) { new KListViewItem(m_filteredList,level, it.current()->text(0), it.current()->text(1), @@ -356,7 +356,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p m_markIface->addMark( p.line(), markType ); TQString msg = p.text(); - msg = msg.replace( TQRegExp("\n"), "" ); + msg = msg.tqreplace( TQRegExp("\n"), "" ); TQString relFileName = m_cppSupport->project()->relativeProjectFile(fileName); @@ -416,7 +416,7 @@ TQString ProblemReporter::levelToString( int level ) const case Problem::Level_Fixme: return TQString( i18n("Fixme") ); default: - return TQString::null; + return TQString(); } } diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index fc25523e..c2abb294 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -102,11 +102,12 @@ namespace KTextEditor class Document; } -class ProblemReporter: public QWidget +class ProblemReporter: public TQWidget { Q_OBJECT + TQ_OBJECT public: - ProblemReporter( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); + ProblemReporter( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0 ); virtual ~ProblemReporter(); void removeAllProblems( const TQString& filename ); diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index 46fa7897..21717dd2 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -25,19 +25,19 @@ #include <stdlib.h> -const TQString QtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" ); +const TQString TQtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" ); -QtBuildConfig::QtBuildConfig( CppSupportPart * part, TQDomDocument* dom ) +TQtBuildConfig::TQtBuildConfig( CppSupportPart * part, TQDomDocument* dom ) : TQObject( part ), m_part( part ), m_dom( dom ) { init(); } -QtBuildConfig::~QtBuildConfig() +TQtBuildConfig::~TQtBuildConfig() { } -void QtBuildConfig::init( ) +void TQtBuildConfig::init( ) { m_used = DomUtil::readBoolEntry( *m_dom, m_configRoot + "/used", false ); m_version = DomUtil::readIntEntry( *m_dom, m_configRoot + "/version", 3 ); @@ -55,9 +55,9 @@ void QtBuildConfig::init( ) m_designerPath = DomUtil::readEntry(*m_dom, m_configRoot + "/designer", ""); m_designerPluginPaths = DomUtil::readListEntry(*m_dom, m_configRoot + "/designerpluginpaths", "path" ); - if( m_root.isEmpty() || !isValidQtDir( m_root ) ) + if( m_root.isEmpty() || !isValidTQtDir( m_root ) ) { - findQtDir(); + findTQtDir(); } if( m_qmakePath.isEmpty() || !isExecutable( m_qmakePath ) ) { @@ -83,7 +83,7 @@ void QtBuildConfig::init( ) } } -bool QtBuildConfig::isValidQtDir( const TQString& path ) const +bool TQtBuildConfig::isValidTQtDir( const TQString& path ) const { TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ "include"+TQString( TQChar( TQDir::separator() ) )+ @@ -91,30 +91,30 @@ bool QtBuildConfig::isValidQtDir( const TQString& path ) const return ( m_version == 4 || ( m_version != 4 && inc.exists() ) ); } -void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const +void TQtBuildConfig::buildBinDirs( TQStringList & dirs ) const { if( m_version == 3 ) { if( !m_root.isEmpty() ) dirs << (m_root + TQString( TQChar( TQDir::separator() ) ) + "bin"); - dirs << (::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin"); + dirs << (::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin"); } TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; TQString binpath = TQDir::rootDirPath() + "bin"; - if( dirs.findIndex( binpath ) != -1 ) + if( dirs.tqfindIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.findIndex( binpath ) != -1 ) + if( dirs.tqfindIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.findIndex( binpath ) != -1 ) + if( dirs.tqfindIndex( binpath ) != -1 ) dirs << binpath; } -TQString QtBuildConfig::findExecutable( const TQString& execname ) const +TQString TQtBuildConfig::findExecutable( const TQString& execname ) const { TQStringList dirs; buildBinDirs( dirs ); @@ -130,27 +130,27 @@ TQString QtBuildConfig::findExecutable( const TQString& execname ) const return ""; } -bool QtBuildConfig::isExecutable( const TQString& path ) const +bool TQtBuildConfig::isExecutable( const TQString& path ) const { TQFileInfo fi(path); return( fi.exists() && fi.isExecutable() ); } -void QtBuildConfig::findQtDir() +void TQtBuildConfig::findTQtDir() { TQStringList qtdirs; if( m_version == 3 ) - qtdirs.push_back( ::getenv("QTDIR") ); - 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( ::getenv("TQTDIR") ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( 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( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { TQString qtdir = *it; - if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) + if( !qtdir.isEmpty() && isValidTQtDir(qtdir) ) { m_root = qtdir; return; @@ -158,7 +158,7 @@ void QtBuildConfig::findQtDir() } } -void QtBuildConfig::store( ) +void TQtBuildConfig::store( ) { DomUtil::writeBoolEntry( *m_dom, m_configRoot + "/used", m_used ); DomUtil::writeIntEntry( *m_dom, m_configRoot + "/version", m_version ); @@ -172,45 +172,45 @@ void QtBuildConfig::store( ) emit stored(); } -void QtBuildConfig::setUsed( bool used ) +void TQtBuildConfig::setUsed( bool used ) { m_used = used; } -void QtBuildConfig::setVersion( int version ) +void TQtBuildConfig::setVersion( int version ) { m_version = version; } -void QtBuildConfig::setIncludeStyle( int style ) +void TQtBuildConfig::setIncludeStyle( int style ) { m_includeStyle = style; } -void QtBuildConfig::setRoot( const TQString& root ) +void TQtBuildConfig::setRoot( const TQString& root ) { m_root = root; } -void QtBuildConfig::setQMakePath( const TQString& path ) +void TQtBuildConfig::setTQMakePath( const TQString& path ) { m_qmakePath = path; } -void QtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx ) +void TQtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx ) { m_designerPluginPaths = pfx; } -void QtBuildConfig::setDesignerPath( const TQString& path ) +void TQtBuildConfig::setDesignerPath( const TQString& path ) { m_designerPath = path; } -void QtBuildConfig::setDesignerIntegration( const TQString& designerIntegration ) +void TQtBuildConfig::setDesignerIntegration( const TQString& designerIntegration ) { m_designerIntegration = designerIntegration; } #include "qtbuildconfig.moc" -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on +//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h index 193f582d..df92869b 100644 --- a/languages/cpp/qtbuildconfig.h +++ b/languages/cpp/qtbuildconfig.h @@ -15,8 +15,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef QTBUILDCONFIG_H -#define QTBUILDCONFIG_H +#ifndef TQTBUILDCONFIG_H +#define TQTBUILDCONFIG_H #include <tqobject.h> #include <tqstringlist.h> @@ -25,17 +25,18 @@ class CppSupportPart; class TQDomDocument; /** - @brief The QtBuildConfig class stores all parameters related to the used Qt library + @brief The TQtBuildConfig class stores all parameters related to the used TQt library @author Tobias Erbsland <te@profzone.ch> */ -class QtBuildConfig : public QObject +class TQtBuildConfig : public TQObject { Q_OBJECT + TQ_OBJECT public: - QtBuildConfig( CppSupportPart* part, TQDomDocument* dom ); - virtual ~QtBuildConfig(); + TQtBuildConfig( CppSupportPart* part, TQDomDocument* dom ); + virtual ~TQtBuildConfig(); inline bool isUsed() const { return m_used; } inline int version() const { return m_version; } @@ -52,7 +53,7 @@ public: void setRoot( const TQString& root ); void setDesignerPath( const TQString& path ); void setDesignerPluginPaths( const TQStringList& pfx ); - void setQMakePath( const TQString& path ); + void setTQMakePath( const TQString& path ); void setDesignerIntegration( const TQString& designerIntegration ); void init(); @@ -64,8 +65,8 @@ signals: private: - bool isValidQtDir( const TQString& ) const; - void findQtDir(); + bool isValidTQtDir( const TQString& ) const; + void findTQtDir(); TQString findExecutable( const TQString& ) const; void buildBinDirs( TQStringList& ) const; bool isExecutable( const TQString& ) const; @@ -76,9 +77,9 @@ private: 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) - 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 + TQString m_root; ///< The root directory of the used qt installation for TQt3 + TQString m_designerPath; ///< The path including the binary name of TQt Designer + TQString m_qmakePath; ///< The path including the binary name of TQMake TQStringList m_designerPluginPaths; ///< The Prefix for Designer TQString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index 9314aceb..83354fa8 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -40,12 +40,12 @@ #include "codemodel_utils.h" #include "implementationwidget.h" -QtDesignerCppIntegration::QtDesignerCppIntegration( KDevLanguageSupport *part, +TQtDesignerCppIntegration::TQtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ) -: QtDesignerIntegration( part, impl, true, 0 ) +: TQtDesignerIntegration( part, impl, true, 0 ) {} -void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass ) +void TQtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass ) { m_part->partController() ->editDocument( KURL( klass->fileName() ) ); KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController() ->activePart() ); @@ -60,7 +60,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function klass->getEndPosition( &line, &column ); // compute the insertion point map - TQMap<TQString, QPair<int, int> > points; + TQMap<TQString, TQPair<int, int> > points; const FunctionList functionList = klass->functionList(); for ( FunctionList::ConstIterator it = functionList.begin(); it != functionList.end(); ++it ) @@ -68,9 +68,9 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); TQString access = accessID( *it ); - QPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); + TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); - if ( !points.contains( access ) || points[ access ] < funEndPoint ) + if ( !points.tqcontains( access ) || points[ access ] < funEndPoint ) { points[ access ] = funEndPoint; } @@ -78,7 +78,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function int insertedLine = 0; - TQString access = function.access + ( function.type == KInterfaceDesigner::ftQtSlot ? " slots" : "" ); + TQString access = function.access + ( function.type == KInterfaceDesigner::ftTQtSlot ? " slots" : "" ); TQString str = function.returnType + " " + function.function; if ( function.specifier == "virtual" ) @@ -90,20 +90,20 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function str += ";\n"; str = " " + str; - QPair<int, int> pt; - if ( points.contains( access ) ) + TQPair<int, int> pt; + if ( points.tqcontains( access ) ) { pt = points[ access ]; } else { str.prepend( access + ":\n" ); - points[ access ] = qMakePair( line - 1, 0 ); + points[ access ] = tqMakePair( line - 1, 0 ); pt = points[ access ]; // end of class declaration } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( TQChar( '\n' ) ); + insertedLine += str.tqcontains( TQChar( '\n' ) ); CppSupportPart *cppPart = dynamic_cast<CppSupportPart *>( m_part ); cppPart->backgroundParser() ->addFile( klass->fileName() ); @@ -121,7 +121,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function TQFileInfo fi( klass->fileName() ); TQString implementationFile = fi.absFilePath(); - implementationFile.replace( ".h", ".cpp" ); + implementationFile.tqreplace( ".h", ".cpp" ); TQFileInfo fileInfo( implementationFile ); if ( !TQFile::exists( fileInfo.absFilePath() ) ) @@ -158,7 +158,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function } else { - if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.moc.*" ) ) ) + if ( editIface->textLine( line ).tqcontains( TQRegExp( ".*#include .*\\.tqmoc.*" ) ) ) atLine = line; break; } @@ -167,7 +167,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function atColumn = 0; } - // editIface->insertLine( atLine + 1, TQString::fromLatin1("") ); + // editIface->insertLine( atLine + 1, TQString::tqfromLatin1("") ); kdDebug() << "at line in intg: " << atLine << " atCol: " << atColumn << endl; kdDebug() << "text: " << stri << endl; editIface->insertText( atLine, atColumn, stri ); @@ -182,35 +182,35 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function cppPart->backgroundParser() ->addFile( implementationFile ); } -TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const +TQString TQtDesignerCppIntegration::accessID( FunctionDom fun ) const { if ( fun->isSignal() ) - return TQString::fromLatin1( "signals" ); + return TQString::tqfromLatin1( "signals" ); switch ( fun->access() ) { case CodeModelItem::Public: if ( fun->isSlot() ) - return TQString::fromLatin1( "public slots" ); - return TQString::fromLatin1( "public" ); + return TQString::tqfromLatin1( "public slots" ); + return TQString::tqfromLatin1( "public" ); case CodeModelItem::Protected: if ( fun->isSlot() ) - return TQString::fromLatin1( "protected slots" ); - return TQString::fromLatin1( "protected" ); + return TQString::tqfromLatin1( "protected slots" ); + return TQString::tqfromLatin1( "protected" ); case CodeModelItem::Private: if ( fun->isSlot() ) - return TQString::fromLatin1( "private slots" ); - return TQString::fromLatin1( "private" ); + return TQString::tqfromLatin1( "private slots" ); + return TQString::tqfromLatin1( "private" ); } - return TQString::null; + return TQString(); } -void QtDesignerCppIntegration::processImplementationName( TQString &name ) +void TQtDesignerCppIntegration::processImplementationName( TQString &name ) { - name.replace( ".h", ".cpp" ); + name.tqreplace( ".h", ".cpp" ); } #include "qtdesignercppintegration.moc" diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h index 6721c9df..5fd95b58 100644 --- a/languages/cpp/qtdesignercppintegration.h +++ b/languages/cpp/qtdesignercppintegration.h @@ -17,16 +17,17 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QTDESIGNERCPPINTEGRATION_H -#define QTDESIGNERCPPINTEGRATION_H +#ifndef TQTDESIGNERCPPINTEGRATION_H +#define TQTDESIGNERCPPINTEGRATION_H #include <qtdesignerintegration.h> -class QtDesignerCppIntegration : public QtDesignerIntegration +class TQtDesignerCppIntegration : public TQtDesignerIntegration { Q_OBJECT + TQ_OBJECT public: - QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ); + TQtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ); protected: virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass ); diff --git a/languages/cpp/simplecontext.cpp b/languages/cpp/simplecontext.cpp index 225bfc84..3d23f76c 100644 --- a/languages/cpp/simplecontext.cpp +++ b/languages/cpp/simplecontext.cpp @@ -27,7 +27,7 @@ SimpleType getGlobal( SimpleType t ) { SafetyCounter s( 50 ); while( !global.scope().isEmpty() && s ) { if( !s ) { kdDebug( 9007 ) << "error" << endl; break; } - global = global->parent(); + global = global->tqparent(); } if( !global.scope().isEmpty() ) {kdDebug( 9007 ) << "ERROR WITH GLOBAL SCOPE" << endl; return SimpleType(); } return global; diff --git a/languages/cpp/simplecontext.h b/languages/cpp/simplecontext.h index d1fde70a..a0075554 100644 --- a/languages/cpp/simplecontext.h +++ b/languages/cpp/simplecontext.h @@ -134,12 +134,12 @@ class SimpleContext } //First the new name, aka "" for real imports, second the name to be imported - void addImport( const QPair<TQString, TQString>& import ) { + void addImport( const TQPair<TQString, TQString>& import ) { m_imports << import; } //Key the new name, aka "" for real imports, second the name to be imported - TQValueList<QPair<TQString, TQString> > imports() { + TQValueList<TQPair<TQString, TQString> > imports() { return m_imports; } @@ -162,7 +162,7 @@ class SimpleContext private: TQValueList<SimpleVariable> m_vars; - TQValueList<QPair<TQString, TQString> > m_imports; + TQValueList<TQPair<TQString, TQString> > m_imports; SimpleContext* m_prev; SimpleType m_container; }; diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index 5111a2a0..b496b96a 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -39,15 +39,15 @@ BuiltinTypes::BuiltinTypes() { } bool BuiltinTypes::isBuiltin( const TypeDesc& desc ) { - return m_types.find( desc.name() ) != m_types.end(); + return m_types.tqfind( desc.name() ) != m_types.end(); } TQString BuiltinTypes::comment( const TypeDesc& desc ) { - TQMap<TQString, TQString>::iterator it = m_types.find( desc.name() ); + TQMap<TQString, TQString>::iterator it = m_types.tqfind( desc.name() ); if( it != m_types.end() ) { return *it; } else { - return TQString::null; + return TQString(); } } @@ -301,7 +301,7 @@ TQString SimpleTypeImpl::operatorToString( Operator op ) { case ParenOp: return "paren-operator"; default: - return TQString( "%1" ).arg( ( long ) op ); + return TQString( "%1" ).tqarg( ( long ) op ); }; } @@ -428,7 +428,7 @@ class TemplateParamMatch { for( int a = 0; a < m_candidateParams.count(); a++ ) { SimpleTypeImpl::TemplateParamInfo::TemplateParam t; if( m_candidateParams.getParam( t, a ) ) { - if( !m_hadParameters.contains( t.name ) ) { + if( !m_hadParameters.tqcontains( t.name ) ) { m_matched = false; } } else { @@ -472,7 +472,7 @@ class TemplateParamMatch { t.value = val; - if( m_hadParameters.contains( t.name ) && oldValue != t.value ) { + if( m_hadParameters.tqcontains( t.name ) && oldValue != t.value ) { return false; ///We have a mismatch, two different values for the same template-parameter. } else { m_candidateParams.addParam( t ); @@ -793,9 +793,9 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d } } - ///Ask parentsc + ///Ask tqparentsc if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) { - LocateResult rett = parent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); + LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); if ( rett->resolved() ) return rett.increaseDepth(); else @@ -803,7 +803,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ret = rett.increaseDepth(); } - ///Ask the bases and allow them to search in their parents. + ///Ask the bases and allow them to search in their tqparents. if ( ! ( mode & ExcludeBases ) ) { TypeDesc baseName = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration TQValueList<LocateResult> bases = getBases(); @@ -832,7 +832,7 @@ void SimpleTypeImpl::breakReferences() { m_desc.resetResolved(); // m_trace.clear(); m_masterProxy = 0; - invalidateCache(); + tqinvalidateCache(); } TypePointer SimpleTypeImpl::bigContainer() { @@ -842,26 +842,26 @@ TypePointer SimpleTypeImpl::bigContainer() { return TypePointer( this ); } -SimpleType SimpleTypeImpl::parent() { +SimpleType SimpleTypeImpl::tqparent() { if ( m_parent ) { - //ifVerbose( dbg() << "\"" << str() << "\": returning parent" << endl; + //ifVerbose( dbg() << "\"" << str() << "\": returning tqparent" << endl; return SimpleType( m_parent ); } else { - ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl ); - invalidateSecondaryCache(); + ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl ); + tqinvalidateSecondaryCache(); TQStringList sc = scope(); if ( !sc.isEmpty() ) { sc.pop_back(); SimpleType r = SimpleType( sc, m_desc.includeFiles() ); if ( &( *r.get() ) == this ) { - kdDebug( 9007 ) << "error: self set as parent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl; + kdDebug( 9007 ) << "error: self set as tqparent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl; return SimpleType( new SimpleTypeImpl( "" ) ); } m_parent = r.get(); return r; } else { - ifVerbose( dbg() << "\"" << str() << "\"warning: returning parent of global scope!" << endl ); + ifVerbose( dbg() << "\"" << str() << "\"warning: returning tqparent of global scope!" << endl ); return SimpleType( new SimpleTypeImpl( "" ) ); } } @@ -876,7 +876,7 @@ const TypeDesc& SimpleTypeImpl::desc() { TypeDesc& SimpleTypeImpl::descForEdit() { desc(); - invalidateCache(); + tqinvalidateCache(); return m_desc; } @@ -934,15 +934,15 @@ TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { Q_UNUSED( depth ); - if ( !m_scope.isEmpty() && parent() ) { - return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); + if ( !m_scope.isEmpty() && tqparent() ) { + return tqparent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); } else { return fullTypeResolved(); } } void SimpleTypeImpl::checkTemplateParams () { - invalidateCache(); + tqinvalidateCache(); if ( ! m_scope.isEmpty() ) { TQString str = m_scope.back(); m_desc = str; @@ -956,7 +956,7 @@ void SimpleTypeImpl::checkTemplateParams () { } void SimpleTypeImpl::setScope( const TQStringList& scope ) { - invalidateCache(); + tqinvalidateCache(); m_scope = scope; if ( m_scope.count() == 1 && m_scope.front().isEmpty() ) { //kdDebug() << "bad scope set " << kdBacktrace() << endl; @@ -965,8 +965,8 @@ void SimpleTypeImpl::setScope( const TQStringList& scope ) { } SimpleTypeImpl::TypeOfResult SimpleTypeImpl::searchBases ( const TypeDesc& name /*option!!*/ ) { - TQValueList<LocateResult> parents = getBases(); - for ( TQValueList<LocateResult>::iterator it = parents.begin(); it != parents.end(); ++it ) { + TQValueList<LocateResult> tqparents = getBases(); + for ( TQValueList<LocateResult>::iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; TypeOfResult type = ( *it ) ->resolved() ->typeOf( name ); @@ -985,20 +985,20 @@ void SimpleTypeImpl::setSlaveParent( SimpleTypeImpl& slave ) { } void SimpleTypeImpl::parseParams( TypeDesc desc ) { - invalidateCache(); + tqinvalidateCache(); m_desc = desc; m_desc.clearInstanceInfo(); } void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) { - invalidateCache(); + tqinvalidateCache(); m_desc.templateParams() = desc.templateParams(); } //SimpleTypeImpl::TemplateParamInfo implementation bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQString name ) const { - TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.find( name ); + TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.tqfind( name ); if ( it != m_paramsByName.end() ) { target = *it; return true; @@ -1007,7 +1007,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQStrin } bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int number ) const { - TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.find( number ); + TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.tqfind( 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 ) { - TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.find( number ); + TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.tqfind( number ); if ( it != m_paramsByNumber.end() ) { m_paramsByName.remove( ( *it ).name ); m_paramsByNumber.remove( it ); diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index 19fb22cc..49b01ee0 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -42,7 +42,7 @@ class SimpleTypeFunctionInterface; typedef KSharedPtr<SimpleTypeImpl> TypePointer; -///if this is set, imported items will get their parent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff) +///if this is set, imported items will get their tqparent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff) //#define PHYSICAL_IMPORT enum Repository { @@ -214,7 +214,7 @@ class SimpleTypeConfiguration { SimpleType::destroyStore(); } } - void invalidate() { + void tqinvalidate() { m_invalid = true; } }; @@ -251,7 +251,7 @@ class SimpleTypeImpl : public KShared { ///Returns the template-specialization-string for classes virtual TQString specialization() const { - return TQString::null; + return TQString(); } class TemplateParamInfo { @@ -322,7 +322,7 @@ class SimpleTypeImpl : public KShared { }; - ///Sets the parent of the given slave to either this class, or the proxy of this class + ///Sets the tqparent of the given slave to either this class, or the proxy of this class virtual void setSlaveParent( SimpleTypeImpl& slave ); void setMasterProxy( TypePointer t ) { @@ -410,11 +410,11 @@ class SimpleTypeImpl : public KShared { } protected: - virtual void invalidateCache() {} + virtual void tqinvalidateCache() {} ; ///Secondary cache also depends on the surrounding - virtual void invalidateSecondaryCache() {} + virtual void tqinvalidateSecondaryCache() {} virtual void setSecondaryCacheActive( bool active ) { Q_UNUSED( active ); @@ -422,7 +422,7 @@ class SimpleTypeImpl : public KShared { ///Primary cache is the one associated only with this object. It must only be cleared ///when the object pointed to changes - virtual void invalidatePrimaryCache( bool onlyNegative = false ) {} + virtual void tqinvalidatePrimaryCache( bool onlyNegative = false ) {} static TQString operatorToString( Operator op ); @@ -480,19 +480,19 @@ class SimpleTypeImpl : public KShared { return ts; } - ///sets the parent-type(type this one is nested in) - void setParent( TypePointer parent ) { - if( parent == m_parent ) return; - invalidateSecondaryCache(); - if ( &( *parent ) == this ) { + ///sets the tqparent-type(type this one is nested in) + void setParent( TypePointer tqparent ) { + if( tqparent == m_parent ) return; + tqinvalidateSecondaryCache(); + if ( &( *tqparent ) == this ) { kdDebug( 9007 ) << "setSlaveParent error\n" << kdBacktrace() << endl; return ; } - m_parent = parent; + m_parent = tqparent; } - ///returns whether the type has template-parameters, or one of the parent-types has template-parameters. + ///returns whether the type has template-parameters, or one of the tqparent-types has template-parameters. bool usingTemplates() const { return !m_desc.templateParams().isEmpty() || ( m_parent && m_parent->usingTemplates() ); } @@ -617,7 +617,7 @@ class SimpleTypeImpl : public KShared { ExcludeParents = 16, ExcludeNestedTypes = 32, ExcludeNamespaces = 64, - ForgetModeUpwards = 128, ///forgets everything, even NoFail, while passing control to the parent + ForgetModeUpwards = 128, ///forgets everything, even NoFail, while passing control to the tqparent LocateBase = 4 + 8 + 32 + 64 + 128, ///searching in the scope visible while the base-declaration of a class NoFail = 256, TraceAliases = 512, ///Stores a copy whenever an alias is applied @@ -718,8 +718,8 @@ class SimpleTypeImpl : public KShared { ///Returns either itself, or the (namespace-)proxy this type is a slave of. TypePointer bigContainer(); - ///Returns the parent, eg. the SimpleType this one is nested in. - SimpleType parent(); + ///Returns the tqparent, eg. the SimpleType this one is nested in. + SimpleType tqparent(); ///this must be a reference, so the desc can be manipulated in-place from outside const TypeDesc& desc(); @@ -779,31 +779,31 @@ class SimpleTypeImpl : public KShared { ///Used to set the include-files that were used to find this type(needed for lazy evaluation of the base-classes) void setFindIncludeFiles( const IncludeFiles& files ); - ///Should be called within the parent-namespace/class + ///Should be called within the tqparent-namespace/class virtual void chooseSpecialization( MemberInfo& member ); }; class TypeTrace { - TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> > m_trace; + TQValueList<TQPair< SimpleTypeImpl::MemberInfo, TypeDesc> > m_trace; public: - TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> >& trace() { + TQValueList<TQPair< SimpleTypeImpl::MemberInfo, TypeDesc> >& trace() { return m_trace; }; void prepend( const SimpleTypeImpl::MemberInfo& t, const TypeDesc& tail = TypeDesc() ) { - m_trace.push_front( QPair< SimpleTypeImpl::MemberInfo, TypeDesc>( t, tail ) ); + m_trace.push_front( TQPair< SimpleTypeImpl::MemberInfo, TypeDesc>( t, tail ) ); } void prepend( const TypeTrace& trace, int indent = 0 ) { /* if( indent != 0 ) { TQString ind; for( int a = 0; a < indent; a++ ) ind += " "; - for( TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> >::const_iterator it = trace.m_trace.end(); it != trace.m_trace.begin(); ) { + for( TQValueList<TQPair< SimpleTypeImpl::MemberInfo, TypeDesc> >::const_iterator it = trace.m_trace.end(); it != trace.m_trace.begin(); ) { --it; - QPair<SimpleTypeImpl::MemberInfo, TypeDesc> item = *it; + TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> item = *it; item.second.prependDecoration( ind ); m_trace.push_front( item ); } diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h index 3f950cbf..6744d5d8 100644 --- a/languages/cpp/simpletypecachebinder.h +++ b/languages/cpp/simpletypecachebinder.h @@ -203,7 +203,7 @@ class SimpleTypeCacheBinder : public Base { } #ifdef TEST_REMAP - typename MemberMap::iterator it = m_memberCache.find( key ); + typename MemberMap::iterator it = m_memberCache.tqfind( key ); if ( it == m_memberCache.end() ) dbgMajor() << "\"" << Base::str() << "\"remap failed with \"" << name.fullNameChain() << "\"" << endl; #endif @@ -260,7 +260,7 @@ class SimpleTypeCacheBinder : public Base { (*r.first).second = t; #ifdef TEST_REMAP - typename LocateMap::iterator it = m_locateCache.find( desc ); + typename LocateMap::iterator it = m_locateCache.tqfind( desc ); if ( it == m_locateCache.end() ) dbgMajor() << "\"" << Base::str() << "\"remap failed with \"" << name.fullNameChain() << "\"" << endl; #endif return t; @@ -293,7 +293,7 @@ class SimpleTypeCacheBinder : public Base { return new SimpleTypeCacheBinder<Base>( this ); } - virtual void invalidatePrimaryCache( bool onlyNegative ) { + virtual void tqinvalidatePrimaryCache( bool onlyNegative ) { //if( !m_memberCache.isEmpty() ) dbg() << "\"" << Base::str() << "\" primary caches cleared" << endl; if ( !onlyNegative) m_memberCache.clear(); @@ -307,7 +307,7 @@ class SimpleTypeCacheBinder : public Base { } m_classListCache.clear(); } - virtual void invalidateSecondaryCache() { + virtual void tqinvalidateSecondaryCache() { //if( !m_locateCache.isEmpty() ) dbg() << "\"" << Base::str() << "\" secondary caches cleared" << endl; m_locateCache.clear(); m_haveBasesCache = false; @@ -322,9 +322,9 @@ class SimpleTypeCacheBinder : public Base { primaryActive = active; } - virtual void invalidateCache() { - invalidatePrimaryCache( false ); - invalidateSecondaryCache(); + virtual void tqinvalidateCache() { + tqinvalidatePrimaryCache( false ); + tqinvalidateSecondaryCache(); }; }; diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp index f662acc5..9afdea75 100644 --- a/languages/cpp/simpletypecatalog.cpp +++ b/languages/cpp/simpletypecatalog.cpp @@ -279,13 +279,13 @@ TQStringList SimpleTypeCatalog::getBaseStrings() { TQStringList ret; TQMap<TQString, bool> bases; -// try with parentsc +// try with tqparentsc TQTime t; t.restart(); - TQValueList<Tag> parents( getBaseClassList() ); + TQValueList<Tag> tqparents( getBaseClassList() ); - TQValueList<Tag>::Iterator it = parents.begin(); - while ( it != parents.end() ) { + TQValueList<Tag>::Iterator it = tqparents.begin(); + while ( it != tqparents.end() ) { Tag & tag = *it; ++it; diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h index e22a3fcf..92563781 100644 --- a/languages/cpp/simpletypecatalog.h +++ b/languages/cpp/simpletypecatalog.h @@ -77,7 +77,7 @@ private: int pointerDepthFromString( const TQString& str ) { TQRegExp ptrRx( "(\\*|\\&)" ); - TQString ptr = str.mid( str.find( ptrRx ) ); + TQString ptr = str.mid( str.tqfind( ptrRx ) ); TQStringList ptrList = TQStringList::split( "", ptr ); return ptrList.size(); } @@ -100,7 +100,7 @@ protected: TypeDesc m_desc; TypePointer m_parent; - CatalogBuildInfo( Tag tag , const TypeDesc& desc, TypePointer parent ) : m_tag( tag ) , m_desc( desc ), m_parent( parent ) { + CatalogBuildInfo( Tag tag , const TypeDesc& desc, TypePointer tqparent ) : m_tag( tag ) , m_desc( desc ), m_parent( tqparent ) { } virtual TypePointer build(); diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp index 3fc1ce52..d0c2c2af 100644 --- a/languages/cpp/simpletypefunction.cpp +++ b/languages/cpp/simpletypefunction.cpp @@ -455,7 +455,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCodeModel::findMember( TypeDesc name , Memb if ( ret.memberType == MemberInfo::Function || ret.memberType == MemberInfo::Variable || ret.memberType == MemberInfo::Template || ret.memberType == MemberInfo::Typedef || ret.memberType == MemberInfo::NestedType ) { //For redirected types it is necessary to add the include-files of the context they were searched in. //That is not quite correct, but it makes sure that at least the same namespace-aliases will be activated while the search for the type, - //Which is necessary because the alias is parented by exactly this class. + //Which is necessary because the alias is tqparented by exactly this class. ret.type->addIncludeFiles( name.includeFiles() ); } @@ -494,7 +494,7 @@ DeclarationInfo SimpleTypeCodeModel::getDeclarationInfo() { TQString SimpleTypeCodeModel::specialization() const { const ClassModel* klass = dynamic_cast<const ClassModel*>( m_item.data() ); - if ( !klass ) return TQString::null; + if ( !klass ) return TQString(); return klass->getSpecializationDeclaration(); } @@ -553,8 +553,8 @@ TQStringList SimpleTypeCodeModel::getBaseStrings() { if ( !m_item || ( klass = dynamic_cast<ClassModel*>( & ( *m_item ) ) ) == 0 ) return ret; - TQStringList parents = klass->baseClassList(); - for ( TQStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) { + TQStringList tqparents = klass->baseClassList(); + for ( TQStringList::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { ret << *it; } @@ -572,8 +572,8 @@ TypePointer SimpleTypeCodeModel::CodeModelBuildInfo::build() { TypeDesc SimpleTypeCodeModelFunction::getReturnType() { if ( item() ) { IncludeFiles files; - if( parent() ) - files = parent()->getFindIncludeFiles(); + if( tqparent() ) + files = tqparent()->getFindIncludeFiles(); if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) { TypeDesc d = m->resultType(); d.setIncludeFiles( files ); @@ -597,8 +597,8 @@ TQValueList<TypeDesc> SimpleTypeCodeModelFunction::getArgumentTypes() { if ( item() ) { IncludeFiles files; - if( parent() ) - files = parent()->getFindIncludeFiles(); + if( tqparent() ) + files = tqparent()->getFindIncludeFiles(); if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) { ArgumentList l = m->argumentList(); for ( ArgumentList::iterator it = l.begin(); it != l.end(); ++it ) { @@ -642,7 +642,7 @@ TQStringList SimpleTypeCodeModelFunction::getArgumentDefaults() { //SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo implementation -SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ) : m_desc( desc ), m_parent( parent ) { +SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ) : m_desc( desc ), m_parent( tqparent ) { for ( FunctionDefinitionList::iterator it = items.begin(); it != items.end(); ++it ) { m_items << model_cast<FunctionDom> ( *it ); diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h index 90b5fcab..86f32a65 100644 --- a/languages/cpp/simpletypefunction.h +++ b/languages/cpp/simpletypefunction.h @@ -139,7 +139,7 @@ public: ///paramInfo now contains the information for all implicit types } - return this->parent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) ); + return this->tqparent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) ); } else { ifVerbose( dbg() << "failed to find a fitting overloaded method" << endl ); } @@ -239,7 +239,7 @@ protected: TypeDesc m_desc; TypePointer m_parent; - CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer parent ) : m_item( item ), m_desc( desc ), m_parent( parent ) { + CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer tqparent ) : m_item( item ), m_desc( desc ), m_parent( tqparent ) { } virtual TypePointer build(); @@ -281,9 +281,9 @@ public: TypeDesc m_desc; TypePointer m_parent; - CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer parent ) : m_items( items ), m_desc( desc ), m_parent( parent ) { + CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer tqparent ) : m_items( items ), m_desc( desc ), m_parent( tqparent ) { } - CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ); + CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ); virtual TypePointer build(); }; @@ -317,7 +317,7 @@ public: TypeDesc m_desc; TypePointer m_parent; - CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) { + CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer tqparent ) : m_tags( tags ), m_desc( desc ), m_parent( tqparent ) { } virtual TypePointer build(); diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp index f7937db1..048eb9ad 100644 --- a/languages/cpp/simpletypenamespace.cpp +++ b/languages/cpp/simpletypenamespace.cpp @@ -116,7 +116,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe ImportList m_aliasImports; - AliasMap::iterator itt = m_aliases.find( name.name() ); + AliasMap::iterator itt = m_aliases.tqfind( name.name() ); if ( itt != m_aliases.end() && !( *itt ).empty() ) { ifVerbose( dbg() << "\"" << str() << "\": namespace-sub-aliases \"" << name.name() << "\"" << "\" requested, locating targets" << endl ); @@ -159,7 +159,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe if ( mem.memberType != MemberInfo::Namespace ) { #ifdef PHYSICAL_IMPORT TypePointer b = mem.build(); - if ( b && !( b->parent()->masterProxy().data() == this ) ) { + if ( b && !( b->tqparent()->masterProxy().data() == this ) ) { b = b ->clone(); //expensive, cache is not shared b->setParent( this ); @@ -169,7 +169,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe if( mem.memberType == MemberInfo::NestedType ) chooseSpecialization( mem ); TypePointer b = mem.build(); - if( b && b->parent() && b->parent()->masterProxy().data() == this ) + if( b && b->tqparent() && b->tqparent()->masterProxy().data() == this ) b->setParent( this ); #endif return mem; @@ -224,10 +224,10 @@ void SimpleTypeNamespace::addAliasMap( const TypeDesc& name, const TypeDesc& ali if ( symmetric ) addAliasMap( alias, name, files, recurse, false ); - invalidateSecondaryCache(); - invalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached) + tqinvalidateSecondaryCache(); + tqinvalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached) - AliasMap::iterator it = m_aliases.find( name.name() ); + AliasMap::iterator it = m_aliases.tqfind( name.name() ); if ( it == m_aliases.end() ) it = m_aliases.insert( name.name(), ImportList() ); @@ -253,7 +253,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/* if ( m_activeSlaves.empty() || !safetyCounter.ok() ) return possibleSlaves; // if( !isRecursion ) { // ///Test the cache -// SlavesCache::const_iterator it = m_slavesCache.find( files ); +// SlavesCache::const_iterator it = m_slavesCache.tqfind( files ); // if( it != m_slavesCache.end() && it->second.first == m_slavesCache.size() ) return; ///The cache already contains a valid entry, and the work is done // } @@ -302,7 +302,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/* #ifdef PHYSICALLY_IMPORT_NAMESPACES if ( desc.resolved()->masterProxy().data() != this ) { desc.setResolved( desc.resolved()->clone() ); //expensive, cache is not shared - desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the parents of all found members correctly + desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the tqparents of all found members correctly } #endif d.first.first = desc; @@ -320,8 +320,8 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/* void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) { while ( !map.isEmpty() ) { - int mid = map.find( "=" ); - int mid2 = map.find( "<<" ); + int mid = map.tqfind( "=" ); + int mid2 = map.tqfind( "<<" ); int found = mid; int len = 1; if ( mid2 != -1 && ( mid2 < found || found == -1 ) ) { @@ -331,7 +331,7 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) if ( found == -1 ) break; - int end = map.find( ";", found + len ); + int end = map.tqfind( ";", found + len ); if ( end == -1 ) { //break; end = map.length(); @@ -344,15 +344,15 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) } } -void SimpleTypeNamespace::invalidatePrimaryCache( bool onlyNegative ) { +void SimpleTypeNamespace::tqinvalidatePrimaryCache( bool onlyNegative ) { //m_slavesCache.clear(); - SimpleTypeImpl::invalidatePrimaryCache( onlyNegative ); + SimpleTypeImpl::tqinvalidatePrimaryCache( onlyNegative ); } void SimpleTypeNamespace::addImport( const TypeDesc& import, const IncludeFiles& files, TypePointer perspective ) { //ifVerbose( dbg() << " if ( !perspective ) perspective = this; - invalidateCache(); + tqinvalidateCache(); TypeDesc d = import; if ( d.resolved() ) { #ifdef PHYSICALLY_IMPORT_NAMESPACES @@ -377,7 +377,7 @@ bool SimpleTypeNamespace::hasNode() const { SimpleTypeNamespace::SlaveList SimpleTypeNamespace::getSlaves( const IncludeFiles& files ) { /* ///Test the cache - SlavesCache::const_iterator it = m_slavesCache.find( files ); + SlavesCache::const_iterator it = m_slavesCache.tqfind( files ); if( it != m_slavesCache.end() && it->second.first == m_activeSlaves.size() ) return it->second.second; ///The cache already contains a valid entry, and the work is done*/ std::set<size_t> allSlaves = updateAliases( files ); diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h index b465cfb6..ab5131c7 100644 --- a/languages/cpp/simpletypenamespace.h +++ b/languages/cpp/simpletypenamespace.h @@ -135,7 +135,7 @@ class SimpleTypeNamespace : public SimpleTypeImpl { return true; } - virtual void invalidatePrimaryCache( bool onlyNegative = false ); + virtual void tqinvalidatePrimaryCache( bool onlyNegative = false ); virtual MemberInfo findMember( TypeDesc name, MemberInfo::MemberType type = MemberInfo::AllTypes ); diff --git a/languages/cpp/store_walker.cpp b/languages/cpp/store_walker.cpp index bcea1a05..e0c9bfd6 100644 --- a/languages/cpp/store_walker.cpp +++ b/languages/cpp/store_walker.cpp @@ -53,7 +53,7 @@ void StoreWalker::parseTranslationUnit( const ParsedFile& ast ) m_anon = 0; m_imports.clear(); - m_imports << QPair<TQMap<TQString, ClassDom>, TQStringList>(TQMap<TQString, ClassDom>(), TQStringList()); + m_imports << TQPair<TQMap<TQString, ClassDom>, TQStringList>(TQMap<TQString, ClassDom>(), TQStringList()); TreeParser::parseTranslationUnit( ast ); m_imports.pop_back(); } @@ -519,7 +519,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) klass->setEndPosition( endLine, endColumn ); klass->setFileName( m_fileName ); - int i = className.find( '<' ); + int i = className.tqfind( '<' ); if( i != -1 ) { klass->setSpecializationDeclaration( className.mid( i ) ); className = className.left( i ); @@ -900,7 +900,7 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom if ( param->declarator() ) { - TQString text = declaratorToString( param->declarator(), TQString::null, true ); + TQString text = declaratorToString( param->declarator(), TQString(), true ); if ( !text.isEmpty() ) arg->setName( text ); } @@ -917,7 +917,7 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom TQString StoreWalker::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) { if ( !typeSpec || !declarator ) - return TQString::null; + return TQString(); TQString text; @@ -982,7 +982,7 @@ ClassDom StoreWalker::findClassFromScope( const TQStringList& scope ) { TQString scopeText = scope.join("::"); if( !m_imports.isEmpty() ) { - TQMapIterator<TQString, ClassDom> it = m_imports.back().first.find( scopeText ); + TQMapIterator<TQString, ClassDom> it = m_imports.back().first.tqfind( scopeText ); if( it != m_imports.back().first.end() ) { return *it; } @@ -1052,7 +1052,7 @@ ClassDom StoreWalker::classFromScope(const TQStringList& scope) { if( c ) { ///Check the file that overrides the code-model file - it = m_overrides.find( c->fileName() ); + it = m_overrides.tqfind( c->fileName() ); //Find the class within the file that is overriding the one in code-model. if( it != m_overrides.end() ) { diff --git a/languages/cpp/store_walker.h b/languages/cpp/store_walker.h index 49c4bb8f..1e646d79 100644 --- a/languages/cpp/store_walker.h +++ b/languages/cpp/store_walker.h @@ -115,7 +115,7 @@ private: HashedString m_hashedFileName; TQStringList m_currentScope; CodeModel* m_store; - TQValueList<QPair<TQMap<TQString, ClassDom>, TQStringList> > m_imports; + TQValueList<TQPair<TQMap<TQString, ClassDom>, TQStringList> > m_imports; int m_currentAccess; bool m_inSlots; bool m_inSignals; diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp index 6ad55925..4eae290a 100644 --- a/languages/cpp/storeconverter.cpp +++ b/languages/cpp/storeconverter.cpp @@ -140,7 +140,7 @@ void StoreConverter::parseArguments(FunctionDom function, CppFunction<Tag> &cppF { ArgumentDom arg = m_model->create<ArgumentModel>(); arg->setType(*it); - arg->setName(cppFun.argumentNames()[args.findIndex(*it)]); + arg->setName(cppFun.argumentNames()[args.tqfindIndex(*it)]); function->addArgument(arg); } diff --git a/languages/cpp/stringhelpers.cpp b/languages/cpp/stringhelpers.cpp index 13a39de2..bc1a8dc7 100644 --- a/languages/cpp/stringhelpers.cpp +++ b/languages/cpp/stringhelpers.cpp @@ -36,9 +36,9 @@ TQString clearComments( TQString str ) { int lastPos = 0; int pos; int len = str.length(); - while( (pos = str.find( "/*", lastPos )) != -1 ) { + while( (pos = str.tqfind( "/*", lastPos )) != -1 ) { if( !s ) return str; - int i = str.find( "*/", pos ); + int i = str.tqfind( "*/", pos ); if( i != -1 && i <= len - 2 ) { clearStr( str, pos, i+2 ); lastPos = i+2; @@ -49,9 +49,9 @@ TQString clearComments( TQString str ) { } lastPos = 0; - while( (pos = str.find( "//", lastPos )) != -1 ) { + while( (pos = str.tqfind( "//", lastPos )) != -1 ) { if( !s ) return str; - int i = str.find( "\n", pos ); + int i = str.tqfind( "\n", pos ); if( i != -1 && i <= len - 1 ) { clearStr( str, pos, i+1 ); lastPos = i+1; @@ -66,17 +66,17 @@ TQString clearComments( TQString str ) { TQString cutTemplateParams( TQString str ) { int p; - if( (p = str.find('<') ) != -1) { + if( (p = str.tqfind('<') ) != -1) { return str.left( p ); } - return str.stripWhiteSpace().replace('*',""); + return str.stripWhiteSpace().tqreplace('*',""); } -QPair<TQString, TQString> splitTemplateParams( TQString str ) { - QPair<TQString, TQString> ret; +TQPair<TQString, TQString> splitTemplateParams( TQString str ) { + TQPair<TQString, TQString> ret; int p; - if( (p = str.find('<') ) != -1) { + if( (p = str.tqfind('<') ) != -1) { ret.first = str.left( p ).stripWhiteSpace(); ret.second = str.mid( p ).stripWhiteSpace(); } else { @@ -238,8 +238,8 @@ int countExtract( TQChar c, const TQString& str ) { TQString templateParamFromString( int num, TQString str ) { if( str.endsWith("::") ) str.truncate( str.length() - 2 ); - int begin = str.find('<'); - int end = str.findRev('>'); + int begin = str.tqfind('<'); + int end = str.tqfindRev('>'); if(begin == -1 || end == -1) return ""; diff --git a/languages/cpp/stringhelpers.h b/languages/cpp/stringhelpers.h index c8783413..a6815f2b 100644 --- a/languages/cpp/stringhelpers.h +++ b/languages/cpp/stringhelpers.h @@ -30,7 +30,7 @@ TQString clearComments( TQString str ); TQString cutTemplateParams( TQString str ); -QPair<TQString, TQString> splitTemplateParams( TQString str ); +TQPair<TQString, TQString> splitTemplateParams( TQString str ); bool parenFits( TQChar c1, TQChar c2 ); @@ -63,8 +63,8 @@ TQStringList splitType( TQString str ) ; class ParamIterator { public: 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 ] ); + int begin = m_source.tqfind( m_parens[ 0 ] ); + int end = m_source.tqfindRev( m_parens[ 1 ] ); m_prefix = m_source.left( begin ); if ( begin == -1 || end == -1 && end - begin > 1 ) diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.cpp b/languages/cpp/subclassing_template/subclass_qt4_template.cpp index c7b3e1f1..3e96646a 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.cpp +++ b/languages/cpp/subclassing_template/subclass_qt4_template.cpp @@ -2,8 +2,8 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(TQWidget* parent, Qt::WFlags fl) -: $QTBASECLASS$( parent, fl ), Ui::$BASECLASS$() +$NEWCLASS$::$NEWCLASS$(TQWidget* tqparent, TQt::WFlags fl) +: $TQTBASECLASS$( tqparent, 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 a84cf0d0..64ba390e 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.h +++ b/languages/cpp/subclassing_template/subclass_qt4_template.h @@ -2,15 +2,16 @@ #ifndef $NEWFILENAMEUC$_H #define $NEWFILENAMEUC$_H -#include <$QTBASECLASS$> +#include <$TQTBASECLASS$> #include "ui_$BASEFILENAME$.h" -class $NEWCLASS$ : public $QTBASECLASS$, private Ui::$BASECLASS$ +class $NEWCLASS$ : public $TQTBASECLASS$, private Ui::$BASECLASS$ { Q_OBJECT + TQ_OBJECT public: - $NEWCLASS$(TQWidget* parent = 0, Qt::WFlags fl = 0 ); + $NEWCLASS$(TQWidget* tqparent = 0, TQt::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 adc89082..8373a260 100644 --- a/languages/cpp/subclassing_template/subclass_template.cpp +++ b/languages/cpp/subclassing_template/subclass_template.cpp @@ -2,8 +2,8 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(TQWidget* parent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) -: $BASECLASS$(parent,name$CAN_BE_MODAL_CPP2$,fl) +$NEWCLASS$::$NEWCLASS$(TQWidget* tqparent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) +: $BASECLASS$(tqparent,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 8e238bae..7f9d2ae2 100644 --- a/languages/cpp/subclassing_template/subclass_template.h +++ b/languages/cpp/subclassing_template/subclass_template.h @@ -7,9 +7,10 @@ class $NEWCLASS$ : public $BASECLASS$ { Q_OBJECT + TQ_OBJECT public: - $NEWCLASS$(TQWidget* parent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); + $NEWCLASS$(TQWidget* tqparent = 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 562cd010..62b154da 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -54,11 +54,11 @@ #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true) -SlotItem::SlotItem(TQListView *parent,const TQString &methodName, +SlotItem::SlotItem(TQListView *tqparent,const TQString &methodName, const TQString &specifier, const TQString &access, const TQString &returnType, bool isFunc,bool callBaseClass) -: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox) +: TQCheckListItem(tqparent,methodName,TQCheckListItem::CheckBox) { setOn(true); m_methodName = methodName; @@ -94,9 +94,9 @@ void SlotItem::setAllreadyInSubclass() SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, - TQStringList &newFileNames, TQWidget* parent, + TQStringList &newFileNames, TQWidget* tqparent, const char* name,bool modal, WFlags fl) -: SubclassingDlgBase(parent,name,modal,fl), +: SubclassingDlgBase(tqparent,name,modal,fl), m_newFileNames(newFileNames), m_cppSupport( cppSupport ) { @@ -117,8 +117,8 @@ m_newFileNames(newFileNames), m_cppSupport( cppSupport ) 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), + TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: SubclassingDlgBase(tqparent, name, modal, fl), m_newFileNames(dummy), m_cppSupport( cppSupport ) { @@ -144,8 +144,8 @@ m_newFileNames(dummy), m_cppSupport( cppSupport ) for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt) { kdDebug() << "base class " << baseClass << " class " << (*classIt)->name() - << " parents " << (*classIt)->baseClassList().join(",") << endl; - if ( (*classIt)->baseClassList().findIndex(baseClass) != -1 ) + << " tqparents " << (*classIt)->baseClassList().join(",") << endl; + if ( (*classIt)->baseClassList().tqfindIndex(baseClass) != -1 ) { kdDebug() << "base class matched " << endl; m_edClassName->setText((*classIt)->name()); @@ -167,7 +167,7 @@ bool SubclassingDlg::alreadyInSubclass(const TQString &method) { for (uint i=0;i<m_parsedMethods.count();i++) { - if (method.find(m_parsedMethods[i])==0) + if (method.tqfind(m_parsedMethods[i])==0) return true; } return false; @@ -191,13 +191,13 @@ void SubclassingDlg::readUiFile() // Special widget specific slots SlotItem *newSlot; - m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog"); + m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING); - if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") ) + if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) ) m_canBeModal = false; else m_canBeModal = true; - if (m_qtBaseClassName != "TQWidget") + if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING) { newSlot = new SLOT_ACCEPT; newSlot->setOn(false); @@ -214,7 +214,7 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - if (m_qtBaseClassName == "TQWizard") + if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING) { newSlot = new SLOT_NEXT; m_slotView->insertItem(newSlot); @@ -276,14 +276,14 @@ void SubclassingDlg::updateDlg() { } -void SubclassingDlg::replace(TQString &string, const TQString& search, const TQString& replace) +void SubclassingDlg::tqreplace(TQString &string, const TQString& search, const TQString& tqreplace) { - int nextPos = string.find(search); + int nextPos = string.tqfind(search); unsigned int searchLength = search.length(); while (nextPos>-1) { - string = string.replace(nextPos,searchLength,replace); - nextPos = string.find(search,nextPos+replace.length()); + string = string.tqreplace(nextPos,searchLength,tqreplace); + nextPos = string.tqfind(search,nextPos+tqreplace.length()); } } @@ -304,24 +304,24 @@ bool SubclassingDlg::loadBuffer(TQString &buffer, const TQString& filename) bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) { - replace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper()); - replace(buffer,"$BASEFILENAMELC$",m_formName.lower()); - replace(buffer,"$BASEFILENAME$",m_formName); - replace(buffer,"$NEWCLASS$",m_edClassName->text()); - replace(buffer,"$QTBASECLASS$", m_qtBaseClassName ); - replace(buffer,"$BASECLASS$",m_baseClassName); - replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); + tqreplace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper()); + tqreplace(buffer,"$BASEFILENAMELC$",m_formName.lower()); + tqreplace(buffer,"$BASEFILENAME$",m_formName); + tqreplace(buffer,"$NEWCLASS$",m_edClassName->text()); + tqreplace(buffer,"$TQTBASECLASS$", m_qtBaseClassName ); + tqreplace(buffer,"$BASECLASS$",m_baseClassName); + tqreplace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); - replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); - replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); + tqreplace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + tqreplace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); + tqreplace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } else { - replace(buffer,"$CAN_BE_MODAL_H$",""); - replace(buffer,"$CAN_BE_MODAL_CPP1$",""); - replace(buffer,"$CAN_BE_MODAL_CPP2$",""); + tqreplace(buffer,"$CAN_BE_MODAL_H$",""); + tqreplace(buffer,"$CAN_BE_MODAL_CPP1$",""); + tqreplace(buffer,"$CAN_BE_MODAL_CPP2$",""); } return true; @@ -378,8 +378,8 @@ void SubclassingDlg::accept() TQFileInfo fi(m_filename + ".h"); TQString module = fi.baseName(); TQString basefilename = fi.baseName(true); - buffer.replace(TQRegExp("\\$MODULE\\$"),module); - buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); + buffer.tqreplace(TQRegExp("\\$MODULE\\$"),module); + buffer.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename); } else loadBuffer(buffer,m_filename+".h"); @@ -411,12 +411,12 @@ void SubclassingDlg::accept() if (!slitem->m_isFunc) { declBuild += spacer.fill(' ',43-declBuild.length()) + slitem->m_methodName + ";"; - replace(buffer,"/*$PUBLIC_SLOTS$*/",declBuild); + tqreplace(buffer,"/*$PUBLIC_SLOTS$*/",declBuild); } else { declBuild += spacer.fill(' ',47-declBuild.length()) + slitem->m_methodName + ";"; - replace(buffer,"/*$PUBLIC_FUNCTIONS$*/",declBuild); + tqreplace(buffer,"/*$PUBLIC_FUNCTIONS$*/",declBuild); } } if (slitem->m_access=="protected") @@ -424,12 +424,12 @@ void SubclassingDlg::accept() if (!slitem->m_isFunc) { declBuild += spacer.fill(' ',46-declBuild.length()) + slitem->m_methodName + ";"; - replace(buffer,"/*$PROTECTED_SLOTS$*/",declBuild); + tqreplace(buffer,"/*$PROTECTED_SLOTS$*/",declBuild); } else { declBuild += spacer.fill(' ',50-declBuild.length()) + slitem->m_methodName + ";"; - replace(buffer,"/*$PROTECTED_FUNCTIONS$*/",declBuild); + tqreplace(buffer,"/*$PROTECTED_FUNCTIONS$*/",declBuild); } } } @@ -458,7 +458,7 @@ void SubclassingDlg::accept() "/*$SPECIALIZATION$*/\n" "$RETURNTYPE$ $NEWCLASS$::$METHOD$\n" "{\n" - " $QTBASECLASS$::$METHOD$;\n" + " $TQTBASECLASS$::$METHOD$;\n" "}\n"; @@ -473,10 +473,10 @@ void SubclassingDlg::accept() TQFileInfo fi(m_filename + ".cpp"); TQString module = fi.baseName(); TQString basefilename = fi.baseName(true); - buffer.replace(TQRegExp("\\$MODULE\\$"),module); - buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); + buffer.tqreplace(TQRegExp("\\$MODULE\\$"),module); + buffer.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename); if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem)) - buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n"; + buffer += "\n#include \"$NEWFILENAMELC$.tqmoc\"\n"; } else loadBuffer(buffer,m_filename+".cpp"); @@ -489,11 +489,11 @@ void SubclassingDlg::accept() slitem->m_alreadyInSubclass) continue; 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); - replace(impl,"$QTBASECLASS$", m_qtBaseClassName); - replace(buffer,"/*$SPECIALIZATION$*/",impl); + tqreplace(impl,"$RETURNTYPE$",slitem->m_returnType); + tqreplace(impl,"$NEWCLASS$",m_edClassName->text()); + tqreplace(impl,"$METHOD$", slitem->m_methodName); + tqreplace(impl,"$TQTBASECLASS$", m_qtBaseClassName); + tqreplace(buffer,"/*$SPECIALIZATION$*/",impl); } if (reformat_box->isChecked()) diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index c49ad683..ca07059a 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -20,10 +20,10 @@ class TQStringList; class TQDomDocument; class CppSupportPart; -class SlotItem : public QCheckListItem +class SlotItem : public TQCheckListItem { public: - SlotItem( TQListView *parent, const TQString &text, + SlotItem( TQListView *tqparent, const TQString &text, const TQString &specifier, const TQString &Access, const TQString &returnType, bool isFunc, bool callBaseClass = false ); @@ -42,10 +42,10 @@ class SubclassingDlg : public SubclassingDlgBase { public: SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames, - TQWidget* parent = 0, const char* name = 0, + TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, - TQWidget* parent = 0, const char* name = 0, + TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassingDlg(); @@ -54,7 +54,7 @@ private: TQString readBaseClassName(); void updateDlg(); bool replaceKeywords( TQString &buffer, bool canBeModal = true ); - void replace( TQString &string, const TQString& search, const TQString& replace ); + void tqreplace( TQString &string, const TQString& search, const TQString& tqreplace ); bool saveBuffer( TQString &buffer, const TQString& filename ); bool loadBuffer( TQString &buffer, const TQString& filename ); bool alreadyInSubclass( const TQString &method ); diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui index c732b244..a43beb05 100644 --- a/languages/cpp/subclassingdlgbase.ui +++ b/languages/cpp/subclassingdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SubclassingDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SubclassingDlgBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -30,12 +30,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> - <string>&Specialize following slots:</string> + <string>&Specialize following Q_SLOTS:</string> </property> <property name="buddy" stdset="0"> <cstring>m_slotView</cstring> @@ -46,7 +46,7 @@ <cstring>m_edClassName</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -65,7 +65,7 @@ <cstring>m_edClassName</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -89,7 +89,7 @@ <cstring>m_edFileName</cstring> </property> </widget> - <widget class="QListView" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQListView" row="3" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Method</string> @@ -149,7 +149,7 @@ <cstring>m_slotView</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>reformat_box</cstring> </property> @@ -157,7 +157,7 @@ <string>Re&format source</string> </property> </widget> - <widget class="QCheckBox" row="4" column="2"> + <widget class="TQCheckBox" row="4" column="2"> <property name="name"> <cstring>reformatDefault_box</cstring> </property> @@ -175,7 +175,7 @@ </widget> </grid> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_btnOk</cstring> </property> @@ -186,7 +186,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>m_btnCancel</cstring> </property> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>20</height> @@ -236,9 +236,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot>onChangedClassName()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp index 15849ad1..2ac8d54b 100644 --- a/languages/cpp/tag_creator.cpp +++ b/languages/cpp/tag_creator.cpp @@ -47,10 +47,10 @@ void TagCreator::parseDeclaration( DeclarationAST* ast ) { if( ast->nodeType() == NodeType_AccessDeclaration || m_currentAccess.isEmpty() || - m_currentAccess.contains("private") || ///In order to correctly evaluate templates, the private members are necessary too - m_currentAccess.contains("public") || - m_currentAccess.contains("protected") || - m_currentAccess.contains("signals") ) + m_currentAccess.tqcontains("private") || ///In order to correctly evaluate templates, the private members are necessary too + m_currentAccess.tqcontains("public") || + m_currentAccess.tqcontains("protected") || + m_currentAccess.tqcontains("signals") ) { TreeParser::parseDeclaration( ast ); } @@ -59,7 +59,7 @@ void TagCreator::parseDeclaration( DeclarationAST* ast ) void TagCreator::parseTranslationUnit( const ParsedFile& ast ) { m_currentScope.clear(); - m_currentAccess = TQString::null; + m_currentAccess = TQString(); m_inSlots = false; m_inSignals = false; m_anon = 0; @@ -78,9 +78,9 @@ void TagCreator::parseTranslationUnit( const ParsedFile& ast ) ast.write( stream ); tag.setAttribute( "cppparsedfile", data ); tag.setAttribute( "includedFrom", ast.includedFrom() ); - 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.setAttribute( "skippedLines", TQString("%1").tqarg( ast.skippedLines()) ); + tag.setAttribute( "macroValueHash", TQString("%1").tqarg( ast.usedMacros().valueHash()) ); + tag.setAttribute( "macroIdHash", TQString("%1").tqarg( ast.usedMacros().idHash() ) ); tag.setScope( m_currentScope ); if( !ast->comment().isEmpty() ) @@ -362,7 +362,7 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) checkTemplateDeclarator( tag ); TQString arguments = tag.attribute( "a" ).toStringList().join( "," ); -tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.replace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) ); +tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.tqreplace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) ); tagBuilder.setAccess( TagUtils::stringToAccess( m_currentAccess ) ); @@ -469,7 +469,7 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast ) tag.setFileName( m_fileName ); - int i = className.find( '<' ); + int i = className.tqfind( '<' ); TQString specialization; if( i != -1 ) { @@ -748,7 +748,7 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator ) TQString name; if( param->declarator() ){ - name = declaratorToString(param->declarator(), TQString::null, true ); + name = declaratorToString(param->declarator(), TQString(), true ); } TQString type = typeOfDeclaration( param->typeSpec(), param->declarator() ); @@ -773,7 +773,7 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator ) TQString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) { if( !typeSpec || !declarator ) - return TQString::null; + return TQString(); TQString text; @@ -862,7 +862,7 @@ int TagUtils::stringToAccess( const TQString & access ) << "public slots" << "protected slots" << "private slots" << "signals"; - int idx = l.findIndex( access ); + int idx = l.tqfindIndex( access ); return idx == -1 ? 0 : idx+1; } @@ -878,7 +878,7 @@ TQString TagUtils::accessToString( int id ) if( l.at(id-1) != l.end() ) return l[ id-1 ]; - return TQString::null; + return TQString(); } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/typedecoration.h b/languages/cpp/typedecoration.h index e142d837..9e52bb5e 100644 --- a/languages/cpp/typedecoration.h +++ b/languages/cpp/typedecoration.h @@ -47,9 +47,9 @@ class TypeDecoration { } void operator += ( const TypeDecoration& rhs ) { - if ( !m_decoration_front.contains( rhs.m_decoration_front ) ) + if ( !m_decoration_front.tqcontains( rhs.m_decoration_front ) ) m_decoration_front += rhs.m_decoration_front; - if ( !m_decoration_back.contains( rhs.m_decoration_back ) ) + if ( !m_decoration_back.tqcontains( rhs.m_decoration_back ) ) m_decoration_back += rhs.m_decoration_back; } diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp index 89d32931..b238b734 100644 --- a/languages/cpp/typedesc.cpp +++ b/languages/cpp/typedesc.cpp @@ -150,7 +150,7 @@ TypeDesc::TypeDesc( const TypeDesc& rhs ) { bool TypeDesc::isValidType() const { if ( !m_data ) return false; - if ( m_data->m_cleanName.find( "->" ) != -1 || m_data->m_cleanName.contains( '.' ) || m_data->m_cleanName.contains( ' ' ) || m_data->m_cleanName.isEmpty() ) + if ( m_data->m_cleanName.tqfind( "->" ) != -1 || m_data->m_cleanName.tqcontains( '.' ) || m_data->m_cleanName.tqcontains( ' ' ) || m_data->m_cleanName.isEmpty() ) return false; for ( TemplateParams::const_iterator it = m_data->m_templateParams.begin(); it != m_data->m_templateParams.end(); ++it ) { @@ -238,7 +238,7 @@ size_t TypeDescData::hashKey() { int len = m_cleanName.length(); for ( int a = 0; a < len; a++ ) - ret += m_cleanName[ a ].unicode() * 3 * (11*(a+1)); + ret += m_cleanName[ a ].tqunicode() * 3 * (11*(a+1)); int n = 1; @@ -266,7 +266,7 @@ size_t TypeDescData::hashKey2() { int len = m_cleanName.length(); for ( int a = 0; a < len; a++ ) - ret += m_cleanName[ a ].unicode() * 19 * (7*(a+1)); + ret += m_cleanName[ a ].tqunicode() * 19 * (7*(a+1)); int n = 1; @@ -590,7 +590,7 @@ void TypeDesc::makeDataPrivate() { if ( m_data.count() > 1 ) { m_data = new TypeDescData( *m_data ); } - m_data->invalidateKey(); + m_data->tqinvalidateKey(); } TypeDesc& TypeDesc::makePrivate() { @@ -708,7 +708,7 @@ void TypeDesc::init( TQString stri ) { ///Since function-names are also processed by this function, this check has to be done if( shorten ) { ///Remove any prefixes like const or typename(very limited algorithm) - int len = str.find( "<" ); + int len = str.tqfind( "<" ); if ( len == -1 ) len = str.length(); int currentStart = 0; diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h index ddb072d2..0759b74e 100644 --- a/languages/cpp/typedesc.h +++ b/languages/cpp/typedesc.h @@ -158,7 +158,7 @@ struct TypeDescData : public KShared { TypeDescData() : m_hashValid( false ), m_hash2Valid( false ) { } - void invalidateKey() { + void tqinvalidateKey() { m_hashValid = false; m_hash2Valid = false; } |