summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-07-09 16:05:57 (UTC)
committer mickeyl <mickeyl>2005-07-09 16:05:57 (UTC)
commit9b070d84b36c5dc764b6b4a8a3ca511d2e3d441f (patch) (side-by-side diff)
tree9d42efed66329ad925f3079e2739d9a3a9ced880
parent5dbfa604bcc5dd32401d862372af806bfe674e89 (diff)
downloadopie-9b070d84b36c5dc764b6b4a8a3ca511d2e3d441f.zip
opie-9b070d84b36c5dc764b6b4a8a3ca511d2e3d441f.tar.gz
opie-9b070d84b36c5dc764b6b4a8a3ca511d2e3d441f.tar.bz2
autopopulate services list, use odebug where appropriate instead of owarn
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc58
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp44
-rw-r--r--noncore/net/opietooth/manager/bluebase.h1
3 files changed, 50 insertions, 53 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 53122c1..83100f1 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -15,3 +15,3 @@ Manager::Manager( const QString& dev )
{
- owarn << "created" << oendl;
+ odebug << "Manager: created" << oendl;
m_device = dev;
@@ -60,3 +60,3 @@ void Manager::isAvailable( Device* /*dev*/ ){
void Manager::searchDevices( const QString& device ){
- owarn << "search devices" << oendl;
+ odebug << "Manager: search devices" << oendl;
OProcess* hcitool = new OProcess();
@@ -69,3 +69,3 @@ void Manager::searchDevices( const QString& device ){
if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
- owarn << "could not start" << oendl;
+ odebug << "Manager: could not start" << oendl;
RemoteDevice::ValueList list;
@@ -110,3 +110,3 @@ void Manager::searchServices( const QString& remDevice ){
m_sdp->setName( remDevice.latin1() );
- owarn << "search Services for " << remDevice.latin1() << oendl;
+ odebug << "Manager: search Services for " << remDevice.latin1() << oendl;
connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
@@ -116,3 +116,3 @@ void Manager::searchServices( const QString& remDevice ){
if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
- owarn << "could not start sdptool" << oendl;
+ odebug << "Manager: could not start sdptool" << oendl;
delete m_sdp;
@@ -143,3 +143,3 @@ void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
QCString str(ch, len+1 );
- owarn << "SDP:" << str.data() << oendl;
+ odebug << "Manager: SDP:" << str.data() << oendl;
QMap<QString, QString>::Iterator it;
@@ -156,3 +156,3 @@ void Manager::slotSDPExited( OProcess* proc)
{
- owarn << "proc name " << proc->name() << oendl;
+ odebug << "Manager: proc name " << proc->name() << oendl;
Services::ValueList list;
@@ -161,3 +161,3 @@ void Manager::slotSDPExited( OProcess* proc)
if ( it != m_out.end() ) {
- owarn << "found process" << oendl;
+ odebug << "Manager: found process" << oendl;
list = parseSDPOutput( it.data() );
@@ -171,3 +171,3 @@ Services::ValueList Manager::parseSDPOutput( const QString& out ) {
Services::ValueList list;
- owarn << "parsing output" << oendl;
+ odebug << "Manager: parsing output" << oendl;
Parser parser( out );
@@ -178,9 +178,9 @@ Services::ValueList Manager::parseSDPOutput( const QString& out ) {
void Manager::slotHCIExited(OProcess* proc ) {
- owarn << "process exited" << oendl;
+ odebug << "Manager: process exited" << oendl;
RemoteDevice::ValueList list;
if (proc->normalExit() ) {
- owarn << "normalExit " << proc->name() << oendl;
+ odebug << "Manager: normalExit " << proc->name() << oendl;
QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
if (it != m_devices.end() ) {
- owarn << "!= end ;)" << oendl;
+ odebug << "Manager: != end ;)" << oendl;
list = parseHCIOutput( it.data() );
@@ -194,9 +194,9 @@ void Manager::slotHCIOut(OProcess* proc, char* ch, int len) {
QCString str( ch, len+1 );
- owarn << "hci: " << str.data() << oendl;
+ odebug << "Manager: hci: " << str.data() << oendl;
QMap<QString, QString>::Iterator it;
it = m_devices.find( proc->name() );
- owarn << "proc->name " << proc->name() << oendl;
+ odebug << "Manager: proc->name " << proc->name() << oendl;
QString string;
if (it != m_devices.end() ) {
- owarn << "slotHCIOut " << oendl;
+ odebug << "Manager: slotHCIOut " << oendl;
string = it.data();
@@ -208,3 +208,3 @@ void Manager::slotHCIOut(OProcess* proc, char* ch, int len) {
RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
- owarn << "parseHCI " << output.latin1() << oendl;
+ odebug << "Manager: parseHCI " << output.latin1() << oendl;
RemoteDevice::ValueList list;
@@ -215,3 +215,3 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
str = (*it).stripWhiteSpace();
- owarn << "OpieTooth " << str.latin1() << oendl;
+ odebug << "Manager: OpieTooth " << str.latin1() << oendl;
int pos = str.findRev(':' );
@@ -220,4 +220,4 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
str.remove( 0, 17 );
- owarn << "mac " << mac.latin1() << oendl;
- owarn << "rest: " << str.latin1() << oendl;
+ odebug << "Manager: mac " << mac.latin1() << oendl;
+ odebug << "Manager: rest: " << str.latin1() << oendl;
RemoteDevice rem( mac , str.stripWhiteSpace() );
@@ -246,3 +246,3 @@ void Manager::connectTo( const QString& mac) {
void Manager::searchConnections() {
- owarn << "searching connections?" << oendl;
+ odebug << "Manager: searchConnections()" << oendl;
OProcess* proc = new OProcess();
@@ -284,11 +284,11 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
QStringList value = QStringList::split(' ', row );
- owarn << "0: %s" << value[0].latin1() << oendl;
- owarn << "1: %s" << value[1].latin1() << oendl;
- owarn << "2: %s" << value[2].latin1() << oendl;
- owarn << "3: %s" << value[3].latin1() << oendl;
- owarn << "4: %s" << value[4].latin1() << oendl;
- owarn << "5: %s" << value[5].latin1() << oendl;
- owarn << "6: %s" << value[6].latin1() << oendl;
- owarn << "7: %s" << value[7].latin1() << oendl;
- owarn << "8: %s" << value[8].latin1() << oendl;
+ odebug << "Manager: 0: " << value[0].latin1() << oendl;
+ odebug << "Manager: 1: " << value[1].latin1() << oendl;
+ odebug << "Manager: 2: " << value[2].latin1() << oendl;
+ odebug << "Manager: 3: " << value[3].latin1() << oendl;
+ odebug << "Manager: 4: " << value[4].latin1() << oendl;
+ odebug << "Manager: 5: " << value[5].latin1() << oendl;
+ odebug << "Manager: 6: " << value[6].latin1() << oendl;
+ odebug << "Manager: 7: " << value[7].latin1() << oendl;
+ odebug << "Manager: 8: " << value[8].latin1() << oendl;
ConnectionState con;
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index af1cd23..0649514 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -61,3 +61,2 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
{
-
m_localDevice = new Manager( "hci0" );
@@ -68,5 +67,3 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) );
- // not good since lib is async
- // connect( devicesView, SIGNAL( expanded(QListViewItem*) ),
- // this, SLOT( addServicesToDevice(QListViewItem*) ) );
+
connect( devicesView, SIGNAL( clicked(QListViewItem*)),
@@ -84,3 +81,2 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
-
// let hold be rightButtonClicked()
@@ -108,10 +104,8 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
devicesView->setRootIsDecorated(true);
-
-
+ m_iconLoader = new BTIconLoader();
writeToHciConfig();
- // search conncetions
addConnectedDevices();
- addSignalStrength();
- m_iconLoader = new BTIconLoader();
readSavedDevices();
+ addServicesToDevices();
+ QTimer::singleShot( 3000, this, SLOT( addServicesToDevices() ) );
}
@@ -173,3 +167,3 @@ void BlueBase::writeToHciConfig()
/**
- * Read the list of allready known devices
+ * Read the list of already known devices
*/
@@ -187,3 +181,3 @@ void BlueBase::readSavedDevices()
/**
- * Write the list of allready known devices
+ * Write the list of already known devices
*/
@@ -297,5 +291,2 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
deviceActive( (*it) );
-
- // ggf auch hier?
- addServicesToDevice( deviceItem );
}
@@ -400,2 +391,13 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
+void BlueBase::addServicesToDevices()
+{
+ odebug << "BlueBase::addServicesToDevices()" << oendl;
+ BTDeviceItem* item = (BTDeviceItem*) devicesView->firstChild();
+ while ( item )
+ {
+ addServicesToDevice( item );
+ item = (BTDeviceItem*) static_cast<QListViewItem*>( item )->nextSibling();
+ }
+}
+
/**
@@ -406,3 +408,3 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item )
{
- odebug << "addServicesToDevice" << oendl;
+ odebug << "BlueBase::addServicesToDevice" << oendl;
// row of mac adress text(3)
@@ -416,4 +418,2 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item )
/**
- * Overloaded. This one it the one that is
- ted to the foundServices signal
* @param device the mac address of the remote device
@@ -423,3 +423,3 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
{
- odebug << "fill services list" << oendl;
+ odebug << "BlueBase::fill services list" << oendl;
@@ -478,6 +478,2 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
-
-
-
-
void BlueBase::addSignalStrength()
@@ -514,2 +510,3 @@ void BlueBase::addConnectedDevices()
m_localDevice->searchConnections();
+ QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) );
}
@@ -617,3 +614,2 @@ void BlueBase::deviceActive( const QString& device, bool connected )
-
if ( connected )
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index a8ab3db..48883d2 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -84,2 +84,3 @@ namespace OpieTooth {
void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
+ void addServicesToDevices();
void addServicesToDevice( BTDeviceItem *item );