forwardport r757231

[dolphin.git] / src / dolphinapplication.h

diff --git a/src/dolphinapplication.h b/src/dolphinapplication.h
index fc1a564c897d9bea252ef0f11a524890e48d2913..8b19e6ef2487fe1df7957840b86817fb90783117 100644 (file)
--- a/src/dolphinapplication.h
+++ b/src/dolphinapplication.h
@@ -22,9 +22,11 @@
 #ifndef _DOLPHIN_APPLICATION_H
 #define _DOLPHIN_APPLICATION_H
 
-#include <kapplication.h>
+#include <kuniqueapplication.h>
+#include <kurl.h>
 
 class DolphinMainWindow;
+class KUrl;
 
 /**
  * @brief Holds the application data which can be accessed.
@@ -32,9 +34,10 @@ class DolphinMainWindow;
  * we will delete on application exit.
  */
 
-class DolphinApplication : public KApplication
+class DolphinApplication : public KUniqueApplication
 {
     Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.Application")
     friend class DolphinMainWindow;
 
 public:
@@ -50,12 +53,19 @@ public:
     DolphinMainWindow* createMainWindow();
     void refreshMainWindows();
 
+    /** @see KUniqueApplication::newInstance(). */
+    virtual int newInstance();
+
+public slots:
+    int openWindow(const KUrl& url);
+
 protected:
     /** Called by the DolphinMainWindow to deregister. */
     void removeMainWindow(DolphinMainWindow* mainWindow);
 
 private:
     QList<DolphinMainWindow*> m_mainWindows;
+    int m_lastId;
 };
 
 #endif