6 files changed, 19 insertions, 5 deletions

diff --git a/noncore/apps/opie-reader/CloseDialog.cpp b/noncore/apps/opie-reader/CloseDialog.cpp
index 741fa67..d7c2652 100644
--- a/noncore/apps/opie-reader/CloseDialog.cpp
+++ b/noncore/apps/opie-reader/CloseDialog.cpp
@@ -1,9 +1,11 @@
 #include "CloseDialog.h"
 #include "qlayout.h"
 
+#include <qpe/qpeapplication.h>
+
 CCloseDialog::CCloseDialog(const QString& fname, bool fs, QWidget* parent, const char* name) : QDialog(parent, name, true)
 {
     setCaption(tr("Tidy-up"));
     QVBoxLayout *tmp = new QVBoxLayout(this);
     QVButtonGroup* vb = new QVButtonGroup(tr("Delete"), this);
     tmp->addWidget(vb);
@@ -11,8 +13,9 @@ CCloseDialog::CCloseDialog(const QString& fname, bool fs, QWidget* parent, const
     file = new QCheckBox(filestring, vb);
     marks = new QCheckBox(tr("Delete Bookmarks"), vb);
     config = new QCheckBox(tr("Delete Configuration"), vb);
     file->setChecked(false);
     marks->setChecked(true);
     config->setChecked(true);
-    if (fs) showMaximized();
+    if (fs)
+        QPEApplication::showDialog( this );
 }
diff --git a/noncore/apps/opie-reader/Prefs.cpp b/noncore/apps/opie-reader/Prefs.cpp
index e5320d9..5150ca5 100644
--- a/noncore/apps/opie-reader/Prefs.cpp
+++ b/noncore/apps/opie-reader/Prefs.cpp
@@ -24,12 +24,14 @@
 #include <qpe/menubutton.h>
 #include <qpe/fontdatabase.h>
 #else
 #include <qfontdatabase.h>
 #endif
 
+#include <qpe/qpeapplication.h>
+
 CLayoutPrefs::CLayoutPrefs( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     QHBoxLayout* hb = new QHBoxLayout(this);
     QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, tr("Text"), this);
     hb->addWidget(bg);
@@ -424,13 +426,14 @@ CPrefs::CPrefs(bool fs, QWidget* parent, const char* name) : QDialog(parent, nam
     td->addTab(inter, tr("Locale"));
     td->addTab(misc, tr("Misc"));
     td->addTab(button, tr("Buttons"));
     QVBoxLayout* v = new QVBoxLayout(this);
     v->addWidget(td);
 
-    if (fs) showMaximized();
+    if (fs)
+        QPEApplication::showDialog( this );
 }
 
 
 /*
 
 Unicode
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index f10020a..07af597 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.cpp b/noncore/apps/opie-reader/ToolbarPrefs.cpp
index 361bf97..d878829 100644
--- a/noncore/apps/opie-reader/ToolbarPrefs.cpp
+++ b/noncore/apps/opie-reader/ToolbarPrefs.cpp
@@ -20,12 +20,13 @@
 #include <qcombobox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #ifdef USEQPE

 #include <qpe/menubutton.h>
 #endif

+#include <qpe/qpeapplication.h>
 
 CBarPrefs::CBarPrefs(const QString& appdir, bool fs, QWidget* parent, const char* name) : QDialog(parent, name, true), config( appdir )
 {
     setCaption(tr( "Toolbar Settings" ) );
     QTabWidget* td = new QTabWidget(this);
     misc = new CMiscBarPrefs(this);
@@ -40,13 +41,14 @@ CBarPrefs::CBarPrefs(const QString& appdir, bool fs, QWidget* parent, const char
     td->addTab(markbar, tr("Marks"));
     td->addTab(indbar, tr("Indicators"));
     td->addTab(misc, tr("Policy"));
     QVBoxLayout* v = new QVBoxLayout(this);
     v->addWidget(td);
 
-    if (fs) showMaximized();
+    if (fs)
+        QPEApplication::showDialog( this );
 }
 
 /*
 CBarPrefs1::CBarPrefs1( Config& _config, QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl ), config(_config)
 {
diff --git a/noncore/apps/opie-reader/URLDialog.cpp b/noncore/apps/opie-reader/URLDialog.cpp
index dd4568b..e572c80 100644
--- a/noncore/apps/opie-reader/URLDialog.cpp
+++ b/noncore/apps/opie-reader/URLDialog.cpp
@@ -1,14 +1,17 @@
 #include "URLDialog.h"
 #include "qlayout.h"
 
+#include <qpe/qpeapplication.h>

+

 CURLDialog::CURLDialog(const QString& fname, bool fs, QWidget* parent, const char* name) : QDialog(parent, name, true)
 {
     setCaption(tr("Save URL"));
     QVBoxLayout *tmp = new QVBoxLayout(this);
     QVButtonGroup* vb = new QVButtonGroup(fname, this);
     tmp->addWidget(vb);
     m_clipboard = new QCheckBox(tr("Clipboard"), vb);
     m_localfile = new QCheckBox(tr("Local file"), vb);
     m_globalfile = new QCheckBox(tr("Global file"), vb);
-    if (fs) showMaximized();
+    if (fs)

+        QPEApplication::showDialog( this );

 }
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index 9cd371d..05f2c31 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -19,12 +19,14 @@ Extensive modification by Tim Wentford to allow it to work in rotated mode
 #endif
 #include <qlayout.h>
 #ifdef _WINDOWS
 #include <direct.h>
 #endif
 
+#include <qpe/qpeapplication.h>
+
 #include "opie.h"
 
 fileBrowser::fileBrowser( bool allownew, QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter, const QString iPath )
     : QDialog( parent, name, true,
                fl/* | WStyle_Customize | WStyle_Tool*/),
       filterspec(QDir::All)
@@ -112,13 +114,14 @@ fileBrowser::fileBrowser( bool allownew, QWidget* parent,  const char* name, boo
         currentDir.setPath(QDir::currentDirPath());
         chdir(QDir::currentDirPath().latin1());
     }
 
     populateList();
 
-    if (modal) showMaximized();
+    if (modal)
+        QPEApplication::showDialog( this );
 }
 
 void fileBrowser::resizeEvent(QResizeEvent* e)
 {
     ListView->setColumnWidth(1,(ListView->width())/4);
     ListView->setColumnWidth(0,ListView->width()-20-ListView->columnWidth(1));