Trinity Qt initial conversion

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

1 files changed, 27 insertions, 27 deletions

diff --git a/krdc/main.cpp b/krdc/main.cpp
index 5c2423bd..034643b4 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -24,11 +24,11 @@
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kwallet.h>
-#include <qwindowdefs.h>
-#include <qtimer.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
+#include <tqwindowdefs.h>
+#include <tqtimer.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
 
 #include "../config.h"
 #include "main.h"
@@ -97,16 +97,16 @@ int main(int argc, char *argv[])
 
 	KApplication a;
 
-	QString host = QString::null;
+	TQString host = TQString::null;
 	Quality quality = QUALITY_UNKNOWN;
-	QString encodings = QString::null;
-	QString password = QString::null;
-	QString resolution = QString::null;
-	QString keymap = QString::null;
+	TQString encodings = TQString::null;
+	TQString password = TQString::null;
+	TQString resolution = TQString::null;
+	TQString keymap = TQString::null;
 	WindowMode wm = WINDOW_MODE_AUTO;
 	bool scale = false;
 	bool localCursor = kapp->config()->readBoolEntry("alwaysShowLocalCursor", false);
-	QSize initialWindowSize;
+	TQSize initialWindowSize;
 
 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
@@ -132,25 +132,25 @@ int main(int argc, char *argv[])
 		encodings = args->getOption("encodings");
 
 	if (args->isSet("password-file")) {
-		QString passwordFile = args->getOption("password-file");
-		QFile f(passwordFile);
+		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));
 			return 1;
 		}
-		password = QTextStream(&f).readLine();
+		password = TQTextStream(&f).readLine();
 		f.close();
 	}
 
 	if (args->count() > 0)
 		host = args->arg(0);
 
-	QString is = a.geometryArgument();
+	TQString is = a.geometryArgument();
 	if (!is.isNull()) {
-		QRegExp re("([0-9]+)[xX]([0-9]+)");
+		TQRegExp re("([0-9]+)[xX]([0-9]+)");
 		if (!re.exactMatch(is))
 			args->usage(i18n("Wrong geometry format, must be widthXheight"));
-		initialWindowSize = QSize(re.cap(1).toInt(), re.cap(2).toInt());
+		initialWindowSize = TQSize(re.cap(1).toInt(), re.cap(2).toInt());
 	}
 
 	MainController mc(&a, wm, host, quality, encodings, password,
@@ -159,13 +159,13 @@ int main(int argc, char *argv[])
 }
 
 MainController::MainController(KApplication *app, WindowMode wm,
-			       const QString &host,
+			       const TQString &host,
 			       Quality quality,
-			       const QString &encodings,
-			       const QString &password,
+			       const TQString &encodings,
+			       const TQString &password,
 			       bool scale,
 			       bool localCursor,
-			       QSize initialWindowSize) :
+			       TQSize initialWindowSize) :
         m_windowMode(wm),
 	m_host(host),
         m_encodings(encodings),
@@ -192,7 +192,7 @@ int MainController::main() {
 }
 
 void MainController::errorRestartRequested() {
-	QTimer::singleShot(0, this, SLOT(errorRestart()));
+	TQTimer::singleShot(0, this, TQT_SLOT(errorRestart()));
 }
 
 bool MainController::start() {
@@ -201,10 +201,10 @@ bool MainController::start() {
 			  m_scale, m_localCursor, m_initialWindowSize);
 	m_app->setMainWidget(m_krdc);
 
-	QObject::connect(m_krdc, SIGNAL(disconnected()),
-			 m_app, SLOT(quit()));
-	connect(m_krdc, SIGNAL(disconnectedError()),
-		SLOT(errorRestartRequested()));
+	TQObject::connect(m_krdc, TQT_SIGNAL(disconnected()),
+			 m_app, TQT_SLOT(quit()));
+	connect(m_krdc, TQT_SIGNAL(disconnectedError()),
+		TQT_SLOT(errorRestartRequested()));
 
 	return m_krdc->start();
 }
@@ -212,7 +212,7 @@ bool MainController::start() {
 void MainController::errorRestart() {
 	if (!m_host.isEmpty())
 		KRDC::setLastHost(m_host);
-	m_host = QString::null; // only auto-connect once
+	m_host = TQString::null; // only auto-connect once
 
 	// unset KRDC as main widget, to avoid quit on delete
 	m_app->setMainWidget(0);