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

List:       kde-commits
Subject:    KDE/kdebase/libkonq
From:       David Faure <faure () kde ! org>
Date:       2007-01-25 23:13:36
Message-ID: 1169766816.632403.1784.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 627198 by dfaure:

Made slotResult virtual for dolphin. Made other slots private. Removed KUrl overload \
                since KUrl::List can be created from a KUrl (implicitly, even)
CCMAIL: Peter Penz <peter.penz@gmx.at>


 M  +1 -8      knewmenu.cpp  
 M  +9 -3      knewmenu.h  


--- trunk/KDE/kdebase/libkonq/knewmenu.cpp #627197:627198
@@ -35,7 +35,6 @@
 #include <kprotocolmanager.h>
 #include <kmenu.h>
 #include <krun.h>
-#include <kactioncollection.h>
 #include <kio/job.h>
 #include <kio/jobuidelegate.h>
 #include <kio/renamedialog.h>
@@ -671,16 +670,10 @@
 }
 
 
-void KNewMenu::setPopupFiles(const KUrl::List & files)
+void KNewMenu::setPopupFiles(const KUrl::List& files)
 {
     d->popupFiles = files;
 }
 
-void KNewMenu::setPopupFiles(const KUrl & file)
-{
-    d->popupFiles.clear();
-    d->popupFiles.append( file );
-}
-
 #include "knewmenu.moc"
 #include "knewmenu_p.moc"
--- trunk/KDE/kdebase/libkonq/knewmenu.h #627197:627198
@@ -60,8 +60,7 @@
      * Set the files the popup is shown for
      * Call this before showing up the menu
      */
-    void setPopupFiles(const KUrl::List & _files);
-    void setPopupFiles(const KUrl & _file);
+    void setPopupFiles(const KUrl::List& files);
 
 public Q_SLOTS:
     /**
@@ -72,6 +71,14 @@
 
 protected Q_SLOTS:
     /**
+     * Called when the job that copied the template has finished.
+     * This method is virtual so that error handling can be reimplemented.
+     * Make sure to call the base class slotResult when !job->error() though.
+     */
+    virtual void slotResult( KJob* job );
+
+private Q_SLOTS:
+    /**
      * Called when New->Directory... is clicked
      */
     void slotNewDir();
@@ -86,7 +93,6 @@
      */
     void slotFillTemplates();
 
-    void slotResult( KJob * );
     // Special case (filename conflict when creating a link=url file)
     void slotRenamed( KIO::Job *, const KUrl&, const KUrl& );
 


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