- catch up with new filenames and include paths.

- remove Makefile.in (who added this??)

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
@@ -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
@@ -1,183 +1,183 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ***********************************************************************/
 
 // Qt
 
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
 
 // Qtopia
 
 #ifdef QWS
 #include <qpe/global.h>
 #endif
 
 // Standard
 
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 
 // Local
 
 #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." );
     
     connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
     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
         startTimer( 700 );
 
 }
 
 Wellenreiter::~Wellenreiter()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 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
   int channel;      Channel
   int wep;          1 = WEP enabled ; 0 = disabled
   char mac[64];     MAC address of Accesspoint
   char bssid[128];  BSSID of Accesspoint
 } wl_network_t;
 */
 
     // qDebug( "Sniffer sent: '%s'", (const char*) buffer );
     hexwindow->log( (const char*) &buffer );
 
     if ( result == NETFOUND )  /* new network found */
     {
         qDebug( "Sniffer said: new network found." );
         wl_network_t n;
         get_network_found( &n, (char*) &buffer );
         
         qDebug( "Sniffer said: net_type is %d.", n.net_type );
         qDebug( "Sniffer said: MAC is %s", (const char*) &n.mac );
 
         //n.bssid[n.ssid_len] = "\0";
 
         QString type;
         
         if ( n.net_type == 1 )
             type = "managed";
         else
             type = "adhoc";
 
         addNewItem( type, n.bssid, QString( (const char*) &n.mac ), n.wep, n.channel, 0 );
 
     }
 
     else
 
     {
         qDebug( "unknown sniffer command." );
     }
 
 }
 
 
 bool Wellenreiter::hasMessage()
 {
 
     // FIXME: do this in libwellenreiter, not here!!!
 
     fd_set rfds;
     FD_ZERO( &rfds );
     FD_SET( daemon_fd, &rfds );
     struct timeval tv;
     tv.tv_sec = 0;
     tv.tv_usec = 10;
     int result = select( daemon_fd+1, &rfds, NULL, NULL, &tv );
     
     if ( result == 0 )
     {
         return false;
     }
     else if ( result == -1 )
     {
         qDebug( "selected returned: %s", strerror( errno ) );
         return false;
     }
     else
         return true; //FD_ISSET( daemon_fd, &rfds ); gibbet 'eh nur einen Deskriptor
 }
 
 void Wellenreiter::timerEvent( QTimerEvent* e )
 {
     //qDebug( "checking for message..." );
     if ( hasMessage() )
     {
         //qDebug( "got message from daemon" );
         handleMessage();
     }
     else
     {
         //qDebug( "no message..." );
     }
 }
 
 void Wellenreiter::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
 {
     // FIXME: this code belongs in customized QListView, not into this class
     // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...)
 
         qDebug( "Wellenreiter::addNewItem( %s / %s / %s [%d]",
         (const char*) type,
         (const char*) essid,
         (const char*) macaddr,