Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index bdc80b35909dd30068f1df5c5239d130c3d45aab..7479c05b14f7836afbc8b6a9a1158ca6af82c3a3 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -45,7 +45,7 @@ class DolphinSearchOptionsConfigurator;
 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
-class KNewMenu;
+class KNewFileMenu;
 class KTabBar;
 class KUrl;
 class QSplitter;
@@ -115,7 +115,7 @@ public:
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).
      */
-    KNewMenu* newMenu() const;
+    KNewFileMenu* newMenu() const;
 
     /**
      * Returns the 'Show Menubar' action which can be shared with
@@ -423,12 +423,24 @@ private slots:
      */
     void handleUrl(const KUrl& url);
 
+    /**
+     * handleUrl() can trigger a stat job to see if the url can actually
+     * be listed.
+     */
+    void slotHandleUrlStatFinished(KJob* job);
+
     /**
      * setUrlAsCaption() will trigger a stat job which reports its result in
      * this slot.
      */
     void slotCaptionStatFinished(KJob* job);
 
+    /**
+     * Is connected to the KTabBar signal receivedDropEvent.
+     * Allows dragging and dropping files onto tabs.
+     */
+    void tabDropEvent(int tab, QDropEvent* event);
+
     /**
      * Is invoked when the write state of a folder has been changed and
      * enables/disables the "Create New..." menu entry.
@@ -522,7 +534,7 @@ private:
         virtual void jobError(KIO::Job* job);
     };
 
-    KNewMenu* m_newMenu;
+    KNewFileMenu* m_newMenu;
     KActionMenu* m_recentTabsMenu;
     KAction* m_showMenuBar;
     KTabBar* m_tabBar;
@@ -549,6 +561,7 @@ private:
     QPointer<DolphinSettingsDialog> m_settingsDialog;
 
     KJob* m_captionStatJob;
+    KJob* m_lastHandleUrlStatJob;
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
@@ -561,7 +574,7 @@ inline bool DolphinMainWindow::isSplit() const
     return m_viewTab[m_tabIndex].secondaryView != 0;
 }
 
-inline KNewMenu* DolphinMainWindow::newMenu() const
+inline KNewFileMenu* DolphinMainWindow::newMenu() const
 {
     return m_newMenu;
 }