summaryrefslogtreecommitdiffstats
path: root/kitchensync/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /kitchensync/src
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kitchensync/src')
-rw-r--r--kitchensync/src/aboutpage.cpp62
-rw-r--r--kitchensync/src/configgui.cpp4
-rw-r--r--kitchensync/src/configguiblank.cpp2
-rw-r--r--kitchensync/src/configguievo2.cpp24
-rw-r--r--kitchensync/src/configguifile.cpp2
-rw-r--r--kitchensync/src/configguigcalendar.cpp2
-rw-r--r--kitchensync/src/configguignokii.cpp20
-rw-r--r--kitchensync/src/configguigpe.cpp32
-rw-r--r--kitchensync/src/configguiirmc.cpp2
-rw-r--r--kitchensync/src/configguijescs.cpp28
-rw-r--r--kitchensync/src/configguildap.cpp48
-rw-r--r--kitchensync/src/configguimoto.cpp14
-rw-r--r--kitchensync/src/configguiopie.cpp32
-rw-r--r--kitchensync/src/configguipalm.cpp2
-rw-r--r--kitchensync/src/configguisunbird.cpp32
-rw-r--r--kitchensync/src/configguisynce.cpp24
-rw-r--r--kitchensync/src/configguisyncmlhttp.cpp2
-rw-r--r--kitchensync/src/configguisyncmlobex.cpp6
-rw-r--r--kitchensync/src/connectionwidgets.cpp46
-rw-r--r--kitchensync/src/genericdiffalgo.cpp6
-rw-r--r--kitchensync/src/groupconfig.cpp10
-rw-r--r--kitchensync/src/groupconfigcommon.cpp20
-rw-r--r--kitchensync/src/groupconfigdialog.cpp2
-rw-r--r--kitchensync/src/groupitem.cpp118
-rw-r--r--kitchensync/src/groupitem.h4
-rw-r--r--kitchensync/src/groupview.cpp2
-rw-r--r--kitchensync/src/htmldiffalgodisplay.cpp22
-rw-r--r--kitchensync/src/mainwidget.cpp4
-rw-r--r--kitchensync/src/memberconfig.cpp6
-rw-r--r--kitchensync/src/multiconflictdialog.cpp20
-rw-r--r--kitchensync/src/part.cpp2
-rw-r--r--kitchensync/src/pluginpicker.cpp16
-rw-r--r--kitchensync/src/singleconflictdialog.cpp16
-rw-r--r--kitchensync/src/syncprocess.cpp4
-rw-r--r--kitchensync/src/syncprocess.h4
-rw-r--r--kitchensync/src/syncprocessmanager.cpp2
36 files changed, 321 insertions, 321 deletions
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index e0bb2600b..97ee86c0b 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -19,7 +19,7 @@
*/
#include <tqfile.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -51,18 +51,18 @@ static TQString readFile( const TQString &fileName )
AboutPage::AboutPage( TQWidget *parent )
: TQWidget( parent, "AboutPage" )
{
- TQVBoxLayout *layout = new TQVBoxLayout( this );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQString location = locate( "data", "kitchensync/about/main.html" );
TQString content = readFile( location );
- content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
+ content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
+ content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
else
- content = content.arg( "" );
+ content = content.tqarg( "" );
KHTMLPart *part = new KHTMLPart( this );
- layout->addWidget( part->view() );
+ tqlayout->addWidget( part->view() );
part->begin( KURL( location ) );
@@ -70,8 +70,8 @@ AboutPage::AboutPage( TQWidget *parent )
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 devices 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/configgui.cpp b/kitchensync/src/configgui.cpp
index d59a5f82e..553b2f5e5 100644
--- a/kitchensync/src/configgui.cpp
+++ b/kitchensync/src/configgui.cpp
@@ -45,9 +45,9 @@
#include <klocale.h>
#include <klineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent )
: TQWidget( parent ), mMember( member )
diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp
index cfeeeb332..3e9d47b65 100644
--- a/kitchensync/src/configguiblank.cpp
+++ b/kitchensync/src/configguiblank.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index a5bcd6f3c..0c79fedf0 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -23,7 +23,7 @@
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqstring.h>
#include <kurlrequester.h>
@@ -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>";
@@ -71,21 +71,21 @@ TQString ConfigGuiEvo2::save() const
void ConfigGuiEvo2::initGUI()
{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+ tqlayout->setMargin( KDialog::marginHint() );
- layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
mAddressPath = new KURLRequester( this );
mAddressPath->setMode( KFile::Directory );
- layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
+ tqlayout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
- layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
mCalendarPath = new KURLRequester( this );
mCalendarPath->setMode( KFile::Directory );
- layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
+ tqlayout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
- layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
mTasksPath = new KURLRequester( this );
mTasksPath->setMode( KFile::Directory );
- layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
+ tqlayout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
}
diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp
index fd7b9ff84..6a8b0402c 100644
--- a/kitchensync/src/configguifile.cpp
+++ b/kitchensync/src/configguifile.cpp
@@ -25,7 +25,7 @@
#include <klocale.h>
#include <kdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqdom.h>
diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp
index 1cee57ea8..8e8006764 100644
--- a/kitchensync/src/configguigcalendar.cpp
+++ b/kitchensync/src/configguigcalendar.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqdom.h>
#include <tqlineedit.h>
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index dd2697f06..84db02752 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqcombobox.h>
@@ -37,14 +37,14 @@
ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
{
- TQGridLayout *layout = new TQGridLayout( topLayout() );
+ TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
// Model
TQLabel *label = new TQLabel( i18n("Model:"), this );
- layout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( label, 0, 0 );
mModel = new KComboBox( true, this );
- layout->addWidget( mModel, 0, 1 );
+ tqlayout->addWidget( mModel, 0, 1 );
mModel->insertItem( "2110" );
mModel->insertItem( "3110" );
mModel->insertItem( "6110" );
@@ -67,10 +67,10 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
// Connection
label = new TQLabel( i18n("Connection:"), this );
- layout->addWidget( label, 1, 0 );
+ tqlayout->addWidget( label, 1, 0 );
mConnection = new TQComboBox( this );
- layout->addWidget( mConnection, 1, 1 );
+ tqlayout->addWidget( mConnection, 1, 1 );
connect( mConnection, TQT_SIGNAL (activated( int ) ),
this, TQT_SLOT( slotConnectionChanged ( int ) ) );
@@ -100,15 +100,15 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
mBluetooth = new BluetoothWidget( connectionWidget );
mBluetooth->hide();
- layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
+ tqlayout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
// Port
mPortLabel = new TQLabel( i18n("Port:"), this );
- layout->addWidget( mPortLabel, 2, 0 );
+ tqlayout->addWidget( mPortLabel, 2, 0 );
mPortLabel->hide();
mPort = new KComboBox( true, this );
- layout->addWidget( mPort, 2, 1 );
+ tqlayout->addWidget( mPort, 2, 1 );
mPort->hide();
mPort->insertItem( "/dev/ircomm0" );
@@ -118,7 +118,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
mPort->insertItem( "/dev/ttyUSB0" );
mPort->insertItem( "/dev/ttyUSB1" );
- layout->setColStretch( 1, 1 );
+ tqlayout->setColStretch( 1, 1 );
topLayout()->addStretch( 1 );
}
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index a57831203..118aed14a 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqspinbox.h>
#include <kcombobox.h>
@@ -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>";
@@ -81,23 +81,23 @@ TQString ConfigGuiGpe::save() const
void ConfigGuiGpe::initGUI()
{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+ tqlayout->setMargin( KDialog::marginHint() );
- layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
mConnectionMode = new KComboBox( this );
- layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
+ tqlayout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
- layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
mIP = new KLineEdit( this );
mIP->setInputMask( "000.000.000.000" );
- layout->addWidget( mIP, 1, 1 );
+ tqlayout->addWidget( mIP, 1, 1 );
- layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight );
+ tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight );
mPort = new TQSpinBox( 1, 65536, 1, this );
- layout->addWidget( mPort, 1, 3 );
+ tqlayout->addWidget( mPort, 1, 3 );
- layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
mUser = new KLineEdit( this );
- layout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
+ tqlayout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
}
diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp
index abd765d02..721c82d70 100644
--- a/kitchensync/src/configguiirmc.cpp
+++ b/kitchensync/src/configguiirmc.cpp
@@ -33,7 +33,7 @@
#include <tqapplication.h>
#include <tqeventloop.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
#include <tqtabwidget.h>
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index a1e2c1539..b7a94c447 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <klineedit.h>
#include <kdialog.h>
@@ -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>";
@@ -76,23 +76,23 @@ TQString ConfigGuiJescs::save() const
void ConfigGuiJescs::initGUI()
{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+ tqlayout->setMargin( KDialog::marginHint() );
- layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
mUrl = new KLineEdit( this );
- layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
+ tqlayout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
- layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
mUsername = new KLineEdit( this );
- layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
+ tqlayout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
- layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
mPassword = new KLineEdit( this );
mPassword->setEchoMode( KLineEdit::Password );
- layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
+ tqlayout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
mDelNotify = new TQCheckBox( this );
mDelNotify->setText( "Notify attendees about event/task deletion" );
- layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
+ tqlayout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
}
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 18c9aebcd..fd9dad4b6 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqspinbox.h>
#include <kcombobox.h>
@@ -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>";
@@ -121,8 +121,8 @@ TQString ConfigGuiLdap::save() const
void ConfigGuiLdap::initGUI()
{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+ tqlayout->setMargin( KDialog::marginHint() );
mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST |
KABC::LdapConfigWidget::W_PORT |
@@ -139,14 +139,14 @@ void ConfigGuiLdap::initGUI()
mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this );
mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this );
- layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
- layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
- layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
- layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
- layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
- layout->addWidget( mEncryption, 12, 0 );
- layout->addWidget( mReadLdap, 13, 0 );
- layout->addWidget( mWriteLdap, 13, 3 );
+ tqlayout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
+ tqlayout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
+ tqlayout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
+ tqlayout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
+ tqlayout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
+ tqlayout->addWidget( mEncryption, 12, 0 );
+ tqlayout->addWidget( mReadLdap, 13, 0 );
+ tqlayout->addWidget( mWriteLdap, 13, 3 );
}
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index da17454e3..e461a808f 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -23,7 +23,7 @@
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <klineedit.h>
#include <kdialog.h>
@@ -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" ).tqarg( mDeviceString->text() );
config += "</config>";
@@ -62,10 +62,10 @@ TQString ConfigGuiMoto::save() const
void ConfigGuiMoto::initGUI()
{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+ tqlayout->setMargin( KDialog::marginHint() );
- layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
mDeviceString = new KLineEdit( this );
- layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
+ tqlayout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
}
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index 9620f9c34..c74623345 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -26,59 +26,59 @@
#include <tqcombobox.h>
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqspinbox.h>
ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
{
- TQGridLayout *layout = new TQGridLayout( topLayout() );
+ TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
TQLabel *label = new TQLabel( i18n("Device IP:"), this );
- layout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( label, 0, 0 );
mDeviceIP = new TQLineEdit( this );
mDeviceIP->setInputMask( "000.000.000.000" );
label->setBuddy( mDeviceIP );
- layout->addWidget( mDeviceIP, 0, 1 );
+ tqlayout->addWidget( mDeviceIP, 0, 1 );
label = new TQLabel( i18n("Device Type:"), this );
- layout->addWidget( label, 1, 0 );
+ tqlayout->addWidget( label, 1, 0 );
mDeviceType = new TQComboBox( this );
label->setBuddy( mDeviceType );
- layout->addWidget( mDeviceType, 1, 1 );
+ tqlayout->addWidget( mDeviceType, 1, 1 );
label = new TQLabel( i18n("Username:"), this );
- layout->addWidget( label, 2, 0 );
+ tqlayout->addWidget( label, 2, 0 );
mUserName = new TQLineEdit( this );
label->setBuddy( mUserName );
- layout->addWidget( mUserName, 2, 1 );
+ tqlayout->addWidget( mUserName, 2, 1 );
label = new TQLabel( i18n("Password:"), this );
- layout->addWidget( label, 3, 0 );
+ tqlayout->addWidget( label, 3, 0 );
mPassword = new TQLineEdit( this );
mPassword->setEchoMode( TQLineEdit::Password );
label->setBuddy( mPassword );
- layout->addWidget( mPassword, 3, 1 );
+ tqlayout->addWidget( mPassword, 3, 1 );
label = new TQLabel( i18n("Protocol:"), this );
- layout->addWidget( label, 4, 0 );
+ tqlayout->addWidget( label, 4, 0 );
mConnectionType = new TQComboBox( this );
label->setBuddy( mConnectionType );
- layout->addWidget( mConnectionType, 4, 1 );
+ tqlayout->addWidget( mConnectionType, 4, 1 );
label = new TQLabel( i18n("Port:"), this );
- layout->addWidget( label, 5, 0 );
+ tqlayout->addWidget( label, 5, 0 );
mPort = new TQSpinBox( this );
mPort->setRange( 0, 65335 );
label->setBuddy( mPort );
- layout->addWidget( mPort, 5, 1 );
+ tqlayout->addWidget( mPort, 5, 1 );
mDeviceType->insertItem( i18n("Opie/OpenZaurus") );
mDeviceType->insertItem( i18n("TQtopia2") );
@@ -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/configguipalm.cpp b/kitchensync/src/configguipalm.cpp
index a3a337191..03d87cdb4 100644
--- a/kitchensync/src/configguipalm.cpp
+++ b/kitchensync/src/configguipalm.cpp
@@ -28,7 +28,7 @@
#include <tqcheckbox.h>
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
#include <tqtabwidget.h>
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index de8a14c6c..d51101aeb 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -25,7 +25,7 @@
#include <tqdom.h>
#include <tqtabwidget.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqsizepolicy.h>
@@ -57,14 +57,14 @@ ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *paren
KPushButton *mLocalAddButton = new KPushButton( mLocalWidget );
mLocalAddButton->setText( i18n( "Add new calendar" ) );
- mLocalAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ mLocalAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
mLocalLayout->addWidget( mLocalAddButton );
connect( mLocalAddButton, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( addLocalCalendar() ) );
KPushButton *mWebdavAddButton = new KPushButton( mWebdavWidget );
mWebdavAddButton->setText( i18n( "Add new calendar" ) );
- mWebdavAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ mWebdavAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
mWebdavLayout->addWidget( mWebdavAddButton );
connect( mWebdavAddButton, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( addWebdavCalendar() ) );
@@ -100,7 +100,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
LocalCalendar *cal = new LocalCalendar( path, defaultcal, days, mLocalWidget );
mLocalLayout->removeItem( mLocalSpacer );
- cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
mLocalLayout->addWidget( cal );
mLocalLayout->addItem( mLocalSpacer );
mLocalList.append( cal );
@@ -122,7 +122,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
WebdavCalendar *cal = new WebdavCalendar( username, password,
url, defaultcal, days, mWebdavWidget );
mWebdavLayout->removeItem( mWebdavSpacer );
- cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
mWebdavLayout->addWidget( cal );
mWebdavLayout->addItem( mWebdavSpacer );
mWebdavList.append( cal );
@@ -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\" " );
@@ -175,7 +175,7 @@ void ConfigGuiSunbird::addLocalCalendar()
{
LocalCalendar *cal = new LocalCalendar( mLocalWidget );
mLocalLayout->removeItem( mLocalSpacer );
- cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
mLocalLayout->addWidget( cal );
mLocalLayout->addItem( mLocalSpacer );
mLocalList.append( cal );
@@ -194,7 +194,7 @@ void ConfigGuiSunbird::addWebdavCalendar()
{
WebdavCalendar *cal = new WebdavCalendar( mWebdavWidget );
mWebdavLayout->removeItem( mWebdavSpacer );
- cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
mWebdavLayout->addWidget( cal );
mWebdavLayout->addItem( mWebdavSpacer );
mWebdavList.append( cal );
@@ -239,7 +239,7 @@ void LocalCalendar::initGui()
mDaysSpinBox = new TQSpinBox( this );
mDaysSpinBox->setDisabled( true );
- mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
this, TQT_SLOT( toggleDays( bool ) ) );
@@ -253,7 +253,7 @@ void LocalCalendar::initGui()
mPathRequester = new KURLRequester( this );
KPushButton *removeButton = new KPushButton( this );
- removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ removeButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
removeButton->setText( i18n( "Remove" ) );
connect( removeButton, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( deleteWidget() ) );
@@ -308,7 +308,7 @@ void WebdavCalendar::initGui()
mDaysSpinBox = new TQSpinBox( this );
mDaysSpinBox->setDisabled( true );
- mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
this, TQT_SLOT( toggleDays( bool ) ) );
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index c5c8a8583..898300769 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -23,7 +23,7 @@
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <klineedit.h>
@@ -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>";
@@ -72,22 +72,22 @@ TQString ConfigGuiSynce::save() const
void ConfigGuiSynce::initGUI()
{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
+ tqlayout->setMargin( KDialog::marginHint() );
mContacts = new TQCheckBox( this );
mContacts->setText( "Sync Contacts" );
- layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
+ tqlayout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
mTodos = new TQCheckBox( this );
mTodos->setText( "Sync \'Todo\' items" );
- layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
+ tqlayout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
mCalendar = new TQCheckBox( this );
mCalendar->setText( "Sync Calendar" );
- layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
+ tqlayout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
- layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
mFile = new KLineEdit( this );
- layout->addWidget( mFile, 3, 1 );
+ tqlayout->addWidget( mFile, 3, 1 );
}
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 9340f6e57..26a8c2241 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -30,7 +30,7 @@
#include <tqcheckbox.h>
#include <tqdom.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqspinbox.h>
#include <tqtabwidget.h>
#include <tqvbox.h>
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 479593e5a..61833b4eb 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -28,7 +28,7 @@
#include <klocale.h>
#include <kurlrequester.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
@@ -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/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index e1a0b9101..bb25c271d 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -31,7 +31,7 @@
#include <tqapplication.h>
#include <tqeventloop.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
#include <tqtabwidget.h>
@@ -43,24 +43,24 @@
BluetoothWidget::BluetoothWidget( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this );
+ TQGridLayout *tqlayout = new TQGridLayout( this );
mAddress = new KLineEdit( this );
mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" );
- layout->addWidget( mAddress, 1, 0 );
+ tqlayout->addWidget( mAddress, 1, 0 );
TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this );
label->setBuddy( mAddress );
- layout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( label, 0, 0 );
mChannel = new KLineEdit( this );
- layout->addWidget( mChannel, 1, 1 );
+ tqlayout->addWidget( mChannel, 1, 1 );
mChannelLabel = new TQLabel( i18n( "Channel:" ), this );
mChannelLabel->setBuddy( mChannel );
- layout->addWidget( mChannelLabel, 0, 1 );
+ tqlayout->addWidget( mChannelLabel, 0, 1 );
- layout->setRowStretch( 2, 1 );
+ tqlayout->setRowStretch( 2, 1 );
}
void BluetoothWidget::hideChannel()
@@ -103,23 +103,23 @@ TQString BluetoothWidget::channel() const
IRWidget::IRWidget( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 );
mDevice = new KLineEdit( this );
mSerialNumber = new KLineEdit( this );
- layout->addWidget( mDevice, 1, 0 );
- layout->addWidget( mSerialNumber, 1, 1 );
+ tqlayout->addWidget( mDevice, 1, 0 );
+ tqlayout->addWidget( mSerialNumber, 1, 1 );
TQLabel *label = new TQLabel( i18n( "Device Name:" ), this );
label->setBuddy( mDevice );
- layout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( label, 0, 0 );
label = new TQLabel( i18n( "Serial Number:" ), this );
label->setBuddy( mSerialNumber );
- layout->addWidget( label, 0, 1 );
+ tqlayout->addWidget( label, 0, 1 );
- layout->setRowStretch( 2, 1 );
+ tqlayout->setRowStretch( 2, 1 );
}
void IRWidget::load( const TQDomElement &parent )
@@ -149,23 +149,23 @@ void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
CableWidget::CableWidget( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 );
mManufacturer = new KComboBox( this );
mDevice = new KComboBox( true, this );
- layout->addWidget( mManufacturer, 0, 1 );
- layout->addWidget( mDevice, 1, 1 );
+ tqlayout->addWidget( mManufacturer, 0, 1 );
+ tqlayout->addWidget( mDevice, 1, 1 );
TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this );
label->setBuddy( mManufacturer );
- layout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( label, 0, 0 );
label = new TQLabel( i18n( "Device:" ), this );
label->setBuddy( mDevice );
- layout->addWidget( label, 1, 0 );
+ tqlayout->addWidget( label, 1, 0 );
- layout->setRowStretch( 2, 1 );
+ tqlayout->setRowStretch( 2, 1 );
mManufacturer->insertItem( i18n( "SonyEricsson/Ericsson" ) );
mManufacturer->insertItem( i18n( "Siemens" ) );
@@ -202,16 +202,16 @@ void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
UsbWidget::UsbWidget( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3);
+ TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3);
mInterface = new TQSpinBox( this );
- layout->addWidget( mInterface, 0, 1 );
+ tqlayout->addWidget( mInterface, 0, 1 );
TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this );
label->setBuddy( mInterface );
- layout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( label, 0, 0 );
- layout->setRowStretch( 2, 1 );
+ tqlayout->setRowStretch( 2, 1 );
}
void UsbWidget::setInterface( int interface )
diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp
index 21b83f454..209382ed7 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 8fb6bdc04..99ff35fdb 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -38,7 +38,7 @@
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
GroupConfig::GroupConfig( TQWidget *parent )
@@ -50,8 +50,8 @@ GroupConfig::GroupConfig( TQWidget *parent )
TQFrame *titleFrame = new TQFrame( this );
topLayout->addWidget( titleFrame );
- titleFrame->setPaletteForegroundColor( colorGroup().light() );
- titleFrame->setPaletteBackgroundColor( colorGroup().mid() );
+ titleFrame->setPaletteForegroundColor( tqcolorGroup().light() );
+ titleFrame->setPaletteBackgroundColor( tqcolorGroup().mid() );
TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame );
nameLayout->setMargin( 4 );
@@ -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/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index dbbc89589..5a0cf49d8 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <libqopensync/group.h>
@@ -41,8 +41,8 @@
ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this );
- layout->setMargin( 0 );
+ TQGridLayout *tqlayout = new TQGridLayout( this );
+ tqlayout->setMargin( 0 );
const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
@@ -78,7 +78,7 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
continue;
TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this );
- layout->addWidget( objectCheckBox, row, col );
+ tqlayout->addWidget( objectCheckBox, row, col );
mObjectTypeChecks.insert( objectType, objectCheckBox );
col++;
@@ -128,19 +128,19 @@ void ObjectTypeSelector::save( QSync::Group group )
GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
- layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
+ tqlayout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
mGroupName = new KLineEdit( this );
- layout->addWidget( mGroupName, 0, 1 );
+ tqlayout->addWidget( mGroupName, 0, 1 );
- layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop );
+ tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop );
mObjectTypeSelector = new ObjectTypeSelector( this );
- layout->addWidget( mObjectTypeSelector, 1, 1 );
+ tqlayout->addWidget( mObjectTypeSelector, 1, 1 );
- layout->setRowStretch( 2, 1 );
+ tqlayout->setRowStretch( 2, 1 );
}
void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess )
diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp
index b2bfe470a..4d8be65d0 100644
--- a/kitchensync/src/groupconfigdialog.cpp
+++ b/kitchensync/src/groupconfigdialog.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process )
: KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"),
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index ed240cd32..3a294f5ba 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -28,7 +28,7 @@
#include <kurllabel.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqprogressbar.h>
#include <tqvbox.h>
@@ -50,7 +50,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
boldFont.setBold( true );
boldFont.setPointSize( boldFont.pointSize() + 2 );
- TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
mBox = new TQVBox( this );
mBox->setMargin( 5 );
@@ -71,38 +71,38 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
mIcon = new TQLabel( hbox );
mIcon->setPixmap( icon );
- mIcon->setFixedSize( mIcon->sizeHint() );
- mIcon->setPaletteBackgroundColor( colorGroup().mid() );
+ mIcon->setFixedSize( mIcon->tqsizeHint() );
+ mIcon->setPaletteBackgroundColor( tqcolorGroup().mid() );
mGroupName = new TQLabel( hbox );
- mGroupName->setAlignment( AlignLeft | AlignVCenter );
+ mGroupName->tqsetAlignment( AlignLeft | AlignVCenter );
mGroupName->setIndent( KDialog::spacingHint() );
mGroupName->setFont( boldFont );
- mGroupName->setPaletteForegroundColor( colorGroup().light() );
- mGroupName->setPaletteBackgroundColor( colorGroup().mid() );
-
- mStatus = new TQLabel( hbox );
- mStatus->setAlignment( TQt::AlignRight );
- mStatus->setAlignment( AlignRight | AlignVCenter );
- mStatus->setIndent( KDialog::spacingHint() );
- mStatus->setFont( boldFont );
- mStatus->setPaletteForegroundColor( colorGroup().light() );
- mStatus->setPaletteBackgroundColor( colorGroup().mid() );
- mStatus->setText( i18n( "Ready" ) );
-
- hbox->setPaletteBackgroundColor( colorGroup().mid() );
- hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
-
- layout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
- layout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
- layout->addWidget( mTime, 2, 0 );
- layout->addWidget( mSyncAction, 2, 1 );
- layout->addWidget( mConfigureAction, 2, 2 );
- layout->addWidget( mProgressBar, 2, 3 );
- layout->setColStretch( 0, 1 );
- layout->setRowStretch( 3, 1 );
-
- setPaletteBackgroundColor( kapp->palette().active().base() );
+ mGroupName->setPaletteForegroundColor( tqcolorGroup().light() );
+ mGroupName->setPaletteBackgroundColor( tqcolorGroup().mid() );
+
+ 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() );
+
+ tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
+ tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
+ tqlayout->addWidget( mTime, 2, 0 );
+ tqlayout->addWidget( mSyncAction, 2, 1 );
+ tqlayout->addWidget( mConfigureAction, 2, 2 );
+ tqlayout->addWidget( mProgressBar, 2, 3 );
+ tqlayout->setColStretch( 0, 1 );
+ tqlayout->setRowStretch( 3, 1 );
+
+ 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++;
- mStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) );
+ mtqStatus->setText( i18n( "%1 entries read" ).tqarg( 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" ).tqarg( 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,8 +258,8 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
mSyncAction->setText( i18n( "Synchronize Now" ) );
break;
case QSync::SyncEngineUpdate::SyncSuccessfull:
- mStatus->setText( i18n( "Successfully synchronized" ) );
- mSyncProcess->group().setLastSynchronization( TQDateTime::currentDateTime() );
+ 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;
}
}
@@ -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;
@@ -358,24 +358,24 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
QSync::Plugin plugin = member.plugin();
- TQVBoxLayout *layout = new TQVBoxLayout( this );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQHBox* box = new TQHBox( this );
box->setMargin( 5 );
box->setSpacing( 6 );
- layout->addWidget( box );
+ tqlayout->addWidget( box );
mIcon = new TQLabel( box );
mIcon->setPixmap( icon );
- mIcon->setAlignment( TQt::AlignTop );
- mIcon->setFixedWidth( mIcon->sizeHint().width() );
+ mIcon->tqsetAlignment( TQt::AlignTop );
+ mIcon->setFixedWidth( mIcon->tqsizeHint().width() );
TQVBox *nameBox = new TQVBox( box );
mMemberName = new TQLabel( nameBox );
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 338c733df..524fa0369 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -76,7 +76,7 @@ class GroupItem : public KWidgetListItem
TQLabel *mIcon;
TQLabel *mGroupName;
- TQLabel *mStatus;
+ TQLabel *mtqStatus;
TQLabel *mTime;
KURLLabel *mSyncAction;
KURLLabel *mConfigureAction;
@@ -106,7 +106,7 @@ class MemberItem : public TQWidget
TQLabel *mIcon;
TQLabel *mMemberName;
TQLabel *mDescription;
- TQLabel *mStatus;
+ TQLabel *mtqStatus;
};
#endif
diff --git a/kitchensync/src/groupview.cpp b/kitchensync/src/groupview.cpp
index 42d5b9690..8e1adf87e 100644
--- a/kitchensync/src/groupview.cpp
+++ b/kitchensync/src/groupview.cpp
@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include "aboutpage.h"
#include "groupitem.h"
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
index 1b4c2fe1b..9558eaecd 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/mainwidget.cpp b/kitchensync/src/mainwidget.cpp
index 70451ee4f..8dbef8cab 100644
--- a/kitchensync/src/mainwidget.cpp
+++ b/kitchensync/src/mainwidget.cpp
@@ -38,7 +38,7 @@
#include <kstdaction.h>
#include <kxmlguiclient.h>
-#include <layout.h>
+#include <tqlayout.h>
MainWidget::MainWidget( KXMLGUIClient *guiClient, TQWidget *widget, const char *name )
: TQWidget( widget, name ), mGUIClient( guiClient )
@@ -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/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
index f7fed0141..c2216546c 100644
--- a/kitchensync/src/memberconfig.cpp
+++ b/kitchensync/src/memberconfig.cpp
@@ -27,7 +27,7 @@
#include <kmessagebox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtabwidget.h>
MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member )
@@ -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/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 2e630cace..e7c037610 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -23,7 +23,7 @@
#include <kwidgetlist.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include "memberinfo.h"
@@ -37,10 +37,10 @@ class ChangeItem : public KWidgetListItem
: KWidgetListItem( parent ),
mChange( change )
{
- TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
MemberInfo mi( change.member() );
- layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
+ tqlayout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
TQString type;
switch ( change.changeType() ) {
@@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem
break;
}
- layout->addWidget( new TQLabel( type, this ), 1, 0 );
+ tqlayout->addWidget( new TQLabel( type, this ), 1, 0 );
}
QSync::SyncChange change() const { return mChange; }
@@ -118,24 +118,24 @@ void MultiConflictDialog::ignoreChange()
void MultiConflictDialog::initGUI()
{
- TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
- layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
+ tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
mWidgetList = new KWidgetList( this );
- layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
+ tqlayout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) );
- layout->addWidget( button, 2, 0 );
+ tqlayout->addWidget( button, 2, 0 );
button = new TQPushButton( i18n( "Duplicate Items" ), this );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
- layout->addWidget( button, 2, 1 );
+ tqlayout->addWidget( button, 2, 1 );
button = new TQPushButton( i18n( "Ignore Conflict" ), this );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
- layout->addWidget( button, 2, 2 );
+ tqlayout->addWidget( button, 2, 2 );
}
#include "multiconflictdialog.moc"
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index 086a8ef73..f66eece63 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvbox.h>
#include <kaction.h>
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index 64b025b62..d8d6c46d5 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -32,17 +32,17 @@
#include <klocale.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
: KWidgetListItem( list ), mPlugin( plugin )
{
TQString iconName = MemberInfo::pluginIconName( mPlugin.name() );
- TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
TQLabel *icon = new TQLabel( this );
icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
- icon->setFixedSize( icon->sizeHint() );
+ icon->setFixedSize( icon->tqsizeHint() );
TQLabel *name = new TQLabel( plugin.longName(), this );
TQLabel *description = new TQLabel( plugin.description(), this );
@@ -51,19 +51,19 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
font.setBold( true );
name->setFont( font );
- layout->addWidget( icon, 0, 0 );
- layout->addWidget( name, 0, 1 );
- layout->addWidget( description, 1, 1 );
+ tqlayout->addWidget( icon, 0, 0 );
+ tqlayout->addWidget( name, 0, 1 );
+ tqlayout->addWidget( description, 1, 1 );
}
PluginPicker::PluginPicker( TQWidget *parent )
: TQWidget( parent )
{
- TQBoxLayout *layout = new TQVBoxLayout( this );
+ TQBoxLayout *tqlayout = new TQVBoxLayout( this );
mPluginList = new KWidgetList( this );
- layout->addWidget( mPluginList );
+ tqlayout->addWidget( mPluginList );
connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ),
TQT_SIGNAL( selected() ) );
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index 3c11cd058..f9228e174 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -22,7 +22,7 @@
#include <klocale.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include "addresseediffalgo.h"
@@ -96,28 +96,28 @@ void SingleConflictDialog::ignoreChange()
void SingleConflictDialog::initGUI()
{
- TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
- layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
+ tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this );
- layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
+ tqlayout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) );
- layout->addWidget( button, 2, 0 );
+ tqlayout->addWidget( button, 2, 0 );
button = new TQPushButton( i18n( "Duplicate Items" ), this );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
- layout->addWidget( button, 2, 1 );
+ tqlayout->addWidget( button, 2, 1 );
button = new TQPushButton( i18n( "Ignore Conflict" ), this );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
- layout->addWidget( button, 2, 2 );
+ tqlayout->addWidget( button, 2, 2 );
button = new TQPushButton( i18n( "Use Item" ), this );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) );
- layout->addWidget( button, 2, 3 );
+ tqlayout->addWidget( button, 2, 3 );
}
#include "singleconflictdialog.moc"
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 60310b803..672c789c3 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 0bf9b803e..31cbd50c7 100644
--- a/kitchensync/src/syncprocess.h
+++ b/kitchensync/src/syncprocess.h
@@ -41,8 +41,8 @@ class SyncProcess : public TQObject
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.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 );
}