author | drw <drw> | 2004-02-12 15:14:07 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-12 15:14:07 (UTC) |
commit | 596d87e16d593cbc52d510973ece99ffe26cd4c4 (patch) (unidiff) | |
tree | 1b04d79f2c5b61aeccca85505d87c9f0d9612d4d | |
parent | c06370063cb3983c1e90434ee66db4d7a3bedda2 (diff) | |
download | opie-596d87e16d593cbc52d510973ece99ffe26cd4c4.zip opie-596d87e16d593cbc52d510973ece99ffe26cd4c4.tar.gz opie-596d87e16d593cbc52d510973ece99ffe26cd4c4.tar.bz2 |
QDialog::exec() -> QPEApplication::execDialog()
-rw-r--r-- | noncore/settings/packagemanager/ChangeLog | 3 | ||||
-rw-r--r-- | noncore/settings/packagemanager/entrydlg.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/packagemanager/filterdlg.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/opackagemanager.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/promptdlg.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/packagemanager/promptdlg.h | 2 |
8 files changed, 13 insertions, 9 deletions
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,2 +1,2 @@ | |||
1 | 2004-mm-dd Dan Williams <drw@handhelds.org> | 1 | 2004-02-12 Dan Williams <drw@handhelds.org> |
2 | 2 | ||
@@ -4,2 +4,3 @@ | |||
4 | * What's This app icon enabled | 4 | * What's This app icon enabled |
5 | * Changed all QDialog::exec() occurences to QPEApplication::execDialog() | ||
5 | 6 | ||
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 | |||
@@ -36,2 +36,4 @@ | |||
36 | 36 | ||
37 | #include <qpe/qpeapplication.h> | ||
38 | |||
37 | EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal ) | 39 | EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal ) |
@@ -70,3 +72,4 @@ QString EntryDlg::getText( const QString &caption, const QString &label, const Q | |||
70 | QString result; | 72 | QString result; |
71 | *ok = ( dlg->exec() == QDialog::Accepted ); | 73 | |
74 | *ok = ( QPEApplication::execDialog( dlg ) == QDialog::Accepted ); | ||
72 | if ( *ok ) | 75 | if ( *ok ) |
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 | |||
@@ -110,3 +110,3 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, | |||
110 | 110 | ||
111 | showMaximized(); | 111 | //showMaximized(); |
112 | } | 112 | } |
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 | |||
@@ -613,3 +613,3 @@ void MainWindow::slotFilterChange() | |||
613 | m_filterCategory ); | 613 | m_filterCategory ); |
614 | if ( dlg.exec() == QDialog::Accepted ) | 614 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) |
615 | { | 615 | { |
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 | |||
@@ -85,3 +85,3 @@ OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *paren | |||
85 | 85 | ||
86 | showMaximized(); | 86 | //showMaximized(); |
87 | } | 87 | } |
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 | |||
@@ -309,3 +309,3 @@ bool OPackageManager::configureDlg( bool installOptions ) | |||
309 | OIpkgConfigDlg dlg( &m_ipkg, installOptions, static_cast<QWidget *>(parent()) ); | 309 | OIpkgConfigDlg dlg( &m_ipkg, installOptions, static_cast<QWidget *>(parent()) ); |
310 | return ( dlg.exec() == QDialog::Accepted ); | 310 | return ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ); |
311 | } | 311 | } |
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 | |||
@@ -59,3 +59,3 @@ PromptDlg::PromptDlg( const QString &caption, const QString &text, const QString | |||
59 | 59 | ||
60 | int PromptDlg::exec() | 60 | int PromptDlg::display() |
61 | { | 61 | { |
@@ -124,3 +124,3 @@ int PromptDlg::ask( const QString &caption, const QString &text, const QString & | |||
124 | PromptDlg *dlg = new PromptDlg( caption, text, btn1, btn2, parent ); | 124 | PromptDlg *dlg = new PromptDlg( caption, text, btn1, btn2, parent ); |
125 | int rc = dlg->exec(); | 125 | int rc = dlg->display(); |
126 | delete dlg; | 126 | delete dlg; |
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 | |||
@@ -42,3 +42,3 @@ public: | |||
42 | 42 | ||
43 | int exec(); | 43 | int display(); |
44 | int btnPressed() { return m_btnClicked; } | 44 | int btnPressed() { return m_btnClicked; } |