Trinity Qt initial conversion

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

1 files changed, 13 insertions, 13 deletions

diff --git a/kpilot/conduits/malconduit/mal-conduit.cc b/kpilot/conduits/malconduit/mal-conduit.cc
index 73a77a141..95c4d64b5 100644
--- a/kpilot/conduits/malconduit/mal-conduit.cc
+++ b/kpilot/conduits/malconduit/mal-conduit.cc
@@ -34,7 +34,7 @@
 
 #include "options.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 #include <kconfig.h>
 #include <kdebug.h>
 
@@ -109,7 +109,7 @@ static int32 cbItem (void */*out*/,
  
 MALConduit::MALConduit(KPilotLink * o,
 	const char *n, 
-	const QStringList & a) :
+	const TQStringList & a) :
 	ConduitAction(o, n, a)
 {
 	FUNCTIONSETUP;
@@ -144,7 +144,7 @@ void MALConduit::readConfig()
 void MALConduit::saveConfig()
 {
 	FUNCTIONSETUP;
-	MALConduitSettings::setLastMALSync( QDateTime::currentDateTime() );
+	MALConduitSettings::setLastMALSync( TQDateTime::currentDateTime() );
 	MALConduitSettings::self()->writeConfig();
 }
 
@@ -152,8 +152,8 @@ void MALConduit::saveConfig()
 
 bool MALConduit::skip() 
 {
-	QDateTime now=QDateTime::currentDateTime();
-	QDateTime lastSync=MALConduitSettings::lastMALSync();
+	TQDateTime now=TQDateTime::currentDateTime();
+	TQDateTime lastSync=MALConduitSettings::lastMALSync();
 	
 	if (!lastSync.isValid() || !now.isValid()) return false;
 	
@@ -203,9 +203,9 @@ bool MALConduit::skip()
 		return false;
 	}
 
-	QString proxyServer( MALConduitSettings::proxyServer() );
+	TQString proxyServer( MALConduitSettings::proxyServer() );
 	int proxyPort( MALConduitSettings::proxyPort() );
-	QString syncMessage;
+	TQString syncMessage;
 	bool canContinue = true;
 	// Set all proxy settings
 	switch (MALConduitSettings::proxyType()) 
@@ -222,7 +222,7 @@ bool MALConduit::skip()
 #ifdef DEBUG
 			DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<<
 				"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<
-				", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?QString("not "):QString())<<"set"
+				", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString())<<"set"
 				<<endl;
 #endif
 #ifdef LIBMAL20
@@ -261,7 +261,7 @@ bool MALConduit::skip()
 			}
 			syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer);
 #ifdef DEBUG
-			DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\",  Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?QString("not "):QString() )<<"set"<<endl;
+			DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\",  Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl;
 #endif
 #ifdef LIBMAL20
 			setSocksProxy( const_cast<char *>(proxyServer.latin1()) );
@@ -304,13 +304,13 @@ bool MALConduit::skip()
 	return delayDone();
 }
 
-void MALConduit::printLogMessage(QString msg)
+void MALConduit::printLogMessage(TQString msg)
 {
 	FUNCTIONSETUP;
 	// Remove the pseudo-progressbar:
-	QString newmsg(msg);
-	newmsg.replace( QRegExp("^\\s*\\.*\\s*"), "");
-	newmsg.replace( QRegExp("\\s*\\.*\\s*$"), "");
+	TQString newmsg(msg);
+	newmsg.replace( TQRegExp("^\\s*\\.*\\s*"), "");
+	newmsg.replace( TQRegExp("\\s*\\.*\\s*$"), "");
 	if (newmsg.length()>0)
 	{
 		emit logMessage(newmsg);