4 files changed, 12 insertions, 10 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 944ee1e..0160dbe 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,6 +7,7 @@ Fixed a problem displaying very long allday events in agenda view in single day
 Fixed a problem with the default settings for new todos.
 Added an error message dialog if saving of calendar files is not possible.
 Made it impossible to close KO/Pi if saving fails.
+Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick.
 
 KA/Pi:
 Added a config option to turn on asking before a contact is deleted.
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index e86ec95..ef25fd0 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -30,6 +30,7 @@
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qwhatsthis.h>
+#include <qdir.h>
 
 
 #include <libkcal/calfilter.h>
@@ -407,16 +408,16 @@ void KOCalEditView::addCal()
 }
 int KOCalEditView::addCalendar( QString name, QString file, bool ask )
 {
-  
+    file = QDir::convertSeparators( file ); 
     QFileInfo fi ( file );
     QString absFile = file;
     bool isRelative = false;
     if ( fi.isRelative() ) {
         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 ) {
             isRelative = true; 
             file = fi.fileName ();
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index eb997f5..77f572c 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -449,7 +449,7 @@ void KOPrefs::usrReadConfig()
         KopiCalendarFile *kkf = getNewCalendar();
         kkf->isStandard = true;
         kkf->mName = i18n("Standard");
-        kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" );
+        kkf->mFileName = QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) );
     } 
     while ( mNextAvailableCalendar  <= numCals ) {
         //qDebug("Read cal #%d ",  mNextAvailableCalendar );
@@ -461,8 +461,8 @@ void KOPrefs::usrReadConfig()
         kkf->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true);
         kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false);
         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);
         if ( kkf->mCalNumber == 1 ) {
             kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" );
@@ -472,7 +472,7 @@ void KOPrefs::usrReadConfig()
             kkf->mFileName = locateLocal( "data", "korganizer/birthdays.ics" ); 
         }
         if ( kkf->isRelative )
-            kkf->mFileName = KGlobalSettings::calendarDir() + kkf->mSavedFileName;
+            kkf->mFileName = QDir::convertSeparators( KGlobalSettings::calendarDir() + kkf->mSavedFileName );
     }
 
     KPimPrefs::usrReadConfig();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9c55e9f..9ae393d 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1692,12 +1692,12 @@ void MainWindow::aboutKnownBugs()
 
 QString MainWindow::defaultFileName()
 {
-    return locateLocal( "data", "korganizer/mycalendar.ics" );
+    return QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) );
 }
 QString MainWindow::syncFileName()
 {
 #ifdef DESKTOP_VERSION
-    return  locateLocal( "tmp", "synccalendar.ics" );
+    return  QDir::convertSeparators( locateLocal( "tmp", "synccalendar.ics" ) );
 #else
     return QString( "/tmp/synccalendar.ics" );
 #endif
@@ -2565,7 +2565,7 @@ void MainWindow::exportVCalendar()
 QString MainWindow::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
-    return  locateLocal( "tmp", "copysynccal.ics" );
+    return  QDir::convertSeparators( locateLocal( "tmp", "copysynccal.ics" ) );
 #else
     return QString( "/tmp/copysynccal.ics" );
 #endif