TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

diff --git a/krdc/main.cpp b/krdc/main.cpp
index 034643b4..95657483 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -97,12 +97,12 @@ int main(int argc, char *argv[])
 
 	KApplication a;
 
-	TQString host = TQString::null;
-	Quality quality = QUALITY_UNKNOWN;
-	TQString encodings = TQString::null;
-	TQString password = TQString::null;
-	TQString resolution = TQString::null;
-	TQString keymap = TQString::null;
+	TQString host = TQString();
+	Quality quality = TQUALITY_UNKNOWN;
+	TQString encodings = TQString();
+	TQString password = TQString();
+	TQString resolution = TQString();
+	TQString keymap = TQString();
 	WindowMode wm = WINDOW_MODE_AUTO;
 	bool scale = false;
 	bool localCursor = kapp->config()->readBoolEntry("alwaysShowLocalCursor", false);
@@ -111,11 +111,11 @@ int main(int argc, char *argv[])
 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
 	if (args->isSet("low-quality"))
-		quality = QUALITY_LOW;
+		quality = TQUALITY_LOW;
 	else if (args->isSet("medium-quality"))
-		quality = QUALITY_MEDIUM;
+		quality = TQUALITY_MEDIUM;
 	else if (args->isSet("high-quality"))
-		quality = QUALITY_HIGH;
+		quality = TQUALITY_HIGH;
 
 	if (args->isSet("fullscreen"))
 		wm = WINDOW_MODE_FULLSCREEN;
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 		TQString passwordFile = args->getOption("password-file");
 		TQFile f(passwordFile);
 		if (!f.open(IO_ReadOnly)) {
-			KMessageBox::error(0, i18n("The password file '%1' does not exist.").arg(passwordFile));
+			KMessageBox::error(0, i18n("The password file '%1' does not exist.").tqarg(passwordFile));
 			return 1;
 		}
 		password = TQTextStream(&f).readLine();
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
 	if (!is.isNull()) {
 		TQRegExp re("([0-9]+)[xX]([0-9]+)");
 		if (!re.exactMatch(is))
-			args->usage(i18n("Wrong geometry format, must be widthXheight"));
+			args->usage(i18n("Wrong tqgeometry format, must be widthXheight"));
 		initialWindowSize = TQSize(re.cap(1).toInt(), re.cap(2).toInt());
 	}
 
@@ -212,7 +212,7 @@ bool MainController::start() {
 void MainController::errorRestart() {
 	if (!m_host.isEmpty())
 		KRDC::setLastHost(m_host);
-	m_host = TQString::null; // only auto-connect once
+	m_host = TQString(); // only auto-connect once
 
 	// unset KRDC as main widget, to avoid quit on delete
 	m_app->setMainWidget(0);