3 files changed, 32 insertions, 32 deletions

diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro
index ce36d66..72cb456 100644
--- a/noncore/net/opietooth/lib/lib.pro
+++ b/noncore/net/opietooth/lib/lib.pro
@@ -2,6 +2,6 @@ TEMPLATE        = lib
 CONFIG          += qte warn_on release
-HEADERS 	= device.h manager.h remotedevice.h services.h
-SOURCES		= device.cc manager.cc remotedevice.cc services.cc
+HEADERS 	= parser.h device.h manager.h remotedevice.h services.h
+SOURCES		= parser.cc device.cc manager.cc remotedevice.cc services.cc
 TARGET		= opietooth
-INCLUDEPATH += $(OPIEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include .
 DESTDIR         = $(QTDIR)/lib$(PROJMAK)
diff --git a/noncore/net/opietooth/lib/services.cc b/noncore/net/opietooth/lib/services.cc
index 75c1bd6..d91e4a1 100644
--- a/noncore/net/opietooth/lib/services.cc
+++ b/noncore/net/opietooth/lib/services.cc
@@ -9,3 +9,3 @@ Services::ProfileDescriptor::ProfileDescriptor(){
 }
-Services::ProfileDescriptor::ProfileDescriptor(const QString &id, uint idInt, uint version ){
+Services::ProfileDescriptor::ProfileDescriptor(const QString &id, int idInt, int version ){
   m_id = id;
@@ -23,12 +23,12 @@ void Services::ProfileDescriptor::setId( const QString& id ){
 }
-void Services::ProfileDescriptor::setId(uint id ){
+void Services::ProfileDescriptor::setId(int id ){
   m_idInt = id;
 }
-uint Services::ProfileDescriptor::idInt()const{
+int Services::ProfileDescriptor::idInt()const{
   return m_idInt;
 }
-uint Services::ProfileDescriptor::version() const{
+int Services::ProfileDescriptor::version() const{
   return m_version;
 }
-void Services::ProfileDescriptor::setVersion(uint version){
+void Services::ProfileDescriptor::setVersion(int version){
   m_version = version;
@@ -41,6 +41,6 @@ Services::ProfileDescriptor& Services::ProfileDescriptor::operator=( const Servi
 }
-bool operator==(const Services::ProfileDescriptor& first, 
+bool operator==(const Services::ProfileDescriptor& first,
 		const Services::ProfileDescriptor& second ){
 
-  if( (first.id() == second.id() ) && 
+  if( (first.id() == second.id() ) &&
       (first.version() == second.version() ) &&
@@ -56,4 +56,4 @@ Services::ProtocolDescriptor::ProtocolDescriptor(){
 Services::ProtocolDescriptor::ProtocolDescriptor(const QString& name,
-						 uint number,
-						 uint channel){
+						 int number,
+						 int channel){
   m_name = name;
@@ -74,12 +74,12 @@ void Services::ProtocolDescriptor::setName(const QString& name ){
 }
-uint Services::ProtocolDescriptor::id()const {
+int Services::ProtocolDescriptor::id()const {
   return m_number;
 }
-void Services::ProtocolDescriptor::setId( uint id ){
+void Services::ProtocolDescriptor::setId( int id ){
   m_number = id;
 }
-uint Services::ProtocolDescriptor::port()const {
+int Services::ProtocolDescriptor::port()const {
   return m_channel;
 }
-void Services::ProtocolDescriptor::setPort( uint port ){
+void Services::ProtocolDescriptor::setPort( int port ){
   m_channel = port;
@@ -95,3 +95,3 @@ bool operator==( const Services::ProtocolDescriptor &first,
   if( ( first.name() == second.name() ) &&
-      ( first.id() == second.id() ) && 
+      ( first.id() == second.id() ) &&
       ( first.port() == second.port() ) )
diff --git a/noncore/net/opietooth/lib/services.h b/noncore/net/opietooth/lib/services.h
index 8e9378a..65de049 100644
--- a/noncore/net/opietooth/lib/services.h
+++ b/noncore/net/opietooth/lib/services.h
@@ -28,3 +28,3 @@ namespace OpieTooth {
        */
-      ProfileDescriptor(const QString &id, uint idInt, uint version );
+      ProfileDescriptor(const QString &id, int idInt, int version );
       /**
@@ -43,5 +43,5 @@ namespace OpieTooth {
       /**
-       * sets the uint id
+       * sets the int id
        */
-      void setId(uint );
+      void setId(int );
       /**
@@ -49,3 +49,3 @@ namespace OpieTooth {
        */
-      uint idInt()const;
+      int idInt()const;
       /**
@@ -53,3 +53,3 @@ namespace OpieTooth {
        */
-      uint version()const;
+      int version()const;
       /**
@@ -57,3 +57,3 @@ namespace OpieTooth {
        */
-      void setVersion(uint version );
+      void setVersion(int version );
       /**
@@ -68,4 +68,4 @@ namespace OpieTooth {
       QString m_id;
-      uint m_idInt;
-      uint m_version;
+      int m_idInt;
+      int m_version;
     };
@@ -86,3 +86,3 @@ namespace OpieTooth {
        */
-      ProtocolDescriptor(const QString&, uint, uint channel ); // Q_UINT8 ?
+      ProtocolDescriptor(const QString&, int, int port = -1 ); // Q_UINT8 ?
       ProtocolDescriptor(const ProtocolDescriptor& );
@@ -91,6 +91,6 @@ namespace OpieTooth {
       void setName(const QString& );
-      uint id()const;
-      void setId(uint );
-      uint port()const;
-      void setPort(uint );
+      int id()const;
+      void setId(int );
+      int port()const;
+      void setPort(int );
       ProtocolDescriptor &operator=( const ProtocolDescriptor& );
@@ -100,4 +100,4 @@ namespace OpieTooth {
       QString m_name;
-      uint m_number;
-      uint m_channel;
+      int m_number;
+      int m_channel;
     };