Changes for compiling on desktop

5 files changed, 17 insertions, 18 deletions

diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index c07d50f..c091e05 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -1,291 +1,287 @@
 /* This file is part of the KDE libraries
    Copyright (C) 1999 Torben Weis <weis@kde.org>
    Copyright (C) 2000 Michael Matz <matz@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 //US #include <config.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qobjectdict.h>
 #include <qwidgetlist.h>
 #include <qwidget.h>
 
 #include "kapplication.h"
 #include "klibloader.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
 #include "klocale.h"
 
 /*US
 #ifndef NDEBUG
 #include "ltdl.h"
 #endif
 */
 
 //US do everything through qlibrary
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qtopia/qlibrary.h>
+#else
+#include <qlibrary.h> 
 #endif
 
-/*US
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#endif
-*/
+
 template class QAsciiDict<KLibrary>;
 
 #include <stdlib.h> //getenv
 
 /*US
 #if HAVE_DLFCN_H
 #  include <dlfcn.h>
 #endif
  
 #ifdef RTLD_GLOBAL
 #  define LT_GLOBAL             RTLD_GLOBAL
 #else
 #  ifdef DL_GLOBAL
 #    define LT_GLOBAL           DL_GLOBAL
 #  endif
 #endif
 #ifndef LT_GLOBAL
 #  define LT_GLOBAL             0
 #endif
 */
 
 /*US
 extern "C" {
 extern int lt_dlopen_flag;
 }
 */
 
 KLibFactory::KLibFactory( QObject* parent, const char* name )
     : QObject( parent, name )
 {
 }
 
 KLibFactory::~KLibFactory()
 {
 //    kdDebug(150) << "Deleting KLibFactory " << this << endl;
 }
 
 QObject* KLibFactory::create( QObject* parent, const char* name, const char* classname, const QStringList &args )
 {
     QObject* obj = createObject( parent, name, classname, args );
     if ( obj )
         emit objectCreated( obj );
     return obj;
 }
 
 
 QObject* KLibFactory::createObject( QObject*, const char*, const char*, const QStringList &)
 {
     return 0;
 }
 
 
 // -----------------------------------------------
 
 //US KLibrary::KLibrary( const QString& libname, const QString& filename, void * handle )
 KLibrary::KLibrary( const QString& libname, const QString& filename, QLibrary* handle )
 {
     /* Make sure, we have a KLibLoader */
     (void) KLibLoader::self();
     m_libname = libname;
     m_filename = filename;
     m_handle = handle;
     m_factory = 0;
     m_timer = 0;
 }
 
 KLibrary::~KLibrary()
 {
 //    kdDebug(150) << "Deleting KLibrary " << this << "  " << m_libname << endl;
     if ( m_timer && m_timer->isActive() )
         m_timer->stop();
 
     // If any object is remaining, delete
     if ( m_objs.count() > 0 )
         {
             QPtrListIterator<QObject> it( m_objs );
             for ( ; it.current() ; ++it )
                 {
                     kdDebug(150) << "Factory still has object " << it.current() << " " << it.current()->name () << " Library = " << m_libname << endl;
                     disconnect( it.current(), SIGNAL( destroyed() ),
                                 this, SLOT( slotObjectDestroyed() ) );
                 }
             m_objs.setAutoDelete(true);
             m_objs.clear();
         }
 
     if ( m_factory ) {
         //kdDebug(150) << " ... deleting the factory " << m_factory << endl;
         delete m_factory;
     }
 }
 
 QString KLibrary::name() const
 {
     return m_libname;
 }
 
 QString KLibrary::fileName() const
 {
     return m_filename;
 }
 
 KLibFactory* KLibrary::factory()
 {
     if ( m_factory )
         return m_factory;
 
         QCString symname;
         symname.sprintf("init_%s", name().latin1() );
     
         void* sym = symbol( symname );
         if ( !sym )
         {
             qDebug("KLibrary: The library %s does not offer an %s function", name().latin1(), symname.data());
 #ifndef NDEBUG
 //US            qDebug("KLibrary: errorcode: %s", lt_dlerror());
 #endif            
             kdWarning(150) << "KLibrary: The library " << name().latin1() << " does not offer an init_" << name().latin1() << " function" << endl;
             return 0;
     }
 
     typedef KLibFactory* (*t_func)();
     t_func func = (t_func)sym;
     m_factory = func();
 
     if( !m_factory )
     {
         kdWarning(150) << "KLibrary: The library " << name() << " does not offer a KDE compatible factory" << endl;
         return 0;
     }
 
     connect( m_factory, SIGNAL( objectCreated( QObject * ) ),
              this, SLOT( slotObjectCreated( QObject * ) ) );
 
     return m_factory;
 }
 
 void* KLibrary::symbol( const char* symname ) const
 {
 //US     void* sym = lt_dlsym( (lt_dlhandle) m_handle, symname );
          void* sym = m_handle->resolve( symname );    
     if ( !sym )
     {
 //US        kdWarning(150) << "KLibrary: " << lt_dlerror() << endl;
-        kdWarning(150) << "KLibrary: " << m_libname << ", symbol:" << symname << " not found " << endl;
         return 0;
     }
 
     return sym;
 }
 
 bool KLibrary::hasSymbol( const char* symname ) const
 {
 //US    void* sym = lt_dlsym( (lt_dlhandle) m_handle, symname );
          void* sym = m_handle->resolve( symname );    
     return (sym != 0L );
 }
 
 void KLibrary::unload() const
 {
    if (KLibLoader::s_self)
       KLibLoader::s_self->unloadLibrary(QFile::encodeName(name()));
 }
 
 void KLibrary::slotObjectCreated( QObject *obj )
 {
   if ( !obj )
     return;
 
   if ( m_timer && m_timer->isActive() )
     m_timer->stop();
 
   if ( m_objs.containsRef( obj ) )
       return; // we know this object already
 
   connect( obj, SIGNAL( destroyed() ),
            this, SLOT( slotObjectDestroyed() ) );
 
   m_objs.append( obj );
 }
 
 void KLibrary::slotObjectDestroyed()
 {
   m_objs.removeRef( sender() );
 
   if ( m_objs.count() == 0 )
   {
 //    kdDebug(150) << "KLibrary: shutdown timer for " << name() << " started!"
 //                 << endl;
 
     if ( !m_timer )
     {
       m_timer = new QTimer( this, "klibrary_shutdown_timer" );
       connect( m_timer, SIGNAL( timeout() ),
                this, SLOT( slotTimeout() ) );
     }
 
     // as long as it's not stable make the timeout short, for debugging
     // pleasure (matz)
     //m_timer->start( 1000*60, true );
     m_timer->start( 1000*10, true );
   }
 }
 
 void KLibrary::slotTimeout()
 {
   if ( m_objs.count() != 0 )
     return;
 
   /* Don't go through KLibLoader::unloadLibrary(), because that uses the
      ref counter, but this timeout means to unconditionally close this library
      The destroyed() signal will take care to remove us from all lists.
   */
   delete this;
 }
 
 // -------------------------------------------------
 
 /* This helper class is needed, because KLibraries can go away without
    being unloaded. So we need some info about KLibraries even after its
    death. */
 class KLibWrapPrivate
 {
 public:
 //US    KLibWrapPrivate(KLibrary *l, lt_dlhandle h);
     KLibWrapPrivate(KLibrary *l, QLibrary* h);
 
     KLibrary *lib;
     enum {UNKNOWN, UNLOAD, DONT_UNLOAD} unload_mode;
     int ref_count;
 //US    lt_dlhandle handle;
     QLibrary *handle;
     QString name;
     QString filename;
 };
 
 //US KLibWrapPrivate::KLibWrapPrivate(KLibrary *l, lt_dlhandle h)
 KLibWrapPrivate::KLibWrapPrivate(KLibrary *l, QLibrary* h)
  : lib(l), ref_count(1), handle(h), name(l->name()), filename(l->fileName())
 {
     unload_mode = UNKNOWN;
@@ -384,264 +380,269 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
 //US in the microedition we work only with shared libraries.
     if (libname.find('.', pos) < 0) {
       libname += ".so";
     }
 
     // only look up the file if it is not an absolute filename
     // (mhk, 20000228)
     QString libfile;
     if (libname[0] == '/')
       libfile = libname;
     else
     {
 //US at this point the libname must exist as real filesname. No expansions will be made later
 // in findResources. Because of that we prepend the lib prefix here to the name 
 //US I add also the "lib" prefix. I do not how could this could have worked before without it?
     libname.insert(pos, "lib");
     
     
 //US      libfile = instance->dirs()->findResource( "module", libname );
       libfile = KGlobal::dirs()->findResource( "module", libname );
       if ( libfile.isEmpty() )
       {
 //US        libfile = instance->dirs()->findResource( "lib", libname );
         libfile = KGlobal::dirs()->findResource( "lib", libname );
 #ifndef NDEBUG
         if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules
           kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl;
 #endif
       }
       if ( libfile.isEmpty() )
       {
 #ifndef NDEBUG
         kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl;
         self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); 
             
         qDebug("KLibLoader::library could not find library: %s", libname.data());
 #endif
             
       }
       else
             self()->d->errorMessage = QString::null;
     }
     return libfile;
 }
 
 
 KLibrary* KLibLoader::globalLibrary( const char *name )
 {
 KLibrary *tmp;
 /*US
 int olt_dlopen_flag = lt_dlopen_flag;
 
    lt_dlopen_flag |= LT_GLOBAL;
    kdDebug(150) << "Loading the next library global with flag " 
                 << lt_dlopen_flag
                 << "." << endl;
 */                
    tmp = library(name);
 /*US   
    lt_dlopen_flag = olt_dlopen_flag;
 */
 return tmp;
 }
 
 
 KLibrary* KLibLoader::library( const char *name )
 {
     if (!name)
         return 0;
 
     KLibWrapPrivate* wrap = m_libs[name];
     if (wrap) {
       /* Nothing to do to load the library.  */
       wrap->ref_count++;
       return wrap->lib;
     }
 
     /* Test if this library was loaded at some time, but got
        unloaded meanwhile, whithout being dlclose()'ed.  */
     QPtrListIterator<KLibWrapPrivate> it(d->loaded_stack);
     for (; it.current(); ++it) {
       if (it.current()->name == name)
         wrap = it.current();
     }
 
     if (wrap) {
       d->pending_close.removeRef(wrap);
       if (!wrap->lib) {
         /* This lib only was in loaded_stack, but not in m_libs.  */
         wrap->lib = new KLibrary( name, wrap->filename, wrap->handle );
       }
       wrap->ref_count++;
     } else {
       QString libfile = findLibrary( name );
       if ( libfile.isEmpty() )
         return 0;
-
+#ifdef DESKTOP_VERSION
+      QLibrary *qlib = new QLibrary( libfile.latin1() );
+#else
       QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately );
+#endif
         
 //US      lt_dlhandle handle = lt_dlopen( libfile.latin1() );
 //US      if ( !handle )
       if ( !qlib )
       {
 //US        const char* errmsg = lt_dlerror();
         char* errmsg;
         sprintf(errmsg, "KLibLoader::library could not load library: %s", libfile.latin1());
         qDebug(errmsg);
         
         if(errmsg)
             d->errorMessage = QString::fromLatin1(errmsg);
         else
             d->errorMessage = QString::null;
         kdWarning(150) << "library=" << name << ": file=" << libfile << ": " << d->errorMessage << endl;
         return 0;
       }
       else
         d->errorMessage = QString::null;
 
       KLibrary *lib = new KLibrary( name, libfile, qlib );
       wrap = new KLibWrapPrivate(lib, qlib);
       d->loaded_stack.prepend(wrap);
     }
     m_libs.insert( name, wrap );
 
     connect( wrap->lib, SIGNAL( destroyed() ),
              this, SLOT( slotLibraryDestroyed() ) );
 
     return wrap->lib;
 }
 
 QString KLibLoader::lastErrorMessage() const
 {
     return d->errorMessage;
 }
 
 void KLibLoader::unloadLibrary( const char *libname )
 {
   KLibWrapPrivate *wrap = m_libs[ libname ];
   if (!wrap)
     return;
   if (--wrap->ref_count)
     return;
 
 //  kdDebug(150) << "closing library " << libname << endl;
 
   m_libs.remove( libname );
 
   disconnect( wrap->lib, SIGNAL( destroyed() ),
               this, SLOT( slotLibraryDestroyed() ) );
   close_pending( wrap );
 }
 
 KLibFactory* KLibLoader::factory( const char* name )
 {
     KLibrary* lib = library( name );
     if ( !lib )
         return 0;
 
     return lib->factory();
 }
 
 void KLibLoader::slotLibraryDestroyed()
 {
   const KLibrary *lib = static_cast<const KLibrary *>( sender() );
 
   QAsciiDictIterator<KLibWrapPrivate> it( m_libs );
   for (; it.current(); ++it )
     if ( it.current()->lib == lib )
     {
       KLibWrapPrivate *wrap = it.current();
       wrap->lib = 0;  /* the KLibrary object is already away */
       m_libs.remove( it.currentKey() );
       close_pending( wrap );
       return;
     }
 }
 
 void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 {
   if (wrap && !d->pending_close.containsRef( wrap ))
     d->pending_close.append( wrap );
 
   /* First delete all KLibrary objects in pending_close, but _don't_ unload
      the DSO behind it.  */
   QPtrListIterator<KLibWrapPrivate> it(d->pending_close);
   for (; it.current(); ++it) {
     wrap = it.current();
     if (wrap->lib) {
       disconnect( wrap->lib, SIGNAL( destroyed() ),
                   this, SLOT( slotLibraryDestroyed() ) );
       delete wrap->lib;
       wrap->lib = 0;
     }
   }
 
   if (d->unload_mode == KLibLoaderPrivate::DONT_UNLOAD) return;
 
   bool deleted_one = false;
   while ((wrap = d->loaded_stack.first())) {
     /* Let's first see, if we want to try to unload this lib.
        If the env. var KDE_DOUNLOAD is set, we try to unload every lib.
        If not, we look at the lib itself, and unload it only, if it exports
        the symbol __kde_do_unload. */
     if (d->unload_mode != KLibLoaderPrivate::UNLOAD
         && wrap->unload_mode != KLibWrapPrivate::UNLOAD)
       break;
 
     /* Now ensure, that the libs are only unloaded in the reverse direction
        they were loaded.  */
     if (!d->pending_close.containsRef( wrap )) {
       if (!deleted_one)
         /* Only diagnose, if we really haven't deleted anything. */
 //        kdDebug(150) << "try to dlclose " << wrap->name << ": not yet" << endl;
       break;
     }
 
 //    kdDebug(150) << "try to dlclose " << wrap->name << ": yes, done." << endl;
 
+#if 0
 #ifndef Q_WS_QWS
     if ( !deleted_one ) {
       /* Only do the hack once in this loop.
          WABA: *HACK*
          We need to make sure to clear the clipboard before unloading a DSO
          because the DSO could have defined an object derived from QMimeSource
          and placed that on the clipboard. */
       /*kapp->clipboard()->clear();*/
 
       /* Well.. let's do something more subtle... convert the clipboard context
          to text. That should be safe as it only uses objects defined by Qt. */
 
       QWidgetList *widgetlist = QApplication::topLevelWidgets();
       QWidget *co = widgetlist->first();
       while (co) {
         if (qstrcmp(co->name(), "internal clipboard owner") == 0) {
           if (XGetSelectionOwner(co->x11Display(), XA_PRIMARY) == co->winId())
             kapp->clipboard()->setText(kapp->clipboard()->text());
 
           break;
         }
         co = widgetlist->next();
       }
       delete widgetlist;
     }
 #else
     // FIXME(E): Implement in Qt Embedded
 #endif
 
+#endif // 0
     deleted_one = true;
 //US    lt_dlclose(wrap->handle);
     wrap->handle->unload();
     
     d->pending_close.removeRef(wrap);
     /* loaded_stack is AutoDelete, so wrap is freed */
     d->loaded_stack.remove();
   }
 }
 
 void KLibLoader::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KLibFactory::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 //US #include "klibloader.moc"
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 1a1e027..7f51d78 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1,142 +1,141 @@
 /* This file is part of the KDE libraries
    Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org>
    Copyright (C) 1999 Stephan Kulow <coolo@kde.org>
    Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
 /*
  * Author: Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org>
          * Version:$Id$
          * Generated:Thu Mar  5 16:05:28 EST 1998
  */
 
 //US #include "config.h"
 
 #include <stdlib.h>
 #include <assert.h>
 //US#include <errno.h>
 //US #ifdef HAVE_SYS_STAT_H
 //US #include <sys/stat.h>
 //US #endif
 //US#include <sys/types.h>
 //US#include <dirent.h>
 //US#include <pwd.h>
 
 #include <qregexp.h>
 #include <qasciidict.h>
 #include <qdict.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qpe/qpeapplication.h>
 
 #include "kstandarddirs.h"
 #include "kconfig.h"
 #include "kdebug.h"
 //US #include "kinstance.h"
 #include "kshell.h"
 //US#include <sys/param.h>
 //US#include <unistd.h>
 
 //US
 QString KStandardDirs::mAppDir = QString::null;
 
 
 template class QDict<QStringList>;
 
 #if 0
 #include <qtextedit.h>
 void ddd( QString op ) 
 {
   static QTextEdit * dot = 0;
   if ( ! dot ) 
   dot = new QTextEdit();
 
   dot->show();
 
   dot->append( op );
 
 }
 #endif
 class KStandardDirs::KStandardDirsPrivate
 {
 public:
    KStandardDirsPrivate()
     : restrictionsActive(false),
       dataRestrictionActive(false)
    { }
 
    bool restrictionsActive;
    bool dataRestrictionActive;
    QAsciiDict<bool> restrictions;
    QStringList xdgdata_prefixes;
    QStringList xdgconf_prefixes;
 };
 
 static const char* const types[] = {"html", "icon", "apps", "sound",
                               "data", "locale", "services", "mime",
                               "servicetypes", "config", "exe",
                               "wallpaper", "lib", "pixmap", "templates", 
                               "module", "qtplugins", 
                               "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu", 0 };
 
 static int tokenize( QStringList& token, const QString& str,
                 const QString& delim );
 
 KStandardDirs::KStandardDirs( ) : addedCustoms(false)
 {
     d = new KStandardDirsPrivate;
     dircache.setAutoDelete(true);
     relatives.setAutoDelete(true);
     absolutes.setAutoDelete(true);
     savelocations.setAutoDelete(true);
     addKDEDefaults();
 }
 
 KStandardDirs::~KStandardDirs()
 {
     delete d;
 }
 
 bool KStandardDirs::isRestrictedResource(const char *type, const QString& relPath) const
 {
    if (!d || !d->restrictionsActive)
       return false;
 
    if (d->restrictions[type])
       return true;
 
    if (strcmp(type, "data")==0)
    {
       applyDataRestrictions(relPath);
       if (d->dataRestrictionActive)
       {
          d->dataRestrictionActive = false;
          return true;
       }
    }
    return false;
 }
 
 void KStandardDirs::applyDataRestrictions(const QString &relPath) const
 {
    QString key;
    int i = relPath.find('/');
    if (i != -1)
       key = "data_"+relPath.left(i);
    else
@@ -1132,193 +1131,193 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
     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 = 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    
-   kdedirList.append(QPEApplication::qpeDir());
+    kdedirList.append(readEnvPath("QPEDIR" ));
 
 #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())
        {
           if (localKdeDir.at(localKdeDir.length()-1) != '/')
              localKdeDir += '/';
        }
        else
        {
           localKdeDir =  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);
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 92cb8d2..79b0f9d 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -931,193 +931,193 @@ int KToolBar::maxWidth()
 }
 
 
 void KToolBar::setTitle (const QString& _title)
 {
     setLabel( _title );
 }
 
 
 void KToolBar::enableFloating (bool )
 {
 }
 
 
 void KToolBar::setIconText(IconText it)
 {
     setIconText( it, true );
 }
 
 
 void KToolBar::setIconText(IconText icontext, bool update)
 {
     bool doUpdate=false;
 
     if (icontext != d->m_iconText) {
         d->m_iconText = icontext;
         doUpdate=true;
     }
 
     if (update == false)
         return;
 
     if (doUpdate)
         emit modechange(); // tell buttons what happened
 
     // ugly hack to force a QMainWindow::triggerLayout( TRUE )
     if ( mainWindow() ) {
         QMainWindow *mw = mainWindow();
         mw->setUpdatesEnabled( FALSE );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setUpdatesEnabled( TRUE );
     }
 }
 
 
 KToolBar::IconText KToolBar::iconText() const
 {
     return d->m_iconText;
 }
 
 
 void KToolBar::setIconSize(int size)
 {
     setIconSize( size, true );
 }
 
 void KToolBar::setIconSize(int size, bool update)
 {
     bool doUpdate=false;
 
     if ( size != d->m_iconSize ) {
             d->m_iconSize = size;
             doUpdate=true;
     }
 
     if (update == false)
         return;
 
     if (doUpdate)
         emit modechange(); // tell buttons what happened
 
     // ugly hack to force a QMainWindow::triggerLayout( TRUE )
     if ( mainWindow() ) {
         QMainWindow *mw = mainWindow();
         mw->setUpdatesEnabled( FALSE );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setUpdatesEnabled( TRUE );
     }
 }
 
 
 int KToolBar::iconSize() const
 {
 /*US
     if ( !d->m_iconSize ) // default value?
     {
          if (!::qstrcmp(QObject::name(), "mainToolBar"))
              return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar);
          else
              return KGlobal::iconLoader()->currentSize(KIcon::Toolbar);
     }
     return d->m_iconSize;
 */
     int ret = 18;
-    if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->width() < 650  )
+    if ( QApplication::desktop()->width() > 320   )
         ret = 30;
    return ret;
 }
 
 
 void KToolBar::setEnableContextMenu(bool enable )
 {
     d->m_enableContext = enable;
 }
 
 
 bool KToolBar::contextMenuEnabled() const
 {
     return d->m_enableContext;
 }
 
 
 void KToolBar::setItemNoStyle(int id, bool no_style )
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return;
 //US    KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
     KToolBarButton * button = (KToolBarButton *)( *it );
     if (button)
         button->setNoStyle( no_style );
 }
 
 
 void KToolBar::setFlat (bool flag)
 {
     if ( !mainWindow() )
         return;
     if ( flag )
 //US        mainWindow()->moveDockWindow( this, DockMinimized );
         mainWindow()->moveToolBar( this, QMainWindow::Minimized );
     else
 //US        mainWindow()->moveDockWindow( this, DockTop );
         mainWindow()->moveToolBar( this, QMainWindow::Top );
     // And remember to save the new look later
 /*US    
     if ( mainWindow()->inherits( "KMainWindow" ) )
         static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
 */        
 }
 
 
 int KToolBar::count() const
 {
     return id2widget.count();
 }
 
 
 void KToolBar::saveState()
 {
 /*US
     // first, try to save to the xml file
     if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() ) {
         // go down one level to get to the right tags
         QDomElement elem = d->m_xmlguiClient->domDocument().documentElement().toElement();
         elem = elem.firstChild().toElement();
         QString barname(!::qstrcmp(name(), "unnamed") ? "mainToolBar" : name());
         QDomElement current;
         // now try to find our toolbar
         d->modified = false;
         for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) {
             current = elem;
 
             if ( current.tagName().lower() != "toolbar" )
                 continue;
 
             QString curname(current.attribute( "name" ));
 
             if ( curname == barname ) {
                 saveState( current );
                 break;
             }
         }
         // if we didn't make changes, then just return
         if ( !d->modified )
             return;
 
         // now we load in the (non-merged) local file
         QString local_xml(KXMLGUIFactory::readConfigFile(d->m_xmlguiClient->xmlFile(), true, d->m_xmlguiClient->instance()));
         QDomDocument local;
         local.setContent(local_xml);
 
         // make sure we don't append if this toolbar already exists locally
         bool just_append = true;
         elem = local.documentElement().toElement();
         KXMLGUIFactory::removeDOMComments( elem );
         elem = elem.firstChild().toElement();
         for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) {
             if ( elem.tagName().lower() != "toolbar" )
                 continue;
 
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 827ec38..2253de4 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -1,126 +1,127 @@
 /*
     This file is part of libkresources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
+//#ifndef DESKTOP_VERSION
 #include <klibloader.h>
-
+//#endif
 #include <qfile.h>
 
 #include "resource.h"
 #include "factory.h"
 
 using namespace KRES;
 
 QDict<Factory> *Factory::mSelves = 0;
 static KStaticDeleter< QDict<Factory> > staticDeleter;
 
 Factory *Factory::self( const QString& resourceFamily )
 {
   
 
   Factory *factory = 0;
   if ( !mSelves )
   {
     mSelves = staticDeleter.setObject( new QDict<Factory> );
   }
 
   factory = mSelves->find( resourceFamily );
 
   if ( !factory ) {
     factory = new Factory( resourceFamily );
     mSelves->insert( resourceFamily, factory );
   } 
 
   return factory;
 }
 
 Factory::Factory( const QString& resourceFamily ) :
   mResourceFamily( resourceFamily )
 {
 //US so far we have three types available for resourceFamily "contact"
 // and that are "file", "dir", "ldap"
 /*US  
   
   KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin", QString( "[X-KDE-ResourceFamily] == '%1'" )
                                                 .arg( resourceFamily ) );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     QVariant type = (*it)->property( "X-KDE-ResourceType" );
     if ( !type.toString().isEmpty() )
       mTypeMap.insert( type.toString(), *it );
   }
 */  
 
 //US new  
   PluginInfo* info = new PluginInfo;
   info->library = "microkabc_file";
   info->nameLabel = i18n( "file" );
   info->descriptionLabel = i18n( "Choose one file" );
   mTypeMap.insert( "file", info );
 
   info = new PluginInfo;
   info->library = "microkabc_dir";
   info->nameLabel = i18n( "dir" );
   info->descriptionLabel = i18n( "Choose a directory with may files" );
   mTypeMap.insert( "dir", info );
   
   info = new PluginInfo;
   info->library = "microkabc_ldap";
   info->nameLabel = i18n( "ldap" );
   info->descriptionLabel = i18n( "No description available" );
   mTypeMap.insert( "ldap", info );
 
   //US add opie plugin only, if the library exists
   QString libname = "microkabc_opie";
   QString path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
   if ( !path.isEmpty() )
   {
     info = new PluginInfo;
     info->library = libname;
     info->nameLabel = i18n( "opie" );
     info->descriptionLabel = i18n( "Opie PIM Addressbook." );
     mTypeMap.insert( "opie", info );
   }
 
   //US add qtopia plugin only, if the library exists
   libname = "microkabc_qtopia";
   path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
   if ( !path.isEmpty() )
   {
     info = new PluginInfo;
     info->library = libname;
     info->nameLabel = i18n( "qtopia" );
     info->descriptionLabel = i18n( "Qtopia PIM Addressbook." );
     mTypeMap.insert( "qtopia", info );
   }
   
 
 }
 
 Factory::~Factory()
 {
 }
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 1e9b022..05833a9 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -5,166 +5,164 @@ CONFIG		+= qt warn_on
 INCLUDEPATH     += .  ../  ../kabc ./kdecore ./kdeui ./kio/kfile
 #LIBS            += -lqtcompat
 
         TARGET  = microkde
 DESTDIR= ../bin
 DEFINES += DESKTOP_VERSION KDE_QT_ONLY
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 include( ../variables.pri )
 
 
 
 HEADERS = \
 qlayoutengine_p.h \
 KDGanttMinimizeSplitter.h \
  kapplication.h \
  kaudioplayer.h \
  kcalendarsystem.h \
  kcalendarsystemgregorian.h \
  kcolorbutton.h \
  kcolordialog.h \
  kcombobox.h \
  kconfig.h \
  kdatetbl.h \
  kdebug.h \
  kdialog.h \
  kdialogbase.h \
  kdirwatch.h \
  keditlistbox.h \
  kemailsettings.h \
  kfiledialog.h \
  kfontdialog.h \
  kglobal.h \
  kglobalsettings.h \
  kiconloader.h \
  klineedit.h \
  klineeditdlg.h \
  kmessagebox.h \
  knotifyclient.h \
  kprinter.h \
  kprocess.h \
  krestrictedline.h \
  krun.h \
  ksimpleconfig.h \
  kstaticdeleter.h \
  ksystemtray.h \
  ktempfile.h \
  ktextedit.h \
  kunload.h \
  kurl.h \
  kdeui/kguiitem.h \
  kdeui/kcmodule.h \
  kdeui/kbuttonbox.h \
  kdeui/klistbox.h \
  kdeui/klistview.h \
  kdeui/kjanuswidget.h \
  kdeui/kseparator.h \
  kdeui/knuminput.h \
  kdeui/knumvalidator.h \
  kdeui/ksqueezedtextlabel.h \
  kio/job.h \
  kio/kfile/kurlrequester.h \
  kresources/resource.h \
  kresources/factory.h \
  kresources/managerimpl.h \
  kresources/manager.h \
  kresources/selectdialog.h \
  kresources/configpage.h \
  kresources/configwidget.h \ 
  kresources/configdialog.h \
  kresources/kcmkresources.h \
  kdecore/kmdcodec.h \
  kdecore/kconfigbase.h \
  kdecore/klocale.h \
  kdecore/kcatalogue.h \
  kdecore/ksharedptr.h \
  kdecore/kshell.h \
  kdecore/kstandarddirs.h \
  kdecore/kstringhandler.h \
  kdecore/kshortcut.h \
  kutils/kcmultidialog.h \
  kdeui/kxmlguiclient.h \
  kdeui/kstdaction.h \
  kdeui/kmainwindow.h \
  kdeui/ktoolbar.h \
  kdeui/ktoolbarbutton.h \
  kdeui/ktoolbarhandler.h \
  kdeui/kaction.h \
  kdeui/kactionclasses.h \
