summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/sms/services
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/sms/services
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
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
Diffstat (limited to 'kopete/protocols/sms/services')
-rw-r--r--kopete/protocols/sms/services/gsmlib.cpp28
-rw-r--r--kopete/protocols/sms/services/gsmlib.h9
-rw-r--r--kopete/protocols/sms/services/gsmlibprefs.ui14
-rw-r--r--kopete/protocols/sms/services/kopete_unix_serial.cpp10
-rw-r--r--kopete/protocols/sms/services/kopete_unix_serial.h2
-rw-r--r--kopete/protocols/sms/services/smsclient.cpp38
-rw-r--r--kopete/protocols/sms/services/smsclient.h5
-rw-r--r--kopete/protocols/sms/services/smsclientprefs.ui20
-rw-r--r--kopete/protocols/sms/services/smssend.cpp32
-rw-r--r--kopete/protocols/sms/services/smssend.h3
-rw-r--r--kopete/protocols/sms/services/smssendprefs.ui22
-rw-r--r--kopete/protocols/sms/services/smssendprovider.cpp36
-rw-r--r--kopete/protocols/sms/services/smssendprovider.h5
13 files changed, 114 insertions, 110 deletions
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<SMSContact*>( m_account->contacts().find( nr ));
+ SMSContact* contact = static_cast<SMSContact*>( 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("<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on <a href=\"%1\">%1</a></qt>").arg(url).arg(url);
+ m_description = i18n("<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on <a href=\"%1\">%1</a></qt>").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 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>GSMLibPrefsUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>GSMLibPrefsUI</cstring>
</property>
@@ -29,14 +29,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>321</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel8</cstring>
</property>
@@ -63,15 +63,15 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -91,7 +91,7 @@
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
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("<qt>SMSClient is a program for sending SMS with the modem. The program can be found on <a href=\"%1\">%1</a></qt>").arg(url).arg(url);
+ m_description = i18n("<qt>SMSClient is a program for sending SMS with the modem. The program can be found on <a href=\"%1\">%1</a></qt>").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 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>SMSClientPrefsUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>SMSClientPrefsUI</cstring>
</property>
@@ -29,14 +29,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>321</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel8</cstring>
</property>
@@ -63,15 +63,15 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -82,7 +82,7 @@
<cstring>program</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -103,12 +103,12 @@
<cstring>configDir</cstring>
</property>
</widget>
- <widget class="QComboBox" row="2" column="1">
+ <widget class="TQComboBox" row="2" column="1">
<property name="name">
<cstring>provider</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -123,7 +123,7 @@
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
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("<qt>SMSSend is a program for sending SMS through gateways on the web. It can be found on <a href=\"%1\">%2</a></qt>").arg(url).arg(url);
+ m_description = i18n("<qt>SMSSend is a program for sending SMS through gateways on the web. It can be found on <a href=\"%1\">%2</a></qt>").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 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>SMSSendPrefsUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>SMSSendPrefsUI</cstring>
</property>
@@ -29,14 +29,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>311</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel7_2</cstring>
</property>
@@ -63,15 +63,15 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout12</cstring>
+ <cstring>tqlayout12</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QComboBox" row="1" column="1">
+ <widget class="TQComboBox" row="1" column="1">
<property name="name">
<cstring>provider</cstring>
</property>
@@ -89,7 +89,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -108,7 +108,7 @@
<cstring>provider</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -139,14 +139,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>351</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>providerLabel</cstring>
</property>
@@ -179,7 +179,7 @@
<tabstop>program</tabstop>
<tabstop>provider</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
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<KLineEdit>& 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<KLineEdit>& 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);