TQt4 port Bibletime

This enables compilation under both Qt3 and Qt4


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

1 files changed, 9 insertions, 9 deletions

diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
index b253286..e569642 100644
--- a/bibletime/frontend/btinstallmgr.cpp
+++ b/bibletime/frontend/btinstallmgr.cpp
@@ -12,7 +12,7 @@
 #include "util/cpointers.h"
 #include "cbtconfig.h"
 
-//Qt includes
+//TQt includes
 #include <tqfile.h>
 #include <tqfileinfo.h>
 
@@ -41,7 +41,7 @@ namespace BookshelfManager {
 
 	const TQString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() {
 		//  Q_ASSERT( CPointers::backend()->sysconfig );
-		return TQString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME"));
+		return TQString::tqfromLatin1("%1/.sword/sword.conf").tqarg(getenv("HOME"));
 	}
 
 	TQStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) {
@@ -65,7 +65,7 @@ namespace BookshelfManager {
 
 			while (sourceBegin != sourceEnd) {
 				InstallSource is("DIR", sourceBegin->second.c_str());
-				names << TQString::fromLatin1(is.caption.c_str());
+				names << TQString::tqfromLatin1(is.caption.c_str());
 
 				sourceBegin++;
 			}
@@ -91,7 +91,7 @@ namespace BookshelfManager {
 			filename = LocalConfig::swordConfigFilename();
 			directAccess = true;
 		}
-		else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th eparent is writable for us, create it
+		else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th etqparent is writable for us, create it
 			filename = LocalConfig::swordConfigFilename();
 			directAccess = true;
 		}
@@ -102,12 +102,12 @@ namespace BookshelfManager {
 
 		for (TQStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
 			TQString t = *it;
-			if (t.contains( TQString("%1/.sword").arg(getenv("HOME")) )) {
+			if (t.tqcontains( TQString("%1/.sword").tqarg(getenv("HOME")) )) {
 				//we don't want HOME/.sword in the config
 				continue;
 			}
 			else {
-				conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit()) );
+				conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit().data()) );
 
 				setDataPath = true;
 			}
@@ -117,7 +117,7 @@ namespace BookshelfManager {
 		if (!directAccess) { //use kdesu to move the file to the right place
 			KProcess *proc = new KProcess;
 			*proc << "kdesu";
-			*proc << TQString::fromLatin1("-c") << TQString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename());
+			*proc << TQString::tqfromLatin1("-c") << TQString("mv %1 %2").tqarg(filename).tqarg(LocalConfig::swordConfigFilename());
 			proc->start(KProcess::Block);
 		}
 	}
@@ -326,8 +326,8 @@ namespace BookshelfManager {
 		emit completed(totalPercent, filePercent);
 	}
 
-	void BTInstallMgr::preStatus(long totalBytes, long completedBytes, const char* /*message*/) {
-		qWarning("pre Status: %i / %i", (int)totalBytes, (int)completedBytes);
+	void BTInstallMgr::pretqStatus(long totalBytes, long completedBytes, const char* /*message*/) {
+		qWarning("pre tqStatus: %i / %i", (int)totalBytes, (int)completedBytes);
 		emit downloadStarted( "unknown filename" );
 
 		m_completedBytes = completedBytes;