[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore
From:       David Faure <faure () kde ! org>
Date:       2009-01-05 18:59:18
Message-ID: 1231181958.672246.11199.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 906194 by dfaure:

Fix KStandardDirs::allTypes not really returning all types, so kde4-config --types \
was missing lib, socket, tmp, cache, and include, as Alexxxxxx noted.


 M  +2 -19     kde-config.cpp  
 M  +15 -2     kernel/kstandarddirs.cpp  


--- trunk/KDE/kdelibs/kdecore/kde-config.cpp #906193:906194
@@ -121,27 +121,10 @@
     if (args->isSet("types"))
     {
         QStringList types = KGlobal::dirs()->allTypes();
-        // The list returned by allTypes() doesn't contain the lib, include,
-        // tmp and socket directories. I don't know if it should:
-        // http://lists.kde.org/?l=kde-core-devel&m=123088427220820&w=2
-        // But we have documentation for them, so insert these manually into this \
                lists
-        // so the documentation printed is complete. Alex
-        if(!types.contains("lib")) {
-            types << "lib";
-        }
-        if(!types.contains("include")) {
-            types << "include";
-        }
-        if(!types.contains("tmp")) {
-            types << "tmp";
-        }
-        if(!types.contains("socket")) {
-            types << "socket";
-        }
-
         types.sort();
         const char *helptexts[] = {
             "apps", I18N_NOOP("Applications menu (.desktop files)"),
+            "cache", I18N_NOOP("Cached information (e.g. favicons, web-pages)"),
             "cgi", I18N_NOOP("CGIs to run from kdehelp"),
             "config", I18N_NOOP("Configuration files"),
             "data", I18N_NOOP("Where applications store data"),
@@ -165,7 +148,7 @@
             "xdgdata-apps", I18N_NOOP("XDG Application menu (.desktop files)"),
             "xdgdata-dirs", I18N_NOOP("XDG Menu descriptions (.directory files)"),
             "xdgdata-icon", I18N_NOOP("XDG Icons"),
-            "xdgdata-pixmaps", I18N_NOOP("Legacy pixmaps"),
+            "xdgdata-pixmap", I18N_NOOP("Legacy pixmaps"),
             "xdgdata-mime", I18N_NOOP("XDG Mime Types"),
             "xdgconf-menu", I18N_NOOP("XDG Menu layout (.menu files)"),
             "tmp", I18N_NOOP("Temporary files (specific for both current host and \
                current user)"),
--- trunk/KDE/kdelibs/kdecore/kernel/kstandarddirs.cpp #906193:906194
@@ -97,7 +97,7 @@
  * 2) update the KStandardDirs class documentation
  * 3) update the kde_default code
  * 4) update the kde_default documentation
- * 5) update the list in kde-config.cpp.in
+ * 5) update the list in kde-config.cpp
 
  data
  share/apps
@@ -266,6 +266,19 @@
     QStringList list;
     for (int i = 0; types_indices[i] != -1; i += 2)
         list.append(QLatin1String(types_string + types_indices[i]));
+    // Those are added manually by addKDEDefaults
+    list.append("lib");
+    //list.append("home"); // undocumented on purpose, said Waldo in r113855.
+
+    // Those are handled by resourceDirs() itself
+    list.append("socket");
+    list.append("tmp");
+    list.append("cache");
+    // Those are handled by installPath()
+    list.append("include");
+
+    // If you add anything here, make sure kde-config.cpp has a description for it.
+
     return list;
 }
 
@@ -1126,7 +1139,7 @@
 #endif
     QFileInfo info( path );
     QFileInfo orig = info;
-    if( info.exists() && info.isSymLink() ) 
+    if( info.exists() && info.isSymLink() )
         info = QFileInfo( info.canonicalFilePath() );
     if( info.exists() && ( ignoreExecBit || info.isExecutable() ) && info.isFile() ) \
                {
         // return absolute path, but without symlinks resolved in order to prevent


[prev in list] [next in list] [prev in thread] [next in thread]