summaryrefslogtreecommitdiff
authordrw <drw>2004-02-12 15:14:07 (UTC)
committer drw <drw>2004-02-12 15:14:07 (UTC)
commit596d87e16d593cbc52d510973ece99ffe26cd4c4 (patch) (unidiff)
tree1b04d79f2c5b61aeccca85505d87c9f0d9612d4d
parentc06370063cb3983c1e90434ee66db4d7a3bedda2 (diff)
downloadopie-596d87e16d593cbc52d510973ece99ffe26cd4c4.zip
opie-596d87e16d593cbc52d510973ece99ffe26cd4c4.tar.gz
opie-596d87e16d593cbc52d510973ece99ffe26cd4c4.tar.bz2
QDialog::exec() -> QPEApplication::execDialog()
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/ChangeLog21
-rw-r--r--noncore/settings/packagemanager/entrydlg.cpp5
-rw-r--r--noncore/settings/packagemanager/filterdlg.cpp2
-rw-r--r--noncore/settings/packagemanager/mainwindow.cpp2
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.cpp2
-rw-r--r--noncore/settings/packagemanager/opackagemanager.cpp2
-rw-r--r--noncore/settings/packagemanager/promptdlg.cpp4
-rw-r--r--noncore/settings/packagemanager/promptdlg.h2
8 files changed, 22 insertions, 18 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,20 +1,21 @@
12004-mm-dd Dan Williams <drw@handhelds.org> 12004-02-12 Dan Williams <drw@handhelds.org>
2 2
3 * Package information dialog implemented 3 * Package information dialog implemented
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
62004-01-23 Dan Williams <drw@handhelds.org> 72004-01-23 Dan Williams <drw@handhelds.org>
7 8
8 * Added package download functionality 9 * Added package download functionality
9 * Have Opie update links after install/removal so that apps 10 * Have Opie update links after install/removal so that apps
10 will display properly in Launcher 11 will display properly in Launcher
11 12
122004-01-20 Dan Williams <drw@handhelds.org> 132004-01-20 Dan Williams <drw@handhelds.org>
13 14
14 * Released version 0.2.0 15 * Released version 0.2.0
15 * Converted to use libipkg in place of spawning ipkg process 16 * Converted to use libipkg in place of spawning ipkg process
16 17
172004-01-13 Dan Williams <drw@handhelds.org> 182004-01-13 Dan Williams <drw@handhelds.org>
18 19
19 * Released version 0.1.0 20 * Released version 0.1.0
20 * Initial check-in of new package management client to eventually replace AQPkg 21 * 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 @@
34#include <qlineedit.h> 34#include <qlineedit.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36 36
37#include <qpe/qpeapplication.h>
38
37EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal ) 39EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal )
38 : QDialog( parent, name, modal ) 40 : QDialog( parent, name, modal )
39{ 41{
@@ -68,7 +70,8 @@ QString EntryDlg::getText( const QString &caption, const QString &label, const Q
68 dlg->setText( text ); 70 dlg->setText( text );
69 71
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 )
73 result = dlg->getText(); 76 result = dlg->getText();
74 77
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,
108 layout->addWidget( m_destCB ); 108 layout->addWidget( m_destCB );
109 layout->addWidget( m_destination ); 109 layout->addWidget( m_destination );
110 110
111 showMaximized(); 111 //showMaximized();
112} 112}
113 113
114void FilterDlg::initItem( QComboBox *comboBox, QCheckBox *checkBox, const QString &selection ) 114void 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()
611{ 611{
612 FilterDlg dlg( this, &m_packman, m_filterName, m_filterServer, m_filterDest, m_filterStatus, 612 FilterDlg dlg( this, &m_packman, m_filterName, m_filterServer, m_filterDest, m_filterStatus,
613 m_filterCategory ); 613 m_filterCategory );
614 if ( dlg.exec() == QDialog::Accepted ) 614 if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted )
615 { 615 {
616 m_filterName = dlg.name(); 616 m_filterName = dlg.name();
617 m_filterServer = dlg.server(); 617 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
83 m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) ); 83 m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
84 } 84 }
85 85
86 showMaximized(); 86 //showMaximized();
87} 87}
88 88
89void OIpkgConfigDlg::accept() 89void 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
307bool OPackageManager::configureDlg( bool installOptions ) 307bool OPackageManager::configureDlg( bool installOptions )
308{ 308{
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}
312 312
313void OPackageManager::saveSettings() 313void 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
57 connect( btn, SIGNAL(clicked()), this, SLOT(slotBtn2Clicked()) ); 57 connect( btn, SIGNAL(clicked()), this, SLOT(slotBtn2Clicked()) );
58} 58}
59 59
60int PromptDlg::exec() 60int PromptDlg::display()
61{ 61{
62 // Determine position of dialog. Derived from QT's QDialog::show() method. 62 // Determine position of dialog. Derived from QT's QDialog::show() method.
63 QWidget *w = parentWidget(); 63 QWidget *w = parentWidget();
@@ -122,7 +122,7 @@ int PromptDlg::ask( const QString &caption, const QString &text, const QString &
122 QWidget *parent ) 122 QWidget *parent )
123{ 123{
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;
127 return rc; 127 return rc;
128} 128}
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:
40 PromptDlg( const QString &caption = 0x0, const QString &text = 0x0, const QString &btn1 = 0x0, 40 PromptDlg( const QString &caption = 0x0, const QString &text = 0x0, const QString &btn1 = 0x0,
41 const QString &btn2 = 0x0, QWidget *parent = 0x0 ); 41 const QString &btn2 = 0x0, QWidget *parent = 0x0 );
42 42
43 int exec(); 43 int display();
44 int btnPressed() { return m_btnClicked; } 44 int btnPressed() { return m_btnClicked; }
45 45
46 static int ask( const QString &caption = 0x0, const QString &text = 0x0, const QString &btn1 = 0x0, 46 static int ask( const QString &caption = 0x0, const QString &text = 0x0, const QString &btn1 = 0x0,