From cd20d2e486389b8d489972b128a5dd06ef579071 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 09:54:31 +0200 Subject: [PATCH] Fixed: Conflicts with member variables, see #279 --HG-- branch : develop --- .../tools/client/ryzom_installer/src/profile.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp index ec0a95696..b80c368df 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp @@ -65,19 +65,19 @@ void CProfile::createShortcuts() const { const CServer &s = CConfigFile::getInstance()->getServer(server); - QString executable = getClientFullPath(); + QString exe = getClientFullPath(); QString workingDir = s.getDirectory(); - QString arguments = QString("--profile %1").arg(id); + QString profileArguments = QString("--profile %1").arg(id); // append custom arguments - if (!arguments.isEmpty()) arguments += QString(" %1").arg(arguments); + if (!arguments.isEmpty()) profileArguments += QString(" %1").arg(arguments); QString icon; #ifdef Q_OS_WIN32 // under Windows, icon is included in executable - icon = executable; + icon = exe; #else // icon is in the same directory as client icon = s.getDirectory() + "/ryzom_client.png"; @@ -88,7 +88,7 @@ void CProfile::createShortcuts() const QString shortcut = getClientDesktopShortcutFullPath(); // create desktop shortcut - createLink(shortcut, name, executable, arguments, icon, workingDir); + createLink(shortcut, name, exe, profileArguments, icon, workingDir); } if (menuShortcut) @@ -96,7 +96,7 @@ void CProfile::createShortcuts() const QString shortcut = getClientMenuShortcutFullPath(); // create menu shortcut - createLink(shortcut, name, executable, arguments, icon, workingDir); + createLink(shortcut, name, exe, profileArguments, icon, workingDir); } }