initial public commit of qt4 portp1

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
@@ -169,9 +169,9 @@ 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
@@ -191,4 +191,6 @@ 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
@@ -87,9 +87,9 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR
 	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);
@@ -137,9 +137,9 @@ 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];
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
@@ -118,17 +118,17 @@ WSALookupServiceBeginA(
 #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 {
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
@@ -5,9 +5,9 @@
 
 #include <windows.h>
 
 typedef struct {
-	HANDLE 		hPhone;
+	Qt::HANDLE 		hPhone;
 	DCB 		old_settings;
 	OVERLAPPED 	osWrite,osRead;
 } GSM_Device_SerialData;
 
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
@@ -46,9 +46,9 @@ SOURCES += gammu.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
 }
@@ -62,4 +62,6 @@ LIBS +=      ../../../bin/microgammu.lib
 OBJECTS_DIR = obj/win
 }
 DESTDIR = ../../../bin
 TARGET = kammu
+#The following line was inserted by qt3to4
+QT += xml  qt3support