connection to popups on services

11 files changed, 71 insertions, 55 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index c81d4d1..ec05a95 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -286,4 +286,6 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
  */
 void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) {
+    if (!item )
+        return;
 
     QPopupMenu *menu = new QPopupMenu();
@@ -343,7 +345,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         if ( it != list.end() ) {
 	    qWarning("Searching id %d %s", it.key(), it.data().latin1() );
-            popup = m_popHelper.find( it.key(),
+            popup = m_popHelper.find( it.key() /*1*/,
                                       service->services(),
-                                      service->parent() );
+                                      (BTDeviceItem*)service->parent() );
 	}else {
 	    qWarning("Empty");
@@ -360,15 +362,16 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
         ret = popup->exec( point );
-
+        qWarning("returned from exec() ");
         if ( ret == -1 )
-            delete popup;
+            ;
         else if ( ret == test1 )
-            delete popup;
+            ;
         else if ( ret == con )
-            delete popup;
+            ;
         else if ( ret == del ) {
             // take item first? -zecke
             delete item;
         }
+        delete popup;
     }
     delete menu;
diff --git a/noncore/net/opietooth/manager/btdeviceitem.h b/noncore/net/opietooth/manager/btdeviceitem.h
index ae51483..e4c6ce7 100644
--- a/noncore/net/opietooth/manager/btdeviceitem.h
+++ b/noncore/net/opietooth/manager/btdeviceitem.h
@@ -1,5 +1,5 @@
 
-#ifndef OPIE_TOOTH_BT_DEVIVE_ITEM
-#define OPIE_TOOTH_BT_DEVIVE_ITEM
+#ifndef OPIE_TOOTH_BT_DEVICE_ITEM
+#define OPIE_TOOTH_BT_DEVICE_ITEM
 
 
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 762b028..121c069 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -8,5 +8,5 @@ HEADERS         = btconnectionitem.h btdeviceitem.h \
 		  hciconfwrapper.h bticonloader.h \
 		  pppdialog.h obexdialog.h \
-		  devicehandler.h
+		  devicehandler.h rfcpopup.h
 		  
 SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \ 
@@ -16,5 +16,6 @@ SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \
 		  btlistitem.cpp hciconfwrapper.cpp \ 
 		  bticonloader.cpp pppdialog.cpp \
-		  obexdialog.cpp devicehandler.cpp
+		  obexdialog.cpp devicehandler.cpp \
+		  rfcpopup.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp
index cb142eb..15973d4 100644
--- a/noncore/net/opietooth/manager/obexdialog.cpp
+++ b/noncore/net/opietooth/manager/obexdialog.cpp
@@ -13,4 +13,6 @@
 #include <opie/ofiledialog.h>
 
+using namespace OpieTooth;
+
 ObexDialog::ObexDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString& device )
     : QDialog( parent, name, modal, fl ) {
diff --git a/noncore/net/opietooth/manager/obexdialog.h b/noncore/net/opietooth/manager/obexdialog.h
index 1a73b57..28d2be2 100644
--- a/noncore/net/opietooth/manager/obexdialog.h
+++ b/noncore/net/opietooth/manager/obexdialog.h
@@ -11,26 +11,29 @@ class QMultiLineEdit;
 class QLineEdit;
 
-class ObexDialog : public QDialog {
 
-    Q_OBJECT
+namespace OpieTooth {
 
-public:
-    ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0,  const QString& device = 0);
-    ~ObexDialog();
+    class ObexDialog : public QDialog {
 
+        Q_OBJECT
+
+    public:
+        ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0,  const QString& device = 0);
+        ~ObexDialog();
 
-private slots:
-    void browse();
-    void sendData();
-
-protected:
-    QVBoxLayout* layout;
-    QLineEdit* cmdLine;
-    QLineEdit* chNameLine;
-    QPushButton* sendButton;
-private:
-    // Device that is used
-    QString m_device;
-};
 
+private slots:
+        void browse();
+        void sendData();
+
+    protected:
+        QVBoxLayout* layout;
+        QLineEdit* cmdLine;
+        QLineEdit* chNameLine;
+        QPushButton* sendButton;
+    private:
+        // Device that is used
+        QString m_device;
+    };
+}
 #endif
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp
index ba91e04..4a4daf2 100644
--- a/noncore/net/opietooth/manager/popuphelper.cpp
+++ b/noncore/net/opietooth/manager/popuphelper.cpp
@@ -18,5 +18,5 @@ void PopupHelper::insert( int id, popupFactory fact ) {
 }
 
-QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) {
+QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) {
     //qWarning("find");
     FactoryMap::Iterator it = m_map.find(id );
diff --git a/noncore/net/opietooth/manager/popuphelper.h b/noncore/net/opietooth/manager/popuphelper.h
index 7541ac5..6d4d413 100644
--- a/noncore/net/opietooth/manager/popuphelper.h
+++ b/noncore/net/opietooth/manager/popuphelper.h
@@ -10,5 +10,5 @@
 
 namespace OpieTooth {
-    typedef QPopupMenu* (*popupFactory)(const Services&, QListViewItem*);
+    typedef QPopupMenu* (*popupFactory)(const Services&, BTDeviceItem*);
     typedef QMap<int,  popupFactory> FactoryMap;
     class PopupHelper {
@@ -17,5 +17,5 @@ namespace OpieTooth {
         ~PopupHelper();
         void insert( int id, popupFactory fact );
-        QPopupMenu* find( int id, const Services&, QListViewItem* );
+        QPopupMenu* find( int id, const Services&, BTDeviceItem* );
     private:
         void init();
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index 4d926a5..1f347ce 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -8,4 +8,6 @@
 #include <opie/oprocess.h>
 
+using namespace OpieTooth;
+
 PPPDialog::PPPDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString& device )
     : QDialog( parent, name, modal, fl ) {
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h
index b80b73d..6fdc90a 100644
--- a/noncore/net/opietooth/manager/pppdialog.h
+++ b/noncore/net/opietooth/manager/pppdialog.h
@@ -11,24 +11,27 @@ class QMultiLineEdit;
 class QLineEdit;
 
-class PPPDialog : public QDialog {
 
-    Q_OBJECT
+namespace OpieTooth {
 
-public:
-    PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0);
-    ~PPPDialog();
+    class PPPDialog : public QDialog {
 
+        Q_OBJECT
 
-private slots:
-    void connectToDevice();
-    void fillOutPut( OProcess* pppDial, char* cha, int len );
-protected:
-    QVBoxLayout* layout;
-    QLineEdit* cmdLine;
-    QPushButton* connectButton;
-    QMultiLineEdit* outPut;
+    public:
+        PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0);
+        ~PPPDialog();
 
-private:
-    QString m_device;
-};
+    private slots:
+        void connectToDevice();
+        void fillOutPut( OProcess* pppDial, char* cha, int len );
+    protected:
+        QVBoxLayout* layout;
+        QLineEdit* cmdLine;
+        QPushButton* connectButton;
+        QMultiLineEdit* outPut;
+
+    private:
+        QString m_device;
+    };
+}
 #endif
diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp
index 2290b9a..750365e 100644
--- a/noncore/net/opietooth/manager/stdpopups.cpp
+++ b/noncore/net/opietooth/manager/stdpopups.cpp
@@ -1,4 +1,4 @@
 
-//#include "rfccompopup.h"
+#include "rfcpopup.h"
 
 #include "stdpopups.h"
@@ -6,11 +6,10 @@
 extern "C" {
 
-    QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) {
-        //  return OpieTooth::RfcComPopup( servive,  item );
-        return 0l;
+    QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive,  OpieTooth::BTDeviceItem* item ) {
+        return new OpieTooth::RfcCommPopup(/* servive,  item*/ ); // fix spellin RfComm vs. RfcComm and paramaters
+        //return 0l;
     }
-    QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) {
+    QPopupMenu* newObexPushPopup( const OpieTooth::Services&,  OpieTooth::BTDeviceItem* ) {
         return 0l;
     }
-
 }
diff --git a/noncore/net/opietooth/manager/stdpopups.h b/noncore/net/opietooth/manager/stdpopups.h
index 185d68d..b57d4de 100644
--- a/noncore/net/opietooth/manager/stdpopups.h
+++ b/noncore/net/opietooth/manager/stdpopups.h
@@ -8,7 +8,10 @@
 #include <services.h>
 
+#include "btdeviceitem.h"
+
 extern "C" {
-QPopupMenu* newRfcComPopup( const OpieTooth::Services&, QListViewItem* );
-QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* );
+
+    QPopupMenu* newRfcComPopup( const OpieTooth::Services&,  OpieTooth::BTDeviceItem* );
+    QPopupMenu* newObexPushPopup( const OpieTooth::Services&,  OpieTooth::BTDeviceItem* );
 }