From 596d87e16d593cbc52d510973ece99ffe26cd4c4 Mon Sep 17 00:00:00 2001 From: drw Date: Thu, 12 Feb 2004 15:14:07 +0000 Subject: QDialog::exec() -> QPEApplication::execDialog() --- (limited to 'noncore/settings') diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog index 72e6169..744122f 100644 --- a/noncore/settings/packagemanager/ChangeLog +++ b/noncore/settings/packagemanager/ChangeLog @@ -1,20 +1,21 @@ -2004-mm-dd Dan Williams +2004-02-12 Dan Williams - * Package information dialog implemented - * What's This app icon enabled + * Package information dialog implemented + * What's This app icon enabled + * Changed all QDialog::exec() occurences to QPEApplication::execDialog() 2004-01-23 Dan Williams - * Added package download functionality - * Have Opie update links after install/removal so that apps - will display properly in Launcher + * Added package download functionality + * Have Opie update links after install/removal so that apps + will display properly in Launcher 2004-01-20 Dan Williams - * Released version 0.2.0 - * Converted to use libipkg in place of spawning ipkg process + * Released version 0.2.0 + * Converted to use libipkg in place of spawning ipkg process 2004-01-13 Dan Williams - * Released version 0.1.0 - * Initial check-in of new package management client to eventually replace AQPkg + * Released version 0.1.0 + * Initial check-in of new package management client to eventually replace AQPkg diff --git a/noncore/settings/packagemanager/entrydlg.cpp b/noncore/settings/packagemanager/entrydlg.cpp index 8deaa37..663abd2 100644 --- a/noncore/settings/packagemanager/entrydlg.cpp +++ b/noncore/settings/packagemanager/entrydlg.cpp @@ -34,6 +34,8 @@ #include #include +#include + EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal ) : QDialog( parent, name, modal ) { @@ -68,7 +70,8 @@ QString EntryDlg::getText( const QString &caption, const QString &label, const Q dlg->setText( text ); QString result; - *ok = ( dlg->exec() == QDialog::Accepted ); + + *ok = ( QPEApplication::execDialog( dlg ) == QDialog::Accepted ); if ( *ok ) result = dlg->getText(); diff --git a/noncore/settings/packagemanager/filterdlg.cpp b/noncore/settings/packagemanager/filterdlg.cpp index 2e48d5b..0da9d19 100644 --- a/noncore/settings/packagemanager/filterdlg.cpp +++ b/noncore/settings/packagemanager/filterdlg.cpp @@ -108,7 +108,7 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, layout->addWidget( m_destCB ); layout->addWidget( m_destination ); - showMaximized(); + //showMaximized(); } void FilterDlg::initItem( QComboBox *comboBox, QCheckBox *checkBox, const QString &selection ) diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp index 8b374ab..2cb11ba 100644 --- a/noncore/settings/packagemanager/mainwindow.cpp +++ b/noncore/settings/packagemanager/mainwindow.cpp @@ -611,7 +611,7 @@ void MainWindow::slotFilterChange() { FilterDlg dlg( this, &m_packman, m_filterName, m_filterServer, m_filterDest, m_filterStatus, m_filterCategory ); - if ( dlg.exec() == QDialog::Accepted ) + if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) { m_filterName = dlg.name(); m_filterServer = dlg.server(); diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp index e335f8f..84c6de4 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp +++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp @@ -83,7 +83,7 @@ OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *paren m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) ); } - showMaximized(); + //showMaximized(); } void OIpkgConfigDlg::accept() diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp index e1c8a21..ad2fe02 100644 --- a/noncore/settings/packagemanager/opackagemanager.cpp +++ b/noncore/settings/packagemanager/opackagemanager.cpp @@ -307,7 +307,7 @@ int OPackageManager::compareVersions( const QString &version1, const QString &ve bool OPackageManager::configureDlg( bool installOptions ) { OIpkgConfigDlg dlg( &m_ipkg, installOptions, static_cast(parent()) ); - return ( dlg.exec() == QDialog::Accepted ); + return ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ); } void OPackageManager::saveSettings() diff --git a/noncore/settings/packagemanager/promptdlg.cpp b/noncore/settings/packagemanager/promptdlg.cpp index bb27190..128e88e 100644 --- a/noncore/settings/packagemanager/promptdlg.cpp +++ b/noncore/settings/packagemanager/promptdlg.cpp @@ -57,7 +57,7 @@ PromptDlg::PromptDlg( const QString &caption, const QString &text, const QString connect( btn, SIGNAL(clicked()), this, SLOT(slotBtn2Clicked()) ); } -int PromptDlg::exec() +int PromptDlg::display() { // Determine position of dialog. Derived from QT's QDialog::show() method. QWidget *w = parentWidget(); @@ -122,7 +122,7 @@ int PromptDlg::ask( const QString &caption, const QString &text, const QString & QWidget *parent ) { PromptDlg *dlg = new PromptDlg( caption, text, btn1, btn2, parent ); - int rc = dlg->exec(); + int rc = dlg->display(); delete dlg; return rc; } diff --git a/noncore/settings/packagemanager/promptdlg.h b/noncore/settings/packagemanager/promptdlg.h index e0e9f41..790ff4d 100644 --- a/noncore/settings/packagemanager/promptdlg.h +++ b/noncore/settings/packagemanager/promptdlg.h @@ -40,7 +40,7 @@ public: PromptDlg( const QString &caption = 0x0, const QString &text = 0x0, const QString &btn1 = 0x0, const QString &btn2 = 0x0, QWidget *parent = 0x0 ); - int exec(); + int display(); int btnPressed() { return m_btnClicked; } static int ask( const QString &caption = 0x0, const QString &text = 0x0, const QString &btn1 = 0x0, -- cgit v0.9.0.2