kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

SVN_SILENT make it compile (Dlg->Dialog)

Browse Source 
svn path=/trunk/playground/utils/dolphin/; revision=618826
This commit is contained in:
Holger Freyther 2007-01-02 09:16:36 +00:00
parent b03d4cfc5d
commit f28181d833
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dolphinmainwindow.cpp
View File

@ -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 @@ void DolphinMainWindow::createFolder()
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 @@ void DolphinMainWindow::createFile()
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

12
src/dolphinview.cpp
View File

@ -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 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
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