no more undefined references when used from libkolab...

4 files changed, 85 insertions, 81 deletions

diff --git a/kdecore/kernel/kcmdlineargs.cpp b/kdecore/kernel/kcmdlineargs.cpp
index 2da636f..57c0cb0 100644
--- a/kdecore/kernel/kcmdlineargs.cpp
+++ b/kdecore/kernel/kcmdlineargs.cpp
@@ -19,7 +19,7 @@
 #include "kcmdlineargs.h"
 #include <kdebug.h>
 
-#include <config.h>
+// #include <config.h>
 
 #include <sys/param.h>
 
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
index 9426ffc..d7bb22c 100644
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -36,9 +36,13 @@
 #include "kkernel_mac.h"
 #include "klocale.h"
 
-#include <config.h>
-#include <config-prefix.h>
-#include <config-kstandarddirs.h>
+// #include <config.h>
+// #include <config-prefix.h>
+// #include <config-kstandarddirs.h>
+#define EXEC_INSTALL_PREFIX "/bin"
+#define KDE_DEFAULT_HOME "/home"
+#define KDESYSCONFDIR "wtf do I know??"
+#define KDELIBSUFF "sldkf"
 
 #include <stdlib.h>
 #include <assert.h>
diff --git a/kdecore/kernel/kstandarddirs_unix.cpp b/kdecore/kernel/kstandarddirs_unix.cpp
index 9ae3f03..cdcfdaa 100644
--- a/kdecore/kernel/kstandarddirs_unix.cpp
+++ b/kdecore/kernel/kstandarddirs_unix.cpp
@@ -26,81 +26,81 @@ QString KStandardDirs::installPath(const char *type)
 {
     Q_ASSERT(type != NULL);
 
-    switch (type[0]) {
-        case 'a':
-            if (strcmp("apps", type) == 0)
-                return QFile::decodeName(APPLNK_INSTALL_DIR "/");
-            break;
-        case 'c':
-            if (strcmp("config", type) == 0)
-                return QFile::decodeName(CONFIG_INSTALL_DIR "/");
-            break;
-        case 'k':
-            if (strcmp("kcfg", type) == 0)
-                return QFile::decodeName(KCFG_INSTALL_DIR "/");
-            if (strcmp("kdedir", type) == 0)
-                return QFile::decodeName(KDEDIR "/");
-            break;
-        case 'd':
-            if (strcmp("data", type) == 0)
-                return QFile::decodeName(DATA_INSTALL_DIR "/");
-            break;
-        case 'e':
-            if (strcmp("exe", type) == 0)
-                return QFile::decodeName(BIN_INSTALL_DIR "/");
-            break;
-        case 'h':
-            if (strcmp("html", type) == 0)
-                return QFile::decodeName(HTML_INSTALL_DIR "/");
-            break;
-        case 'i':
-            if (strcmp("icon", type) == 0)
-                return QFile::decodeName(ICON_INSTALL_DIR "/");
-            if (strcmp("include", type) == 0)
-                return QFile::decodeName(INCLUDE_INSTALL_DIR "/");
-            break;
-        case 'l':
-            if (strcmp("lib", type) == 0)
-                return QFile::decodeName(LIB_INSTALL_DIR "/");
-            if (strcmp("libexec", type) == 0)
-                return QFile::decodeName(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
-            if (strcmp("locale", type) == 0)
-                return QFile::decodeName(LOCALE_INSTALL_DIR "/");
-            break;
-        case 'm':
-            if (strcmp("module", type) == 0)
-                return QFile::decodeName(PLUGIN_INSTALL_DIR "/");
-            if (strcmp("mime", type) == 0)
-                return QFile::decodeName(MIME_INSTALL_DIR "/");
-            break;
-        case 'q':
-            if (strcmp("qtplugins", type) == 0)
-                return QFile::decodeName(PLUGIN_INSTALL_DIR "/plugins/");
-            break;
-        case 's':
-            if (strcmp("services", type) == 0)
-                return QFile::decodeName(SERVICES_INSTALL_DIR "/");
-            if (strcmp("servicetypes", type) == 0)
-                return QFile::decodeName(SERVICETYPES_INSTALL_DIR "/");
-            if (strcmp("sound", type) == 0)
-                return QFile::decodeName(SOUND_INSTALL_DIR "/");
-            break;
-        case 't':
-            if (strcmp("templates", type) == 0)
-                return QFile::decodeName(TEMPLATES_INSTALL_DIR "/");
-            break;
-        case 'w':
-            if (strcmp("wallpaper", type) == 0)
-                return QFile::decodeName(WALLPAPER_INSTALL_DIR "/");
-            break;
-        case 'x':
-            if (strcmp("xdgconf-menu", type) == 0)
-                return QFile::decodeName(SYSCONF_INSTALL_DIR "/xdg/menus/");
-            if (strcmp("xdgdata-apps", type) == 0)
-                return QFile::decodeName(XDG_APPS_INSTALL_DIR "/");
-            if (strcmp("xdgdata-dirs", type) == 0)
-                return QFile::decodeName(XDG_DIRECTORY_INSTALL_DIR "/");
-            break;
-    }
+//     switch (type[0]) {
+//         case 'a':
+//             if (strcmp("apps", type) == 0)
+//                 return QFile::decodeName(APPLNK_INSTALL_DIR "/");
+//             break;
+//         case 'c':
+//             if (strcmp("config", type) == 0)
+//                 return QFile::decodeName(CONFIG_INSTALL_DIR "/");
+//             break;
+//         case 'k':
+//             if (strcmp("kcfg", type) == 0)
+//                 return QFile::decodeName(KCFG_INSTALL_DIR "/");
+//             if (strcmp("kdedir", type) == 0)
+//                 return QFile::decodeName(KDEDIR "/");
+//             break;
+//         case 'd':
+//             if (strcmp("data", type) == 0)
+//                 return QFile::decodeName(DATA_INSTALL_DIR "/");
+//             break;
+//         case 'e':
+//             if (strcmp("exe", type) == 0)
+//                 return QFile::decodeName(BIN_INSTALL_DIR "/");
+//             break;
+//         case 'h':
+//             if (strcmp("html", type) == 0)
+//                 return QFile::decodeName(HTML_INSTALL_DIR "/");
+//             break;
+//         case 'i':
+//             if (strcmp("icon", type) == 0)
+//                 return QFile::decodeName(ICON_INSTALL_DIR "/");
+//             if (strcmp("include", type) == 0)
+//                 return QFile::decodeName(INCLUDE_INSTALL_DIR "/");
+//             break;
+//         case 'l':
+//             if (strcmp("lib", type) == 0)
+//                 return QFile::decodeName(LIB_INSTALL_DIR "/");
+//             if (strcmp("libexec", type) == 0)
+//                 return QFile::decodeName(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
+//             if (strcmp("locale", type) == 0)
+//                 return QFile::decodeName(LOCALE_INSTALL_DIR "/");
+//             break;
+//         case 'm':
+//             if (strcmp("module", type) == 0)
+//                 return QFile::decodeName(PLUGIN_INSTALL_DIR "/");
+//             if (strcmp("mime", type) == 0)
+//                 return QFile::decodeName(MIME_INSTALL_DIR "/");
+//             break;
+//         case 'q':
+//             if (strcmp("qtplugins", type) == 0)
+//                 return QFile::decodeName(PLUGIN_INSTALL_DIR "/plugins/");
+//             break;
+//         case 's':
+//             if (strcmp("services", type) == 0)
+//                 return QFile::decodeName(SERVICES_INSTALL_DIR "/");
+//             if (strcmp("servicetypes", type) == 0)
+//                 return QFile::decodeName(SERVICETYPES_INSTALL_DIR "/");
+//             if (strcmp("sound", type) == 0)
+//                 return QFile::decodeName(SOUND_INSTALL_DIR "/");
+//             break;
+//         case 't':
+//             if (strcmp("templates", type) == 0)
+//                 return QFile::decodeName(TEMPLATES_INSTALL_DIR "/");
+//             break;
+//         case 'w':
+//             if (strcmp("wallpaper", type) == 0)
+//                 return QFile::decodeName(WALLPAPER_INSTALL_DIR "/");
+//             break;
+//         case 'x':
+//             if (strcmp("xdgconf-menu", type) == 0)
+//                 return QFile::decodeName(SYSCONF_INSTALL_DIR "/xdg/menus/");
+//             if (strcmp("xdgdata-apps", type) == 0)
+//                 return QFile::decodeName(XDG_APPS_INSTALL_DIR "/");
+//             if (strcmp("xdgdata-dirs", type) == 0)
+//                 return QFile::decodeName(XDG_DIRECTORY_INSTALL_DIR "/");
+//             break;
+//     }
     return QString();
 }
diff --git a/kdecore/kernel/ktoolinvocation.cpp b/kdecore/kernel/ktoolinvocation.cpp
index 73c8bc0..560803a 100644
--- a/kdecore/kernel/ktoolinvocation.cpp
+++ b/kdecore/kernel/ktoolinvocation.cpp
@@ -393,4 +393,4 @@ void KToolInvocation::startKdeinit()
 //    qApp->restoreOverrideCursor();
 }
 
-#include "ktoolinvocation.moc"
+#include "../../ktoolinvocation.moc"