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
@@ -5,3 +5,3 @@ using namespace OpieTooth;
 
-Connection::Connection() {
+ConnectionState::ConnectionState() {
     m_direction = Incoming;
@@ -12,3 +12,3 @@ Connection::Connection() {
 
-Connection::Connection( const Connection& con1 ) {
+ConnectionState::ConnectionState( const ConnectionState& con1 ) {
     (*this) = con1;
@@ -17,3 +17,3 @@ Connection::Connection( const Connection& con1 ) {
 
-Connection::Connection( bool in,
+ConnectionState::ConnectionState( bool in,
                         const QString& conType,
@@ -32,3 +32,3 @@ Connection::Connection( bool in,
 
-void Connection::setDirection( bool incoming ) {
+void ConnectionState::setDirection( bool incoming ) {
     m_direction = incoming;
@@ -36,3 +36,3 @@ void Connection::setDirection( bool incoming ) {
 
-bool Connection::direction() const {
+bool ConnectionState::direction() const {
     return m_direction;
@@ -40,3 +40,3 @@ bool Connection::direction() const {
 
-void Connection::setConnectionMode( const QString& conType ) {
+void ConnectionState::setConnectionMode( const QString& conType ) {
     m_contype = conType;
@@ -44,3 +44,3 @@ void Connection::setConnectionMode( const QString& conType ) {
 
-QString Connection::connectionMode() const {
+QString ConnectionState::connectionMode() const {
     return m_contype;
@@ -48,3 +48,3 @@ QString Connection::connectionMode() const {
 
-void Connection::setMac( const QString& mac ) {
+void ConnectionState::setMac( const QString& mac ) {
     m_mac = mac;
@@ -52,3 +52,3 @@ void Connection::setMac( const QString& mac ) {
 
-QString Connection::mac() const{
+QString ConnectionState::mac() const{
     return m_mac;
@@ -56,3 +56,3 @@ QString Connection::mac() const{
 
-void Connection::setHandle( int handle ) {
+void ConnectionState::setHandle( int handle ) {
     m_handle = handle;
@@ -60,3 +60,3 @@ void Connection::setHandle( int handle ) {
 
-int Connection::handle() const{
+int ConnectionState::handle() const{
     return m_handle;
@@ -64,3 +64,3 @@ int Connection::handle() const{
 
-void Connection::setState( int state ) {
+void ConnectionState::setState( int state ) {
     m_state = state;
@@ -68,3 +68,3 @@ void Connection::setState( int state ) {
 
-int Connection::state()const {
+int ConnectionState::state()const {
     return m_state;
@@ -72,3 +72,3 @@ int Connection::state()const {
 
-void Connection::setLinkMode( int linkMode ) {
+void ConnectionState::setLinkMode( int linkMode ) {
     m_linkMode = linkMode;
@@ -76,3 +76,3 @@ void Connection::setLinkMode( int linkMode ) {
 
-int Connection::linkMode()const{
+int ConnectionState::linkMode()const{
     return m_linkMode;
@@ -80,3 +80,3 @@ int Connection::linkMode()const{
 
-Connection &Connection::operator=( const Connection& con1 ) {
+ConnectionState &ConnectionState::operator=( const ConnectionState& con1 ) {
     m_direction = con1.m_direction;
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
@@ -19,3 +19,3 @@ namespace OpieTooth {
 
-    class Connection {
+    class ConnectionState {
     public:
@@ -25,3 +25,3 @@ namespace OpieTooth {
          */
-        typedef QValueList<Connection> ValueList;
+        typedef QValueList<ConnectionState> ValueList;
 
@@ -30,3 +30,3 @@ namespace OpieTooth {
          */
-        Connection( const Connection& );
+        ConnectionState( const ConnectionState& );
 
@@ -46,3 +46,3 @@ namespace OpieTooth {
          */
-        Connection( bool in,
+        ConnectionState( bool in,
                     const QString& conType,
@@ -57,3 +57,3 @@ namespace OpieTooth {
          */
-        Connection();
+        ConnectionState();
 
@@ -133,7 +133,7 @@ namespace OpieTooth {
          */
-        Connection &operator=( const Connection& );
+        ConnectionState &operator=( const ConnectionState& );
 
     private:
-        class ConnectionPrivate;
-        ConnectionPrivate *d;
+        class ConnectionStatePrivate;
+        ConnectionStatePrivate *d;
         bool m_direction : 1;
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
@@ -256,3 +256,3 @@ void Manager::searchConnections() {
     if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        Connection::ValueList list;
+        ConnectionState::ValueList list;
         emit connections( list  );
@@ -263,3 +263,3 @@ void Manager::slotConnectionExited( OProcess* /*proc*/ ) {
     qWarning("exited");
-    Connection::ValueList list;
+    ConnectionState::ValueList list;
     list = parseConnections( m_hcitoolCon );
@@ -272,4 +272,4 @@ void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) {
 }
-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 );
@@ -288,3 +288,3 @@ Connection::ValueList Manager::parseConnections( const QString& out ) {
         qWarning("8: %s", value[8].latin1() );
-        Connection con;
+        ConnectionState con;
         con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming );
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
@@ -139,3 +139,3 @@ namespace OpieTooth {
         void foundDevices( const QString& device, RemoteDevice::ValueList );
-        void connections( Connection::ValueList );
+        void connections( ConnectionState::ValueList );
 
@@ -155,3 +155,3 @@ private slots:
         RemoteDevice::ValueList parseHCIOutput( const QString& );
-        Connection::ValueList parseConnections( const QString& );
+        ConnectionState::ValueList parseConnections( const QString& );
         OProcess *m_hcitool;