relevant parts of kdecore

13 files changed, 86 insertions, 81 deletions

diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index a8b21fc..45205ac 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -26,11 +26,14 @@ INCLUDE (CheckTypeSize)
 INCLUDE (CheckStructMember)
 
 include_directories(localization)
-# include_directories(${CMAKE_CURRENT_BINARY_DIR}/jobs)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/jobs)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/jobs)
 
-# QT4_AUTOMOC(date/ksystemtimezone.cpp)
-QT4_GENERATE_MOC(${CMAKE_SOURCE_DIR}/date/ksystemtimezone.cpp ${CMAKE_CURRENT_BINARY_DIR}/date/ksystemtimezone.moc)
-# QT4_GENERATE_MOC(${CMAKE_SOURCE_DIR}/jobs/kcompositejob.cpp ${CMAKE_CURRENT_BINARY_DIR}/jobs/kcompositejob.moc)
+# QT4_AUTOMOC(${CMAKE_CURRENT_SOURCE_DIR}/jobs/kjob.cpp)
+# QT4_AUTOMOC(${CMAKE_CURRENT_SOURCE_DIR}/jobs/kcompositejob.cpp)
+# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/date/ksystemtimezone.cpp ${CMAKE_CURRENT_BINARY_DIR}/date/ksystemtimezone.moc)
+# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/jobs/kjob.cpp ${CMAKE_CURRENT_BINARY_DIR}/jobs/kjob.moc)
+# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/jobs/kcompositejob.cpp ${CMAKE_CURRENT_BINARY_DIR}/jobs/kcompositejob.moc)
 
 # Generate config-kstandarddirs.h
 # configure_file(config-kstandarddirs.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kstandarddirs.h )
