Support both 5.5 and 5.6 version of ParaView

[modules/gui.git] / src / SUIT / SUIT_LicenseDlg.cxx

diff --git a/src/SUIT/SUIT_LicenseDlg.cxx b/src/SUIT/SUIT_LicenseDlg.cxx
index e95319c1ee134045998f6e085acce5420f7a15a9..6a2c7dbac636055d786cc929b0bacc5dffebc1a5 100755 (executable)
--- a/src/SUIT/SUIT_LicenseDlg.cxx
+++ b/src/SUIT/SUIT_LicenseDlg.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -118,15 +118,18 @@ void SUIT_LicenseDlg::onAgree()
 {
   QString env;
 #ifdef WIN32
-    DWORD aLen=1024;
-  char aStr[1024];
+  DWORD aLen=1024;
+  TCHAR aStr[1024];
   HANDLE aToken=0;
   HANDLE hProcess = GetCurrentProcess();
   OpenProcessToken(hProcess,TOKEN_QUERY,&aToken);
   if( ! GetUserProfileDirectory( aToken, aStr, &aLen ) )
     reject();
-
+#ifdef UNICODE
+  env = QString::fromWCharArray(aStr);
+#else 
   env = aStr;
+#endif
 #else
   if( ! ::getenv( "HOME" ) )
     reject();