4 files changed, 9 insertions, 110 deletions

diff --git a/noncore/net/wellenreiter/contrib/orinoco_hopper/Makefile.in b/noncore/net/wellenreiter/contrib/orinoco_hopper/Makefile.in
deleted file mode 100644
index c542a59..0000000
--- a/noncore/net/wellenreiter/contrib/orinoco_hopper/Makefile.in
+++ b/dev/null
@@ -1,101 +0,0 @@
-#############################################################################
-
-####### Compiler, tools and options
-
-        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS)
-        CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =
-        LFLAGS  =$(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
-        LIBS    =$(SUBLIBS) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
-        MOC     =$(SYSCONF_MOC)
-        UIC     =$(SYSCONF_UIC)
-
-####### Target
-
-DESTDIR = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-        TARGET= orinoco_hopper
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-        HEADERS =
-        SOURCES =orinoco_hopper.c
-        OBJECTS =orinoco_hopper.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-        SRCMOC  =
-        OBJMOC  =
-
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(DESTDIR)$(TARGET)
-
-$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
-        $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake:
-        tmake orinoco_hopper.pro
-
-clean:
-        -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-        -rm -f *~ core
-        -rm -f allmoc.cpp
-
-####### Extension Modules
-
-listpromodules:
-        @echo 
-
-listallmodules:
-        @echo 
-
-listaddonpromodules:
-        @echo 
-
-listaddonentmodules:
-        @echo 
-
-
-REQUIRES=
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-
-####### Compile
-
-orinoco_hopper.o: orinoco_hopper.c
-
-
diff --git a/noncore/net/wellenreiter/gui/gui-x11.pro b/noncore/net/wellenreiter/gui/gui-x11.pro
index 0cddd22..6b4a7bf 100644
--- a/noncore/net/wellenreiter/gui/gui-x11.pro
+++ b/noncore/net/wellenreiter/gui/gui-x11.pro
@@ -4,8 +4,8 @@ CONFIG          = qt warn_on debug
 #CONFIG         = qt warn_on release
 HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h
 SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp
-INCLUDEPATH     += ../daemon
-DEPENDPATH      += ../daemon
+INCLUDEPATH     += ../
+DEPENDPATH      += ../
 LIBS            += -lwellenreiter
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index b271ee3..b6e884d 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -4,8 +4,8 @@ CONFIG          = qt warn_on debug
 #CONFIG         = qt warn_on release
 HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h
 SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp
-INCLUDEPATH     += $(OPIEDIR)/include ../daemon
-DEPENDPATH      += $(OPIEDIR)/include ../daemon
+INCLUDEPATH     += $(OPIEDIR)/include ../
+DEPENDPATH      += $(OPIEDIR)/include ../
 LIBS            += -lqpe -lopie -lwellenreiter
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 0e95b28..0fd929f 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -43,9 +43,9 @@
 #include "hexwindow.h"
 #include "configwindow.h"
 
-#include "../libwellenreiter/source/sock.hh"    // <--- ugly path, FIX THIS!
-#include "../libwellenreiter/source/proto.hh"    // <--- ugly path, FIX THIS!
-#include "../daemon/source/config.hh"           // <--- ugly path, FIX THIS!
+#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 )
@@ -60,7 +60,7 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
     // setup socket for daemon communication and start poller
     //
 
-    daemon_fd = commsock( GUIADDR, GUIPORT );
+    daemon_fd = wl_setupsock( GUIADDR, GUIPORT );
     if ( daemon_fd == -1 )
     {
         logwindow->log( "(E) Couldn't get file descriptor for commsocket." );
@@ -84,7 +84,7 @@ void Wellenreiter::handleMessage()
 
     char buffer[128];
 
-    int result = recvcomm( &daemon_fd, (char*) &buffer, sizeof(buffer) );
+    int result = wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) );
     qDebug( "received %d from recvcomm", result );
 
 /*