From 86518702ea6efc14992580a7fc6c089905cfb716 Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 22 Apr 2005 09:02:00 +0000 Subject: fixes --- (limited to 'microkde') diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index 566bb41..2c9e3b6 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp @@ -170,7 +170,7 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) { if ( numBup < 1) return 3; int ret = 3; - qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); + //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); QDir bupDir ( dp ); bool tryAgain = true; while ( tryAgain ) { @@ -200,7 +200,7 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) if ( fi. find( fName ) > -1 ) fileList.append( fi ); } - qDebug("%d backup files exist ", fileList.count()); + qDebug("KApp: %d backup files exist ", fileList.count()); int count = fileList.count(); fileList.sort(); int remCount = 0; @@ -215,20 +215,19 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); file.replace ( QRegExp (" "), "0" ); file += fName ; - file = dp + "/"+file; + file = dp + file; QString command; int res = 0; #ifdef _WIN32_ - command = "xcopy "+ fn+ " "+file; - command = QDir::convertSeparators( command ); + command = "copy \""+ QDir::convertSeparators( fn)+ "\" \""+QDir::convertSeparators(file)+ "\" "; #else command = "cp "+ fn+ " "+file; #endif - qDebug("command %s ",command.latin1() ); + //qDebug("command %s ",command.latin1() ); tryAgain = true; while ( tryAgain ) { res = system ( command.latin1() ); - qDebug("copy result %d ", res); + qDebug("KApp: Copy result %d ", res); if ( res != 0 ) { KBackupPrefs noDir( i18n("The backup copy command failed!")); if ( !noDir.exec() ) return 3; -- cgit v0.9.0.2