From 50058d3b42b7a929546414e1da97c24ff6fc5245 Mon Sep 17 00:00:00 2001 From: Martin van Zijl Date: Sep 06 2019 22:32:20 +0000 Subject: Use QDir::home() instead of getenv("HOME") in file browser. This is following up from PR #2735. --- diff --git a/toonz/sources/toonz/filebrowsermodel.cpp b/toonz/sources/toonz/filebrowsermodel.cpp index dc6f523..3840026 100644 --- a/toonz/sources/toonz/filebrowsermodel.cpp +++ b/toonz/sources/toonz/filebrowsermodel.cpp @@ -51,13 +51,10 @@ TFilePath getMyDocumentsPath() { return TFilePath((const char *)[documentsDirectory cStringUsingEncoding:NSASCIIStringEncoding]); #else - std::string path(getenv("HOME")); - if(path.empty()) return TFilePath(); - path += "/Documents"; - QString pathAsQString = QString::fromStdString(path); - QDir dir(pathAsQString); + QDir dir = QDir::home(); + dir.cd("Documents"); if(!dir.exists()) return TFilePath(); - return TFilePath(path); + return TFilePath(dir.absolutePath().toStdString()); #endif } @@ -79,13 +76,10 @@ TFilePath getDesktopPath() { return TFilePath((const char *)[desktopDirectory cStringUsingEncoding:NSASCIIStringEncoding]); #else - std::string path(getenv("HOME")); - if(path.empty()) return TFilePath(); - path += "/Desktop"; - QString pathAsQString = QString::fromStdString(path); - QDir dir(pathAsQString); + QDir dir = QDir::home(); + dir.cd("Desktop"); if(!dir.exists()) return TFilePath(); - return TFilePath(path); + return TFilePath(dir.absolutePath().toStdString()); #endif } }