From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmobile/devices/gnokii/gnokii_mobile.cpp | 2 +- kmobile/devices/gnokii/gnokiiconfigui.ui | 10 +++++----- kmobile/kioslave/kio_mobile.cpp | 2 +- kmobile/kmobile_selectiondialog.ui | 8 ++++---- kmobile/kmobileclient.cpp | 2 +- kmobile/kmobiledevice.h | 14 +++++++------- kmobile/kmobileitem.cpp | 2 +- kmobile/pref.cpp | 8 ++++---- 8 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kmobile') diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index 7061493ac..0b2889a62 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -403,7 +403,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt // evaluate timestamp (ignore timezone) TQDateTime datetime; if (entry.date.year<1998) - datetime = TQDateTime::currentDateTime(); + datetime = TQDateTime::tqcurrentDateTime(); else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui index 5b2893a3a..24b663f81 100644 --- a/kmobile/devices/gnokii/gnokiiconfigui.ui +++ b/kmobile/devices/gnokii/gnokiiconfigui.ui @@ -4,7 +4,7 @@ GnokiiConfigUI - + 0 0 @@ -66,7 +66,7 @@ Expanding - + 20 20 @@ -140,7 +140,7 @@ Expanding - + 20 140 @@ -199,7 +199,7 @@ 0 - + 41 0 @@ -269,5 +269,5 @@ reject() - + diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp index d32c11cb4..5cf5bed5e 100644 --- a/kmobile/kioslave/kio_mobile.cpp +++ b/kmobile/kioslave/kio_mobile.cpp @@ -536,7 +536,7 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result, /** - * Test if the url contains a directory or a file. + * Test if the url tqcontains a directory or a file. */ void KMobileProtocol::stat( const KURL &url ) { diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui index 907e35b9b..f637ca9fe 100644 --- a/kmobile/kmobile_selectiondialog.ui +++ b/kmobile/kmobile_selectiondialog.ui @@ -4,7 +4,7 @@ KMobile_SelectionDialog - + 0 0 @@ -21,7 +21,7 @@ - layout3 + tqlayout3 @@ -86,7 +86,7 @@ Expanding - + 181 41 @@ -105,7 +105,7 @@ - + kdialog.h kpushbutton.h diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp index 63910fba1..05bcff554 100644 --- a/kmobile/kmobileclient.cpp +++ b/kmobile/kmobileclient.cpp @@ -126,7 +126,7 @@ TQStringList KMobileClient::deviceNames() { if (!isKMobileAvailable()) return TQStringList(); - RETURN_TYPE( "deviceNames()", TQString::fromLatin1(""), TQStringList ); + RETURN_TYPE( "deviceNames()", TQString::tqfromLatin1(""), TQStringList ); } void KMobileClient::removeDevice( TQString deviceName ) diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 8d1e69a0d..04bd10d2c 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -316,7 +316,7 @@ public: signals: /** * Call this from stat() to express details about an object, the - * UDSEntry customarily contains the atoms describing file name, size, + * UDSEntry customarily tqcontains the atoms describing file name, size, * mimetype, etc. * @param _entry The UDSEntry containing all of the object attributes. */ @@ -351,10 +351,10 @@ signals: * KIO::AuthInfo authInfo; * if ( openPassDlg( authInfo ) ) * { - * kdDebug() << TQString::fromLatin1("User: ") + * kdDebug() << TQString::tqfromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::fromLatin1("Password: ") - * << TQString::fromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::tqfromLatin1("Password: ") + * << TQString::tqfromLatin1("Not displayed here!") << endl; * } * * @@ -368,10 +368,10 @@ signals: * TQString errorMsg = "You entered an incorrect password."; * if ( openPassDlg( authInfo, errorMsg ) ) * { - * kdDebug() << TQString::fromLatin1("User: ") + * kdDebug() << TQString::tqfromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::fromLatin1("Password: ") - * << TQString::fromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::tqfromLatin1("Password: ") + * << TQString::tqfromLatin1("Not displayed here!") << endl; * } * * diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index 0e4705c5b..3780c9801 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -39,7 +39,7 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser setText(service->name()); m_deviceDesktopFile = service->desktopEntryName(); m_deviceConfigFile = TQString("kmobile_%1_rc").arg(text()); - m_deviceConfigFile = m_deviceConfigFile.replace(' ', ""); + m_deviceConfigFile = m_deviceConfigFile.tqreplace(' ', ""); m_iconName = service->icon(); }; diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp index 6b5a02309..2bb907445 100644 --- a/kmobile/pref.cpp +++ b/kmobile/pref.cpp @@ -27,8 +27,8 @@ KMobilePreferences::KMobilePreferences() KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } @@ -36,8 +36,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } -- cgit v1.2.1