[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 558347 by mlaurent:

Port++


 M  +1 -1      kapptemplate/kpartapp/app.cpp  
 M  +1 -1      kbabel/catalogmanager/catalogmanagerview.cpp  
 M  +1 -1      kbabel/kbabel/kbabelview.cpp  
 M  +1 -1      kbabel/kbabel/kbabelview2.cpp  
 M  +2 -2      kcachegrind/kcachegrind/toplevel.cpp  
 M  +1 -1      kompare/kompare_shell.cpp  
 M  +1 -1      kuiviewer/kuiviewer.cpp  
 M  +1 -1      umbrello/umbrello/uml.cpp  
 M  +1 -1      umbrello/umbrello/umllistview.cpp  
 M  +2 -2      umbrello/umbrello/umlviewimageexporter.cpp  


--- trunk/KDE/kdesdk/kapptemplate/kpartapp/app.cpp #558346:558347
@@ -152,7 +152,7 @@
     // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar
     // button is clicked
     KUrl url =
-        KFileDialog::getOpenURL( QString::null, QString::null, this );
+        KFileDialog::getOpenUrl( QString::null, QString::null, this );
 
     if (url.isEmpty() == false)
     {
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanagerview.cpp #558346:558347
@@ -449,7 +449,7 @@
 
 void CatalogManagerView::loadMarks()
 {
-    const KUrl url = KFileDialog::getOpenURL( QString(),"*.marklist", this );
+    const KUrl url = KFileDialog::getOpenUrl( QString(),"*.marklist", this );
     if( url.isEmpty() ) return;
 
     QString filename;
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelview.cpp #558346:558347
@@ -1137,7 +1137,7 @@
        if(url.isEmpty())
        {
             QString filename;
-            if ((url = KFileDialog::getOpenURL(currentURL().url(), CatalogImportPlugin::availableImportMimeTypes().join(" ")
+            if ((url = KFileDialog::getOpenUrl(currentURL().url(), CatalogImportPlugin::availableImportMimeTypes().join(" ")
                             ,this)).isEmpty())
             {
                 return;
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelview2.cpp #558346:558347
@@ -697,7 +697,7 @@
 
     if(url.isEmpty())
     {
-        url = KFileDialog::getOpenURL(_project->settings()->diffBaseDir(), 
+        url = KFileDialog::getOpenUrl(_project->settings()->diffBaseDir(), 
 "application/x-gettext", this, i18n("Select File to Diff With"));
     }
 
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/toplevel.cpp #558346:558347
@@ -957,7 +957,7 @@
 
 void TopLevel::loadTrace()
 {
-    KUrl url = KFileDialog::getOpenURL(":",
+    KUrl url = KFileDialog::getOpenUrl(":",
                                        i18n("cachegrind.out* callgrind.out*|Callgrind Profile Data\n*|All Files"),
                                        this,
                                        i18n("Select Callgrind Profile Data"));
@@ -1002,7 +1002,7 @@
 
 void TopLevel::addTrace()
 {
-    KUrl url = KFileDialog::getOpenURL(QString::null,
+    KUrl url = KFileDialog::getOpenUrl(QString::null,
                                        i18n("cachegrind.out* callgrind.out*|Callgrind Profile Data\n*|All Files"),
                                        this,
                                        i18n("Add Callgrind Profile Data"));
--- trunk/KDE/kdesdk/kompare/kompare_shell.cpp #558346:558347
@@ -356,7 +356,7 @@
 void KompareShell::slotFileOpen()
 {
 	// FIXME: use different filedialog which gets encoding
-	KUrl url = KFileDialog::getOpenURL( QString::null, "text/x-diff", this );
+	KUrl url = KFileDialog::getOpenUrl( QString::null, "text/x-diff", this );
 	if( !url.isEmpty() ) {
 		KompareShell* shell = new KompareShell();
 		kapp->ref();
--- trunk/KDE/kdesdk/kuiviewer/kuiviewer.cpp #558346:558347
@@ -125,7 +125,7 @@
     // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar
     // button is clicked
     KUrl file_name =
-        KFileDialog::getOpenURL( QString::null, i18n("*.ui *.UI|User Interface Files"), this );
+        KFileDialog::getOpenUrl( QString::null, i18n("*.ui *.UI|User Interface Files"), this );
 
     if (file_name.isEmpty() == false)
     {
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #558346:558347
@@ -642,7 +642,7 @@
         // here saving wasn't successful
 
     } else {
-        KUrl url=KFileDialog::getOpenURL(":open-umbrello-file",
+        KUrl url=KFileDialog::getOpenUrl(":open-umbrello-file",
             i18n("*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
                  "*.xmi|Uncompressed XMI Files (*.xmi)\n"
                  "*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #558346:558347
@@ -409,7 +409,7 @@
             }
             fileDialog.setSelection(defaultFilename.lower());
             fileDialog.exec();
-            KUrl selURL = fileDialog.selectedURL();
+            KUrl selURL = fileDialog.selectedUrl();
             if (selURL.isEmpty())
                 return;
             QString fileName = selURL.fileName();
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp #558346:558347
@@ -85,14 +85,14 @@
     prepareFileDialog(fileDialog);
     fileDialog.exec();
 
-    if (fileDialog.selectedURL().isEmpty())
+    if (fileDialog.selectedUrl().isEmpty())
         return false;
     m_view->clearSelected();   // Thanks to Peter Soetens for the idea
 
     // update image url and mime type
     m_imageMimeType = fileDialog.currentMimeFilter();
     app->setImageMimeType(m_imageMimeType);
-    m_imageURL = fileDialog.selectedURL();
+    m_imageURL = fileDialog.selectedUrl();
 
     // check if the extension is the extension of the mime type
     QFileInfo info(m_imageURL.filename());