There are some extractable strings in subdirs too.

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 2f0fb9589a21e287d52fb33a2cced79f917de7b2..71d7b52d187cbbfa6d45005fae280b8f8c9311a9 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -28,7 +28,7 @@
 #include <config-nepomuk.h>
 
 #include <kfileitemdelegate.h>
-#include <konq_fileundomanager.h>
+#include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 
@@ -254,12 +254,6 @@ private slots:
      */
     void editLocation();
 
-    /**
-     * Opens the view properties dialog, which allows to modify the properties
-     * of the currently active view.
-     */
-    void adjustViewProperties();
-
     /** Goes back on step of the URL history. */
     void goBack();
 
@@ -323,7 +317,7 @@ private slots:
     void toggleActiveView();
 
     /** Called when the view is doing a file operation, like renaming, copying, moving etc. */
-    void slotDoingOperation(KonqFileUndoManager::CommandType type);
+    void slotDoingOperation(KIO::FileUndoManager::CommandType type);
 
     /**
      * Activates the tab with the index \a index, which means that the current view
@@ -345,6 +339,13 @@ private slots:
      */
     void openTabContextMenu(int index, const QPoint& pos);
 
+    /**
+     * Handles a click on a places item: if the middle mouse button is
+     * clicked, a new tab is opened for \a url, otherwise the current
+     * view is replaced by \a url.
+     */
+    void handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons);
+
 private:
     DolphinMainWindow(int id);
     void init();
@@ -388,15 +389,12 @@ private:
      * assures that all errors are shown in the status bar of Dolphin
      * instead as modal error dialog with an OK button.
      */
-    class UndoUiInterface : public KonqFileUndoManager::UiInterface
+    class UndoUiInterface : public KIO::FileUndoManager::UiInterface
     {
     public:
-        UndoUiInterface(DolphinMainWindow* mainWin);
+        UndoUiInterface();
         virtual ~UndoUiInterface();
         virtual void jobError(KIO::Job* job);
-
-    private:
-        DolphinMainWindow* m_mainWin;
     };
 
     KNewMenu* m_newMenu;
@@ -421,7 +419,7 @@ private:
     DolphinViewActionHandler* m_actionHandler;
 
     /// remember pending undo operations until they are finished
-    QList<KonqFileUndoManager::CommandType> m_undoCommandTypes;
+    QList<KIO::FileUndoManager::CommandType> m_undoCommandTypes;
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const