summaryrefslogtreecommitdiffabout
path: root/microkde
authorzautrix <zautrix>2005-04-22 09:02:00 (UTC)
committer zautrix <zautrix>2005-04-22 09:02:00 (UTC)
commit86518702ea6efc14992580a7fc6c089905cfb716 (patch) (unidiff)
tree29ba7c61bd1948a0eb1155d1f4f06f48aeaadd9f /microkde
parentabf935a18e55fcbe221d5a7c652840af279e2e3f (diff)
downloadkdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.zip
kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.tar.gz
kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.tar.bz2
fixes
Diffstat (limited to 'microkde') (more/less context) (show whitespace changes)
-rw-r--r--microkde/kapplication.cpp13
1 files changed, 6 insertions, 7 deletions
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 )
170{ 170{
171 if ( numBup < 1) return 3; 171 if ( numBup < 1) return 3;
172 int ret = 3; 172 int ret = 3;
173 qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); 173 //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup);
174 QDir bupDir ( dp ); 174 QDir bupDir ( dp );
175 bool tryAgain = true; 175 bool tryAgain = true;
176 while ( tryAgain ) { 176 while ( tryAgain ) {
@@ -200,7 +200,7 @@ int KApplication::createBackup( QString fn, QString dp, int numBup )
200 if ( fi. find( fName ) > -1 ) 200 if ( fi. find( fName ) > -1 )
201 fileList.append( fi ); 201 fileList.append( fi );
202 } 202 }
203 qDebug("%d backup files exist ", fileList.count()); 203 qDebug("KApp: %d backup files exist ", fileList.count());
204 int count = fileList.count(); 204 int count = fileList.count();
205 fileList.sort(); 205 fileList.sort();
206 int remCount = 0; 206 int remCount = 0;
@@ -215,20 +215,19 @@ int KApplication::createBackup( QString fn, QString dp, int numBup )
215 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 ); 215 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 );
216 file.replace ( QRegExp (" "), "0" ); 216 file.replace ( QRegExp (" "), "0" );
217 file += fName ; 217 file += fName ;
218 file = dp + "/"+file; 218 file = dp + file;
219 QString command; 219 QString command;
220 int res = 0; 220 int res = 0;
221#ifdef _WIN32_ 221#ifdef _WIN32_
222 command = "xcopy "+ fn+ " "+file; 222 command = "copy \""+ QDir::convertSeparators( fn)+ "\" \""+QDir::convertSeparators(file)+ "\" ";
223 command = QDir::convertSeparators( command );
224#else 223#else
225 command = "cp "+ fn+ " "+file; 224 command = "cp "+ fn+ " "+file;
226#endif 225#endif
227 qDebug("command %s ",command.latin1() ); 226 //qDebug("command %s ",command.latin1() );
228 tryAgain = true; 227 tryAgain = true;
229 while ( tryAgain ) { 228 while ( tryAgain ) {
230 res = system ( command.latin1() ); 229 res = system ( command.latin1() );
231 qDebug("copy result %d ", res); 230 qDebug("KApp: Copy result %d ", res);
232 if ( res != 0 ) { 231 if ( res != 0 ) {
233 KBackupPrefs noDir( i18n("<b>The backup copy command failed!</b>")); 232 KBackupPrefs noDir( i18n("<b>The backup copy command failed!</b>"));
234 if ( !noDir.exec() ) return 3; 233 if ( !noDir.exec() ) return 3;