summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/lib.pro6
-rw-r--r--noncore/net/opietooth/lib/services.cc28
-rw-r--r--noncore/net/opietooth/lib/services.h30
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
@@ -1,9 +1,9 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qte warn_on release 2CONFIG += qte warn_on release
3 HEADERS = device.h manager.h remotedevice.h services.h 3 HEADERS = parser.h device.h manager.h remotedevice.h services.h
4 SOURCES = device.cc manager.cc remotedevice.cc services.cc 4 SOURCES = parser.cc device.cc manager.cc remotedevice.cc services.cc
5 TARGET = opietooth 5 TARGET = opietooth
6INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include .
7DESTDIR = $(QTDIR)/lib$(PROJMAK) 7DESTDIR = $(QTDIR)/lib$(PROJMAK)
8LIBS += -lopie 8LIBS += -lopie
9#VERSION = 0.0.0 9#VERSION = 0.0.0
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
@@ -7,7 +7,7 @@ using namespace OpieTooth;
7Services::ProfileDescriptor::ProfileDescriptor(){ 7Services::ProfileDescriptor::ProfileDescriptor(){
8 8
9} 9}
10Services::ProfileDescriptor::ProfileDescriptor(const QString &id, uint idInt, uint version ){ 10Services::ProfileDescriptor::ProfileDescriptor(const QString &id, int idInt, int version ){
11 m_id = id; 11 m_id = id;
12 m_idInt = idInt; 12 m_idInt = idInt;
13 m_version = version; 13 m_version = version;
@@ -21,16 +21,16 @@ QString Services::ProfileDescriptor::id() const {
21void Services::ProfileDescriptor::setId( const QString& id ){ 21void Services::ProfileDescriptor::setId( const QString& id ){
22 m_id = id; 22 m_id = id;
23} 23}
24void Services::ProfileDescriptor::setId(uint id ){ 24void Services::ProfileDescriptor::setId(int id ){
25 m_idInt = id; 25 m_idInt = id;
26} 26}
27uint Services::ProfileDescriptor::idInt()const{ 27int Services::ProfileDescriptor::idInt()const{
28 return m_idInt; 28 return m_idInt;
29} 29}
30uint Services::ProfileDescriptor::version() const{ 30int Services::ProfileDescriptor::version() const{
31 return m_version; 31 return m_version;
32} 32}
33void Services::ProfileDescriptor::setVersion(uint version){ 33void Services::ProfileDescriptor::setVersion(int version){
34 m_version = version; 34 m_version = version;
35} 35}
36Services::ProfileDescriptor& Services::ProfileDescriptor::operator=( const Services::ProfileDescriptor& prof){ 36Services::ProfileDescriptor& Services::ProfileDescriptor::operator=( const Services::ProfileDescriptor& prof){
@@ -39,10 +39,10 @@ Services::ProfileDescriptor& Services::ProfileDescriptor::operator=( const Servi
39 m_version = prof.m_version; 39 m_version = prof.m_version;
40 return *this; 40 return *this;
41} 41}
42bool operator==(const Services::ProfileDescriptor& first, 42bool operator==(const Services::ProfileDescriptor& first,
43 const Services::ProfileDescriptor& second ){ 43 const Services::ProfileDescriptor& second ){
44 44
45 if( (first.id() == second.id() ) && 45 if( (first.id() == second.id() ) &&
46 (first.version() == second.version() ) && 46 (first.version() == second.version() ) &&
47 (first.idInt() == second.idInt() ) ) 47 (first.idInt() == second.idInt() ) )
48 return true; 48 return true;
@@ -54,8 +54,8 @@ Services::ProtocolDescriptor::ProtocolDescriptor(){
54 m_channel = 0; 54 m_channel = 0;
55} 55}
56Services::ProtocolDescriptor::ProtocolDescriptor(const QString& name, 56Services::ProtocolDescriptor::ProtocolDescriptor(const QString& name,
57 uint number, 57 int number,
58 uint channel){ 58 int channel){
59 m_name = name; 59 m_name = name;
60 m_number = number; 60 m_number = number;
61 m_channel = channel; 61 m_channel = channel;
@@ -72,16 +72,16 @@ QString Services::ProtocolDescriptor::name() const{
72void Services::ProtocolDescriptor::setName(const QString& name ){ 72void Services::ProtocolDescriptor::setName(const QString& name ){
73 m_name = name; 73 m_name = name;
74} 74}
75uint Services::ProtocolDescriptor::id()const { 75int Services::ProtocolDescriptor::id()const {
76 return m_number; 76 return m_number;
77} 77}
78void Services::ProtocolDescriptor::setId( uint id ){ 78void Services::ProtocolDescriptor::setId( int id ){
79 m_number = id; 79 m_number = id;
80} 80}
81uint Services::ProtocolDescriptor::port()const { 81int Services::ProtocolDescriptor::port()const {
82 return m_channel; 82 return m_channel;
83} 83}
84void Services::ProtocolDescriptor::setPort( uint port ){ 84void Services::ProtocolDescriptor::setPort( int port ){
85 m_channel = port; 85 m_channel = port;
86} 86}
87Services::ProtocolDescriptor &Services::ProtocolDescriptor::operator=( const Services::ProtocolDescriptor& desc ){ 87Services::ProtocolDescriptor &Services::ProtocolDescriptor::operator=( const Services::ProtocolDescriptor& desc ){
@@ -93,7 +93,7 @@ Services::ProtocolDescriptor &Services::ProtocolDescriptor::operator=( const Ser
93bool operator==( const Services::ProtocolDescriptor &first, 93bool operator==( const Services::ProtocolDescriptor &first,
94 const Services::ProtocolDescriptor &second ){ 94 const Services::ProtocolDescriptor &second ){
95 if( ( first.name() == second.name() ) && 95 if( ( first.name() == second.name() ) &&
96 ( first.id() == second.id() ) && 96 ( first.id() == second.id() ) &&
97 ( first.port() == second.port() ) ) 97 ( first.port() == second.port() ) )
98 return true; 98 return true;
99 99
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
@@ -26,7 +26,7 @@ namespace OpieTooth {
26 * @param idInt The id as uint ( 0x1102 ) 26 * @param idInt The id as uint ( 0x1102 )
27 * @param version Version of the Profile ( 1 ) 27 * @param version Version of the Profile ( 1 )
28 */ 28 */
29 ProfileDescriptor(const QString &id, uint idInt, uint version ); 29 ProfileDescriptor(const QString &id, int idInt, int version );
30 /** 30 /**
31 * copy c'tor 31 * copy c'tor
32 */ 32 */
@@ -41,21 +41,21 @@ namespace OpieTooth {
41 void setId(const QString& id); 41 void setId(const QString& id);
42 42
43 /** 43 /**
44 * sets the uint id 44 * sets the int id
45 */ 45 */
46 void setId(uint ); 46 void setId(int );
47 /** 47 /**
48 * reutns the id as int 48 * reutns the id as int
49 */ 49 */
50 uint idInt()const; 50 int idInt()const;
51 /** 51 /**
52 * returns the version 52 * returns the version
53 */ 53 */
54 uint version()const; 54 int version()const;
55 /** 55 /**
56 * sets the Version 56 * sets the Version
57 */ 57 */
58 void setVersion(uint version ); 58 void setVersion(int version );
59 /** 59 /**
60 * copy operator 60 * copy operator
61 */ 61 */
@@ -66,8 +66,8 @@ namespace OpieTooth {
66 friend bool operator==(const ProfileDescriptor&, const ProfileDescriptor& ); 66 friend bool operator==(const ProfileDescriptor&, const ProfileDescriptor& );
67 private: 67 private:
68 QString m_id; 68 QString m_id;
69 uint m_idInt; 69 int m_idInt;
70 uint m_version; 70 int m_version;
71 }; 71 };
72 /** 72 /**
73 * Protocol Descriptor 73 * Protocol Descriptor
@@ -84,22 +84,22 @@ namespace OpieTooth {
84 * number 84 * number
85 * channel/port 85 * channel/port
86 */ 86 */
87 ProtocolDescriptor(const QString&, uint, uint channel ); // Q_UINT8 ? 87 ProtocolDescriptor(const QString&, int, int port = -1 ); // Q_UINT8 ?
88 ProtocolDescriptor(const ProtocolDescriptor& ); 88 ProtocolDescriptor(const ProtocolDescriptor& );
89 ~ProtocolDescriptor(); 89 ~ProtocolDescriptor();
90 QString name()const; 90 QString name()const;
91 void setName(const QString& ); 91 void setName(const QString& );
92 uint id()const; 92 int id()const;
93 void setId(uint ); 93 void setId(int );
94 uint port()const; 94 int port()const;
95 void setPort(uint ); 95 void setPort(int );
96 ProtocolDescriptor &operator=( const ProtocolDescriptor& ); 96 ProtocolDescriptor &operator=( const ProtocolDescriptor& );
97 friend bool operator==( const ProtocolDescriptor&, 97 friend bool operator==( const ProtocolDescriptor&,
98 const ProtocolDescriptor& ); 98 const ProtocolDescriptor& );
99 private: 99 private:
100 QString m_name; 100 QString m_name;
101 uint m_number; 101 int m_number;
102 uint m_channel; 102 int m_channel;
103 }; 103 };
104 104
105 public: 105 public: