| 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) (side-by-side diff) | |
| tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /gammu/emb/common | |
| 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/common.pro | 4 | ||||
| -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 |
4 files changed, 8 insertions, 6 deletions
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro index af45382..65fd303 100644 --- a/gammu/emb/common/common.pro +++ b/gammu/emb/common/common.pro @@ -170,7 +170,7 @@ phone/obex/obexgen.c \ phone/symbian/mroutgen.c DEFINES += DESKTOP_VERSION -TARGET = microgammu +TARGET = xmicrogammu CONFIG = warn_off release console DESTDIR = ../../../bin OBJECTS_DIR = obj/unix @@ -192,3 +192,5 @@ HEADERS += device/serial/ser_w32.h \ SOURCES += device/serial/ser_w32.c \ device/bluetoth/blue_w32.c } +#The following line was inserted by qt3to4 +QT += xml qt3support 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 char addressAsString[1000]; DWORD bufferLength, addressSize; WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer; - HANDLE handle; + Qt::HANDLE handle; GSM_Error error; memset(&querySet, 0, sizeof(querySet)); @@ -138,7 +138,7 @@ GSM_Error bluetooth_findchannel(GSM_StateMachine *s) WSADATA wsaData; int i, protocolInfoSize, result; WSAPROTOCOL_INFO protocolInfo; - HANDLE handle; + Qt::HANDLE handle; DWORD flags; WSAQUERYSET querySet; 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( WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceNextA( - IN HANDLE hLookup, + IN Qt::HANDLE hLookup, IN DWORD dwControlFlags, IN OUT LPDWORD lpdwBufferLength, OUT LPWSAQUERYSETA lpqsResults @@ -127,7 +127,7 @@ WSALookupServiceNextA( #define WSALookupServiceNext WSALookupServiceNextA -WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN HANDLE hLookup); +WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN Qt::HANDLE hLookup); #define MAX_PROTOCOL_CHAIN 7 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 @@ #include <windows.h> typedef struct { - HANDLE hPhone; + Qt::HANDLE hPhone; DCB old_settings; OVERLAPPED osWrite,osRead; } GSM_Device_SerialData; |