Rename old tq methods that no longer need a unique name

(cherry picked from commit 089118c18533dfa3e6ce5065dbebdd4db94051f1)

9 files changed, 31 insertions, 31 deletions

diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index a3ee592e..fa213552 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -108,7 +108,7 @@ bool WinPopupLib::checkMessageDir()
 													   "Install Into Samba (Configure... -> Account -> Edit) information\n"
 													   "on how to do this.\n"
 													   "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR),
-												  TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
+												  TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
 		if (tmpYesNo == KMessageBox::Yes) {
 			TQStringList kdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
 			if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true;
@@ -127,7 +127,7 @@ bool WinPopupLib::checkMessageDir()
 														   "You will not receive messages if you say no.\n"
 														   "You can also correct it manually (chmod 0777 %1) and restart kopete.\n"
 														   "Fix? (May need root password)").tqarg(WP_POPUP_DIR),
-													  TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+													  TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
 			if (tmpYesNo == KMessageBox::Yes) {
 				TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR));
 				if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true;
@@ -148,7 +148,7 @@ void WinPopupLib::slotUpdateGroupData()
 	passedInitialHost = false;
 	todo.clear();
 	currentGroupsMap.clear();
-	currentHost = TQString::tqfromLatin1("LOCALHOST");
+	currentHost = TQString::fromLatin1("LOCALHOST");
 	startReadProcess(currentHost);
 }
 
@@ -184,7 +184,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r)
 		if (group.search(tmpLine) != -1) currentGroups[group.cap(1)] = group.cap(2);
 		if (error.search(tmpLine) != -1) {
 			kdDebug(14170) << "Connection to " << currentHost << " failed!" << endl;
-			if (currentHost == TQString::tqfromLatin1("LOCALHOST")) currentHost = TQString::tqfromLatin1("failed"); // to be sure
+			if (currentHost == TQString::fromLatin1("LOCALHOST")) currentHost = TQString::fromLatin1("failed"); // to be sure
 		}
 	}
 }
@@ -229,11 +229,11 @@ void WinPopupLib::slotReadProcessExited(KProcess *r)
 				todo += groupMaster;
 			}
 		} else {
-			if (currentHost == TQString::tqfromLatin1("failed"))
+			if (currentHost == TQString::fromLatin1("failed"))
 				KMessageBox::error(Kopete::UI::Global::mainWidget(),
 								   i18n("Connection to localhost failed!\n"
 									    "Is your samba server running?"),
-								   TQString::tqfromLatin1("Winpopup"));
+								   TQString::fromLatin1("Winpopup"));
 		}
 	}
 
@@ -303,7 +303,7 @@ void WinPopupLib::readMessages(const KFileItemList &items)
 															  i18n("A message file could not be removed; "
 																   "maybe the permissions are wrong.\n"
 																   "Fix? (May need root password)"),
-															  TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+															  TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
 					if (tmpYesNo == KMessageBox::Yes) {
 						TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
 						if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) {
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index 686252ea..b4d7dc82 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -29,7 +29,7 @@
 #include <kprocio.h>
 #include <kfileitem.h>
 
-const TQString WP_POPUP_DIR = TQString::tqfromLatin1("/var/lib/winpopup");
+const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup");
 
 class KDirLister;
 
diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index 8049dab1..fe0fab28 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -133,7 +133,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -166,7 +166,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index 32c8ead5..91522218 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -179,7 +179,7 @@ However, the recommended way is to ask your administrator to create this directo
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>16</height>
@@ -209,7 +209,7 @@ However, the recommended way is to ask your administrator to create this directo
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>135</height>
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index eb881c70..004750ca 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -66,7 +66,7 @@ const TQStringList WPAccount::getHosts(const TQString &Group)
 bool WPAccount::checkHost(const TQString &Name)
 {
 //	kdDebug() << "WPAccount::checkHost: " << Name << endl;
-	if (Name.upper() == TQString::tqfromLatin1("LOCALHOST")) {
+	if (Name.upper() == TQString::fromLatin1("LOCALHOST")) {
 		// Assume localhost is always there, but it will not appear in the samba output.
 		// Should never happen as localhost is now forbidden as contact, just for safety. GF
 		return true;
@@ -159,8 +159,8 @@ KActionMenu* WPAccount::actionMenu()
 
 	/// How to remove an action from Kopete::Account::actionMenu()? GF
 
-	KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlinetqStatus().iconFor(this), this);
-	theActionMenu->popupMenu()->insertTitle(myself()->onlinetqStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId()));
+	KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this);
+	theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId()));
 
 	if (mProtocol)
 	{
@@ -189,17 +189,17 @@ void WPAccount::slotSendMessage(const TQString &Body, const TQString &Destinatio
 {
 	kdDebug(14170) << "WPAccount::slotSendMessage(" << Body << ", " << Destination << ")" << endl;
 
-	if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
+	if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
 	mProtocol->sendMessage(Body, Destination);
 }
 
 void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason)
 {
-	if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online)
+	if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online)
 		connect( status );
