[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs
From:       David Faure <faure () kde ! org>
Date:       2006-08-31 21:56:21
Message-ID: 1157061381.121854.4264.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579358 by dfaure:

Fix string<->url conversion bugs


 M  +3 -3      kabc/plugins/dir/resourcedirconfig.cpp  
 M  +2 -2      kcal/resourcelocalconfig.cpp  


--- trunk/KDE/kdepimlibs/kabc/plugins/dir/resourcedirconfig.cpp #579357:579358
@@ -83,9 +83,9 @@
 
   mFormatBox->setCurrentIndex( mFormatTypes.indexOf( resource->format() ) );
 
-  mFileNameEdit->setUrl( KUrl::fromPath(resource->path()) );
+  mFileNameEdit->setPath( resource->path() );
   if ( mFileNameEdit->url().isEmpty() )
-    mFileNameEdit->setUrl( KUrl::fromPath(KABC::StdAddressBook::directoryName()) );
+    mFileNameEdit->setPath( KABC::StdAddressBook::directoryName() );
 }
 
 void ResourceDirConfig::saveSettings( KRES::Resource *res )
@@ -100,7 +100,7 @@
   if ( mInEditMode )
     resource->setFormat( mFormatTypes[ mFormatBox->currentIndex() ] );
 
-  resource->setPath( mFileNameEdit->url().toString() );
+  resource->setPath( mFileNameEdit->url().path() );
 }
 
 #include "resourcedirconfig.moc"
--- trunk/KDE/kdepimlibs/kcal/resourcelocalconfig.cpp #579357:579358
@@ -79,7 +79,7 @@
 
 void ResourceLocalConfig::saveSettings( KRES::Resource *resource )
 {
-  QString url = mURL->url().toString();
+  KUrl url = mURL->url();
 
   if( url.isEmpty() ) {
     KStandardDirs dirs;
@@ -92,7 +92,7 @@
 
     KMessageBox::information( this, i18n( "You did not specify a URL for this \
resource. Therefore, the resource will be saved in %1. It is still possible to change \
this location by editing the resource properties.", file.fileName() ) );  
-    url = file.fileName();
+    url = KUrl::fromPath( file.fileName() );
   }
 
   ResourceLocal* res = static_cast<ResourceLocal*>( resource );


[prev in list] [next in list] [prev in thread] [next in thread]