diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-04-18 22:49:02 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 11:07:25 +0200 |
| commit | 21eb4578e5e0da44c87fc6a7d0d664c3584194e8 (patch) | |
| tree | 849f95379eca79e564111406d4f8b5672635c5be /src | |
| parent | 1f622c986b52e07bee3ba47a34ef4cf55823a393 (diff) | |
replace getenv("HOME") with a "centralized" QDir::homePath()
Task-number: QTBUG-4902
Change-Id: Ie9124de45be2d8e859f8b0aaea246e660145a1c5
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qstandardpaths_json.cpp | 2 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qstandardpaths_json.cpp b/src/corelib/io/qstandardpaths_json.cpp index c7cb858f0f..8542371848 100644 --- a/src/corelib/io/qstandardpaths_json.cpp +++ b/src/corelib/io/qstandardpaths_json.cpp @@ -193,7 +193,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) QString value = iter.value().toString(); // optimize for a common case - value.replace(QLatin1String("${HOME}"), QFile::decodeName(qgetenv("HOME"))); + value.replace(QLatin1String("${HOME}"), QDir::homePath()); // Do ${} format environment variable substitution if necessary if (!value.isEmpty() && value.contains(QLatin1String("${"))) { diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 75c9664d1d..f7689c1620 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -825,7 +825,7 @@ void QUnixPrintWidgetPrivate::applyPrinterProperties(QPrinter *p) return; printer = p; if (p->outputFileName().isEmpty()) { - QString home = QString::fromLocal8Bit(qgetenv("HOME").constData()); + QString home = QDir::homePath(); QString cur = QDir::currentPath(); if (home.at(home.length()-1) != QLatin1Char('/')) home += QLatin1Char('/'); |