| author | zautrix <zautrix> | 2005-04-03 21:03:06 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-04-03 21:03:06 (UTC) |
| commit | f3707f1dcc3d42d43c9e6b649a9a68b2e706051e (patch) (side-by-side diff) | |
| tree | cad8019b110d59bd76a2901494259f2971c160b7 /microkde | |
| parent | 2d83daf3568bb829db2530baa917db5a4cbf0768 (diff) | |
| download | kdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.zip kdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.tar.gz kdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.tar.bz2 | |
static fix
| -rw-r--r-- | microkde/kresources/factory.cpp | 26 | ||||
| -rw-r--r-- | microkde/kresources/managerimpl.cpp | 2 | ||||
| -rw-r--r-- | microkde/microkde.pro | 8 |
3 files changed, 35 insertions, 1 deletions
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp index a3b7fff..5fbfa68 100644 --- a/microkde/kresources/factory.cpp +++ b/microkde/kresources/factory.cpp @@ -34,6 +34,11 @@ #include "resource.h" #include "factory.h" +#ifdef STATIC_RESOURCES +#include <file/resourcefile.h> +#include <dir/resourcedir.h> +#include <qtopia/resourceqtopia.h> +#endif using namespace KRES; QDict<Factory> *Factory::mSelves = 0; @@ -219,6 +224,25 @@ Resource *Factory::resource( const QString& type, const KConfig *config ) if ( type.isEmpty() || !mTypeMap.contains( type ) ) return 0; +#ifdef STATIC_RESOURCES + qDebug("NEW STATIC RESOURCE %s", type.latin1()); + Resource *resource = 0; + if ( type == "file" ) { + resource = (Resource *) new KABC::ResourceFile( config ); + } else if ( type == "dir" ) { + resource = new KABC::ResourceDir( config ); + } else if ( type == "qtopia" ) { + resource = new KABC::ResourceQtopia( config ); + } + if ( !resource) + qDebug("Factory::resource:: resources are statically linked. resource type %s is not supported ",type.latin1() ); + else + resource->setType( type ); + return resource; +#else + + + /*US load the lib not dynamicly. !! KService::Ptr ptr = mTypeMap[ type ]; KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); @@ -253,4 +277,6 @@ Resource *Factory::resource( const QString& type, const KConfig *config ) resource->setType( type ); return resource; + +#endif } diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp index 566b8f4..a6d2007 100644 --- a/microkde/kresources/managerimpl.cpp +++ b/microkde/kresources/managerimpl.cpp @@ -40,6 +40,8 @@ $Id$ #include "factory.h" #include "managerimpl.h" + + using namespace KRES; ManagerImpl::ManagerImpl( const QString &family ) diff --git a/microkde/microkde.pro b/microkde/microkde.pro index 9016260..783ec34 100644 --- a/microkde/microkde.pro +++ b/microkde/microkde.pro @@ -1,5 +1,6 @@ TEMPLATE = lib CONFIG += qt warn_on +include( ../variables.pri ) #INCLUDEPATH += $(QTDIR)/include . #DEPENDPATH += $(QTDIR)/include INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio @@ -9,6 +10,12 @@ TARGET = microkde DESTDIR= ../bin DEFINES += DESKTOP_VERSION KDE_QT_ONLY unix : { +staticlib: { +INCLUDEPATH += ../kabc/plugins +DEFINES += STATIC_RESOURCES +} + + OBJECTS_DIR = obj/unix MOC_DIR = moc/unix } @@ -17,7 +24,6 @@ DEFINES += _WIN32_ OBJECTS_DIR = obj/win MOC_DIR = moc/win } -include( ../variables.pri ) |