1 files changed, 11 insertions, 8 deletions
diff --git a/src/frontend/displaywindow/cdisplaywindow.h b/src/frontend/displaywindow/cdisplaywindow.h
index 4935d8f..72199d1 100644
--- a/src/frontend/displaywindow/cdisplaywindow.h
+++ b/src/frontend/displaywindow/cdisplaywindow.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -15,7 +17,6 @@
 #include <QStringList>
 #include "backend/managers/cswordbackend.h"
 #include "btglobal.h"
-#include "frontend/profile/cprofilewindow.h"
 
 
 class BtActionCollection;
@@ -25,14 +26,13 @@ class CKeyChooser;
 class CMDIArea;
 class BtModuleChooserBar;
 class CSwordModuleInfo;
-class QCloseEvent;
 class QMenu;
 class QToolBar;
 class BTHistory;
 class BibleTime;
 
-/** The base class for all display windows of BibleTime. 
-  * 
+/** The base class for all display windows of BibleTime.
+  *
   * Inherits QMainWindow.
   *
   * Inherited by CReadWindow and CWriteWindow.
@@ -46,6 +46,9 @@ class CDisplayWindow : public QMainWindow {
         /** Insert the keyboard accelerators of this window into the given actioncollection.*/
         static void insertKeyboardActions( BtActionCollection* const a );
 
+        /** Returns a pointer to the parent widget of type QMdiSubWindow or pointer to self if none found. */
+        QWidget * getProfileWindow() const;
+
         /** Returns pointer to the mdi area object.*/
         inline CMDIArea *mdi() const {
             return m_mdi;
@@ -63,10 +66,10 @@ class CDisplayWindow : public QMainWindow {
         }
 
         /** Store the settings of this window in the given CProfileWindow object.*/
-        virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow ) = 0;
+        virtual void storeProfileSettings(const QString & windowGroup);
 
         /** Load the settings the given CProfileWindow object into this window.*/
-        virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow ) = 0;
+        virtual void applyProfileSettings(const QString & windowGroup);
 
         /** Returns the display options used by this display window. */
         inline const DisplayOptions &displayOptions() const {
@@ -228,7 +231,7 @@ class CDisplayWindow : public QMainWindow {
 
         friend class CBibleReadWindow;
 
-        CDisplayWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
+        CDisplayWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent);
         virtual ~CDisplayWindow();
 
         /**