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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

2 files changed, 10 insertions, 10 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;