diff options
Diffstat (limited to 'kitchensync/src')
74 files changed, 283 insertions, 257 deletions
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index 3d5b1f047..9d0503edb 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -48,8 +48,8 @@ static TQString readFile( const TQString &fileName ) return content; } -AboutPage::AboutPage( TQWidget *parent ) - : TQWidget( parent, "AboutPage" ) +AboutPage::AboutPage( TQWidget *tqparent ) + : TQWidget( tqparent, "AboutPage" ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); @@ -133,7 +133,7 @@ TQString AboutPage::htmlText() const .arg( wizard_icon_path ) .arg( "exec:/addGroup" ) .arg( i18n( "Add Synchronization Group" ) ) - .arg( i18n( "Create group of devices for synchronization" ) ); + .arg( i18n( "Create group of tqdevices for synchronization" ) ); return info; } diff --git a/kitchensync/src/aboutpage.h b/kitchensync/src/aboutpage.h index 75f9d489e..9da3a72b9 100644 --- a/kitchensync/src/aboutpage.h +++ b/kitchensync/src/aboutpage.h @@ -25,12 +25,13 @@ #include <tqwidget.h> -class AboutPage : public QWidget +class AboutPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - AboutPage( TQWidget *parent ); + AboutPage( TQWidget *tqparent ); signals: void addGroup(); diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp index fc73c3677..cba16ec84 100644 --- a/kitchensync/src/addresseediffalgo.cpp +++ b/kitchensync/src/addresseediffalgo.cpp @@ -146,12 +146,12 @@ void AddresseeDiffAlgo::diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right ) { for ( uint i = 0; i < left.count(); ++i ) { - if ( right.find( left[ i ] ) == right.end() ) + if ( right.tqfind( left[ i ] ) == right.end() ) additionalLeftField( id, toString( left[ i ] ) ); } for ( uint i = 0; i < right.count(); ++i ) { - if ( left.find( right[ i ] ) == left.end() ) + if ( left.tqfind( right[ i ] ) == left.end() ) additionalRightField( id, toString( right[ i ] ) ); } } diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp index 9d18649a8..fe376428e 100644 --- a/kitchensync/src/calendardiffalgo.cpp +++ b/kitchensync/src/calendardiffalgo.cpp @@ -44,17 +44,17 @@ static TQString toString( KCal::Attendee *attendee ) static TQString toString( KCal::Alarm * ) { - return TQString::null; + return TQString(); } static TQString toString( KCal::Incidence * ) { - return TQString::null; + return TQString(); } static TQString toString( KCal::Attachment * ) { - return TQString::null; + return TQString(); } static TQString toString( const TQDate &date ) @@ -140,7 +140,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri conflictField( i18n( "Summary" ), left->summary(), right->summary() ); if ( left->status() != right->status() ) - conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() ); + conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() ); if ( left->secrecy() != right->secrecy() ) conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) ); @@ -206,12 +206,12 @@ void CalendarDiffAlgo::diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right ) { for ( uint i = 0; i < left.count(); ++i ) { - if ( right.find( left[ i ] ) == right.end() ) + if ( right.tqfind( left[ i ] ) == right.end() ) additionalLeftField( id, toString( left[ i ] ) ); } for ( uint i = 0; i < right.count(); ++i ) { - if ( left.find( right[ i ] ) == left.end() ) + if ( left.tqfind( right[ i ] ) == left.end() ) additionalRightField( id, toString( right[ i ] ) ); } } diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp index 6e2aa5d70..2fb7ef18d 100644 --- a/kitchensync/src/configgui.cpp +++ b/kitchensync/src/configgui.cpp @@ -49,8 +49,8 @@ #include <tqlabel.h> #include <tqtextedit.h> -ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent ) - : TQWidget( parent ), mMember( member ) +ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *tqparent ) + : TQWidget( tqparent ), mMember( member ) { mTopLayout = new TQVBoxLayout( this ); mTopLayout->setSpacing( KDialog::spacingHint() ); @@ -76,49 +76,49 @@ TQString ConfigGui::instanceName() const } ConfigGui *ConfigGui::Factory::create( const QSync::Member &member, - TQWidget *parent ) + TQWidget *tqparent ) { TQString name = member.pluginName(); if ( name == "file-sync" ) { - return new ConfigGuiFile( member, parent ); + return new ConfigGuiFile( member, tqparent ); } else if ( name == "palm-sync" ) { - return new ConfigGuiPalm( member, parent ); + return new ConfigGuiPalm( member, tqparent ); } else if ( name == "irmc-sync" ) { - return new ConfigGuiIRMC( member, parent ); + return new ConfigGuiIRMC( member, tqparent ); } else if ( name == "syncml-obex-client" ) { - return new ConfigGuiSyncmlObex( member, parent ); + return new ConfigGuiSyncmlObex( member, tqparent ); } else if ( name == "syncml-http-server" ) { - return new ConfigGuiSyncmlHttp( member, parent ); + return new ConfigGuiSyncmlHttp( member, tqparent ); } else if ( name == "opie-sync" ) { - return new ConfigGuiOpie( member, parent ); + return new ConfigGuiOpie( member, tqparent ); } else if ( name == "gnokii-sync" ) { - return new ConfigGuiGnokii( member, parent ); + return new ConfigGuiGnokii( member, tqparent ); } else if ( name == "gpe-sync" ) { - return new ConfigGuiGpe( member, parent ); + return new ConfigGuiGpe( member, tqparent ); } else if ( name == "google-calendar" ) { - return new ConfigGuiGoogleCalendar( member, parent ); + return new ConfigGuiGoogleCalendar( member, tqparent ); } else if ( name == "ldap-sync" ) { - return new ConfigGuiLdap( member, parent ); + return new ConfigGuiLdap( member, tqparent ); } else if ( name == "kdepim-sync" ) { - return new ConfigGuiBlank( member, parent ); + return new ConfigGuiBlank( member, tqparent ); } else if ( name == "jescs-sync" ) { - return new ConfigGuiJescs( member, parent ); + return new ConfigGuiJescs( member, tqparent ); } else if ( name == "evo2-sync" ) { - return new ConfigGuiEvo2( member, parent ); + return new ConfigGuiEvo2( member, tqparent ); } else if ( name == "moto-sync" ) { - return new ConfigGuiMoto( member, parent ); + return new ConfigGuiMoto( member, tqparent ); } else if ( name == "synce-plugin" ) { - return new ConfigGuiSynce( member, parent ); + return new ConfigGuiSynce( member, tqparent ); } else if ( name == "sunbird-sync" ) { - return new ConfigGuiSunbird( member, parent ); + return new ConfigGuiSunbird( member, tqparent ); } else { - return new ConfigGuiXml( member, parent ); + return new ConfigGuiXml( member, tqparent ); } } -ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { mTextEdit = new TQTextEdit( this ); topLayout()->addWidget( mTextEdit ); diff --git a/kitchensync/src/configgui.h b/kitchensync/src/configgui.h index 4309db1b2..9f784dc2b 100644 --- a/kitchensync/src/configgui.h +++ b/kitchensync/src/configgui.h @@ -29,15 +29,15 @@ class TQBoxLayout; class KLineEdit; class TQTextEdit; -class ConfigGui : public QWidget +class ConfigGui : public TQWidget { public: - ConfigGui( const QSync::Member &, TQWidget *parent ); + ConfigGui( const QSync::Member &, TQWidget *tqparent ); class Factory { public: - static ConfigGui *create( const QSync::Member &, TQWidget *parent ); + static ConfigGui *create( const QSync::Member &, TQWidget *tqparent ); }; void setInstanceName( const TQString & ); @@ -60,7 +60,7 @@ class ConfigGui : public QWidget class ConfigGuiXml : public ConfigGui { public: - ConfigGuiXml( const QSync::Member &, TQWidget *parent ); + ConfigGuiXml( const QSync::Member &, TQWidget *tqparent ); void load( const TQString & ); TQString save() const; diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp index 3e9d47b65..e5e60f201 100644 --- a/kitchensync/src/configguiblank.cpp +++ b/kitchensync/src/configguiblank.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tqlayout.h> -ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { TQLabel *label = new TQLabel( i18n( "This member/plugin needs no configuration." ), this ); topLayout()->addWidget( label ); diff --git a/kitchensync/src/configguiblank.h b/kitchensync/src/configguiblank.h index e2048ac79..738c5adb8 100644 --- a/kitchensync/src/configguiblank.h +++ b/kitchensync/src/configguiblank.h @@ -26,7 +26,7 @@ class ConfigGuiBlank : public ConfigGui { public: - ConfigGuiBlank( const QSync::Member &member, TQWidget *parent = 0 ); + ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent = 0 ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index 716bce78a..872e673fd 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/kitchensync/src/configguievo2.cpp @@ -32,8 +32,8 @@ #include <kdialog.h> #include <klocale.h> -ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { initGUI(); } diff --git a/kitchensync/src/configguievo2.h b/kitchensync/src/configguievo2.h index 7e3a17679..5e030aa97 100644 --- a/kitchensync/src/configguievo2.h +++ b/kitchensync/src/configguievo2.h @@ -29,7 +29,7 @@ class KURLRequester; class ConfigGuiEvo2 : public ConfigGui { public: - ConfigGuiEvo2( const QSync::Member &, TQWidget *parent ); + ConfigGuiEvo2( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp index 6a8b0402c..fdf4c8ce8 100644 --- a/kitchensync/src/configguifile.cpp +++ b/kitchensync/src/configguifile.cpp @@ -30,8 +30,8 @@ #include <tqlabel.h> #include <tqdom.h> -ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { TQBoxLayout *filenameLayout = new TQHBoxLayout( topLayout() ); diff --git a/kitchensync/src/configguifile.h b/kitchensync/src/configguifile.h index db9385223..7859fbeee 100644 --- a/kitchensync/src/configguifile.h +++ b/kitchensync/src/configguifile.h @@ -29,7 +29,7 @@ class TQCheckBox; class ConfigGuiFile : public ConfigGui { public: - ConfigGuiFile( const QSync::Member &, TQWidget *parent ); + ConfigGuiFile( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp index 8e8006764..d832157e7 100644 --- a/kitchensync/src/configguigcalendar.cpp +++ b/kitchensync/src/configguigcalendar.cpp @@ -29,8 +29,8 @@ #include <tqdom.h> #include <tqlineedit.h> -ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { TQBoxLayout *userLayout = new TQHBoxLayout( topLayout() ); diff --git a/kitchensync/src/configguigcalendar.h b/kitchensync/src/configguigcalendar.h index 198cf77ca..458e948d8 100644 --- a/kitchensync/src/configguigcalendar.h +++ b/kitchensync/src/configguigcalendar.h @@ -29,7 +29,7 @@ class TQLineEdit; class ConfigGuiGoogleCalendar : public ConfigGui { public: - ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *parent ); + ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp index 84db02752..dfc7413e7 100644 --- a/kitchensync/src/configguignokii.cpp +++ b/kitchensync/src/configguignokii.cpp @@ -34,8 +34,8 @@ #include <tqdom.h> #include <tqvbox.h> -ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { TQGridLayout *tqlayout = new TQGridLayout( topLayout() ); diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h index fcb5eaad1..673dce0a0 100644 --- a/kitchensync/src/configguignokii.h +++ b/kitchensync/src/configguignokii.h @@ -34,9 +34,10 @@ class TQComboBox; class ConfigGuiGnokii : public ConfigGui { Q_OBJECT + TQ_OBJECT public: - ConfigGuiGnokii( const QSync::Member &, TQWidget *parent ); + ConfigGuiGnokii( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; @@ -49,7 +50,7 @@ class ConfigGuiGnokii : public ConfigGui BluetoothWidget *mBluetooth; - typedef QPair<TQString, TQString> ConnectionType; + typedef TQPair<TQString, TQString> ConnectionType; typedef TQValueList<ConnectionType> ConnectionTypeList; ConnectionTypeList mConnectionTypes; diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp index 94108d300..34502d4d6 100644 --- a/kitchensync/src/configguigpe.cpp +++ b/kitchensync/src/configguigpe.cpp @@ -32,8 +32,8 @@ #include <klineedit.h> #include <klocale.h> -ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { initGUI(); @@ -93,7 +93,7 @@ void ConfigGuiGpe::initGUI() mIP->setInputMask( "000.000.000.000" ); tqlayout->addWidget( mIP, 1, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight ); + tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight ); mPort = new TQSpinBox( 1, 65536, 1, this ); tqlayout->addWidget( mPort, 1, 3 ); diff --git a/kitchensync/src/configguigpe.h b/kitchensync/src/configguigpe.h index e1fc10c6e..0d4888f60 100644 --- a/kitchensync/src/configguigpe.h +++ b/kitchensync/src/configguigpe.h @@ -32,7 +32,7 @@ class KLineEdit; class ConfigGuiGpe : public ConfigGui { public: - ConfigGuiGpe( const QSync::Member &, TQWidget *parent ); + ConfigGuiGpe( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp index 721c82d70..8bff86fea 100644 --- a/kitchensync/src/configguiirmc.cpp +++ b/kitchensync/src/configguiirmc.cpp @@ -42,8 +42,8 @@ #include "configguiirmc.h" -ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { initGUI(); diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h index 5e8250d17..5fe5b454a 100644 --- a/kitchensync/src/configguiirmc.h +++ b/kitchensync/src/configguiirmc.h @@ -37,9 +37,10 @@ class TQSpinBox; class ConfigGuiIRMC : public ConfigGui { Q_OBJECT + TQ_OBJECT public: - ConfigGuiIRMC( const QSync::Member &, TQWidget *parent ); + ConfigGuiIRMC( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp index 158eb2253..552b49a39 100644 --- a/kitchensync/src/configguijescs.cpp +++ b/kitchensync/src/configguijescs.cpp @@ -30,8 +30,8 @@ #include <kdialog.h> #include <klocale.h> -ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { initGUI(); } diff --git a/kitchensync/src/configguijescs.h b/kitchensync/src/configguijescs.h index 1667900c9..6884bbbd7 100644 --- a/kitchensync/src/configguijescs.h +++ b/kitchensync/src/configguijescs.h @@ -30,7 +30,7 @@ class TQCheckBox; class ConfigGuiJescs : public ConfigGui { public: - ConfigGuiJescs( const QSync::Member &, TQWidget *parent ); + ConfigGuiJescs( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index 417e58d0b..485b65994 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -32,8 +32,8 @@ #include <klineedit.h> #include <klocale.h> -ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { initGUI(); diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h index a73eae5b3..1db94357f 100644 --- a/kitchensync/src/configguildap.h +++ b/kitchensync/src/configguildap.h @@ -36,9 +36,10 @@ class KLineEdit; class ConfigGuiLdap : public ConfigGui { Q_OBJECT + TQ_OBJECT public: - ConfigGuiLdap( const QSync::Member &, TQWidget *parent ); + ConfigGuiLdap( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp index c44a2b406..3314dbef8 100644 --- a/kitchensync/src/configguimoto.cpp +++ b/kitchensync/src/configguimoto.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> #include <klocale.h> -ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { initGUI(); } @@ -43,7 +43,7 @@ void ConfigGuiMoto::load( const TQString &xml ) TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement element = node.toElement(); - if ( element.tagName() == "device" ) { + if ( element.tagName() == "tqdevice" ) { mDeviceString->setText( element.text() ); } } @@ -53,7 +53,7 @@ TQString ConfigGuiMoto::save() const { TQString config = "<config>\n"; - config += TQString( "<device>%1</device>\n" ).arg( mDeviceString->text() ); + config += TQString( "<tqdevice>%1</tqdevice>\n" ).arg( mDeviceString->text() ); config += "</config>"; diff --git a/kitchensync/src/configguimoto.h b/kitchensync/src/configguimoto.h index cd588facf..1c5cd0f0e 100644 --- a/kitchensync/src/configguimoto.h +++ b/kitchensync/src/configguimoto.h @@ -29,7 +29,7 @@ class KLineEdit; class ConfigGuiMoto : public ConfigGui { public: - ConfigGuiMoto( const QSync::Member &, TQWidget *parent ); + ConfigGuiMoto( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp index ed8aa15f4..c2b3be2ec 100644 --- a/kitchensync/src/configguiopie.cpp +++ b/kitchensync/src/configguiopie.cpp @@ -30,8 +30,8 @@ #include <tqlineedit.h> #include <tqspinbox.h> -ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { TQGridLayout *tqlayout = new TQGridLayout( topLayout() ); @@ -81,7 +81,7 @@ ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent ) tqlayout->addWidget( mPort, 5, 1 ); mDeviceType->insertItem( i18n("Opie/OpenZaurus") ); - mDeviceType->insertItem( i18n("Qtopia2") ); + mDeviceType->insertItem( i18n("TQtopia2") ); mConnectionType->insertItem( i18n("SCP") ); mConnectionType->insertItem( i18n("FTP") ); @@ -105,7 +105,7 @@ void ConfigGuiOpie::load( const TQString &xml ) mDeviceIP->setText( e.text() ); } else if ( e.tagName() == "port" ) { mPort->setValue( e.text().toInt() ); - } else if ( e.tagName() == "device" ) { + } else if ( e.tagName() == "tqdevice" ) { if ( e.text() == "opie" ) mDeviceType->setCurrentItem( 0 ); else @@ -126,7 +126,7 @@ TQString ConfigGuiOpie::save() const xml += "<username>" + mUserName->text() + "</username>"; xml += "<password>" + mPassword->text() + "</password>"; xml += "<url>" + mDeviceIP->text() + "</url>"; - xml += "<device>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</device>"; + xml += "<tqdevice>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</tqdevice>"; xml += "<port>" + TQString::number( mPort->value() ) + "</port>"; xml += "<conntype>" + TQString( mConnectionType->currentItem() == 0 ? "scp" : "ftp" ) + "</conntype>"; xml += "</config>"; diff --git a/kitchensync/src/configguiopie.h b/kitchensync/src/configguiopie.h index e90f4acfe..b798de93c 100644 --- a/kitchensync/src/configguiopie.h +++ b/kitchensync/src/configguiopie.h @@ -30,7 +30,7 @@ class TQSpinBox; class ConfigGuiOpie : public ConfigGui { public: - ConfigGuiOpie( const QSync::Member &, TQWidget *parent ); + ConfigGuiOpie( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp index 03d87cdb4..b07223d58 100644 --- a/kitchensync/src/configguipalm.cpp +++ b/kitchensync/src/configguipalm.cpp @@ -35,8 +35,8 @@ #include "configguipalm.h" -ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { initGUI(); @@ -167,7 +167,7 @@ void ConfigGuiPalm::initGUI() gridLayout = new TQGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() ); gridLayout->setMargin( KDialog::marginHint() ); - TQButtonGroup *buttonGroup = new TQButtonGroup( 1, Qt::Horizontal, connectionWidget ); + TQButtonGroup *buttonGroup = new TQButtonGroup( 1, TQt::Horizontal, connectionWidget ); buttonGroup->setExclusive( true ); buttonGroup->setFrameStyle( TQFrame::NoFrame ); mSyncAlways = new TQRadioButton( i18n( "Sync Anyway" ), buttonGroup ); diff --git a/kitchensync/src/configguipalm.h b/kitchensync/src/configguipalm.h index 354e5a29f..86c797a07 100644 --- a/kitchensync/src/configguipalm.h +++ b/kitchensync/src/configguipalm.h @@ -33,7 +33,7 @@ class TQSpinBox; class ConfigGuiPalm : public ConfigGui { public: - ConfigGuiPalm( const QSync::Member &, TQWidget *parent ); + ConfigGuiPalm( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index b0da28cad..daa251b10 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/kitchensync/src/configguisunbird.cpp @@ -40,8 +40,8 @@ #include <klocale.h> #include <kfile.h> -ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { TQTabWidget *tabWidget = new TQTabWidget( this ); topLayout()->addWidget( tabWidget ); @@ -209,14 +209,14 @@ void ConfigGuiSunbird::delWebdavCalendar( WebdavCalendar *calendar ) calendar->deleteLater(); } -LocalCalendar::LocalCalendar( TQWidget *parent ) - : TQWidget( parent ) +LocalCalendar::LocalCalendar( TQWidget *tqparent ) + : TQWidget( tqparent ) { initGui(); } -LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *parent ) - : TQWidget( parent ) +LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *tqparent ) + : TQWidget( tqparent ) { initGui(); @@ -275,15 +275,15 @@ void LocalCalendar::deleteWidget() emit deleteRequest( this ); } -WebdavCalendar::WebdavCalendar( TQWidget *parent ) - : TQWidget( parent ) +WebdavCalendar::WebdavCalendar( TQWidget *tqparent ) + : TQWidget( tqparent ) { initGui(); }; WebdavCalendar::WebdavCalendar( const TQString &username, const TQString &password, const TQString &url, - const TQString &defaultcal, const TQString &days, TQWidget *parent ) - : TQWidget( parent ) + const TQString &defaultcal, const TQString &days, TQWidget *tqparent ) + : TQWidget( tqparent ) { initGui(); diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h index d8401bd83..25ac78a9f 100644 --- a/kitchensync/src/configguisunbird.h +++ b/kitchensync/src/configguisunbird.h @@ -36,15 +36,16 @@ class KURLRequester; class KPushButton; class KLineEdit; -class LocalCalendar : public QWidget +class LocalCalendar : public TQWidget { Q_OBJECT + TQ_OBJECT public: - LocalCalendar( TQWidget *parent = 0 ); + LocalCalendar( TQWidget *tqparent = 0 ); LocalCalendar( const TQString &path, const TQString &defaultcal, - const TQString &days, TQWidget *parent = 0 ); + const TQString &days, TQWidget *tqparent = 0 ); KURLRequester *mPathRequester; TQCheckBox *mDaysCheckBox; @@ -62,17 +63,18 @@ class LocalCalendar : public QWidget void initGui(); }; -class WebdavCalendar : public QWidget +class WebdavCalendar : public TQWidget { Q_OBJECT + TQ_OBJECT public: - WebdavCalendar( TQWidget *parent = 0 ); + WebdavCalendar( TQWidget *tqparent = 0 ); WebdavCalendar( const TQString &username, const TQString &password, const TQString &url, const TQString &defaultcal, - const TQString &days, TQWidget *parent = 0 ); + const TQString &days, TQWidget *tqparent = 0 ); KLineEdit *mUrl; TQCheckBox *mDaysCheckBox; @@ -95,9 +97,10 @@ class WebdavCalendar : public QWidget class ConfigGuiSunbird : public ConfigGui { Q_OBJECT + TQ_OBJECT public: - ConfigGuiSunbird( const QSync::Member &, TQWidget *parent ); + ConfigGuiSunbird( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp index b83e85683..64c171a83 100644 --- a/kitchensync/src/configguisynce.cpp +++ b/kitchensync/src/configguisynce.cpp @@ -30,8 +30,8 @@ #include <kdialog.h> #include <klocale.h> -ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { initGUI(); } diff --git a/kitchensync/src/configguisynce.h b/kitchensync/src/configguisynce.h index 680b1b128..fb318f9d0 100644 --- a/kitchensync/src/configguisynce.h +++ b/kitchensync/src/configguisynce.h @@ -31,7 +31,7 @@ class KLineEdit; class ConfigGuiSynce : public ConfigGui { public: - ConfigGuiSynce( const QSync::Member &, TQWidget *parent ); + ConfigGuiSynce( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp index 08c596bc1..e81e92d46 100644 --- a/kitchensync/src/configguisyncmlhttp.cpp +++ b/kitchensync/src/configguisyncmlhttp.cpp @@ -35,8 +35,8 @@ #include <tqtabwidget.h> #include <tqvbox.h> -ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ), mUrl( 0 ), mPort( 0 ) +ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ), mUrl( 0 ), mPort( 0 ) { TQTabWidget *tabWidget = new TQTabWidget( this ); @@ -137,12 +137,12 @@ ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget topLayout()->addStretch( 1 ); } -void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ) +void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row ) { - TQLabel *label = new TQLabel( text, parent); + TQLabel *label = new TQLabel( text, tqparent); mGridLayout->addWidget( label, row, 0 ); - *edit = new KComboBox( true, parent ); + *edit = new KComboBox( true, tqparent ); mGridLayout->addWidget( *edit, row, 1 ); } diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h index 784a7fe08..de71586d5 100644 --- a/kitchensync/src/configguisyncmlhttp.h +++ b/kitchensync/src/configguisyncmlhttp.h @@ -36,9 +36,10 @@ class ConfigGuiSyncmlHttp : public ConfigGui { Q_OBJECT + TQ_OBJECT public: - ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent ); + ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *tqparent ); void load( const TQString &xml ); TQString save() const; @@ -61,7 +62,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui KComboBox *mNoteDb; protected slots: - void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ); + void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row ); }; #endif diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp index fe7354ed4..1447f5698 100644 --- a/kitchensync/src/configguisyncmlobex.cpp +++ b/kitchensync/src/configguisyncmlobex.cpp @@ -37,8 +37,8 @@ #include <tqtabwidget.h> #include <tqvbox.h> -ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *parent ) - : ConfigGui( member, parent ) +ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *tqparent ) + : ConfigGui( member, tqparent ) { TQTabWidget *tabWidget = new TQTabWidget( this ); topLayout()->addWidget( tabWidget ); @@ -308,12 +308,12 @@ TQString ConfigGuiSyncmlObex::save() const return xml; } -void ConfigGuiSyncmlObex::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ) +void ConfigGuiSyncmlObex::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row ) { - TQLabel *label = new TQLabel( text, parent ); + TQLabel *label = new TQLabel( text, tqparent ); mGridLayout->addWidget( label, row, 0 ); - *edit = new KComboBox( true, parent ); + *edit = new KComboBox( true, tqparent ); mGridLayout->addWidget( *edit, row, 1 ); } diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h index c45f842b8..a4e427474 100644 --- a/kitchensync/src/configguisyncmlobex.h +++ b/kitchensync/src/configguisyncmlobex.h @@ -38,9 +38,10 @@ class KURLRequester; class ConfigGuiSyncmlObex : public ConfigGui { Q_OBJECT + TQ_OBJECT public: - ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 ); + ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *tqparent = 0 ); void load( const TQString &xml ); TQString save() const; @@ -50,7 +51,7 @@ class ConfigGuiSyncmlObex : public ConfigGui private: // Connection - typedef QPair<int, TQString> ConnectionType; + typedef TQPair<int, TQString> ConnectionType; typedef TQValueList<ConnectionType> ConnectionTypeList; ConnectionTypeList mConnectionTypes; @@ -59,7 +60,7 @@ class ConfigGuiSyncmlObex : public ConfigGui UsbWidget *mUsb; // Options - typedef QPair<int, TQString> SyncmlVersion; + typedef TQPair<int, TQString> SyncmlVersion; typedef TQValueList<SyncmlVersion> SyncmlVersionList; SyncmlVersionList mSyncmlVersions; @@ -81,7 +82,7 @@ class ConfigGuiSyncmlObex : public ConfigGui KComboBox *mNoteDb; protected slots: - void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ); + void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row ); }; #endif diff --git a/kitchensync/src/conflictdialog.cpp b/kitchensync/src/conflictdialog.cpp index 39943ffe4..c3e236ccc 100644 --- a/kitchensync/src/conflictdialog.cpp +++ b/kitchensync/src/conflictdialog.cpp @@ -20,7 +20,7 @@ #include "conflictdialog.h" -ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) - : TQDialog( parent ), mMapping( mapping ) +ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ) + : TQDialog( tqparent ), mMapping( mapping ) { } diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h index 1a17e06ca..81c91138b 100644 --- a/kitchensync/src/conflictdialog.h +++ b/kitchensync/src/conflictdialog.h @@ -28,10 +28,10 @@ /** Base class for SingleConflictDialog and MultiConflictDialog. */ -class ConflictDialog : public QDialog +class ConflictDialog : public TQDialog { public: - ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); + ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ); protected: QSync::SyncMapping mMapping; diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp index bb25c271d..f6157b6fa 100644 --- a/kitchensync/src/connectionwidgets.cpp +++ b/kitchensync/src/connectionwidgets.cpp @@ -40,8 +40,8 @@ #include "connectionwidgets.h" -BluetoothWidget::BluetoothWidget( TQWidget *parent ) - : TQWidget( parent ) +BluetoothWidget::BluetoothWidget( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQGridLayout *tqlayout = new TQGridLayout( this ); @@ -100,8 +100,8 @@ TQString BluetoothWidget::channel() const } // FIXME - Only IrMC specific -IRWidget::IRWidget( TQWidget *parent ) - : TQWidget( parent ) +IRWidget::IRWidget( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 ); @@ -122,10 +122,10 @@ IRWidget::IRWidget( TQWidget *parent ) tqlayout->setRowStretch( 2, 1 ); } -void IRWidget::load( const TQDomElement &parent ) +void IRWidget::load( const TQDomElement &tqparent ) { TQDomNode node; - for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { + for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement element = node.toElement(); if ( element.tagName() == "irname" ) mDevice->setText( element.text() ); @@ -134,20 +134,20 @@ void IRWidget::load( const TQDomElement &parent ) } } -void IRWidget::save( TQDomDocument &doc, TQDomElement &parent ) +void IRWidget::save( TQDomDocument &doc, TQDomElement &tqparent ) { TQDomElement element = doc.createElement( "irname" ); element.appendChild( doc.createTextNode( mDevice->text() ) ); - parent.appendChild( element ); + tqparent.appendChild( element ); element = doc.createElement( "irserial" ); element.appendChild( doc.createTextNode( mSerialNumber->text() ) ); - parent.appendChild( element ); + tqparent.appendChild( element ); } // FIXME - Only IrMC specific -CableWidget::CableWidget( TQWidget *parent ) - : TQWidget( parent ) +CableWidget::CableWidget( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 ); @@ -176,10 +176,10 @@ CableWidget::CableWidget( TQWidget *parent ) mDevice->insertItem( "/dev/ttyUSB1" ); } -void CableWidget::load( const TQDomElement &parent ) +void CableWidget::load( const TQDomElement &tqparent ) { TQDomNode node; - for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { + for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement element = node.toElement(); if ( element.tagName() == "cabletype" ) mManufacturer->setCurrentItem( element.text().toInt() ); @@ -188,19 +188,19 @@ void CableWidget::load( const TQDomElement &parent ) } } -void CableWidget::save( TQDomDocument &doc, TQDomElement &parent ) +void CableWidget::save( TQDomDocument &doc, TQDomElement &tqparent ) { TQDomElement element = doc.createElement( "cabletype" ); element.appendChild( doc.createTextNode( TQString::number( mManufacturer->currentItem() ) ) ); - parent.appendChild( element ); + tqparent.appendChild( element ); element = doc.createElement( "cabledev" ); element.appendChild( doc.createTextNode( mDevice->currentText() ) ); - parent.appendChild( element ); + tqparent.appendChild( element ); } -UsbWidget::UsbWidget( TQWidget *parent ) - : TQWidget( parent ) +UsbWidget::UsbWidget( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3); diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h index d3326acbb..5ffc9bc5e 100644 --- a/kitchensync/src/connectionwidgets.h +++ b/kitchensync/src/connectionwidgets.h @@ -35,12 +35,13 @@ class TQSpinBox; class KComboBox; class KLineEdit; -class BluetoothWidget : public QWidget +class BluetoothWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - BluetoothWidget( TQWidget *parent ); + BluetoothWidget( TQWidget *tqparent ); void hideChannel(); void showChannel(); @@ -56,12 +57,13 @@ class BluetoothWidget : public QWidget TQLabel *mChannelLabel; }; -class IRWidget : public QWidget +class IRWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IRWidget( TQWidget *parent ); + IRWidget( TQWidget *tqparent ); void load( const TQDomElement& ); void save( TQDomDocument&, TQDomElement& ); @@ -71,10 +73,10 @@ class IRWidget : public QWidget KLineEdit *mSerialNumber; }; -class CableWidget : public QWidget +class CableWidget : public TQWidget { public: - CableWidget( TQWidget *parent ); + CableWidget( TQWidget *tqparent ); void load( const TQDomElement& ); void save( TQDomDocument&, TQDomElement& ); @@ -84,10 +86,10 @@ class CableWidget : public QWidget KComboBox *mDevice; }; -class UsbWidget : public QWidget +class UsbWidget : public TQWidget { public: - UsbWidget( TQWidget *parent ); + UsbWidget( TQWidget *tqparent ); int interface() const; void setInterface( int interface ); diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index 2d1ccbc56..eac5759c0 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -41,8 +41,8 @@ #include <tqlayout.h> #include <tqpushbutton.h> -GroupConfig::GroupConfig( TQWidget *parent ) - : TQWidget( parent ) +GroupConfig::GroupConfig( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h index 8dc300b6b..be19641dc 100644 --- a/kitchensync/src/groupconfig.h +++ b/kitchensync/src/groupconfig.h @@ -31,12 +31,13 @@ class GroupConfigCommon; class MemberConfig; class SyncProcess; -class GroupConfig : public QWidget +class GroupConfig : public TQWidget { Q_OBJECT + TQ_OBJECT public: - GroupConfig( TQWidget *parent ); + GroupConfig( TQWidget *tqparent ); void setSyncProcess( SyncProcess *process ); diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp index d5c89bc8f..f2afe3c46 100644 --- a/kitchensync/src/groupconfigcommon.cpp +++ b/kitchensync/src/groupconfigcommon.cpp @@ -38,8 +38,8 @@ #include "groupconfigcommon.h" -ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent ) - : TQWidget( parent ) +ObjectTypeSelector::ObjectTypeSelector( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQGridLayout *tqlayout = new TQGridLayout( this ); tqlayout->setMargin( 0 ); @@ -125,8 +125,8 @@ void ObjectTypeSelector::save( QSync::Group group ) config.setActiveObjectTypes( objectTypes ); } -GroupConfigCommon::GroupConfigCommon( TQWidget *parent ) - : TQWidget( parent ) +GroupConfigCommon::GroupConfigCommon( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); @@ -135,7 +135,7 @@ GroupConfigCommon::GroupConfigCommon( TQWidget *parent ) mGroupName = new KLineEdit( this ); tqlayout->addWidget( mGroupName, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop ); + tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop ); mObjectTypeSelector = new ObjectTypeSelector( this ); tqlayout->addWidget( mObjectTypeSelector, 1, 1 ); diff --git a/kitchensync/src/groupconfigcommon.h b/kitchensync/src/groupconfigcommon.h index 25a0ceb0c..b406d4519 100644 --- a/kitchensync/src/groupconfigcommon.h +++ b/kitchensync/src/groupconfigcommon.h @@ -33,7 +33,7 @@ class TQCheckBox; class ObjectTypeSelector : public TQWidget { public: - ObjectTypeSelector( TQWidget *parent ); + ObjectTypeSelector( TQWidget *tqparent ); void load( const QSync::Group &group ); void save( QSync::Group group ); @@ -42,10 +42,10 @@ class ObjectTypeSelector : public TQWidget TQMap<TQString,TQCheckBox *> mObjectTypeChecks; }; -class GroupConfigCommon : public QWidget +class GroupConfigCommon : public TQWidget { public: - GroupConfigCommon( TQWidget *parent ); + GroupConfigCommon( TQWidget *tqparent ); void setSyncProcess( SyncProcess *syncProcess ); void save(); diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp index 4d8be65d0..bf48ce210 100644 --- a/kitchensync/src/groupconfigdialog.cpp +++ b/kitchensync/src/groupconfigdialog.cpp @@ -26,8 +26,8 @@ #include <tqlayout.h> -GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process ) - : KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"), +GroupConfigDialog::GroupConfigDialog( TQWidget *tqparent, SyncProcess *process ) + : KDialogBase( tqparent, 0, true, i18n("Configure Synchronization Group"), Ok ) { TQFrame *topFrame = makeMainWidget(); diff --git a/kitchensync/src/groupconfigdialog.h b/kitchensync/src/groupconfigdialog.h index 5fd70884f..712f627ae 100644 --- a/kitchensync/src/groupconfigdialog.h +++ b/kitchensync/src/groupconfigdialog.h @@ -28,9 +28,10 @@ class SyncProcess; class GroupConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GroupConfigDialog( TQWidget *parent, SyncProcess * ); + GroupConfigDialog( TQWidget *tqparent, SyncProcess * ); ~GroupConfigDialog(); protected slots: diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index 0a27fb9e9..d708f6815 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -40,8 +40,8 @@ #include "groupitem.h" -GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) - : KWidgetListItem( parent ), mSyncProcess( process ), +GroupItem::GroupItem( KWidgetList *tqparent, SyncProcess *process ) + : KWidgetListItem( tqparent ), mSyncProcess( process ), mCallbackHandler( new QSync::CallbackHandler ), mProcessedItems( 0 ), mMaxProcessedItems( 0 ), mSynchronizing( false ) @@ -81,14 +81,14 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) mGroupName->setPaletteForegroundColor( tqcolorGroup().light() ); mGroupName->setPaletteBackgroundColor( tqcolorGroup().mid() ); - mStatus = new TQLabel( hbox ); - mStatus->tqsetAlignment( Qt::AlignRight ); - mStatus->tqsetAlignment( AlignRight | AlignVCenter ); - mStatus->setIndent( KDialog::spacingHint() ); - mStatus->setFont( boldFont ); - mStatus->setPaletteForegroundColor( tqcolorGroup().light() ); - mStatus->setPaletteBackgroundColor( tqcolorGroup().mid() ); - mStatus->setText( i18n( "Ready" ) ); + mtqStatus = new TQLabel( hbox ); + mtqStatus->tqsetAlignment( TQt::AlignRight ); + mtqStatus->tqsetAlignment( AlignRight | AlignVCenter ); + mtqStatus->setIndent( KDialog::spacingHint() ); + mtqStatus->setFont( boldFont ); + mtqStatus->setPaletteForegroundColor( tqcolorGroup().light() ); + mtqStatus->setPaletteBackgroundColor( tqcolorGroup().mid() ); + mtqStatus->setText( i18n( "Ready" ) ); hbox->setPaletteBackgroundColor( tqcolorGroup().mid() ); hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() ); @@ -189,14 +189,14 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update ) switch ( update.type() ) { case QSync::SyncChangeUpdate::Received: mProcessedItems++; - mStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) ); + mtqStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) ); break; case QSync::SyncChangeUpdate::ReceivedInfo: - mStatus->setText( i18n( "Receive information" ) ); + mtqStatus->setText( i18n( "Receive information" ) ); break; case QSync::SyncChangeUpdate::Sent: mProcessedItems--; - mStatus->setText( i18n( "%1 entries written" ).arg( mMaxProcessedItems - mProcessedItems ) ); + mtqStatus->setText( i18n( "%1 entries written" ).arg( mMaxProcessedItems - mProcessedItems ) ); mProgressBar->show(); @@ -212,15 +212,15 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update ) } break; case QSync::SyncChangeUpdate::WriteError: - mStatus->setText( i18n( "Error" ) ); + mtqStatus->setText( i18n( "Error" ) ); KPassivePopup::message( update.result().message(), this ); break; case QSync::SyncChangeUpdate::ReceiveError: - mStatus->setText( i18n( "Error" ) ); + mtqStatus->setText( i18n( "Error" ) ); KPassivePopup::message( update.result().message(), this ); break; default: - mStatus->setText( TQString() ); + mtqStatus->setText( TQString() ); break; } } @@ -233,24 +233,24 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update ) { switch ( update.type() ) { case QSync::SyncEngineUpdate::EndPhaseConnected: - mStatus->setText( i18n( "Connected" ) ); + mtqStatus->setText( i18n( "Connected" ) ); mProgressBar->setProgress( 0 ); mSynchronizing = true; mSyncAction->setText( "Abort Synchronization" ); break; case QSync::SyncEngineUpdate::EndPhaseRead: - mStatus->setText( i18n( "Data read" ) ); + mtqStatus->setText( i18n( "Data read" ) ); break; case QSync::SyncEngineUpdate::EndPhaseWrite: - mStatus->setText( i18n( "Data written" ) ); + mtqStatus->setText( i18n( "Data written" ) ); mProgressBar->setProgress( 100 ); mProcessedItems = mMaxProcessedItems = 0; break; case QSync::SyncEngineUpdate::EndPhaseDisconnected: - mStatus->setText( i18n( "Disconnected" ) ); + mtqStatus->setText( i18n( "Disconnected" ) ); break; case QSync::SyncEngineUpdate::Error: - mStatus->setText( i18n( "Synchronization failed" ) ); + mtqStatus->setText( i18n( "Synchronization failed" ) ); KPassivePopup::message( update.result().message(), this ); this->update(); @@ -258,7 +258,7 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update ) mSyncAction->setText( i18n( "Synchronize Now" ) ); break; case QSync::SyncEngineUpdate::SyncSuccessfull: - mStatus->setText( i18n( "Successfully synchronized" ) ); + mtqStatus->setText( i18n( "Successfully synchronized" ) ); mSyncProcess->group().setLastSynchronization( TQDateTime::tqcurrentDateTime() ); mSyncProcess->group().save(); this->update(); @@ -267,14 +267,14 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update ) mSyncAction->setText( i18n( "Synchronize Now" ) ); break; case QSync::SyncEngineUpdate::PrevUnclean: - mStatus->setText( i18n( "Previous synchronization failed" ) ); + mtqStatus->setText( i18n( "Previous synchronization failed" ) ); break; case QSync::SyncEngineUpdate::EndConflicts: - mStatus->setText( i18n( "Conflicts solved" ) ); + mtqStatus->setText( i18n( "Conflicts solved" ) ); mMaxProcessedItems = mProcessedItems; break; default: - mStatus->setText( TQString() ); + mtqStatus->setText( TQString() ); break; } } @@ -345,9 +345,9 @@ void GroupItem::engineChanged( QSync::Engine *engine ) this->update(); } -MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, +MemberItem::MemberItem( TQWidget *tqparent, SyncProcess *process, const QSync::Member &member ) - : TQWidget( parent ), mSyncProcess( process ), mMember( member ) + : TQWidget( tqparent ), mSyncProcess( process ), mMember( member ) { TQFont boldFont; boldFont.setBold( true ); @@ -367,7 +367,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, mIcon = new TQLabel( box ); mIcon->setPixmap( icon ); - mIcon->tqsetAlignment( Qt::AlignTop ); + mIcon->tqsetAlignment( TQt::AlignTop ); mIcon->setFixedWidth( mIcon->tqsizeHint().width() ); TQVBox *nameBox = new TQVBox( box ); @@ -375,7 +375,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, mMemberName->setFont( boldFont ); mDescription = new TQLabel( nameBox ); - mStatus = new TQLabel( box ); + mtqStatus = new TQLabel( box ); mMemberName->setText( member.name() ); mDescription->setText( plugin.longName() ); @@ -383,7 +383,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, void MemberItem::seStatusMessage( const TQString &msg ) { - mStatus->setText( msg ); + mtqStatus->setText( msg ); } #include "groupitem.moc" diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h index dc7248901..0202f13d9 100644 --- a/kitchensync/src/groupitem.h +++ b/kitchensync/src/groupitem.h @@ -40,6 +40,7 @@ class TQVBox; class GroupItem : public KWidgetListItem { Q_OBJECT + TQ_OBJECT public: GroupItem( KWidgetList*, SyncProcess *syncProcess ); @@ -75,7 +76,7 @@ class GroupItem : public KWidgetListItem TQLabel *mIcon; TQLabel *mGroupName; - TQLabel *mStatus; + TQLabel *mtqStatus; TQLabel *mTime; KURLLabel *mSyncAction; KURLLabel *mConfigureAction; @@ -87,10 +88,10 @@ class GroupItem : public KWidgetListItem bool mSynchronizing; }; -class MemberItem : public QWidget +class MemberItem : public TQWidget { public: - MemberItem( TQWidget *parent, SyncProcess *syncProcess, + MemberItem( TQWidget *tqparent, SyncProcess *syncProcess, const QSync::Member &member ); SyncProcess* syncProcess() const { return mSyncProcess; } @@ -105,7 +106,7 @@ class MemberItem : public QWidget TQLabel *mIcon; TQLabel *mMemberName; TQLabel *mDescription; - TQLabel *mStatus; + TQLabel *mtqStatus; }; #endif diff --git a/kitchensync/src/groupview.cpp b/kitchensync/src/groupview.cpp index 8e1adf87e..d7afdf10d 100644 --- a/kitchensync/src/groupview.cpp +++ b/kitchensync/src/groupview.cpp @@ -26,8 +26,8 @@ #include "groupview.h" -GroupView::GroupView( TQWidget *parent ) - : TQWidget( parent ), mAboutPage( 0 ) +GroupView::GroupView( TQWidget *tqparent ) + : TQWidget( tqparent ), mAboutPage( 0 ) { mLayout = new TQVBoxLayout( this ); diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h index 5d1e4791c..88f8da21f 100644 --- a/kitchensync/src/groupview.h +++ b/kitchensync/src/groupview.h @@ -26,12 +26,13 @@ class AboutPage; class SyncProcess; class TQVBoxLayout; -class GroupView : public QWidget +class GroupView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - GroupView( TQWidget *parent ); + GroupView( TQWidget *tqparent ); SyncProcess* selectedSyncProcess() const; diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index 610f05a54..06779c80b 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text ) return TQStyleSheet::convertFromPlainText( text ); } -HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent ) - : KTextBrowser( parent ) +HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent ) + : KTextBrowser( tqparent ) { setWrapPolicy( TQTextEdit::AtWordBoundary ); setVScrollBarMode( TQScrollView::AlwaysOff ); diff --git a/kitchensync/src/htmldiffalgodisplay.h b/kitchensync/src/htmldiffalgodisplay.h index b3d52259f..f7964e18c 100644 --- a/kitchensync/src/htmldiffalgodisplay.h +++ b/kitchensync/src/htmldiffalgodisplay.h @@ -32,7 +32,7 @@ namespace KSync { class HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser { public: - HTMLDiffAlgoDisplay( TQWidget *parent ); + HTMLDiffAlgoDisplay( TQWidget *tqparent ); void begin(); void end(); diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp index e8c1b791a..3869bc1dd 100644 --- a/kitchensync/src/kwidgetlist.cpp +++ b/kitchensync/src/kwidgetlist.cpp @@ -38,8 +38,8 @@ class KWidgetList::Private TQVBox *mBox; }; -KWidgetList::KWidgetList( TQWidget *parent, const char *name ) - : TQScrollView( parent, name ), +KWidgetList::KWidgetList( TQWidget *tqparent, const char *name ) + : TQScrollView( tqparent, name ), d( new Private ) { d->mBox = new TQVBox( viewport() ); @@ -217,7 +217,7 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) } } else if ( event->type() == TQEvent::KeyPress ) { TQKeyEvent *keyEvent = static_cast<TQKeyEvent*>( event ); - if ( keyEvent->key() == Qt::Key_Up ) { + if ( keyEvent->key() == TQt::Key_Up ) { if ( d->mSelectedItem == 0 ) { if ( !d->mItems.isEmpty() ) { setSelected( d->mItems.first() ); @@ -234,7 +234,7 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) } } return true; - } else if ( keyEvent->key() == Qt::Key_Down ) { + } else if ( keyEvent->key() == TQt::Key_Down ) { if ( d->mSelectedItem == 0 ) { if ( !d->mItems.isEmpty() ) { setSelected( d->mItems.last() ); @@ -256,8 +256,8 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) return TQScrollView::eventFilter( object, event ); } -KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name ) - : TQWidget( parent, name ) +KWidgetListItem::KWidgetListItem( KWidgetList *tqparent, const char *name ) + : TQWidget( tqparent, name ) { mForegroundColor = KGlobalSettings::textColor(); mBackgroundColor = KGlobalSettings::baseColor(); diff --git a/kitchensync/src/kwidgetlist.h b/kitchensync/src/kwidgetlist.h index 83c928f25..89586b891 100644 --- a/kitchensync/src/kwidgetlist.h +++ b/kitchensync/src/kwidgetlist.h @@ -26,12 +26,13 @@ class KWidgetListItem; -class KWidgetList : public QScrollView +class KWidgetList : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - KWidgetList( TQWidget *parent = 0, const char *name = 0 ); + KWidgetList( TQWidget *tqparent = 0, const char *name = 0 ); ~KWidgetList(); uint count() const; @@ -66,10 +67,10 @@ class KWidgetList : public QScrollView Private *d; }; -class KWidgetListItem : public QWidget +class KWidgetListItem : public TQWidget { public: - KWidgetListItem( KWidgetList *parent, const char *name = 0 ); + KWidgetListItem( KWidgetList *tqparent, const char *name = 0 ); ~KWidgetListItem(); void setSelected( bool selected ); diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index d04542f9d..63c5c8f98 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -125,7 +125,7 @@ void MainWidget::addGroup() { bool ok; TQString name = KInputDialog::getText( i18n("Create Synchronization Group"), - i18n("Name for new synchronization group."), TQString::null, &ok, this ); + i18n("Name for new synchronization group."), TQString(), &ok, this ); if ( ok ) { SyncProcessManager::self()->addGroup( name ); enableActions(); diff --git a/kitchensync/src/mainwidget.h b/kitchensync/src/mainwidget.h index acd353434..1378e1dce 100644 --- a/kitchensync/src/mainwidget.h +++ b/kitchensync/src/mainwidget.h @@ -36,9 +36,10 @@ namespace QSync { class Environment; } -class KDE_EXPORT MainWidget : public QWidget +class KDE_EXPORT MainWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: MainWidget( KXMLGUIClient *guiClient, TQWidget *widget = 0, const char *name = 0 ); ~MainWidget(); diff --git a/kitchensync/src/mainwindow.h b/kitchensync/src/mainwindow.h index 653227181..90cc1ff9b 100644 --- a/kitchensync/src/mainwindow.h +++ b/kitchensync/src/mainwindow.h @@ -32,6 +32,7 @@ class MainWidget; class MainWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: MainWindow(); diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp index 37755a504..7687e4524 100644 --- a/kitchensync/src/memberconfig.cpp +++ b/kitchensync/src/memberconfig.cpp @@ -30,8 +30,8 @@ #include <tqlayout.h> #include <tqtabwidget.h> -MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member ) - : TQWidget( parent ), mMember( member ) +MemberConfig::MemberConfig( TQWidget *tqparent, const QSync::Member &member ) + : TQWidget( tqparent ), mMember( member ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h index c6457972d..2e20e63ee 100644 --- a/kitchensync/src/memberconfig.h +++ b/kitchensync/src/memberconfig.h @@ -27,12 +27,13 @@ class TQTextEdit; class ConfigGui; -class MemberConfig : public QWidget +class MemberConfig : public TQWidget { Q_OBJECT + TQ_OBJECT public: - MemberConfig( TQWidget *parent, const QSync::Member & ); + MemberConfig( TQWidget *tqparent, const QSync::Member & ); ~MemberConfig(); void loadData(); diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp index 212e2e396..d8c672d6e 100644 --- a/kitchensync/src/memberinfo.cpp +++ b/kitchensync/src/memberinfo.cpp @@ -95,5 +95,5 @@ TQString MemberInfo::pluginIconName( const TQString &pluginName ) if ( pluginName == "jescs-sync" ) return "www"; - return TQString::null; + return TQString(); } diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index e7c037610..35679392d 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -33,8 +33,8 @@ class ChangeItem : public KWidgetListItem { public: - ChangeItem( KWidgetList *parent, const QSync::SyncChange &change ) - : KWidgetListItem( parent ), + ChangeItem( KWidgetList *tqparent, const QSync::SyncChange &change ) + : KWidgetListItem( tqparent ), mChange( change ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); @@ -71,8 +71,8 @@ class ChangeItem : public KWidgetListItem QSync::SyncChange mChange; }; -MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) - : ConflictDialog( mapping, parent ) +MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ) + : ConflictDialog( mapping, tqparent ) { initGUI(); diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h index a7dcfaddc..fd0cdef53 100644 --- a/kitchensync/src/multiconflictdialog.h +++ b/kitchensync/src/multiconflictdialog.h @@ -28,9 +28,10 @@ class KWidgetList; class MultiConflictDialog : public ConflictDialog { Q_OBJECT + TQ_OBJECT public: - MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); + MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ); ~MultiConflictDialog(); private slots: diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index 0e5c5c0c3..217b32bcc 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -37,9 +37,9 @@ typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory; K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory ) KitchenSyncPart::KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, + TQObject *tqparent, const char *name, const TQStringList& ) - : KParts::ReadOnlyPart( parent, name ) + : KParts::ReadOnlyPart( tqparent, name ) { setInstance( KitchenSyncFactory::instance() ); diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h index d9e03a3f0..82a641875 100644 --- a/kitchensync/src/part.h +++ b/kitchensync/src/part.h @@ -30,10 +30,11 @@ class KAboutData; class KitchenSyncPart: public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList& ); + TQObject *tqparent, const char *name, const TQStringList& ); virtual ~KitchenSyncPart(); static KAboutData *createAboutData(); diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp index d8d6c46d5..10f311f9d 100644 --- a/kitchensync/src/pluginpicker.cpp +++ b/kitchensync/src/pluginpicker.cpp @@ -57,8 +57,8 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) } -PluginPicker::PluginPicker( TQWidget *parent ) - : TQWidget( parent ) +PluginPicker::PluginPicker( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQBoxLayout *tqlayout = new TQVBoxLayout( this ); @@ -94,8 +94,8 @@ QSync::Plugin PluginPicker::selectedPlugin() const } -PluginPickerDialog::PluginPickerDialog( TQWidget *parent ) - : KDialogBase( parent, 0, true, i18n("Select Member Type"), Ok | Cancel ) +PluginPickerDialog::PluginPickerDialog( TQWidget *tqparent ) + : KDialogBase( tqparent, 0, true, i18n("Select Member Type"), Ok | Cancel ) { TQFrame *topFrame = makeMainWidget(); @@ -114,9 +114,9 @@ QSync::Plugin PluginPickerDialog::selectedPlugin() const return mPicker->selectedPlugin(); } -QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *parent ) +QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *tqparent ) { - PluginPickerDialog dlg( parent ); + PluginPickerDialog dlg( tqparent ); if ( dlg.exec() ) return dlg.selectedPlugin(); else diff --git a/kitchensync/src/pluginpicker.h b/kitchensync/src/pluginpicker.h index 81b49161e..fbaed3f26 100644 --- a/kitchensync/src/pluginpicker.h +++ b/kitchensync/src/pluginpicker.h @@ -39,12 +39,13 @@ class PluginItem : public KWidgetListItem QSync::Plugin mPlugin; }; -class PluginPicker : public QWidget +class PluginPicker : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PluginPicker( TQWidget *parent ); + PluginPicker( TQWidget *tqparent ); QSync::Plugin selectedPlugin() const; @@ -61,13 +62,14 @@ class PluginPicker : public QWidget class PluginPickerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PluginPickerDialog( TQWidget *parent ); + PluginPickerDialog( TQWidget *tqparent ); QSync::Plugin selectedPlugin() const; - static QSync::Plugin getPlugin( TQWidget *parent ); + static QSync::Plugin getPlugin( TQWidget *tqparent ); protected slots: void slotOk(); diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index f9228e174..c70402795 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -32,8 +32,8 @@ #include "singleconflictdialog.h" -SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) - : ConflictDialog( mapping, parent ), mDiffAlgo( 0 ) +SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ) + : ConflictDialog( mapping, tqparent ), mDiffAlgo( 0 ) { initGUI(); diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h index 25ff4bd78..9c80f7fc6 100644 --- a/kitchensync/src/singleconflictdialog.h +++ b/kitchensync/src/singleconflictdialog.h @@ -33,9 +33,10 @@ class HTMLDiffAlgoDisplay; class SingleConflictDialog : public ConflictDialog { Q_OBJECT + TQ_OBJECT public: - SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); + SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ); ~SingleConflictDialog(); private slots: diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp index 924151bd9..1a70f877d 100644 --- a/kitchensync/src/syncprocess.cpp +++ b/kitchensync/src/syncprocess.cpp @@ -48,12 +48,12 @@ SyncProcess::~SyncProcess() mEngine = 0; } -TQString SyncProcess::groupStatus() const +TQString SyncProcess::grouptqStatus() const { return i18n( "Ready" ); } -TQString SyncProcess::memberStatus( const QSync::Member& ) const +TQString SyncProcess::membertqStatus( const QSync::Member& ) const { return i18n( "Ready" ); } diff --git a/kitchensync/src/syncprocess.h b/kitchensync/src/syncprocess.h index ef23f7c52..31cbd50c7 100644 --- a/kitchensync/src/syncprocess.h +++ b/kitchensync/src/syncprocess.h @@ -29,9 +29,10 @@ namespace QSync { class Engine; } -class SyncProcess : public QObject +class SyncProcess : public TQObject { Q_OBJECT + TQ_OBJECT public: SyncProcess( const QSync::Group &group ); @@ -40,8 +41,8 @@ class SyncProcess : public QObject QSync::Group group() const { return mGroup; } QSync::Engine* engine() const { return mEngine; } - TQString groupStatus() const; - TQString memberStatus( const QSync::Member &member ) const; + TQString grouptqStatus() const; + TQString membertqStatus( const QSync::Member &member ) const; QSync::Result addMember( const QSync::Plugin &plugin ); diff --git a/kitchensync/src/syncprocessmanager.h b/kitchensync/src/syncprocessmanager.h index b95018a84..f29d8a114 100644 --- a/kitchensync/src/syncprocessmanager.h +++ b/kitchensync/src/syncprocessmanager.h @@ -31,9 +31,10 @@ class Environment; class SyncProcess; -class SyncProcessManager : public QObject +class SyncProcessManager : public TQObject { Q_OBJECT + TQ_OBJECT public: static SyncProcessManager *self(); diff --git a/kitchensync/src/xmldiffalgo.cpp b/kitchensync/src/xmldiffalgo.cpp index b5f4890fc..53f051f1e 100644 --- a/kitchensync/src/xmldiffalgo.cpp +++ b/kitchensync/src/xmldiffalgo.cpp @@ -87,14 +87,14 @@ void XmlDiffAlgo::appendConflictNodes(TQDomElement &leftElement, TQDomElement &r TQString id = leftChild.tagName(); if (id == "Content") - id = left.parentNode().nodeName(); + id = left.tqparentNode().nodeName(); conflictField( id, leftChild.text(), rightChild.text() ); - left.parentNode().removeChild( left ); + left.tqparentNode().removeChild( left ); left = leftElement.firstChild(); - right.parentNode().removeChild( right ); + right.tqparentNode().removeChild( right ); right = rightElement.firstChild(); } @@ -121,8 +121,8 @@ top:; compareNode( leftChild, rightChild ); if ( !left.hasChildNodes() && !right.hasChildNodes() ) { - left.parentNode().removeChild( left ); - right.parentNode().removeChild( right ); + left.tqparentNode().removeChild( left ); + right.tqparentNode().removeChild( right ); goto top; } @@ -133,13 +133,13 @@ top:; TQString id = leftChild.tagName(); if ( id == "Content" ) - id = left.parentNode().nodeName(); + id = left.tqparentNode().nodeName(); if ( id != "Type" ) //matchingField( id, leftChild.text(), rightChild.text() ); - left.parentNode().removeChild( left ); - right.parentNode().removeChild( right ); + left.tqparentNode().removeChild( left ); + right.tqparentNode().removeChild( right ); goto top; } } |