summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-27 23:10:35 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-27 23:10:35 (GMT)
commite541be844bbfd101c3a03617af25749603905bd2 (patch)
tree49e17496b4f57014ff140cbdf4c95fa17c2a6d2d
parent9b0d5b0bd47e94db70804b92ed0abe62423bfa93 (diff)
downloadlibcalendaring-e541be844bbfd101c3a03617af25749603905bd2.tar.gz
no more undefined references when used from libkolab...
-rw-r--r--kdecore/CMakeLists.txt154
-rw-r--r--kdecore/config/kconfigbackend.cpp2
-rw-r--r--kdecore/date/ksystemtimezone.cpp1
-rw-r--r--kdecore/io/klockfile_unix.cpp2
-rw-r--r--kdecore/io/ksavefile.cpp2
-rw-r--r--kdecore/jobs/kjobuidelegate.cpp2
-rw-r--r--kdecore/kernel/kcmdlineargs.cpp2
-rw-r--r--kdecore/kernel/kstandarddirs.cpp10
-rw-r--r--kdecore/kernel/kstandarddirs_unix.cpp152
-rw-r--r--kdecore/kernel/ktoolinvocation.cpp2
-rw-r--r--kdecore/localization/klocale.cpp12
-rw-r--r--kdecore/network/ksslcertificatemanager.cpp2
-rw-r--r--kdecore/network/ktcpsocket.cpp8
-rw-r--r--kdecore/sycoca/ksycoca.cpp4
-rw-r--r--kdecore/sycoca/ksycocafactory.cpp2
-rw-r--r--kdecore/util/kautostart.cpp2
-rw-r--r--kdecore/util/kdedmodule.cpp2
-rw-r--r--kdecore/util/klauncher_iface.cpp2
-rw-r--r--kdecore/util/klibrary.cpp2
-rw-r--r--kdecore/util/kpluginfactory.cpp2
-rw-r--r--kdecore/util/kpluginloader.cpp6
21 files changed, 190 insertions, 183 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index b75fe3f..500c385 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -176,18 +176,18 @@ add_definitions(-DQT_NO_CAST_FROM_ASCII)
# if (UNIX)
-# set(kdecore_OPTIONAL_SRCS ${kdecore_OPTIONAL_SRCS}
-# kernel/ktoolinvocation_x11.cpp
-# kernel/kstandarddirs_unix.cpp
-# localization/klocale_unix.cpp
+ set(kdecore_OPTIONAL_SRCS ${kdecore_OPTIONAL_SRCS}
+ kernel/ktoolinvocation_x11.cpp
+ kernel/kstandarddirs_unix.cpp
+ localization/klocale_unix.cpp
# network/klocalsocket_unix.cpp
# network/netsupp.cpp
-# io/klockfile_unix.cpp
-# util/kshell_unix.cpp
-# util/kuser_unix.cpp
-# util/kmacroexpander_unix.cpp
+ io/klockfile_unix.cpp
+ util/kshell_unix.cpp
+ util/kuser_unix.cpp
+ util/kmacroexpander_unix.cpp
# fakes.c
-# )
+ )
# # if (NOT KDECORE_NO_KDE3SUPPORT)
# # set(kdecore_OPTIONAL_SRCS ${kdecore_OPTIONAL_SRCS}
# # network/k3httpproxysocketdevice.cpp
@@ -228,10 +228,10 @@ set(kdecore_LIB_SRCS
config/kconfig.cpp
config/kconfigbase.cpp
config/kconfiggroup.cpp
-# config/kconfigbackend.cpp
-# config/kconfigini.cpp
-# config/kdesktopfile.cpp
-# config/ksharedconfig.cpp
+ config/kconfigbackend.cpp
+ config/kconfigini.cpp
+ config/kdesktopfile.cpp
+ config/ksharedconfig.cpp
# config/kcoreconfigskeleton.cpp
date/kcalendarera.cpp
date/kcalendarsystem.cpp
@@ -261,28 +261,28 @@ set(kdecore_LIB_SRCS
io/kdebug.cpp
io/kdebugdbusiface.cpp
# io/kdirwatch.cpp
-# io/kfilesystemtype_p.cpp
+ io/kfilesystemtype_p.cpp
# io/klimitediodevice.cpp
-# io/kmessage.cpp
+ io/kmessage.cpp
# io/kmountpoint.cpp
# io/kprocess.cpp
-# io/ksavefile.cpp
+ io/ksavefile.cpp
# io/ktar.cpp
# io/ktempdir.cpp
-# io/ktemporaryfile.cpp
+ io/ktemporaryfile.cpp
io/kurl.cpp
# io/kzip.cpp
jobs/kcompositejob.cpp
jobs/kjob.cpp
-# jobs/kjobuidelegate.cpp
+ jobs/kjobuidelegate.cpp
# jobs/kjobtrackerinterface.cpp
-# kernel/kauthorized.cpp
-# kernel/kaboutdata.cpp
-# kernel/kcmdlineargs.cpp
+ kernel/kauthorized.cpp
+ kernel/kaboutdata.cpp
+ kernel/kcmdlineargs.cpp
kernel/kglobal.cpp
-# kernel/kcomponentdata.cpp
-# kernel/kstandarddirs.cpp
-# kernel/ktoolinvocation.cpp
+ kernel/kcomponentdata.cpp
+ kernel/kstandarddirs.cpp
+ kernel/ktoolinvocation.cpp
# auth/kauthaction.cpp
# auth/kauthactionreply.cpp
# auth/kauthactionwatcher.cpp
@@ -292,28 +292,28 @@ set(kdecore_LIB_SRCS
# auth/kauthhelpersupport.cpp
# auth/backends/fake/FakeBackend.cpp
# auth/backends/fakehelper/FakeHelperProxy.cpp
-# services/kfoldermimetype.cpp
-# services/kmimetypefactory.cpp
-# services/kmimemagicrule.cpp
-# services/kmimetypetrader.cpp
-# services/kmimetype.cpp
-# services/kmimeglobsfileparser.cpp
-# services/kmimetyperepository.cpp
-# services/kservice.cpp
-# services/kserviceaction.cpp
-# services/kservicefactory.cpp
-# services/kservicegroup.cpp
-# services/kservicegroupfactory.cpp
-# services/kserviceoffer.cpp
-# services/kservicetype.cpp
-# services/kservicetypefactory.cpp
-# services/kservicetypeprofile.cpp
-# services/kservicetypetrader.cpp
-# services/ktraderparse.cpp
-# services/ktraderparsetree.cpp
-# services/yacc.c
-# services/lex.c
-# services/kplugininfo.cpp
+ services/kfoldermimetype.cpp
+ services/kmimetypefactory.cpp
+ services/kmimemagicrule.cpp
+ services/kmimetypetrader.cpp
+ services/kmimetype.cpp
+ services/kmimeglobsfileparser.cpp
+ services/kmimetyperepository.cpp
+ services/kservice.cpp
+ services/kserviceaction.cpp
+ services/kservicefactory.cpp
+ services/kservicegroup.cpp
+ services/kservicegroupfactory.cpp
+ services/kserviceoffer.cpp
+ services/kservicetype.cpp
+ services/kservicetypefactory.cpp
+ services/kservicetypeprofile.cpp
+ services/kservicetypetrader.cpp
+ services/ktraderparse.cpp
+ services/ktraderparsetree.cpp
+ services/yacc.c
+ services/lex.c
+ services/kplugininfo.cpp
# sonnet/loader.cpp
# sonnet/client.cpp
# sonnet/spellerplugin.cpp
@@ -348,10 +348,10 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
# network/klocalsocket.cpp
# network/ksocketfactory.cpp
# network/ksslcertificatemanager.cpp
-# network/ktcpsocket.cpp
-# localization/kcatalog.cpp
-# localization/kcurrencycode.cpp
-# localization/kcharsets.cpp
+ network/ktcpsocket.cpp
+ localization/kcatalog.cpp
+ localization/kcurrencycode.cpp
+ localization/kcharsets.cpp
# localization/kencodingdetector.cpp
# localization/guess_ja.cpp
# localization/kencodingprober.cpp
@@ -382,33 +382,33 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
# localization/probers/nsSBCharSetProber.cpp
# localization/probers/nsSJISProber.cpp
# localization/probers/nsUniversalDetector.cpp
-# localization/klocale.cpp
-# localization/klocale_kde.cpp
-# localization/klocalizedstring.cpp
-# localization/kuitsemantics.cpp
-# localization/kuitformats.cpp
-# localization/common_helpers.cpp
-# sycoca/ksycoca.cpp
-# sycoca/ksycocadict.cpp
-# sycoca/ksycocaentry.cpp
-# sycoca/ksycocafactory.cpp
-# sycoca/kprotocolinfo.cpp
-# sycoca/kprotocolinfofactory.cpp
-# sycoca/kmemfile.cpp
-# text/kascii.cpp
-# text/kcodecs.cpp
-# text/kstringhandler.cpp
-# util/kallocator.cpp
-# util/kautostart.cpp
-# util/kdedmodule.cpp
-# util/kdeversion.cpp
-# util/klauncher_iface.cpp
-# util/klibrary.cpp
-# util/kmacroexpander.cpp
-# util/kpluginfactory.cpp
-# util/kpluginloader.cpp
-# util/kshell.cpp
- util/krandom.cpp
+ localization/klocale.cpp
+ localization/klocale_kde.cpp
+ localization/klocalizedstring.cpp
+ localization/kuitsemantics.cpp
+ localization/kuitformats.cpp
+ localization/common_helpers.cpp
+ sycoca/ksycoca.cpp
+ sycoca/ksycocadict.cpp
+ sycoca/ksycocaentry.cpp
+ sycoca/ksycocafactory.cpp
+ sycoca/kprotocolinfo.cpp
+ sycoca/kprotocolinfofactory.cpp
+ sycoca/kmemfile.cpp
+ text/kascii.cpp
+ text/kcodecs.cpp
+ text/kstringhandler.cpp
+ util/kallocator.cpp
+ util/kautostart.cpp
+ util/kdedmodule.cpp
+ util/kdeversion.cpp
+ util/klauncher_iface.cpp
+ util/klibrary.cpp
+ util/kmacroexpander.cpp
+ util/kpluginfactory.cpp
+ util/kpluginloader.cpp
+ util/kshell.cpp
+ util/krandom.cpp
# util/krandomsequence.cpp
# util/qtest_kde.cpp
${kdecore_OPTIONAL_SRCS}
diff --git a/kdecore/config/kconfigbackend.cpp b/kdecore/config/kconfigbackend.cpp
index cd10da7..8cd651d 100644
--- a/kdecore/config/kconfigbackend.cpp
+++ b/kdecore/config/kconfigbackend.cpp
@@ -39,7 +39,7 @@
#include "kconfigdata.h"
#include "kdebug.h"
#include "kstandarddirs.h"
-#include "kconfigbackend.moc"
+#include "../../kconfigbackend.moc"
typedef KSharedPtr<KConfigBackend> BackendPtr;
diff --git a/kdecore/date/ksystemtimezone.cpp b/kdecore/date/ksystemtimezone.cpp
index 0221cea..c2e2da3 100644
--- a/kdecore/date/ksystemtimezone.cpp
+++ b/kdecore/date/ksystemtimezone.cpp
@@ -890,3 +890,4 @@ QList<int> KSystemTimeZoneData::utcOffsets() const
return QList<int>();
}
+#include "../../ksystemtimezone.moc" \ No newline at end of file
diff --git a/kdecore/io/klockfile_unix.cpp b/kdecore/io/klockfile_unix.cpp
index 93e92e2..90b257c 100644
--- a/kdecore/io/klockfile_unix.cpp
+++ b/kdecore/io/klockfile_unix.cpp
@@ -20,7 +20,7 @@
#include "klockfile.h"
-#include <config.h>
+// #include <config.h>
#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
diff --git a/kdecore/io/ksavefile.cpp b/kdecore/io/ksavefile.cpp
index 9a82be3..e659bb4 100644
--- a/kdecore/io/ksavefile.cpp
+++ b/kdecore/io/ksavefile.cpp
@@ -23,7 +23,7 @@
#include "ksavefile.h"
-#include <config.h>
+// #include <config.h>
#include <QDir>
#include <QProcess>
diff --git a/kdecore/jobs/kjobuidelegate.cpp b/kdecore/jobs/kjobuidelegate.cpp
index 2920b41..efedffc 100644
--- a/kdecore/jobs/kjobuidelegate.cpp
+++ b/kdecore/jobs/kjobuidelegate.cpp
@@ -117,4 +117,4 @@ void KJobUiDelegate::Private::_k_result(KJob *job2)
q->showErrorMessage();
}
-// #include "kjobuidelegate.moc"
+#include "../../kjobuidelegate.moc"
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"
diff --git a/kdecore/localization/klocale.cpp b/kdecore/localization/klocale.cpp
index 02aa77a..e253854 100644
--- a/kdecore/localization/klocale.cpp
+++ b/kdecore/localization/klocale.cpp
@@ -23,13 +23,13 @@
*/
#include "klocale.h"
-#if defined Q_WS_WIN
- #include "klocale_win_p.h"
-#elif defined Q_OS_MAC
- #include "klocale_mac_p.h"
-#else
+// #if defined Q_WS_WIN
+// #include "klocale_win_p.h"
+// #elif defined Q_OS_MAC
+// #include "klocale_mac_p.h"
+// #else
#include "klocale_unix_p.h"
-#endif
+// #endif
#include <QtCore/QDateTime>
#include <QtCore/QTextCodec>
diff --git a/kdecore/network/ksslcertificatemanager.cpp b/kdecore/network/ksslcertificatemanager.cpp
index d748709..5f53b98 100644
--- a/kdecore/network/ksslcertificatemanager.cpp
+++ b/kdecore/network/ksslcertificatemanager.cpp
@@ -33,7 +33,7 @@
#include <QtDBus/QtDBus>
-#include "kssld/kssld_interface.h"
+// #include "kssld/kssld_interface.h"
/*
Config file format:
diff --git a/kdecore/network/ktcpsocket.cpp b/kdecore/network/ktcpsocket.cpp
index 8da620a..17b84d1 100644
--- a/kdecore/network/ktcpsocket.cpp
+++ b/kdecore/network/ktcpsocket.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <kglobal.h>
-#include <ksslcertificatemanager.h>
+// #include <ksslcertificatemanager.h>
#include <kstandarddirs.h>
#include <klocale.h>
@@ -261,7 +261,7 @@ public:
emittedReadyRead(false)
{
// create the instance, which sets Qt's static internal cert set to empty.
- KSslCertificateManager::self();
+// KSslCertificateManager::self();
}
KTcpSocket::State state(QAbstractSocket::SocketState s)
@@ -370,7 +370,7 @@ public:
void maybeLoadCertificates()
{
if (!certificatesLoaded) {
- sock.setCaCertificates(KSslCertificateManager::self()->caCertificates());
+// sock.setCaCertificates(KSslCertificateManager::self()->caCertificates());
certificatesLoaded = true;
}
}
@@ -1143,4 +1143,4 @@ KSslErrorUiData &KSslErrorUiData::operator=(const KSslErrorUiData &other)
}
-#include "ktcpsocket.moc"
+#include "../../ktcpsocket.moc"
diff --git a/kdecore/sycoca/ksycoca.cpp b/kdecore/sycoca/ksycoca.cpp
index bba13d8..24099d1 100644
--- a/kdecore/sycoca/ksycoca.cpp
+++ b/kdecore/sycoca/ksycoca.cpp
@@ -39,7 +39,7 @@
#include <QProcess>
#include <QtDBus/QtDBus>
-#include <config.h>
+// #include <config.h>
#include <stdlib.h>
#include <fcntl.h>
@@ -601,4 +601,4 @@ void KSycoca::clearCaches()
ksycocaInstance->sycoca()->d->closeDatabase();
}
-#include "ksycoca.moc"
+#include "../../ksycoca.moc"
diff --git a/kdecore/sycoca/ksycocafactory.cpp b/kdecore/sycoca/ksycocafactory.cpp
index 24ceca5..9784e96 100644
--- a/kdecore/sycoca/ksycocafactory.cpp
+++ b/kdecore/sycoca/ksycocafactory.cpp
@@ -22,7 +22,7 @@
#include "ksycocaentry.h"
#include "ksycocadict_p.h"
-#include <config.h>
+// #include <config.h>
#include <kdebug.h>
#include <QThread>
diff --git a/kdecore/util/kautostart.cpp b/kdecore/util/kautostart.cpp
index 97d8bc1..972bbe7 100644
--- a/kdecore/util/kautostart.cpp
+++ b/kdecore/util/kautostart.cpp
@@ -356,4 +356,4 @@ QString KAutostart::startAfter() const
return d->df->desktopGroup().readEntry("X-KDE-autostart-after");
}
-#include "kautostart.moc"
+#include "../../kautostart.moc"
diff --git a/kdecore/util/kdedmodule.cpp b/kdecore/util/kdedmodule.cpp
index 00e0734..6a5ba85 100644
--- a/kdecore/util/kdedmodule.cpp
+++ b/kdecore/util/kdedmodule.cpp
@@ -98,4 +98,4 @@ QString KDEDModule::moduleName() const
return d->moduleName;
}
-#include "kdedmodule.moc"
+#include "../../kdedmodule.moc"
diff --git a/kdecore/util/klauncher_iface.cpp b/kdecore/util/klauncher_iface.cpp
index b7ea680..2c56b35 100644
--- a/kdecore/util/klauncher_iface.cpp
+++ b/kdecore/util/klauncher_iface.cpp
@@ -25,4 +25,4 @@ OrgKdeKLauncherInterface::~OrgKdeKLauncherInterface()
}
-#include "klauncher_iface.moc"
+#include "../../klauncher_iface.moc"
diff --git a/kdecore/util/klibrary.cpp b/kdecore/util/klibrary.cpp
index 00bffdc..7d930db 100644
--- a/kdecore/util/klibrary.cpp
+++ b/kdecore/util/klibrary.cpp
@@ -197,4 +197,4 @@ void KLibrary::setFileName(const QString &name, const KComponentData &data)
QLibrary::setFileName(findLibrary(name, data));
}
-#include "klibrary.moc"
+#include "../../klibrary.moc"
diff --git a/kdecore/util/kpluginfactory.cpp b/kdecore/util/kpluginfactory.cpp
index 893f3b5..f62509e 100644
--- a/kdecore/util/kpluginfactory.cpp
+++ b/kdecore/util/kpluginfactory.cpp
@@ -246,4 +246,4 @@ QVariantList KPluginFactory::stringListToVariantList(const QStringList &list)
return variantlist;
}
-#include "kpluginfactory.moc"
+#include "../../kpluginfactory.moc"
diff --git a/kdecore/util/kpluginloader.cpp b/kdecore/util/kpluginloader.cpp
index 838b49b..f925377 100644
--- a/kdecore/util/kpluginloader.cpp
+++ b/kdecore/util/kpluginloader.cpp
@@ -30,7 +30,9 @@
#include <QtCore/QLibrary>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
-
+//Just some number which certainly doesn't match an actual release
+#define KDE_VERSION 15
+#define KDE_VERSION_MAJOR 15
extern int kLibraryDebugArea();
class KPluginLoaderPrivate
@@ -280,4 +282,4 @@ QString KPluginLoader::pluginName() const
return d->name;
}
-#include "kpluginloader.moc"
+#include "../../kpluginloader.moc"