summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/configguiopie.cpp
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/configguiopie.cpp
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/configguiopie.cpp')
-rw-r--r--kitchensync/src/configguiopie.cpp32
1 files changed, 16 insertions, 16 deletions
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>";