First implementation of plugins

THIS VERSION DOES NOT COMPILE

7 files changed, 26 insertions, 7 deletions

diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth.pro b/noncore/settings/networksettings2/bluetooth/bluetooth.pro
index 2e3b5bb..053a6cb 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth.pro
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth.pro
@@ -1,14 +1,14 @@
 TEMPLATE        = lib
-CONFIG          += qt warn_on release
+CONFIG          += qt warn_on release plugin
 DESTDIR         = $(OPIEDIR)/plugins/networksettings2
 HEADERS		= bluetoothBNEP_NN.h \
                   bluetoothBNEP_NNI.h \
                   bluetoothRFCOMM_NN.h \
                   bluetoothRFCOMM_NNI.h \
                   bluetoothBNEPedit.h \
                   bluetoothRFCOMMrun.h \
                   bluetoothRFCOMMedit.h
 SOURCES		= bluetoothBNEP_NN.cpp \
                   bluetoothBNEP_NNI.cpp \
                   bluetoothRFCOMM_NN.cpp \
                   bluetoothRFCOMM_NNI.cpp \
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NN.cpp
index ee3e92b..5e4d951 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NN.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NN.cpp
@@ -1,16 +1,22 @@
 #include "bluetoothBNEP_NN.h"
 #include "bluetoothBNEP_NNI.h"
 #include "bluetoothRFCOMM_NNI.h"
 
+#ifndef MYPLUGIN
+
+#include "netnodeinterface.h"
+
+#endif
+
 //
 //
 // BLUETOOTH PAN/NAP node
 //
 //
 
 static const char * BluetoothBNEPNeeds[] = 
     { 0
     };
 
 static const char * BluetoothBNEPProvides[] = 
     { "device",
@@ -60,19 +66,29 @@ QString BluetoothBNEPNetNode::genNic( long nr ) {
 void BluetoothBNEPNetNode::setSpecificAttribute( QString & A, QString & V ) {
       if( A == "interfacecount" ) {
         InstanceCount = V.toLong();
       }
 }
 
 void BluetoothBNEPNetNode::saveSpecificAttribute( QTextStream & TS) {
       TS << "interfacecount="
          << InstanceCount
          << endl;
 }
 
+#ifndef MYPLUGIN
+
 extern "C" {
 // create plugin registers both BT functions
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new BluetoothBNEPNetNode() );
       PNN.append( new BluetoothRFCOMMNetNode() );
 }
+
+#else
+
+typedef Opie::Core::MakeTypelist<BluetoothBNEPNetNode,  BluetoothRFCOMMNetNode>::Result BluetoothTypes;
+OPIE_NS2_PLUGIN( NetNodeInterface<BluetoothTypes> )
+
+#endif
+
 }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
index 9d4ae97..5c937a1 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
@@ -1,18 +1,22 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #include <resources.h>
 #include "bluetoothBNEPrun.h"
 
+using Opietooth2::OTGateway;
+using Opietooth2::OTPANConnection;
+using Opietooth2::PANConnectionVector;
+
 BluetoothBNEPRun::BluetoothBNEPRun( ANetNodeInstance * NNI, 
                   BluetoothBNEPData & D ) : 
                   RuntimeInfo( NNI ),
                   Data( D),
                   Pat( "bnep[0-6]" ) {
     OT = 0;
 }
 
 BluetoothBNEPRun::~BluetoothBNEPRun( void ) {
     if( OT ) {
       OTGateway::releaseOTGateway();
     }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
index a05a7a2..8551a2e 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
@@ -1,17 +1,16 @@
 #include <netnode.h>
 #include "bluetoothBNEPdata.h"
 
 #include <OTGateway.h>
-using namespace Opietooth2;
 
 class BluetoothBNEPRun  : public RuntimeInfo {
 
 public :
 
       BluetoothBNEPRun( ANetNodeInstance * NNI, 
                         BluetoothBNEPData & D );
       virtual ~BluetoothBNEPRun( void );
 
       // i am a device
       virtual RuntimeInfo * device( void ) 
         { return this; }
@@ -21,15 +20,15 @@ public :
 
       State_t detectState( void );
 
 protected :
 
       QString setMyState( NodeCollection * , Action_t, bool );
 
 private :
 
       bool hasFreePANConnection( bool Grab = 0 );
 
       BluetoothBNEPData &         Data;
-      OTGateway *                 OT;
+      Opietooth2::OTGateway *     OT;
       QRegExp Pat;
 };
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMedit.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMedit.h
index 9ad8f2a..fe474fc 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMedit.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMedit.h
@@ -1,27 +1,26 @@
 #include "bluetoothRFCOMMdata.h"
 #include "bluetoothRFCOMMGUI.h"
 
 #include <Opietooth.h>
-using namespace Opietooth2;
 
 class BluetoothRFCOMMEdit  : public BluetoothRFCOMMGUI {
 
 public :
 
     BluetoothRFCOMMEdit( QWidget * parent );
     virtual ~BluetoothRFCOMMEdit( void );
 
     QString acceptable( void );
     void showData( BluetoothRFCOMMData & Data );
     bool commit( BluetoothRFCOMMData & Data );
 
     bool Modified;
-    OTGateway * OT;
+    Opietooth2::OTGateway * OT;
 
 public slots :
 
     void SLOT_AddServer( void );
     void SLOT_RemoveServer( void );
     void SLOT_FindDevice( void );
 
 };
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
index 1e91ed1..ef6878a 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
@@ -1,19 +1,21 @@
 #include <qapplication.h>
 #include <resources.h>
 #include <OTDevice.h>
 #include <OTGateway.h>
 #include "bluetoothRFCOMMrun.h"
 
-using namespace Opietooth2;
+using Opietooth2::OTGateway;
+using Opietooth2::OTDevice;
+using Opietooth2::OTDeviceAddress;
 
 BluetoothRFCOMMRun::~BluetoothRFCOMMRun( void ) {
       if( OT ) {
         OTGateway::releaseOTGateway();
       }
 }
 
 State_t BluetoothRFCOMMRun::detectState( void ) {
 
       if( ! OT ) {
         OT = OTGateway::getOTGateway();
       }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
index 24e3dae..5a31a94 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
@@ -1,17 +1,16 @@
 #include <netnode.h>
 #include "bluetoothRFCOMMdata.h"
 
 #include <OTGateway.h>
-using namespace Opietooth2;
 
 class BluetoothRFCOMMRun  : public RuntimeInfo {
 
 public :
 
       BluetoothRFCOMMRun( ANetNodeInstance * NNI, 
                           BluetoothRFCOMMData & D ) : RuntimeInfo( NNI )
         {  DeviceNr = -1; Data = &D; OT = 0; }
       virtual ~BluetoothRFCOMMRun( void );
 
       virtual RuntimeInfo * line( void ) 
         { return this; }