commit 3658736c2cf2c24cc27b669a1a2794bc32d5bc66
author Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Thu Feb 04 12:30:52 2016 -0500
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Thu Feb 04 13:49:38 2016 -0500
tree 340843dafc08599eafbcdd95775f8f820be51b95
parent 31484f1a0f6b02368016041df3f1b8461427402d

wizard: automatic alias suggestion

- Also fix some code style issue
- Change Q_OS_WIN32 macro to more general Q_OS_WIN

Change-Id: I54c646b52e07ffee7ad7f078528b106e12ff32f2
Tuleap: #334

utils.cpp

diff --git a/utils.cpp b/utils.cpp
index d4ff52d..e3cb7b5 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -18,7 +18,7 @@
 
 #include "utils.h"
 
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
 #include <lmcons.h>
 #include <shobjidl.h>
 #include <shlguid.h>
@@ -29,7 +29,7 @@
 bool
 Utils::CreateStartupLink()
 {
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     TCHAR szPath[MAX_PATH];
     GetModuleFileName(NULL, szPath, MAX_PATH);
 
@@ -49,7 +49,7 @@
 
 bool
 Utils::CreateLink(LPCWSTR lpszPathObj, LPCWSTR lpszPathLink) {
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     HRESULT hres;
     IShellLink* psl;
 
@@ -71,13 +71,15 @@
     }
     return hres;
 #else
+    Q_UNUSED(lpszPathObj)
+    Q_UNUSED(lpszPathLink)
     return true;
 #endif
 }
 
 void
 Utils::DeleteStartupLink() {
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     TCHAR startupPath[MAX_PATH];
     SHGetFolderPathW(NULL, CSIDL_STARTUP, NULL, 0, startupPath);
 
@@ -90,7 +92,7 @@
 
 bool
 Utils::CheckStartupLink() {
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     TCHAR startupPath[MAX_PATH];
     SHGetFolderPathW(NULL, CSIDL_STARTUP, NULL, 0, startupPath);
 
@@ -104,7 +106,7 @@
 
 QString
 Utils::GetRingtonePath() {
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     TCHAR workingDirectory[MAX_PATH];
     GetCurrentDirectory(MAX_PATH, workingDirectory);
 
@@ -119,7 +121,7 @@
 
 QString
 Utils::GenGUID() {
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     GUID gidReference;
     wchar_t *str;
     HRESULT hCreateGuid = CoCreateGuid(&gidReference);
@@ -129,7 +131,7 @@
         return gStr.remove("{").remove("}").toLower();
     }
     else
-        return QString("");
+        return QString();
 #else
     return QString("");
 #endif
@@ -137,13 +139,25 @@
 
 QString
 Utils::GetISODate() {
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     SYSTEMTIME lt;
     GetSystemTime(&lt);
     return QString("%1-%2-%3T%4:%5:%6Z").arg(lt.wYear).arg(lt.wMonth,2,10,QChar('0')).arg(lt.wDay,2,10,QChar('0'))
             .arg(lt.wHour,2,10,QChar('0')).arg(lt.wMinute,2,10,QChar('0')).arg(lt.wSecond,2,10,QChar('0'));
 #else
-    return QString("");
+    return QString();
+#endif
+}
+
+QString
+Utils::GetCurrentUserName() {
+#ifdef Q_OS_WIN
+    wchar_t username[UNLEN+1];
+    DWORD username_len = UNLEN+1;
+    GetUserName(username, &username_len);
+    return QString::fromWCharArray(username, username_len);
+#else
+    return QString();
 #endif
 }