3 files changed, 12 insertions, 23 deletions

diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index e8d502f..01a51a2 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -147,24 +147,30 @@ void OFileViewInterface::setCurrentFileName( const QString& str )
 }
 
 QString OFileViewInterface::currentFileName()const
 {
     return selector()->m_lneEdit->text();
 }
 
 QString OFileViewInterface::startDirectory()const
 {
     return selector()->m_startDir;
 }
 
+bool OFileViewInterface::allItem( const QString& item )const
+{
+    return selector()->m_allList.contains( item );
+}
+
+
 ODocumentFileView::ODocumentFileView( OFileSelector* selector )
                   :OFileViewInterface( selector )
 {
     m_selector = 0;
     setName( QObject::tr("Documents") );
 }
 
 ODocumentFileView::~ODocumentFileView()
 {
 }
 
 QString ODocumentFileView::selectedName()const
@@ -521,32 +527,24 @@ bool OFileViewFileListView::eventFilter (QObject *, QEvent *e)
     if ( e->type() == QEvent::KeyPress )
     {
         QKeyEvent *k = (QKeyEvent *)e;
         if ( (k->key()==Key_Enter) || (k->key()==Key_Return))
         {
             slotClicked( Qt::LeftButton,m_view->currentItem(),QPoint(0,0),0);
             return true;
         }
     }
     return false;
 }
 
-/**
- * @return true if the item show all files or directories
- */
-bool OFileViewFileListView::allItem( const QString& item )const
-{
-    return m_sel->allItem( item );
-}
-
 void OFileViewFileListView::connectSlots()
 {
     connect(m_view, SIGNAL(clicked(QListViewItem*) ),
             this, SLOT(slotCurrentChanged(QListViewItem*) ) );
     connect(m_view, SIGNAL(mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ),
             this, SLOT(slotClicked(int,QListViewItem*,const QPoint&,int) ) );
 }
 
 void OFileViewFileListView::slotCurrentChanged( QListViewItem* item)
 {
     if (!item)
         return;
@@ -816,25 +814,25 @@ int OFileViewFileSystem::fileCount()const
 
 QWidget* OFileViewFileSystem::widget( QWidget* parent )
 {
     if (!m_view )
     {
         m_view = new OFileViewFileListView( parent, startDirectory(), selector() );
     }
     return m_view;
 }
 
 void OFileViewFileSystem::activate( const QString& str )
 {
-    m_all = m_view->allItem( str );
+    m_all = allItem( str );
 }
 
 
 }
 /* Selector */
 /**
  * @short new and complete c'tor
  *
  * Create a OFileSelector to let the user select a file. It can
  * either be used to open a file, select a save name in a dir or
  * as a dropin for the FileSelector.
  *
@@ -866,25 +864,25 @@ OFileSelector::OFileSelector( QWidget* parent, int mode, int sel,
                               bool showNew,  bool showClose)
               :QWidget( parent, "OFileSelector" )
 {
     m_current = 0;
     m_shNew = showNew;
     m_shClose = showClose;
     m_mimeType = mimetypes;
     m_startDir = dirName;
 
     m_mode = mode;
     m_selector = sel;
 
-    m_allList = new QStringList();
+    m_allList = QStringList();
 
     initUI();
     m_lneEdit->setText( fileName );
     initMime();
     initViews();
 
     QString str;
     switch ( m_selector )
     {
     default:
     case Normal:
         if ( m_mode == DIRECTORYSELECTOR )
@@ -1024,30 +1022,30 @@ void OFileSelector::initViews()
     }
 
     connect(m_cmbView, SIGNAL(activated(const QString&) ),
             this, SLOT(slotViewChange(const QString&) ) );
 
     /* see above why add both */
     OFileViewInterface* in = new OFileViewFileSystem( this );
 
     if ( m_mode == OFileSelector::DIRECTORYSELECTOR )
     {
         m_views.insert( QObject::tr("Directories"), in );
         m_views.insert( QObject::tr("All Directories"), in );
-        m_allList->append( QObject::tr("All Directories") );
+        m_allList.append( QObject::tr("All Directories") );
     } else {
         m_views.insert( QObject::tr("Documents"), new ODocumentFileView(this) );
         m_views.insert( QObject::tr("Files"), in );
         m_views.insert( QObject::tr("All Files"), in );
-        m_allList->append( QObject::tr("All Files") );
+        m_allList.append( QObject::tr("All Files") );
     }
 }
 
 void OFileSelector::registerView( const Internal::OFileViewInterface* iface ) {
     m_viewsPtr.append( iface );
 }
 
 
 /**
  * d'tor
  */
 OFileSelector::~OFileSelector()
