Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

11 files changed, 48 insertions, 48 deletions

diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 8efe247a..15440eda 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -107,8 +107,8 @@ bool WinPopupLib::checkMessageDir()
 													   "If you have not configured anything yet (samba) please see\n"
 													   "Install Into Samba (Configure... -> Account -> Edit) information\n"
 													   "on how to do this.\n"
-													   "Should the directory be created? (May need root password)").arg(WP_POPUP_DIR),
-												  TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
+													   "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR),
+												  TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
 		if (tmpYesNo == KMessageBox::Yes) {
 			TQStringList tdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
 			if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
@@ -126,8 +126,8 @@ bool WinPopupLib::checkMessageDir()
 														   "%1 are wrong!\n"
 														   "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)").arg(WP_POPUP_DIR),
-													  TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+														   "Fix? (May need root password)").tqarg(WP_POPUP_DIR),
+													  TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
 			if (tmpYesNo == KMessageBox::Yes) {
 				TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR));
 				if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
@@ -148,7 +148,7 @@ void WinPopupLib::slotUpdateGroupData()
 	passedInitialHost = false;
 	todo.clear();
 	currentGroupsMap.clear();
-	currentHost = TQString::fromLatin1("LOCALHOST");
+	currentHost = TQString::tqfromLatin1("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::fromLatin1("LOCALHOST")) currentHost = TQString::fromLatin1("failed"); // to be sure
+			if (currentHost == TQString::tqfromLatin1("LOCALHOST")) currentHost = TQString::tqfromLatin1("failed"); // to be sure
 		}
 	}
 }
