author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /gammu/emb/common/device | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | gammu/emb/common/device/bluetoth/blue_w32.c | 4 | ||||
-rw-r--r-- | gammu/emb/common/device/bluetoth/blue_w32.h | 4 | ||||
-rw-r--r-- | gammu/emb/common/device/serial/ser_w32.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gammu/emb/common/device/bluetoth/blue_w32.c b/gammu/emb/common/device/bluetoth/blue_w32.c index a631c9f..8a367f4 100644 --- a/gammu/emb/common/device/bluetoth/blue_w32.c +++ b/gammu/emb/common/device/bluetoth/blue_w32.c | |||
@@ -88,7 +88,7 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR | |||
88 | char addressAsString[1000]; | 88 | char addressAsString[1000]; |
89 | DWORD bufferLength, addressSize; | 89 | DWORD bufferLength, addressSize; |
90 | WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer; | 90 | WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer; |
91 | HANDLE handle; | 91 | Qt::HANDLE handle; |
92 | GSM_Error error; | 92 | GSM_Error error; |
93 | 93 | ||
94 | memset(&querySet, 0, sizeof(querySet)); | 94 | memset(&querySet, 0, sizeof(querySet)); |
@@ -138,7 +138,7 @@ GSM_Error bluetooth_findchannel(GSM_StateMachine *s) | |||
138 | WSADATA wsaData; | 138 | WSADATA wsaData; |
139 | int i, protocolInfoSize, result; | 139 | int i, protocolInfoSize, result; |
140 | WSAPROTOCOL_INFO protocolInfo; | 140 | WSAPROTOCOL_INFO protocolInfo; |
141 | HANDLE handle; | 141 | Qt::HANDLE handle; |
142 | DWORD flags; | 142 | DWORD flags; |
143 | WSAQUERYSET querySet; | 143 | WSAQUERYSET querySet; |
144 | BYTE buffer[2000]; | 144 | BYTE buffer[2000]; |
diff --git a/gammu/emb/common/device/bluetoth/blue_w32.h b/gammu/emb/common/device/bluetoth/blue_w32.h index e457c92..409f4b1 100644 --- a/gammu/emb/common/device/bluetoth/blue_w32.h +++ b/gammu/emb/common/device/bluetoth/blue_w32.h | |||
@@ -119,7 +119,7 @@ WSALookupServiceBeginA( | |||
119 | 119 | ||
120 | WINSOCK_API_LINKAGE INT WSAAPI | 120 | WINSOCK_API_LINKAGE INT WSAAPI |
121 | WSALookupServiceNextA( | 121 | WSALookupServiceNextA( |
122 | IN HANDLE hLookup, | 122 | IN Qt::HANDLE hLookup, |
123 | IN DWORD dwControlFlags, | 123 | IN DWORD dwControlFlags, |
124 | IN OUT LPDWORD lpdwBufferLength, | 124 | IN OUT LPDWORD lpdwBufferLength, |
125 | OUT LPWSAQUERYSETA lpqsResults | 125 | OUT LPWSAQUERYSETA lpqsResults |
@@ -127,7 +127,7 @@ WSALookupServiceNextA( | |||
127 | 127 | ||
128 | #define WSALookupServiceNext WSALookupServiceNextA | 128 | #define WSALookupServiceNext WSALookupServiceNextA |
129 | 129 | ||
130 | WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN HANDLE hLookup); | 130 | WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN Qt::HANDLE hLookup); |
131 | 131 | ||
132 | #define MAX_PROTOCOL_CHAIN 7 | 132 | #define MAX_PROTOCOL_CHAIN 7 |
133 | 133 | ||
diff --git a/gammu/emb/common/device/serial/ser_w32.h b/gammu/emb/common/device/serial/ser_w32.h index d226f32..d1aa37a 100644 --- a/gammu/emb/common/device/serial/ser_w32.h +++ b/gammu/emb/common/device/serial/ser_w32.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #include <windows.h> | 6 | #include <windows.h> |
7 | 7 | ||
8 | typedef struct { | 8 | typedef struct { |
9 | HANDLE hPhone; | 9 | Qt::HANDLE hPhone; |
10 | DCB old_settings; | 10 | DCB old_settings; |
11 | OVERLAPPED osWrite,osRead; | 11 | OVERLAPPED osWrite,osRead; |
12 | } GSM_Device_SerialData; | 12 | } GSM_Device_SerialData; |