From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kitchensync/libqopensync/group.cpp | 4 +-- kitchensync/opensyncdbus/dbusclient.cpp | 12 +++---- kitchensync/src/aboutpage.cpp | 56 ++++++++++++++++----------------- kitchensync/src/configguievo2.cpp | 6 ++-- kitchensync/src/configguigpe.cpp | 10 +++--- kitchensync/src/configguijescs.cpp | 8 ++--- kitchensync/src/configguildap.cpp | 26 +++++++-------- kitchensync/src/configguimoto.cpp | 2 +- kitchensync/src/configguipalm.cpp | 2 +- kitchensync/src/configguisunbird.cpp | 12 +++---- kitchensync/src/configguisynce.cpp | 8 ++--- kitchensync/src/configguisyncmlobex.cpp | 4 +-- kitchensync/src/genericdiffalgo.cpp | 6 ++-- kitchensync/src/groupconfig.cpp | 4 +-- kitchensync/src/groupitem.cpp | 20 ++++++------ kitchensync/src/htmldiffalgodisplay.cpp | 22 ++++++------- kitchensync/src/kwidgetlist.cpp | 16 +++++----- kitchensync/src/mainwidget.cpp | 10 +++--- kitchensync/src/mainwindow.cpp | 2 +- kitchensync/src/memberconfig.cpp | 4 +-- kitchensync/src/syncprocessmanager.cpp | 2 +- 21 files changed, 118 insertions(+), 118 deletions(-) (limited to 'kitchensync') diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp index a3fd4f2a0..d716e1c4c 100644 --- a/kitchensync/libqopensync/group.cpp +++ b/kitchensync/libqopensync/group.cpp @@ -46,7 +46,7 @@ TQStringList GroupConfig::activeObjectTypes() const { Q_ASSERT( mGroup ); - const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); + const TQString fileName = TQString( "%1/filter.conf" ).tqarg( osync_group_get_configdir( mGroup ) ); TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) @@ -92,7 +92,7 @@ void GroupConfig::setActiveObjectTypes( const TQStringList &objectTypes ) element.appendChild( entry ); } - const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); + const TQString fileName = TQString( "%1/filter.conf" ).tqarg( osync_group_get_configdir( mGroup ) ); TQFile file( fileName ); if ( !file.open( IO_WriteOnly ) ) diff --git a/kitchensync/opensyncdbus/dbusclient.cpp b/kitchensync/opensyncdbus/dbusclient.cpp index f53ee74e3..39cd1cc94 100644 --- a/kitchensync/opensyncdbus/dbusclient.cpp +++ b/kitchensync/opensyncdbus/dbusclient.cpp @@ -85,7 +85,7 @@ TQDBusMessage OpenSyncService::showMember( const TQDBusMessage &message ) if ( message.count() != 2 ) { return error( message, "arg_count", TQString("Wrong number of arguments. Expected 2, got %1.") - .arg( message.count() ) ); + .tqarg( message.count() ) ); } TQString groupName = message[ 0 ].toString(); @@ -111,14 +111,14 @@ TQDBusMessage OpenSyncService::showMember( const TQDBusMessage &message ) QSync::Group group = env.groupByName( groupName ); if ( !group.isValid() ) { return error( message, "group_name", TQString("Unknown group '%1'.") - .arg( groupName ) ); + .tqarg( groupName ) ); } QSync::Member member = group.memberById( memberId ); if ( !member.isValid() ) { return error( message, "member_id", - TQString("Unknown member id '%1' in group '%2'.").arg( groupName ) - .arg( memberId ) ); + TQString("Unknown member id '%1' in group '%2'.").tqarg( groupName ) + .tqarg( memberId ) ); } reply.append( memberId ); @@ -136,7 +136,7 @@ TQDBusMessage OpenSyncService::showGroup( const TQDBusMessage &message ) if ( message.count() != 1 ) { return error( message, "arg_count", TQString("Wrong number of arguments. Expected 1, got %1") - .arg( message.count() ) ); + .tqarg( message.count() ) ); } TQString groupName = message[ 0 ].toString(); @@ -156,7 +156,7 @@ TQDBusMessage OpenSyncService::showGroup( const TQDBusMessage &message ) QSync::Group group = env.groupByName( groupName ); if ( !group.isValid() ) { return error( message, "group_name", TQString("Unknown group '%1'") - .arg( groupName ) ); + .tqarg( groupName ) ); } QSync::Group::Iterator it( &group ); diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index 9d0503edb..1590338c2 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -55,11 +55,11 @@ AboutPage::AboutPage( TQWidget *tqparent ) TQString location = locate( "data", "kitchensync/about/main.html" ); TQString content = readFile( location ); - content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); + content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); + content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); else - content = content.arg( "" ); + content = content.tqarg( "" ); KHTMLPart *part = new KHTMLPart( this ); tqlayout->addWidget( part->view() ); @@ -70,8 +70,8 @@ AboutPage::AboutPage( TQWidget *tqparent ) TQString catchPhrase( i18n( "Get Synchronized!" ) ); TQString quickDescription( i18n( "The KDE Synchronization Tool" ) ); - part->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) - .arg( catchPhrase ).arg( quickDescription ).arg( htmlText() ) ); + part->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName ) + .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( htmlText() ) ); part->end(); connect( part->browserExtension(), @@ -111,29 +111,29 @@ TQString AboutPage::htmlText() const "" "%1
%1" "" ) - .arg( kapp->aboutData()->version() ) - .arg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) ) - .arg( "help:/kitchensync" ) - .arg( iconSize ) - .arg( iconSize ) - .arg( handbook_icon_path ) - .arg( "help:/kitchensync" ) - .arg( i18n( "Read Manual" ) ) - .arg( i18n( "Learn more about KitchenSync and its components" ) ) - .arg( "http://pim.kde.org" ) - .arg( iconSize ) - .arg( iconSize ) - .arg( html_icon_path ) - .arg( "http://pim.kde.org" ) - .arg( i18n( "Visit KitchenSync Website" ) ) - .arg( i18n( "Access online resources and tutorials" ) ) - .arg( "exec:/addGroup" ) - .arg( iconSize ) - .arg( iconSize ) - .arg( wizard_icon_path ) - .arg( "exec:/addGroup" ) - .arg( i18n( "Add Synchronization Group" ) ) - .arg( i18n( "Create group of tqdevices for synchronization" ) ); + .tqarg( kapp->aboutData()->version() ) + .tqarg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) ) + .tqarg( "help:/kitchensync" ) + .tqarg( iconSize ) + .tqarg( iconSize ) + .tqarg( handbook_icon_path ) + .tqarg( "help:/kitchensync" ) + .tqarg( i18n( "Read Manual" ) ) + .tqarg( i18n( "Learn more about KitchenSync and its components" ) ) + .tqarg( "http://pim.kde.org" ) + .tqarg( iconSize ) + .tqarg( iconSize ) + .tqarg( html_icon_path ) + .tqarg( "http://pim.kde.org" ) + .tqarg( i18n( "Visit KitchenSync Website" ) ) + .tqarg( i18n( "Access online resources and tutorials" ) ) + .tqarg( "exec:/addGroup" ) + .tqarg( iconSize ) + .tqarg( iconSize ) + .tqarg( wizard_icon_path ) + .tqarg( "exec:/addGroup" ) + .tqarg( i18n( "Add Synchronization Group" ) ) + .tqarg( i18n( "Create group of tqdevices for synchronization" ) ); return info; } diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index 872e673fd..3a6db784e 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/kitchensync/src/configguievo2.cpp @@ -60,9 +60,9 @@ TQString ConfigGuiEvo2::save() const { TQString config = "\n"; - config += TQString( "%1\n" ).arg( mAddressPath->url() ); - config += TQString( "%1\n" ).arg( mCalendarPath->url() ); - config += TQString( "%1\n" ).arg( mTasksPath->url() ); + config += TQString( "%1\n" ).tqarg( mAddressPath->url() ); + config += TQString( "%1\n" ).tqarg( mCalendarPath->url() ); + config += TQString( "%1\n" ).tqarg( mTasksPath->url() ); config += ""; diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp index 34502d4d6..260552642 100644 --- a/kitchensync/src/configguigpe.cpp +++ b/kitchensync/src/configguigpe.cpp @@ -68,11 +68,11 @@ TQString ConfigGuiGpe::save() const { TQString config = ""; - config += TQString( "%1" ).arg( mConnectionMode->currentItem() == 0 ); - config += TQString( "%1" ).arg( mConnectionMode->currentItem() == 1 ); - config += TQString( "%1" ).arg( mIP->text() ); - config += TQString( "%1" ).arg( mPort->value() ); - config += TQString( "%1" ).arg( mUser->text() ); + config += TQString( "%1" ).tqarg( mConnectionMode->currentItem() == 0 ); + config += TQString( "%1" ).tqarg( mConnectionMode->currentItem() == 1 ); + config += TQString( "%1" ).tqarg( mIP->text() ); + config += TQString( "%1" ).tqarg( mPort->value() ); + config += TQString( "%1" ).tqarg( mUser->text() ); config += ""; diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp index 552b49a39..e284c3e76 100644 --- a/kitchensync/src/configguijescs.cpp +++ b/kitchensync/src/configguijescs.cpp @@ -61,13 +61,13 @@ TQString ConfigGuiJescs::save() const int delNotifyState; TQString config = "\n"; - config += TQString( "%1\n" ).arg( mUrl->text() ); - config += TQString( "%1\n" ).arg( mUsername->text() ); - config += TQString( "%1\n" ).arg( mPassword->text() ); + config += TQString( "%1\n" ).tqarg( mUrl->text() ); + config += TQString( "%1\n" ).tqarg( mUsername->text() ); + config += TQString( "%1\n" ).tqarg( mPassword->text() ); if ( mDelNotify->isChecked() ) { delNotifyState = 1; } else { delNotifyState = 0; } - config += TQString( "%1\n" ).arg( delNotifyState ); + config += TQString( "%1\n" ).tqarg( delNotifyState ); config += ""; diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index 485b65994..b5ebd02ea 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -93,26 +93,26 @@ TQString ConfigGuiLdap::save() const { TQString config = "\n"; - config += TQString( "%1\n" ).arg( mLdapWidget->host() ); - config += TQString( "%1\n" ).arg( mLdapWidget->port() ); - config += TQString( "%1\n" ).arg( mLdapWidget->bindDN() ); - config += TQString( "%1\n" ).arg( mLdapWidget->password() ); - config += TQString( "%1\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" ); - config += TQString( "%1\n" ).arg( mLdapWidget->dn() ); - config += TQString( "%1\n" ).arg( mLdapWidget->filter() ); - config += TQString( "%1\n" ).arg( mLdapWidget->dn() ); - config += TQString( "%1\n" ).arg( mKeyAttribute->text() ); + config += TQString( "%1\n" ).tqarg( mLdapWidget->host() ); + config += TQString( "%1\n" ).tqarg( mLdapWidget->port() ); + config += TQString( "%1\n" ).tqarg( mLdapWidget->bindDN() ); + config += TQString( "%1\n" ).tqarg( mLdapWidget->password() ); + config += TQString( "%1\n" ).tqarg( mLdapWidget->isAuthAnon() ? "1" : "0" ); + config += TQString( "%1\n" ).tqarg( mLdapWidget->dn() ); + config += TQString( "%1\n" ).tqarg( mLdapWidget->filter() ); + config += TQString( "%1\n" ).tqarg( mLdapWidget->dn() ); + config += TQString( "%1\n" ).tqarg( mKeyAttribute->text() ); TQStringList scopes; scopes << "base" << "one" << "sub"; - config += TQString( "%1\n" ).arg( scopes[ mSearchScope->currentItem() ] ); + config += TQString( "%1\n" ).tqarg( scopes[ mSearchScope->currentItem() ] ); config += TQString( "SIMPLE\n" ); - config += TQString( "%1\n" ).arg( mEncryption->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).tqarg( mEncryption->isChecked() ? "1" : "0" ); - config += TQString( "%1\n" ).arg( mReadLdap->isChecked() ? "1" : "0" ); - config += TQString( "%1\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).tqarg( mReadLdap->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).tqarg( mWriteLdap->isChecked() ? "1" : "0" ); config += ""; diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp index 3314dbef8..b9ec2342c 100644 --- a/kitchensync/src/configguimoto.cpp +++ b/kitchensync/src/configguimoto.cpp @@ -53,7 +53,7 @@ TQString ConfigGuiMoto::save() const { TQString config = "\n"; - config += TQString( "%1\n" ).arg( mDeviceString->text() ); + config += TQString( "%1\n" ).tqarg( mDeviceString->text() ); config += ""; diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp index b07223d58..688e0cc0d 100644 --- a/kitchensync/src/configguipalm.cpp +++ b/kitchensync/src/configguipalm.cpp @@ -167,7 +167,7 @@ void ConfigGuiPalm::initGUI() gridLayout = new TQGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() ); gridLayout->setMargin( KDialog::marginHint() ); - TQButtonGroup *buttonGroup = new TQButtonGroup( 1, TQt::Horizontal, connectionWidget ); + TQButtonGroup *buttonGroup = new TQButtonGroup( 1, Qt::Horizontal, connectionWidget ); buttonGroup->setExclusive( true ); buttonGroup->setFrameStyle( TQFrame::NoFrame ); mSyncAlways = new TQRadioButton( i18n( "Sync Anyway" ), buttonGroup ); diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index daa251b10..b77ce93ba 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/kitchensync/src/configguisunbird.cpp @@ -140,10 +140,10 @@ TQString ConfigGuiSunbird::save() const for ( uint i = 0; i < mLocalList.count(); ++i ) { LocalCalendar *lcal = mLocalList[ i ]; config += TQString( "mPathRequester->url() ); + config += TQString( "path=\"%1\" " ).tqarg( lcal->mPathRequester->url() ); if ( lcal->mDaysCheckBox->isChecked() ) { - config += TQString( "deletedaysold=\"%1\" " ).arg( lcal->mDaysSpinBox->value() ); + config += TQString( "deletedaysold=\"%1\" " ).tqarg( lcal->mDaysSpinBox->value() ); } if ( lcal->mDefaultCheckBox->isChecked() ) { config += TQString( "default=\"1\" " ); @@ -154,12 +154,12 @@ TQString ConfigGuiSunbird::save() const for ( uint i = 0; i < mWebdavList.count(); ++i ) { WebdavCalendar *wcal = mWebdavList[ i ]; config += TQString( "mUsername->text() ); - config += TQString( "password=\"%1\" " ).arg( wcal->mPassword->text() ); - config += TQString( "url=\"%1\" " ).arg( wcal->mUrl->text() ); + config += TQString( "username=\"%1\" " ).tqarg( wcal->mUsername->text() ); + config += TQString( "password=\"%1\" " ).tqarg( wcal->mPassword->text() ); + config += TQString( "url=\"%1\" " ).tqarg( wcal->mUrl->text() ); if ( wcal->mDaysCheckBox->isChecked() ) { - config += TQString( "deletedaysold=\"%1\" " ).arg( wcal->mDaysSpinBox->value() ); + config += TQString( "deletedaysold=\"%1\" " ).tqarg( wcal->mDaysSpinBox->value() ); } if ( wcal->mDefaultCheckBox->isChecked() ) { config += TQString( "default=\"1\" " ); diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp index 64c171a83..5ff5aeacc 100644 --- a/kitchensync/src/configguisynce.cpp +++ b/kitchensync/src/configguisynce.cpp @@ -60,10 +60,10 @@ TQString ConfigGuiSynce::save() const { TQString config = "\n"; - config += TQString( "%1\n" ).arg( mContacts->isChecked() ? "1" : "0" ); - config += TQString( "%1\n" ).arg( mTodos->isChecked() ? "1" : "0" ); - config += TQString( "%1\n" ).arg( mCalendar->isChecked() ? "1" : "0" ); - config += TQString( "%1\n" ).arg( mFile->text() ); + config += TQString( "%1\n" ).tqarg( mContacts->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).tqarg( mTodos->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).tqarg( mCalendar->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).tqarg( mFile->text() ); config += ""; diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp index 1447f5698..024e72ede 100644 --- a/kitchensync/src/configguisyncmlobex.cpp +++ b/kitchensync/src/configguisyncmlobex.cpp @@ -246,7 +246,7 @@ TQString ConfigGuiSyncmlObex::save() const ConnectionTypeList::ConstIterator it; for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ ) { if ( mConnection->currentText() == (*it).second ) { - xml += "" + TQString("%1").arg((*it).first) + "\n"; + xml += "" + TQString("%1").tqarg((*it).first) + "\n"; break; } } @@ -264,7 +264,7 @@ TQString ConfigGuiSyncmlObex::save() const SyncmlVersionList::ConstIterator itVersion; for ( itVersion = mSyncmlVersions.begin(); itVersion != mSyncmlVersions.end(); itVersion++ ) { if ( mSyncmlVersion->currentText() == (*itVersion).second ) { - xml += "" + TQString("%1").arg((*itVersion).first) + "\n"; + xml += "" + TQString("%1").tqarg((*itVersion).first) + "\n"; break; } } diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp index 67e49bab4..118f25a55 100644 --- a/kitchensync/src/genericdiffalgo.cpp +++ b/kitchensync/src/genericdiffalgo.cpp @@ -57,11 +57,11 @@ void GenericDiffAlgo::run() for ( uint i = 0; i < lines; ++i ) { if ( i < leftList.count() && i < rightList.count() ) { if ( !compareString( leftList[ i ], rightList[ i ] ) ) - conflictField( i18n( "Line %1" ).arg( i ), leftList[ i ], rightList[ i ] ); + conflictField( i18n( "Line %1" ).tqarg( i ), leftList[ i ], rightList[ i ] ); } else if ( i < leftList.count() && i >= rightList.count() ) { - additionalLeftField( i18n( "Line %1" ).arg( i ), leftList[ i ] ); + additionalLeftField( i18n( "Line %1" ).tqarg( i ), leftList[ i ] ); } else if ( i >= leftList.count() && i < rightList.count() ) { - additionalRightField( i18n( "Line %1" ).arg( i ), rightList[ i ] ); + additionalRightField( i18n( "Line %1" ).tqarg( i ), rightList[ i ] ); } } diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index eac5759c0..f8f16988c 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -131,7 +131,7 @@ void GroupConfig::updateMembers() QSync::Member member = *it; MemberInfo mi( member ); TQFrame *page = mMemberView->addPage( mi.name(), - TQString( "%1 (%2)" ).arg( mi.name() ).arg(member.pluginName()), mi.desktopIcon() ); + TQString( "%1 (%2)" ).tqarg( mi.name() ).tqarg(member.pluginName()), mi.desktopIcon() ); TQBoxLayout *pageLayout = new TQVBoxLayout( page ); mConfigPages.append( page ); @@ -165,7 +165,7 @@ void GroupConfig::addMember() QSync::Result result = SyncProcessManager::self()->addMember( mProcess, plugin ); if ( result.isError() ) { KMessageBox::error( this, i18n("Error adding member %1\n%2\nType: %3") - .arg( plugin.name() ).arg( result.message() ).arg( result.type() ) ); + .tqarg( plugin.name() ).tqarg( result.message() ).tqarg( result.type() ) ); } else { updateMembers(); diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index d708f6815..71a8deff9 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -102,7 +102,7 @@ GroupItem::GroupItem( KWidgetList *tqparent, SyncProcess *process ) tqlayout->setColStretch( 0, 1 ); tqlayout->setRowStretch( 3, 1 ); - setPaletteBackgroundColor( kapp->palette().active().base() ); + setPaletteBackgroundColor( kapp->tqpalette().active().base() ); connect( mCallbackHandler, TQT_SIGNAL( conflict( QSync::SyncMapping ) ), this, TQT_SLOT( conflict( QSync::SyncMapping ) ) ); @@ -139,11 +139,11 @@ void GroupItem::update() { clear(); - mGroupName->setText( i18n( "Group: %1" ).arg( mSyncProcess->group().name() ) ); + mGroupName->setText( i18n( "Group: %1" ).tqarg( mSyncProcess->group().name() ) ); TQDateTime dateTime = mSyncProcess->group().lastSynchronization(); if ( dateTime.isValid() ) - mTime->setText( i18n( "Last synchronized on: %1" ).arg( KGlobal::locale()->formatDateTime( dateTime ) ) ); + mTime->setText( i18n( "Last synchronized on: %1" ).tqarg( KGlobal::locale()->formatDateTime( dateTime ) ) ); else mTime->setText( i18n( "Not synchronized yet" ) ); @@ -189,14 +189,14 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update ) switch ( update.type() ) { case QSync::SyncChangeUpdate::Received: mProcessedItems++; - mtqStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) ); + mtqStatus->setText( i18n( "%1 entries read" ).tqarg( mProcessedItems ) ); break; case QSync::SyncChangeUpdate::ReceivedInfo: mtqStatus->setText( i18n( "Receive information" ) ); break; case QSync::SyncChangeUpdate::Sent: mProcessedItems--; - mtqStatus->setText( i18n( "%1 entries written" ).arg( mMaxProcessedItems - mProcessedItems ) ); + mtqStatus->setText( i18n( "%1 entries written" ).tqarg( mMaxProcessedItems - mProcessedItems ) ); mProgressBar->show(); @@ -298,19 +298,19 @@ void GroupItem::member( const QSync::SyncMemberUpdate &update ) (*it)->seStatusMessage( i18n( "Disconnected" ) ); break; case QSync::SyncMemberUpdate::ConnectError: - (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::GetChangesError: - (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::CommittedAllError: - (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::SyncDoneError: - (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::DisconnectedError: - (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); break; default: break; diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index 06779c80b..9094216ee 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -45,13 +45,13 @@ void HTMLDiffAlgoDisplay::begin() mText.append( "" ); mText.append( TQString( "" ) - .arg( KGlobalSettings::textColor().name() ) - .arg( KGlobalSettings::baseColor().name() ) ); + .tqarg( KGlobalSettings::textColor().name() ) + .tqarg( KGlobalSettings::baseColor().name() ) ); mText.append( "
" ); mText.append( TQString( "" ) - .arg( mLeftTitle ) - .arg( mRightTitle ) ); + .tqarg( mLeftTitle ) + .tqarg( mRightTitle ) ); } void HTMLDiffAlgoDisplay::end() @@ -76,22 +76,22 @@ void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title ) void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value ) { mText.append( TQString( "" ) - .arg( id ) - .arg( textToHTML( value ) ) ); + .tqarg( id ) + .tqarg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value ) { mText.append( TQString( "" ) - .arg( id ) - .arg( textToHTML( value ) ) ); + .tqarg( id ) + .tqarg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue, const TQString &rightValue ) { mText.append( TQString( "" ) - .arg( id ) - .arg( textToHTML( leftValue ) ) - .arg( textToHTML( rightValue ) ) ); + .tqarg( id ) + .tqarg( textToHTML( leftValue ) ) + .tqarg( textToHTML( rightValue ) ) ); } diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp index 3869bc1dd..011b4c73b 100644 --- a/kitchensync/src/kwidgetlist.cpp +++ b/kitchensync/src/kwidgetlist.cpp @@ -46,7 +46,7 @@ KWidgetList::KWidgetList( TQWidget *tqparent, const char *name ) addChild( d->mBox ); setResizePolicy( AutoOneFit ); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( Qt::StrongFocus ); viewport()->setFocus(); } @@ -169,7 +169,7 @@ KWidgetListItem *KWidgetList::item( int index ) const int KWidgetList::index( KWidgetListItem *item ) const { - return d->mItems.findIndex( item ); + return d->mItems.tqfindIndex( item ); } void KWidgetList::clear() @@ -191,11 +191,11 @@ void KWidgetList::setFocus() bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) { if ( event->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent *mouseEvent = static_cast( event ); - if ( mouseEvent->button() & LeftButton ) { + TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT( event ); + if ( mouseEvent->button() & Qt::LeftButton ) { TQValueList::Iterator it; for ( it = d->mItems.begin(); it != d->mItems.end(); ++it ) { - if ( *it == object ) { + if ( TQT_BASE_OBJECT(*it) == TQT_BASE_OBJECT(object) ) { if ( d->mItems.count() != 1 ) { setSelected( *it ); emit selectionChanged( *it ); @@ -207,7 +207,7 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) } else if ( event->type() == TQEvent::MouseButtonDblClick ) { TQValueList::Iterator it; for ( it = d->mItems.begin(); it != d->mItems.end(); ++it ) { - if ( *it == object ) { + if ( TQT_BASE_OBJECT(*it) == TQT_BASE_OBJECT(object) ) { if ( d->mItems.count() != 1 ) { setSelected( *it ); emit doubleClicked( *it ); @@ -216,7 +216,7 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) } } } else if ( event->type() == TQEvent::KeyPress ) { - TQKeyEvent *keyEvent = static_cast( event ); + TQKeyEvent *keyEvent = TQT_TQKEYEVENT( event ); if ( keyEvent->key() == TQt::Key_Up ) { if ( d->mSelectedItem == 0 ) { if ( !d->mItems.isEmpty() ) { @@ -264,7 +264,7 @@ KWidgetListItem::KWidgetListItem( KWidgetList *tqparent, const char *name ) mSelectionForegroundColor = KGlobalSettings::highlightedTextColor(); mSelectionBackgroundColor = KGlobalSettings::highlightColor(); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( Qt::StrongFocus ); } KWidgetListItem::~KWidgetListItem() diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 63c5c8f98..8dbef8cab 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -102,13 +102,13 @@ void MainWidget::initGUI() void MainWidget::initActions() { - mActionSynchronize = new KAction( i18n("Synchronize"), "hotsync", 0, this, TQT_SLOT( sync() ), + mActionSynchronize = new KAction( i18n("Synchronize"), "hotsync", 0, TQT_TQOBJECT(this), TQT_SLOT( sync() ), mGUIClient->actionCollection(), "sync" ); - mActionAddGroup = new KAction( i18n("Add Group..."), "filenew", 0, this, TQT_SLOT( addGroup() ), + mActionAddGroup = new KAction( i18n("Add Group..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ), mGUIClient->actionCollection(), "add_group" ); - mActionDeleteGroup = new KAction( i18n("Delete Group..."), "editdelete", 0, this, TQT_SLOT( deleteGroup() ), + mActionDeleteGroup = new KAction( i18n("Delete Group..."), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteGroup() ), mGUIClient->actionCollection(), "delete_group" ); - mActionEditGroup = new KAction( i18n("Edit Group..."), "edit", 0, this, TQT_SLOT( editGroup() ), + mActionEditGroup = new KAction( i18n("Edit Group..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( editGroup() ), mGUIClient->actionCollection(), "edit_group" ); } @@ -141,7 +141,7 @@ void MainWidget::deleteGroup() SyncProcess *syncProcess = mGroupView->selectedSyncProcess(); if ( syncProcess ) { int result = KMessageBox::warningContinueCancel( this, - i18n("Delete synchronization group '%1'?").arg( syncProcess->group().name() ) ); + i18n("Delete synchronization group '%1'?").tqarg( syncProcess->group().name() ) ); if ( result == KMessageBox::Continue ) { SyncProcessManager::self()->remove( syncProcess ); enableActions(); diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp index 4052cb0c1..7a0aa0653 100644 --- a/kitchensync/src/mainwindow.cpp +++ b/kitchensync/src/mainwindow.cpp @@ -55,7 +55,7 @@ MainWindow::~MainWindow() void MainWindow::initActions() { - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); } #include "mainwindow.moc" diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp index 7687e4524..c6da7a3ab 100644 --- a/kitchensync/src/memberconfig.cpp +++ b/kitchensync/src/memberconfig.cpp @@ -51,7 +51,7 @@ void MemberConfig::loadData() if ( error ) { KMessageBox::error( this, i18n("Unable to read config from plugin '%1':\n%2") - .arg( mMember.pluginName() ).arg( error.message() ) ); + .tqarg( mMember.pluginName() ).tqarg( error.message() ) ); } else { TQString txt = TQString::fromUtf8( cfg.data(), cfg.size() ); mGui->load( txt ); @@ -65,7 +65,7 @@ void MemberConfig::saveData() TQString txt = mGui->save(); if ( txt.isEmpty() ) { - KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").arg( mMember.pluginName() ) ); + KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").tqarg( mMember.pluginName() ) ); } else { TQByteArray cfg = txt.utf8(); cfg.truncate(cfg.size() - 1); /* discard NUL terminator */ diff --git a/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp index fda111efd..67fe3095c 100644 --- a/kitchensync/src/syncprocessmanager.cpp +++ b/kitchensync/src/syncprocessmanager.cpp @@ -47,7 +47,7 @@ SyncProcessManager::SyncProcessManager() QSync::Result result = mEnvironment->initialize(); if ( result.isError() ) { KMessageBox::error( 0, i18n("Error initializing OpenSync.\n%1") - .arg( result.message() ) ); + .tqarg( result.message() ) ); } else { init( mEnvironment ); } -- cgit v1.2.1
%1 %2
%1:%2
%1:%2
%1:%2%3