Port away from KInit

KInit is planned to go away

https://phabricator.kde.org/T14298

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f3ecfff26067b6f080ceba7604b1bc834eb986c..f7065946734ce8b4b241867351963b976106f702 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -333,12 +333,11 @@ set(dolphin_SRCS
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png")
 ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
 
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png")
 ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
 

-kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
+add_executable(dolphin ${dolphin_SRCS})

 
 

-
-target_link_libraries(kdeinit_dolphin PUBLIC
-    dolphinprivate
+target_link_libraries(dolphin

     PRIVATE
     PRIVATE

+    dolphinprivate

     dolphinstatic
     KF5::Crash
 )
     dolphinstatic
     KF5::Crash
 )


@@ -346,13 +345,12 @@ target_link_libraries(kdeinit_dolphin PUBLIC
 include(DbusInterfaceMacros)
 
 generate_and_install_dbus_interface(
 include(DbusInterfaceMacros)
 
 generate_and_install_dbus_interface(

-    kdeinit_dolphin
+    dolphin

     dbusinterface.h
     org.freedesktop.FileManager1.xml
     OPTIONS -a
 )
 
     dbusinterface.h
     org.freedesktop.FileManager1.xml
     OPTIONS -a
 )
 

-install(TARGETS kdeinit_dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

 install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################
 install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################

diff --git a/src/main.cpp b/src/main.cpp
index ef2905d776ade988e669f67dd134e78cce10f146..fba45f43c431b9698e272c5d3676e1e8a3490a9f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,7 +37,7 @@
 #endif
 #include <iostream>
 
 #endif
 #include <iostream>
 

-extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+int main(int argc, char **argv)

 {
 #ifndef Q_OS_WIN
     // Prohibit using sudo or kdesu (but allow using the root user directly)
 {
 #ifndef Q_OS_WIN
     // Prohibit using sudo or kdesu (but allow using the root user directly)