3 files changed, 9 insertions, 9 deletions
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
@@ -5,6 +5,6 @@ CONFIG          = qt warn_on debug
 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
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
@@ -5,6 +5,6 @@ CONFIG          = qt warn_on debug
 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
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
@@ -44,7 +44,7 @@
 #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 )
@@ -61,5 +61,5 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
     //
 
-    daemon_fd = commsock( GUIADDR, GUIPORT );
+    daemon_fd = wl_setupsock( GUIADDR, GUIPORT );
     if ( daemon_fd == -1 )
     {
@@ -85,5 +85,5 @@ 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 );