data dir

2 files changed, 4 insertions, 2 deletions

diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 4c03c15..f3584d7 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -902,761 +902,763 @@ int KStandardDirs::findAllExe( QStringList& list, const QString& appname,
     }
 
     list.clear();
     tokenize( tokens, p, ":\b" );
 
     for ( unsigned i = 0; i < tokens.count(); i++ ) {
 	p = tokens[ i ];
 	p += "/";
 	p += appname;
 
 	info.setFile( p );
 
 	if( info.exists() && (ignore || info.isExecutable())
 	    && info.isFile() ) {
 	    list.append( p );
 	}
 
     }
 
     return list.count();
 }
 */
 
 static int tokenize( QStringList& tokens, const QString& str,
 		     const QString& delim )
 {
     int len = str.length();
     QString token = "";
 
     for( int index = 0; index < len; index++)
     {
 	if ( delim.find( str[ index ] ) >= 0 )
 	{
 	    tokens.append( token );
 	    token = "";
 	}
 	else
 	{
 	    token += str[ index ];
 	}
     }
     if ( token.length() > 0 )
     {
 	tokens.append( token );
     }
 
     return tokens.count();
 }
 
 QString KStandardDirs::kde_default(const char *type) {
     if (!strcmp(type, "data"))
 	return "apps/";
     if (!strcmp(type, "html"))
 	return "share/doc/HTML/";
     if (!strcmp(type, "icon"))
 	return "share/icons/";
     if (!strcmp(type, "config"))
 	return "config/";
     if (!strcmp(type, "pixmap"))
 	return "share/pixmaps/";
     if (!strcmp(type, "apps"))
 	return "share/applnk/";
     if (!strcmp(type, "sound"))
 	return "share/sounds/";
     if (!strcmp(type, "locale"))
 	return "share/locale/";
     if (!strcmp(type, "services"))
 	return "share/services/";
     if (!strcmp(type, "servicetypes"))
 	return "share/servicetypes/";
     if (!strcmp(type, "mime"))
 	return "share/mimelnk/";
     if (!strcmp(type, "cgi"))
 	return "cgi-bin/";
     if (!strcmp(type, "wallpaper"))
 	return "share/wallpapers/";
     if (!strcmp(type, "templates"))
 	return "share/templates/";
     if (!strcmp(type, "exe"))
 	return "bin/";
     if (!strcmp(type, "lib"))
       	return "lib/";
     if (!strcmp(type, "module"))
       	return "lib/kde3/";
     if (!strcmp(type, "qtplugins"))
         return "lib/kde3/plugins";
     if (!strcmp(type, "xdgdata-apps"))
         return "applications/";
     if (!strcmp(type, "xdgdata-dirs"))
         return "desktop-directories/";
     if (!strcmp(type, "xdgconf-menu"))
         return "menus/";
     if (!strcmp(type, "tmp"))
 	return "tmp/";
 
     qFatal("unknown resource type %s", type);
     return QString::null;
 }
 
 QString KStandardDirs::saveLocation(const char *type,
 				    const QString& suffix,
 				    bool create) const
 {
     //qDebug("KStandardDirs::saveLocation called %s %s", type,suffix.latin1() );
     //return "";
     checkConfig();
 
     QString *pPath = savelocations.find(type);
     if (!pPath)
     {
        QStringList *dirs = relatives.find(type);
        if (!dirs && (
                      (strcmp(type, "socket") == 0) ||
                      (strcmp(type, "tmp") == 0) ||
                      (strcmp(type, "cache") == 0) ))
        {
           (void) resourceDirs(type); // Generate socket|tmp|cache resource.
           dirs = relatives.find(type); // Search again.
        }
        if (dirs)
        {
           // Check for existance of typed directory + suffix
           if (strncmp(type, "xdgdata-", 8) == 0)
              pPath = new QString(realPath(localxdgdatadir() + dirs->last()));
           else if (strncmp(type, "xdgconf-", 8) == 0)
              pPath = new QString(realPath(localxdgconfdir() + dirs->last()));
           else
              pPath = new QString(realPath(localkdedir() + dirs->last()));
        }
        else {
           dirs = absolutes.find(type);
           if (!dirs)
              qFatal("KStandardDirs: The resource type %s is not registered", type);
           pPath = new QString(realPath(dirs->last()));
        }
 
        savelocations.insert(type, pPath);
     }
 
     QString fullPath = *pPath + suffix;
 //US    struct stat st;
 //US    if (stat(QFile::encodeName(fullPath), &st) != 0 || !(S_ISDIR(st.st_mode)))
       QFileInfo fullPathInfo(QFile::encodeName(fullPath));
       if (fullPathInfo.isReadable() || !fullPathInfo.isDir())
 
 
     {
 	if(!create) {
 #ifndef NDEBUG
 	    qDebug("save location %s doesn't exist", fullPath.latin1());
 #endif
 	    return fullPath;
 	}
 	if(!makeDir(fullPath, 0700)) {
             qWarning("failed to create %s", fullPath.latin1());
 	    return fullPath;
 	}
         dircache.remove(type);
     }
     return fullPath;
 }
 
 QString KStandardDirs::relativeLocation(const char *type, const QString &absPath)
 {
     QString fullPath = absPath;
     int i = absPath.findRev('/');
     if (i != -1)
     {
        fullPath = realPath(absPath.left(i+1))+absPath.mid(i+1); // Normalize
     }
 
     QStringList candidates = resourceDirs(type);
 
     for (QStringList::ConstIterator it = candidates.begin();
 	 it != candidates.end(); it++)
       if (fullPath.startsWith(*it))
       {
 	return fullPath.mid((*it).length());
       }
 
     return absPath;
 }
 
 
 bool KStandardDirs::makeDir(const QString& dir2, int mode)
 {
   QString dir = QDir::convertSeparators( dir2  );
 #if 0
     //LR
 
     // we want an absolute path
     if (dir.at(0) != '/')
         return false;
 
     QString target = dir;
     uint len = target.length();
 
     // append trailing slash if missing
     if (dir.at(len - 1) != '/')
         target += '/';
 
     QString base("");
     uint i = 1;
 
     while( i < len )
     {
 //US        struct stat st;
         int pos = target.find('/', i);
         base += target.mid(i - 1, pos - i + 1);
         QCString baseEncoded = QFile::encodeName(base);
         // bail out if we encountered a problem
 //US        if (stat(baseEncoded, &st) != 0)
         QFileInfo baseEncodedInfo(baseEncoded);
         if (!baseEncodedInfo.exists())
         {
           // Directory does not exist....
           // Or maybe a dangling symlink ?
 //US          if (lstat(baseEncoded, &st) == 0)
           if (baseEncodedInfo.isSymLink()) {
 //US              (void)unlink(baseEncoded); // try removing
               QFile(baseEncoded).remove();
           }
 
 //US	  if ( mkdir(baseEncoded, (mode_t) mode) != 0)
     QDir dirObj;
 	  if ( dirObj.mkdir(baseEncoded) != true )
     {
 //US	    perror("trying to create local folder");
 	    return false; // Couldn't create it :-(
 	  }
         }
         i = pos + 1;
     }
     return true;
 #endif
 
     // ********************************************
     // new code for WIN32
   QDir dirObj;
 
 
     // we want an absolute path
 #ifndef _WIN32_
     if (dir.at(0) != '/')
         return false;
 #endif
 
     QString target = dir;
     uint len = target.length();
 #ifndef _WIN32_
     // append trailing slash if missing
     if (dir.at(len - 1) != '/')
         target += '/';
 #endif
 
     QString base("");
     uint i = 1;
 
     while( i < len )
     {
 //US        struct stat st;
 #ifndef _WIN32_
         int pos = target.find('/', i);
 #else
 	int pos = target.find('\\', i);
 #endif
 	if ( pos < 0 )
 	  return true;
         base += target.mid(i - 1, pos - i + 1);
 	//QMessageBox::information( 0,"cap111", base, 1 );
 /*US
         QCString baseEncoded = QFile::encodeName(base);
         // bail out if we encountered a problem
         if (stat(baseEncoded, &st) != 0)
         {
           // Directory does not exist....
           // Or maybe a dangling symlink ?
           if (lstat(baseEncoded, &st) == 0)
               (void)unlink(baseEncoded); // try removing
 
 
           if ( mkdir(baseEncoded, (mode_t) mode) != 0) {
             perror("trying to create local folder");
             return false; // Couldn't create it :-(
           }
         }
 */
 
         if (dirObj.exists(base) == false)
         {
             //qDebug("KStandardDirs::makeDir try to create : %s" , base.latin1());
           if (dirObj.mkdir(base) != true)
           {
             qDebug("KStandardDirs::makeDir could not create: %s" , base.latin1());
             return false;
           }
         }
 
         i = pos + 1;
     }
     return true;
 
 }
 
 static QString readEnvPath(const char *env)
 {
   //#ifdef _WIN32_
   //    return "";
   //#else
   QCString c_path;
   if ( getenv(env) != NULL )
     c_path = QString ( getenv(env) );
   if (c_path.isEmpty())
     return QString::null;
   return QFile::decodeName(c_path);
    //#endif
 
 }
 
 void KStandardDirs::addKDEDefaults()
 {
  
     //qDebug("ERROR: KStandardDirs::addKDEDefaults() called ");
     //return;
     QStringList kdedirList;
 
     // begin KDEDIRS
     QString kdedirs = readEnvPath("MICROKDEDIRS");
     if (!kdedirs.isEmpty())
     {
 	tokenize(kdedirList, kdedirs, ":");
     }
     else
     {
 	QString kdedir = readEnvPath("MICROKDEDIR");
 	if (!kdedir.isEmpty())
         {
            kdedir = KShell::tildeExpand(kdedir);
 	   kdedirList.append(kdedir);
         }
     }
 //US    kdedirList.append(KDEDIR);
 //US for embedded, add qtopia dir as kdedir
 
 #ifndef DESKTOP_VERSION
     QString tmp = readEnvPath("QPEDIR");
     if (!tmp.isEmpty())
       kdedirList.append(tmp);
 
     tmp = readEnvPath("QTDIR");
     if (!tmp.isEmpty())
       kdedirList.append(tmp);
 
     tmp = readEnvPath("OPIEDIR");
     if (!tmp.isEmpty())
       kdedirList.append(tmp);
 
 #endif
 
 #ifdef __KDE_EXECPREFIX
     QString execPrefix(__KDE_EXECPREFIX);
     if (execPrefix!="NONE")
        kdedirList.append(execPrefix);
 #endif
 
     QString localKdeDir;
 
 //US    if (getuid())
     if (true)
     {
        localKdeDir = readEnvPath("MICROKDEHOME");
        if (!localKdeDir.isEmpty())
        {
 #ifdef _WIN32_
           if (localKdeDir.at(localKdeDir.length()-1) != '\\')
              localKdeDir += '\\';
 #else
           if (localKdeDir.at(localKdeDir.length()-1) != '/')
              localKdeDir += '/';
 #endif
 	  //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 );
        }
        else
        {
-          localKdeDir =  QDir::homeDirPath() + "/kdepim/";
+           KConfig cfg (   QDir::homeDirPath() + "/.microkdehome" );
+           cfg.setGroup("Global");
+           localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" );
        }
     }
     else
     {
        // We treat root different to prevent root messing up the
        // file permissions in the users home directory.
        localKdeDir = readEnvPath("MICROKDEROOTHOME");
        if (!localKdeDir.isEmpty())
        {
           if (localKdeDir.at(localKdeDir.length()-1) != '/')
              localKdeDir += '/';
        }
        else
        {
 //US          struct passwd *pw = getpwuid(0);
 //US          localKdeDir =  QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root")  + "/.microkde/";
               qDebug("KStandardDirs::addKDEDefaults: 1 has to be fixed");
        }
 
     }
 
 //US    localKdeDir =  appDir();
 
 //US
 //  qDebug("KStandardDirs::addKDEDefaults: localKdeDir=%s", localKdeDir.latin1());
     if (localKdeDir != "-/")
     {
         localKdeDir = KShell::tildeExpand(localKdeDir);
         addPrefix(localKdeDir);
     }
 
     for (QStringList::ConstIterator it = kdedirList.begin();
 	 it != kdedirList.end(); it++)
     {
         QString dir = KShell::tildeExpand(*it);
 	addPrefix(dir);
     }
     // end KDEDIRS
 
     // begin XDG_CONFIG_XXX
     QStringList xdgdirList;
     QString xdgdirs = readEnvPath("XDG_CONFIG_DIRS");
     if (!xdgdirs.isEmpty())
     {
 	tokenize(xdgdirList, xdgdirs, ":");
     }
     else
     {
 	xdgdirList.clear();
         xdgdirList.append("/etc/xdg");
     }
 
     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
     if (!localXdgDir.isEmpty())
     {
        if (localXdgDir.at(localXdgDir.length()-1) != '/')
           localXdgDir += '/';
     }
     else
     {
 //US       if (getuid())
        if (true)
        {
           localXdgDir =  QDir::homeDirPath() + "/.config/";
        }
        else
        {
 //US          struct passwd *pw = getpwuid(0);
 //US          localXdgDir =  QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root")  + "/.config/";
               qDebug("KStandardDirs::addKDEDefaults: 2 has to be fixed");
        }
     }
 
     localXdgDir = KShell::tildeExpand(localXdgDir);
     addXdgConfigPrefix(localXdgDir);
 
     for (QStringList::ConstIterator it = xdgdirList.begin();
 	 it != xdgdirList.end(); it++)
     {
         QString dir = KShell::tildeExpand(*it);
 	addXdgConfigPrefix(dir);
     }
     // end XDG_CONFIG_XXX
 
     // begin XDG_DATA_XXX
     xdgdirs = readEnvPath("XDG_DATA_DIRS");
     if (!xdgdirs.isEmpty())
     {
 	tokenize(xdgdirList, xdgdirs, ":");
     }
     else
     {
 	xdgdirList.clear();
         for (QStringList::ConstIterator it = kdedirList.begin();
            it != kdedirList.end(); it++)
         {
            QString dir = *it;
            if (dir.at(dir.length()-1) != '/')
              dir += '/';
            xdgdirList.append(dir+"share/");
         }
 
         xdgdirList.append("/usr/local/share/");
         xdgdirList.append("/usr/share/");
     }
 
     localXdgDir = readEnvPath("XDG_DATA_HOME");
     if (!localXdgDir.isEmpty())
     {
        if (localXdgDir.at(localXdgDir.length()-1) != '/')
           localXdgDir += '/';
     }
     else
     {
 //US       if (getuid())
        if (true)
        {
           localXdgDir =  QDir::homeDirPath() + "/.local/share/";
        }
        else
        {
 //US          struct passwd *pw = getpwuid(0);
 //US          localXdgDir =  QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root")  + "/.local/share/";
               qDebug("KStandardDirs::addKDEDefaults: 3 has to be fixed");
        }
     }
 
     localXdgDir = KShell::tildeExpand(localXdgDir);
     addXdgDataPrefix(localXdgDir);
 
     for (QStringList::ConstIterator it = xdgdirList.begin();
 	 it != xdgdirList.end(); it++)
     {
         QString dir = KShell::tildeExpand(*it);
 
 	addXdgDataPrefix(dir);
     }
     // end XDG_DATA_XXX
 
 
     uint index = 0;
     while (types[index] != 0) {
 	addResourceType(types[index], kde_default(types[index]));
 	index++;
     }
 
     addResourceDir("home", QDir::homeDirPath());
 }
 
 void KStandardDirs::checkConfig() const
 {
 /*US
     if (!addedCustoms && KGlobal::_instance && KGlobal::_instance->_config)
         const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::_instance->_config);
 */
     if (!addedCustoms && KGlobal::config())
         const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::config());
 }
 
 bool KStandardDirs::addCustomized(KConfig *config)
 {
     if (addedCustoms) // there are already customized entries
         return false; // we just quite and hope they are the right ones
 
     // save the numbers of config directories. If this changes,
     // we will return true to give KConfig a chance to reparse
     uint configdirs = resourceDirs("config").count();
 
     // reading the prefixes in
     QString oldGroup = config->group();
     config->setGroup("Directories");
 
     QStringList list;
     QStringList::ConstIterator it;
     list = config->readListEntry("prefixes");
     for (it = list.begin(); it != list.end(); it++)
 	addPrefix(*it);
 
     // iterating over all entries in the group Directories
     // to find entries that start with dir_$type
 /*US
     QMap<QString, QString> entries = config->entryMap("Directories");
 
     QMap<QString, QString>::ConstIterator it2;
     for (it2 = entries.begin(); it2 != entries.end(); it2++)
     {
       QString key = it2.key();
       if (key.left(4) == "dir_") {
         // generate directory list, there may be more than 1.
         QStringList dirs = QStringList::split(',', *it2);
         QStringList::Iterator sIt(dirs.begin());
         QString resType = key.mid(4, key.length());
         for (; sIt != dirs.end(); ++sIt) {
           addResourceDir(resType.latin1(), *sIt);
         }
       }
     }
 
     // Process KIOSK restrictions.
     config->setGroup("KDE Resource Restrictions");
     entries = config->entryMap("KDE Resource Restrictions");
     for (it2 = entries.begin(); it2 != entries.end(); it2++)
     {
 	QString key = it2.key();
         if (!config->readBoolEntry(key, true))
         {
            d->restrictionsActive = true;
            d->restrictions.insert(key.latin1(), &d->restrictionsActive); // Anything will do
            dircache.remove(key.latin1());
         }
     }
 */
     // save it for future calls - that will return
     addedCustoms = true;
     config->setGroup(oldGroup);
 
     // return true if the number of config dirs changed
     return (resourceDirs("config").count() != configdirs);
 }
 
 QString KStandardDirs::localkdedir() const
 {
     // Return the prefix to use for saving
     return prefixes.first();
 }
 
 QString KStandardDirs::localxdgdatadir() const
 {
     // Return the prefix to use for saving
     return d->xdgdata_prefixes.first();
 }
 
 QString KStandardDirs::localxdgconfdir() const
 {
     // Return the prefix to use for saving
     return d->xdgconf_prefixes.first();
 }
 
 void KStandardDirs::setAppDir( const QString &appDir )
 {
   mAppDir = appDir;
 
   if ( mAppDir.right( 1 ) != "/" )
     mAppDir += "/";
 }
 
 QString KStandardDirs::appDir()
 {
   return mAppDir;
 }
 
 // just to make code more readable without macros
 QString locate( const char *type,
 		const QString& filename/*US , const KInstance* inst*/ )
 {
 //US    return inst->dirs()->findResource(type, filename);
     return KGlobal::dirs()->findResource(type, filename);
 }
 
 QString locateLocal( const char *type,
 	             const QString& filename/*US , const KInstance* inst*/ )
 {
 
      QString path = locateLocal(type, filename, true /*US, inst*/);
 
 
 /*
      static int ccc = 0;
      ++ccc;
      if ( ccc > 13 )
          abort();
 */
      //qDebug("locatelocal: %s" , path.latin1());
      return path;
 
 /*US why do we put all files into one directory. It is quit complicated.
 why not staying with the original directorystructure ?
 
 
   QString escapedFilename = filename;
   escapedFilename.replace( QRegExp( "/" ), "_" );
 
   QString path = KStandardDirs::appDir() + type + "_" + escapedFilename;
 
   kdDebug() << "locate: '" << path << "'" << endl;
   qDebug("locate: %s" , path.latin1());
   return path;
 */
 //US so my proposal is this:
 
 //  QString escapedFilename = filename;
 //  escapedFilename.replace( QRegExp( "/" ), "_" );
 
 #if 0
 #ifdef _WIN32_
   QString path = QDir::convertSeparators(KStandardDirs::appDir() + type + "/" + filename);
 #else
   QString path = KStandardDirs::appDir() + type + "/" + filename;
 #endif
 
   //US Create the containing dir if needed
   QFileInfo fi ( path );
 
   // QString dir=pathurl.directory();
   //	QMessageBox::information( 0,"path", path, 1 );
 
 #ifdef _WIN32_
   KStandardDirs::makeDir(path);
 #else
   KStandardDirs::makeDir(fi.dirPath( true ));
 #endif
 
   qDebug("locate22: %s" , path.latin1());
   return path;
 
 #endif
 
 }
 
 QString locateLocal( const char *type,
 	             const QString& filename, bool createDir/*US , const KInstance* inst*/ )
 {
     // try to find slashes. If there are some, we have to
     // create the subdir first
     int slash = filename.findRev('/')+1;
     if (!slash) // only one filename
 //US	return inst->dirs()->saveLocation(type, QString::null, createDir) + filename;
       return KGlobal::dirs()->saveLocation(type, QString::null, createDir) + filename;
 
     // split path from filename
     QString dir = filename.left(slash);
     QString file = filename.mid(slash);
 //US    return inst->dirs()->saveLocation(type, dir, createDir) + file;
     return KGlobal::dirs()->saveLocation(type, dir, createDir) + file;
 
     // ***************************************************************
 #if 0
 
 /*US why do we put all files into one directory. It is quit complicated.
 why not staying with the original directorystructure ?
 
 
   QString escapedFilename = filename;
   escapedFilename.replace( QRegExp( "/" ), "_" );
 
   QString path = KStandardDirs::appDir() + type + "_" + escapedFilename;
 
   kdDebug() << "locate: '" << path << "'" << endl;
   qDebug("locate: %s" , path.latin1());
   return path;
 */
 //US so my proposal is this:
 
 //  QString escapedFilename = filename;
 //  escapedFilename.replace( QRegExp( "/" ), "_" );
 
 #ifdef _WIN32_
   QString path = QDir::convertSeparators(KStandardDirs::appDir() + type + "/" + filename);
 #else
   QString path = KStandardDirs::appDir() + type + "/" + filename;
 #endif
 
   //US Create the containing dir if needed
   KURL pathurl;
   pathurl.setPath(path);
   QString dir=pathurl.directory();
   //	QMessageBox::information( 0,"path", path, 1 );
 #ifdef _WIN32_
   KStandardDirs::makeDir(path);
 #else
   KStandardDirs::makeDir(dir);
 #endif
 
   return path;
 #endif
 }
