use QPEApplication::execDialog instead of showMaximized/execDialog

1 files changed, 4 insertions, 6 deletions

diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index 4c6b800..e01fbe5 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -127,132 +127,130 @@ OFileDialog::OFileDialog(const QString &caption,
  */
 QString OFileDialog::mimetype()const
 {
     return QString::null;
 }
 
 /**
  * @return the fileName
  */
 QString OFileDialog::fileName()const
 {
     return file->selectedName();
 }
 
 /**
  * return a DocLnk to the current file
  */
 DocLnk OFileDialog::selectedDocument()const
 {
     return file->selectedDocument();
 }
 
 /**
  * This opens up a filedialog in Open mode
  *
  * @param selector the Selector Mode
  * @param startDir Where to start from
  * @param file A proposed filename
  * @param mimes A list of MimeTypes
  * @param wid the parent
  * @param caption of the dialog if QString::null tr("Open") will be used
  * @return the fileName or QString::null
  */
 QString OFileDialog::getOpenFileName(int selector,
                                      const QString &_startDir,
                                      const QString &file,
                                      const MimeTypes &mimes,
                                      QWidget *wid,
                                      const QString &caption )
 {
     QString ret;
     QString startDir = _startDir;
     if (startDir.isEmpty() )
         startDir = lastUsedDir( "FileDialog-OPEN" );
 
 
     OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption,
                      wid, OFileSelector::Open, selector, startDir, file, mimes);
-    dlg.showMaximized();
-    if( dlg.exec() )
+    if( QPEApplication::execDialog(&dlg ) )
     {
         ret = dlg.fileName();
         saveLastDir( "FileDialog-OPEN", ret );
     }
 
     return ret;
 }
 
 /**
  * This opens up a file dialog in save mode
  * @see getOpenFileName
  */
 QString OFileDialog::getSaveFileName(int selector,
                                      const QString &_startDir,
                                      const QString &file,
                                      const MimeTypes &mimes,
                                      QWidget *wid,
                                      const QString &caption )
 {
     QString ret;
     QString startDir = _startDir;
     if (startDir.isEmpty() )
         startDir = lastUsedDir( "FileDialog-SAVE" );
 
     OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption,
                      wid, OFileSelector::Save, selector, startDir, file, mimes);
-    dlg.showMaximized();
-    if( dlg.exec() )
+    if( QPEApplication::execDialog(&dlg) )
     {
         ret = dlg.fileName();
         saveLastDir( "FileDialog-SAVE", ret );
     }
 
     return ret;
 }
 
 /**
  * This opens up a filedialog in select directory mode
  *
  * @param selector the Selector Mode
  * @param startDir Where to start from
  * @param wid the parent
  * @param caption of the dialog if QString::null tr("Open") will be used
  * @return the directoryName or QString::null
  */
 QString OFileDialog::getDirectory(int selector,
                                  const QString &_startDir,
                                  QWidget *wid,
                                  const QString &caption )
 {
     QString ret;
     QString startDir = _startDir;
     if ( startDir.isEmpty() )
         startDir = lastUsedDir( "FileDialog-SELECTDIR" );
 
     OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption,
                      wid, OFileSelector::DirectorySelector, selector, startDir );
-    dlg.showMaximized();
-    if ( dlg.exec() )
+
+    if ( QPEApplication::execDialog(&dlg) )
     {
         ret = dlg.fileName();
         saveLastDir( "FileDialog-SELECTDIR", ret );
     }
     return ret;
 }
 
 void OFileDialog::slotFileSelected(const QString & )
 {
     accept();
 }
 
 void OFileDialog::slotSelectorOk( )
 {
     accept();
 }
 
 void OFileDialog::slotDirSelected(const QString &dir )
 {
     setCaption( dir );
     // if mode
     //accept();
 }