From 7d0dd6d54181a3f2d4d9b3b488063fdcadc183ee Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 9 May 2015 16:39:13 +0000 Subject: [PATCH] generic: stop using kdeinit for main applications --- kconf_update/CMakeLists.txt | 9 +++------ kconf_update/kconf_update.cpp | 2 +- kded/CMakeLists.txt | 18 ++++++------------ kded/kbuildsycoca.cpp | 2 +- kded/kded.cpp | 2 +- kinit/CMakeLists.txt | 11 ++++------- kinit/klauncher_main.cpp | 2 +- kioslave/http/CMakeLists.txt | 9 +++------ kioslave/http/http_cache_cleaner.cpp | 2 +- 9 files changed, 21 insertions(+), 36 deletions(-) diff --git a/kconf_update/CMakeLists.txt b/kconf_update/CMakeLists.txt index 9737efe3..23cc2cfa 100644 --- a/kconf_update/CMakeLists.txt +++ b/kconf_update/CMakeLists.txt @@ -6,19 +6,16 @@ include_directories( ${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES} ) ########### next target ############### -set(kconf_update_KDEINIT_SRCS +set(kconf_update_SRCS kconf_update.cpp kconfigutils.cpp ) -kde4_add_kdeinit_executable( kconf_update NOGUI ${kconf_update_KDEINIT_SRCS}) +kde4_add_executable(kconf_update NOGUI ${kconf_update_SRCS}) -target_link_libraries(kdeinit_kconf_update ${KDE4_KDECORE_LIBS} ) +target_link_libraries(kconf_update ${KDE4_KDECORE_LIBS} ) -install(TARGETS kdeinit_kconf_update ${INSTALL_TARGETS_DEFAULT_ARGS}) - -target_link_libraries( kconf_update kdeinit_kconf_update ) install(TARGETS kconf_update DESTINATION ${LIBEXEC_INSTALL_DIR} ) ########### install files ############### diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp index 6081856e..d166d618 100644 --- a/kconf_update/kconf_update.cpp +++ b/kconf_update/kconf_update.cpp @@ -915,7 +915,7 @@ void KonfUpdate::resetOptions() } -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { KCmdLineOptions options; options.add("debug", ki18n("Keep output results from scripts")); diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index 50b3e4ac..7eb20fbf 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -13,12 +13,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kded.h.cmake ${CMAKE_CURRENT_B ########### next target ############### -set(kded_KDEINIT_SRCS kded.cpp kdedadaptor.cpp +set(kded_SRCS kded.cpp kdedadaptor.cpp ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded.xml # just so that it gets generated ) -kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS}) +kde4_add_executable(kded4 ${kded_SRCS}) if (Q_WS_MAC) set_target_properties(kded4 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template) @@ -26,11 +26,8 @@ if (Q_WS_MAC) set_target_properties(kded4 PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Daemon") endif (Q_WS_MAC) -target_link_libraries(kdeinit_kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) -install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS}) - -target_link_libraries( kded4 kdeinit_kded4 ) install(TARGETS kded4 ${INSTALL_TARGETS_DEFAULT_ARGS} ) @@ -41,7 +38,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded.xml DESTINATION ${DBUS_IN ########### next target ############### -set(kbuildsycoca_KDEINIT_SRCS +set(kbuildsycoca_SRCS kbuildsycoca.cpp kbuildmimetypefactory.cpp kmimeassociations.cpp @@ -61,13 +58,10 @@ endif(KBUILDSYCOCA_NO_KCRASH) # We need to add a '4' so that kde3 apps running kbuildsycoca don't run the kde4 one. -kde4_add_kdeinit_executable( kbuildsycoca4 NOGUI ${kbuildsycoca_KDEINIT_SRCS}) +kde4_add_executable( kbuildsycoca4 NOGUI ${kbuildsycoca_SRCS}) -target_link_libraries(kdeinit_kbuildsycoca4 ${KBUILDSYCOCA_MAIN_LIBS} ${QT_QTXML_LIBRARY}) +target_link_libraries(kbuildsycoca4 ${KBUILDSYCOCA_MAIN_LIBS} ${QT_QTXML_LIBRARY}) -install(TARGETS kdeinit_kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS}) - -target_link_libraries( kbuildsycoca4 kdeinit_kbuildsycoca4 ) install(TARGETS kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index 40ad63f4..a2b62d72 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -630,7 +630,7 @@ static const char appFullName[] = "org.kde.kbuildsycoca"; static const char appName[] = "kbuildsycoca4"; static const char appVersion[] = "1.1"; -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { KAboutData d(appName, "kdelibs4", ki18n("KBuildSycoca"), appVersion, ki18n("Rebuilds the system configuration cache."), diff --git a/kded/kded.cpp b/kded/kded.cpp index f3069318..d53fffa1 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -856,7 +856,7 @@ public: bool startup; }; -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +int main(int argc, char *argv[]) { KAboutData aboutData( "kded" /*don't change this one to kded4! dbus registration should be org.kde.kded etc.*/, "kdelibs4", ki18n("KDE Daemon"), diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt index 0d7e54d4..8880fdd6 100644 --- a/kinit/CMakeLists.txt +++ b/kinit/CMakeLists.txt @@ -104,7 +104,7 @@ install(TARGETS kioslave DESTINATION ${LIBEXEC_INSTALL_DIR} ) ########### klauncher ############### -set(klauncher_KDEINIT_SRCS +set(klauncher_SRCS klauncher.cpp klauncher_main.cpp klauncher_adaptor.cpp @@ -117,14 +117,11 @@ set(klauncher_KDEINIT_SRCS qt4_generate_dbus_interface(klauncher_adaptor.h org.kde.KLauncher.xml) -kde4_add_kdeinit_executable( klauncher NOGUI ${klauncher_KDEINIT_SRCS}) -set_target_properties(kdeinit_klauncher PROPERTIES DEFINE_SYMBOL MAKE_KLAUNCHER) +kde4_add_executable( klauncher NOGUI ${klauncher_SRCS}) +set_target_properties(klauncher PROPERTIES DEFINE_SYMBOL MAKE_KLAUNCHER) -target_link_libraries(kdeinit_klauncher ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +target_link_libraries(klauncher ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) -install(TARGETS kdeinit_klauncher ${INSTALL_TARGETS_DEFAULT_ARGS}) - -target_link_libraries( klauncher kdeinit_klauncher ) install(TARGETS klauncher DESTINATION ${LIBEXEC_INSTALL_DIR} ) ########### start_kdeinit ############### diff --git a/kinit/klauncher_main.cpp b/kinit/klauncher_main.cpp index 34a28798..c321ed8d 100644 --- a/kinit/klauncher_main.cpp +++ b/kinit/klauncher_main.cpp @@ -49,7 +49,7 @@ static void sig_handler(int sig_num) #endif -extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) +int main( int argc, char**argv ) { // Started via kdeinit. int launcherFd; diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt index cea76f5a..f11e7437 100644 --- a/kioslave/http/CMakeLists.txt +++ b/kioslave/http/CMakeLists.txt @@ -36,18 +36,15 @@ add_subdirectory( tests ) ########### next target ############### -set(kio_http_cache_cleaner_KDEINIT_SRCS +set(kio_http_cache_cleaner_SRCS http_cache_cleaner.cpp ) -kde4_add_kdeinit_executable( kio_http_cache_cleaner NOGUI ${kio_http_cache_cleaner_KDEINIT_SRCS}) +kde4_add_executable( kio_http_cache_cleaner NOGUI ${kio_http_cache_cleaner_SRCS}) -target_link_libraries(kdeinit_kio_http_cache_cleaner ${KDE4_KIO_LIBS} ${ZLIB_LIBRARY}) +target_link_libraries(kio_http_cache_cleaner ${KDE4_KIO_LIBS} ${ZLIB_LIBRARY}) -install(TARGETS kdeinit_kio_http_cache_cleaner ${INSTALL_TARGETS_DEFAULT_ARGS}) - -target_link_libraries( kio_http_cache_cleaner kdeinit_kio_http_cache_cleaner ) install(TARGETS kio_http_cache_cleaner DESTINATION ${LIBEXEC_INSTALL_DIR} ) ########### next target ############### diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp index 1a1b0594..40a01d48 100644 --- a/kioslave/http/http_cache_cleaner.cpp +++ b/kioslave/http/http_cache_cleaner.cpp @@ -725,7 +725,7 @@ private: }; -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { KCmdLineArgs::init(argc, argv, appName, "kdelibs4", ki18n("KDE HTTP cache maintenance tool"), version,