Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 01746169bd16de848e6e161fd48eff17e2fc19db..637f41f2108e2d143abc2beeadb6cd9b6ff0c624 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -23,15 +23,14 @@
 #define DOLPHIN_MAINWINDOW_H
 
 #include <config-baloo.h>
 #define DOLPHIN_MAINWINDOW_H
 
 #include <config-baloo.h>

-

 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>

-#include <QIcon>
-#include <QUrl>

 
 

+#include <QIcon>

 #include <QList>
 #include <QPointer>
 #include <QList>
 #include <QPointer>

+#include <QUrl>

 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 


@@ -47,9 +46,7 @@ class KNewFileMenu;
 class QToolButton;
 class QIcon;
 class PlacesPanel;
 class QToolButton;
 class QIcon;
 class PlacesPanel;

-#ifndef Q_OS_WIN

 class TerminalPanel;
 class TerminalPanel;

-#endif

 
 /**
  * @short Main window for Dolphin.
 
 /**
  * @short Main window for Dolphin.


@@ -60,7 +57,6 @@ class DolphinMainWindow: public KXmlGuiWindow
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")

-    Q_PROPERTY(int id READ getId SCRIPTABLE true)

 
 public:
     DolphinMainWindow();
 
 public:
     DolphinMainWindow();


@@ -104,11 +100,6 @@ public slots:
      */
     void pasteIntoFolder();
 
      */
     void pasteIntoFolder();
 

-    /**
-     * Returns the main window ID used through DBus.
-     */
-    int getId() const;
-

     /**
      * Implementation of the MainWindowAdaptor/QDBusAbstractAdaptor interface.
      * Inform all affected dolphin components (panels, views) of an URL
     /**
      * Implementation of the MainWindowAdaptor/QDBusAbstractAdaptor interface.
      * Inform all affected dolphin components (panels, views) of an URL


@@ -348,6 +339,11 @@ private slots:
      */
     void openInNewWindow();
 
      */
     void openInNewWindow();
 

+    /**
+     * Show the target of the selected symlink
+     */
+    void showTarget();
+

     /**
      * Indicates in the statusbar that the execution of the command \a command
      * has been finished.
     /**
      * Indicates in the statusbar that the execution of the command \a command
      * has been finished.


@@ -512,7 +508,6 @@ private:
     KNewFileMenu* m_newFileMenu;
     DolphinTabWidget* m_tabWidget;
     DolphinViewContainer* m_activeViewContainer;
     KNewFileMenu* m_newFileMenu;
     DolphinTabWidget* m_tabWidget;
     DolphinViewContainer* m_activeViewContainer;

-    int m_id;

 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;


@@ -524,9 +519,7 @@ private:
 
     KIO::Job* m_lastHandleUrlStatJob;
 
 
     KIO::Job* m_lastHandleUrlStatJob;
 

-#ifndef Q_OS_WIN

     TerminalPanel* m_terminalPanel;
     TerminalPanel* m_terminalPanel;

-#endif

     PlacesPanel* m_placesPanel;
     bool m_tearDownFromPlacesRequested;
 };
     PlacesPanel* m_placesPanel;
     bool m_tearDownFromPlacesRequested;
 };


@@ -541,10 +534,5 @@ inline KNewFileMenu* DolphinMainWindow::newFileMenu() const
     return m_newFileMenu;
 }
 
     return m_newFileMenu;
 }
 

-inline int DolphinMainWindow::getId() const
-{
-    return m_id;
-}
-

 #endif // DOLPHIN_MAINWINDOW_H
 
 #endif // DOLPHIN_MAINWINDOW_H