diff --git a/microkde/kdecore/kstandarddirs.h b/microkde/kdecore/kstandarddirs.h
index c4e1108..bee864e 100644
--- a/microkde/kdecore/kstandarddirs.h
+++ b/microkde/kdecore/kstandarddirs.h
@@ -187,495 +187,495 @@ public:
 	bool addResourceType( const char *type,
 			      const QString& relativename );
 
 	/**
 	 * Adds absolute path at the end of the search path for
 	 * particular types (for example in case of icons where
 	 * the user specifies extra paths).
 	 *
 	 * You shouldn't need this
 	 * function in 99% of all cases besides adding user-given
 	 * paths.
 	 *
 	 * @param type Specifies a short descriptive string to access files
 	 * of this type.
 	 * @param absdir Points to directory where to look for this specific
 	 * type. Non-existant directories may be saved but pruned.
 	 * @return true if successful, false otherwise.
 	 */
 	bool addResourceDir( const char *type,
 			     const QString& absdir);
 
 	/**
 	 * Tries to find a resource in the following order:
 	 * @li All PREFIX/\<relativename> paths (most recent first).
 	 * @li All absolute paths (most recent first).
 	 *
 	 * The filename should be a filename relative to the base dir
 	 * for resources. So is a way to get the path to libkdecore.la
 	 * to findResource("lib", "libkdecore.la"). KStandardDirs will
 	 * then look into the subdir lib of all elements of all prefixes
 	 * ($KDEDIRS) for a file libkdecore.la and return the path to
 	 * the first one it finds (e.g. /opt/kde/lib/libkdecore.la)
 	 *
 	 * @param type The type of the wanted resource
 	 * @param filename A relative filename of the resource.
 	 *
 	 * @return A full path to the filename specified in the second
 	 *         argument, or QString::null if not found.
 	 */
 	QString findResource( const char *type,
 			      const QString& filename ) const;
 
 	/**
 	 * Checks whether a resource is restricted as part of the KIOSK
 	 * framework. When a resource is restricted it means that user-
 	 * specific files in the resource are ignored.
 	 *
 	 * E.g. by restricting the "wallpaper" resource, only system-wide
 	 * installed wallpapers will be found by this class. Wallpapers
 	 * installed under the $KDEHOME directory will be ignored.
 	 *
 	 * @param type The type of the resource to check
 	 * @param relPath A relative path in the resource.
 	 *
 	 * @return True if the resource is restricted.
 	 * @since 3.1
 	 */
 	bool isRestrictedResource( const char *type,
 			      const QString& relPath=QString::null ) const;
 
         /**
          * Returns a number that identifies this version of the resource.
          * When a change is made to the resource this number will change.
          *
 	 * @param type The type of the wanted resource
 	 * @param filename A relative filename of the resource.
 	 * @param deep If true, all resources are taken into account
 	 *        otherwise only the one returned by findResource().
 	 *
 	 * @return A number identifying the current version of the
 	 *          resource.
 	 */
 /*US   
 	Q_UINT32 calcResourceHash( const char *type,
 			      const QString& filename, bool deep) const;
 */
 	/**
 	 * Tries to find all directories whose names consist of the
 	 * specified type and a relative path. So would
 	 * findDirs("apps", "Settings") return
 	 * @li /opt/kde/share/applnk/Settings/
 	 * @li /home/joe/.kde/share/applnk/Settings/
 	 *
 	 * Note that it appends / to the end of the directories,
 	 * so you can use this right away as directory names.
 	 *
 	 * @param type The type of the base directory.
 	 * @param reldir Relative directory.
 	 *
 	 * @return A list of matching directories, or an empty
 	 *         list if the resource specified is not found.
 	 */
 	QStringList findDirs( const char *type,
                               const QString& reldir ) const;
 
 	/**
 	 * Tries to find the directory the file is in.
 	 * It works the same as @ref findResource(), but it doesn't
 	 * return the filename but the name of the directory.
 	 *
 	 * This way the application can access a couple of files
 	 * that have been installed into the same directory without
 	 * having to look for each file.
 	 *
 	 * findResourceDir("lib", "libkdecore.la") would return the
 	 * path of the subdir libkdecore.la is found first in
 	 * (e.g. /opt/kde/lib/)
 	 *
 	 * @param type The type of the wanted resource
 	 * @param filename A relative filename of the resource.
 	 * @return The directory where the file specified in the second
 	 *         argument is located, or QString::null if the type
 	 *         of resource specified is unknown or the resource
 	 *         cannot be found.
 	 */
 	QString findResourceDir( const char *type,
 				 const QString& filename) const;
 
 
 	/**
 	 * Tries to find all resources with the specified type.
 	 *
 	 * The function will look into all specified directories
 	 * and return all filenames in these directories.
 	 *
 	 * @param type The type of resource to locate directories for.
 	 * @param filter Only accept filenames that fit to filter. The filter
 	 *        may consist of an optional directory and a @ref QRegExp
 	 *        wildcard expression. E.g. "images\*.jpg". Use QString::null
 	 *        if you do not want a filter.
 	 * @param recursive Specifies if the function should decend
 	 *        into subdirectories.
 	 * @param uniq If specified,  only return items which have
 	 *        unique suffixes - suppressing duplicated filenames.
 	 *
 	 * @return A list of directories matching the resource specified,
 	 *         or an empty list if the resource type is unknown.
 	 */
 	QStringList findAllResources( const char *type,
 				       const QString& filter = QString::null,
 				       bool recursive = false,
 				       bool uniq = false) const;
 
 	/**
 	 * Tries to find all resources with the specified type.
 	 *
 	 * The function will look into all specified directories
 	 * and return all filenames (full and relative paths) in
 	 * these directories.
 	 *
 	 * @param type The type of resource to locate directories for.
 	 * @param filter Only accept filenames that fit to filter. The filter
 	 *        may consist of an optional directory and a @ref QRegExp
 	 *        wildcard expression. E.g. "images\*.jpg". Use QString::null
 	 *        if you do not want a filter.
 	 * @param recursive Specifies if the function should decend
 	 *        into subdirectories.
 	 * @param uniq If specified,  only return items which have
 	 *        unique suffixes.
 	 * @param list Of relative paths for the given type.
 	 * @param relPaths The list to store the relative paths into
 	 *        These can be used later to ::locate() the file
 	 *
 	 * @return A list of directories matching the resource specified,
 	 *         or an empty list if the resource type is unknown.
 	 */
 	QStringList findAllResources( const char *type,
 				       const QString& filter,
 				       bool recursive,
 				       bool uniq,
 				       QStringList &relPaths) const;
 
 	/**
 	 * Finds the executable in the system path.
 	 *
 	 * A valid executable must
 	 * be a file and have its executable bit set.
 	 *
 	 * @param appname The name of the executable file for which to search.
 	 * @param pathstr The path which will be searched. If this is
 	 * 		null (default), the $PATH environment variable will
 	 *		be searched.
 	 * @param ignoreExecBit	If true, an existing file will be returned
 	 *			even if its executable bit is not set.
 	 *
 	 * @return The path of the executable. If it was not found,
 	 *         it will return QString::null.
 	 * @see findAllExe()
 	 */
 /*US   
 	static QString findExe( const QString& appname,
 				const QString& pathstr=QString::null,
 				bool ignoreExecBit=false );
 */
 
 	/**
 	 * Finds all occurences of an executable in the system path.
 	 *
 	 * @param list	Will be filled with the pathnames of all the
 	 *		executables found. Will be empty if the executable
 	 *		was not found.
 	 * @param appname	The name of the executable for which to
 	 *	 		search.
 	 * @param pathstr	The path list which will be searched. If this
 	 *		is 0 (default), the $PATH environment variable will
 	 *		be searched.
 	 * @param ignoreExecBit If true, an existing file will be returned
 	 *			even if its executable bit is not set.
 	 *
 	 * @return The number of executables found, 0 if none were found.
 	 *
 	 * @see	findExe()
 	 */
 	static int findAllExe( QStringList& list, const QString& appname,
 			       const QString& pathstr=QString::null,
 			       bool ignoreExecBit=false );
 
 	/**
 	 * This function adds the defaults that are used by the current
 	 * KDE version.
 	 *
 	 * It's a series of @ref addResourceTypes()
 	 * and @ref addPrefix() calls.
 	 * You normally wouldn't call this function because it's called
 	 * for you from @ref KGlobal.
 	 */
 	void addKDEDefaults();
 
 	/**
 	 * Reads customized entries out of the given config object and add
 	 * them via @ref addResourceDirs().
 	 *
 	 * @param config The object the entries are read from. This should
 	 *        contain global config files
 	 * @return true if new config paths have been added
 	 * from @p config.
 	 **/
 	bool addCustomized(KConfig *config);
 
 	/**
 	 * This function is used internally by almost all other function as
 	 * it serves and fills the directories cache.
          *
 	 * @param type The type of resource
 	 * @return The list of possible directories for the specified @p type.
 	 * The function updates the cache if possible.  If the resource
 	 * type specified is unknown, it will return an empty list.
          * Note, that the directories are assured to exist beside the save
          * location, which may not exist, but is returned anyway.
 	 */
 	QStringList resourceDirs(const char *type) const;
 
 	/**
 	 * This function will return a list of all the types that KStandardDirs
 	 * supports.
 	 *
 	 * @return All types that KDE supports
 	 */
 	QStringList allTypes() const;
 
 	/**
 	 * Finds a location to save files into for the given type
 	 * in the user's home directory.
 	 *
 	 * @param type The type of location to return.
 	 * @param suffix A subdirectory name.
 	 *             Makes it easier for you to create subdirectories.
 	 *   You can't pass filenames here, you _have_ to pass
 	 *       directory names only and add possible filename in
 	 *       that directory yourself. A directory name always has a
  	 *       trailing slash ('/').
 	 * @param create If set, saveLocation() will create the directories
 	 *        needed (including those given by @p suffix).
 	 *
 	 * @return A path where resources of the specified type should be
 	 *         saved, or QString::null if the resource type is unknown.
 	 */
 	 QString saveLocation(const char *type,
 			      const QString& suffix = QString::null,
 			      bool create = true) const;
 
         /**
          * Converts an absolute path to a path relative to a certain
          * resource.
          *
          * If "abs = ::locate(resource, rel)"
          * then "rel = relativeLocation(resource, abs)" and vice versa.
          *
          * @param type The type of resource.
          *
          * @param absPath An absolute path to make relative.
          *
          * @return A relative path relative to resource @p type that
          * will find @p absPath. If no such relative path exists, absPath
          * will be returned unchanged.
          */
          QString relativeLocation(const char *type, const QString &absPath);
 
 	/**
 	 * Recursively creates still-missing directories in the given path.
 	 *
 	 * The resulting permissions will depend on the current umask setting.
 	 * permission = mode & ~umask.
 	 *
 	 * @param dir Absolute path of the directory to be made.
 	 * @param mode Directory permissions.
 	 * @return true if successful, false otherwise
 	 */
 	static bool makeDir(const QString& dir, int mode = 0755);
 
 	/**
 	 * This returns a default relative path for the standard KDE
 	 * resource types. Below is a list of them so you get an idea
 	 * of what this is all about.
 	 *
 	 * @li data - share/apps
 	 * @li html - share/doc/HTML
 	 * @li icon - share/icon
 	 * @li config - share/config
 	 * @li pixmap - share/pixmaps
 	 * @li apps - share/applnk
 	 * @li sound - share/sounds
 	 * @li locale - share/locale
 	 * @li services - share/services
 	 * @li servicetypes - share/servicetypes
 	 * @li mime - share/mimelnk
 	 * @li wallpaper - share/wallpapers
 	 * @li templates - share/templates
 	 * @li exe - bin
 	 * @li lib - lib
 	 *
 	 * @returns Static default for the specified resource.  You
 	 *          should probably be using locate() or locateLocal()
 	 *          instead.
 	 * @see locate()
 	 * @see locateLocal()
 	 */
 	static QString kde_default(const char *type);
 
 	/**
 	 * @internal (for use by sycoca only)
 	 */
 	QString kfsstnd_prefixes();
 
 	/**
 	 * Returns the toplevel directory in which KStandardDirs
 	 * will store things. Most likely $HOME/.kde
 	 * Don't use this function if you can use locateLocal
 	 * @return the toplevel directory
 	 */
 	QString localkdedir() const;
 
 	/**
 	 * @return $XDG_DATA_HOME
 	 * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html
 	 */
 	QString localxdgdatadir() const;
 
 	/**
 	 * @return $XDG_CONFIG_HOME
 	 * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html
 	 */
 	QString localxdgconfdir() const;
 
 	/**
 	 * Checks for existence and accessability.
 	 * Faster than creating a QFileInfo first.
 	 * @param fullPath the path to check
 	 * @return true if the directory exists
 	 */
 	static bool exists(const QString &fullPath);
 
         /**
          * Expands all symbolic links and resolves references to 
          * '/./', '/../' and extra  '/' characters in @p dirname
          * and returns the canonicalized absolute pathname.
          * The resulting path will have no symbolic link, '/./' 
          * or '/../' components.
 	 * @since 3.1
          */
         static QString realPath(const QString &dirname);
         
     static void setAppDir( const QString & );
     static QString appDir();
