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

List:       kde-commits
Subject:    playground/utils/dolphin/src (silent)
From:       Holger Freyther <freyther () gmx ! net>
Date:       2007-01-02 9:16:44
Message-ID: 1167729404.710973.6430.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 618826 by zecke:

SVN_SILENT make it compile (Dlg->Dialog)


 M  +3 -3      dolphinmainwindow.cpp  
 M  +6 -6      dolphinview.cpp  


--- trunk/playground/utils/dolphin/src/dolphinmainwindow.cpp #618825:618826
@@ -39,7 +39,7 @@
 #include <kaction.h>
 #include <kstandardaction.h>
 #include <kmenu.h>
-#include <kio/renamedlg.h>
+#include <kio/renamedialog.h>
 #include <kinputdialog.h>
 #include <kshell.h>
 #include <kdesktopfile.h>
@@ -379,7 +379,7 @@
 
 
     if (baseUrl.isLocalFile() && QFileInfo(baseUrl.path(KUrl::AddTrailingSlash) + \
                name).exists()) {
-        name = KIO::RenameDlg::suggestName(baseUrl, i18n("New Folder"));
+        name = KIO::RenameDialog::suggestName(baseUrl, i18n("New Folder"));
     }
 
     bool ok = false;
@@ -484,7 +484,7 @@
     const bool fileExists = viewUrl.isLocalFile() &&
                             QFileInfo(viewUrl.path(KUrl::AddTrailingSlash) + \
KIO::encodeFileName(name)).exists();  if (fileExists) {
-        name = KIO::RenameDlg::suggestName(viewUrl, name);
+        name = KIO::RenameDialog::suggestName(viewUrl, name);
     }
 
     // let the user change the suggested file name
--- trunk/playground/utils/dolphin/src/dolphinview.cpp #618825:618826
@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <klocale.h>
 #include <kio/netaccess.h>
-#include <kio/renamedlg.h>
+#include <kio/renamedialog.h>
 #include <kmimetyperesolver.h>
 #include <assert.h>
 
@@ -547,11 +547,11 @@
     if (destExists) {
         // the destination already exists, hence ask the user
         // how to proceed...
-        KIO::RenameDlg renameDialog(this,
-                                    i18n("File Already Exists"),
-                                    source.path(),
-                                    dest.path(),
-                                    KIO::M_OVERWRITE);
+        KIO::RenameDialog renameDialog(this,
+                                       i18n("File Already Exists"),
+                                       source.path(),
+                                       dest.path(),
+                                       KIO::M_OVERWRITE);
         switch (renameDialog.exec()) {
             case KIO::R_OVERWRITE:
                 // the destination should be overwritten


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