summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-bartender/bartender.cpp
Unidiff
Diffstat (limited to 'noncore/apps/opie-bartender/bartender.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-bartender/bartender.cpp14
1 files changed, 5 insertions, 9 deletions
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
@@ -166,14 +166,13 @@ void Bartender::fillList() {
166 166
167void Bartender::fileNew() { 167void Bartender::fileNew() {
168 168
169 New_Drink *newDrinks; 169 New_Drink *newDrinks;
170 newDrinks = new New_Drink(this,"New Drink....", TRUE); 170 newDrinks = new New_Drink(this,"New Drink....", TRUE);
171 QString newName, newIng; 171 QString newName, newIng;
172 newDrinks->showMaximized(); 172 QPEApplication::execDialog( newDrinks );
173 newDrinks->exec();
174 newName = newDrinks->LineEdit1->text(); 173 newName = newDrinks->LineEdit1->text();
175 newIng= newDrinks->MultiLineEdit1->text(); 174 newIng= newDrinks->MultiLineEdit1->text();
176 175
177 if(dbFile.isOpen()) 176 if(dbFile.isOpen())
178 dbFile.close(); 177 dbFile.close();
179 if ( !dbFile.open( IO_WriteOnly| IO_Append)) { 178 if ( !dbFile.open( IO_WriteOnly| IO_Append)) {
@@ -223,14 +222,13 @@ void Bartender::showDrink( QListViewItem *item) {
223 showDrinks->MultiLineEdit1->append(s2); 222 showDrinks->MultiLineEdit1->append(s2);
224 } 223 }
225 if( dbFile.atEnd() ) break; 224 if( dbFile.atEnd() ) break;
226 } 225 }
227 } 226 }
228 } 227 }
229 showDrinks->showMaximized(); 228 QPEApplication::execDialog( showDrinks );
230 showDrinks->exec();
231 229
232 if(showDrinks ->result() ==0) { 230 if(showDrinks ->result() ==0) {
233 doEdit(); 231 doEdit();
234 } 232 }
235 delete showDrinks; 233 delete showDrinks;
236} 234}
@@ -314,15 +312,14 @@ void Bartender::showSearchResult(QStringList &searchList) {
314 QString result; 312 QString result;
315 Search_Results *searchDlg; 313 Search_Results *searchDlg;
316 314
317 searchList.sort(); 315 searchList.sort();
318 316
319 searchDlg = new Search_Results(this, "Search Results", TRUE); 317 searchDlg = new Search_Results(this, "Search Results", TRUE);
320 searchDlg->showMaximized();
321 searchDlg->ListBox1->insertStringList( searchList,-1); 318 searchDlg->ListBox1->insertStringList( searchList,-1);
322 searchDlg->exec(); 319 QPEApplication::execDialog( searchDlg );
323 320
324 if( searchDlg->result() == 1 ) { 321 if( searchDlg->result() == 1 ) {
325 result= searchDlg->ListBox1->currentText(); 322 result= searchDlg->ListBox1->currentText();
326 } 323 }
327 QListViewItemIterator it2( DrinkView ); 324 QListViewItemIterator it2( DrinkView );
328 for ( ; it2.current(); ++it2 ) { 325 for ( ; it2.current(); ++it2 ) {
@@ -343,13 +340,13 @@ void Bartender::doEdit() {
343 myDrink= DrinkView->currentItem()->text(0); 340 myDrink= DrinkView->currentItem()->text(0);
344 dbFile.at(0); 341 dbFile.at(0);
345 int foundAt=0; 342 int foundAt=0;
346 New_Drink *newDrinks; 343 New_Drink *newDrinks;
347 newDrinks = new New_Drink(this,"Edit Drink....", TRUE); 344 newDrinks = new New_Drink(this,"Edit Drink....", TRUE);
348 QString newName, newIng; 345 QString newName, newIng;
349 newDrinks->showMaximized(); 346 QPEApplication::showDialog( newDrinks );
350 QTextStream t( &dbFile); 347 QTextStream t( &dbFile);
351 348
352 QString s, s2; 349 QString s, s2;
353 while ( !t.eof()) { 350 while ( !t.eof()) {
354 s = t.readLine(); 351 s = t.readLine();
355 if(s.find( myDrink, 0, TRUE) != -1) { 352 if(s.find( myDrink, 0, TRUE) != -1) {
@@ -398,14 +395,13 @@ void Bartender::clearList() {
398 DrinkView->clear(); 395 DrinkView->clear();
399} 396}
400 397
401void Bartender::doBac() { 398void Bartender::doBac() {
402 BacDialog *bacDlg; 399 BacDialog *bacDlg;
403 bacDlg = new BacDialog(this,"BAC",TRUE); 400 bacDlg = new BacDialog(this,"BAC",TRUE);
404 bacDlg->showMaximized(); 401 QPEApplication::execDialog( bacDlg );
405 bacDlg->exec();
406 delete bacDlg; 402 delete bacDlg;
407} 403}
408 404
409void Bartender::openCurrentDrink() { 405void Bartender::openCurrentDrink() {
410 if(DrinkView->currentItem() == NULL) return; 406 if(DrinkView->currentItem() == NULL) return;
411 showDrink(DrinkView->currentItem()); 407 showDrink(DrinkView->currentItem());