1 files changed, 13 insertions, 13 deletions

diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 9bdbee27..497429f9 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -88,7 +88,7 @@ bool WinPopupLib::checkHost(const TQString &Name)
 
 	TQMap<TQString, WorkGroup>::Iterator end = theGroups.end();
 	for(TQMap<TQString, WorkGroup>::Iterator i = theGroups.begin(); i != end && !ret; i++) {
-		if ((*i).Hosts().contains(Name.upper())) {
+		if ((*i).Hosts().tqcontains(Name.upper())) {
 			ret = true;
 			break;
 		}
@@ -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 kdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
 			if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 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 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::fromLatin1("LOCALHOST");
+	currentHost = TQString::tqfromLatin1("LOCALHOST");
 	startReadProcess(currentHost);
 }
 
@@ -173,7 +173,7 @@ void WinPopupLib::startReadProcess(const TQString &Host)
 
 void WinPopupLib::slotReadProcessReady(KProcIO *r)
 {
-	TQString tmpLine = TQString::null;
+	TQString tmpLine = TQString();
 	TQRegExp group("^Workgroup\\|(.*)\\|(.*)$"), host("^Server\\|(.*)\\|(.*)$"),
 			info("^Domain=\\[([^\\]]+)\\] OS=\\[([^\\]]+)\\] Server=\\[([^\\]]+)\\]"),
 			error("Connection.*failed");
@@ -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
 		}
 	}
 }
@@ -208,7 +208,7 @@ void WinPopupLib::slotReadProcessExited(KProcess *r)
 			TQMap<TQString, TQString>::ConstIterator end = currentGroups.end();
 			for (TQMap<TQString, TQString>::ConstIterator i = currentGroups.begin(); i != end; i++) {
 				TQString groupMaster = i.data();
-				if (!done.contains(groupMaster)) todo += groupMaster;
+				if (!done.tqcontains(groupMaster)) todo += groupMaster;
 			}
 		}
 
@@ -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 kdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
 						if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) {
@@ -360,4 +360,4 @@ void WinPopupLib::settingsChanged(const TQString &smbClient, int groupFreq)
 #include "libwinpopup.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;