author | zautrix <zautrix> | 2004-10-03 18:03:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-03 18:03:18 (UTC) |
commit | dd8f6efd23350b101065ddb64f35920f24010185 (patch) (unidiff) | |
tree | 76475452c6c8854178a84e5fff863a21a8e117d3 /microkde | |
parent | 2a7b61c2b45a0a0344ae65633b2578b4cde1753f (diff) | |
download | kdepimpi-dd8f6efd23350b101065ddb64f35920f24010185.zip kdepimpi-dd8f6efd23350b101065ddb64f35920f24010185.tar.gz kdepimpi-dd8f6efd23350b101065ddb64f35920f24010185.tar.bz2 |
Fixes for desktop. Fixed kdehomedir on wintendo
-rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp index 7f2a326..1c3e0ae 100644 --- a/microkde/kdecore/kstandarddirs.cpp +++ b/microkde/kdecore/kstandarddirs.cpp | |||
@@ -44,2 +44,3 @@ | |||
44 | #include <qstring.h> | 44 | #include <qstring.h> |
45 | #include <qmessagebox.h> | ||
45 | #include <qapplication.h> | 46 | #include <qapplication.h> |
@@ -1206,10 +1207,13 @@ static QString readEnvPath(const char *env) | |||
1206 | { | 1207 | { |
1207 | #ifdef _WIN32_ | 1208 | //#ifdef _WIN32_ |
1208 | return ""; | 1209 | // return ""; |
1209 | #else | 1210 | //#else |
1210 | QCString c_path = getenv(env); | 1211 | QCString c_path; |
1211 | if (c_path.isEmpty()) | 1212 | if ( getenv(env) != NULL ) |
1212 | return QString::null; | 1213 | c_path = QString ( getenv(env) ); |
1213 | return QFile::decodeName(c_path); | 1214 | if (c_path.isEmpty()) |
1214 | #endif | 1215 | return QString::null; |
1216 | return QFile::decodeName(c_path); | ||
1217 | //#endif | ||
1218 | |||
1215 | } | 1219 | } |
@@ -1218,2 +1222,3 @@ void KStandardDirs::addKDEDefaults() | |||
1218 | { | 1222 | { |
1223 | |||
1219 | //qDebug("ERROR: KStandardDirs::addKDEDefaults() called "); | 1224 | //qDebug("ERROR: KStandardDirs::addKDEDefaults() called "); |
@@ -1269,4 +1274,10 @@ void KStandardDirs::addKDEDefaults() | |||
1269 | { | 1274 | { |
1275 | #ifdef _WIN32_ | ||
1276 | if (localKdeDir.at(localKdeDir.length()-1) != '\\') | ||
1277 | localKdeDir += '\\'; | ||
1278 | #else | ||
1270 | if (localKdeDir.at(localKdeDir.length()-1) != '/') | 1279 | if (localKdeDir.at(localKdeDir.length()-1) != '/') |
1271 | localKdeDir += '/'; | 1280 | localKdeDir += '/'; |
1281 | #endif | ||
1282 | //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 ); | ||
1272 | } | 1283 | } |