Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/wellenreiter/gui/gui-x11.pro | 4 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 4 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 10 |
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 @@ -1,11 +1,11 @@ DESTDIR = . TEMPLATE = app 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 @@ -1,11 +1,11 @@ DESTDIR = $(OPIEDIR)/bin TEMPLATE = app 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 @@ -40,15 +40,15 @@ #include "wellenreiter.h" #include "scanlistitem.h" #include "logwindow.h" #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 ) { logwindow->log( "(i) Wellenreiter has been started." ); @@ -57,13 +57,13 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) netview->setColumnWidthMode( 1, QListView::Manual ); // // 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." ); qDebug( "D'oh! Could not get file descriptor for daemon-->gui communication socket." ); } else @@ -81,13 +81,13 @@ void Wellenreiter::handleMessage() // FIXME: receive message and handle it qDebug( "received message from daemon." ); 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 ); /* typedef struct { int net_type; 1 = Accesspoint ; 2 = Ad-Hoc int ssid_len; Length of SSID |