summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp19
-rw-r--r--noncore/net/opietooth/manager/popuphelper.cpp11
-rw-r--r--noncore/net/opietooth/manager/stdpopups.cpp15
3 files changed, 28 insertions, 17 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index af64663..c81d4d1 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -20,2 +20,7 @@
#include "hciconfwrapper.h"
+#include "devicehandler.h"
+#include "btconnectionitem.h"
+
+#include <remotedevice.h>
+#include <services.h>
@@ -28,3 +33,2 @@
#include <qvariant.h>
-#include <qwhatsthis.h>
#include <qimage.h>
@@ -42,2 +46,3 @@
+#include <qpe/qpeapplication.h>
#include <qpe/resource.h>
@@ -45,7 +50,2 @@
-#include <remotedevice.h>
-#include <services.h>
-
-#include "devicehandler.h"
-#include "btconnectionitem.h"
@@ -74,2 +74,7 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
+
+ // let hold be rightButtonClicked()
+ QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold);
+ QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
+
//Load all icons needed
@@ -164,3 +169,2 @@ void BlueBase::writeToHciConfig() {
* Read the list of allready known devices
- *
*/
@@ -178,3 +182,2 @@ void BlueBase::readSavedDevices() {
* Write the list of allready known devices
- *
*/
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp
index 4ef1ed5..ba91e04 100644
--- a/noncore/net/opietooth/manager/popuphelper.cpp
+++ b/noncore/net/opietooth/manager/popuphelper.cpp
@@ -10,2 +10,3 @@ PopupHelper::PopupHelper() {
}
+
PopupHelper::~PopupHelper() {
@@ -13,2 +14,3 @@ PopupHelper::~PopupHelper() {
}
+
void PopupHelper::insert( int id, popupFactory fact ) {
@@ -16,2 +18,3 @@ void PopupHelper::insert( int id, popupFactory fact ) {
}
+
QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) {
@@ -22,3 +25,3 @@ QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item
popupFactory fact = it.data();
- return (*fact)(ser, item);
+ return (*fact)(ser, item);
}
@@ -26,5 +29,7 @@ QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item
}
+
void PopupHelper::init() {
- insert( 1, newRfcComPopup );
- insert(2, newObexPushPopup );
+ insert( 4355, newRfcComPopup );
+ insert( 4353, newRfcComPopup );
+ insert( 3, newObexPushPopup );
}
diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp
index f462368..2290b9a 100644
--- a/noncore/net/opietooth/manager/stdpopups.cpp
+++ b/noncore/net/opietooth/manager/stdpopups.cpp
@@ -5,9 +5,12 @@
+extern "C" {
+
+ QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) {
+ // return OpieTooth::RfcComPopup( servive, item );
+ return 0l;
+ }
+ QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) {
+ return 0l;
+ }
-QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) {
- // return OpieTooth::RfcComPopup( servive, item );
- return 0l;
-}
-QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) {
- return 0l;
}