summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-20 18:37:19 (UTC)
committer harlekin <harlekin>2002-06-20 18:37:19 (UTC)
commite3b199e4b3ad71cb8d046e33e792402250a8faec (patch) (unidiff)
tree22bf9a5d7295819e09bd89adee8fff90a4fdfbdc
parent6b3a0f610d311ee6b1b44a3f20350b9ce63ba368 (diff)
downloadopie-e3b199e4b3ad71cb8d046e33e792402250a8faec.zip
opie-e3b199e4b3ad71cb8d046e33e792402250a8faec.tar.gz
opie-e3b199e4b3ad71cb8d046e33e792402250a8faec.tar.bz2
available instead of connected - better naming
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc8
-rw-r--r--noncore/net/opietooth/lib/manager.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index c454588..fcd21f6 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -34,21 +34,21 @@ void Manager::setDevice( const QString& dev ){
34} 34}
35void Manager::setDevice( Device* dev ){ 35void Manager::setDevice( Device* dev ){
36 36
37} 37}
38void Manager::isConnected( const QString& device ){ 38void Manager::isAvailable( const QString& device ){
39 OProcess* l2ping = new OProcess(); 39 OProcess* l2ping = new OProcess();
40 l2ping->setName( device.latin1() ); 40 l2ping->setName( device.latin1() );
41 *l2ping << "l2ping" << "-c1" << device; 41 *l2ping << "l2ping" << "-c1" << device;
42 connect(l2ping, SIGNAL(processExited(OProcess* ) ), 42 connect(l2ping, SIGNAL(processExited(OProcess* ) ),
43 this, SLOT(slotProcessExited(OProcess*) ) ); 43 this, SLOT(slotProcessExited(OProcess*) ) );
44 if (!l2ping->start() ) { 44 if (!l2ping->start() ) {
45 emit connected( device, false ); 45 emit available( device, false );
46 delete l2ping; 46 delete l2ping;
47 } 47 }
48 48
49} 49}
50void Manager::isConnected( Device* dev ){ 50void Manager::isAvailable( Device* dev ){
51 51
52 52
53} 53}
54void Manager::searchDevices( const QString& device ){ 54void Manager::searchDevices( const QString& device ){
@@ -126,9 +126,9 @@ void Manager::slotProcessExited(OProcess* proc ) {
126 if (proc->normalExit() && proc->exitStatus() == 0 ) 126 if (proc->normalExit() && proc->exitStatus() == 0 )
127 conn = true; 127 conn = true;
128 128
129 QString name = QString::fromLatin1(proc->name() ); 129 QString name = QString::fromLatin1(proc->name() );
130 emit connected( name, conn ); 130 emit available( name, conn );
131 delete proc; 131 delete proc;
132} 132}
133void Manager::slotSDPOut(OProcess* proc, char* ch, int len) 133void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
134{ 134{
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h
index aba70f7..415ec72 100644
--- a/noncore/net/opietooth/lib/manager.h
+++ b/noncore/net/opietooth/lib/manager.h
@@ -52,13 +52,13 @@ Q_OBJECT
52 * device and see if it's up 52 * device and see if it's up
53 * for Remote devices it will ping and see. 53 * for Remote devices it will ping and see.
54 * @param either mac or hciX 54 * @param either mac or hciX
55 */ 55 */
56 void isConnected(const QString& device= QString::null ); 56 void isAvailable(const QString& device= QString::null );
57 /** 57 /**
58 * same as above 58 * same as above
59 */ 59 */
60 void isConnected(Device *dev ); 60 void isAvailable(Device *dev );
61 61
62 /** this searchs for devices reachable from the 62 /** this searchs for devices reachable from the
63 * currently managed device 63 * currently managed device
64 * or from device if @param device is not empty 64 * or from device if @param device is not empty
@@ -104,9 +104,9 @@ Q_OBJECT
104 104
105 signals: 105 signals:
106 // device either mac or dev name 106 // device either mac or dev name
107 // the first device is the device which you access 107 // the first device is the device which you access
108 void connected( const QString& device, bool connected ); 108 void available( const QString& device, bool connected );
109 void addedService( const QString& service, bool added ); 109 void addedService( const QString& service, bool added );
110 void removedService( const QString& service, bool removed ); 110 void removedService( const QString& service, bool removed );
111 void foundServices( const QString& device, Services::ValueList ); 111 void foundServices( const QString& device, Services::ValueList );
112 void foundDevices( const QString& device, RemoteDevice::ValueList ); 112 void foundDevices( const QString& device, RemoteDevice::ValueList );