[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: KDE/kdelibs/kdecore
From: Alexander Neundorf <neundorf () kde ! org>
Date: 2006-11-14 21:41:18
Message-ID: 1163540478.675675.28989.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 604973 by neundorf:
-kill KDEDIR now and forever, may it rest in pieces ;-)
Alex
CCMAIL: kde-core-devel@kde.org
CCMAIL: kde-windows@kde.org
CCMAIL: Ch.Ehrlicher@gmx.de
M +3 -14 kstandarddirs.cpp
M +1 -4 kstandarddirs.h
--- trunk/KDE/kdelibs/kdecore/kstandarddirs.cpp #604972:604973
@@ -1312,14 +1312,12 @@
if (!s->defaultprefix.isEmpty())
return s->defaultprefix;
#ifdef Q_WS_WIN
- s->defaultprefix = readEnvPath("KDEDIR");
- if (s->defaultprefix.isEmpty()) {
- s->defaultprefix = QFile::decodeName(KDEDIR);
- //TODO: find other location (the Registry?)
- }
+ s->defaultprefix = QFile::decodeName(KDEDIR);
+ //TODO: find other location (the Registry?)
#else //UNIX
s->defaultprefix = KDEDIR;
#endif
+
if (s->defaultprefix.isEmpty())
kWarning() << "KStandardDirs::kfsstnd_defaultprefix(): default KDE prefix not found!" << endl;
return s->defaultprefix;
@@ -1374,15 +1372,6 @@
{
tokenize(kdedirList, kdedirs, QString(QChar(KPATH_SEPARATOR)));
}
- else
- {
- QString kdedir = readEnvPath("KDEDIR");
- if (!kdedir.isEmpty())
- {
- kdedir = KShell::tildeExpand(kdedir);
- kdedirList.append(kdedir);
- }
- }
kdedirList.append(QFile::decodeName(KDEDIR));
#ifdef __KDE_EXECPREFIX
--- trunk/KDE/kdelibs/kdecore/kstandarddirs.h #604972:604973
@@ -107,9 +107,6 @@
* search for resources. The directories should be separated
* by <tt>':'</tt>. The directories are searched in the order they are
* specified.
- * @li @c KDEDIR - Used for backwards compatibility. As @c KDEDIRS but only a single
- * directory may be specified. If @c KDEDIRS is set @c KDEDIR is
- * ignored.
* @li @c KDEHOME - The directory where changes are saved to. This directory is
* used to search for resources first. If @c KDEHOME is not
* specified it defaults to @c "$HOME/.kde"
@@ -185,7 +182,7 @@
* Adds another search dir to front of the @p fsstnd list.
*
* @li When compiling kdelibs, the prefix is added to this.
- * @li @c KDEDIRS or @c KDEDIR is taken into account
+ * @li @c KDEDIRS is taken into account
* @li Additional dirs may be loaded from kdeglobals.
*
* @param dir The directory to append relative paths to.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic