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
@@ -111,96 +111,102 @@ QStringList OFileViewInterface::currentMimeType()const
     return selector()->currentMimeType();
 }
 
 void OFileViewInterface::activate( const QString& )
 {
     // not implemented here
 }
 
 void OFileViewInterface::ok()
 {
     emit selector()->ok();
 }
 
 void OFileViewInterface::cancel()
 {
     emit selector()->cancel();
 }
 
 void OFileViewInterface::closeMe()
 {
     emit selector()->closeMe();
 }
 
 void OFileViewInterface::fileSelected( const QString& str)
 {
     emit selector()->fileSelected( str);
 }
 
 void OFileViewInterface::fileSelected( const DocLnk& lnk)
 {
     emit selector()->fileSelected( lnk );
 }
 
 void OFileViewInterface::setCurrentFileName( const QString& str )
 {
     selector()->m_lneEdit->setText( 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
 {
     if (!m_selector)
         return QString::null;
 
     return m_selector->selectedDocument().file();
 }
 
 QString ODocumentFileView::selectedPath()const
 {
     return QPEApplication::documentDir();
 }
 
 QString ODocumentFileView::directory()const
 {
     return selectedPath();
 }
 
 void ODocumentFileView::reread()
 {
     if (!m_selector)
         return;
 
     m_selector->setNewVisible( showNew() );
     m_selector->setCloseVisible( showClose() );
     m_selector->filter = currentMimeType().join(";");
     m_selector->reread();
 }
 
 int ODocumentFileView::fileCount()const
 {
     if (!m_selector)
         return -1;
 
     return m_selector->fileCount();
 }
 
@@ -485,104 +491,96 @@ void OFileViewFileListView::reread( bool all )
                     file = info.dirPath(true ) + "/" + info.readLink() ;
                     break;
                 }
                 else if( i == 4)
                 { // couldn't resolve symlink add it as symlink
                     addSymlink( fi );
                 }
             } // off for loop for symlink resolving
         }
         else if( fi->isDir() )
             addDir(  fi );
         else if( fi->isFile() )
             addFile( fi );
 
         ++it;
     } // of while loop
     m_view->sort();
 
 }
 int OFileViewFileListView::fileCount()const
 {
     return m_view->childCount();
 }
 
 QString OFileViewFileListView::currentDir()const
 {
     return m_currentDir;
 }
 
 OFileSelector* OFileViewFileListView::selector()
 {
     return m_sel;
 }
 
 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;
 #if 0
 
     OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item);
 
     if (!sel->isDir() )
     {
         selector()->m_lneEdit->setText( sel->text(1) );
         // if in fileselector mode we will emit selected
         if ( selector()->mode() == OFileSelector::FileSelector )
         {
             odebug << "slot Current Changed" << oendl;
             QStringList str = QStringList::split("->", sel->text(1) );
             QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
             emit selector()->fileSelected( path );
             DocLnk lnk( path );
             emit selector()->fileSelected( lnk );
         }
     }
 #endif
 }
 
 void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const QPoint&, int )
 {
     if (!item || ( button != Qt::LeftButton) )
         return;
 
     OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item);
     if (!sel->isLocked() )
     {
         QStringList str = QStringList::split("->", sel->text(1) );
         if (sel->isDir() )
         {
             m_currentDir = sel->directory() + "/" + str[0].stripWhiteSpace();
             emit selector()->dirSelected( m_currentDir );
             reread( m_all );
         }
@@ -780,147 +778,147 @@ QString OFileViewFileSystem::selectedName()const
     QString cFN=currentFileName();
     if (cFN.startsWith("/")) return cFN;
     return m_view->currentDir() + "/" + cFN;
 }
 
 QString OFileViewFileSystem::selectedPath()const
 {
     return QString::null;
 }
 
 QString OFileViewFileSystem::directory()const
 {
     if (!m_view)
         return QString::null;
 
     OFileSelectorItem* item = m_view->currentItem();
     if (!item )
         return QString::null;
 
     return QDir(item->directory() ).absPath();
 }
 
 void OFileViewFileSystem::reread()
 {
     if (!m_view)
         return;
 
     m_view->reread( m_all );
 }
 
 int OFileViewFileSystem::fileCount()const
 {
     if (!m_view )
         return -1;
     return m_view->fileCount();
 }
 
 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.
  *
  * <pre>
  *  QMap<QString, QStringList> mimeTypes;
  *  QStringList types;
  *  types << "text@slash* ";
  *  types << "audio@slash*";
  *  mimeTypes.insert( tr("Audio and Text"), types );
  *  mimeTypes.insert( tr("All"), "*@slash*);
  *
  *  now you could create your fileselector
  * </pre>
  *
  *
  * @param parent the parent of this widget
  * @param mode The mode from the enum Mode (Open,Save,FILESELECTOR)
  * @param sel The  selector to be used
  * @param dirName The name of the dir to start int
  * @param fileName The fileName placed in the fileselector lineedit
  * @param mimetypes The MimeType map of used mimetypes
  * @param showNew Show a New Button. Most likely to be used in the FileSelector view.
  * @param showClose Show a Close Button. Most likely to be used in FileSelector view.
  *
  */
 OFileSelector::OFileSelector( QWidget* parent, int mode, int sel,
                               const QString& dirName, const QString& fileName,
                               const MimeTypes& mimetypes,
                               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 )
             str = QObject::tr("Directories");
         else
             str = QObject::tr("Documents");
         m_cmbView->setCurrentItem( 0 );
         break;
     case Extended:
         if ( m_mode == DIRECTORYSELECTOR )
         {
             str = QObject::tr("Directories");
             m_cmbView->setCurrentItem( 0 );
         } else {
             str = QObject::tr("Files");
             m_cmbView->setCurrentItem( 1 );
         }
         break;
     case ExtendedAll:
         if ( m_mode == DIRECTORYSELECTOR )
         {
             str = QObject::tr("All Directories");
             m_cmbView->setCurrentItem( 1 );
         } else {
             str = QObject::tr("All Files");
             m_cmbView->setCurrentItem( 2 );
         }
         break;
     }
     slotViewChange( str );
 
 }
 
 
 /**
  * This a convience c'tor to just substitute the use of FileSelector
  */
 OFileSelector::OFileSelector( const QString& mimeFilter, QWidget* parent, const char* name,
                               bool showNew, bool showClose )
