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
@@ -78,3 +78,3 @@ void BatteryMeter::mouseReleaseEvent( QMouseEvent* e)
         if ( !batteryView ) batteryView = new BatteryStatus( ps );
-        batteryView->showMaximized();
+        QPEApplication::showWidget( batteryView );
         batteryView->raise();
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
@@ -615,4 +615,3 @@ void Launcher::properties( AppLnk *appLnk )
 
-        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
@@ -704,3 +704,3 @@ void ServerApplication::shutdown()
              this, SLOT(shutdown(ShutdownImpl::Type)) );
-    sd->showMaximized();
+    QPEApplication::showWidget( sd );
 }
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
@@ -288,3 +288,3 @@ void AudioWidget::setView( char view ) {
 //        show();
-        showMaximized();
+        QPEApplication::showWidget( this );
     } else {
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
@@ -707,3 +707,3 @@ void PlayListWidget::setView( char view ) {
    if ( view == 'l' )
-      showMaximized();
+      QPEApplication::showWidget( this );
    else
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
@@ -422,3 +422,3 @@ void VideoWidget::makeVisible() {
       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
@@ -3,2 +3,3 @@
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 
@@ -28,3 +29,3 @@ void ObexHandler::doSend(const QString& str, const QString& desc) {
     m_sender->raise();
-    m_sender->showMaximized();
+    QPEApplication::showWidget( m_sender );
     connect(m_sender, SIGNAL(done() ),
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
@@ -84,3 +84,3 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
     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
@@ -21,2 +21,3 @@
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 
@@ -89,3 +90,3 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
     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
@@ -216,4 +216,3 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 
-        d-> showMaximized ( );
-        if ( d-> exec ( ) == QDialog::Accepted ) {
+        if ( QPEApplication::execDialog ( d ) == QDialog::Accepted ) {
 
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
@@ -34,2 +34,3 @@
 #include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 
@@ -302,4 +303,3 @@ void TabsSettings::editClicked ( )
 
-        d-> showMaximized ( );
-        if ( d-> exec ( ) == QDialog::Accepted ) {
+        if ( QPEApplication::execDialog( d ) == QDialog::Accepted ) {
                 tc. m_changed = true;
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
@@ -212,4 +212,3 @@ void LightSettings::calibrateSensorAC ( )
         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
@@ -104,3 +104,3 @@
     dl = new QPEDialogListener(this);
-    showMaximized();
+    QPEApplication::showDialog( this );
 }