[Kst] branches/work/kst/kst1kde4/kst/src/libkstapp

[Zongyi Zhang]

SVN commit 1115247 by zhang:

continue kst1kde4

 M  +2 -2      kstdoc.cpp  
 M  +1 -1      kstvectordialog.cpp  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstdoc.cpp #1115246:1115247
@@ -195,7 +195,7 @@
     tmpFile = url.path();
   } else {
 /*    if (!KIO::NetAccess::exists(url, true, KstApp::inst()) || !KIO::NetAccess::download(url, tmpFile, KstApp::inst())) {
-      QMessageBox::warning(KstApp::inst(), QObject::tr("kst"), QObject::tr("%1: There is no file with that name to open.").arg(url.path()));
+      QMessageBox::warning(KstApp::inst(), QObject::tr("kst"), QObject::tr("%1: There is no file with that name to open.").arg(url.toString()));
 
       return false;
     }
@@ -895,7 +895,7 @@
 
   if (QFile::exists(url)) {
     if (prompt) {
-      int rc = QMessageBox::warning(KstApp::inst(), QObject::tr("Kst"), QObject::tr("File %1 exists.  Overwrite?").arg(url.prettyURL()), QMessageBox::Yes | QMessageBox::No);
+      int rc = QMessageBox::warning(KstApp::inst(), QObject::tr("Kst"), QObject::tr("File %1 exists.  Overwrite?").arg(url.path()), QMessageBox::Yes | QMessageBox::No);
       if (rc == QMessageBox::No) {
         return false;
       }
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectordialog.cpp #1115246:1115247
@@ -135,7 +135,7 @@
       QDir dir(strFolder);
 
       if (dir.cdUp()) {
-// xxx        fileDlg->setURL(KURL(dir.absPath()));
+        fileDlg->setDirectory(dir);
       }
     }
   }