| -rw-r--r-- | korganizer/kofilterview.cpp | 7 | ||||
| -rw-r--r-- | korganizer/koprefs.cpp | 8 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index e86ec95..ef25fd0 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp @@ -32,2 +32,3 @@ #include <qwhatsthis.h> +#include <qdir.h> @@ -409,3 +410,3 @@ int KOCalEditView::addCalendar( QString name, QString file, bool ask ) { - + file = QDir::convertSeparators( file ); QFileInfo fi ( file ); @@ -415,6 +416,6 @@ int KOCalEditView::addCalendar( QString name, QString file, bool ask ) isRelative = true; - absFile = KGlobalSettings::calendarDir()+file; + absFile = QDir::convertSeparators( KGlobalSettings::calendarDir()+file ); fi.setFile( absFile ); } else { - QString cd = KGlobalSettings::calendarDir(); + QString cd = QDir::convertSeparators( KGlobalSettings::calendarDir() ); if ( file.left( cd.length() ) == cd ) { diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index eb997f5..77f572c 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -451,3 +451,3 @@ void KOPrefs::usrReadConfig() kkf->mName = i18n("Standard"); - kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); + kkf->mFileName = QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) ); } @@ -463,4 +463,4 @@ void KOPrefs::usrReadConfig() kkf->mName = fc.readEntry( prefix+"_Name", "Calendar"); - kkf->mFileName = fc.readEntry( prefix+"_FileName", kkf->mFileName); - kkf->mSavedFileName = fc.readEntry( prefix+"_SavedFileName", kkf->mFileName); + kkf->mFileName = QDir::convertSeparators( fc.readEntry( prefix+"_FileName", kkf->mFileName) ); + kkf->mSavedFileName = QDir::convertSeparators( fc.readEntry( prefix+"_SavedFileName", kkf->mFileName) ); kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor); @@ -474,3 +474,3 @@ void KOPrefs::usrReadConfig() if ( kkf->isRelative ) - kkf->mFileName = KGlobalSettings::calendarDir() + kkf->mSavedFileName; + kkf->mFileName = QDir::convertSeparators( KGlobalSettings::calendarDir() + kkf->mSavedFileName ); } diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 9c55e9f..9ae393d 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1694,3 +1694,3 @@ QString MainWindow::defaultFileName() { - return locateLocal( "data", "korganizer/mycalendar.ics" ); + return QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) ); } @@ -1699,3 +1699,3 @@ QString MainWindow::syncFileName() #ifdef DESKTOP_VERSION - return locateLocal( "tmp", "synccalendar.ics" ); + return QDir::convertSeparators( locateLocal( "tmp", "synccalendar.ics" ) ); #else @@ -2567,3 +2567,3 @@ QString MainWindow::sentSyncFile() #ifdef DESKTOP_VERSION - return locateLocal( "tmp", "copysynccal.ics" ); + return QDir::convertSeparators( locateLocal( "tmp", "copysynccal.ics" ) ); #else |