Fixed control file so ipkg will build and commented out an unused include (but did convert to libopie2)

2 files changed, 20 insertions, 20 deletions

diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index cd0a364..740478f 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -18,9 +18,9 @@
 #include "bac.h"
 
 #include <qpe/qpetoolbar.h>
 #include <qmenubar.h>
-#include <opie/colorpopupmenu.h>
+//#include <opie2/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include <qcstring.h>
@@ -75,14 +75,14 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     fileMenu->insertItem(tr("New Drink"));
     fileMenu->insertItem(tr("Open Drink"));
     fileMenu->insertItem(tr("Find by Drink Name"));
     fileMenu->insertItem(tr("Find by Alcohol"));
-    
+
     QPopupMenu *editMenu;
     editMenu = new QPopupMenu( this);
     menuBar->insertItem( tr("Edit"), editMenu );
     editMenu->insertItem(tr("edit"));
-    
+
     connect( fileMenu, SIGNAL( activated(int) ), this, SLOT( fileMenuActivated(int) ));
     connect( editMenu, SIGNAL( activated(int) ), this, SLOT( editMenuActivated(int) ));
 
 
@@ -104,12 +104,12 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
 
     QPushButton *t;
     t= new QPushButton( "BAC", ToolBar1, "bacButtin");
     connect( t, SIGNAL( clicked() ), this, SLOT( doBac() ) );
-    
+
     DrinkView = new QListView( this, "DrinkView" );
     DrinkView->addColumn( tr( "Name of Drink" ) );
-//    DrinkView->setRootIsDecorated( TRUE ); 
+//    DrinkView->setRootIsDecorated( TRUE );
     DrinkView->header()->hide();
 
     QPEApplication::setStylusOperation( DrinkView->viewport(),QPEApplication::RightOnHold);
 
@@ -185,12 +185,12 @@ void Bartender::fileNew() {
         qDebug("writing "+newDrink);
         dbFile.writeBlock( newDrink.latin1(), newDrink.length());
         clearList();
         dbFile.close();
-        
+
         initDrinkDb();
     }
-    delete newDrinks;   
+    delete newDrinks;
 }
 
 void Bartender::showDrink(int mouse, QListViewItem * item, const QPoint&, int) {
     switch (mouse) {
@@ -209,9 +209,9 @@ void Bartender::showDrink( QListViewItem *item) {
     Show_Drink *showDrinks;
     QString myDrink=item->text(0);
     showDrinks = new Show_Drink(this, myDrink, TRUE);
     QTextStream t( &dbFile);
-    
+
     QString s, s2;
     while ( !t.eof()) {
         s = t.readLine();
         if(s.find( myDrink, 0, TRUE) != -1) {
@@ -274,23 +274,23 @@ void Bartender::doSearchByName() {
 void Bartender::doSearchByDrink() {
 //    if( DrinkView->currentItem() == NULL) return;
     QStringList searchList;
     QString searchForDrinkName, lastDrinkName, tempName;
-    
+
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Find by Alcohol"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         searchForDrinkName = fileDlg->LineEdit1->text();
 
         dbFile.at(0);
         QTextStream t( &dbFile);
-    
+
         QString s, s2;
         while ( !t.eof()) {
             s = t.readLine();
             if(s.find("#",0,TRUE) != -1) {
-                lastDrinkName=s.right(s.length()-2);    
+                lastDrinkName=s.right(s.length()-2);
 //                qDebug("last drink name "+lastDrinkName);
             }
             else if( s.find( searchForDrinkName ,0, FALSE) != -1 && lastDrinkName != tempName ) {
 //                qDebug("appending "+lastDrinkName);
@@ -312,9 +312,9 @@ void Bartender::showSearchResult(QStringList &searchList) {
     QString result;
     Search_Results *searchDlg;
 
     searchList.sort();
-        
+
     searchDlg = new Search_Results(this, "Search Results", TRUE);
     searchDlg->ListBox1->insertStringList( searchList,-1);
     QPEApplication::execDialog( searchDlg );
 
@@ -374,20 +374,20 @@ void Bartender::doEdit() {
             return;
         }
         int fd = dbFile.handle();
         lseek( fd, foundAt, SEEK_SET);
-        
+
 //        dbFile.at( foundAt);
 #warning FIXME problems with editing drinks db
         ////////// FIXME write to user file
         QString newDrink="# "+newName+"\n";
         newDrink.append(newIng+"\n");
         qDebug("writing "+newDrink);
         dbFile.writeBlock( newDrink.latin1(), newDrink.length());
         clearList();
-        
+
         dbFile.flush();
-        
+
         initDrinkDb();
     }
 }
 
@@ -423,9 +423,9 @@ void Bartender::fileMenuActivated( int item) {
       case -6://        alcohol -6
           doSearchByDrink();
 
           break;
-          
+
     }
 }
 
 void Bartender::editMenuActivated(int item) {
@@ -434,10 +434,10 @@ void Bartender::editMenuActivated(int item) {
         edit -8
       */
     switch(item) {
       case -8:
-          doEdit() ;          
+          doEdit() ;
           break;
-          
+
     }
 }
 
diff --git a/noncore/apps/opie-bartender/opie-bartender.control b/noncore/apps/opie-bartender/opie-bartender.control
index acd3304..a8bf860 100644
--- a/noncore/apps/opie-bartender/opie-bartender.control
+++ b/noncore/apps/opie-bartender/opie-bartender.control
@@ -4,7 +4,7 @@ Package: opie-bartender
 Section: opie/applications
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qpe-base ($QPE_VERSION)
+Depends: task-opie-minimal
 Description: Bartender drink receipe database lookup, and
-blood alcohol estimator.
+ blood alcohol estimator.