X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4e40fe810d324e69eeb824e40011e509e6676aaf..eb68fae15cdbf15e894d1a9d555c88d306261cc2:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 01746169b..25233096a 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -23,15 +23,14 @@ #define DOLPHIN_MAINWINDOW_H #include - #include #include #include -#include -#include +#include #include #include +#include typedef KIO::FileUndoManager::CommandType CommandType; @@ -47,9 +46,7 @@ class KNewFileMenu; class QToolButton; class QIcon; class PlacesPanel; -#ifndef Q_OS_WIN class TerminalPanel; -#endif /** * @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_PROPERTY(int id READ getId SCRIPTABLE true) public: DolphinMainWindow(); @@ -104,11 +100,6 @@ public slots: */ 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 @@ -512,7 +503,6 @@ private: KNewFileMenu* m_newFileMenu; DolphinTabWidget* m_tabWidget; DolphinViewContainer* m_activeViewContainer; - int m_id; DolphinViewActionHandler* m_actionHandler; DolphinRemoteEncoding* m_remoteEncoding; @@ -524,9 +514,7 @@ private: KIO::Job* m_lastHandleUrlStatJob; -#ifndef Q_OS_WIN TerminalPanel* m_terminalPanel; -#endif PlacesPanel* m_placesPanel; bool m_tearDownFromPlacesRequested; }; @@ -541,10 +529,5 @@ inline KNewFileMenu* DolphinMainWindow::newFileMenu() const return m_newFileMenu; } -inline int DolphinMainWindow::getId() const -{ - return m_id; -} - #endif // DOLPHIN_MAINWINDOW_H