-	else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline)
+	else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline)
 		disconnect();
-	else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away)
+	else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away)
 		setAway( true, reason );
 }
 
diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index 25e4b6d8..e5912c14 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -93,7 +93,7 @@ bool WPAddContact::validateData()
 
 	// If our own host is not allowed as contact localhost should be forbidden as well,
 	// additionally somehow localhost as contact crashes when receiving a message from it?? GF
-	if (tmpHostName.upper() == TQString::tqfromLatin1("LOCALHOST")) {
+	if (tmpHostName.upper() == TQString::fromLatin1("LOCALHOST")) {
 		KMessageBox::sorry(this, i18n("<qt>LOCALHOST is not allowed as contact.</qt>"), i18n("WinPopup"));
 		return false;
 	}
diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp
index 1aff6e32..103a2a85 100644
--- a/kopete/protocols/winpopup/wpcontact.cpp
+++ b/kopete/protocols/winpopup/wpcontact.cpp
@@ -51,8 +51,8 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
 	// Initialise and start the periodical checking for contact's status
 	setOnlineStatus(static_cast<WPProtocol *>(protocol())->WPOffline);
 
-	connect(&checktqStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus()));
-	checktqStatus.start(1000, false);
+	connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
+	checkStatus.start(1000, false);
 }
 
 TQPtrList<KAction> * WPContact::customContextMenuActions()
@@ -89,14 +89,14 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr
 bool WPContact::isOnline() const
 {
 	kdDebug(14170) << "[WPContact::isOnline()]" << endl;
-	return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
+	return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
 }
 */
 
 bool WPContact::isReachable()
 {
 //	kdDebug(14170) << "[WPContact::isReachable()]" << endl;
-	return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
+	return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
 }
 
 void WPContact::slotChatSessionDestroyed()
@@ -131,7 +131,7 @@ void deleteContact()
 }
 */
 
-void WPContact::slotChecktqStatus()
+void WPContact::slotCheckStatus()
 {
 	bool oldWasConnected = myWasConnected;
 	bool newIsOnline = false;
@@ -141,11 +141,11 @@ void WPContact::slotChecktqStatus()
 	if (acct) newIsOnline = acct->checkHost(contactId());
 
 	if(newIsOnline != isOnline() || myWasConnected != oldWasConnected) {
-		Kopete::OnlineStatus tmptqStatus = WPProtocol::protocol()->WPOffline;
+		Kopete::OnlineStatus tmpStatus = WPProtocol::protocol()->WPOffline;
 		if (myWasConnected && newIsOnline) {
-				tmptqStatus = WPProtocol::protocol()->WPOnline;
+				tmpStatus = WPProtocol::protocol()->WPOnline;
 		}
-		setOnlineStatus(tmptqStatus);
+		setOnlineStatus(tmpStatus);
 	}
 }
 
diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h
index 6843d6c2..8acd7235 100644
--- a/kopete/protocols/winpopup/wpcontact.h
+++ b/kopete/protocols/winpopup/wpcontact.h
@@ -62,7 +62,7 @@ public:
 
 public slots:
 	virtual void slotUserInfo();
-	void slotChecktqStatus();	// the call back for the checktqStatus timer
+	void slotCheckStatus();	// the call back for the checkStatus timer
 	void slotNewMessage(const TQString &Body, const TQDateTime &Arrival);
 
 private slots:
@@ -73,7 +73,7 @@ private slots:
 private:
 	bool myWasConnected;	// true if protocol connected at last check
 
-	TQTimer checktqStatus;		// checks the status of this contact every second or so
+	TQTimer checkStatus;		// checks the status of this contact every second or so
 //	KActionCollection *myActionCollection;
 							// holds all the protocol specific actions (not many!)
 	Kopete::ChatSession *m_manager;
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index a6805a7e..bf2b5c3e 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -58,7 +58,7 @@ WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList &
 
 	sProtocol = this;
 
-	// Load tqStatus Actions
+	// Load Status Actions
 //	initActions();
 	// TODO: Maybe use this in the future?