-rw-r--r-- | noncore/net/opietooth/lib/connection.cpp | 32 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/connection.h | 16 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 10 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.h | 4 |
4 files changed, 31 insertions, 31 deletions
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 @@ -4,5 +4,5 @@ using namespace OpieTooth; -Connection::Connection() { +ConnectionState::ConnectionState() { m_direction = Incoming; m_handle = -1; @@ -11,10 +11,10 @@ Connection::Connection() { }; -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, @@ -31,53 +31,53 @@ 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; 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 @@ -18,5 +18,5 @@ namespace OpieTooth { */ - class Connection { + class ConnectionState { public: /** @@ -24,10 +24,10 @@ namespace OpieTooth { * Connections */ - typedef QValueList<Connection> ValueList; + typedef QValueList<ConnectionState> ValueList; /** * Copy c'tor. */ - Connection( const Connection& ); + ConnectionState( const ConnectionState& ); /** @@ -45,5 +45,5 @@ namespace OpieTooth { * */ - Connection( bool in, + ConnectionState( bool in, const QString& conType, const QString& mac, @@ -56,5 +56,5 @@ namespace OpieTooth { * QValueList needs this c'tor. */ - Connection(); + ConnectionState(); /** @@ -132,9 +132,9 @@ 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; 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 @@ -255,5 +255,5 @@ void Manager::searchConnections() { if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { - Connection::ValueList list; + ConnectionState::ValueList list; emit connections( list ); delete proc; @@ -262,5 +262,5 @@ void Manager::searchConnections() { void Manager::slotConnectionExited( OProcess* /*proc*/ ) { qWarning("exited"); - Connection::ValueList list; + ConnectionState::ValueList list; list = parseConnections( m_hcitoolCon ); emit connections(list ); @@ -271,6 +271,6 @@ void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) { 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; @@ -287,5 +287,5 @@ Connection::ValueList Manager::parseConnections( const QString& out ) { 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] ); 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 @@ -138,5 +138,5 @@ namespace OpieTooth { void foundServices( const QString& device, Services::ValueList ); void foundDevices( const QString& device, RemoteDevice::ValueList ); - void connections( Connection::ValueList ); + void connections( ConnectionState::ValueList ); private slots: @@ -154,5 +154,5 @@ private slots: 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 |