Trinity Qt initial conversion

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

4 files changed, 39 insertions, 39 deletions

diff --git a/kioslave/media/mounthelper/dialog.cpp b/kioslave/media/mounthelper/dialog.cpp
index 74bcfb388..549bbdc4a 100644
--- a/kioslave/media/mounthelper/dialog.cpp
+++ b/kioslave/media/mounthelper/dialog.cpp
@@ -22,7 +22,7 @@
 
 #include "dialog.h"
 
-Dialog::Dialog(QString url, QString iconName) :
+Dialog::Dialog(TQString url, TQString iconName) :
 	KDialogBase(NULL, "Dialog", true, "Decrypt Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Decrypt"), "decrypted" ))
 {
 	decryptDialog = new DecryptDialog(this);
@@ -34,10 +34,10 @@ Dialog::Dialog(QString url, QString iconName) :
 
 	enableButton( User1, false );
 
-	QPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
+	TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
 	decryptDialog->encryptedIcon->setPixmap( pixmap );
 
-	connect(decryptDialog->passwordEdit, SIGNAL (textChanged(const QString &)), this, SLOT (slotPasswordChanged(const QString &)));
+	connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
 
 	setMainWidget(decryptDialog);
 }
@@ -47,20 +47,20 @@ Dialog::~Dialog()
 	delete decryptDialog;
 }
 
-QString Dialog::getPassword()
+TQString Dialog::getPassword()
 {
 	return decryptDialog->passwordEdit->text();
 }
 
-void Dialog::slotDialogError(QString errorMsg)
+void Dialog::slotDialogError(TQString errorMsg)
 {
 	kdDebug() << __func__ << "(" << errorMsg << " )" << endl;
 
-	decryptDialog->errorLabel->setText(QString("<b>%1</b>").arg(errorMsg));
+	decryptDialog->errorLabel->setText(TQString("<b>%1</b>").arg(errorMsg));
 	decryptDialog->errorBox->show();
 }
 
-void Dialog::slotPasswordChanged(const QString &text)
+void Dialog::slotPasswordChanged(const TQString &text)
 {
 	enableButton( User1, !text.isEmpty() );
 }
diff --git a/kioslave/media/mounthelper/dialog.h b/kioslave/media/mounthelper/dialog.h
index 1f544c370..872486f5b 100644
--- a/kioslave/media/mounthelper/dialog.h
+++ b/kioslave/media/mounthelper/dialog.h
@@ -30,9 +30,9 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqgroupbox.h>
 
 #include "decryptdialog.h"
 
@@ -44,14 +44,14 @@ class Dialog : public KDialogBase
 Q_OBJECT	
 
 public:
-	Dialog(QString url, QString iconName);
+	Dialog(TQString url, TQString iconName);
 	~Dialog();
 
-	QString getPassword();
+	TQString getPassword();
 
 public slots:
