1 files changed, 16 insertions, 0 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 2d9bbee..9068e3a 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -50,20 +50,34 @@ using namespace Opie;
 #include "wellenreiter.h"
 #include "scanlist.h"
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "configwindow.h"
 
+#include "manufacturers.h"
+
 #include <libwellenreiter/source/wl_sock.hh>
 #include <libwellenreiter/source/wl_proto.hh>
 #include <daemon/source/config.hh>
 
 Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
     : WellenreiterBase( parent, name, fl ), daemonRunning( false )
 {
 
+    //
+    // construct manufacturer database
+    //
+    
+    QString manufile;
+    #ifdef QWS
+    manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) qApp.qpeDir() );
+    #else
+    manufile.sprintf( "/home/mickey/work/opie/share/wellenreiter/manufacturers.dat" );
+    #endif
+    manufacturerdb = new ManufacturerDB( manufile );
+
     logwindow->log( "(i) Wellenreiter has been started." );
     
     //
     // detect operating system
     //
     
@@ -100,12 +114,14 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
         
 }
 
 Wellenreiter::~Wellenreiter()
 {
     // no need to delete child widgets, Qt does it all for us
+    
+    delete manufacturerdb;
 }
 
 void Wellenreiter::handleMessage()
 {
     // FIXME: receive message and handle it