From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/protocols/sms/serviceloader.cpp | 2 +- kopete/protocols/sms/services/gsmlib.cpp | 28 +++++----- kopete/protocols/sms/services/gsmlib.h | 9 ++-- kopete/protocols/sms/services/gsmlibprefs.ui | 14 ++--- .../protocols/sms/services/kopete_unix_serial.cpp | 10 ++-- kopete/protocols/sms/services/kopete_unix_serial.h | 2 +- kopete/protocols/sms/services/smsclient.cpp | 38 +++++++------- kopete/protocols/sms/services/smsclient.h | 5 +- kopete/protocols/sms/services/smsclientprefs.ui | 20 ++++---- kopete/protocols/sms/services/smssend.cpp | 32 ++++++------ kopete/protocols/sms/services/smssend.h | 3 +- kopete/protocols/sms/services/smssendprefs.ui | 22 ++++---- kopete/protocols/sms/services/smssendprovider.cpp | 36 ++++++------- kopete/protocols/sms/services/smssendprovider.h | 5 +- kopete/protocols/sms/smsaccount.cpp | 26 +++++----- kopete/protocols/sms/smsaccount.h | 7 +-- kopete/protocols/sms/smsaddcontactpage.cpp | 4 +- kopete/protocols/sms/smsaddcontactpage.h | 3 +- kopete/protocols/sms/smscontact.cpp | 4 +- kopete/protocols/sms/smscontact.h | 3 +- kopete/protocols/sms/smseditaccountwidget.cpp | 8 +-- kopete/protocols/sms/smseditaccountwidget.h | 3 +- kopete/protocols/sms/smsprotocol.cpp | 18 +++---- kopete/protocols/sms/smsprotocol.h | 7 +-- kopete/protocols/sms/smsservice.h | 9 ++-- kopete/protocols/sms/smsuserpreferences.h | 1 + kopete/protocols/sms/ui/smsactprefs.ui | 60 +++++++++++----------- kopete/protocols/sms/ui/smsadd.ui | 26 +++++----- kopete/protocols/sms/ui/smsuserprefs.ui | 14 ++--- 29 files changed, 215 insertions(+), 204 deletions(-) (limited to 'kopete/protocols/sms') diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp index 0ebbe7fa..b3f497be 100644 --- a/kopete/protocols/sms/serviceloader.cpp +++ b/kopete/protocols/sms/serviceloader.cpp @@ -43,7 +43,7 @@ SMSService* ServiceLoader::loadService(const TQString& name, Kopete::Account* ac #endif else { - KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").arg(name), + KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").tqarg(name), i18n("Error Loading Service")); s = 0L; } diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 7f129473..35d7c274 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -67,10 +67,10 @@ void GSMLibEvent::setSubType(GSMLibEvent::SubType t) } ///////////////////////////////////////////////////////////////////// -GSMLibThread::GSMLibThread(TQString dev, GSMLib* parent) +GSMLibThread::GSMLibThread(TQString dev, GSMLib* tqparent) { m_device = dev; - m_parent = parent; + m_parent = tqparent; m_run = true; m_MeTa = NULL; } @@ -308,7 +308,7 @@ void GSMLib::saveConfig() { KConfigGroup* c = m_account->configGroup(); - c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device); + c->writeEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), m_device); } } @@ -320,8 +320,8 @@ void GSMLib::loadConfig() TQString temp; KConfigGroup* c = m_account->configGroup(); - temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString::null); - if( temp != TQString::null ) + temp = c->readEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), TQString()); + if( temp != TQString() ) m_device = temp; } } @@ -348,12 +348,12 @@ void GSMLib::disconnect() } -void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) +void GSMLib::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) { - m_parent = parent; - m_layout = layout; - TQWidget *configWidget = configureWidget(parent); - layout->addMultiCellWidget(configWidget, 0, 1, 0, 1); + m_parent = tqparent; + m_layout = tqlayout; + TQWidget *configWidget = configureWidget(tqparent); + tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1); configWidget->show(); } @@ -362,11 +362,11 @@ void GSMLib::send(const Kopete::Message& msg) m_thread->send(msg); } -TQWidget* GSMLib::configureWidget(TQWidget* parent) +TQWidget* GSMLib::configureWidget(TQWidget* tqparent) { if (prefWidget == 0L) - prefWidget = new GSMLibPrefsUI(parent); + prefWidget = new GSMLibPrefsUI(tqparent); loadConfig(); prefWidget->device->setURL(m_device); @@ -419,7 +419,7 @@ void GSMLib::customEvent(TQCustomEvent* e) TQString text = ge->Text; // Locate a contact - SMSContact* contact = static_cast( m_account->contacts().find( nr )); + SMSContact* contact = static_cast( m_account->contacts().tqfind( nr )); if ( contact==NULL ) { // No contact found, make a new one @@ -444,7 +444,7 @@ void GSMLib::customEvent(TQCustomEvent* e) const TQString& GSMLib::description() { TQString url = "http://www.pxh.de/fs/gsmlib/"; - m_description = i18n("GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on %1").arg(url).arg(url); + m_description = i18n("GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on %1").tqarg(url).tqarg(url); return m_description; } diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h index b3c9951f..a3f01995 100644 --- a/kopete/protocols/sms/services/gsmlib.h +++ b/kopete/protocols/sms/services/gsmlib.h @@ -46,12 +46,13 @@ class GSMLibThread; class GSMLib : public SMSService { Q_OBJECT + TQ_OBJECT public: GSMLib(Kopete::Account* account); ~GSMLib(); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* parent, TQGridLayout* container); + void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); int maxSize(); const TQString& description(); @@ -66,7 +67,7 @@ public slots: protected: virtual void customEvent(TQCustomEvent* e); - TQWidget* configureWidget(TQWidget* parent); + TQWidget* configureWidget(TQWidget* tqparent); void saveConfig(); void loadConfig(); @@ -83,7 +84,7 @@ protected: /// Custom event for async-events -class GSMLibEvent : public QCustomEvent +class GSMLibEvent : public TQCustomEvent { public: enum SubType { CONNECTED, DISCONNECTED, NEW_MESSAGE, MSG_SENT, MSG_NOT_SENT }; @@ -107,7 +108,7 @@ protected: class GSMLibThread : public TQThread, gsmlib::GsmEvent { public: - GSMLibThread(TQString dev, GSMLib* parent); + GSMLibThread(TQString dev, GSMLib* tqparent); virtual ~GSMLibThread(); virtual void run(); diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui index 108f6326..49545bc5 100644 --- a/kopete/protocols/sms/services/gsmlibprefs.ui +++ b/kopete/protocols/sms/services/gsmlibprefs.ui @@ -1,6 +1,6 @@ GSMLibPrefsUI - + GSMLibPrefsUI @@ -29,14 +29,14 @@ Expanding - + 321 16 - + textLabel8 @@ -63,15 +63,15 @@ Horizontal - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -91,7 +91,7 @@ - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp index c40f831b..e8650de0 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.cpp +++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp @@ -280,13 +280,13 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, // for the first call getLine() waits only 3 seconds // because of _timeoutVal = 3 string s = getLine(); - if (s.find("OK") != string::npos || - s.find("CABLE: GSM") != string::npos) + if (s.tqfind("OK") != string::npos || + s.tqfind("CABLE: GSM") != string::npos) { foundOK = true; readTries = 0; // found OK, exit loop } - else if (s.find("ERROR") != string::npos) + else if (s.tqfind("ERROR") != string::npos) readTries = 0; // error, exit loop } @@ -301,8 +301,8 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, while (readTries-- > 0) { string s = getLine(); - if (s.find("OK") != string::npos || - s.find("CABLE: GSM") != string::npos) + if (s.tqfind("OK") != string::npos || + s.tqfind("CABLE: GSM") != string::npos) { _readNotifier = new TQSocketNotifier(_fd, TQSocketNotifier::Read); connect( _readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated())); diff --git a/kopete/protocols/sms/services/kopete_unix_serial.h b/kopete/protocols/sms/services/kopete_unix_serial.h index fb1d73c4..048e8ce8 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.h +++ b/kopete/protocols/sms/services/kopete_unix_serial.h @@ -32,7 +32,7 @@ namespace gsmlib class KopeteUnixSerialPort : public TQObject, public Port { - Q_OBJECT; + TQ_OBJECT; protected: int _fd; // file descriptor for device diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 17a27066..b45793d1 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -41,13 +41,13 @@ SMSClient::~SMSClient() { } -void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) +void SMSClient::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) { - kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl; - m_parent = parent; - m_layout = layout; - TQWidget *configWidget = configureWidget(parent); - layout->addMultiCellWidget(configWidget, 0, 1, 0, 1); + kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl; + m_parent = tqparent; + m_layout = tqlayout; + TQWidget *configWidget = configureWidget(tqparent); + tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1); configWidget->show(); } @@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg) m_msg = msg; KConfigGroup* c = m_account->configGroup(); - TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), TQString::null); + TQString provider = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), TQString()); if (provider.isNull()) { @@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg) return; } - TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"). TQString::null); + TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString()); if (programName.isNull()) programName = "/usr/bin/sms_client"; @@ -87,25 +87,25 @@ void SMSClient::send(const Kopete::Message& msg) p->start(KProcess::Block, KProcess::AllOutput); } -TQWidget* SMSClient::configureWidget(TQWidget* parent) +TQWidget* SMSClient::configureWidget(TQWidget* tqparent) { kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl; if (prefWidget == 0L) - prefWidget = new SMSClientPrefsUI(parent); + prefWidget = new SMSClientPrefsUI(tqparent); prefWidget->configDir->setMode(KFile::Directory); TQString configDir; if (m_account) - configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), TQString::null); + configDir = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), TQString()); if (configDir.isNull()) configDir = "/etc/sms"; prefWidget->configDir->setURL(configDir); TQString programName; if (m_account) - programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), - TQString::null); + programName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), + TQString()); if (programName.isNull()) programName = "/usr/bin/sms_client"; prefWidget->program->setURL(programName); @@ -114,7 +114,7 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) if (m_account) { - TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName")); + TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName")); for (int i=0; i < prefWidget->provider->count(); i++) { if (prefWidget->provider->text(i) == pName) @@ -136,9 +136,9 @@ void SMSClient::savePreferences() { KConfigGroup* c = m_account->configGroup(); - c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), prefWidget->program->url()); - c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), prefWidget->configDir->url()); - c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), prefWidget->provider->currentText()); + c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), prefWidget->program->url()); + c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), prefWidget->configDir->url()); + c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), prefWidget->provider->currentText()); } } @@ -147,7 +147,7 @@ TQStringList SMSClient::providers() TQStringList p; TQDir d; - d.setPath(TQString("%1/services/").arg(prefWidget->configDir->url())); + d.setPath(TQString("%1/services/").tqarg(prefWidget->configDir->url())); p += d.entryList("*", TQDir::Files); return p; @@ -176,7 +176,7 @@ int SMSClient::maxSize() const TQString& SMSClient::description() { TQString url = "http://www.smsclient.org"; - m_description = i18n("SMSClient is a program for sending SMS with the modem. The program can be found on %1").arg(url).arg(url); + m_description = i18n("SMSClient is a program for sending SMS with the modem. The program can be found on %1").tqarg(url).tqarg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h index 00ad5041..f922a011 100644 --- a/kopete/protocols/sms/services/smsclient.h +++ b/kopete/protocols/sms/services/smsclient.h @@ -31,12 +31,13 @@ class KProcess; class SMSClient : public SMSService { Q_OBJECT + TQ_OBJECT public: SMSClient(Kopete::Account* account); ~SMSClient(); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* parent, TQGridLayout* container); + void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); int maxSize(); const TQString& description(); @@ -51,7 +52,7 @@ signals: void messageSent(const Kopete::Message &); private: - TQWidget* configureWidget(TQWidget* parent); + TQWidget* configureWidget(TQWidget* tqparent); SMSClientPrefsUI* prefWidget; TQStringList providers(); diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui index 363081e3..40dffc4e 100644 --- a/kopete/protocols/sms/services/smsclientprefs.ui +++ b/kopete/protocols/sms/services/smsclientprefs.ui @@ -1,6 +1,6 @@ SMSClientPrefsUI - + SMSClientPrefsUI @@ -29,14 +29,14 @@ Expanding - + 321 16 - + textLabel8 @@ -63,15 +63,15 @@ Horizontal - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -82,7 +82,7 @@ program - + textLabel3 @@ -103,12 +103,12 @@ configDir - + provider - + textLabel2 @@ -123,7 +123,7 @@ - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 2e843dea..8249948a 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -50,7 +50,7 @@ SMSSend::~SMSSend() void SMSSend::send(const Kopete::Message& msg) { kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl; - TQString provider = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null); + TQString provider = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString()); if (provider.length() < 1) { @@ -58,7 +58,7 @@ void SMSSend::send(const Kopete::Message& msg) return; } - TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null); + TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString()); if (prefix.isNull()) { KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("No prefix set for SMSSend, please change it in the configuration dialog."), i18n("No Prefix")); @@ -73,23 +73,23 @@ void SMSSend::send(const Kopete::Message& msg) m_provider->send(msg); } -void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) +void SMSSend::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) { - kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl; - m_parent = parent; - m_layout = layout; + kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl; + m_parent = tqparent; + m_layout = tqlayout; // could end up being deleted twice?? delete prefWidget; - prefWidget = new SMSSendPrefsUI(parent); - layout->addMultiCellWidget(prefWidget, 0, 1, 0, 1); + prefWidget = new SMSSendPrefsUI(tqparent); + tqlayout->addMultiCellWidget(prefWidget, 0, 1, 0, 1); prefWidget->program->setMode(KFile::Directory); - TQString prefix = TQString::null; + TQString prefix = TQString(); if (m_account) - prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null); + prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString()); if (prefix.isNull()) { TQDir d("/usr/share/smssend"); @@ -140,7 +140,7 @@ void SMSSend::loadProviders(const TQString &prefix) TQDir d(prefix + "/share/smssend"); if (!d.exists()) { - setOptions(TQString::null); + setOptions(TQString()); return; } @@ -160,7 +160,7 @@ void SMSSend::loadProviders(const TQString &prefix) bool found = false; if (m_account) - { TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null); + { TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString()); for (int i=0; i < prefWidget->provider->count(); i++) { if (prefWidget->provider->text(i) == pName) @@ -181,7 +181,7 @@ void SMSSend::setOptions(const TQString& name) kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl; if(!prefWidget) return; // sanity check - prefWidget->providerLabel->setText(i18n("%1 Settings").arg(name)); + prefWidget->providerLabel->setText(i18n("%1 Settings").tqarg(name)); labels.setAutoDelete(true); labels.clear(); @@ -222,10 +222,10 @@ int SMSSend::maxSize() { kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl; - TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null); + TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString()); if (pName.length() < 1) return 160; - TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null); + TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString()); if (prefix.isNull()) prefix = "/usr"; // quick sanity check @@ -237,7 +237,7 @@ int SMSSend::maxSize() const TQString& SMSSend::description() { TQString url = "http://zekiller.skytech.org/smssend_en.php"; - m_description = i18n("SMSSend is a program for sending SMS through gateways on the web. It can be found on %2").arg(url).arg(url); + m_description = i18n("SMSSend is a program for sending SMS through gateways on the web. It can be found on %2").tqarg(url).tqarg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smssend.h b/kopete/protocols/sms/services/smssend.h index 2ffd4fd5..14adbd20 100644 --- a/kopete/protocols/sms/services/smssend.h +++ b/kopete/protocols/sms/services/smssend.h @@ -33,6 +33,7 @@ class TQGridLayout; class SMSSend : public SMSService { Q_OBJECT + TQ_OBJECT public: SMSSend(Kopete::Account* account); ~SMSSend(); @@ -40,7 +41,7 @@ public: virtual void setAccount(Kopete::Account* account); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* parent, TQGridLayout* container); + void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); int maxSize(); const TQString& description(); diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui index faf3a306..b9b1b06a 100644 --- a/kopete/protocols/sms/services/smssendprefs.ui +++ b/kopete/protocols/sms/services/smssendprefs.ui @@ -1,6 +1,6 @@ SMSSendPrefsUI - + SMSSendPrefsUI @@ -29,14 +29,14 @@ Expanding - + 311 16 - + textLabel7_2 @@ -63,15 +63,15 @@ Horizontal - + - layout12 + tqlayout12 unnamed - + provider @@ -89,7 +89,7 @@ - + textLabel2 @@ -108,7 +108,7 @@ provider - + textLabel1 @@ -139,14 +139,14 @@ Expanding - + 351 16 - + providerLabel @@ -179,7 +179,7 @@ program provider - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 5f0f37ee..c886cb3d 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -32,8 +32,8 @@ #include "smsprotocol.h" #include "smscontact.h" -SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent, const char *name) - : TQObject( parent, name ), m_account(account) +SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* tqparent, const char *name) + : TQObject( tqparent, name ), m_account(account) { kdWarning( 14160 ) << k_funcinfo << "this = " << this << ", m_account = " << m_account << " (should be ok if zero!!)" << endl; @@ -49,7 +49,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p if (f.open(IO_ReadOnly)) { TQTextStream t(&f); - TQString group = TQString("SMSSend-%1").arg(provider); + TQString group = TQString("SMSSend-%1").tqarg(provider); bool exactNumberMatch = false; TQStringList numberWords; numberWords.append("Tel"); @@ -71,7 +71,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p TQStringList args = TQStringList::split(':',s); TQStringList options = TQStringList::split(' ', args[0]); - names.append(options[0].replace(0,1,"")); + names.append(options[0].tqreplace(0,1,"")); bool hidden = false; for(unsigned i = 1; i < options.count(); i++) @@ -87,21 +87,21 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p descriptions.append(args[1]); if (m_account) - values.append(m_account->configGroup()->readEntry(TQString("%1:%2").arg(group).arg(names[names.count()-1]), - TQString::null)); + values.append(m_account->configGroup()->readEntry(TQString("%1:%2").tqarg(group).tqarg(names[names.count()-1]), + TQString())); else values.append(""); - if( args[0].contains("Message") || args[0].contains("message") - || args[0].contains("message") || args[0].contains("nachricht") - || args[0].contains("Msg") || args[0].contains("Mensagem") ) + if( args[0].tqcontains("Message") || args[0].tqcontains("message") + || args[0].tqcontains("message") || args[0].tqcontains("nachricht") + || args[0].tqcontains("Msg") || args[0].tqcontains("Mensagem") ) { for( unsigned i = 0; i < options.count(); i++) { - if (options[i].contains("Size=")) + if (options[i].tqcontains("Size=")) { TQString option = options[i]; - option.replace(0,5,""); + option.tqreplace(0,5,""); m_maxSize = option.toInt(); } } @@ -111,7 +111,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p { for (TQStringList::Iterator it=numberWords.begin(); it != numberWords.end(); ++it) { - if (args[0].contains(*it)) + if (args[0].tqcontains(*it)) { telPos = names.count() - 1; if (args[0] == *it) @@ -119,7 +119,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p // kdDebug(14160) << "Exact match for " << args[0] << endl; exactNumberMatch = true; } -// kdDebug(14160) << "args[0] (" << args[0] << ") contains " << *it << endl; +// kdDebug(14160) << "args[0] (" << args[0] << ") tqcontains " << *it << endl; } } } @@ -150,7 +150,7 @@ void SMSSendProvider::setAccount(Kopete::Account *account) const TQString& SMSSendProvider::name(int i) { if ( telPos == i || messagePos == i) - return TQString::null; + return TQString(); else return names[i]; } @@ -175,7 +175,7 @@ void SMSSendProvider::save(TQPtrList& args) kdDebug( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl; if (!m_account) return; // prevent crash in worst case - TQString group = TQString("SMSSend-%1").arg(provider); + TQString group = TQString("SMSSend-%1").tqarg(provider); int namesI=0; for (unsigned i=0; i < args.count(); i++) @@ -194,7 +194,7 @@ void SMSSendProvider::save(TQPtrList& args) // kdDebug(14160) << k_funcinfo << "saving " << args.at(i) << " to " << names[namesI] << endl; if (!args.at(i)->text().isEmpty()) { values[namesI] = args.at(i)->text(); - m_account->configGroup()->writeEntry(TQString("%1:%2").arg(group).arg(names[namesI]), values[namesI]); + m_account->configGroup()->writeEntry(TQString("%1:%2").tqarg(group).tqarg(names[namesI]), values[namesI]); } namesI++; } @@ -239,9 +239,9 @@ void SMSSendProvider::send(const Kopete::Message& msg) KProcess* p = new KProcess; - kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; + kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").tqarg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; - *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; + *p << TQString("%1/bin/smssend").tqarg(prefix) << provider << values; output = ""; connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *))); diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h index bd046104..9d899ce8 100644 --- a/kopete/protocols/sms/services/smssendprovider.h +++ b/kopete/protocols/sms/services/smssendprovider.h @@ -33,11 +33,12 @@ class KProcess; namespace Kopete { class Account; } class SMSContact; -class SMSSendProvider : public QObject +class SMSSendProvider : public TQObject { Q_OBJECT + TQ_OBJECT public: - SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent = 0, const char* name = 0); + SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* tqparent = 0, const char* name = 0); ~SMSSendProvider(); void setAccount(Kopete::Account *account); diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 8fea6a12..f4cf21f5 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -34,14 +34,14 @@ #include "smsprotocol.h" #include "smscontact.h" -SMSAccount::SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name ) - : Kopete::Account( parent, accountID, name ) +SMSAccount::SMSAccount( SMSProtocol *tqparent, const TQString &accountID, const char *name ) + : Kopete::Account( tqparent, accountID, name ) { setMyself( new SMSContact(this, accountID, accountID, Kopete::ContactList::self()->myself()) ); loadConfig(); myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOffline ); - TQString sName = configGroup()->readEntry("ServiceName", TQString::null); + TQString sName = configGroup()->readEntry("ServiceName", TQString()); theService = ServiceLoader::loadService(sName, this); if( theService ) @@ -65,14 +65,14 @@ SMSAccount::~SMSAccount() void SMSAccount::loadConfig() { theSubEnable = configGroup()->readBoolEntry("SubEnable", false); - theSubCode = configGroup()->readEntry("SubCode", TQString::null); + theSubCode = configGroup()->readEntry("SubCode", TQString()); theLongMsgAction = (SMSMsgAction)configGroup()->readNumEntry("MsgAction", 0); } void SMSAccount::translateNumber(TQString &theNumber) { if(theNumber[0] == TQChar('0') && theSubEnable) - theNumber.replace(0, 1, theSubCode); + theNumber.tqreplace(0, 1, theSubCode); } const bool SMSAccount::splitNowMsgTooLong(int msgLength) @@ -83,7 +83,7 @@ const bool SMSAccount::splitNowMsgTooLong(int msgLength) int max = theService->maxSize(); if(theLongMsgAction == ACT_CANCEL) return false; if(theLongMsgAction == ACT_SPLIT) return true; - if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").arg(max).arg(msgLength / max + 1), + if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").tqarg(max).tqarg(msgLength / max + 1), i18n("Message Too Long"), i18n("Divide"), i18n("Do Not Divide")) == KMessageBox::Yes) return true; else @@ -104,7 +104,7 @@ void SMSAccount::connect(const Kopete::OnlineStatus&) void SMSAccount::slotConnected() { myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOnline ); - setAllContactsStatus( SMSProtocol::protocol()->SMSOnline ); + setAllContactstqStatus( SMSProtocol::protocol()->SMSOnline ); } void SMSAccount::disconnect() @@ -116,7 +116,7 @@ void SMSAccount::disconnect() void SMSAccount::slotDisconnected() { myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOffline ); - setAllContactsStatus( SMSProtocol::protocol()->SMSOffline ); + setAllContactstqStatus( SMSProtocol::protocol()->SMSOffline ); } void SMSAccount::slotSendMessage(Kopete::Message &msg) @@ -170,9 +170,9 @@ void SMSAccount::slotSendingFailure(const Kopete::Message &msg, const TQString & } bool SMSAccount::createContact( const TQString &contactId, - Kopete::MetaContact * parentContact ) + Kopete::MetaContact * tqparentContact ) { - if (new SMSContact(this, contactId, parentContact->displayName(), parentContact)) + if (new SMSContact(this, contactId, tqparentContact->displayName(), tqparentContact)) return true; else return false; @@ -186,11 +186,11 @@ KActionMenu* SMSAccount::actionMenu() void SMSAccount::setOnlineStatus( const Kopete::OnlineStatus & status , const TQString &reason) { - if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online ) + if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online ) connect(); - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) disconnect(); - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away ) + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away ) setAway( true, reason ); } diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index 1df8a63f..7ab7dbd4 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -30,9 +30,10 @@ enum SMSMsgAction { ACT_ASK = 0, ACT_CANCEL, ACT_SPLIT }; class SMSAccount : public Kopete::Account { Q_OBJECT + TQ_OBJECT public: - SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name = 0L ); + SMSAccount( SMSProtocol *tqparent, const TQString &accountID, const char *name = 0L ); ~SMSAccount(); virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar @@ -52,7 +53,7 @@ public: public slots: void loadConfig(); - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); public slots: virtual void connect(const Kopete::OnlineStatus& initial= Kopete::OnlineStatus()); @@ -67,7 +68,7 @@ protected slots: protected: - bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); + bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); private: bool theSubEnable; diff --git a/kopete/protocols/sms/smsaddcontactpage.cpp b/kopete/protocols/sms/smsaddcontactpage.cpp index c18e5866..a1be6890 100644 --- a/kopete/protocols/sms/smsaddcontactpage.cpp +++ b/kopete/protocols/sms/smsaddcontactpage.cpp @@ -22,8 +22,8 @@ -SMSAddContactPage::SMSAddContactPage(TQWidget *parent, const char *name ) - : AddContactPage(parent,name) +SMSAddContactPage::SMSAddContactPage(TQWidget *tqparent, const char *name ) + : AddContactPage(tqparent,name) { (new TQVBoxLayout(this))->setAutoAdd(true); smsdata = new smsAddUI(this); diff --git a/kopete/protocols/sms/smsaddcontactpage.h b/kopete/protocols/sms/smsaddcontactpage.h index 6f6f4290..4c4899d9 100644 --- a/kopete/protocols/sms/smsaddcontactpage.h +++ b/kopete/protocols/sms/smsaddcontactpage.h @@ -26,8 +26,9 @@ class SMSProtocol; class SMSAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - SMSAddContactPage(TQWidget *parent=0, const char *name=0); + SMSAddContactPage(TQWidget *tqparent=0, const char *name=0); ~SMSAddContactPage(); smsAddUI *smsdata; virtual bool validateData(); diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index f47a0b46..19a42549 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -32,8 +32,8 @@ #include "smsuserpreferences.h" SMSContact::SMSContact( Kopete::Account* _account, const TQString &phoneNumber, - const TQString &displayName, Kopete::MetaContact *parent ) -: Kopete::Contact( _account, phoneNumber, parent ), m_phoneNumber( phoneNumber ) + const TQString &displayName, Kopete::MetaContact *tqparent ) +: Kopete::Contact( _account, phoneNumber, tqparent ), m_phoneNumber( phoneNumber ) { // kdWarning( 14160 ) << k_funcinfo << " this = " << this << ", phone = " << phoneNumber << endl; setNickName( displayName ); diff --git a/kopete/protocols/sms/smscontact.h b/kopete/protocols/sms/smscontact.h index 548aa063..1c77f25f 100644 --- a/kopete/protocols/sms/smscontact.h +++ b/kopete/protocols/sms/smscontact.h @@ -32,9 +32,10 @@ class KAction; class SMSContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: SMSContact( Kopete::Account* _account, const TQString &phoneNumber, - const TQString &displayName, Kopete::MetaContact *parent ); + const TQString &displayName, Kopete::MetaContact *tqparent ); TQPtrList* customContextMenuActions(); diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index 97379e75..94d480c2 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -35,8 +35,8 @@ #include "smsprotocol.h" #include "smsaccount.h" -SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *account, TQWidget *parent, const char */*name*/) - : TQWidget(parent), KopeteEditAccountWidget(account) +SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *account, TQWidget *tqparent, const char */*name*/) + : TQWidget(tqparent), KopeteEditAccountWidget(account) { TQVBoxLayout *l = new TQVBoxLayout(this, TQBoxLayout::Down); preferencesDialog = new smsActPrefsUI(this); @@ -55,9 +55,9 @@ SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Accoun //Disable changing the account ID for now //FIXME: Remove this when we can safely change the account ID (Matt) preferencesDialog->accountId->setDisabled(true); - sName = account->configGroup()->readEntry("ServiceName", TQString::null); + sName = account->configGroup()->readEntry("ServiceName", TQString()); preferencesDialog->subEnable->setChecked(account->configGroup()->readBoolEntry("SubEnable", false)); - preferencesDialog->subCode->setText(account->configGroup()->readEntry("SubCode", TQString::null)); + preferencesDialog->subCode->setText(account->configGroup()->readEntry("SubCode", TQString())); preferencesDialog->ifMessageTooLong->setCurrentItem(SMSMsgAction(account->configGroup()->readNumEntry("MsgAction", 0))); } diff --git a/kopete/protocols/sms/smseditaccountwidget.h b/kopete/protocols/sms/smseditaccountwidget.h index 497bfce8..de8ef844 100644 --- a/kopete/protocols/sms/smseditaccountwidget.h +++ b/kopete/protocols/sms/smseditaccountwidget.h @@ -29,8 +29,9 @@ class TQGridLayout; class SMSEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0); + SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent = 0, const char *name = 0); ~SMSEditAccountWidget(); bool validateData(); diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp index 361eba57..5e17e7ed 100644 --- a/kopete/protocols/sms/smsprotocol.cpp +++ b/kopete/protocols/sms/smsprotocol.cpp @@ -32,11 +32,11 @@ K_EXPORT_COMPONENT_FACTORY( kopete_sms, SMSProtocolFactory( "kopete_sms" ) ) SMSProtocol* SMSProtocol::s_protocol = 0L; -SMSProtocol::SMSProtocol(TQObject *parent, const char *name, const TQStringList &/*args*/) -: Kopete::Protocol( SMSProtocolFactory::instance(), parent, name ), - SMSOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online ), - SMSConnecting( Kopete::OnlineStatus::Connecting,2, this, 3, TQString::null, i18n( "Connecting" ) ), - SMSOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString::null, i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ) +SMSProtocol::SMSProtocol(TQObject *tqparent, const char *name, const TQStringList &/*args*/) +: Kopete::Protocol( SMSProtocolFactory::instance(), tqparent, name ), + SMSOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online ), + SMSConnecting( Kopete::OnlineStatus::Connecting,2, this, 3, TQString(), i18n( "Connecting" ) ), + SMSOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString(), i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ) { if (s_protocol) kdWarning( 14160 ) << k_funcinfo << "s_protocol already defined!" << endl; @@ -51,14 +51,14 @@ SMSProtocol::~SMSProtocol() s_protocol = 0L; } -AddContactPage *SMSProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account */*i*/) +AddContactPage *SMSProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account */*i*/) { - return new SMSAddContactPage(parent); + return new SMSAddContactPage(tqparent); } -KopeteEditAccountWidget* SMSProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget* SMSProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new SMSEditAccountWidget(this, account, parent); + return new SMSEditAccountWidget(this, account, tqparent); } SMSProtocol* SMSProtocol::protocol() diff --git a/kopete/protocols/sms/smsprotocol.h b/kopete/protocols/sms/smsprotocol.h index 411fa934..5785407d 100644 --- a/kopete/protocols/sms/smsprotocol.h +++ b/kopete/protocols/sms/smsprotocol.h @@ -40,9 +40,10 @@ class SMSContact; class SMSProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - SMSProtocol(TQObject *parent, const char *name, const TQStringList &args); + SMSProtocol(TQObject *tqparent, const char *name, const TQStringList &args); ~SMSProtocol(); static SMSProtocol *protocol(); @@ -53,8 +54,8 @@ public: virtual Kopete::Contact *deserializeContact(Kopete::MetaContact *metaContact, const TQMap &serializedData, const TQMap &addressBookData ); - virtual AddContactPage *createAddContactWidget(TQWidget *parent , Kopete::Account *i); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); + virtual AddContactPage *createAddContactWidget(TQWidget *tqparent , Kopete::Account *i); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); virtual Kopete::Account *createNewAccount(const TQString &accountId); const Kopete::OnlineStatus SMSOnline; diff --git a/kopete/protocols/sms/smsservice.h b/kopete/protocols/sms/smsservice.h index c1d46563..d448570b 100644 --- a/kopete/protocols/sms/smsservice.h +++ b/kopete/protocols/sms/smsservice.h @@ -28,9 +28,10 @@ namespace Kopete { class Account; } class TQGridLayout; class TQWidget; -class SMSService : public QObject +class SMSService : public TQObject { Q_OBJECT + TQ_OBJECT public: SMSService(Kopete::Account* account = 0); virtual ~SMSService(); @@ -44,11 +45,11 @@ public: virtual void setAccount(Kopete::Account* account); /** - * Called when the settings widget has a place to be. @param parent is the - * settings widget's parent and @param layout is the 2xn grid layout it may + * Called when the settings widget has a place to be. @param tqparent is the + * settings widget's tqparent and @param tqlayout is the 2xn grid tqlayout it may * use. */ - virtual void setWidgetContainer(TQWidget* parent, TQGridLayout* layout) = 0; + virtual void setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) = 0; virtual void send(const Kopete::Message& msg) = 0; virtual int maxSize() = 0; diff --git a/kopete/protocols/sms/smsuserpreferences.h b/kopete/protocols/sms/smsuserpreferences.h index 7331c53a..5dee2d19 100644 --- a/kopete/protocols/sms/smsuserpreferences.h +++ b/kopete/protocols/sms/smsuserpreferences.h @@ -27,6 +27,7 @@ class SMSContact; class SMSUserPreferences : public KDialogBase { Q_OBJECT + TQ_OBJECT public: SMSUserPreferences(SMSContact* contact); ~SMSUserPreferences(); diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui index 62e53800..5f8eb9f4 100644 --- a/kopete/protocols/sms/ui/smsactprefs.ui +++ b/kopete/protocols/sms/ui/smsactprefs.ui @@ -1,7 +1,7 @@ smsActPrefsUI Richard Lärkäng - + smsActPrefsUI @@ -34,7 +34,7 @@ 0 - + middleFrame @@ -48,11 +48,11 @@ 0 - + tabWidget9 - + tab @@ -63,7 +63,7 @@ unnamed - + groupBox61 @@ -74,7 +74,7 @@ unnamed - + textLabel2 @@ -91,7 +91,7 @@ A unique name for this SMS account. - + textLabel1 @@ -108,7 +108,7 @@ The delivery service that you would like to use. Note that you will need to have this software installed prior to using this account. - + accountId @@ -116,15 +116,15 @@ A unique name for this SMS account. - + - layout35 + tqlayout35 unnamed - + serviceName @@ -143,7 +143,7 @@ The delivery service that you would like to use. Note that you will need to have this software installed prior to using this account. - + descButton @@ -161,7 +161,7 @@ - + groupBox22 @@ -172,7 +172,7 @@ unnamed - + textLabel12 @@ -187,7 +187,7 @@ To use SMS, you will need an account with a delivery service. - + WordBreak|AlignTop @@ -203,7 +203,7 @@ Expanding - + 20 181 @@ -212,7 +212,7 @@ - + tab @@ -223,7 +223,7 @@ unnamed - + groupBox62 @@ -234,15 +234,15 @@ unnamed - + - layout119 + tqlayout119 unnamed - + textLabel2_2 @@ -259,7 +259,7 @@ What should happen if you type a message that is too long to fit in a single SMS message. You can either choose to break it up into smaller messages automatically, cancel the message from being sent entirely, or have Kopete prompt you each time you enter a message that is too long. - + Prompt (recommended) @@ -287,7 +287,7 @@ - + subEnable @@ -301,15 +301,15 @@ Check if you would like to enable phone number internationalization. Without this option, you will only be able to use SMS for accounts within your country. - + - layout56 + tqlayout56 unnamed - + textLabel2_3 @@ -379,7 +379,7 @@ Expanding - + 20 20 @@ -389,14 +389,14 @@ - + labelStatusMessage - + AlignCenter @@ -428,7 +428,7 @@ knuminput.h - + krestrictedline.h diff --git a/kopete/protocols/sms/ui/smsadd.ui b/kopete/protocols/sms/ui/smsadd.ui index 0ee71281..4b05727b 100644 --- a/kopete/protocols/sms/ui/smsadd.ui +++ b/kopete/protocols/sms/ui/smsadd.ui @@ -1,6 +1,6 @@ smsAddUI - + smsAddUI @@ -30,23 +30,23 @@ 6 - + - layout35 + tqlayout35 unnamed - + - layout33 + tqlayout33 unnamed - + textLabel1 @@ -63,7 +63,7 @@ The telephone number of the contact you would like to add. This should be a number with SMS service available. - + textLabel1_2 @@ -82,15 +82,15 @@ - + - layout34 + tqlayout34 unnamed - + addNr @@ -101,7 +101,7 @@ The telephone number of the contact you would like to add. This should be a number with SMS service available. - + addName @@ -126,7 +126,7 @@ Expanding - + 31 170 @@ -139,5 +139,5 @@ addNr addName - + diff --git a/kopete/protocols/sms/ui/smsuserprefs.ui b/kopete/protocols/sms/ui/smsuserprefs.ui index 8a912792..a21c5037 100644 --- a/kopete/protocols/sms/ui/smsuserprefs.ui +++ b/kopete/protocols/sms/ui/smsuserprefs.ui @@ -1,6 +1,6 @@ SMSUserPrefsUI - + SMSUserPrefsUI @@ -27,7 +27,7 @@ 0 - + title @@ -54,15 +54,15 @@ Horizontal - + - layout11 + tqlayout11 unnamed - + textLabel3 @@ -102,7 +102,7 @@ Expanding - + 20 40 @@ -111,7 +111,7 @@ - + klineedit.h -- cgit v1.2.3