fixxx

1 files changed, 4 insertions, 3 deletions

diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index e86ec95..ef25fd0 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -9,48 +9,49 @@
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qwhatsthis.h>
+#include <qdir.h>
 
 
 #include <libkcal/calfilter.h>
 
 #include "kofilterview.h"
 #include "koprefs.h"
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kcolorbutton.h>
 #include <kmessagebox.h>
 
 
 
  
 
 KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent,
                            const char* name,WFlags fl )
   : KOFilterView_base(parent,name,fl)
 {
   mFilters = filterList;
 
   connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged()));
   connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged()));
@@ -386,58 +387,58 @@ void KOCalEditView::addCal()
             if ( kkf->mName == name ) {
                 KMessageBox::information( this,  i18n("Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!").arg( name ) ); 
                 name = "";
                 tryagain = true;  
                 break;
             }
             if ( kkf->mFileName == file ) {
                 KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
                 file = KGlobalSettings::calendarDir()+"newCal.ics";
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();
         } 
         QFileInfo fi ( file );
         if ( fi.isDir() ) {
             tryagain = true;  
         }
     }
     addCalendar ( name, file );
     QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) );
 }
 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 ();
             fi.setFile( absFile );
         }
     }
     if (!fi.exists() ) {
         if ( ask )
             if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( KGlobal::formatMessage (absFile,0) ) )== KMessageBox::No )
                 return 0;
         QFile fileIn( absFile );
         if (!fileIn.open( IO_WriteOnly ) ) {
             KMessageBox::sorry( this,  i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); 
             return 0;
         } 
         QTextStream tsIn( &fileIn );
         tsIn.setCodec( QTextCodec::codecForName("utf8") );
         tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n";
         fileIn.close();       
     }
     KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar();
     kkf->mName = name;
     kkf->mFileName =  absFile;
     kkf->mSavedFileName = file;