summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp12
-rw-r--r--noncore/apps/checkbook/checkbook.cpp6
-rw-r--r--noncore/apps/checkbook/mainwindow.cpp11
-rw-r--r--noncore/apps/odict/configdlg.cpp7
-rw-r--r--noncore/apps/odict/searchmethoddlg.cpp7
-rw-r--r--noncore/apps/opie-bartender/bartender.cpp14
-rw-r--r--noncore/apps/opie-console/configdialog.cpp10
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp7
-rw-r--r--noncore/apps/opie-console/modemconfigwidget.cpp9
-rw-r--r--noncore/apps/opie-reader/CloseDialog.cpp5
-rw-r--r--noncore/apps/opie-reader/Prefs.cpp5
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp0
-rw-r--r--noncore/apps/opie-reader/ToolbarPrefs.cpp4
-rw-r--r--noncore/apps/opie-reader/URLDialog.cpp5
-rw-r--r--noncore/apps/opie-reader/fileBrowser.cpp5
-rw-r--r--noncore/apps/opie-sheet/mainwindow.cpp9
-rw-r--r--noncore/apps/tableviewer/ui/tveditview.cpp4
-rw-r--r--noncore/apps/tableviewer/ui/tvfilterview.cpp4
-rw-r--r--noncore/apps/tableviewer/ui/tvkeyedit.cpp4
-rw-r--r--noncore/apps/tinykate/libkate/view/kateview.cpp4
-rw-r--r--noncore/apps/zsafe/scqtfileedit.cpp4
-rw-r--r--noncore/apps/zsafe/zsafe.cpp27
-rw-r--r--noncore/comm/keypebble/kvnc.cpp7
23 files changed, 82 insertions, 88 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 26bc36d..78f9da2 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -240,8 +240,7 @@ void AdvancedFm::filePerms() {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
filePermissions *filePerm;
filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
- filePerm->showMaximized();
- filePerm->exec();
+ QPEApplication::execDialog( filePerm );
if( filePerm)
delete filePerm;
}
@@ -262,8 +261,7 @@ void AdvancedFm::doProperties() {
// qDebug((filePath+*it));
DocLnk lnk( (filePath+*it));
LnkProperties prop( &lnk );
- prop.showMaximized();
- prop.exec();
+ QPEApplication::execDialog( &prop );
}
#endif
@@ -601,8 +599,7 @@ void AdvancedFm::runCommand() {
command << fileDlg->LineEdit1->text();
Output *outDlg;
outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
- outDlg->showMaximized();
- outDlg->exec();
+ QPEApplication::execDialog( outDlg );
qApp->processEvents();
}
@@ -639,8 +636,7 @@ void AdvancedFm::fileStatus() {
Output *outDlg;
outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
- outDlg->showMaximized();
- outDlg->exec();
+ QPEApplication::execDialog( outDlg );
qApp->processEvents();
}
diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index a42c824..a5492e4 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -483,8 +483,7 @@ void Checkbook::slotNewTran()
Transaction *currtran = new Transaction( this, true, info->name(),
traninfo,
_pCfg );
- currtran->showMaximized();
- if ( currtran->exec() == QDialog::Accepted )
+ if ( QPEApplication::execDialog( currtran ) == QDialog::Accepted )
{
// Add to transaction list
info->addTransaction( traninfo );
@@ -530,8 +529,7 @@ void Checkbook::slotEditTran()
Transaction *currtran = new Transaction( this, false, info->name(),
traninfo,
_pCfg );
- currtran->showMaximized();
- if ( currtran->exec() == QDialog::Accepted )
+ if ( QPEApplication::execDialog( currtran ) == QDialog::Accepted )
{
curritem->setText( COL_NUM, traninfo->number() );
curritem->setText( COL_SORTDATE, traninfo->datestr(false) );
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index f29001a..60aea42 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -36,11 +36,11 @@
#include <qpe/config.h>
#include <qpe/global.h>
#include <qpe/qpeapplication.h>
-#include <qmenubar.h>
#include <qpe/qpemessagebox.h>
#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
+#include <qmenubar.h>
#include <qaction.h>
#include <qcheckbox.h>
#include <qdir.h>
@@ -214,8 +214,7 @@ void MainWindow::slotNew()
CBInfo *cb = new CBInfo();
Checkbook *currcb = new Checkbook( this, cb, &_cfg );
- currcb->showMaximized();
- if ( currcb->exec() == QDialog::Accepted )
+ if ( QPEApplication::execDialog( currcb ) == QDialog::Accepted )
{
// Save new checkbook
buildFilename( cb->name() );
@@ -272,8 +271,7 @@ void MainWindow::openBook(QListViewItem *curritem)
_cfg.setLastBook( currname );
Checkbook *currcb = new Checkbook( this, cb, &_cfg );
- currcb->showMaximized();
- if ( currcb->exec() == QDialog::Accepted )
+ if ( QPEApplication::execDialog( currcb ) == QDialog::Accepted )
{
QString newname = cb->name();
if ( currname != newname )
@@ -345,8 +343,7 @@ void MainWindow::slotDelete()
void MainWindow::slotConfigure()
{
Configuration *cfgdlg = new Configuration( this, _cfg );
- cfgdlg->showMaximized();
- if ( cfgdlg->exec() == QDialog::Accepted )
+ if ( QPEApplication::execDialog( cfgdlg ) == QDialog::Accepted )
{
// read data from config dialog & save it
cfgdlg->saveConfig( _cfg );
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index 2103df9..b12a395 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -17,10 +17,11 @@
#include "configdlg.h"
#include "searchmethoddlg.h"
-#include <qdialog.h>
+#include <qpe/qpeapplication.h>
#include <qpe/config.h>
-#include <qlayout.h>
+#include <qdialog.h>
+#include <qlayout.h>
#include <qhbox.h>
#include <qvbox.h>
#include <qlabel.h>
@@ -53,7 +54,7 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
vbox_layout->addWidget( search_tab );
- showMaximized();
+ QPEApplication::execDialog( this );
}
void ConfigDlg::slotNewMethod()
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp
index 99cd8db..8ed7152 100644
--- a/noncore/apps/odict/searchmethoddlg.cpp
+++ b/noncore/apps/odict/searchmethoddlg.cpp
@@ -16,10 +16,11 @@
**************************************************************************/
#include "searchmethoddlg.h"
-#include <qdialog.h>
#include <qpe/config.h>
-#include <qlayout.h>
+#include <qpe/qpeapplication.h>
+#include <qdialog.h>
+#include <qlayout.h>
#include <qhbox.h>
#include <qvbox.h>
#include <qlabel.h>
@@ -66,7 +67,7 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal,
vbox_layout->addWidget( vbox );
- showMaximized();
+ QPEApplication::execDialog ( this );
if( !itemname )
setCaption( tr( "New Searchmethod" ) );
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index 8c4ee93..cd0a364 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -169,8 +169,7 @@ void Bartender::fileNew() {
New_Drink *newDrinks;
newDrinks = new New_Drink(this,"New Drink....", TRUE);
QString newName, newIng;
- newDrinks->showMaximized();
- newDrinks->exec();
+ QPEApplication::execDialog( newDrinks );
newName = newDrinks->LineEdit1->text();
newIng= newDrinks->MultiLineEdit1->text();
@@ -226,8 +225,7 @@ void Bartender::showDrink( QListViewItem *item) {
}
}
}
- showDrinks->showMaximized();
- showDrinks->exec();
+ QPEApplication::execDialog( showDrinks );
if(showDrinks ->result() ==0) {
doEdit();
@@ -317,9 +315,8 @@ void Bartender::showSearchResult(QStringList &searchList) {
searchList.sort();
searchDlg = new Search_Results(this, "Search Results", TRUE);
- searchDlg->showMaximized();
searchDlg->ListBox1->insertStringList( searchList,-1);
- searchDlg->exec();
+ QPEApplication::execDialog( searchDlg );
if( searchDlg->result() == 1 ) {
result= searchDlg->ListBox1->currentText();
@@ -346,7 +343,7 @@ void Bartender::doEdit() {
New_Drink *newDrinks;
newDrinks = new New_Drink(this,"Edit Drink....", TRUE);
QString newName, newIng;
- newDrinks->showMaximized();
+ QPEApplication::showDialog( newDrinks );
QTextStream t( &dbFile);
QString s, s2;
@@ -401,8 +398,7 @@ void Bartender::clearList() {
void Bartender::doBac() {
BacDialog *bacDlg;
bacDlg = new BacDialog(this,"BAC",TRUE);
- bacDlg->showMaximized();
- bacDlg->exec();
+ QPEApplication::execDialog( bacDlg );
delete bacDlg;
}
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index b23f4d0..882cd3d 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -1,5 +1,7 @@
-#include <qlistview.h>
+#include <qpe/qpeapplication.h>
+
+#include <qlistview.h>
#include "configdialog.h"
#include "profileeditordialog.h"
@@ -73,8 +75,7 @@ void ConfigDialog::slotEdit() {
ProfileEditorDialog dlg(m_fact, p);
dlg.setCaption(tr("Edit Connection Profile"));
- dlg.showMaximized();
- int ret = dlg.exec();
+ int ret = QPEApplication::execDialog( &dlg );
if(ret == QDialog::Accepted)
{
@@ -92,8 +93,7 @@ void ConfigDialog::slotAdd() {
ProfileEditorDialog dlg(m_fact);
dlg.setCaption(tr("New Connection"));
- dlg.showMaximized();
- int ret = dlg.exec();
+ int ret = QPEApplication::execDialog( &dlg );
if(ret == QDialog::Accepted)
{
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 2673335..3fe9040 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -8,6 +8,7 @@
#include <qfileinfo.h>
#include <qpe/filemanager.h>
+#include <qpe/qpeapplication.h>
#include <opie/ofiledialog.h>
@@ -310,9 +311,8 @@ QList<Session> MainWindow::sessions() {
void MainWindow::slotNew() {
ProfileEditorDialog dlg(factory() );
- dlg.showMaximized();
dlg.setCaption( tr("New Connection") );
- int ret = dlg.exec();
+ int ret = QPEApplication::execDialog( &dlg );
if ( ret == QDialog::Accepted ) {
create( dlg.profile() );
@@ -425,9 +425,8 @@ void MainWindow::slotQuickLaunch() {
void MainWindow::slotConfigure() {
ConfigDialog conf( manager()->all(), factory() );
- conf.showMaximized();
- int ret = conf.exec();
+ int ret = QPEApplication::execDialog( &conf );
if ( QDialog::Accepted == ret ) {
manager()->setProfiles( conf.list() );
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index e552990..3466e3a 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -1,3 +1,6 @@
+
+#include <qpe/qpeapplication.h>
+
#include <qlabel.h>
#include <qlayout.h>
#include <qcombobox.h>
@@ -237,8 +240,7 @@ void ModemConfigWidget::slotAT() {
// but making it a TopLevel Dialog and ignoring
// cancel is not fun either...
// what to do? FIXME!!! -zecke
- atConf->showMaximized();
- if ( atConf->exec() != QDialog::Accepted ) {
+ if ( QPEApplication::execDialog( atConf ) != QDialog::Accepted ) {
// reload old settings
}
}
@@ -248,8 +250,7 @@ void ModemConfigWidget::slotDial() {
if(!m_telNumber->text().isEmpty()) {
dial.setNumber(m_telNumber->text().replace(QRegExp("[\\-\\/\\ \\.\\,]"), ""));
}
- dial.showMaximized();
- if ( dial.exec() == QDialog::Accepted ) {
+ if ( QPEApplication::execDialog( &dial ) == QDialog::Accepted ) {
m_telNumber->setText( dial.number() );
}
}
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,6 +1,8 @@
#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"));
@@ -14,5 +16,6 @@ CCloseDialog::CCloseDialog(const QString& fname, bool fs, QWidget* parent, const
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
@@ -27,6 +27,8 @@
#include <qfontdatabase.h>
#endif
+#include <qpe/qpeapplication.h>
+
CLayoutPrefs::CLayoutPrefs( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
@@ -427,7 +429,8 @@ CPrefs::CPrefs(bool fs, QWidget* parent, const char* name) : QDialog(parent, nam
QVBoxLayout* v = new QVBoxLayout(this);
v->addWidget(td);
- if (fs) showMaximized();
+ if (fs)
+ QPEApplication::showDialog( this );
}
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
@@ -23,6 +23,7 @@
#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 )
{
@@ -43,7 +44,8 @@ CBarPrefs::CBarPrefs(const QString& appdir, bool fs, QWidget* parent, const char
QVBoxLayout* v = new QVBoxLayout(this);
v->addWidget(td);
- if (fs) showMaximized();
+ if (fs)
+ QPEApplication::showDialog( this );
}
/*
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,6 +1,8 @@
#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"));
@@ -10,5 +12,6 @@ CURLDialog::CURLDialog(const QString& fname, bool fs, QWidget* parent, const cha
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
@@ -22,6 +22,8 @@ Extensive modification by Tim Wentford to allow it to work in rotated mode
#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 )
@@ -115,7 +117,8 @@ fileBrowser::fileBrowser( bool allownew, QWidget* parent, const char* name, boo
populateList();
- if (modal) showMaximized();
+ if (modal)
+ QPEApplication::showDialog( this );
}
void fileBrowser::resizeEvent(QResizeEvent* e)
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index bd98aca..3d3c688 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -17,10 +17,13 @@
#include <qpe/filemanager.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
#include <qmessagebox.h>
#include <qfile.h>
#include <qtranslator.h>
#include <qradiobutton.h>
+
#include "cellformat.h"
#include "numberdlg.h"
#include "textdlg.h"
@@ -747,7 +750,7 @@ void MainWindow::addFlyAction(const QString &text, const QString &menuText, cons
void MainWindow::slotFormatCells()
{
CellFormat dialogCellFormat(this);
- dialogCellFormat.showMaximized();
+ QPEApplication::showDialog( &dialogCellFormat );
dialogCellFormat.exec(sheet);
}
@@ -967,7 +970,7 @@ void MainWindow::slotSheetRemove()
void MainWindow::slotDataSort()
{
SortDialog dialogSort(this);
- dialogSort.showMaximized();
+ QPEApplication::showDialog( &dialogSort );
dialogSort.exec(sheet);
}
@@ -1003,6 +1006,6 @@ void MainWindow::slotInsertCells()
void MainWindow::slotDataFindReplace()
{
FindDialog dialogFind(this);
- dialogFind.showMaximized();
+ QPEApplication::showDialog( &dialogFind );
dialogFind.exec(sheet);
}
diff --git a/noncore/apps/tableviewer/ui/tveditview.cpp b/noncore/apps/tableviewer/ui/tveditview.cpp
index 23e2b42..20a24c8 100644
--- a/noncore/apps/tableviewer/ui/tveditview.cpp
+++ b/noncore/apps/tableviewer/ui/tveditview.cpp
@@ -40,6 +40,8 @@
#include <qscrollview.h>
#include <qsignalmapper.h>
+#include <qpe/qpeapplication.h>
+
TVEditView::TVEditView(TableState *s, DataElem *d, QWidget* parent,
const char *name, WFlags fl ) : QDialog(parent, name, true, fl)
{
@@ -64,7 +66,7 @@ TVEditView::TVEditView(TableState *s, DataElem *d, QWidget* parent,
setData(s, d);
#ifdef Q_WS_QWS
- showMaximized();
+ QPEApplication::showDialog( this );
#endif
}
diff --git a/noncore/apps/tableviewer/ui/tvfilterview.cpp b/noncore/apps/tableviewer/ui/tvfilterview.cpp
index 0182127..b03e846 100644
--- a/noncore/apps/tableviewer/ui/tvfilterview.cpp
+++ b/noncore/apps/tableviewer/ui/tvfilterview.cpp
@@ -26,6 +26,8 @@
#include <qpushbutton.h>
#include <qlabel.h>
+#include <qpe/qpeapplication.h>
+
TVFilterView::TVFilterView(TableState *t, QWidget* parent,
const char *name, WFlags fl ) : QDialog(parent, name, TRUE, fl)
{
@@ -95,7 +97,7 @@ TVFilterView::TVFilterView(TableState *t, QWidget* parent,
do_filter = false;
#ifdef Q_WS_QWS
- showMaximized();
+ QPEApplication::showDialog( this );
#endif
}
diff --git a/noncore/apps/tableviewer/ui/tvkeyedit.cpp b/noncore/apps/tableviewer/ui/tvkeyedit.cpp
index 4849e87..c22ecd3 100644
--- a/noncore/apps/tableviewer/ui/tvkeyedit.cpp
+++ b/noncore/apps/tableviewer/ui/tvkeyedit.cpp
@@ -26,6 +26,8 @@
#include <stdlib.h>
#include <qpushbutton.h>
+#include <qpe/qpeapplication.h>
+
/* QList view item... ?? that can store and update the values that I will
* be changing */
@@ -135,7 +137,7 @@ TVKeyEdit::TVKeyEdit(TableState *t, QWidget* parent, const char *name,
display->setSorting(0);
#ifdef Q_WS_QWS
- showMaximized();
+ QPEApplication::showDialog( this );
#endif
}
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp
index af3b30d..794fbdb 100644
--- a/noncore/apps/tinykate/libkate/view/kateview.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateview.cpp
@@ -84,6 +84,7 @@
#include "kateviewdialog.h"
#include "kateundohistory.h"
#include <qlayout.h>
+#include <qpe/qpeapplication.h>
KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) : QWidget(view)
{
@@ -2327,8 +2328,7 @@ void KateView::configDialog()
(new QVBoxLayout(page))->setAutoAdd(true);
hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, page);
- kd->showMaximized();
- if (kd->exec()) {
+ if ( QPEApplication::execDialog( kd )) {
// color options
colorConfig->getColors(colors);
myDoc->setFont (fontConfig->getFont());
diff --git a/noncore/apps/zsafe/scqtfileedit.cpp b/noncore/apps/zsafe/scqtfileedit.cpp
index effd86b..7a3d906 100644
--- a/noncore/apps/zsafe/scqtfileedit.cpp
+++ b/noncore/apps/zsafe/scqtfileedit.cpp
@@ -28,6 +28,8 @@
#include "scqtfileedit.h"
+#include <qpe/qpeapplication.h>
+
// #define DEBUGFILEEDIT
/* XPM */
@@ -158,7 +160,7 @@ ScQtFileEditDlg::ScQtFileEditDlg( QWidget *parent, const char *name,
cdToParentIcon = new QPixmap( (const char **)cdtoparent_xpm);
#ifdef QWS
- showMaximized();
+ QPEApplication::execDialog( this );
#endif
mkdirflag = false;
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index ee1da77..bdd2aed 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -775,14 +775,8 @@ void ZSafe::editPwd()
dialog->Field6->setText(selectedItem->text (5));
dialog->CommentField->insertLine(comment);
dialog->CommentField->setCursorPosition(0,0);
-#ifdef DESKTOP
-#ifndef WIN32
- dialog->show();
-#endif
-#else
- dialog->showMaximized();
-#endif
- DialogCode result = (DialogCode) dialog->exec();
+
+ DialogCode result = (DialogCode) QPEApplication::execDialog( dialog );
#ifdef DESKTOP
result = Accepted;
@@ -840,14 +834,8 @@ void ZSafe::newPwd()
dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4")));
dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5")));
retype:
-#ifdef DESKTOP
-#ifndef WIN32
- dialog->show();
-#endif
-#else
- dialog->showMaximized();
-#endif
- DialogCode result = (DialogCode) dialog->exec();
+
+ DialogCode result = (DialogCode) QPEApplication::execDialog( dialog );
#ifdef DESKTOP
result = Accepted;
#endif
@@ -1188,12 +1176,7 @@ void ZSafe::showInfo( QListViewItem *_item)
infoForm->InfoText->setText(text);
infoForm->hide();
-#ifdef DESKTOP
- infoForm->show();
-#else
- infoForm->showMaximized();
-#endif
-
+ QPEApplication::showDialog( infoForm );
}
}
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 25c8919..2fa8d1f 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -127,8 +127,7 @@ void KVNC::newConnection()
curServer=new KRFBServer;
KVNCConnDlg dlg( curServer,this);
- dlg.showMaximized();
- if ( dlg.exec()) {
+ if ( QPEApplication::execDialog( &dlg )) {
if (!curServer->name.isEmpty())
bookmarkSelector->addBookmark(curServer);
canvas->openConnection(*curServer);
@@ -142,9 +141,7 @@ void KVNC::openConnection( QString name)
if (curServer) {
KVNCConnDlg dlg( curServer,this);
- dlg.showMaximized();
-
- if ( dlg.exec() ) {
+ if ( QPEApplication::execDialog( &dlg ) ) {
canvas->openConnection(*curServer);
bookmarkSelector->writeBookmarks();
} else