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

List:       kde-commits
Subject:    [kde-baseapps/frameworks] lib/konq/src: Remove KonqOperations::mkdir, port its only usage.
From:       David Faure <faure () kde ! org>
Date:       2014-08-30 21:36:38
Message-ID: E1XNqK6-0006NS-I2 () scm ! kde ! org
[Download RAW message or body]

Git commit 471b2687c05dd6aa277394b352e88c97c55074b1 by David Faure.
Committed on 30/08/2014 at 21:34.
Pushed by dfaure into branch 'frameworks'.

Remove KonqOperations::mkdir, port its only usage.

Documented in https://community.kde.org/Frameworks/Porting_Notes#libkonq

M  +5    -10   lib/konq/src/konq_operations.cpp
M  +0    -5    lib/konq/src/konq_operations.h

http://commits.kde.org/kde-baseapps/471b2687c05dd6aa277394b352e88c97c55074b1

diff --git a/lib/konq/src/konq_operations.cpp b/lib/konq/src/konq_operations.cpp
index 246f5a6..55a384a 100644
--- a/lib/konq/src/konq_operations.cpp
+++ b/lib/konq/src/konq_operations.cpp
@@ -97,15 +97,6 @@ void KonqOperations::editMimeType( const QString & mimeType, \
QWidget* parent )  keditfiletype, keditfiletype /*unused*/, parent );
 }
 
-KIO::SimpleJob* KonqOperations::mkdir( QWidget *parent, const KUrl & url )
-{
-    KIO::SimpleJob * job = KIO::mkdir(url);
-    KJobWidgets::setWindow(job, parent);
-    job->ui()->setAutoErrorHandlingEnabled(true);
-    KIO::FileUndoManager::self()->recordJob( KIO::FileUndoManager::Mkdir, \
                QList<QUrl>(), url, job );
-    return job;
-}
-
 void KonqOperations::doPaste( QWidget * parent, const KUrl & destUrl, const QPoint \
&pos )  {
     (void) KonqOperations::doPasteV2( parent, destUrl, pos );
@@ -768,7 +759,11 @@ KIO::SimpleJob* KonqOperations::newDir(QWidget * parent, const \
KUrl & baseUrl, N  url = baseUrl;
                 url.addPath( name );
             }
-            return KonqOperations::mkdir( parent, url );
+            KIO::SimpleJob * job = KIO::mkdir(url);
+            KJobWidgets::setWindow(job, parent);
+            job->ui()->setAutoErrorHandlingEnabled(true);
+            KIO::FileUndoManager::self()->recordJob( KIO::FileUndoManager::Mkdir, \
QList<QUrl>(), url, job ); +            return job;
         }
     } while (askAgain);
     return 0;
diff --git a/lib/konq/src/konq_operations.h b/lib/konq/src/konq_operations.h
index ab89e3d..df908f2 100644
--- a/lib/konq/src/konq_operations.h
+++ b/lib/konq/src/konq_operations.h
@@ -117,11 +117,6 @@ public:
     static QPair<bool, QString> pasteInfo(const KUrl& targetUrl);
 
     /**
-     * Create a directory. Same as KIO::mkdir but records job into \
                KonqFileUndoManager for undo/redo purposes.
-     */
-    static KIO::SimpleJob* mkdir( QWidget *parent, const KUrl & url );
-
-    /**
      * Ask for the name of a new directory and create it.
      * Calls KonqOperations::mkdir.
      *


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