summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-08 19:53:13 (UTC)
committer zecke <zecke>2004-02-08 19:53:13 (UTC)
commitf345ae92a187aebbe014775324fcb5ffe0042e5a (patch) (unidiff)
tree4e99138a88e83d36f42224ac49773809afd1aa81
parent5f698069bca9dde2c8be9ff1bf863ee3a7a33cf0 (diff)
downloadopie-f345ae92a187aebbe014775324fcb5ffe0042e5a.zip
opie-f345ae92a187aebbe014775324fcb5ffe0042e5a.tar.gz
opie-f345ae92a187aebbe014775324fcb5ffe0042e5a.tar.bz2
Fix return type to void
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index a884046..c0f0bfc 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -113,25 +113,25 @@ public:
113 DisableLightOff = 1, 113 DisableLightOff = 1,
114 DisableSuspend = 2, 114 DisableSuspend = 2,
115 Enable = 100 115 Enable = 100
116 }; 116 };
117 117
118 static void setInputMethodHint( QWidget *, InputMethodHint ); 118 static void setInputMethodHint( QWidget *, InputMethodHint );
119 static InputMethodHint inputMethodHint( QWidget * ); 119 static InputMethodHint inputMethodHint( QWidget * );
120 120
121 void showMainWidget( QWidget*, bool nomax=FALSE ); 121 void showMainWidget( QWidget*, bool nomax=FALSE );
122 void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); 122 void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
123 static void showDialog( QDialog*, bool nomax=FALSE ); 123 static void showDialog( QDialog*, bool nomax=FALSE );
124 static int execDialog( QDialog*, bool nomax=FALSE ); 124 static int execDialog( QDialog*, bool nomax=FALSE );
125 static int showWidget( QWidget*, bool nomax=FALSE ); 125 static void showWidget( QWidget*, bool nomax=FALSE );
126 /* Merge setTempScreenSaverMode */ 126 /* Merge setTempScreenSaverMode */
127#ifdef QTOPIA_INTERNAL_INITAPP 127#ifdef QTOPIA_INTERNAL_INITAPP
128 void initApp( int argv, char **argv ); 128 void initApp( int argv, char **argv );
129#endif 129#endif
130 130
131 static void setKeepRunning(); 131 static void setKeepRunning();
132 bool keepRunning() const; 132 bool keepRunning() const;
133 133
134 bool keyboardGrabbed() const; 134 bool keyboardGrabbed() const;
135 135
136 int exec(); 136 int exec();
137 137
@@ -199,25 +199,25 @@ inline void QPEApplication::showDialog( QDialog* d, bool nomax )
199 } else { 199 } else {
200 d->resize(w,h); 200 d->resize(w,h);
201 d->show(); 201 d->show();
202 } 202 }
203} 203}
204 204
205inline int QPEApplication::execDialog( QDialog* d, bool nomax ) 205inline int QPEApplication::execDialog( QDialog* d, bool nomax )
206{ 206{
207 showDialog(d,nomax); 207 showDialog(d,nomax);
208 return d->exec(); 208 return d->exec();
209} 209}
210 210
211inline int QPEApplication::showWidget( QWidget* wg, bool nomax ) 211inline void QPEApplication::showWidget( QWidget* wg, bool nomax )
212{ 212{
213 QSize sh = wg->sizeHint(); 213 QSize sh = wg->sizeHint();
214 int w = QMAX(sh.width(),wg->width()); 214 int w = QMAX(sh.width(),wg->width());
215 int h = QMAX(sh.height(),wg->height()); 215 int h = QMAX(sh.height(),wg->height());
216 if ( !nomax 216 if ( !nomax
217 && ( w > qApp->desktop()->width()*3/4 217 && ( w > qApp->desktop()->width()*3/4
218 || h > qApp->desktop()->height()*3/4 ) ) 218 || h > qApp->desktop()->height()*3/4 ) )
219 { 219 {
220 wg->showMaximized(); 220 wg->showMaximized();
221 } else { 221 } else {
222 wg->resize(w,h); 222 wg->resize(w,h);
223 wg->show(); 223 wg->show();