summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/meanwhile
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/meanwhile')
-rw-r--r--kopete/protocols/meanwhile/meanwhileaccount.cpp12
-rw-r--r--kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp2
-rw-r--r--kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp6
-rw-r--r--kopete/protocols/meanwhile/meanwhileprotocol.cpp8
-rw-r--r--kopete/protocols/meanwhile/meanwhileprotocol.h4
-rw-r--r--kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui6
-rw-r--r--kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui16
7 files changed, 27 insertions, 27 deletions
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp
index d0fe10bc..03f8e008 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp
@@ -71,7 +71,7 @@ bool MeanwhileAccount::createContact(
MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol());
if ((newContact != 0L) && (m_session != 0L)
- && (myself()->onlinetqStatus() !=
+ && (myself()->onlineStatus() !=
p->statusOffline))
m_session->addContact(newContact);
@@ -109,7 +109,7 @@ void MeanwhileAccount::connectWithPassword(const TQString &password)
if (!m_session->isConnected() && !m_session->isConnecting())
m_session->connect(password);
- m_session->setStatus(initialtqStatus());
+ m_session->setStatus(initialStatus());
}
void MeanwhileAccount::disconnect()
@@ -123,7 +123,7 @@ void MeanwhileAccount::disconnect(Kopete::Account::DisconnectReason reason)
return;
MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol());
- setAllContactstqStatus(p->statusOffline);
+ setAllContactsStatus(p->statusOffline);
disconnected(reason);
emit isConnectedChanged();
@@ -139,7 +139,7 @@ KActionMenu * MeanwhileAccount::actionMenu()
#if 0
menu->insert(new KAction(i18n("&Change Status Message"), TQString(), 0,
- this, TQT_SLOT(meanwhileChangetqStatus()), this,
+ this, TQT_SLOT(meanwhileChangeStatus()), this,
"meanwhileChangeStatus"));
//infoPlugin->addCustomMenus(theMenu);
#endif
@@ -219,7 +219,7 @@ void MeanwhileAccount::setOnlineStatus(const Kopete::OnlineStatus &status,
const TQString &reason)
{
HERE;
- Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus();
+ Kopete::OnlineStatus oldstatus = myself()->onlineStatus();
mwDebug() << "From: " << oldstatus.description() << "(" <<
oldstatus.internalStatus() << "):" << oldstatus.isDefinitelyOnline()
@@ -256,7 +256,7 @@ void MeanwhileAccount::syncContactsToServer()
void MeanwhileAccount::slotSessionStateChange(Kopete::OnlineStatus status)
{
HERE;
- Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus();
+ Kopete::OnlineStatus oldstatus = myself()->onlineStatus();
myself()->setOnlineStatus(status);
if (status.isDefinitelyOnline() != oldstatus.isDefinitelyOnline()) {
diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
index 57dca0c0..909afe41 100644
--- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
@@ -16,7 +16,7 @@
*/
#include "meanwhileaddcontactpage.h"
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kopeteaccount.h>
#include <kopetemetacontact.h>
#include <tqlineedit.h>
diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
index 58c70f68..5fcb3b1c 100644
--- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
+++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
@@ -14,7 +14,7 @@
* *
*************************************************************************
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqcheckbox.h>
#include <tqpushbutton.h>
@@ -40,8 +40,8 @@ void MeanwhileEditAccountWidget::setupClientList()
for (id = MeanwhileSession::getClientIDs(); id->name; id++, i++) {
TQString name = TQString("%1 (0x%2)")
- .tqarg(TQString(id->name))
- .tqarg(id->id, 0, 16);
+ .arg(TQString(id->name))
+ .arg(id->id, 0, 16);
mClientID->insertItem(name, i);
diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp
index 3347f6da..5f443f36 100644
--- a/kopete/protocols/meanwhile/meanwhileprotocol.cpp
+++ b/kopete/protocols/meanwhile/meanwhileprotocol.cpp
@@ -59,7 +59,7 @@ MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name,
statusAccountOffline(Kopete::OnlineStatus::Offline, 0, this, 0,
TQString(), i18n("Account Offline")),
- statusMessage(TQString::tqfromLatin1("statusMessage"),
+ statusMessage(TQString::fromLatin1("statusMessage"),
i18n("Status Message"), TQString(), false, true),
awayMessage(Kopete::Global::Properties::self()->awayMessage())
@@ -113,14 +113,14 @@ Kopete::Contact *MeanwhileProtocol::deserializeContact(
return theAccount->contacts()[contactId];
}
-const Kopete::OnlineStatus MeanwhileProtocol::accountOfflinetqStatus()
+const Kopete::OnlineStatus MeanwhileProtocol::accountOfflineStatus()
{
return statusAccountOffline;
}
-const Kopete::OnlineStatus MeanwhileProtocol::lookuptqStatus(
+const Kopete::OnlineStatus MeanwhileProtocol::lookupStatus(
enum Kopete::OnlineStatusManager::Categories cats)
{
- return Kopete::OnlineStatusManager::self()->onlinetqStatus(this, cats);
+ return Kopete::OnlineStatusManager::self()->onlineStatus(this, cats);
}
#include "meanwhileprotocol.moc"
diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.h b/kopete/protocols/meanwhile/meanwhileprotocol.h
index dab52878..9b550c9e 100644
--- a/kopete/protocols/meanwhile/meanwhileprotocol.h
+++ b/kopete/protocols/meanwhile/meanwhileprotocol.h
@@ -58,9 +58,9 @@ public:
const TQMap<TQString,TQString> &serializedData,
const TQMap<TQString, TQString> &addressBookData);
- const Kopete::OnlineStatus accountOfflinetqStatus();
+ const Kopete::OnlineStatus accountOfflineStatus();
- const Kopete::OnlineStatus lookuptqStatus(
+ const Kopete::OnlineStatus lookupStatus(
enum Kopete::OnlineStatusManager::Categories cats);
const Kopete::OnlineStatus statusOffline;
diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
index 6920d7e3..170f5b90 100644
--- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
+++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout53</cstring>
+ <cstring>layout53</cstring>
</property>
<hbox>
<property name="name">
@@ -84,7 +84,7 @@
<property name="text">
<string>&lt;i&gt;(for example: johndoe)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
index 5f85cac2..914d1533 100644
--- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
+++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
@@ -47,7 +47,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout81</cstring>
+ <cstring>layout81</cstring>
</property>
<hbox>
<property name="name">
@@ -127,7 +127,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<hbox>
<property name="name">
@@ -135,7 +135,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout56</cstring>
+ <cstring>layout56</cstring>
</property>
<hbox>
<property name="name">
@@ -173,7 +173,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<hbox>
<property name="name">
@@ -241,7 +241,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<grid>
<property name="name">
@@ -271,7 +271,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -298,7 +298,7 @@
<property name="text">
<string>.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -357,7 +357,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>