From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kopete/protocols/meanwhile/meanwhileaccount.cpp | 12 ++++++------ kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp | 2 +- .../protocols/meanwhile/meanwhileeditaccountwidget.cpp | 6 +++--- kopete/protocols/meanwhile/meanwhileprotocol.cpp | 8 ++++---- kopete/protocols/meanwhile/meanwhileprotocol.h | 4 ++-- kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui | 6 +++--- .../protocols/meanwhile/ui/meanwhileeditaccountbase.ui | 16 ++++++++-------- 7 files changed, 27 insertions(+), 27 deletions(-) (limited to 'kopete/protocols/meanwhile') diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index 03f8e008..d0fe10bc 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -71,7 +71,7 @@ bool MeanwhileAccount::createContact( MeanwhileProtocol *p = static_cast(protocol()); if ((newContact != 0L) && (m_session != 0L) - && (myself()->onlineStatus() != + && (myself()->onlinetqStatus() != 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(initialStatus()); + m_session->setStatus(initialtqStatus()); } void MeanwhileAccount::disconnect() @@ -123,7 +123,7 @@ void MeanwhileAccount::disconnect(Kopete::Account::DisconnectReason reason) return; MeanwhileProtocol *p = static_cast(protocol()); - setAllContactsStatus(p->statusOffline); + setAllContactstqStatus(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(meanwhileChangeStatus()), this, + this, TQT_SLOT(meanwhileChangetqStatus()), 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()->onlineStatus(); + Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus(); 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()->onlineStatus(); + Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus(); myself()->setOnlineStatus(status); if (status.isDefinitelyOnline() != oldstatus.isDefinitelyOnline()) { diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp index 909afe41..57dca0c0 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp @@ -16,7 +16,7 @@ */ #include "meanwhileaddcontactpage.h" #include -#include +#include #include #include #include diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index 5fcb3b1c..58c70f68 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -14,7 +14,7 @@ * * ************************************************************************* */ -#include +#include #include #include #include @@ -40,8 +40,8 @@ void MeanwhileEditAccountWidget::setupClientList() for (id = MeanwhileSession::getClientIDs(); id->name; id++, i++) { TQString name = TQString("%1 (0x%2)") - .arg(TQString(id->name)) - .arg(id->id, 0, 16); + .tqarg(TQString(id->name)) + .tqarg(id->id, 0, 16); mClientID->insertItem(name, i); diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp index 5f443f36..3347f6da 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::fromLatin1("statusMessage"), + statusMessage(TQString::tqfromLatin1("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::accountOfflineStatus() +const Kopete::OnlineStatus MeanwhileProtocol::accountOfflinetqStatus() { return statusAccountOffline; } -const Kopete::OnlineStatus MeanwhileProtocol::lookupStatus( +const Kopete::OnlineStatus MeanwhileProtocol::lookuptqStatus( enum Kopete::OnlineStatusManager::Categories cats) { - return Kopete::OnlineStatusManager::self()->onlineStatus(this, cats); + return Kopete::OnlineStatusManager::self()->onlinetqStatus(this, cats); } #include "meanwhileprotocol.moc" diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.h b/kopete/protocols/meanwhile/meanwhileprotocol.h index 9b550c9e..dab52878 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.h +++ b/kopete/protocols/meanwhile/meanwhileprotocol.h @@ -58,9 +58,9 @@ public: const TQMap &serializedData, const TQMap &addressBookData); - const Kopete::OnlineStatus accountOfflineStatus(); + const Kopete::OnlineStatus accountOfflinetqStatus(); - const Kopete::OnlineStatus lookupStatus( + const Kopete::OnlineStatus lookuptqStatus( 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 170f5b90..6920d7e3 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui @@ -27,7 +27,7 @@ - layout53 + tqlayout53 @@ -84,7 +84,7 @@ <i>(for example: johndoe)</i> - + AlignVCenter|AlignRight @@ -98,7 +98,7 @@ Expanding - + 20 80 diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index 914d1533..5f85cac2 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -47,7 +47,7 @@ - layout81 + tqlayout81 @@ -127,7 +127,7 @@ - layout21 + tqlayout21 @@ -135,7 +135,7 @@ - layout56 + tqlayout56 @@ -173,7 +173,7 @@ - layout57 + tqlayout57 @@ -241,7 +241,7 @@ - layout17 + tqlayout17 @@ -271,7 +271,7 @@ - layout13 + tqlayout13 @@ -298,7 +298,7 @@ . - + AlignCenter @@ -357,7 +357,7 @@ Expanding - + 20 31 -- cgit v1.2.1