-	void slotDialogError(QString errorMsg);
-	void slotPasswordChanged(const QString &text);
+	void slotDialogError(TQString errorMsg);
+	void slotPasswordChanged(const TQString &text);
 
 private:
 	DecryptDialog *decryptDialog;
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index 5dae9e0d3..01448f79d 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <qtimer.h>
+#include <tqtimer.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -45,7 +45,7 @@ const Medium MountHelper::findMedium(const KURL &url)
 	DCOPReply reply = mediamanager.call( "properties", url.fileName() );
 	if ( !reply.isValid() ) {
 		m_errorStr = i18n("The KDE mediamanager is not running.")+"\n";
-		return Medium(QString::null, QString::null);
+		return Medium(TQString::null, TQString::null);
 	}
 	const Medium& medium = Medium::create(reply);
 	if ( medium.id().isEmpty() ) {
@@ -53,7 +53,7 @@ const Medium MountHelper::findMedium(const KURL &url)
 		reply = mediamanager.call( "properties", url.prettyURL() );
 		if ( !reply.isValid() ) {
 			m_errorStr = i18n("Internal Error");
-			return Medium(QString::null, QString::null);
+			return Medium(TQString::null, TQString::null);
 		}
 		return Medium::create(reply);
 	} else {
@@ -65,7 +65,7 @@ MountHelper::MountHelper() : KApplication()
 {
 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
-	m_errorStr = QString::null;
+	m_errorStr = TQString::null;
 
 	KURL url(args->url(0));
 	const Medium medium = findMedium(url);
@@ -74,19 +74,19 @@ MountHelper::MountHelper() : KApplication()
 	{
 		if (m_errorStr.isEmpty())
 			m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL());
-		QTimer::singleShot(0, this, SLOT(error()) );
+		TQTimer::singleShot(0, this, TQT_SLOT(error()) );
 		return;
 	}
 
 	if ( !medium.isMountable() && !args->isSet("e") && !args->isSet("s"))
 	{
 		m_errorStr = i18n("%1 is not a mountable media.").arg(url.prettyURL());
-		QTimer::singleShot(0, this, SLOT(error()) );
+		TQTimer::singleShot(0, this, TQT_SLOT(error()) );
 		return;
 	}
 
-	QString device = medium.deviceNode();
-	QString mount_point = medium.mountPoint();
+	TQString device = medium.deviceNode();
+	TQString mount_point = medium.mountPoint();
 
 	m_isCdrom = medium.mimeType().find("dvd")!=-1
 	         || medium.mimeType().find("cd")!=-1;
@@ -96,20 +96,20 @@ MountHelper::MountHelper() : KApplication()
 		if (!medium.isEncrypted())
 		{
 			m_errorStr = i18n("%1 is not an encrypted media.").arg(url.prettyURL());
-			QTimer::singleShot(0, this, SLOT(error()) );
+			TQTimer::singleShot(0, this, TQT_SLOT(error()) );
 			return;
 		}
 		if (!medium.needDecryption())
 		{
 			m_errorStr = i18n("%1 is already decrypted.").arg(url.prettyURL());
-			QTimer::singleShot(0, this, SLOT(error()) );
+			TQTimer::singleShot(0, this, TQT_SLOT(error()) );
 			return;
 		}
 
-		QString iconName = medium.iconName();
+		TQString iconName = medium.iconName();
 		if (iconName.isEmpty())
 		{
-			QString mime = medium.mimeType();
+			TQString mime = medium.mimeType();
 			iconName = KMimeType::mimeType(mime)->icon(mime, false);
 		}
 
@@ -117,9 +117,9 @@ MountHelper::MountHelper() : KApplication()
 		dialog = new Dialog(url.prettyURL(), iconName);
 		dialog->show();
 
-		connect(dialog, SIGNAL (user1Clicked()), this, SLOT (slotSendPassword()));
-		connect(dialog, SIGNAL (cancelClicked()), this, SLOT (slotCancel()));
-		connect(this, SIGNAL (signalPasswordError(QString)), dialog, SLOT (slotDialogError(QString)));
+		connect(dialog, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotSendPassword()));
+		connect(dialog, TQT_SIGNAL (cancelClicked()), this, TQT_SLOT (slotCancel()));
+		connect(this, TQT_SIGNAL (signalPasswordError(TQString)), dialog, TQT_SLOT (slotDialogError(TQString)));
 	}
 	else if (args->isSet("u"))
 	{
@@ -180,7 +180,7 @@ MountHelper::MountHelper() : KApplication()
 	}
 }
 
-void MountHelper::invokeEject(const QString &device, bool quiet)
+void MountHelper::invokeEject(const TQString &device, bool quiet)
 {
 	KProcess *proc = new KProcess(this);
 	*proc << "kdeeject";
@@ -189,8 +189,8 @@ void MountHelper::invokeEject(const QString &device, bool quiet)
 		*proc << "-q";
 	}
 	*proc << device;
-	connect( proc, SIGNAL(processExited(KProcess *)),
-		this, SLOT( ejectFinished(KProcess *) ) );
+	connect( proc, TQT_SIGNAL(processExited(KProcess *)),
+		this, TQT_SLOT( ejectFinished(KProcess *) ) );
 	proc->start();
 }
 
@@ -209,7 +209,7 @@ void MountHelper::ejectFinished(KProcess* proc)
 				m_errorStr = i18n("The device was successfully unmounted, but could not be ejected");
 		}
 //X Comment this because the error is useless as long as the unmount is successfull. 
-//X 		QTimer::singleShot(0, this, SLOT(error()));
+//X 		TQTimer::singleShot(0, this, TQT_SLOT(error()));
       ::exit(0);
 	}
 }
@@ -229,7 +229,7 @@ void MountHelper::slotSendPassword()
 		m_errorStr = i18n("The KDE mediamanager is not running.");
 		error();
 	} else {
-		QString errorMsg = reply;
+		TQString errorMsg = reply;
 		if (errorMsg.isNull()) {
 			exit(0);
 		} else {
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h
index ed5884d4f..4779c75ec 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.h
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.h
@@ -23,7 +23,7 @@
 #define _KIO_MEDIA_MOUNTHELPER_H_
 
 #include <kapplication.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <kio/job.h>
 
 #include "medium.h"
@@ -38,10 +38,10 @@ public:
 
 private:
 	const Medium findMedium(const KURL &url);
-	void invokeEject(const QString &device, bool quiet=false);
-	QString m_errorStr;
+	void invokeEject(const TQString &device, bool quiet=false);
+	TQString m_errorStr;
 	bool m_isCdrom;
-	QString m_mediumId;
+	TQString m_mediumId;
 	Dialog *dialog;
 
 private slots:
@@ -51,7 +51,7 @@ private slots:
 	void error();
 
 signals:
-	void signalPasswordError(QString errorMsg);
+	void signalPasswordError(TQString errorMsg);
 };
 
 #endif