Delete the Views which are created in the OFileSelector

Add a new member and one method to register the view.
The views themselves (baseclass) call this function.

Simply going over the viewMap wouldn't work as we can
have the same instance contained twice under a different name

1 files changed, 10 insertions, 0 deletions

diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h
index 8bcd9ee..de2b98a 100644
--- a/libopie2/opieui/fileselector/ofileselector.h
+++ b/libopie2/opieui/fileselector/ofileselector.h
@@ -23,48 +23,49 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 /*
   This is based on code and ideas of
   L. J. Potter ljp@llornkcor.com
   Thanks a lot
 */
 
 #ifndef OFILESELECTOR_H
 #define OFILESELECTOR_H
 
 /* OPIE */
 #include <qpe/applnk.h>
 
 /* QT */
 #include <qlist.h>
 #include <qwidget.h>
 #include <qmap.h>
 #include <qvaluelist.h>
 #include <qstringlist.h>
+#include <qlist.h>
 
 class QLineEdit;
 class QComboBox;
 class QWidgetStack;
 class QHBox;
 
 typedef QMap<QString, QStringList> MimeTypes;
 
 namespace Opie {
 namespace Ui   {
 
 namespace Internal {
 class OFileViewInterface;
 class OFileViewFileListView;
 }
 
 
 /**
  * @short a dropin replacement for the FileSelector
  *
  * This class is first used insert the OFileDialog.
  * It supports multiple view and mimetype filtering for now.
  *
  * @see OFileDialog
@@ -162,59 +163,68 @@ signals:
     void closeMe();
 
    /**
     * Ok is emitted on a Qt::Key_Return or Q::Key_Enter
     * in the line edit
     */
     void ok();
     void cancel();
 
     /* used by the ViewInterface */
 private:
     bool showNew()const;
     bool showClose()const;
     MimeTypes mimeTypes()const;
     QStringList currentMimeType()const;
 
 private:
     /* inits the Widgets */
     void initUI();
     /* inits the MimeType ComboBox content + connects signals and slots */
     void initMime();
     /* init the Views :) */
     void initViews();
 
+
+    /*
+     * register a view for deletion.
+     * This happens on creation of a OFileViewInterface
+     */
+    void registerView( const Internal::OFileViewInterface* );
+
 private:
     QLineEdit* m_lneEdit; // the LineEdit for the Name
     QComboBox *m_cmbView, *m_cmbMime; // two ComboBoxes to select the View and MimeType
     QWidgetStack* m_stack;  // our widget stack which will contain the views
     Internal::OFileViewInterface* currentView() const; // returns the currentView
     Internal::OFileViewInterface* m_current; // here is the view saved
     bool m_shNew   : 1; // should we show New?
     bool m_shClose : 1; // should we show Close?
     MimeTypes m_mimeType; // list of mimetypes
 
     QMap<QString, Internal::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
+    /* views register themselves automatically */
+    QList<Internal::OFileViewInterface> m_viewsPtr;
     QHBox* m_nameBox; // the LineEdit + Label is hold here
     QHBox* m_cmbBox; // this holds the two combo boxes
 
     QString m_startDir;
     int m_mode;
     int m_selector;
 
     struct Data; // used for future versions
     Data *d;
 
 private slots:
     void slotMimeTypeChanged();
 
     /* will set the text of the lineedit and emit a fileChanged signal */
     void slotDocLnkBridge( const DocLnk& );
     void slotFileBridge( const QString& );
     void slotViewChange( const QString& );
 
     bool eventFilter (QObject *o, QEvent *e);
 
 };
 
 }
 }