Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13

[dolphin.git] / src / dolphinapplication.h

diff --git a/src/dolphinapplication.h b/src/dolphinapplication.h
index a8474bd361614eee56d89fb24559042e234de5be..69d07c36e4e76b3ede4c0cea321a12a3019960d6 100644 (file)
--- a/src/dolphinapplication.h
+++ b/src/dolphinapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006-2011 by Peter Penz <peter.penz19@gmail.com>        *
  *   Copyright (C) 2006 by Holger 'zecke' Freyther <freyther@kde.org>      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,50 +15,30 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#ifndef DOLPHIN_APPLICATION_H
+#define DOLPHIN_APPLICATION_H
 
-#ifndef _DOLPHIN_APPLICATION_H
-#define _DOLPHIN_APPLICATION_H
-
-#include <kapplication.h>
+#include <KApplication>
 
 class DolphinMainWindow;
 
-/**
- * 
- * DolphinApplication will hold application wide data which
- * can be accessed.
- * At first this will hold a list of DolphinMainWindows which
- * we will delete on application exit. 
- */
-
-class DolphinApplication : public KApplication {
+class DolphinApplication : public KApplication
+{
     Q_OBJECT
-    friend class DolphinMainWindow;
+
 public:
     DolphinApplication();
-    ~DolphinApplication();
+    virtual ~DolphinApplication();
 
     static DolphinApplication* app();
 
-    /**
-     * Construct a new mainwindow which is owned
-     * by the application.
-     */
-    DolphinMainWindow* createMainWindow();
-    void refreshMainWindows();
-
-protected:
-    /**
-     * called by the MainWindow to deregister
-     */
-    void removeMainWindow( DolphinMainWindow* );
+    void restoreSession();
 
 private:
-    QList<DolphinMainWindow*> m_mainWindows;
+    DolphinMainWindow* m_mainWindow;
 };
 
-
 #endif