From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- kode/code.cpp | 2 +- kode/enum.cpp | 4 ++-- kode/file.cpp | 2 +- kode/kodemain.cpp | 4 ++-- kode/kwsdl/kung/binaryinputfield.cpp | 6 +++--- kode/kwsdl/kung/complexbaseinputfield.cpp | 8 ++++---- kode/kwsdl/kung/dateinputfield.cpp | 2 +- kode/kwsdl/kung/inputfield.cpp | 2 +- kode/kwsdl/kung/listinputfield.cpp | 12 ++++++------ kode/kwsdl/kung/pageinputfield.cpp | 12 ++++++------ kode/kxml_compiler/creator.cpp | 4 ++-- kode/kxml_compiler/creator.h | 2 +- kode/kxml_compiler/kxml_compiler.cpp | 2 +- kode/kxml_compiler/parser.cpp | 2 +- kode/kxml_compiler/parser.h | 2 +- kode/printer.cpp | 2 +- kode/style.cpp | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) (limited to 'kode') diff --git a/kode/code.cpp b/kode/code.cpp index 3c4c3816..ce4e9708 100644 --- a/kode/code.cpp +++ b/kode/code.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include using namespace KODE; diff --git a/kode/enum.cpp b/kode/enum.cpp index 64bf8f79..8a41f58b 100644 --- a/kode/enum.cpp +++ b/kode/enum.cpp @@ -41,9 +41,9 @@ TQString Enum::declaration() const for ( it = mEnums.begin(); it != mEnums.end(); ++it, ++value ) { if ( mCombinable ) { if ( it == mEnums.begin() ) - retval += TQString( " %1 = %2" ).arg( *it ).arg( 1 << value ); + retval += TQString( " %1 = %2" ).tqarg( *it ).tqarg( 1 << value ); else - retval += TQString( ", %1 = %2" ).arg( *it ).arg( 1 << value ); + retval += TQString( ", %1 = %2" ).tqarg( *it ).tqarg( 1 << value ); } else { if ( it == mEnums.begin() ) retval += " " + *it; diff --git a/kode/file.cpp b/kode/file.cpp index 451ee801..b6e7619f 100644 --- a/kode/file.cpp +++ b/kode/file.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include using namespace KODE; diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 30c46949..6e9b6222 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include @@ -384,7 +384,7 @@ int create( KCmdLineArgs *args ) authorName = a.realName(); } if ( !authorEmail.isEmpty() ) { - file.addCopyright( TQDate::currentDate().year(), authorName, authorEmail ); + file.addCopyright( TQDate::tqcurrentDate().year(), authorName, authorEmail ); } KODE::License l; diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index 9d971893..8d897c4c 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include @@ -131,7 +131,7 @@ void BinaryWidget::setData( const TQByteArray &data ) part->openURL( KURL( file.name() ) ); mMainWidget = part->widget(); } else { - mMainWidget = new TQLabel( i18n( "No part found for visualization of mimetype %1" ).arg( mimetype ), this ); + mMainWidget = new TQLabel( i18n( "No part found for visualization of mimetype %1" ).tqarg( mimetype ), this ); } mData = data; @@ -154,7 +154,7 @@ void BinaryWidget::load() if ( KIO::NetAccess::download( url, tempFile, this ) ) { TQFile file( tempFile ); if ( !file.open( IO_ReadOnly ) ) { - KMessageBox::error( this, i18n( "Unable to open file %1" ).arg( url.url() ) ); + KMessageBox::error( this, i18n( "Unable to open file %1" ).tqarg( url.url() ) ); return; } diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp index 676ee3ba..bfcd375e 100644 --- a/kode/kwsdl/kung/complexbaseinputfield.cpp +++ b/kode/kwsdl/kung/complexbaseinputfield.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include @@ -141,14 +141,14 @@ TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent ) { TQGroupBox *inputWidget = new TQGroupBox( mName, parent ); inputWidget->setColumnLayout( 0, TQt::Horizontal ); - TQGridLayout *layout = new TQGridLayout( inputWidget->layout(), 2, 2, 6 ); + TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), inputWidget ); - layout->addWidget( label, row, 0 ); - layout->addWidget( (*it)->createWidget( inputWidget ), row, 1 ); + tqlayout->addWidget( label, row, 0 ); + tqlayout->addWidget( (*it)->createWidget( inputWidget ), row, 1 ); } return inputWidget; diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index 56132a4e..d49c1947 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -25,7 +25,7 @@ DateInputField::DateInputField( const TQString &name, const Schema::SimpleType *type ) : SimpleInputField( name, type ), - mValue( TQDate::currentDate() ) + mValue( TQDate::tqcurrentDate() ) { } diff --git a/kode/kwsdl/kung/inputfield.cpp b/kode/kwsdl/kung/inputfield.cpp index 7bdd4cde..a8a1c66f 100644 --- a/kode/kwsdl/kung/inputfield.cpp +++ b/kode/kwsdl/kung/inputfield.cpp @@ -25,7 +25,7 @@ #include "inputfield.h" InputField::InputField( const TQString &name ) - : TQObject( 0, TQString( "InputField( %1 )" ).arg( name ).latin1() ), + : TQObject( 0, TQString( "InputField( %1 )" ).tqarg( name ).latin1() ), mName( name ) { } diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 0b95daf3..7a5eeb71 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include @@ -91,19 +91,19 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS : TQWidget( parent ), mParentField( parentField ), mName( name ), mType( type ) { - TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); + TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); mView = new TQListBox( this ); - layout->addMultiCellWidget( mView, 0, 3, 0, 0 ); + tqlayout->addMultiCellWidget( mView, 0, 3, 0, 0 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - layout->addWidget( mAddButton, 0, 1 ); + tqlayout->addWidget( mAddButton, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit..." ), this ); - layout->addWidget( mEditButton, 1, 1 ); + tqlayout->addWidget( mEditButton, 1, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - layout->addWidget( mRemoveButton, 2, 1 ); + tqlayout->addWidget( mRemoveButton, 2, 1 ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp index 261f58ab..6ca3409d 100644 --- a/kode/kwsdl/kung/pageinputfield.cpp +++ b/kode/kwsdl/kung/pageinputfield.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include "inputfieldfactory.h" @@ -88,18 +88,18 @@ TQString PageInputField::data() const TQWidget *PageInputField::createWidget( TQWidget *parent ) { TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" ); - TQGridLayout *layout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); + TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), mInputWidget ); - label->setAlignment( TQt::AlignTop ); - layout->addWidget( label, row, 0 ); - layout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); + label->tqsetAlignment( TQt::AlignTop ); + tqlayout->addWidget( label, row, 0 ); + tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); } - layout->setRowStretch( ++row, 1 ); + tqlayout->setRowStretch( ++row, 1 ); return mInputWidget; } diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp index 2460f314..3d4983f9 100644 --- a/kode/kxml_compiler/creator.cpp +++ b/kode/kxml_compiler/creator.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -659,7 +659,7 @@ void Creator::createFileWriter( Element *element, const TQString &dtd ) KODE::Class c = mFile.findClass( className ); c.addInclude( "kdebug.h" ); - c.addInclude( "textstream.h" ); + c.addInclude( "tqtextstream.h" ); c.addInclude( "tqfile.h" ); if ( !externalWriter() ) { diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h index b81c8fc1..2103f928 100644 --- a/kode/kxml_compiler/creator.h +++ b/kode/kxml_compiler/creator.h @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index a9add1ab..71720d6b 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/kode/kxml_compiler/kxml_compiler.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp index 3777c478..9a123581 100644 --- a/kode/kxml_compiler/parser.cpp +++ b/kode/kxml_compiler/parser.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h index 786b1123..6efd6f74 100644 --- a/kode/kxml_compiler/parser.h +++ b/kode/kxml_compiler/parser.h @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/kode/printer.cpp b/kode/printer.cpp index 786d447f..f36b1c38 100644 --- a/kode/printer.cpp +++ b/kode/printer.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include using namespace KODE; diff --git a/kode/style.cpp b/kode/style.cpp index 3f6b5ecb..e92c3691 100644 --- a/kode/style.cpp +++ b/kode/style.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include using namespace KODE; -- cgit v1.2.3