Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: stop using kdeinit for main applications

Browse source
This commit is contained in:
Ivailo Monev 2015-05-09 16:39:13 +00:00
parent bf3011ed2c
commit 7d0dd6d541
9 changed files with 21 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kconf_update/CMakeLists.txt
View file

@ -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 ###############

2
kconf_update/kconf_update.cpp
View file

@ -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"));

18
kded/CMakeLists.txt
View file

@ -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 ###############

2
kded/kbuildsycoca.cpp
View file

@ -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."),

2
kded/kded.cpp
View file

@ -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"),

11
kinit/CMakeLists.txt
View file

@ -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 ###############

2
kinit/klauncher_main.cpp
View file

@ -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;

9
kioslave/http/CMakeLists.txt
View file

@ -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 ###############

2
kioslave/http/http_cache_cleaner.cpp
View file

@ -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,