From 76d7938ec6b89aa11f54f9fbdad40bb358b4886a Mon Sep 17 00:00:00 2001 From: harlekin Date: Sat, 20 Jul 2002 23:54:44 +0000 Subject: update --- (limited to 'noncore/net') 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 @@ -18,6 +18,11 @@ #include "bluebase.h" #include "scandialog.h" #include "hciconfwrapper.h" +#include "devicehandler.h" +#include "btconnectionitem.h" + +#include +#include #include @@ -26,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -40,14 +44,10 @@ #include #include +#include #include #include -#include -#include - -#include "devicehandler.h" -#include "btconnectionitem.h" using namespace OpieTooth; @@ -72,6 +72,11 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) connect( m_localDevice, SIGNAL( connections( ConnectionState::ValueList ) ), this, SLOT( addConnectedDevices( ConnectionState::ValueList ) ) ); + + // let hold be rightButtonClicked() + QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold); + QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold); + //Load all icons needed m_offPix = Resource::loadPixmap( "editdelete" ); m_onPix = Resource::loadPixmap( "installed" ); @@ -162,7 +167,6 @@ void BlueBase::writeToHciConfig() { /** * Read the list of allready known devices - * */ void BlueBase::readSavedDevices() { @@ -176,7 +180,6 @@ void BlueBase::readSavedDevices() { /** * Write the list of allready known devices - * */ void BlueBase::writeSavedDevices() { QListViewItemIterator it( ListView2 ); 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 @@ -8,23 +8,28 @@ using namespace OpieTooth; PopupHelper::PopupHelper() { init(); } + PopupHelper::~PopupHelper() { } + void PopupHelper::insert( int id, popupFactory fact ) { m_map.insert(id, fact ); } + QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) { //qWarning("find"); FactoryMap::Iterator it = m_map.find(id ); if ( it != m_map.end() ) { //qWarning("found"); popupFactory fact = it.data(); - return (*fact)(ser, item); + return (*fact)(ser, item); } return 0l; } + 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 @@ -3,11 +3,14 @@ #include "stdpopups.h" +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; } -- cgit v0.9.0.2