initial public commit of qt4 portp1

1 files changed, 2 insertions, 2 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
@@ -67,49 +67,49 @@ GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
 		//noauth
 		close(d->hPhone);
 		return ERR_UNKNOWN;
 	}
 
 	return ERR_NONE;
 }
 
 #ifdef BLUETOOTH_RF_SEARCHING
 
 #pragma comment(lib, "irprops.lib")
 #pragma comment(lib, "ws2_32.lib")
 
 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;
 
         result = WSALookupServiceBegin(&querySet, flags, &handle);
 	if (result != 0) return ERR_UNKNOWN;
 
 	bufferLength = sizeof(buffer);
 	while (1) {
                 result = WSALookupServiceNext(handle, flags, &bufferLength, pResults);
 		if (result != 0) break;
  		addressSize 		= sizeof(addressAsString);
 		addressAsString[0] 	= 0;
 		if (WSAAddressToString(pResults->lpcsaBuffer->RemoteAddr.lpSockaddr,
 			pResults->lpcsaBuffer->RemoteAddr.iSockaddrLength, protocolInfo, 
@@ -117,49 +117,49 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR
                 	smprintf(s, "%s - ", addressAsString);
 		}
 		smprintf(s, "\"%s\"\n", pResults->lpszServiceInstanceName);
 		if (addressAsString[0] != 0) {
 			for (i=strlen(addressAsString)-1;i>0;i--) {
 				if (addressAsString[i] == ':') break;
 			}
 			if (bluetooth_checkservicename(s, pResults->lpszServiceInstanceName) == ERR_NONE) {
 				error = bluetooth_connect(s,atoi(addressAsString+i+1),address+1);
 				result = WSALookupServiceEnd(handle);
 				return error;
 			}
 		}
 	}
 	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) {
 		i = GetLastError();
 		GSM_OSErrorInfo(s, "Socket in bluetooth_open");
 		if (i == 10041) return ERR_DEVICENODRIVER;//unknown socket type
 		return ERR_UNKNOWN;
 	}
 
 	protocolInfoSize = sizeof(protocolInfo);
       	if (getsockopt(d->hPhone, SOL_SOCKET, SO_PROTOCOL_INFO,
 		(char*)&protocolInfo, &protocolInfoSize) != 0)
 	{
 		close(d->hPhone);
 		return ERR_UNKNOWN;