1 files changed, 34 insertions, 6 deletions

diff --git a/core/obex/btobex.h b/core/obex/btobex.h
index 9c1ab70..7e91c06 100644
--- a/core/obex/btobex.h
+++ b/core/obex/btobex.h
@@ -1,22 +1,54 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=l.            Copyright (c)  2002 Maximilian Reiss <max.reiss@gmx.de>
+           .>+-=
+ _;:,     .>    :=|.         This library is free software; you can
+.> <,   >  .   <=           redistribute it and/or  modify it under
+:=1 )Y*s>-.--   :            the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :
+    .%+i>       _;_.
+    .i_,=:_.      -<s.       This library is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|     MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>:      PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .     .:        details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=            this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+/*
+ * The Bluetooth OBEX manipulating class declaration
+ */
 
 
 #ifndef OpieBtObex_H
 #define OpieBtObex_H
 
+#include "obexbase.h"
 #include <qobject.h>
 #include <services.h>
 #include <manager.h>
 #include <obexpush.h>
+#include "obexserver.h"
 
 namespace Opie {namespace Core {class OProcess;}}
 class QCopChannel;
 using namespace OpieTooth;
 namespace OpieObex {
   // Maybe this should be derved from Obex.
-  class BtObex : public QObject {
+  class BtObex : public ObexBase {
       Q_OBJECT
   public:
       /**
        * BtObex c'tor look
        */
       BtObex( QObject *parent, const char* name);
@@ -52,22 +84,18 @@ namespace OpieObex {
        * signal sent The file got beamed to the remote location
        */
       void sent(bool);
       void done(bool);
 
   private:
-      uint m_count;
-      QString m_file;
-      QString m_outp;
-      QString m_bdaddr;
       int m_port;
       ObexPush* m_send;
-      Opie::Core::OProcess *m_rec;
       bool m_receive : 1;
       OpieTooth::Manager* btManager;
       void shutDownReceive();
+      ObexServer* m_rec;
 
 private slots:
 
       // Push process slots
       void slotPushStatus(QCString&);
       void slotPushComplete(int);