X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fcommon%2Fuuid.cpp;h=c808791879048871c101e9ff60054e527c46bb57;hp=1a6ee5a0768ff45926f7d9f71ba83cebcb08fe4d;hb=1db40ff99bc679ae56a995d6f5a25b03660e5a93;hpb=e09672385792a1594700f03e06d1293e352dcd83

diff --git a/source/common/uuid.cpp b/source/common/uuid.cpp
index 1a6ee5a..c808791 100644
--- a/source/common/uuid.cpp
+++ b/source/common/uuid.cpp
@@ -20,21 +20,16 @@
 
 string GenerateUUID()
 {
-
-#if defined(__WIN32__)
-	
-#include <rpc.h>
-	
-	UUID UUIDData;
-	UuidCreate(&UUIDData);
-	wchar_t* UUIDStr = 0;
-	UuidToString(&UUIDData, (RPC_WSTR*)&UUIDStr);
-	wxString Result(UUIDStr);
-	
+#if defined(WIN32)
+	UUID uuidData;
+	UuidCreate(&uuidData);
+	wchar_t* uuidStr = 0;
+	UuidToString(&uuidData, (RPC_WSTR*)&uuidStr);
+	wstring uuidWStr(uuidStr);
+	std::string uuidOut(uuidWStr.begin(), uuidWStr.end());
 #elif defined(__HAIKU__)
     
 #else
-    
 #include <stdio.h>
     
 	FILE *uuidhdl = popen("uuidgen", "r");
@@ -51,7 +46,6 @@ string GenerateUUID()
 	}
     
 	pclose(uuidhdl);
-    
 #endif
     
 	if (uuidOut.back() == '\n'){
@@ -61,5 +55,4 @@ string GenerateUUID()
 	}
 	
 	return uuidOut;
-        
 }
\ No newline at end of file