-        
+         
  private:
 
 	QStringList prefixes;
 
 	// Directory dictionaries
 	QDict<QStringList> absolutes;
 	QDict<QStringList> relatives;
 
 	mutable QDict<QStringList> dircache;
 	mutable QDict<QString> savelocations;
 
 	// Disallow assignment and copy-construction
 	KStandardDirs( const KStandardDirs& );
 	KStandardDirs& operator= ( const KStandardDirs& );
 
 	bool addedCustoms;
 
         class KStandardDirsPrivate;
 	KStandardDirsPrivate *d;
 //US    
     static QString mAppDir;
 
 	void checkConfig() const;
 	void applyDataRestrictions(const QString &) const;
 //US 	void createSpecialResource(const char*);
 };
 
 /**
  * \addtogroup locates Locate Functions
  *  @{
  * On The Usage Of 'locate' and 'locateLocal'
  *
  * Typical KDE applications use resource files in one out of
  * three ways:
  *
  * 1) A resource file is read but is never written. A system
  *    default is supplied but the user can override this
  *    default in his local .kde directory:
  *
  *    \code
  *    // Code example
  *    myFile = locate("appdata", "groups.lst");
  *    myData =  myReadGroups(myFile); // myFile may be null
  *    \endcode
  *
  * 2) A resource file is read and written. If the user has no
  *    local version of the file the system default is used.
  *    The resource file is always written to the users local
  *    .kde directory.
  *
  *    \code
  *    // Code example
  *    myFile = locate("appdata", "groups.lst")
  *    myData =  myReadGroups(myFile);
  *    ...
  *    doSomething(myData);
  *    ...
  *    myFile = locateLocal("appdata", "groups.lst");
  *    myWriteGroups(myFile, myData);
  *    \endcode
  *
  * 3) A resource file is read and written. No system default
  *    is used if the user has no local version of the file.
  *    The resource file is always written to the users local
  *    .kde directory.
  *
  *    \code
  *    // Code example
  *    myFile = locateLocal("appdata", "groups.lst");
  *    myData =  myReadGroups(myFile);
  *    ...
  *    doSomething(myData);
  *    ...
  *    myFile = locateLocal("appdata", "groups.lst");
  *    myWriteGroups(myFile, myData);
  *    \endcode
  **/
 
 /*!
  * \relates KStandardDirs
  * This function is just for convenience. It simply calls
  *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename).
  **/
 QString locate( const char *type, const QString& filename /*US , const KInstance* instance = KGlobal::instance()*/ );
 
 /*!
  * \relates KStandardDirs
  * This function is much like locate. However it returns a
  * filename suitable for writing to. No check is made if the
  * specified filename actually exists. Missing directories
  * are created. If filename is only a directory, without a
  * specific file, filename must have a trailing slash.
  *
  **/
 QString locateLocal( const char *type, const QString& filename /*US , const KInstance* instance = KGlobal::instance() */ );
 
 /*!
  * \relates KStandardDirs
  * This function is much like locate. No check is made if the
  * specified filename actually exists. Missing directories
  * are created if @p createDir is true. If filename is only 
  * a directory, without a specific file, 
  * filename must have a trailing slash.
  *
  **/
 QString locateLocal( const char *type, const QString& filename, bool createDir /*US , const KInstance* instance = KGlobal::instance() */);
 
 /*! @} */
 
 #endif // SSK_KSTDDIRS_H