From 3ef94d4d1a6dd34630d7aaf53588dce2a73e1950 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 9 May 2015 16:39:54 +0000 Subject: [PATCH] generic: stop using kdeinit for main applications --- kcminit/CMakeLists.txt | 14 +++--- kcminit/main.cpp | 2 +- kcmshell/CMakeLists.txt | 7 ++- kcmshell/main.cpp | 2 +- kcontrol/access/CMakeLists.txt | 7 ++- kcontrol/access/main.cpp | 3 +- kglobalaccel/CMakeLists.txt | 8 ++-- kglobalaccel/main.cpp | 2 +- klipper/CMakeLists.txt | 11 ++--- klipper/main.cpp | 2 +- kmenuedit/CMakeLists.txt | 11 ++--- kmenuedit/main.cpp | 2 +- krunner/CMakeLists.txt | 15 +++--- krunner/main.cpp | 3 +- ksmserver/CMakeLists.txt | 14 +++--- ksmserver/main.cpp | 4 +- ksysguard/gui/CMakeLists.txt | 7 ++- ksysguard/gui/ksysguard.cpp | 2 +- kuiserver/CMakeLists.txt | 29 ++++------- kuiserver/main.cpp | 2 +- kwalletd/CMakeLists.txt | 21 ++++---- kwalletd/main.cpp | 2 +- kwin/CMakeLists.txt | 48 +++++++++---------- kwin/kcmkwin/kwinrules/CMakeLists.txt | 7 ++- kwin/kcmkwin/kwinrules/main.cpp | 3 +- kwin/main.cpp | 3 +- plasma/desktop/shell/CMakeLists.txt | 11 ++--- plasma/desktop/shell/main.cpp | 3 +- .../shells/plasma-windowed/CMakeLists.txt | 6 +-- .../generic/shells/plasma-windowed/main.cpp | 3 +- 30 files changed, 108 insertions(+), 146 deletions(-) diff --git a/kcminit/CMakeLists.txt b/kcminit/CMakeLists.txt index 029990c1..98377f97 100644 --- a/kcminit/CMakeLists.txt +++ b/kcminit/CMakeLists.txt @@ -1,26 +1,24 @@ ########### next target ############### -set(kcminit_KDEINIT_SRCS main.cpp) +set(kcminit_SRCS main.cpp) -kde4_add_kdeinit_executable( kcminit ${kcminit_KDEINIT_SRCS}) +kde4_add_executable(kcminit ${kcminit_SRCS}) -target_link_libraries(kdeinit_kcminit ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kcminit ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES}) -install(TARGETS kdeinit_kcminit ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kcminit ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### next target ############### # TODO might be simpler to make _startup to be a symlink to -set(kcminit_startup_KDEINIT_SRCS main.cpp) +set(kcminit_startup_SRCS main.cpp) -kde4_add_kdeinit_executable( kcminit_startup ${kcminit_startup_KDEINIT_SRCS}) +kde4_add_executable( kcminit_startup ${kcminit_startup_SRCS}) -target_link_libraries(kdeinit_kcminit_startup ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kcminit_startup ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES}) -install(TARGETS kdeinit_kcminit_startup ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kcminit_startup ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/kcminit/main.cpp b/kcminit/main.cpp index 28a4431c..ffccf579 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -234,7 +234,7 @@ void KCMInit::runPhase2() qApp->exit( 0 ); } -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +int main(int argc, char *argv[]) { // kdeinit waits for kcminit to finish, but during KDE startup // only important kcm's are started very early in the login process, diff --git a/kcmshell/CMakeLists.txt b/kcmshell/CMakeLists.txt index 7943c98d..f73706c2 100644 --- a/kcmshell/CMakeLists.txt +++ b/kcmshell/CMakeLists.txt @@ -1,9 +1,8 @@ -set(kcmshell_KDEINIT_SRCS main.cpp ) +set(kcmshell_SRCS main.cpp ) -kde4_add_kdeinit_executable( kcmshell4 ${kcmshell_KDEINIT_SRCS}) +kde4_add_executable( kcmshell4 ${kcmshell_SRCS}) -target_link_libraries(kdeinit_kcmshell4 ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ) +target_link_libraries(kcmshell4 ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ) -install(TARGETS kdeinit_kcmshell4 ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kcmshell4 ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp index 73864b54..11f6c713 100644 --- a/kcmshell/main.cpp +++ b/kcmshell/main.cpp @@ -168,7 +168,7 @@ void KCMShell::appExit(const QString &appId, const QString &oldName, const QStri } } -extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) +int main(int _argc, char *_argv[]) { KAboutData aboutData( "kcmshell", 0, ki18n("KDE Control Module"), KDE_VERSION_STRING, diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt index 1fbcd78a..6bb80d99 100644 --- a/kcontrol/access/CMakeLists.txt +++ b/kcontrol/access/CMakeLists.txt @@ -16,14 +16,13 @@ install(TARGETS kcm_access DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### next target ############### -set(kaccess_KDEINIT_SRCS kaccess.cpp main.cpp ) +set(kaccess_SRCS kaccess.cpp main.cpp ) -kde4_add_kdeinit_executable( kaccess ${kaccess_KDEINIT_SRCS}) +kde4_add_executable( kaccess ${kaccess_SRCS}) -target_link_libraries(kdeinit_kaccess ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kaccess ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${X11_LIBRARIES}) -install(TARGETS kdeinit_kaccess ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kaccess ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp index 9dc1ae59..5ecd5e1d 100644 --- a/kcontrol/access/main.cpp +++ b/kcontrol/access/main.cpp @@ -4,7 +4,8 @@ #include #include #include -extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] ) + +int main(int argc, char * argv[] ) { KAboutData about(I18N_NOOP("kaccess"), 0, ki18n("KDE Accessibility Tool"), 0, KLocalizedString(), KAboutData::License_GPL, diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt index 9e94434c..5d39fd5b 100644 --- a/kglobalaccel/CMakeLists.txt +++ b/kglobalaccel/CMakeLists.txt @@ -31,15 +31,13 @@ if ( Q_WS_QWS ) set( kglobalaccel_SRCS ${kglobalaccel_SRCS} kglobalaccel_qws.cpp ) endif ( Q_WS_QWS ) -kde4_add_kdeinit_executable( kglobalaccel NOGUI ${kglobalaccel_SRCS} ) -target_link_libraries(kdeinit_kglobalaccel ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +kde4_add_executable( kglobalaccel NOGUI ${kglobalaccel_SRCS} ) +target_link_libraries(kglobalaccel ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) if(Q_WS_MAC) - target_link_libraries(kdeinit_kglobalaccel ${CARBON_LIBRARY}) + target_link_libraries(kglobalaccel ${CARBON_LIBRARY}) endif(Q_WS_MAC) -target_link_libraries(kglobalaccel kdeinit_kglobalaccel) # Install application and configuration -install( TARGETS kdeinit_kglobalaccel ${INSTALL_TARGETS_DEFAULT_ARGS} ) install( TARGETS kglobalaccel ${INSTALL_TARGETS_DEFAULT_ARGS} ) # install( FILES kglobalaccel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) install( FILES kglobalaccel.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kglobalaccel/main.cpp b/kglobalaccel/main.cpp index 4d230b8d..c0815461 100644 --- a/kglobalaccel/main.cpp +++ b/kglobalaccel/main.cpp @@ -45,7 +45,7 @@ static void sighandler(int /*sig*/) } -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { // Disable Session Management the right way (C) // diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt index d0c6e6be..7f1ac52c 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -30,20 +30,19 @@ kde4_add_app_icon(libklipper_common_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps kde4_add_ui_files(libklipper_common_SRCS generalconfig.ui actionsconfig.ui editactiondialog.ui) kde4_add_kcfg_files(libklipper_common_SRCS klippersettings.kcfgc) -set(klipper_KDEINIT_SRCS ${libklipper_common_SRCS} main.cpp tray.cpp) +set(klipper_SRCS ${libklipper_common_SRCS} main.cpp tray.cpp) -kde4_add_kdeinit_executable(klipper ${klipper_KDEINIT_SRCS}) +kde4_add_executable(klipper ${klipper_SRCS}) -target_link_libraries(kdeinit_klipper ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${ZLIB_LIBRARY}) +target_link_libraries(klipper ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${ZLIB_LIBRARY}) if (X11_Xfixes_FOUND) - target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB}) + target_link_libraries(klipper ${X11_Xfixes_LIB}) endif (X11_Xfixes_FOUND) if (PRISON_FOUND) - target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES}) + target_link_libraries(klipper ${PRISON_LIBRARIES}) endif (PRISON_FOUND) -install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS klipper.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/klipper/main.cpp b/klipper/main.cpp index 3428a716..e5fda8e4 100644 --- a/klipper/main.cpp +++ b/klipper/main.cpp @@ -29,7 +29,7 @@ #include "tray.h" #include "klipper.h" -extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) +int main(int argc, char *argv[]) { Klipper::createAboutData(); KCmdLineArgs::init( argc, argv, Klipper::aboutData()); diff --git a/kmenuedit/CMakeLists.txt b/kmenuedit/CMakeLists.txt index 19ccdfc2..5f19f07d 100644 --- a/kmenuedit/CMakeLists.txt +++ b/kmenuedit/CMakeLists.txt @@ -11,15 +11,12 @@ qt4_add_dbus_interface( ${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml khotkeys_interface) -set(kmenuedit_KDEINIT_SRCS main.cpp ${kmenueditcommon_STAT_SRCS}) +set(kmenuedit_SRCS main.cpp ${kmenueditcommon_STAT_SRCS}) -kde4_add_kdeinit_executable( kmenuedit ${kmenuedit_KDEINIT_SRCS}) +kde4_add_executable(kmenuedit ${kmenuedit_SRCS}) -target_link_libraries(kdeinit_kmenuedit ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY}) +target_link_libraries(kmenuedit ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY}) -install(TARGETS kdeinit_kmenuedit DESTINATION ${LIB_INSTALL_DIR} ) - -target_link_libraries( kmenuedit kdeinit_kmenuedit ) install(TARGETS kmenuedit ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### @@ -27,7 +24,7 @@ install(TARGETS kmenuedit ${INSTALL_TARGETS_DEFAULT_ARGS}) install( PROGRAMS kmenuedit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES kmenueditui.rc DESTINATION ${DATA_INSTALL_DIR}/kmenuedit ) -add_dependencies(kdeinit_kmenuedit kded_khotkeys) +add_dependencies(kmenuedit kded_khotkeys) kde4_install_icons( ${ICON_INSTALL_DIR} ) diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index b8af237a..dd7fa8bd 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -54,7 +54,7 @@ public: }; -extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) +int main( int argc, char **argv ) { KAboutData aboutData("kmenuedit", 0, ki18n("KDE Menu Editor"), version, ki18n(description), KAboutData::License_GPL, diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt index 5ca95274..6d730bfb 100644 --- a/krunner/CMakeLists.txt +++ b/krunner/CMakeLists.txt @@ -50,21 +50,22 @@ set(krunner_SRCS ksystemactivitydialog.cpp startupid.cpp) -kde4_add_kdeinit_executable(krunner ${krunner_SRCS}) +kde4_add_executable(krunner ${krunner_SRCS}) -target_link_libraries(kdeinit_krunner kworkspace plasmagenericshell ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBRARIES} ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} ) - -target_link_libraries(kdeinit_krunner processui ${X11_Xrender_LIB} ${X11_LIBRARIES}) +target_link_libraries(krunner kworkspace plasmagenericshell processui + ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBRARIES} + ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDEUI_LIBS} + ${KDE4_KCMUTILS_LIBS} ${X11_Xrender_LIB} + ${X11_LIBRARIES}) if(X11_Xss_LIB) - target_link_libraries(kdeinit_krunner ${X11_Xss_LIB}) + target_link_libraries(krunner ${X11_Xss_LIB}) endif(X11_Xss_LIB) if(X11_Xcursor_FOUND) - target_link_libraries(kdeinit_krunner ${X11_Xcursor_LIB}) + target_link_libraries(krunner ${X11_Xcursor_LIB}) endif(X11_Xcursor_FOUND) -install(TARGETS kdeinit_krunner ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS krunner ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES krunner.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) diff --git a/krunner/main.cpp b/krunner/main.cpp index 8f92abc3..edaf7750 100644 --- a/krunner/main.cpp +++ b/krunner/main.cpp @@ -36,8 +36,7 @@ static const char description[] = I18N_NOOP( "KDE run command interface" ); -extern "C" -KDE_EXPORT int kdemain(int argc, char* argv[]) +int main(int argc, char* argv[]) { #ifdef Q_WS_X11 // krunner only works properly with Qt's native X11 backend; override any compile-time diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 49b83a75..63e30baa 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -17,7 +17,7 @@ configure_file(config-ksmserver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksmse ########### next target ############### -set(ksmserver_KDEINIT_SRCS +set(ksmserver_SRCS main.cpp server.cpp shutdowndlg.cpp @@ -41,7 +41,7 @@ set(kcminit_xml ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCMinit.xml) add_custom_command(OUTPUT ${kcminit_xml} COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${kcminit_adaptor} > ${kcminit_xml} DEPENDS ${kcminit_adaptor}) -qt4_add_dbus_interface( ksmserver_KDEINIT_SRCS ${kcminit_xml} kcminit_interface ) +qt4_add_dbus_interface( ksmserver_SRCS ${kcminit_xml} kcminit_interface ) # This is actually now disabled, because OrgKDEKlauncherInterface is also provided # by kdecore, it is not autogenerated and is not binary compatible with a currently @@ -49,19 +49,17 @@ qt4_add_dbus_interface( ksmserver_KDEINIT_SRCS ${kcminit_xml} kcminit_interface # This should be fixed for KDE5. # KLauchner.xml is installed by kdelibs, so it is in KDE4_DBUS_INTERFACES_DIR # set(klauncher_xml ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KLauncher.xml) -# qt4_add_dbus_interface( ksmserver_KDEINIT_SRCS ${klauncher_xml} klauncher_interface ) +# qt4_add_dbus_interface( ksmserver_SRCS ${klauncher_xml} klauncher_interface ) -qt4_add_dbus_adaptor( ksmserver_KDEINIT_SRCS org.kde.KSMServerInterface.xml server.h KSMServer ) +qt4_add_dbus_adaptor( ksmserver_SRCS org.kde.KSMServerInterface.xml server.h KSMServer ) -kde4_add_kdeinit_executable( ksmserver ${ksmserver_KDEINIT_SRCS}) +kde4_add_executable( ksmserver ${ksmserver_SRCS}) -target_link_libraries(kdeinit_ksmserver ${SCREEN_LOCKER} ${KDE4_PLASMA_LIBS} kworkspace +target_link_libraries(ksmserver ${SCREEN_LOCKER} ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${X11_LIBRARIES} ${X11_Xrender_LIB} ${QT_QTDECLARATIVE_LIBRARY} ${KDECLARATIVE_LIBRARIES} ) -install(TARGETS kdeinit_ksmserver ${INSTALL_TARGETS_DEFAULT_ARGS}) - install(TARGETS ksmserver ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index d0188475..f452b65f 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -228,7 +228,7 @@ void sanity_check( int argc, char* argv[], KAboutData* aboutDataPtr ) } } -extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) +int main( int argc, char* argv[] ) { KAboutData aboutData( "ksmserver", 0, ki18n("The KDE Session Manager"), version, ki18n(description), KAboutData::License_BSD, @@ -290,7 +290,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) #else KSMServer *server = new KSMServer( wm, only_local ); #endif - + // for the KDE-already-running check in startkde KSelectionOwner kde_running( "_KDE_RUNNING", 0 ); kde_running.claim( false ); diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt index e5809ac0..7781b180 100644 --- a/ksysguard/gui/CMakeLists.txt +++ b/ksysguard/gui/CMakeLists.txt @@ -40,7 +40,7 @@ kde4_add_ui_files( libsensordisplays_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/SensorDisplayLib/SensorLoggerSettingsWidget.ui ) -set(ksysguard_KDEINIT_SRCS ${libsensordisplays_SRCS} +set(ksysguard_SRCS ${libsensordisplays_SRCS} ksortfilterproxymodel.cpp SensorBrowser.cpp WorkSheet.cpp @@ -52,11 +52,10 @@ set(ksysguard_KDEINIT_SRCS ${libsensordisplays_SRCS} -kde4_add_kdeinit_executable(ksysguard ${ksysguard_KDEINIT_SRCS}) +kde4_add_executable(ksysguard ${ksysguard_SRCS}) -target_link_libraries(kdeinit_ksysguard processui ksignalplotter ${KDE4_KIO_LIBS} ksgrd) +target_link_libraries(ksysguard processui ksignalplotter ${KDE4_KIO_LIBS} ksgrd) -install(TARGETS kdeinit_ksysguard ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS ksysguard ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp index 7383f2d6..36bde47f 100644 --- a/ksysguard/gui/ksysguard.cpp +++ b/ksysguard/gui/ksysguard.cpp @@ -479,7 +479,7 @@ void TopLevel::setSwapInfo( qlonglong used, qlonglong free, const QString & ) /* * Once upon a time... */ -extern "C" KDE_EXPORT int kdemain( int argc, char** argv ) +int main( int argc, char** argv ) { // initpipe is used to keep the parent process around till the child // has registered with dbus diff --git a/kuiserver/CMakeLists.txt b/kuiserver/CMakeLists.txt index f8fee33e..d4571476 100644 --- a/kuiserver/CMakeLists.txt +++ b/kuiserver/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${KDE4_KIO_INCLUDES} ) # for dbus_add_activation_service include(MacroDBusAddActivationService) -set(kuiserver_KDEINIT_SRCS +set(kuiserver_SRCS main.cpp uiserver.cpp jobview.cpp @@ -20,7 +20,7 @@ progresslistdelegate_p.h uiserver_p.h ) -kde4_add_ui_files(kuiserver_KDEINIT_SRCS configdialog.ui) +kde4_add_ui_files(kuiserver_SRCS configdialog.ui) # @@ -28,21 +28,21 @@ kde4_add_ui_files(kuiserver_KDEINIT_SRCS configdialog.ui) # set(jobview_xml ${KDE4_DBUS_INTERFACES_DIR}/org.kde.JobViewV2.xml) - qt4_add_dbus_adaptor(kuiserver_KDEINIT_SRCS ${jobview_xml} jobview.h JobView jobviewadaptor ) + qt4_add_dbus_adaptor(kuiserver_SRCS ${jobview_xml} jobview.h JobView jobviewadaptor ) - qt4_add_dbus_interface(kuiserver_KDEINIT_SRCS ${jobview_xml} jobview_interface ) + qt4_add_dbus_interface(kuiserver_SRCS ${jobview_xml} jobview_interface ) # # set(jobviewserver_xml ${KDE4_DBUS_INTERFACES_DIR}/org.kde.JobViewServer.xml) - qt4_add_dbus_adaptor(kuiserver_KDEINIT_SRCS ${jobviewserver_xml} progresslistmodel.h ProgressListModel jobviewserveradaptor ) + qt4_add_dbus_adaptor(kuiserver_SRCS ${jobviewserver_xml} progresslistmodel.h ProgressListModel jobviewserveradaptor ) - qt4_add_dbus_interface(kuiserver_KDEINIT_SRCS ${jobviewserver_xml} jobviewserver_interface ) + qt4_add_dbus_interface(kuiserver_SRCS ${jobviewserver_xml} jobviewserver_interface ) # -qt4_add_dbus_adaptor(kuiserver_KDEINIT_SRCS org.kde.kuiserver.xml progresslistmodel.h ProgressListModel kuiserveradaptor ) +qt4_add_dbus_adaptor(kuiserver_SRCS org.kde.kuiserver.xml progresslistmodel.h ProgressListModel kuiserveradaptor ) dbus_add_activation_service(org.kde.kuiserver.service.in) @@ -50,21 +50,12 @@ dbus_add_activation_service(org.kde.kuiserver.service.in) # -kde4_add_kcfg_files(kuiserver_KDEINIT_SRCS kuiserversettings.kcfgc) +kde4_add_kcfg_files(kuiserver_SRCS kuiserversettings.kcfgc) -kde4_add_kdeinit_executable( kuiserver ${kuiserver_KDEINIT_SRCS}) +kde4_add_executable( kuiserver ${kuiserver_SRCS}) -if (Q_WS_MAC) - set_target_properties(kuiserver PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template) - set_target_properties(kuiserver PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.kuiserver") - set_target_properties(kuiserver PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE UI Server") -endif (Q_WS_MAC) +target_link_libraries(kuiserver ${KDE4_KIO_LIBS} ) - -target_link_libraries(kdeinit_kuiserver ${KDE4_KIO_LIBS} ) -install(TARGETS kdeinit_kuiserver ${INSTALL_TARGETS_DEFAULT_ARGS}) - -target_link_libraries( kuiserver kdeinit_kuiserver ) install(TARGETS kuiserver ${INSTALL_TARGETS_DEFAULT_ARGS} ) install( FILES kuiserver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/kuiserver/main.cpp b/kuiserver/main.cpp index 08ea9c34..5346b5b4 100644 --- a/kuiserver/main.cpp +++ b/kuiserver/main.cpp @@ -33,7 +33,7 @@ #include -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { // GS 5/2001 - I changed the name to "KDE" to make it look better // in the titles of dialogs which are displayed. diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt index b9e821b8..7240364a 100644 --- a/kwalletd/CMakeLists.txt +++ b/kwalletd/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backend) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=285) -set(kwalletd_KDEINIT_SRCS +set(kwalletd_SRCS main.cpp kbetterthankdialog.cpp kwalletd.cpp @@ -29,7 +29,7 @@ set(kwalletd_KDEINIT_SRCS kwalletsessionstore.cpp ) -kde4_add_ui_files(kwalletd_KDEINIT_SRCS +kde4_add_ui_files(kwalletd_SRCS kbetterthankdialogbase.ui kwalletwizardpageexplanation.ui kwalletwizardpageintro.ui @@ -38,11 +38,11 @@ kde4_add_ui_files(kwalletd_KDEINIT_SRCS ) if (GPGME_FOUND AND QGPGME_FOUND) - set(kwalletd_KDEINIT_SRCS - ${kwalletd_KDEINIT_SRCS} + set(kwalletd_SRCS + ${kwalletd_SRCS} knewwalletdialog.cpp ) - kde4_add_ui_files(kwalletd_KDEINIT_SRCS + kde4_add_ui_files(kwalletd_SRCS kwalletwizardpagepasswordgpg.ui kwalletwizardpagegpgkey.ui knewwalletdialogintro.ui @@ -52,18 +52,15 @@ endif(GPGME_FOUND AND QGPGME_FOUND) find_file(kwallet_xml org.kde.KWallet.xml HINTS ${KDE4_DBUS_INTERFACES_DIR} ) -qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD ) +qt4_add_dbus_adaptor( kwalletd_SRCS ${kwallet_xml} kwalletd.h KWalletD ) -kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} ) +kde4_add_executable( kwalletd NOGUI ${kwalletd_SRCS} ) -target_link_libraries(kdeinit_kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend ) +target_link_libraries(kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend ) if (GPGME_FOUND AND QGPGME_FOUND) - target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} ) + target_link_libraries(kwalletd ${QGPGME_LIBRARIES} ) endif(GPGME_FOUND AND QGPGME_FOUND) -install(TARGETS kdeinit_kwalletd ${INSTALL_TARGETS_DEFAULT_ARGS}) - -target_link_libraries(kwalletd kdeinit_kwalletd) install(TARGETS kwalletd ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### diff --git a/kwalletd/main.cpp b/kwalletd/main.cpp index 76004805..0c6f3d87 100644 --- a/kwalletd/main.cpp +++ b/kwalletd/main.cpp @@ -140,7 +140,7 @@ char* checkPamModule(int argc, char **argv) return hash; } -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { char *hash = NULL; if (getenv("PAM_KWALLET_LOGIN")) { diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt index 5a1c2a74..427fc9a3 100644 --- a/kwin/CMakeLists.txt +++ b/kwin/CMakeLists.txt @@ -85,7 +85,7 @@ add_subdirectory( tabbox ) ########### next target ############### -set(kwin_KDEINIT_SRCS +set(kwin_SRCS workspace.cpp dbusinterface.cpp client.cpp @@ -135,7 +135,7 @@ set(kwin_KDEINIT_SRCS if(KWIN_BUILD_TABBOX) set( - kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} + kwin_SRCS ${kwin_SRCS} tabbox/tabbox.cpp tabbox/clientmodel.cpp tabbox/declarative.cpp @@ -148,34 +148,34 @@ endif() if(KWIN_BUILD_SCREENEDGES) set( - kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} + kwin_SRCS ${kwin_SRCS} screenedge.cpp ) endif() if(KWIN_BUILD_KAPPMENU) set( - kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} + kwin_SRCS ${kwin_SRCS} appmenu.cpp ) endif() if(KWIN_HAVE_EGL) - set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} eglonxbackend.cpp) + set(kwin_SRCS ${kwin_SRCS} eglonxbackend.cpp) endif() -kde4_add_kcfg_files(kwin_KDEINIT_SRCS settings.kcfgc) +kde4_add_kcfg_files(kwin_SRCS settings.kcfgc) -qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface ) -qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor ) -qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl ) +qt4_add_dbus_adaptor( kwin_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface ) +qt4_add_dbus_adaptor( kwin_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor ) +qt4_add_dbus_adaptor( kwin_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl ) -qt4_add_dbus_interface( kwin_KDEINIT_SRCS +qt4_add_dbus_interface( kwin_SRCS ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml ksmserver_interface) -qt4_add_dbus_interface( kwin_KDEINIT_SRCS +qt4_add_dbus_interface( kwin_SRCS ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml screenlocker_interface) -qt4_add_resources( kwin_KDEINIT_SRCS resources.qrc ) +qt4_add_resources( kwin_SRCS resources.qrc ) ########### target link libraries ############### @@ -241,38 +241,34 @@ set(kwinLibs ${kwin_OPENGL_LIBS} ) -kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS}) +kde4_add_executable( kwin ${kwin_SRCS}) -target_link_libraries(kdeinit_kwin ${kwinLibs}) +target_link_libraries(kwin ${kwinLibs}) set_target_properties(kwin PROPERTIES OUTPUT_NAME ${KWIN_NAME}) -set_target_properties(kdeinit_kwin PROPERTIES OUTPUT_NAME kdeinit4_${KWIN_NAME}) if(OPENGL_FOUND) if( KWIN_BUILD_OPENGL_1_COMPOSITING ) - set_target_properties(kdeinit_kwin PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL_1) + set_target_properties(kwin PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL_1) endif() add_subdirectory(opengltest) - target_link_libraries(kdeinit_kwin kwinglutils ${OPENGL_gl_LIBRARY}) + target_link_libraries(kwin kwinglutils ${OPENGL_gl_LIBRARY}) # -ldl used by OpenGL code find_library(DL_LIBRARY dl) if (DL_LIBRARY) - target_link_libraries(kdeinit_kwin ${DL_LIBRARY}) + target_link_libraries(kwin ${DL_LIBRARY}) endif() elseif(OPENGLES_FOUND) - target_link_libraries(kdeinit_kwin ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES}) - set_target_properties(kdeinit_kwin PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES") + target_link_libraries(kwin ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES}) + set_target_properties(kwin PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES") endif() -install(TARGETS kdeinit_kwin ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS} ) if(OPENGLES_FOUND) - kde4_add_kdeinit_executable( kwin_gles ${kwin_KDEINIT_SRCS}) - target_link_libraries(kdeinit_kwin_gles ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES}) - set_target_properties(kdeinit_kwin_gles PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES") + kde4_add_executable( kwin_gles ${kwin_SRCS}) + target_link_libraries(kwin_gles ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES}) + set_target_properties(kwin_gles PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES") set_target_properties(kwin_gles PROPERTIES OUTPUT_NAME ${KWIN_NAME}_gles) - set_target_properties(kdeinit_kwin_gles PROPERTIES OUTPUT_NAME kdeinit4_${KWIN_NAME}_gles) - install(TARGETS kdeinit_kwin_gles ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kwin_gles ${INSTALL_TARGETS_DEFAULT_ARGS} ) endif() diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules/CMakeLists.txt index 054d4df0..57d66b16 100644 --- a/kwin/kcmkwin/kwinrules/CMakeLists.txt +++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt @@ -7,18 +7,17 @@ set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp ${ kde4_add_ui_files(kwinrules_SRCS ruleslist.ui detectwidget.ui editshortcut.ui ruleswidgetbase.ui) -set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS}) +set(kwin_rules_dialog_SRCS main.cpp ${kwinrules_SRCS}) -kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS}) +kde4_add_executable( kwin_rules_dialog ${kwin_rules_dialog_SRCS}) set(kwin_kcm_rules_XCB_LIBS ${XCB_XCB_LIBRARIES} ${X11_XCB_LIBRARIES} ) -target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS}) +target_link_libraries(kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS}) -install(TARGETS kdeinit_kwin_rules_dialog ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kwin_rules_dialog DESTINATION ${LIBEXEC_INSTALL_DIR} ) ########### next target ############### diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index 33c4a166..5b6646ea 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/main.cpp @@ -238,8 +238,7 @@ static int edit(Window wid, bool whole_app) } // namespace -extern "C" -KDE_EXPORT int kdemain(int argc, char* argv[]) +int main(int argc, char* argv[]) { KCmdLineArgs::init(argc, argv, "kwin_rules_dialog", "kcmkwinrules", ki18n("KWin"), "1.0" , ki18n("KWin helper utility")); diff --git a/kwin/main.cpp b/kwin/main.cpp index c2a911f4..3b2e0982 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -459,8 +459,7 @@ void Application::resetCrashesCount() static const char version[] = KWIN_VERSION_STRING; static const char description[] = I18N_NOOP("KDE window manager"); -extern "C" -KDE_EXPORT int kdemain(int argc, char * argv[]) +int main(int argc, char * argv[]) { #ifdef M_TRIM_THRESHOLD // Prevent fragmentation of the heap by malloc (glibc). diff --git a/plasma/desktop/shell/CMakeLists.txt b/plasma/desktop/shell/CMakeLists.txt index 750be4e0..82870f0f 100644 --- a/plasma/desktop/shell/CMakeLists.txt +++ b/plasma/desktop/shell/CMakeLists.txt @@ -37,21 +37,18 @@ qt4_add_dbus_interface(plasma_SRCS ${ksmserver_xml} ksmserver_interface) kde4_add_app_icon(plasma_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/plasma.png") -kde4_add_kdeinit_executable(plasma-desktop ${plasma_SRCS}) +kde4_add_executable(plasma-desktop ${plasma_SRCS}) -target_link_libraries(kdeinit_plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace plasmagenericshell ${QT_QTDECLARATIVE_LIBRARY}) +target_link_libraries(plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace plasmagenericshell ${QT_QTDECLARATIVE_LIBRARY}) if(UNIX AND Q_WS_X11) - target_link_libraries(kdeinit_plasma-desktop ${X11_LIBRARIES}) + target_link_libraries(plasma-desktop ${X11_LIBRARIES} kephal) if(X11_Xrender_FOUND) - target_link_libraries(kdeinit_plasma-desktop ${X11_Xrender_LIB}) + target_link_libraries(plasma-desktop ${X11_Xrender_LIB}) endif(X11_Xrender_FOUND) endif(UNIX AND Q_WS_X11) -target_link_libraries(kdeinit_plasma-desktop kephal) - -install(TARGETS kdeinit_plasma-desktop DESTINATION ${LIB_INSTALL_DIR}) install(TARGETS plasma-desktop ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES data/plasma.desktop data/plasma-desktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) install(FILES data/plasma-shell-desktop.kcfg DESTINATION ${KCFG_INSTALL_DIR}) diff --git a/plasma/desktop/shell/main.cpp b/plasma/desktop/shell/main.cpp index 0110d708..c46c70ba 100644 --- a/plasma/desktop/shell/main.cpp +++ b/plasma/desktop/shell/main.cpp @@ -45,8 +45,7 @@ static const char description[] = I18N_NOOP( "The KDE desktop, panels and widgets workspace application." ); QString plasmaLocale; -extern "C" -KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "START" << "(line:" << __LINE__ << ")"; diff --git a/plasma/generic/shells/plasma-windowed/CMakeLists.txt b/plasma/generic/shells/plasma-windowed/CMakeLists.txt index 86b7770b..3a242b1b 100644 --- a/plasma/generic/shells/plasma-windowed/CMakeLists.txt +++ b/plasma/generic/shells/plasma-windowed/CMakeLists.txt @@ -9,11 +9,9 @@ set(plasma-windowed_SRCS ) -kde4_add_kdeinit_executable(plasma-windowed ${plasma-windowed_SRCS}) +kde4_add_executable(plasma-windowed ${plasma-windowed_SRCS}) -target_link_libraries(kdeinit_plasma-windowed ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} ) +target_link_libraries(plasma-windowed ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} ) - -install(TARGETS kdeinit_plasma-windowed DESTINATION ${LIB_INSTALL_DIR}) install(TARGETS plasma-windowed ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/plasma/generic/shells/plasma-windowed/main.cpp b/plasma/generic/shells/plasma-windowed/main.cpp index 7cdf2e3c..1bf29ec0 100644 --- a/plasma/generic/shells/plasma-windowed/main.cpp +++ b/plasma/generic/shells/plasma-windowed/main.cpp @@ -28,8 +28,7 @@ static const char description[] = I18N_NOOP( "Shell used to load Plasma widgets as stand-alone applications." ); static const char version[] = "0.1"; -extern "C" -KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { KAboutData aboutData("plasma-windowed", 0, ki18n("Plasma Widgets shell"), version, ki18n(description), KAboutData::License_GPL,