summaryrefslogtreecommitdiffstats
path: root/kitchensync
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /kitchensync
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
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
Diffstat (limited to 'kitchensync')
-rw-r--r--kitchensync/libqopensync/group.cpp4
-rw-r--r--kitchensync/opensyncdbus/dbusclient.cpp12
-rw-r--r--kitchensync/src/aboutpage.cpp56
-rw-r--r--kitchensync/src/configguievo2.cpp6
-rw-r--r--kitchensync/src/configguigpe.cpp10
-rw-r--r--kitchensync/src/configguijescs.cpp8
-rw-r--r--kitchensync/src/configguildap.cpp26
-rw-r--r--kitchensync/src/configguimoto.cpp2
-rw-r--r--kitchensync/src/configguipalm.cpp2
-rw-r--r--kitchensync/src/configguisunbird.cpp12
-rw-r--r--kitchensync/src/configguisynce.cpp8
-rw-r--r--kitchensync/src/configguisyncmlobex.cpp4
-rw-r--r--kitchensync/src/genericdiffalgo.cpp6
-rw-r--r--kitchensync/src/groupconfig.cpp4
-rw-r--r--kitchensync/src/groupitem.cpp20
-rw-r--r--kitchensync/src/htmldiffalgodisplay.cpp22
-rw-r--r--kitchensync/src/kwidgetlist.cpp16
-rw-r--r--kitchensync/src/mainwidget.cpp10
-rw-r--r--kitchensync/src/mainwindow.cpp2
-rw-r--r--kitchensync/src/memberconfig.cpp4
-rw-r--r--kitchensync/src/syncprocessmanager.cpp2
21 files changed, 118 insertions, 118 deletions
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
"<tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
"<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
"</table>" )
- .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 = "<config>\n";
- config += TQString( "<address_path>%1</address_path>\n" ).arg( mAddressPath->url() );
- config += TQString( "<calendar_path>%1</calendar_path>\n" ).arg( mCalendarPath->url() );
- config += TQString( "<tasks_path>%1</tasks_path>\n" ).arg( mTasksPath->url() );
+ config += TQString( "<address_path>%1</address_path>\n" ).tqarg( mAddressPath->url() );
+ config += TQString( "<calendar_path>%1</calendar_path>\n" ).tqarg( mCalendarPath->url() );
+ config += TQString( "<tasks_path>%1</tasks_path>\n" ).tqarg( mTasksPath->url() );
config += "</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>";
- config += TQString( "<use_local>%1</use_local>" ).arg( mConnectionMode->currentItem() == 0 );
- config += TQString( "<use_ssh>%1</use_ssh>" ).arg( mConnectionMode->currentItem() == 1 );
- config += TQString( "<handheld_ip>%1</handheld_ip>" ).arg( mIP->text() );
- config += TQString( "<handheld_port>%1</handheld_port>" ).arg( mPort->value() );
- config += TQString( "<handheld_user>%1</handheld_user>" ).arg( mUser->text() );
+ config += TQString( "<use_local>%1</use_local>" ).tqarg( mConnectionMode->currentItem() == 0 );
+ config += TQString( "<use_ssh>%1</use_ssh>" ).tqarg( mConnectionMode->currentItem() == 1 );
+ config += TQString( "<handheld_ip>%1</handheld_ip>" ).tqarg( mIP->text() );
+ config += TQString( "<handheld_port>%1</handheld_port>" ).tqarg( mPort->value() );
+ config += TQString( "<handheld_user>%1</handheld_user>" ).tqarg( mUser->text() );
config += "</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 = "<config>\n";
- config += TQString( "<url>%1</url>\n" ).arg( mUrl->text() );
- config += TQString( "<username>%1</username>\n" ).arg( mUsername->text() );
- config += TQString( "<password>%1</password>\n" ).arg( mPassword->text() );
+ config += TQString( "<url>%1</url>\n" ).tqarg( mUrl->text() );
+ config += TQString( "<username>%1</username>\n" ).tqarg( mUsername->text() );
+ config += TQString( "<password>%1</password>\n" ).tqarg( mPassword->text() );
if ( mDelNotify->isChecked() ) { delNotifyState = 1;
} else { delNotifyState = 0;
}
- config += TQString( "<del_notify>%1</del_notify>\n" ).arg( delNotifyState );
+ config += TQString( "<del_notify>%1</del_notify>\n" ).tqarg( delNotifyState );
config += "</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 = "<config>\n";
- config += TQString( "<servername>%1</servername>\n" ).arg( mLdapWidget->host() );
- config += TQString( "<serverport>%1</serverport>\n" ).arg( mLdapWidget->port() );
- config += TQString( "<binddn>%1</binddn>\n" ).arg( mLdapWidget->bindDN() );
- config += TQString( "<password>%1</password>\n" ).arg( mLdapWidget->password() );
- config += TQString( "<anonymous>%1</anonymous>\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" );
- config += TQString( "<searchbase>%1</searchbase>\n" ).arg( mLdapWidget->dn() );
- config += TQString( "<searchfilter>%1</searchfilter>\n" ).arg( mLdapWidget->filter() );
- config += TQString( "<storebase>%1</storebase>\n" ).arg( mLdapWidget->dn() );
- config += TQString( "<keyattr>%1</keyattr>\n" ).arg( mKeyAttribute->text() );
+ config += TQString( "<servername>%1</servername>\n" ).tqarg( mLdapWidget->host() );
+ config += TQString( "<serverport>%1</serverport>\n" ).tqarg( mLdapWidget->port() );
+ config += TQString( "<binddn>%1</binddn>\n" ).tqarg( mLdapWidget->bindDN() );
+ config += TQString( "<password>%1</password>\n" ).tqarg( mLdapWidget->password() );
+ config += TQString( "<anonymous>%1</anonymous>\n" ).tqarg( mLdapWidget->isAuthAnon() ? "1" : "0" );
+ config += TQString( "<searchbase>%1</searchbase>\n" ).tqarg( mLdapWidget->dn() );
+ config += TQString( "<searchfilter>%1</searchfilter>\n" ).tqarg( mLdapWidget->filter() );
+ config += TQString( "<storebase>%1</storebase>\n" ).tqarg( mLdapWidget->dn() );
+ config += TQString( "<keyattr>%1</keyattr>\n" ).tqarg( mKeyAttribute->text() );
TQStringList scopes;
scopes << "base" << "one" << "sub";
- config += TQString( "<scope>%1</scope>\n" ).arg( scopes[ mSearchScope->currentItem() ] );
+ config += TQString( "<scope>%1</scope>\n" ).tqarg( scopes[ mSearchScope->currentItem() ] );
config += TQString( "<authmech>SIMPLE</authmech>\n" );
- config += TQString( "<encryption>%1</encryption>\n" ).arg( mEncryption->isChecked() ? "1" : "0" );
+ config += TQString( "<encryption>%1</encryption>\n" ).tqarg( mEncryption->isChecked() ? "1" : "0" );
- config += TQString( "<ldap_read>%1</ldap_read>\n" ).arg( mReadLdap->isChecked() ? "1" : "0" );
- config += TQString( "<ldap_write>%1</ldap_write>\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" );
+ config += TQString( "<ldap_read>%1</ldap_read>\n" ).tqarg( mReadLdap->isChecked() ? "1" : "0" );
+ config += TQString( "<ldap_write>%1</ldap_write>\n" ).tqarg( mWriteLdap->isChecked() ? "1" : "0" );
config += "</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 = "<config>\n";
- config += TQString( "<tqdevice>%1</tqdevice>\n" ).arg( mDeviceString->text() );
+ config += TQString( "<tqdevice>%1</tqdevice>\n" ).tqarg( mDeviceString->text() );
config += "</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( "<file " );
- config += TQString( "path=\"%1\" " ).arg( lcal->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( "<webdav " );
- config += TQString( "username=\"%1\" " ).arg( wcal->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 = "<config>\n";
- config += TQString( "<contact>%1</contact>\n" ).arg( mContacts->isChecked() ? "1" : "0" );
- config += TQString( "<todos>%1</todos>\n" ).arg( mTodos->isChecked() ? "1" : "0" );
- config += TQString( "<calendar>%1</calendar>\n" ).arg( mCalendar->isChecked() ? "1" : "0" );
- config += TQString( "<file>%1</file>\n" ).arg( mFile->text() );
+ config += TQString( "<contact>%1</contact>\n" ).tqarg( mContacts->isChecked() ? "1" : "0" );
+ config += TQString( "<todos>%1</todos>\n" ).tqarg( mTodos->isChecked() ? "1" : "0" );
+ config += TQString( "<calendar>%1</calendar>\n" ).tqarg( mCalendar->isChecked() ? "1" : "0" );
+ config += TQString( "<file>%1</file>\n" ).tqarg( mFile->text() );
config += "</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 += "<type>" + TQString("%1").arg((*it).first) + "</type>\n";
+ xml += "<type>" + TQString("%1").tqarg((*it).first) + "</type>\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 += "<version>" + TQString("%1").arg((*itVersion).first) + "</version>\n";
+ xml += "<version>" + TQString("%1").tqarg((*itVersion).first) + "</version>\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( "<html>" );
mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" )
- .arg( KGlobalSettings::textColor().name() )
- .arg( KGlobalSettings::baseColor().name() ) );
+ .tqarg( KGlobalSettings::textColor().name() )
+ .tqarg( KGlobalSettings::baseColor().name() ) );
mText.append( "<center><table>" );
mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" )
- .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( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" )
- .arg( id )
- .arg( textToHTML( value ) ) );
+ .tqarg( id )
+ .tqarg( textToHTML( value ) ) );
}
void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value )
{
mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" )
- .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( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" )
- .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<TQMouseEvent*>( event );
- if ( mouseEvent->button() & LeftButton ) {
+ TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT( event );
+ if ( mouseEvent->button() & Qt::LeftButton ) {
TQValueList<KWidgetListItem*>::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<KWidgetListItem*>::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<TQKeyEvent*>( 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 );
}