new code from Paul Eggleton

1 files changed, 3 insertions, 2 deletions

diff --git a/noncore/apps/opie-bartender/bartender.h b/noncore/apps/opie-bartender/bartender.h
index 27362df..9970ef1 100644
--- a/noncore/apps/opie-bartender/bartender.h
+++ b/noncore/apps/opie-bartender/bartender.h
@@ -8,12 +8,13 @@
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 #ifndef BARTENDER_H
 #define BARTENDER_H
 #include "newdrinks.h"
+#include "drinkdata.h"
 
 #include <qvariant.h>
 #include <qwidget.h>
 #include <qmainwindow.h>
 #include <qfile.h>
 
@@ -33,13 +34,13 @@ public:
     ~Bartender();
     
     static QString appName() { return QString::fromLatin1("bartender"); }
 
     QToolBar* ToolBar1;
     QListView* DrinkView;
-    QFile dbFile;
+    DrinkData drinkDB;
 public slots:
     void doEdit();
     
 protected:
 
 protected slots:
@@ -48,13 +49,13 @@ protected slots:
     void cleanUp();
     void fileNew();
     void showDrink( QListViewItem *);
     void showDrink(int, QListViewItem *, const QPoint&, int);
     void initDrinkDb();
     void doSearchByName();
-    void doSearchByDrink();
+    void doSearchByIngredient();
     void showSearchResult(QStringList &);
     void doBac();
     void openCurrentDrink();
     void askSearch();
 private:
     void clearList();