@@ -988,102 +986,102 @@ bool OFileSelector::eventFilter (QObject *, QEvent *e)
             return true;
         }
     }
     return false;
 }
 
 /*
  * This will insert the MimeTypes into the Combo Box
  * And also connect the changed signal
  *
  * AutoMimeTyping is disabled for now. It used to reparse a dir and then set available mimetypes
  */
 void OFileSelector::initMime()
 {
     MimeTypes::Iterator it;
     for ( it = m_mimeType.begin(); it != m_mimeType.end(); ++it )
     {
         m_cmbMime->insertItem( it.key() );
     }
     m_cmbMime->setCurrentItem( 0 );
 
     connect( m_cmbMime, SIGNAL(activated(int) ),
              this, SLOT(slotMimeTypeChanged() ) );
 
 }
 
 void OFileSelector::initViews()
 {
     if ( m_mode == OFileSelector::DIRECTORYSELECTOR )
     {
         m_cmbView->insertItem( QObject::tr("Directories") );
         m_cmbView->insertItem( QObject::tr("All Directories") );
     } else {
         m_cmbView->insertItem( QObject::tr("Documents") );
         m_cmbView->insertItem( QObject::tr("Files") );
         m_cmbView->insertItem( QObject::tr("All Files") );
     }
 
     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()
 {
     m_viewsPtr.setAutoDelete( true );
     m_viewsPtr.clear();
 }
 
 
 
 /**
  * Convience function for the fileselector
  * make sure to delete the DocLnk
  *
  * @see DocLnk
  * @todo remove in ODP
  */
 const DocLnk* OFileSelector::selected()
 {
     DocLnk* lnk = new DocLnk( currentView()->selectedDocument() );
     return lnk;
 }
 
 /**
  *
  * @return the name of the selected file
  */
 QString OFileSelector::selectedName()const
 {
     return currentView()->selectedName();
 }
 
 
 /**
  * @return the selected path
  */
 QString OFileSelector::selectedPath()const
 {
     return currentView()->selectedPath();
@@ -1113,104 +1111,96 @@ int OFileSelector::fileCount()const
     return currentView()->fileCount();
 }
 
 /**
  * @return  reparse the file content
  */
 void OFileSelector::reread()
 {
     return currentView()->reread();
 }
 
 OFileViewInterface* OFileSelector::currentView()const
 {
     return m_current;
 }
 
 bool OFileSelector::showNew()const
 {
     return m_shNew;
 }
 
 bool OFileSelector::showClose()const
 {
     return m_shClose;
 }
 
 MimeTypes OFileSelector::mimeTypes()const
 {
     return m_mimeType;
 }
 
 /**
  * @return the Mode of the OFileSelector
  */
 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)
 {
     m_lneEdit->setText( lnk.name() );
     emit fileSelected( lnk );
     emit fileSelected( lnk.name() );
 }
 
 void OFileSelector::slotFileBridge( const QString& str)
 {
     DocLnk lnk( str );
     emit fileSelected( lnk );
 }
 
 void OFileSelector::slotViewChange( const QString& view )
 {
     OFileViewInterface* interface = m_views[view];
     if (!interface)
         return;
 
     if (m_current)
         m_stack->removeWidget( m_current->widget( m_stack ) );
 
     static int id = 1;
 
     m_stack->addWidget( interface->widget(m_stack), id );
     m_stack->raiseWidget( id );
 
     interface->activate( view );
     interface->reread();
     m_current = interface;
 
     id++;
 }
 
 void OFileSelector::setNewVisible( bool b )
 {
     m_shNew = b;
     currentView()->reread();
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
@@ -76,161 +76,160 @@ class OFileViewFileListView;
 class OFileSelector : public QWidget
 {
     Q_OBJECT
     friend class Internal::OFileViewInterface;
     friend class Internal::OFileViewFileListView;
 
 public:
     /**
      * The Mode of the Fileselector
      * Open = Open A File
      * Save = Save a File
      * FILESELECTOR = As A GUI in a screen to select a file
      * SelectDir = Select a Directory
      */
     enum Mode { Open = 1, Save = 2, DirectorySelector = 3, FileSelector = 4, OPEN = 1, SAVE = 2, DIRECTORYSELECTOR = 3, FILESELECTOR = 4 };
     //    enum OldMode { OPEN=1, SAVE=2, FILESELECTOR = 4 };
     /**
      * Normal       = The old FileSelector
      * Extended     = Dir View
      * ExtendedAll  = Dir View with all hidden files
      * Default      = What the vendor considers best
      */
     enum Selector { Normal = 0, Extended=1,  ExtendedAll =2, Default=3,  NORMAL=0,EXTENDED=1, EXTENDED_ALL =2, DEFAULT=3 };
     //    enum OldSelector { NORMAL = 0, EXTENDED =1, EXTENDED_ALL = 2};
 
     OFileSelector(QWidget* parent, int mode, int selector,
                   const QString& dirName,
                   const QString& fileName,
                   const MimeTypes& mimetypes = MimeTypes(),
                   bool newVisible = FALSE, bool closeVisible = FALSE );
 
     OFileSelector(const QString& mimeFilter, QWidget* parent,
                   const char* name = 0,  bool newVisible = TRUE, bool closeVisible = FALSE );
     ~OFileSelector();
 
     const DocLnk* selected();
 
     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 );
 
     /**
      * Set the Name Line visible
      */
     void setNameVisible( bool b );
 
 signals:
    /**
     * dirSelected is emitted whenever changed into a different dir
     */
     void dirSelected( const QString& );
 
    /**
     * fileSelected  is emitted when a file is selected
     * it uses a DocLnk as parameter
     */
     void fileSelected( const DocLnk& );
 
     /**
      * fileSelected is emitted when a file is selected
      * the complete path is a parameter
      */
     void fileSelected( const QString& );
 
     /**
      * Create a new File with a DocLnk
      */
     void newSelected( const DocLnk& );
 
     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;
 
-    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& );
 
     bool eventFilter (QObject *o, QEvent *e);
 
 };
 
 }
 }
 
 #endif
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
@@ -30,165 +30,165 @@
 #define OFILESELECTOR_PRIVATE_H
 
 /* OPIE */
 #include <qpe/applnk.h>
 #include <qpe/fileselector.h>
 
 /* QT */
 #include <qmap.h>
 #include <qstringlist.h>
 #include <qwidget.h>
 #include <qlistview.h>
 
 /*
  * How to avoid having really two different objects
  * for Extended and ExtendedAll
  * The only difference is the Lister...
  * a) static object?
  * b) leave some object inside the OFileSelector which can be used?
  * c) when switching views tell which view we want o have.. internally we can switch then
  *
  * I'll take c) -zecke
  */
 
 typedef QMap<QString, QStringList> MimeTypes;
 
 /* the View Interface */
 class QFileInfo;
 class QToolButton;
 
 namespace Opie{
 namespace Ui{
 class OFileSelector;
 namespace Internal {
 
 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();
     void fileSelected( const QString& );
     void fileSelected( const DocLnk& );
     void setCurrentFileName( const QString& );
     QString currentFileName()const;
 
 private:
     QString m_name;
     OFileSelector* m_selector;
 };
 
 
 /* THE Document View hosting a FileSelector*/
 class ODocumentFileView : public OFileViewInterface
 {
 public:
     ODocumentFileView( OFileSelector* selector );
     ~ODocumentFileView();
 
     QString selectedName() const;
     QString selectedPath() const;
 
     QString directory() const;
     void reread();
     int fileCount()const;
     DocLnk selectedDocument()const;
 
     QWidget* widget( QWidget* parent );
 
 private:
     mutable FileSelector* m_selector;
 
 };
 
 
 class OFileSelectorItem : public QListViewItem
 {
 public:
     OFileSelectorItem( QListView* view, const QPixmap& pixmap,
                        const QString& path, const QString& date,
                        const QString& size, const QString& mDir,
                        bool isLocked = false, bool isDir = false );
     ~OFileSelectorItem();
     bool isLocked()const;
     bool isDir()const;
     QString directory()const;
     QString path()const;
     QString key(int id, bool )const;
 
 private:
     bool m_locked : 1;
     bool m_isDir    : 1;
     QString m_dir;
 };
 
 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);
 
 protected:
     OFileSelector* selector();
 
 private:
     QMap<QString, QString> m_dev;
     bool m_all : 1;
     OFileSelector* m_sel;
     QPopupMenu* m_fsPop;
     bool compliesMime( const QString& );
     QStringList m_mimes; // used in compy mime
     QString m_currentDir;
     QToolButton *m_btnNew, *m_btnClose;
     void connectSlots();
     void addFile( QFileInfo* info, bool symlink = FALSE );
     void addDir ( QFileInfo* info, bool symlink = FALSE );
     void addSymlink( QFileInfo* info, bool = FALSE );
 
 
 private:
     QListView* m_view;
 };
 
 }
 }
 }
 
 #endif