kmix: stop using kdeinit for main applications

diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index 4790e56..3760e18 100644 (file)
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -91,7 +91,7 @@ if (PULSEAUDIO_FOUND)
       backends/mixer_pulse.cpp )
 endif (PULSEAUDIO_FOUND)
 
-set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
+set(kmix_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
    apps/main.cpp 
    apps/kmix.cpp 
    apps/KMixApp.cpp
@@ -129,26 +129,24 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
    core/volume.cpp
    )
 
-kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
+kde4_add_executable( kmix ${kmix_SRCS})
 
-target_link_libraries(kdeinit_kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
-#target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} /home/kde/workspace/kdelibs/build/lib/libsolid.so.4.7.0 ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
+target_link_libraries(kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
 
 if (HAVE_LIBASOUND2)
-    target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})
+    target_link_libraries(kmix ${ASOUND_LIBRARY})
 endif (HAVE_LIBASOUND2)
 
 if (PULSEAUDIO_FOUND)
-    target_link_libraries(kdeinit_kmix ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY} ${GLIB2_LIBRARIES})
+    target_link_libraries(kmix ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY} ${GLIB2_LIBRARIES})
 endif (PULSEAUDIO_FOUND)
 
 if (CANBERRA_FOUND)
-  target_link_libraries(kdeinit_kmix ${CANBERRA_LIBRARIES})
+  target_link_libraries(kmix ${CANBERRA_LIBRARIES})
 endif (CANBERRA_FOUND)
 
-install(TARGETS kdeinit_kmix  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kmix  DESTINATION ${LIB_INSTALL_DIR} )
 
-target_link_libraries( kmix kdeinit_kmix )
 install(TARGETS kmix  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### next target ###############
@@ -196,7 +194,7 @@ install( FILES kmixd.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 ########### next target ###############
 
-set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
+set(kmixctrl_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
    apps/kmixctrl.cpp 
    core/ControlManager.cpp
 #   core/ControlPool.cpp
@@ -214,28 +212,27 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
 # gui/guiprofile.cpp
 
 
-kde4_add_kdeinit_executable( kmixctrl ${kmixctrl_KDEINIT_SRCS})
+kde4_add_executable( kmixctrl ${kmixctrl_SRCS})
 
-target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
+target_link_libraries(kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
 
 if (HAVE_LIBASOUND2)
-    target_link_libraries(kdeinit_kmixctrl ${ASOUND_LIBRARY})
+    target_link_libraries(kmixctrl ${ASOUND_LIBRARY})
 endif (HAVE_LIBASOUND2)
 
 if (PULSEAUDIO_FOUND)
-    target_link_libraries(kdeinit_kmixctrl ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY} ${GLIB2_LIBRARIES})
+    target_link_libraries(kmixctrl ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY} ${GLIB2_LIBRARIES})
 endif (PULSEAUDIO_FOUND)
 
 if (CANBERRA_FOUND)
-  target_link_libraries(kdeinit_kmixctrl ${CANBERRA_LIBRARIES})
+  target_link_libraries(kmixctrl ${CANBERRA_LIBRARIES})
 endif (CANBERRA_FOUND)
 
 ########### next target ###############
 add_subdirectory( plasma )
 
-install( TARGETS kdeinit_kmixctrl  DESTINATION ${LIB_INSTALL_DIR} )
+install( TARGETS kmixctrl  DESTINATION ${LIB_INSTALL_DIR} )
 
-target_link_libraries( kmixctrl kdeinit_kmixctrl )
 install( TARGETS kmixctrl ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install( PROGRAMS kmix.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )

diff --git a/kmix/apps/kmixctrl.cpp b/kmix/apps/kmixctrl.cpp
index 02c28ec..2559802 100644 (file)
--- a/kmix/apps/kmixctrl.cpp
+++ b/kmix/apps/kmixctrl.cpp
@@ -36,7 +36,7 @@
 static const char description[] =
 I18N_NOOP("kmixctrl - kmix volume save/restore utility");
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
    KLocale::setMainCatalog("kmix");
    KAboutData aboutData( "kmixctrl", 0, ki18n("KMixCtrl"),

diff --git a/kmix/apps/main.cpp b/kmix/apps/main.cpp
index d765e29..03a585c 100644 (file)
--- a/kmix/apps/main.cpp
+++ b/kmix/apps/main.cpp
@@ -32,7 +32,7 @@
 static const char description[] =
 I18N_NOOP("KMix - KDE's full featured mini mixer");
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
    KAboutData aboutData( "kmix", 0, ki18n("KMix"),
                          APP_VERSION, ki18n(description), KAboutData::License_GPL,

diff --git a/kmix/backends/mixer_backend.h b/kmix/backends/mixer_backend.h
index b1431fe..e6208e4 100644 (file)
--- a/kmix/backends/mixer_backend.h
+++ b/kmix/backends/mixer_backend.h
@@ -24,6 +24,8 @@
 
 #include <QString>
 #include <QTime>
+#include <QTimer>
+
 //#include "core/mixer.h"
 #include "core/mixdevice.h"
 #include "core/mixset.h"

diff --git a/kmix/tests/CMakeLists.txt b/kmix/tests/CMakeLists.txt
index 1028bdb..1abd2b2 100644 (file)
--- a/kmix/tests/CMakeLists.txt
+++ b/kmix/tests/CMakeLists.txt
@@ -35,11 +35,10 @@ if (PULSEAUDIO_FOUND)
 endif (PULSEAUDIO_FOUND)
 
 ########### next target ###############
-set(dialogtest_KDEINIT_SRCS dialogtest.cpp )
+set(dialogtest_SRCS dialogtest.cpp )
 
-kde4_add_kdeinit_executable( dialogtest ${dialogtest_KDEINIT_SRCS}
-    )
+kde4_add_executable( dialogtest ${dialogtest_SRCS} )
     
-target_link_libraries(kdeinit_dialogtest  ${KDE4_KDEUI_LIBS} )
+target_link_libraries(dialogtest  ${KDE4_KDEUI_LIBS} )