- kdeui/kactioncollection.h 
+ kdeui/kactioncollection.h \
+ kdecore/klibloader.h 
  
 
 # kdecore/klibloader.h \
 
 
 SOURCES = \
 KDGanttMinimizeSplitter.cpp \
  kapplication.cpp \
  kcalendarsystem.cpp \
  kcalendarsystemgregorian.cpp \
  kcolorbutton.cpp \
  kcolordialog.cpp \
  kconfig.cpp \
  kdatetbl.cpp \
  kdialog.cpp \
  kdialogbase.cpp \
  keditlistbox.cpp \
  kemailsettings.cpp \
  kfontdialog.cpp \
  kfiledialog.cpp \
  kglobal.cpp \
  kglobalsettings.cpp \
  kiconloader.cpp \
  kmessagebox.cpp \
  ktextedit.cpp \
  kprocess.cpp \
  krun.cpp \
  ksystemtray.cpp \
  ktempfile.cpp \
  kurl.cpp \
  kdecore/kcatalogue.cpp \
  kdecore/klocale.cpp \
  kdecore/kmdcodec.cpp \
  kdecore/kshell.cpp \
  kdecore/kstandarddirs.cpp \
  kdecore/kstringhandler.cpp \
  kdeui/kbuttonbox.cpp \
  kdeui/kcmodule.cpp \
  kdeui/kguiitem.cpp \
  kdeui/kjanuswidget.cpp \
  kdeui/klistbox.cpp \
  kdeui/klistview.cpp \
  kdeui/knuminput.cpp \
  kdeui/knumvalidator.cpp \
  kdeui/kseparator.cpp \
  kdeui/ksqueezedtextlabel.cpp \
  kio/kfile/kurlrequester.cpp \
  kresources/configpage.cpp \
  kresources/configdialog.cpp \
  kresources/configwidget.cpp \
  kresources/factory.cpp \
  kresources/kcmkresources.cpp \
  kresources/managerimpl.cpp \
  kresources/resource.cpp \
  kresources/selectdialog.cpp \
  kutils/kcmultidialog.cpp \
  kdeui/kaction.cpp \
  kdeui/kactionclasses.cpp \
  kdeui/kactioncollection.cpp \
  kdeui/kmainwindow.cpp \
  kdeui/ktoolbar.cpp \
  kdeui/ktoolbarbutton.cpp \
  kdeui/ktoolbarhandler.cpp \
  kdeui/kstdaction.cpp \
- kdeui/kxmlguiclient.cpp 
-
-
-
-# kdecore/klibloader.cpp \
\ No newline at end of file
+ kdeui/kxmlguiclient.cpp \
+ kdecore/klibloader.cpp 
\ No newline at end of file