author | mickeyl <mickeyl> | 2002-12-28 13:57:48 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2002-12-28 13:57:48 (UTC) |
commit | 0ab4ac99bead80d8af18988045748fd2b3dd3a15 (patch) (unidiff) | |
tree | b01ce259b2935dfc54ff4322a1167cbe4ec0b282 /noncore/net/wellenreiter/gui | |
parent | 224f9b43d51d1e0a261b807c2b8a37aa2a5289bb (diff) | |
download | opie-0ab4ac99bead80d8af18988045748fd2b3dd3a15.zip opie-0ab4ac99bead80d8af18988045748fd2b3dd3a15.tar.gz opie-0ab4ac99bead80d8af18988045748fd2b3dd3a15.tar.bz2 |
- catch up with new filenames and include paths.
- remove Makefile.in (who added this??)
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 | |||
@@ -4,8 +4,8 @@ CONFIG = qt warn_on debug | |||
4 | #CONFIG = qt warn_on release | 4 | #CONFIG = qt warn_on release |
5 | HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h | 5 | HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h |
6 | SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp | 6 | SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp |
7 | INCLUDEPATH += ../daemon | 7 | INCLUDEPATH += ../ |
8 | DEPENDPATH += ../daemon | 8 | DEPENDPATH += ../ |
9 | LIBS += -lwellenreiter | 9 | LIBS += -lwellenreiter |
10 | INTERFACES = configbase.ui | 10 | INTERFACES = configbase.ui |
11 | TARGET = wellenreiter | 11 | 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 | |||
4 | #CONFIG = qt warn_on release | 4 | #CONFIG = qt warn_on release |
5 | HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h | 5 | HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h |
6 | SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp | 6 | SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include ../daemon | 7 | INCLUDEPATH += $(OPIEDIR)/include ../ |
8 | DEPENDPATH += $(OPIEDIR)/include ../daemon | 8 | DEPENDPATH += $(OPIEDIR)/include ../ |
9 | LIBS += -lqpe -lopie -lwellenreiter | 9 | LIBS += -lqpe -lopie -lwellenreiter |
10 | INTERFACES = configbase.ui | 10 | INTERFACES = configbase.ui |
11 | TARGET = wellenreiter | 11 | 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 @@ | |||
43 | #include "hexwindow.h" | 43 | #include "hexwindow.h" |
44 | #include "configwindow.h" | 44 | #include "configwindow.h" |
45 | 45 | ||
46 | #include "../libwellenreiter/source/sock.hh" // <--- ugly path, FIX THIS! | 46 | #include <libwellenreiter/source/wl_sock.hh> |
47 | #include "../libwellenreiter/source/proto.hh" // <--- ugly path, FIX THIS! | 47 | #include <libwellenreiter/source/wl_proto.hh> |
48 | #include "../daemon/source/config.hh" // <--- ugly path, FIX THIS! | 48 | #include <daemon/source/config.hh> |
49 | 49 | ||
50 | Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | 50 | Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) |
51 | : WellenreiterBase( parent, name, fl ), daemonRunning( false ) | 51 | : WellenreiterBase( parent, name, fl ), daemonRunning( false ) |
@@ -60,7 +60,7 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | |||
60 | // setup socket for daemon communication and start poller | 60 | // setup socket for daemon communication and start poller |
61 | // | 61 | // |
62 | 62 | ||
63 | daemon_fd = commsock( GUIADDR, GUIPORT ); | 63 | daemon_fd = wl_setupsock( GUIADDR, GUIPORT ); |
64 | if ( daemon_fd == -1 ) | 64 | if ( daemon_fd == -1 ) |
65 | { | 65 | { |
66 | logwindow->log( "(E) Couldn't get file descriptor for commsocket." ); | 66 | logwindow->log( "(E) Couldn't get file descriptor for commsocket." ); |
@@ -84,7 +84,7 @@ void Wellenreiter::handleMessage() | |||
84 | 84 | ||
85 | char buffer[128]; | 85 | char buffer[128]; |
86 | 86 | ||
87 | int result = recvcomm( &daemon_fd, (char*) &buffer, sizeof(buffer) ); | 87 | int result = wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) ); |
88 | qDebug( "received %d from recvcomm", result ); | 88 | qDebug( "received %d from recvcomm", result ); |
89 | 89 | ||
90 | /* | 90 | /* |