@@ -85,24 +88,24 @@ QT4_GENERATE_MOC(${CMAKE_SOURCE_DIR}/date/ksystemtimezone.cpp ${CMAKE_CURRENT_BI
 # include_directories( ${ZLIB_INCLUDE_DIR} )
 include_directories( ${QT_INCLUDES} )
 
-if (KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
+# if (KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
    set(KDECORE_NO_KDE3SUPPORT TRUE)
-endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
+# endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/sonnet/ )
+# include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/sonnet/ )
 
 # kdecore_OPTIONAL_SRCS is used to collect source files
 # which are not always compiled into kdecore
 # if it's used, *always* append to it
-set(kdecore_OPTIONAL_SRCS)
+# set(kdecore_OPTIONAL_SRCS)
 # same for optional libs
-set(kdecore_OPTIONAL_LIBS)
+# set(kdecore_OPTIONAL_LIBS)
 
 add_definitions(-DQT_NO_CAST_FROM_ASCII)
 
-if(WIN32)
-   set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${KDEWIN_LIBRARIES})
-endif(WIN32)
+# if(WIN32)
+#    set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${KDEWIN_LIBRARIES})
+# endif(WIN32)
 
 # Needed for the kdatetime test in release mode
 # if(KDE4_BUILD_TESTS)
@@ -255,8 +258,8 @@ set(kdecore_LIB_SRCS
 #    io/kar.cpp
 #    io/karchive.cpp
 #    io/kautosavefile.cpp
-#    io/kdebug.cpp
-#    io/kdebugdbusiface.cpp
+   io/kdebug.cpp
+   io/kdebugdbusiface.cpp
 #    io/kdirwatch.cpp
 #    io/kfilesystemtype_p.cpp
 #    io/klimitediodevice.cpp
@@ -267,10 +270,10 @@ set(kdecore_LIB_SRCS
 #    io/ktar.cpp
 #    io/ktempdir.cpp
 #    io/ktemporaryfile.cpp
-#    io/kurl.cpp
+   io/kurl.cpp
 #    io/kzip.cpp
-#    jobs/kcompositejob.cpp
-#    jobs/kjob.cpp
+   jobs/kcompositejob.cpp
+   jobs/kjob.cpp
 #    jobs/kjobuidelegate.cpp
 #    jobs/kjobtrackerinterface.cpp
 #    kernel/kauthorized.cpp
@@ -340,7 +343,7 @@ set(kdecore_LIB_SRCS
 #       network/k3socketbuffer.cpp
 #    )
 # endif (NOT KDECORE_NO_KDE3SUPPORT)
-
+include_directories(date)
 set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
 #    network/klocalsocket.cpp
 #    network/ksocketfactory.cpp
@@ -348,7 +351,7 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
 #    network/ktcpsocket.cpp
 #    localization/kcatalog.cpp
 #    localization/kcurrencycode.cpp
-   localization/kcharsets.cpp
+#    localization/kcharsets.cpp
 #    localization/kencodingdetector.cpp
 #    localization/guess_ja.cpp
 #    localization/kencodingprober.cpp
@@ -411,6 +414,8 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
    ${kdecore_OPTIONAL_SRCS}
 )
 
+QT4_AUTOMOC("${kdecore_LIB_SRCS}")
+
 # if(NOT KDE_NO_DEPRECATED)
 #     set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
 #        util/klibloader.cpp
@@ -470,7 +475,7 @@ set_target_properties(calendaring-kdecore PROPERTIES
                      )
 
 
-# install(TARGETS kdecore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS calendaring-kdecore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### next target ###############
 
@@ -569,53 +574,53 @@ set_target_properties(calendaring-kdecore PROPERTIES
 # install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages DESTINATION ${LOCALE_INSTALL_DIR}  )
 # install( FILES localization/entry.desktop  DESTINATION  ${LOCALE_INSTALL_DIR}/en_US )
 # install( FILES kdebug.areas kdebugrc DESTINATION ${CONFIG_INSTALL_DIR} )
-# install( FILES
-#    kdecore_export.h
-# #    compression/kfilterbase.h
-# #    compression/karchive_export.h
-# #    compression/kfilterdev.h
-# #    config/conversion_check.h
-# #    config/kconfig.h
-# #    #config/kconfigbackend.h re-enable post-API review and implementation (4.2?)
-# #    config/kconfigbase.h
-# #    config/kconfiggroup.h
-# #    config/kdesktopfile.h
-# #    config/ksharedconfig.h
-# #    config/kcoreconfigskeleton.h
-#    date/kcalendarsystem.h
-#    date/kdatetime.h
-#    date/klocalizeddate.h
-#    date/ksystemtimezone.h
-#    date/ktimezone.h
-#    date/ktzfiletimezone.h
-# #    io/kar.h
-# #    io/karchive.h
-# #    io/kautosavefile.h
-# #    io/kdebug.h
-# #    io/kdirwatch.h
-# #    io/kmessage.h
-# #    io/kprocess.h
-# #    io/klockfile.h
-# #    io/kmountpoint.h
-# #    io/ksavefile.h
-# #    io/ktar.h
-# #    io/ktempdir.h
-# #    io/ktemporaryfile.h
-# #    io/kurl.h
-# #    io/kzip.h
-#    jobs/kcompositejob.h
-#    jobs/kjob.h
+install( FILES
+   kdecore_export.h
+#    compression/kfilterbase.h
+#    compression/karchive_export.h
+#    compression/kfilterdev.h
+#    config/conversion_check.h
+#    config/kconfig.h
+#    #config/kconfigbackend.h re-enable post-API review and implementation (4.2?)
+#    config/kconfigbase.h
+#    config/kconfiggroup.h
+#    config/kdesktopfile.h
+#    config/ksharedconfig.h
+#    config/kcoreconfigskeleton.h
+   date/kcalendarsystem.h
+   date/kdatetime.h
+   date/klocalizeddate.h
+   date/ksystemtimezone.h
+   date/ktimezone.h
+   date/ktzfiletimezone.h
+#    io/kar.h
+#    io/karchive.h
+#    io/kautosavefile.h
+   io/kdebug.h
+#    io/kdirwatch.h
+#    io/kmessage.h
+#    io/kprocess.h
+#    io/klockfile.h
+#    io/kmountpoint.h
+#    io/ksavefile.h
+#    io/ktar.h
+#    io/ktempdir.h
+#    io/ktemporaryfile.h
+   io/kurl.h
+#    io/kzip.h
+   jobs/kcompositejob.h
+   jobs/kjob.h
 #    jobs/kjobuidelegate.h
 #    jobs/kjobtrackerinterface.h
-#    kernel/kaboutdata.h
-#    kernel/kauthorized.h
-#    kernel/kcmdlineargs.h
-#    kernel/kglobal.h
+   kernel/kaboutdata.h
+   kernel/kauthorized.h
+   kernel/kcmdlineargs.h
+   kernel/kglobal.h
 #    kernel/kcomponentdata.h
 #    kernel/kstandarddirs.h
 #    kernel/ktoolinvocation.h
-#    DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
-# )
+   DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+)
 
 # if (NOT KDECORE_NO_KDE3SUPPORT)
 #    install(FILES
@@ -636,10 +641,10 @@ set_target_properties(calendaring-kdecore PROPERTIES
 #    )
 # endif (NOT KDECORE_NO_KDE3SUPPORT)
 
-# install(FILES
-#    network/klocalsocket.h
-#    network/ksocketfactory.h
-#    network/ktcpsocket.h
+install(FILES
+   network/klocalsocket.h
+   network/ksocketfactory.h
+   network/ktcpsocket.h
 #    auth/kauthaction.h
 #    auth/kauthactionreply.h
 #    auth/kauthactionwatcher.h
@@ -696,8 +701,8 @@ set_target_properties(calendaring-kdecore PROPERTIES
 #    util/qtest_kde.h
 #    ${CMAKE_CURRENT_BINARY_DIR}/kdefakes.h
 #    ${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h
-#    DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
-# )
+   DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+)
 # 
 # install( FILES sonnet/backgroundchecker.h sonnet/speller.h sonnet/globals.h
 #          DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet COMPONENT Devel)
diff --git a/kdecore/io/kdebug.cpp b/kdecore/io/kdebug.cpp
index 129ab87..d72da01 100644
--- a/kdecore/io/kdebug.cpp
+++ b/kdecore/io/kdebug.cpp
@@ -49,7 +49,7 @@
 #undef kBacktrace
 #endif
 
-#include <config.h>
+// #include <config.h>
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
diff --git a/kdecore/io/kdebugdbusiface.cpp b/kdecore/io/kdebugdbusiface.cpp
index 6fbab74..844ffd2 100644
--- a/kdecore/io/kdebugdbusiface.cpp
+++ b/kdecore/io/kdebugdbusiface.cpp
@@ -43,4 +43,4 @@ void KDebugDBusIface::printBacktrace()
     kDebug() << kBacktrace();
 }
 
-#include "kdebugdbusiface_p.moc"
+#include "../../kdebugdbusiface_p.moc"
diff --git a/kdecore/jobs/kcompositejob.cpp b/kdecore/jobs/kcompositejob.cpp
index 5ddabd7..c0cd6ad 100644
--- a/kdecore/jobs/kcompositejob.cpp
+++ b/kdecore/jobs/kcompositejob.cpp
@@ -112,4 +112,4 @@ void KCompositeJob::slotInfoMessage( KJob *job, const QString &plain, const QStr
     emit infoMessage( job, plain, rich );
 }
 
-#include "kcompositejob.moc"
+#include "../../kcompositejob.moc"
diff --git a/kdecore/jobs/kjob.cpp b/kdecore/jobs/kjob.cpp
index 123068b..d4574eb 100644
--- a/kdecore/jobs/kjob.cpp
+++ b/kdecore/jobs/kjob.cpp
@@ -367,4 +367,4 @@ void KJob::setAutoDelete( bool autodelete )
     d->isAutoDelete = autodelete;
 }
 
-#include "kjob.moc"
+#include "../../kjob.moc"
diff --git a/kdecore/jobs/kjobuidelegate.cpp b/kdecore/jobs/kjobuidelegate.cpp
index d3adea2..2920b41 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/kstandarddirs_unix.cpp b/kdecore/kernel/kstandarddirs_unix.cpp
index f8646ea..9ae3f03 100644
--- a/kdecore/kernel/kstandarddirs_unix.cpp
+++ b/kdecore/kernel/kstandarddirs_unix.cpp
@@ -18,8 +18,8 @@
 
 #include "kstandarddirs.h"
 
-#include <config-prefix.h>
-#include <config.h>
+// #include <config-prefix.h>
+// #include <config.h>
 #include <QFile>
 
 QString KStandardDirs::installPath(const char *type)
diff --git a/kdecore/kernel/ktoolinvocation_x11.cpp b/kdecore/kernel/ktoolinvocation_x11.cpp
index 5168f2f..c833094 100644
--- a/kdecore/kernel/ktoolinvocation_x11.cpp
+++ b/kdecore/kernel/ktoolinvocation_x11.cpp
@@ -22,7 +22,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <config.h>
+// #include <config.h>
 
 #include "ktoolinvocation.h"
 
diff --git a/kdecore/localization/kcatalog.cpp b/kdecore/localization/kcatalog.cpp
index 1f01688..2c126c6 100644
--- a/kdecore/localization/kcatalog.cpp
+++ b/kdecore/localization/kcatalog.cpp
@@ -20,7 +20,7 @@
 #include "kcatalog_p.h"
 #include "kstandarddirs.h"
 
-#include <config.h>
+// #include <config.h>
 
 #include <QtCore/QFile>
 #include <QMutexLocker>
diff --git a/kdecore/localization/klocale_kde.cpp b/kdecore/localization/klocale_kde.cpp
index b010e74..e0fecc5 100644
--- a/kdecore/localization/klocale_kde.cpp
+++ b/kdecore/localization/klocale_kde.cpp
@@ -24,7 +24,7 @@
 
 #include "klocale_p.h"
 
-#include "config-localization.h"
+// #include "config-localization.h"
 
 #include <math.h>
 
diff --git a/kdecore/localization/klocalizedstring.cpp b/kdecore/localization/klocalizedstring.cpp
index 819c8b0..287e904 100644
--- a/kdecore/localization/klocalizedstring.cpp
+++ b/kdecore/localization/klocalizedstring.cpp
@@ -19,7 +19,7 @@
 
 #include <klocalizedstring.h>
 
-#include <config.h>
+// #include <config.h>
 
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/kdecore/localization/kuitformats.cpp b/kdecore/localization/kuitformats.cpp
index 15eacb2..def71cb 100644
--- a/kdecore/localization/kuitformats.cpp
+++ b/kdecore/localization/kuitformats.cpp
@@ -19,7 +19,7 @@
 
 #include <kuitformats_p.h>
 
-#include <config.h>
+// #include <config.h>
 #include <klocale.h>
 
 #include <QStringList>
diff --git a/kdecore/localization/kuitsemantics.cpp b/kdecore/localization/kuitsemantics.cpp
index 150bea9..71a9715 100644
--- a/kdecore/localization/kuitsemantics.cpp
+++ b/kdecore/localization/kuitsemantics.cpp
@@ -19,7 +19,7 @@
 
 #include <kuitsemantics_p.h>
 
-#include <config.h>
+// #include <config.h>
 
 #include <QHash>
 #include <QSet>