@@ -1149,32 +1147,24 @@ int OFileSelector::mode()const
     return m_mode;
 }
 
 
 /**
  * @return the Selector of the OFileSelector
  */
 int OFileSelector::selector()const
 {
     return m_selector;
 }
 
-/**
- * @return true if the item show all files or directories
- */
-bool OFileSelector::allItem( const QString& item )const
-{
-    return ( m_allList->findIndex( item ) != -1 );
-}
-
 QStringList OFileSelector::currentMimeType()const
 {
     return m_mimeType[m_cmbMime->currentText()];
 }
 
 void OFileSelector::slotMimeTypeChanged()
 {
     reread();
 }
 
 void OFileSelector::slotDocLnkBridge( const DocLnk& lnk)
 {
diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h
index d96712a..d166afd 100644
--- a/libopie2/opieui/fileselector/ofileselector.h
+++ b/libopie2/opieui/fileselector/ofileselector.h
@@ -112,25 +112,24 @@ public:
 
     QString selectedName()const;
     QString selectedPath()const;
     QString directory()const;
 
     DocLnk selectedDocument()const;
 
     int fileCount()const;
     void reread();
 
     int mode()const;
     int selector()const;
-    bool allItem( const QString& )const;
 
     /**
      * Set the Icon visible
      * @param b Show or Hide the New Button
      */
     void setNewVisible( bool b );
 
     /**
      * Set the Icon visible
      */
     void setCloseVisible( bool b );
 
@@ -204,25 +203,25 @@ private:
     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;
 
-    QStringList* m_allList;
+    QStringList m_allList;
 
     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& );
 
diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h
index 252a7f5..790d2bd 100644
--- a/libopie2/opieui/fileselector/ofileselector_p.h
+++ b/libopie2/opieui/fileselector/ofileselector_p.h
@@ -66,24 +66,25 @@ class OFileViewInterface
 public:
     OFileViewInterface( OFileSelector* selector );
     virtual ~OFileViewInterface();
     virtual QString selectedName()const = 0;
     virtual QString selectedPath()const = 0;
     virtual QString directory()const = 0;
     virtual void reread() = 0;
     virtual int fileCount()const = 0;
     virtual DocLnk selectedDocument()const;
     virtual QWidget* widget( QWidget* parent) = 0;
     virtual void activate( const QString& );
     QString name()const;
+    bool allItem( const QString& )const;
 protected:
     OFileSelector* selector()const;
     void setName( const QString& );
     bool showNew()const;
     bool showClose()const;
     MimeTypes mimeTypes()const;
     QStringList currentMimeType()const;
     QString startDirectory()const;
 protected:
     void ok();
     void cancel();
     void closeMe();
@@ -143,25 +144,24 @@ private:
 
 class OFileViewFileListView : public QWidget
 {
     Q_OBJECT
 public:
     OFileViewFileListView( QWidget* parent, const QString& dir, OFileSelector* selector );
     ~OFileViewFileListView();
 
     OFileSelectorItem* currentItem()const;
     void reread( bool all = false );
     int fileCount()const;
     QString currentDir()const;
-    bool allItem( const QString& )const;
 protected:
     bool eventFilter (QObject *o, QEvent *e);
 private slots:
     void slotNew(); // will emit newSelected
     void cdUP();
     void cdHome();
     void cdDoc();
     void changeDir( const QString& );
     void slotCurrentChanged( QListViewItem* );
     void slotClicked(int, QListViewItem*, const QPoint&, int );
     void slotFSActivated(int);