| 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 | |
| parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
| download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.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 | ||||
| -rw-r--r-- | gammu/emb/gammu/gammu.pro | 4 |
5 files changed, 11 insertions, 7 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 @@ -172,3 +172,3 @@ phone/symbian/mroutgen.c DEFINES += DESKTOP_VERSION -TARGET = microgammu +TARGET = xmicrogammu CONFIG = warn_off release console @@ -194 +194,3 @@ SOURCES += device/serial/ser_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 @@ -90,3 +90,3 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer; - HANDLE handle; + Qt::HANDLE handle; GSM_Error error; @@ -140,3 +140,3 @@ GSM_Error bluetooth_findchannel(GSM_StateMachine *s) WSAPROTOCOL_INFO protocolInfo; - HANDLE handle; + Qt::HANDLE handle; DWORD flags; 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 @@ -121,3 +121,3 @@ WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceNextA( - IN HANDLE hLookup, + IN Qt::HANDLE hLookup, IN DWORD dwControlFlags, @@ -129,3 +129,3 @@ WSALookupServiceNextA( -WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN HANDLE hLookup); +WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN Qt::HANDLE hLookup); 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 @@ -8,3 +8,3 @@ typedef struct { - HANDLE hPhone; + Qt::HANDLE hPhone; DCB old_settings; diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro index c8aa3f0..e8ccac3 100644 --- a/gammu/emb/gammu/gammu.pro +++ b/gammu/emb/gammu/gammu.pro @@ -49,3 +49,3 @@ SOURCES += gammu.c \ unix : { -LIBS += ../../../bin/libmicrogammu.so /usr/lib/libpthread.so +LIBS += ../../../bin/libxmicrogammu.so -lpthread # bluetooth disabled for now @@ -65 +65,3 @@ DESTDIR = ../../../bin TARGET = kammu +#The following line was inserted by qt3to4 +QT += xml qt3support |