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) (side-by-side diff)
tree29ba7c61bd1948a0eb1155d1f4f06f48aeaadd9f /microkde
parentabf935a18e55fcbe221d5a7c652840af279e2e3f (diff)
downloadkdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.zip
kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.tar.gz
kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.tar.bz2
fixes
Diffstat (limited to 'microkde') (more/less context) (ignore 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
@@ -167,13 +167,13 @@ private:
QRadioButton* vcal, *ical, *ocal, *tcal;
};
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 ) {
if ( !bupDir.exists() ) {
KBackupPrefs noDir( i18n("<b>Backup directory does not exist: </b>") + dp.right(30));
if ( !noDir.exec() ) return 3;
@@ -197,13 +197,13 @@ int KApplication::createBackup( QString fn, QString dp, int numBup )
int i;
for ( i = 0; i < allFileList.count(); ++i ) {
QString fi = allFileList[i];
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;
while ( count >= numBup ) {
QString fnr = dp + "/"+fileList[remCount];
QFile::remove( fnr );
@@ -212,26 +212,25 @@ int KApplication::createBackup( QString fn, QString dp, int numBup )
}
QDateTime mRunStart = QDateTime::currentDateTime();
QString file = "%1%2%3-%4%5%6-";
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("<b>The backup copy command failed!</b>"));
if ( !noDir.exec() ) return 3;
if ( noDir.againTomorrow() ) {
return 0;
} else if ( noDir.later() ) {