@@ -229,11 +229,11 @@ void WinPopupLib::slotReadProcessExited(KProcess *r)
 				todo += groupMaster;
 			}
 		} else {
-			if (currentHost == TQString::fromLatin1("failed"))
+			if (currentHost == TQString::tqfromLatin1("failed"))
 				KMessageBox::error(Kopete::UI::Global::mainWidget(),
 								   i18n("Connection to localhost failed!\n"
 									    "Is your samba server running?"),
-								   TQString::fromLatin1("Winpopup"));
+								   TQString::tqfromLatin1("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::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+															  TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
 					if (tmpYesNo == KMessageBox::Yes) {
 						TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
 						if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) {
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index b4d7dc82..686252ea 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::fromLatin1("/var/lib/winpopup");
+const TQString WP_POPUP_DIR = TQString::tqfromLatin1("/var/lib/winpopup");
 
 class KDirLister;
 
diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index a594a5b1..8049dab1 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -28,7 +28,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout59</cstring>
+                <cstring>tqlayout59</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -36,7 +36,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout57</cstring>
+                        <cstring>tqlayout57</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -80,7 +80,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout58</cstring>
+                        <cstring>tqlayout58</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -117,7 +117,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -133,7 +133,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -166,7 +166,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index ecf97df5..32c8ead5 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -32,7 +32,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -64,7 +64,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout40</cstring>
+                                    <cstring>tqlayout40</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -142,7 +142,7 @@
                                 <property name="text">
                                     <string>To receive WinPopup messages sent from other machines, the hostname above must be set to this machine's hostname.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignTop</set>
                                 </property>
                             </widget>
@@ -163,7 +163,7 @@
 However, the recommended way is to ask your administrator to create this directory ('mkdir -p -m 0777 /var/lib/winpopup') and add
 'message command = _PATH_TO_/winpopup-send.sh %s %m %t &amp;' (substitute _PATH_TO_ by the real path) to your smb.conf [global]-section.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignTop</set>
                                 </property>
                             </widget>
@@ -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="sizeHint">
+                        <property name="tqsizeHint">
                             <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="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>135</height>
@@ -266,7 +266,7 @@ However, the recommended way is to ask your administrator to create this directo
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                                 <property name="name">
-                                    <cstring>layout6</cstring>
+                                    <cstring>tqlayout6</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -274,7 +274,7 @@ However, the recommended way is to ask your administrator to create this directo
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout5</cstring>
+                                            <cstring>tqlayout5</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
index 7c87b961..aaec0dbe 100644
--- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
+++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
@@ -26,7 +26,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -34,7 +34,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index d7439628..eb881c70 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::fromLatin1("LOCALHOST")) {
+	if (Name.upper() == TQString::tqfromLatin1("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()->onlineStatus().iconFor(this), this);
-	theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId()));
+	KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlinetqStatus().iconFor(this), this);
+	theActionMenu->popupMenu()->insertTitle(myself()->onlinetqStatus().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()->onlineStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
+	if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
 	mProtocol->sendMessage(Body, Destination);
 }
 
 void WPAccount::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( status );
-	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/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index 0ca685dc..25e4b6d8 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -18,7 +18,7 @@
  *                                                                         *
  ***************************************************************************/
 // QT Includes
-#include <layout.h>
+#include <tqlayout.h>
 
 // KDE Includes
 #include <kcombobox.h>
@@ -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::fromLatin1("LOCALHOST")) {
+	if (tmpHostName.upper() == TQString::tqfromLatin1("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 103a2a85..1aff6e32 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(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
-	checkStatus.start(1000, false);
+	connect(&checktqStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus()));
+	checktqStatus.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 onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
+	return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
 }
 */
 
 bool WPContact::isReachable()
 {
 //	kdDebug(14170) << "[WPContact::isReachable()]" << endl;
-	return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
+	return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
 }
 
 void WPContact::slotChatSessionDestroyed()
@@ -131,7 +131,7 @@ void deleteContact()
 }
 */
 
-void WPContact::slotCheckStatus()
+void WPContact::slotChecktqStatus()
 {
 	bool oldWasConnected = myWasConnected;
 	bool newIsOnline = false;
@@ -141,11 +141,11 @@ void WPContact::slotCheckStatus()
 	if (acct) newIsOnline = acct->checkHost(contactId());
 
 	if(newIsOnline != isOnline() || myWasConnected != oldWasConnected) {
-		Kopete::OnlineStatus tmpStatus = WPProtocol::protocol()->WPOffline;
+		Kopete::OnlineStatus tmptqStatus = WPProtocol::protocol()->WPOffline;
 		if (myWasConnected && newIsOnline) {
-				tmpStatus = WPProtocol::protocol()->WPOnline;
+				tmptqStatus = WPProtocol::protocol()->WPOnline;
 		}
-		setOnlineStatus(tmpStatus);
+		setOnlineStatus(tmptqStatus);
 	}
 }
 
diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h
index 8acd7235..6843d6c2 100644
--- a/kopete/protocols/winpopup/wpcontact.h
+++ b/kopete/protocols/winpopup/wpcontact.h
@@ -62,7 +62,7 @@ public:
 
 public slots:
 	virtual void slotUserInfo();
-	void slotCheckStatus();	// the call back for the checkStatus timer
+	void slotChecktqStatus();	// the call back for the checktqStatus 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 checkStatus;		// checks the status of this contact every second or so
+	TQTimer checktqStatus;		// 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 91145338..d16c8e6a 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 Status Actions
+	// Load tqStatus Actions
 //	initActions();
 	// TODO: Maybe use this in the future?
 
diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp
index 162374b7..c602b70e 100644
--- a/kopete/protocols/winpopup/wpuserinfo.cpp
+++ b/kopete/protocols/winpopup/wpuserinfo.cpp
@@ -38,7 +38,7 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa
 {
 //	kdDebug( 14170 ) << k_funcinfo << endl;
 
-	setCaption( i18n( "User Info for %1" ).arg( m_contact->nickName() ) );
+	setCaption( i18n( "User Info for %1" ).tqarg( m_contact->nickName() ) );
 
 	m_mainWidget = new WPUserInfoWidget( this, "WPUserInfo::m_mainWidget" );
 	setMainWidget( m_mainWidget );