From 89dce758480cc90502ad14b6c4cf80774e6c1845 Mon Sep 17 00:00:00 2001 From: zecke Date: Fri, 12 Jul 2002 17:14:58 +0000 Subject: - Connection -> ConnectionState - Factory adjustments - Factory function - Refactoring the QListViewItem derived class BTListItem | - BTDeviceItem for RemoteDevices | - BTServiceItem for Services | - BTConnectionItem for ConnectionState - misc bug fixes --- (limited to 'noncore/net/opietooth/lib') diff --git a/noncore/net/opietooth/lib/connection.cpp b/noncore/net/opietooth/lib/connection.cpp index 1f9baaf..ef7d925 100644 --- a/noncore/net/opietooth/lib/connection.cpp +++ b/noncore/net/opietooth/lib/connection.cpp @@ -3,19 +3,19 @@ using namespace OpieTooth; -Connection::Connection() { +ConnectionState::ConnectionState() { m_direction = Incoming; m_handle = -1; m_state = -1; m_linkMode = -1; }; -Connection::Connection( const Connection& con1 ) { +ConnectionState::ConnectionState( const ConnectionState& con1 ) { (*this) = con1; } -Connection::Connection( bool in, +ConnectionState::ConnectionState( bool in, const QString& conType, const QString& mac, int handle, @@ -30,55 +30,55 @@ Connection::Connection( bool in, } -void Connection::setDirection( bool incoming ) { +void ConnectionState::setDirection( bool incoming ) { m_direction = incoming; } -bool Connection::direction() const { +bool ConnectionState::direction() const { return m_direction; } -void Connection::setConnectionMode( const QString& conType ) { +void ConnectionState::setConnectionMode( const QString& conType ) { m_contype = conType; } -QString Connection::connectionMode() const { +QString ConnectionState::connectionMode() const { return m_contype; } -void Connection::setMac( const QString& mac ) { +void ConnectionState::setMac( const QString& mac ) { m_mac = mac; } -QString Connection::mac() const{ +QString ConnectionState::mac() const{ return m_mac; } -void Connection::setHandle( int handle ) { +void ConnectionState::setHandle( int handle ) { m_handle = handle; } -int Connection::handle() const{ +int ConnectionState::handle() const{ return m_handle; } -void Connection::setState( int state ) { +void ConnectionState::setState( int state ) { m_state = state; } -int Connection::state()const { +int ConnectionState::state()const { return m_state; } -void Connection::setLinkMode( int linkMode ) { +void ConnectionState::setLinkMode( int linkMode ) { m_linkMode = linkMode; } -int Connection::linkMode()const{ +int ConnectionState::linkMode()const{ return m_linkMode; } -Connection &Connection::operator=( const Connection& con1 ) { +ConnectionState &ConnectionState::operator=( const ConnectionState& con1 ) { m_direction = con1.m_direction; m_contype = con1.m_contype; m_mac = con1.m_mac; diff --git a/noncore/net/opietooth/lib/connection.h b/noncore/net/opietooth/lib/connection.h index 37090ce..76e5dad 100644 --- a/noncore/net/opietooth/lib/connection.h +++ b/noncore/net/opietooth/lib/connection.h @@ -17,18 +17,18 @@ namespace OpieTooth { * in a OO way */ - class Connection { + class ConnectionState { public: /** * typedef for a list of * Connections */ - typedef QValueList ValueList; + typedef QValueList ValueList; /** * Copy c'tor. */ - Connection( const Connection& ); + ConnectionState( const ConnectionState& ); /** * Main c'tor @@ -44,7 +44,7 @@ namespace OpieTooth { * < ACL 00:02:C7:09:2B:53 handle 1 state 1 lm MASTER * */ - Connection( bool in, + ConnectionState( bool in, const QString& conType, const QString& mac, int handle, @@ -55,7 +55,7 @@ namespace OpieTooth { * C'tor for compability with QValueList * QValueList needs this c'tor. */ - Connection(); + ConnectionState(); /** * Set if the connection is incoming or @@ -131,11 +131,11 @@ namespace OpieTooth { /** * copy c'tor */ - Connection &operator=( const Connection& ); + ConnectionState &operator=( const ConnectionState& ); private: - class ConnectionPrivate; - ConnectionPrivate *d; + class ConnectionStatePrivate; + ConnectionStatePrivate *d; bool m_direction : 1; QString m_contype; QString m_mac; diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index e07f9da..1281116 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -254,14 +254,14 @@ void Manager::searchConnections() { *proc << "con"; if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { - Connection::ValueList list; + ConnectionState::ValueList list; emit connections( list ); delete proc; } } void Manager::slotConnectionExited( OProcess* /*proc*/ ) { qWarning("exited"); - Connection::ValueList list; + ConnectionState::ValueList list; list = parseConnections( m_hcitoolCon ); emit connections(list ); } @@ -270,8 +270,8 @@ void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) { m_hcitoolCon.append( str ); delete proc; } -Connection::ValueList Manager::parseConnections( const QString& out ) { - Connection::ValueList list2; +ConnectionState::ValueList Manager::parseConnections( const QString& out ) { + ConnectionState::ValueList list2; QStringList list = QStringList::split('\n', out ); QStringList::Iterator it; for (it = list.begin(); it != list.end(); ++it ) { @@ -286,7 +286,7 @@ Connection::ValueList Manager::parseConnections( const QString& out ) { qWarning("6: %s", value[6].latin1() ); qWarning("7: %s", value[7].latin1() ); qWarning("8: %s", value[8].latin1() ); - Connection con; + ConnectionState con; con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); con.setConnectionMode( value[1] ); con.setMac( value[2] ); diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h index b32327c..0ebe1b3 100644 --- a/noncore/net/opietooth/lib/manager.h +++ b/noncore/net/opietooth/lib/manager.h @@ -137,7 +137,7 @@ namespace OpieTooth { void removedService( const QString& service, bool removed ); void foundServices( const QString& device, Services::ValueList ); void foundDevices( const QString& device, RemoteDevice::ValueList ); - void connections( Connection::ValueList ); + void connections( ConnectionState::ValueList ); private slots: void slotProcessExited(OProcess* ); @@ -153,7 +153,7 @@ private slots: private: Services::ValueList parseSDPOutput( const QString& ); RemoteDevice::ValueList parseHCIOutput( const QString& ); - Connection::ValueList parseConnections( const QString& ); + ConnectionState::ValueList parseConnections( const QString& ); OProcess *m_hcitool; OProcess *m_sdp; // not only one QString m_device; -- cgit v0.9.0.2