TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

1 files changed, 8 insertions, 8 deletions

diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp
index cb5b0e2a..de7a4d0f 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -25,20 +25,20 @@ TQStringList WaSkinManager::availableSkins() {
 	
 	// This loop adds them all to our skin list
 	for(unsigned int x = 0;x < skinDirs.count();x++) {
-		TQDir skinQDir(skinDirs[x]);
+		TQDir skinTQDir(skinDirs[x]);
 
 		// We only want directories, although there shouldn't be anything else
-		skinQDir.setFilter( TQDir::Dirs );
+		skinTQDir.setFilter( TQDir::Dirs );
 		// I guess name is as good as any
-		skinQDir.setSorting( TQDir::Name );
+		skinTQDir.setSorting( TQDir::Name );
 
-		for (unsigned int y = 0;y < skinQDir.count();y++) {
-			TQStringList skins = skinQDir.entryList(TQDir::Dirs, TQDir::Name);
+		for (unsigned int y = 0;y < skinTQDir.count();y++) {
+			TQStringList skins = skinTQDir.entryList(TQDir::Dirs, TQDir::Name);
 
 			// We really don't care for '.' and '..'
-			if (skinQDir[y][0] != (char)'.') {
+			if (skinTQDir[y][0] != (char)'.') {
 				// Add ourselves to the list, using our directory name
-				skin_list += skinQDir[y];
+				skin_list += skinTQDir[y];
  			}
 		}
 	}
@@ -82,7 +82,7 @@ bool WaSkinManager::installSkin(TQString _url) {
 			return false;
 
 		TQString base_path;
-		base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " ");
+		base_path = location + "/" + TQFileInfo(url.path()).baseName().tqreplace(TQRegExp("_"), " ");
 		KIO::Job *job = KIO::copy("zip:" + url.path(), base_path);
 		connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));