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
@@ -161,34 +161,36 @@ phone/nokia/dct3/n9210.c \
 phone/nokia/dct3/dct3func.c \
 phone/nokia/dct4/n3320.c \
 phone/nokia/dct4/n3650.c \
 phone/nokia/dct4/n6510.c \
 phone/nokia/dct4/dct4func.c \
 phone/nokia/nauto.c \
 phone/nokia/nfunc.c \
 phone/nokia/nfuncold.c \
 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
 MOC_DIR = moc/unix
 
 unix: {
 HEADERS += device/serial/ser_unx.h \
            device/irda/irda_unx.h 
 
 SOURCES += device/serial/ser_unx.c \
 
 }
 win32:{
 
 HEADERS += device/serial/ser_w32.h \
            device/irda/irda_w32.h \
            device/bluetoth/blue_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
@@ -79,25 +79,25 @@ GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
 
 static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPROTOCOL_INFO *protocolInfo)
 {
                 GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
                 WSAQUERYSET             querySet;
                 DWORD                   flags;
                 GUID                    protocol;
                 int                     i, result;
                 BYTE                    buffer[2000];
                 char                    addressAsString[1000];
                 DWORD                   bufferLength, addressSize;
                 WSAQUERYSET             *pResults = (WSAQUERYSET*)&buffer;
-                HANDLE                  handle;
+                Qt::HANDLE                      handle;
                 GSM_Error               error;
 
         memset(&querySet, 0, sizeof(querySet));
                 querySet.dwSize   = sizeof(querySet);
                 protocol          = L2CAP_PROTOCOL_UUID;
         querySet.lpServiceClassId = &protocol;
                 querySet.dwNameSpace   = NS_BTH;
                 querySet.lpszContext   = address;
 
         flags = LUP_FLUSHCACHE  | LUP_RETURN_NAME |
                 LUP_RETURN_TYPE | LUP_RETURN_ADDR |
                 LUP_RETURN_BLOB | LUP_RETURN_COMMENT;
@@ -129,25 +129,25 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR
                 }
         }
         result = WSALookupServiceEnd(handle);
         return ERR_NOTSUPPORTED;
 }
 
 GSM_Error bluetooth_findchannel(GSM_StateMachine *s)
 {
                 GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
                 WSADATA                         wsaData;
                 int                     i, protocolInfoSize, result;
                 WSAPROTOCOL_INFO        protocolInfo;
-                HANDLE                          handle;
+                Qt::HANDLE                      handle;
                 DWORD                   flags;
                 WSAQUERYSET             querySet;
                 BYTE                    buffer[2000];
                 char                    addressAsString[1000];
                 DWORD                   bufferLength, addressSize;
                 WSAQUERYSET             *pResults = (WSAQUERYSET*)&buffer;
                 GSM_Error               error;
 
             if (WSAStartup(MAKEWORD(2,2), &wsaData)!=0x00) return ERR_DEVICENODRIVER;
 
             d->hPhone = socket(AF_BTH, SOCK_STREAM, BTHPROTO_RFCOMM);
         if (d->hPhone == INVALID_SOCKET) {
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
@@ -110,33 +110,33 @@ DEFINE_GUID(L2CAP_PROTOCOL_UUID,  0x00000100, 0x0000, 0x1000, 0x80, 0x00, 0x00,
 
 WINSOCK_API_LINKAGE INT WSAAPI
 WSALookupServiceBeginA(
     IN  LPWSAQUERYSETA lpqsRestrictions,
     IN  DWORD          dwControlFlags,
     OUT LPHANDLE       lphLookup
     );
 
 #define WSALookupServiceBegin  WSALookupServiceBeginA
 
 WINSOCK_API_LINKAGE INT WSAAPI
 WSALookupServiceNextA(
-    IN     HANDLE           hLookup,
+    IN     Qt::HANDLE           hLookup,
     IN     DWORD            dwControlFlags,
     IN OUT LPDWORD          lpdwBufferLength,
     OUT    LPWSAQUERYSETA   lpqsResults
     );
 
 #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
 
 typedef struct _WSAPROTOCOLCHAIN {
     int ChainLen;                                 /* the length of the chain,     */
                                                   /* length = 0 means layered protocol, */
                                                   /* length = 1 means base protocol, */
                                                   /* length > 1 means protocol chain */
     DWORD ChainEntries[MAX_PROTOCOL_CHAIN];       /* a list of dwCatalogEntryIds */
 } WSAPROTOCOLCHAIN, FAR * LPWSAPROTOCOLCHAIN;
 
 #define WSAPROTOCOL_LEN  255
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
@@ -1,19 +1,19 @@
 
 #ifdef WIN32
 #ifndef winserial_h
 #define winserial_h
 
 #include <windows.h>
 
 typedef struct {
-                HANDLE          hPhone;
+                Qt::HANDLE      hPhone;
                 DCB     old_settings;
                 OVERLAPPED osWrite,osRead;
 } GSM_Device_SerialData;
 
 #endif
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
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
@@ -38,28 +38,30 @@ SOURCES += gammu.c \
            smsd/s_files.c \
            smsd/smsdcore.c \
            depend/nokia/dct3.c \
            depend/nokia/dct4.c \
            depend/siemens/chiffre.c \
            depend/siemens/dsiemens.c \
            depend/nokia/dct3trac/wmx-gsm.c \
            depend/nokia/dct3trac/wmx-list.c \
            depend/nokia/dct3trac/wmx-sim.c \
            depend/nokia/dct3trac/wmx-util.c \
            depend/nokia/dct3trac/wmx.c
 unix : {
-LIBS +=      ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
+LIBS +=      ../../../bin/libxmicrogammu.so -lpthread
 # bluetooth disabled for now
 #/usr/lib/libbluetooth.so  /usr/lib/libsdp.so 
 OBJECTS_DIR = obj/unix
 }
 win32 : {
         CONFIG  += qt warn_on 
 #LIBS += mfc71u.lib
 LIBS += libc.lib
 #LIBS += msvcrt.lib
 QMAKE_LINK += /NODEFAULTLIB:msvcrt
 LIBS +=      ../../../bin/microgammu.lib
 OBJECTS_DIR = obj/win
 }
 DESTDIR = ../../../bin
 TARGET = kammu
+#The following line was inserted by qt3to4
+QT += xml  qt3support