From 5b2aefb4744236c22d0e640693fd236b2c869512 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 15 Oct 2009 16:26:01 +0200
Subject: [PATCH] Source USERNAME environment variable on Windows instead of
USER.
---
src/plugins/cpaster/settingspage.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp
index 13d11fd521f..c530027f3e6 100644
--- a/src/plugins/cpaster/settingspage.cpp
+++ b/src/plugins/cpaster/settingspage.cpp
@@ -44,7 +44,12 @@ SettingsPage::SettingsPage()
m_settings = Core::ICore::instance()->settings();
if (m_settings) {
m_settings->beginGroup("CodePaster");
- m_username = m_settings->value("UserName", qgetenv("USER")).toString();
+#ifdef Q_OS_WIN32
+ QString defaultUser = qgetenv("USERNAME");
+#else
+ QString defaultUser = qgetenv("USER");
+#endif
+ m_username = m_settings->value("UserName", defaultUser).toString();
m_protocol = m_settings->value("DefaultProtocol", "CodePaster").toString();
m_copy = m_settings->value("CopyToClipboard", true).toBool();
m_output = m_settings->value("DisplayOutput", true).toBool();
--
GitLab