diff options
Diffstat (limited to 'kode')
57 files changed, 128 insertions, 129 deletions
diff --git a/kode/automakefile.h b/kode/automakefile.h index 418851ad..25113bd4 100644 --- a/kode/automakefile.h +++ b/kode/automakefile.h @@ -26,14 +26,14 @@ #include <tqmap.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT AutoMakefile +class TDE_EXPORT AutoMakefile { public: - class KDE_EXPORT Target + class TDE_EXPORT Target { public: typedef TQValueList<Target> List; diff --git a/kode/class.h b/kode/class.h index f3f44114..7e8548c7 100644 --- a/kode/class.h +++ b/kode/class.h @@ -26,7 +26,7 @@ #include "membervariable.h" #include "typedef.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> @@ -34,7 +34,7 @@ namespace KODE { -class KDE_EXPORT Class +class TDE_EXPORT Class { public: typedef TQValueList<Class> List; diff --git a/kode/code.h b/kode/code.h index 97a1b8d3..d060b2f5 100644 --- a/kode/code.h +++ b/kode/code.h @@ -26,10 +26,10 @@ #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT Code +class TDE_EXPORT Code { public: Code(); diff --git a/kode/enum.h b/kode/enum.h index 56681724..f4f90f37 100644 --- a/kode/enum.h +++ b/kode/enum.h @@ -22,11 +22,11 @@ #define KODE_ENUM_H #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT Enum +class TDE_EXPORT Enum { public: typedef TQValueList<Enum> List; diff --git a/kode/file.h b/kode/file.h index f4fe555e..c0d9d39c 100644 --- a/kode/file.h +++ b/kode/file.h @@ -28,11 +28,11 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT File +class TDE_EXPORT File { public: File(); diff --git a/kode/function.h b/kode/function.h index 305838eb..f9cab7e2 100644 --- a/kode/function.h +++ b/kode/function.h @@ -26,11 +26,11 @@ #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT Function +class TDE_EXPORT Function { public: typedef TQValueList<Function> List; diff --git a/kode/kwsdl/compiler.h b/kode/kwsdl/compiler.h index f7ab693d..1d1781ab 100644 --- a/kode/kwsdl/compiler.h +++ b/kode/kwsdl/compiler.h @@ -31,7 +31,7 @@ namespace KWSDL { class Compiler : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index 2117c59c..41e7e0a9 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -37,7 +37,7 @@ static TQString escapeEnum( const TQString &str ) Converter::Converter() { - mTQObject = KODE::Class( TQOBJECT_OBJECT_NAME_STRING ); + mTQObject = KODE::Class( "TQObject" ); } void Converter::setWSDL( const WSDL &wsdl ) @@ -249,7 +249,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) escapedEnums.append( escapeEnum( enums[ i ] ) ); // marshal value - KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING ); + KODE::Function marshalValue( "marshalValue", "TQString" ); marshalValue.setStatic( true ); marshalValue.addArgument( "const " + typeName + "* value" ); code += "switch ( value->type() ) {"; @@ -315,7 +315,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) demarshalCode.unindent(); demarshalCode += "}"; - KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING ); + KODE::Function marshalValue( "marshalValue", "TQString" ); marshalValue.setStatic( true ); marshalValue.addArgument( "const " + typeName + "* value" ); marshalValue.setBody( "return Serializer::marshalValue( value->value() );" ); @@ -689,9 +689,9 @@ void Converter::convertService( const Service &service ) KODE::MemberVariable transport( inputMessage.name() + "Transport", "Transport" ); ctorCode += transport.name() + " = new Transport( \"" + (*it).mLocation + "\" );"; - ctorCode += "connect( " + transport.name() + ", TQT_SIGNAL( result( const TQString& ) ),"; + ctorCode += "connect( " + transport.name() + ", TQ_SIGNAL( result( const TQString& ) ),"; ctorCode.indent(); - ctorCode += "this, TQT_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );"; + ctorCode += "this, TQ_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );"; ctorCode.unindent(); dtorCode += "delete " + transport.name() + ";"; @@ -839,7 +839,7 @@ void Converter::createUtilClasses() of typing and is easier to maintain at the end ;) */ TypeEntry types[] = { - { TQSTRING_OBJECT_NAME_STRING, "xsd:string", "*value", "str" }, + { "TQString", "xsd:string", "*value", "str" }, { "bool", "xsd:boolean", "(*value ? \"true\" : \"false\")", "(str.lower() == \"true\" ? true : false)" }, { "float", "xsd:TODO", "TQString::number( *value )", "str.toFloat()" }, { "int", "xsd:int", "TQString::number( *value )", "str.toInt()" }, @@ -848,7 +848,7 @@ void Converter::createUtilClasses() { "char", "xsd:byte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" }, { "unsigned char", "xsd:unsignedByte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" }, { "short", "xsd:short", "TQString::number( *value )", "str.toShort()" }, - { TQBYTEARRAY_OBJECT_NAME_STRING, "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" }, + { "TQByteArray", "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" }, { "TQDateTime", "xsd:dateTime", "value->toString( TQt::ISODate )", "TQDateTime::fromString( str, TQt::ISODate )" }, { "TQDate", "xsd:date", "value->toString( TQt::ISODate )", "TQDate::fromString( str, TQt::ISODate )" } }; @@ -859,7 +859,7 @@ void Converter::createUtilClasses() TypeEntry entry = types[ i ]; - marshal = KODE::Function( "marshalValue", TQSTRING_OBJECT_NAME_STRING ); + marshal = KODE::Function( "marshalValue", "TQString" ); marshal.setStatic( true ); marshal.addArgument( "const " + entry.type + "* value" ); @@ -911,10 +911,10 @@ void Converter::createTransportClass() transport.addInclude( "kdebug.h" ); - KODE::MemberVariable url( "url", TQSTRING_OBJECT_NAME_STRING ); + KODE::MemberVariable url( "url", "TQString" ); transport.addMemberVariable( url ); - KODE::MemberVariable slotDataVar( "data", TQBYTEARRAY_OBJECT_NAME_STRING ); + KODE::MemberVariable slotDataVar( "data", "TQByteArray" ); transport.addMemberVariable( slotDataVar ); // ctor @@ -946,8 +946,8 @@ void Converter::createTransportClass() queryCode += "job->addMetaData( \"UserAgent\", \"KWSDL\" );"; queryCode += "job->addMetaData( \"content-type\", \"Content-Type: text/xml; charset=utf-8\" );"; queryCode.newLine(); - queryCode += "connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );"; - queryCode += "connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );"; + queryCode += "connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );"; + queryCode += "connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );"; query.setBody( queryCode ); diff --git a/kode/kwsdl/creator.cpp b/kode/kwsdl/creator.cpp index e31808ad..4564c365 100644 --- a/kode/kwsdl/creator.cpp +++ b/kode/kwsdl/creator.cpp @@ -58,7 +58,7 @@ void Creator::create( const KODE::Class::List &list ) } KODE::AutoMakefile::Target libTarget( "bin_PROGRAMS", "kwsdl" ); - libTarget.setSources( "main.cc " + cppFiles.join( " " ) ); + libTarget.setSources( "main.cpp " + cppFiles.join( " " ) ); libTarget.setLdFlags( "$(all_libraries) $(KDE_RPATH)" ); libTarget.setLdAdd( "-ltdecore -ltdeio" ); diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index b0fb78b0..9a31b31a 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -107,8 +107,8 @@ BinaryWidget::BinaryWidget( TQWidget *parent ) mLayout->addWidget( mLoadButton, 0, 1 ); mLayout->addWidget( mSaveButton, 1, 1 ); - connect( mLoadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) ); - connect( mSaveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( save() ) ); + connect( mLoadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) ); + connect( mSaveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( save() ) ); } void BinaryWidget::setData( const TQByteArray &data ) diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h index 3695654c..f5c2c67b 100644 --- a/kode/kwsdl/kung/binaryinputfield.h +++ b/kode/kwsdl/kung/binaryinputfield.h @@ -32,7 +32,7 @@ class TQPushButton; class BinaryInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: @@ -58,7 +58,7 @@ class BinaryInputField : public SimpleInputField class BinaryWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp index 88311266..12def657 100644 --- a/kode/kwsdl/kung/boolinputfield.cpp +++ b/kode/kwsdl/kung/boolinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *BoolInputField::createWidget( TQWidget *parent ) mInputWidget->setChecked( mValue ); - connect( mInputWidget, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( inputChanged( bool ) ) ); + connect( mInputWidget, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( inputChanged( bool ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h index e99a3d50..0f40c60e 100644 --- a/kode/kwsdl/kung/boolinputfield.h +++ b/kode/kwsdl/kung/boolinputfield.h @@ -30,7 +30,7 @@ class TQCheckBox; class BoolInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index cb24670f..b7d6f8f0 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *DateInputField::createWidget( TQWidget *parent ) mInputWidget->setDate( mValue ); - connect( mInputWidget, TQT_SIGNAL( dateChanged( TQDate ) ), - this, TQT_SLOT( inputChanged( TQDate ) ) ); + connect( mInputWidget, TQ_SIGNAL( dateChanged( TQDate ) ), + this, TQ_SLOT( inputChanged( TQDate ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/dateinputfield.h b/kode/kwsdl/kung/dateinputfield.h index 6a5d29ae..54cd3deb 100644 --- a/kode/kwsdl/kung/dateinputfield.h +++ b/kode/kwsdl/kung/dateinputfield.h @@ -31,7 +31,7 @@ class KDatePicker; class DateInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp index 5c65d0c4..7b2ad477 100644 --- a/kode/kwsdl/kung/dispatcher.cpp +++ b/kode/kwsdl/kung/dispatcher.cpp @@ -57,10 +57,10 @@ void Dispatcher::setWSDL( const KWSDL::WSDL &wsdl ) mConversationManager = new GeneralConversationManager( mWSDL ); mTransport = new Transport( mWSDL.service().ports().first().mLocation ); - connect( mTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( result( const TQString& ) ) ); - connect( mTransport, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( error( const TQString& ) ) ); + connect( mTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( result( const TQString& ) ) ); + connect( mTransport, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( error( const TQString& ) ) ); } void Dispatcher::run() @@ -140,14 +140,14 @@ void Dispatcher::result( const TQString &xml ) mLastMessage = mCurrentMessage; - TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) ); } void Dispatcher::error( const TQString &errorMsg ) { KMessageBox::error( 0, errorMsg ); - TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) ); } #include "dispatcher.moc" diff --git a/kode/kwsdl/kung/dispatcher.h b/kode/kwsdl/kung/dispatcher.h index c5e0744d..cba421cf 100644 --- a/kode/kwsdl/kung/dispatcher.h +++ b/kode/kwsdl/kung/dispatcher.h @@ -31,7 +31,7 @@ class Transport; class Dispatcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp index 39f22774..1df00f03 100644 --- a/kode/kwsdl/kung/doubleinputfield.cpp +++ b/kode/kwsdl/kung/doubleinputfield.cpp @@ -78,8 +78,8 @@ TQWidget *DoubleInputField::createWidget( TQWidget *parent ) mInputWidget->setValue( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( inputChanged( double ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( inputChanged( double ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/doubleinputfield.h b/kode/kwsdl/kung/doubleinputfield.h index 1368a6cd..df3eaa83 100644 --- a/kode/kwsdl/kung/doubleinputfield.h +++ b/kode/kwsdl/kung/doubleinputfield.h @@ -30,7 +30,7 @@ class KDoubleSpinBox; class DoubleInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp index 30c11670..f49ab4be 100644 --- a/kode/kwsdl/kung/enuminputfield.cpp +++ b/kode/kwsdl/kung/enuminputfield.cpp @@ -70,8 +70,8 @@ TQWidget *EnumInputField::createWidget( TQWidget *parent ) mInputWidget->insertStringList( mEnums ); mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) ); - connect( mInputWidget, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( inputChanged( int ) ) ); + connect( mInputWidget, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( inputChanged( int ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/enuminputfield.h b/kode/kwsdl/kung/enuminputfield.h index 13615b1e..bb5b6990 100644 --- a/kode/kwsdl/kung/enuminputfield.h +++ b/kode/kwsdl/kung/enuminputfield.h @@ -30,7 +30,7 @@ class KComboBox; class EnumInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h index 4a68e161..69692c48 100644 --- a/kode/kwsdl/kung/inputfield.h +++ b/kode/kwsdl/kung/inputfield.h @@ -39,7 +39,7 @@ class ComplexType; */ class InputField : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp index 76d48cd5..38c08222 100644 --- a/kode/kwsdl/kung/integerinputfield.cpp +++ b/kode/kwsdl/kung/integerinputfield.cpp @@ -116,8 +116,8 @@ TQWidget *IntegerInputField::createWidget( TQWidget *parent ) mInputWidget->setValue( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( inputChanged( int ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( inputChanged( int ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/integerinputfield.h b/kode/kwsdl/kung/integerinputfield.h index 91294308..dbb8cc27 100644 --- a/kode/kwsdl/kung/integerinputfield.h +++ b/kode/kwsdl/kung/integerinputfield.h @@ -30,7 +30,7 @@ class KIntSpinBox; class IntegerInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 539e3de2..147c83fd 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -105,9 +105,9 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); layout->addWidget( mRemoveButton, 2, 1 ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); update(); } diff --git a/kode/kwsdl/kung/listinputfield.h b/kode/kwsdl/kung/listinputfield.h index c7105bbb..ed49e815 100644 --- a/kode/kwsdl/kung/listinputfield.h +++ b/kode/kwsdl/kung/listinputfield.h @@ -32,7 +32,7 @@ class TQPushButton; class ListInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: @@ -53,7 +53,7 @@ class ListInputField : public SimpleInputField class ListWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/loader.h b/kode/kwsdl/kung/loader.h index 2839780c..d3ff45d5 100644 --- a/kode/kwsdl/kung/loader.h +++ b/kode/kwsdl/kung/loader.h @@ -28,7 +28,7 @@ class Dispatcher; class Loader : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp index 2dadbe9d..3036eeae 100644 --- a/kode/kwsdl/kung/main.cpp +++ b/kode/kwsdl/kung/main.cpp @@ -58,7 +58,7 @@ int main( int argc, char **argv ) Loader loader; loader.setWSDLUrl( args->url( 0 ).path() ); - TQTimer::singleShot( 0, &loader, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, &loader, TQ_SLOT( run() ) ); return app.exec(); } diff --git a/kode/kwsdl/kung/pageinputfield.h b/kode/kwsdl/kung/pageinputfield.h index f70ba98e..f0f9411b 100644 --- a/kode/kwsdl/kung/pageinputfield.h +++ b/kode/kwsdl/kung/pageinputfield.h @@ -30,7 +30,7 @@ class PageInputField : public InputField { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp index 9ea45029..ee90eeec 100644 --- a/kode/kwsdl/kung/stringinputfield.cpp +++ b/kode/kwsdl/kung/stringinputfield.cpp @@ -84,8 +84,8 @@ TQWidget *StringInputField::createWidget( TQWidget *parent ) mInputWidget->setText( mValue ); - connect( mInputWidget, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( inputChanged( const TQString& ) ) ); + connect( mInputWidget, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( inputChanged( const TQString& ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/stringinputfield.h b/kode/kwsdl/kung/stringinputfield.h index b6c8f172..d237aae5 100644 --- a/kode/kwsdl/kung/stringinputfield.h +++ b/kode/kwsdl/kung/stringinputfield.h @@ -30,7 +30,7 @@ class TQLineEdit; class StringInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp index 38e1a264..024e2671 100644 --- a/kode/kwsdl/kung/timeinputfield.cpp +++ b/kode/kwsdl/kung/timeinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *TimeInputField::createWidget( TQWidget *parent ) mInputWidget->setTime( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SLOT( inputChanged( const TQTime& ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( const TQTime& ) ), + this, TQ_SLOT( inputChanged( const TQTime& ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/timeinputfield.h b/kode/kwsdl/kung/timeinputfield.h index 2b351652..f586d190 100644 --- a/kode/kwsdl/kung/timeinputfield.h +++ b/kode/kwsdl/kung/timeinputfield.h @@ -31,7 +31,7 @@ class KTimeWidget; class TimeInputField : public SimpleInputField { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp index e9dabf3c..4961ad2f 100644 --- a/kode/kwsdl/kung/transport.cpp +++ b/kode/kwsdl/kung/transport.cpp @@ -45,8 +45,8 @@ void Transport::query( const TQString &xml ) job->addMetaData( "UserAgent", "KDE Kung" ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); } void Transport::slotData( TDEIO::Job*, const TQByteArray &data ) diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h index 46355525..384d14a9 100644 --- a/kode/kwsdl/kung/transport.h +++ b/kode/kwsdl/kung/transport.h @@ -25,7 +25,7 @@ class Transport : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp index 5ba4f533..900f6ee4 100644 --- a/kode/kwsdl/main.cpp +++ b/kode/kwsdl/main.cpp @@ -71,7 +71,7 @@ int main( int argc, char **argv ) if ( args->isSet( "namespace" ) ) compiler.setNameSpace( args->getOption( "namespace" ) ); - TQTimer::singleShot( 0, &compiler, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, &compiler, TQ_SLOT( run() ) ); return app.exec(); } diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index ed5606fd..8d435274 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/kode/kwsdl/schema/fileprovider.cpp @@ -53,10 +53,10 @@ bool FileProvider::get( const TQString &url, TQString &target ) tqDebug( "Downloading external schema '%s'", url.latin1() ); TDEIO::TransferJob* job = TDEIO::get( KURL( url ), false, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); mBlocked = true; while ( mBlocked ) { diff --git a/kode/kwsdl/schema/fileprovider.h b/kode/kwsdl/schema/fileprovider.h index c855416d..817c55ad 100644 --- a/kode/kwsdl/schema/fileprovider.h +++ b/kode/kwsdl/schema/fileprovider.h @@ -32,7 +32,7 @@ namespace Schema { class FileProvider : TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am index 9dd839c5..66da11c3 100644 --- a/kode/kwsdl/tests/google/Makefile.am +++ b/kode/kwsdl/tests/google/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO bin_PROGRAMS = googletest -googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp +googletest_SOURCES = main.cpp googlesearch.cpp transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp googletest_LDADD = -ltdecore -ltdeio googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/kode/kwsdl/tests/google/README b/kode/kwsdl/tests/google/README index cfe83159..46ef2ff0 100644 --- a/kode/kwsdl/tests/google/README +++ b/kode/kwsdl/tests/google/README @@ -1,7 +1,7 @@ This application shows how easy it is to use a web service with code, generated by kwsdl_compiler. -Only the files main.cc, googlesearch.cc and googlesearch.hh are +Only the files main.cpp, googlesearch.cpp and googlesearch.h are written manually, all other files were created by kwsdl_compiler -d kwsdl/tests/google/ GoogleSearch.wsdl diff --git a/kode/kwsdl/tests/google/googlesearch.cc b/kode/kwsdl/tests/google/googlesearch.cpp index 690b9a11..aa282a06 100644 --- a/kode/kwsdl/tests/google/googlesearch.cc +++ b/kode/kwsdl/tests/google/googlesearch.cpp @@ -22,19 +22,19 @@ without including the source code for TQt in the source distribution. */ -#include "googlesearch.hh" +#include "googlesearch.h" #include "resultelement.h" #include "resultelementarray.h" GoogleSearch::GoogleSearch() : TQObject( 0, "" ) { - connect( &mService, TQT_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ), - this, TQT_SLOT( cachedPageResult( TQByteArray* ) ) ); - connect( &mService, TQT_SIGNAL( doSpellingSuggestionResponse( TQString* ) ), - this, TQT_SLOT( spellingSuggestionResult( TQString* ) ) ); - connect( &mService, TQT_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ), - this, TQT_SLOT( googleSearchResult( GoogleSearchResult* ) ) ); + connect( &mService, TQ_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ), + this, TQ_SLOT( cachedPageResult( TQByteArray* ) ) ); + connect( &mService, TQ_SIGNAL( doSpellingSuggestionResponse( TQString* ) ), + this, TQ_SLOT( spellingSuggestionResult( TQString* ) ) ); + connect( &mService, TQ_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ), + this, TQ_SLOT( googleSearchResult( GoogleSearchResult* ) ) ); mKey = ""; } diff --git a/kode/kwsdl/tests/google/googlesearch.hh b/kode/kwsdl/tests/google/googlesearch.h index b6400616..9551fc5d 100644 --- a/kode/kwsdl/tests/google/googlesearch.hh +++ b/kode/kwsdl/tests/google/googlesearch.h @@ -30,7 +30,6 @@ class GoogleSearch : public TQObject { - Q_OBJECT TQ_OBJECT public: diff --git a/kode/kwsdl/tests/google/googlesearchservice.cpp b/kode/kwsdl/tests/google/googlesearchservice.cpp index d2e7c97e..095fe115 100644 --- a/kode/kwsdl/tests/google/googlesearchservice.cpp +++ b/kode/kwsdl/tests/google/googlesearchservice.cpp @@ -183,14 +183,14 @@ void GoogleSearchService::doGoogleSearchResponseSlot( const TQString &xml ) GoogleSearchService::GoogleSearchService() { mDoGetCachedPageTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoGetCachedPageTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) ); + connect( mDoGetCachedPageTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) ); mDoSpellingSuggestionTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoSpellingSuggestionTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) ); + connect( mDoSpellingSuggestionTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) ); mDoGoogleSearchTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoGoogleSearchTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) ); + connect( mDoGoogleSearchTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) ); } GoogleSearchService::~GoogleSearchService() diff --git a/kode/kwsdl/tests/google/googlesearchservice.h b/kode/kwsdl/tests/google/googlesearchservice.h index e61cd446..0d2d8e79 100644 --- a/kode/kwsdl/tests/google/googlesearchservice.h +++ b/kode/kwsdl/tests/google/googlesearchservice.h @@ -32,7 +32,7 @@ class GoogleSearchService : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cpp index 38c64594..130a9cc6 100644 --- a/kode/kwsdl/tests/google/main.cc +++ b/kode/kwsdl/tests/google/main.cpp @@ -3,7 +3,7 @@ #include <tdecmdlineargs.h> #include <kmdcodec.h> -#include "googlesearch.hh" +#include "googlesearch.h" int main( int argc, char **argv ) { diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp index 30b9645e..c7a390e8 100644 --- a/kode/kwsdl/tests/google/transport.cpp +++ b/kode/kwsdl/tests/google/transport.cpp @@ -48,8 +48,8 @@ void Transport::query( const TQString &xml ) job->addMetaData( "UserAgent", "KWSDL" ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); } void Transport::slotData( TDEIO::Job*, const TQByteArray &data ) diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h index a0873e26..cfb8a6c1 100644 --- a/kode/kwsdl/tests/google/transport.h +++ b/kode/kwsdl/tests/google/transport.h @@ -29,7 +29,7 @@ class Transport : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kode/kwsdl/typemapper.cpp b/kode/kwsdl/typemapper.cpp index 3ec0a20a..88842ece 100644 --- a/kode/kwsdl/typemapper.cpp +++ b/kode/kwsdl/typemapper.cpp @@ -33,21 +33,21 @@ using namespace KWSDL; TypeMapper::TypeMapper() { - mMap.insert( "any", TypeInfo( "any", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) ); - mMap.insert( "anyURI", TypeInfo( "anyUri", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) ); - mMap.insert( "base64Binary", TypeInfo( "base64Binary", TQBYTEARRAY_OBJECT_NAME_STRING, "tqcstring.h" ) ); - mMap.insert( "binary", TypeInfo( "binary", TQBYTEARRAY_OBJECT_NAME_STRING, "tqcstring.h" ) ); + mMap.insert( "any", TypeInfo( "any", "TQString", "tqstring.h" ) ); + mMap.insert( "anyURI", TypeInfo( "anyUri", "TQString", "tqstring.h" ) ); + mMap.insert( "base64Binary", TypeInfo( "base64Binary", "TQByteArray", "tqcstring.h" ) ); + mMap.insert( "binary", TypeInfo( "binary", "TQByteArray", "tqcstring.h" ) ); mMap.insert( "boolean", TypeInfo( "boolean", "bool", "" ) ); mMap.insert( "byte", TypeInfo( "byte", "char", "" ) ); mMap.insert( "date", TypeInfo( "date", "TQDate", "tqdatetime.h" ) ); mMap.insert( "dateTime", TypeInfo( "dateTime", "TQDateTime", "tqdatetime.h" ) ); mMap.insert( "decimal", TypeInfo( "decimal", "float", "" ) ); mMap.insert( "double", TypeInfo( "double", "double", "" ) ); - mMap.insert( "duration", TypeInfo( "duration", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) ); // TODO: add duration class + mMap.insert( "duration", TypeInfo( "duration", "TQString", "tqstring.h" ) ); // TODO: add duration class mMap.insert( "int", TypeInfo( "int", "int", "" ) ); - mMap.insert( "language", TypeInfo( "language", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) ); + mMap.insert( "language", TypeInfo( "language", "TQString", "tqstring.h" ) ); mMap.insert( "short", TypeInfo( "short", "short", "" ) ); - mMap.insert( "string", TypeInfo( "string", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) ); + mMap.insert( "string", TypeInfo( "string", "TQString", "tqstring.h" ) ); mMap.insert( "unsignedByte", TypeInfo( "unsignedByte", "unsigned char", "" ) ); mMap.insert( "unsignedInt", TypeInfo( "unsignedInt", "unsigned int", "" ) ); } @@ -170,7 +170,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Element *element TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) { if ( !it.data().header.isEmpty() ) { - if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING ) + if ( it.data().type == "TQByteArray" ) headers.insert( it.data().header, TQString() ); else headers.insert( it.data().header, it.data().type ); @@ -213,7 +213,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Attribute *attrib TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) { if ( !it.data().header.isEmpty() ) { - if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING ) + if ( it.data().type == "TQByteArray" ) headers.insert( it.data().header, TQString() ); else headers.insert( it.data().header, it.data().type ); @@ -252,7 +252,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const TQString &typeName ) cons TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) { if ( !it.data().header.isEmpty() ) { - if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING ) + if ( it.data().type == "TQByteArray" ) headers.insert( it.data().header, TQString() ); else headers.insert( it.data().header, it.data().type ); diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp index bc330eaf..26eb2e22 100644 --- a/kode/kxml_compiler/creator.cpp +++ b/kode/kxml_compiler/creator.cpp @@ -95,7 +95,7 @@ void Creator::createProperty( KODE::Class &c, const TQString &type, void Creator::createElementFunctions( KODE::Class &c, Element *e ) { if ( e->hasText ) { - createProperty( c, TQSTRING_OBJECT_NAME_STRING, e->name ); + createProperty( c, "TQString", e->name ); if ( mXmlParserType == XmlParserCustomExternal ) { createTextElementParserCustom( c, e ); } @@ -150,7 +150,7 @@ void Creator::createClass( Element *element ) itA != element->attributes.end(); ++itA ) { Attribute *a = *itA; - createProperty( c, TQSTRING_OBJECT_NAME_STRING, a->name ); + createProperty( c, "TQString", a->name ); } TQValueList<Element *>::ConstIterator itE; @@ -176,7 +176,7 @@ void Creator::createClass( Element *element ) void Creator::createElementWriter( KODE::Class &c, Element *element ) { - KODE::Function writer( "writeElement", TQSTRING_OBJECT_NAME_STRING ); + KODE::Function writer( "writeElement", "TQString" ); KODE::Code code; @@ -268,7 +268,7 @@ void Creator::createElementParser( KODE::Class &c, Element *e ) void Creator::createTextElementParserCustom( KODE::Class &, Element *e ) { - KODE::Function parser( "parseElement" + upperFirst( e->name ), TQSTRING_OBJECT_NAME_STRING ); + KODE::Function parser( "parseElement" + upperFirst( e->name ), "TQString" ); KODE::Code code; @@ -637,7 +637,7 @@ void Creator::createListTypedefs() void Creator::createIndenter( KODE::File &file ) { - KODE::Function indenter( "indent", TQSTRING_OBJECT_NAME_STRING ); + KODE::Function indenter( "indent", "TQString" ); indenter.addArgument( "int n = 0" ); KODE::Code code; @@ -724,7 +724,7 @@ void Creator::createFileParserCustom( Element *element ) mParserClass.addInclude( "kdebug.h" ); mParserClass.addMemberVariable( KODE::MemberVariable( "mBuffer", - TQSTRING_OBJECT_NAME_STRING ) ); + "TQString" ) ); mParserClass.addMemberVariable( KODE::MemberVariable( "mRunning", "unsigned int" ) ); diff --git a/kode/license.h b/kode/license.h index 6474babc..d5aa685d 100644 --- a/kode/license.h +++ b/kode/license.h @@ -22,11 +22,11 @@ #define KODE_LICENSE_H #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT License +class TDE_EXPORT License { public: enum Type { GPL, LGPL }; diff --git a/kode/membervariable.h b/kode/membervariable.h index fe5e889d..6adc9ddb 100644 --- a/kode/membervariable.h +++ b/kode/membervariable.h @@ -25,11 +25,11 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT MemberVariable : public Variable +class TDE_EXPORT MemberVariable : public Variable { public: typedef TQValueList<MemberVariable> List; diff --git a/kode/printer.cpp b/kode/printer.cpp index 7808f290..7052382f 100644 --- a/kode/printer.cpp +++ b/kode/printer.cpp @@ -200,7 +200,7 @@ TQString Printer::classHeader( const Class &c ) code.indent(); if ( c.isTQObject() ) { - code += "Q_OBJECT"; + code += "TQ_OBJECT"; code.newLine(); code += ""; code.newLine(); diff --git a/kode/printer.h b/kode/printer.h index 1d3f103e..0f92608e 100644 --- a/kode/printer.h +++ b/kode/printer.h @@ -26,14 +26,14 @@ #include "style.h" #include "automakefile.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> namespace KODE { -class KDE_EXPORT Printer +class TDE_EXPORT Printer { public: Printer(); diff --git a/kode/statemachine.h b/kode/statemachine.h index 5c977293..c4e5f6a5 100644 --- a/kode/statemachine.h +++ b/kode/statemachine.h @@ -25,11 +25,11 @@ #include <tqstring.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT StateMachine +class TDE_EXPORT StateMachine { public: StateMachine(); diff --git a/kode/style.h b/kode/style.h index 26921f71..989cf0d1 100644 --- a/kode/style.h +++ b/kode/style.h @@ -27,11 +27,11 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT Style +class TDE_EXPORT Style { public: Style(); diff --git a/kode/typedef.h b/kode/typedef.h index 9cc69635..7da8eb46 100644 --- a/kode/typedef.h +++ b/kode/typedef.h @@ -22,11 +22,11 @@ #define KODE_TYPEDEF_H #include <tqvaluelist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT Typedef +class TDE_EXPORT Typedef { public: typedef TQValueList<Typedef> List; diff --git a/kode/variable.h b/kode/variable.h index 1eda384f..87b87eeb 100644 --- a/kode/variable.h +++ b/kode/variable.h @@ -24,11 +24,11 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { -class KDE_EXPORT Variable +class TDE_EXPORT Variable { public: typedef TQValueList<Variable> List; |