13 files changed, 16 insertions, 17 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 4adcab4..3b64fb5 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -76,7 +76,7 @@ void BatteryMeter::mouseReleaseEvent( QMouseEvent* e)
         delete (QWidget *) batteryView;
     } else {
         if ( !batteryView ) batteryView = new BatteryStatus( ps );
-        batteryView->showMaximized();
+        QPEApplication::showWidget( batteryView );
         batteryView->raise();
         batteryView->show();
     }
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index bdddd37..98e7481 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -613,8 +613,7 @@ void Launcher::properties( AppLnk *appLnk )
 /* ### libqtopia FIXME also moving docLnks... */
         LnkProperties prop(appLnk,0 );
 
-        prop.showMaximized();
-        prop.exec();
+        QPEApplication::execDialog( &prop );
     }
 }
 
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index e8d49fd..e18bcee 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -702,7 +702,7 @@ void ServerApplication::shutdown()
     ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose );
     connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)),
              this, SLOT(shutdown(ShutdownImpl::Type)) );
-    sd->showMaximized();
+    QPEApplication::showWidget( sd );
 }
 
 void ServerApplication::shutdown( ShutdownImpl::Type t )
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 44fbe48..fbc5072 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -286,7 +286,7 @@ void AudioWidget::setView( char view ) {
     if ( view == 'a' ) {
         startTimer( 150 );
 //        show();
-        showMaximized();
+        QPEApplication::showWidget( this );
     } else {
         killTimers();
         hide();
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 82fd1e1..db99866 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -705,7 +705,7 @@ void PlayListWidget::setPlaylist( bool shown ) {
 
 void PlayListWidget::setView( char view ) {
    if ( view == 'l' )
-      showMaximized();
+      QPEApplication::showWidget( this );
    else
       hide();
 }
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index d9a9478..5273ad3 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -420,7 +420,7 @@ void VideoWidget::makeVisible() {
    {
       setBackgroundPixmap( *pixBg );
       showNormal();
-      showMaximized();
+      QPEApplication::showWidget( this );
       slider->show();
    }
 }
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp
index 5aaf63c..c237555 100644
--- a/core/obex/obexhandler.cpp
+++ b/core/obex/obexhandler.cpp
@@ -1,6 +1,7 @@
 #include <qcopchannel_qws.h>
 
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 
 #include "obexsend.h"
 #include "receiver.h"
@@ -26,7 +27,7 @@ void ObexHandler::doSend(const QString& str, const QString& desc) {
     delete m_sender;
     m_sender = new SendWidget;
     m_sender->raise();
-    m_sender->showMaximized();
+    QPEApplication::showWidget( m_sender );
     connect(m_sender, SIGNAL(done() ),
             this, SLOT(slotSent() ) );
     m_sender->send( str, desc );
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 139c91b..c83a5df 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -82,7 +82,7 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
 
     qApp->processEvents();
     loadPlugins();
-    showMaximized();
+    QPEApplication::showWidget( this );
 }
 
 /**
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index e71c5b0..9ced0d8 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -19,6 +19,7 @@
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 
 #include <qcheckbox.h>
 #include <qlabel.h>
@@ -87,7 +88,7 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
     connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) );
 
     readConfig();
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 
 
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index 523e295..141e0f6 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -214,8 +214,7 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 
         RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this );
 
-        d-> showMaximized ( );
-        if ( d-> exec ( ) == QDialog::Accepted ) {
+        if ( QPEApplication::execDialog ( d ) == QDialog::Accepted ) {
 
 
                 if ( hold ) {
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index a3d31a5..17a1609 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -32,6 +32,7 @@
 #include <qpe/mimetype.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 
 #include <qlistbox.h>
 #include <qpushbutton.h>
@@ -300,8 +301,7 @@ void TabsSettings::editClicked ( )
 
         TabDialog *d = new TabDialog ( m_list-> pixmap ( ind ), m_list-> text ( ind ), tc, this, "TabDialog", true );
 
-        d-> showMaximized ( );
-        if ( d-> exec ( ) == QDialog::Accepted ) {
+        if ( QPEApplication::execDialog( d ) == QDialog::Accepted ) {
                 tc. m_changed = true;
                 m_tabs [m_ids [ind]] = tc;
 
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index b21215b..60f7417 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -210,8 +210,7 @@ void LightSettings::calibrateSensorAC ( )
 {
         Sensor *s = new Sensor ( m_sensordata_ac, this );
         connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int )));
-        s-> showMaximized ( );
-        s-> exec ( );
+        QPEApplication::execDialog ( s );
         delete s;
 }
 
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 7bb14cd..34f7e50 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -102,7 +102,7 @@
     updateGUI();
 
     dl = new QPEDialogListener(this);
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 
 Security::~Security()