Removed commented out code from common/etag.cpp

[xestiaab/.git] / source / common / uuid.cpp

diff --git a/source/common/uuid.cpp b/source/common/uuid.cpp
index a658829..a5cd6fa 100644 (file)
--- a/source/common/uuid.cpp
+++ b/source/common/uuid.cpp
@@ -1,9 +1,28 @@
+// uuid.cpp - UUID subroutines.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include <wx/wx.h>
 
 wxString GenerateUUID()
 {
 
 #if defined(__WIN32__)
+#include <rpc.h>
     UUID UUIDData;
     UuidCreate(&UUIDData);
     wchar_t* UUIDStr = 0;
@@ -11,10 +30,6 @@ wxString GenerateUUID()
     wxString Result(UUIDStr);
 #elif defined(__HAIKU__)
     
-#elif defined(__APPLE__)
-    
-    wxString Result;
-    
 #else
     
 #include <stdio.h>
@@ -40,18 +55,8 @@ wxString GenerateUUID()
     
     pclose(uuid_hdl);
     
-/*#include <uuid/uuid.h>
-    
-    uuid_t *uuid;
-    uuid_create(&uuid);
-    char *strdata[100];
-    
-    strdata = NULL;
-    
-    wxString Result = wxString::FromUTF8(strdata);
-    
-    delete strdata;
-    strdata = NULL;*/
+    Result = wxString::Format(wxT("%s"), uuidout);
+    Result.Trim();
     
 #endif
     
@@ -66,4 +71,4 @@ bool CheckUUID(wxString UUIDInc)
     
     return Result;
     
-}
\ No newline at end of file
+}