renaming experimental branch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4675 90c681e8-e032-0410-971d-27865f9a5e38

15 files changed, 10 insertions, 171 deletions

diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt
index c2e77df71..6406d7e75 100644
--- a/src/plugins/Output/alsa/CMakeLists.txt
+++ b/src/plugins/Output/alsa/CMakeLists.txt
@@ -37,11 +37,6 @@ SET(libalsa_SRCS
   settingsdialog.cpp
 )
 
-SET(libalsa_MOC_HDRS
-  outputalsafactory.h
-  settingsdialog.h
-)
-
 SET(libalsa_HDRS
   outputalsa.h
 )
@@ -50,8 +45,6 @@ SET(libalsa_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libalsa_RCC_SRCS ${libalsa_RCCS})
 
-QT4_WRAP_CPP(libalsa_MOC_SRCS ${libalsa_MOC_HDRS})
-
 # user interface
 
 
@@ -65,7 +58,7 @@ QT4_WRAP_UI(libalsa_UIS_H ${libalsa_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(ALSA_FOUND)
-ADD_LIBRARY(alsa MODULE ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H}
+ADD_LIBRARY(alsa MODULE ${libalsa_SRCS} ${libalsa_UIS_H}
   ${libalsa_RCC_SRCS} ${libalsa_HDRS})
 add_dependencies(alsa qmmp)
 target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp ${ALSA_LDFLAGS})
diff --git a/src/plugins/Output/alsa/alsa.pro b/src/plugins/Output/alsa/alsa.pro
index 54db7e5a3..6ad5edfae 100644
--- a/src/plugins/Output/alsa/alsa.pro
+++ b/src/plugins/Output/alsa/alsa.pro
@@ -23,21 +23,6 @@ LIBS += -lqmmp
 PKGCONFIG += alsa
 
 FORMS += settingsdialog.ui
-TRANSLATIONS = translations/alsa_plugin_ru.ts \
-               translations/alsa_plugin_uk_UA.ts \
-               translations/alsa_plugin_zh_CN.ts \
-               translations/alsa_plugin_zh_TW.ts \
-               translations/alsa_plugin_cs.ts \
-               translations/alsa_plugin_pl.ts \
-               translations/alsa_plugin_de.ts \
-               translations/alsa_plugin_it.ts \
-               translations/alsa_plugin_tr.ts \
-               translations/alsa_plugin_lt.ts \
-               translations/alsa_plugin_nl.ts \
-               translations/alsa_plugin_ja.ts \
-               translations/alsa_plugin_es.ts \
-               translations/alsa_plugin_sr_BA.ts \
-               translations/alsa_plugin_sr_RS.ts
 
 RESOURCES = translations/translations.qrc
 
diff --git a/src/plugins/Output/directsound/CMakeLists.txt b/src/plugins/Output/directsound/CMakeLists.txt
index 5f8727756..c2b085c90 100644
--- a/src/plugins/Output/directsound/CMakeLists.txt
+++ b/src/plugins/Output/directsound/CMakeLists.txt
@@ -35,10 +35,6 @@ SET(libdirectsound_SRCS
   outputdirectsoundfactory.cpp
 )
 
-SET(libdirectsound_MOC_HDRS
-  outputdirectsoundfactory.h
-)
-
 SET(libdirectsound_HDRS
   outputdirectsound.h
 )
@@ -47,11 +43,9 @@ SET(libdirectsound_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libdirectsound_RCC_SRCS ${libdirectsound_RCCS})
 
-QT4_WRAP_CPP(libdirectsound_MOC_SRCS ${libdirectsound_MOC_HDRS})
-
 
 IF(DSOUND_H_FOUND)
-ADD_LIBRARY(directsound MODULE ${libdirectsound_SRCS} ${libdirectsound_MOC_SRCS} ${libdirectsound_RCC_SRCS} ${libdirectsound_HDRS})
+ADD_LIBRARY(directsound MODULE ${libdirectsound_SRCS} ${libdirectsound_RCC_SRCS} ${libdirectsound_HDRS})
 add_dependencies(directsound qmmp)
 target_link_libraries(directsound ${QT_LIBRARIES} -lqmmp -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound)
 install(TARGETS directsound DESTINATION ${LIB_DIR}/qmmp/Output)
diff --git a/src/plugins/Output/directsound/directsound.pro b/src/plugins/Output/directsound/directsound.pro
index 14bd03f66..6cbd4c30b 100644
--- a/src/plugins/Output/directsound/directsound.pro
+++ b/src/plugins/Output/directsound/directsound.pro
@@ -21,21 +21,6 @@ plugin
 TEMPLATE = lib
 LIBS += -lqmmp0 -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound
 
-TRANSLATIONS = translations/directsound_plugin_cs.ts \
-               translations/directsound_plugin_de.ts \
-               translations/directsound_plugin_zh_CN.ts \
-               translations/directsound_plugin_zh_TW.ts \
-               translations/directsound_plugin_ru.ts \
-               translations/directsound_plugin_pl.ts \
-               translations/directsound_plugin_uk_UA.ts \
-               translations/directsound_plugin_it.ts \
-               translations/directsound_plugin_tr.ts \
-               translations/directsound_plugin_lt.ts \
-               translations/directsound_plugin_nl.ts \
-               translations/directsound_plugin_ja.ts \
-               translations/directsound_plugin_es.ts \
-               translations/directsound_plugin_sr_BA.ts \
-               translations/directsound_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 isEmpty (LIB_DIR){
diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt
index caafb8223..260c93d07 100644
--- a/src/plugins/Output/jack/CMakeLists.txt
+++ b/src/plugins/Output/jack/CMakeLists.txt
@@ -66,19 +66,13 @@ SET(libjack_HDRS
   outputjack.h
 )
 
-SET(libjack_MOC_HDRS
-  outputjackfactory.h
-)
-
 SET(libjack_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libjack_RCC_SRCS ${libjack_RCCS})
 
-QT4_WRAP_CPP(libjack_MOC_SRCS ${libjack_MOC_HDRS})
-
 
 IF(JACK_FOUND)
-ADD_LIBRARY(jack MODULE ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS} ${libjack_HDRS})
+ADD_LIBRARY(jack MODULE ${libjack_SRCS} ${libjack_RCC_SRCS} ${libjack_HDRS})
 add_dependencies(jack qmmp)
 set_target_properties(jack PROPERTIES
                            COMPILE_FLAGS -pthread
diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro
index c72116bb7..b3bf777cd 100644
--- a/src/plugins/Output/jack/jack.pro
+++ b/src/plugins/Output/jack/jack.pro
@@ -24,21 +24,6 @@ link_pkgconfig
 TEMPLATE = lib
 LIBS += -lqmmp
 PKGCONFIG += jack samplerate
-TRANSLATIONS = translations/jack_plugin_ru.ts \
-               translations/jack_plugin_uk_UA.ts \
-               translations/jack_plugin_zh_CN.ts \
-               translations/jack_plugin_zh_TW.ts \
-               translations/jack_plugin_cs.ts \
-               translations/jack_plugin_pl.ts \
-               translations/jack_plugin_de.ts \
-               translations/jack_plugin_it.ts \
-               translations/jack_plugin_tr.ts \
-               translations/jack_plugin_lt.ts \
-               translations/jack_plugin_nl.ts \
-               translations/jack_plugin_ja.ts \
-               translations/jack_plugin_es.ts \
-               translations/jack_plugin_sr_BA.ts \
-               translations/jack_plugin_sr_RS.ts
 
 RESOURCES = translations/translations.qrc
 
diff --git a/src/plugins/Output/null/CMakeLists.txt b/src/plugins/Output/null/CMakeLists.txt
index 0a251c614..8057dfbe3 100644
--- a/src/plugins/Output/null/CMakeLists.txt
+++ b/src/plugins/Output/null/CMakeLists.txt
@@ -30,10 +30,6 @@ SET(libnull_SRCS
   outputnullfactory.cpp
 )
 
-SET(libnull_MOC_HDRS
-  outputnullfactory.h
-)
-
 SET(libnull_HDRS
   outputnull.h
 )
@@ -42,15 +38,12 @@ SET(libnull_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libnull_RCC_SRCS ${libnull_RCCS})
 
-QT4_WRAP_CPP(libnull_MOC_SRCS ${libnull_MOC_HDRS})
-
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 
-ADD_LIBRARY(null MODULE ${libnull_SRCS} ${libnull_MOC_SRCS} ${libnull_UIS_H} ${libnull_RCC_SRCS} ${libnull_HDRS})
+ADD_LIBRARY(null MODULE ${libnull_SRCS} ${libnull_UIS_H} ${libnull_RCC_SRCS} ${libnull_HDRS})
 add_dependencies(null qmmp)
 target_link_libraries(null ${QT_LIBRARIES} -lqmmp)
 install(TARGETS null DESTINATION ${LIB_DIR}/qmmp/Output)
diff --git a/src/plugins/Output/null/null.pro b/src/plugins/Output/null/null.pro
index 6616e44ee..4d0d98601 100644
--- a/src/plugins/Output/null/null.pro
+++ b/src/plugins/Output/null/null.pro
@@ -18,22 +18,6 @@ plugin
 
 TEMPLATE = lib
 
-TRANSLATIONS = translations/null_plugin_cs.ts \
-               translations/null_plugin_de.ts \
-               translations/null_plugin_zh_CN.ts \
-               translations/null_plugin_zh_TW.ts \
-               translations/null_plugin_ru.ts \
-               translations/null_plugin_pl.ts \
-               translations/null_plugin_uk_UA.ts \
-               translations/null_plugin_it.ts \
-               translations/null_plugin_tr.ts \
-               translations/null_plugin_lt.ts \
-               translations/null_plugin_nl.ts \
-               translations/null_plugin_ja.ts \
-               translations/null_plugin_es.ts \
-               translations/null_plugin_sr_BA.ts \
-               translations/null_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt
index c5cd8453e..94c18454f 100644
--- a/src/plugins/Output/oss/CMakeLists.txt
+++ b/src/plugins/Output/oss/CMakeLists.txt
@@ -39,11 +39,6 @@ SET(liboss_SRCS
   settingsdialog.cpp
 )
 
-SET(liboss_MOC_HDRS
-  outputossfactory.h
-  settingsdialog.h
-)
-
 SET(liboss_HDRS
   outputoss.h
 )
@@ -52,15 +47,13 @@ SET(liboss_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(liboss_RCC_SRCS ${liboss_RCCS})
 
-QT4_WRAP_CPP(liboss_MOC_SRCS ${liboss_MOC_HDRS})
-
 SET(liboss_UIS
     settingsdialog.ui
 )
 
 QT4_WRAP_UI(liboss_UIS_H ${liboss_UIS})
 
-ADD_LIBRARY(oss MODULE ${liboss_SRCS} ${liboss_MOC_SRCS} ${liboss_UIS_H}
+ADD_LIBRARY(oss MODULE ${liboss_SRCS} ${liboss_UIS_H}
   ${liboss_RCC_SRCS} ${liboss_HDRS})
 add_dependencies(oss qmmp)
 target_link_libraries(oss ${QT_LIBRARIES} -lqmmp)
diff --git a/src/plugins/Output/oss/oss.pro b/src/plugins/Output/oss/oss.pro
index c99fcae06..4f8c9a695 100644
--- a/src/plugins/Output/oss/oss.pro
+++ b/src/plugins/Output/oss/oss.pro
@@ -7,7 +7,7 @@ HEADERS += outputossfactory.h \
 
 
 SOURCES += outputossfactory.cpp \
-           outputoss.cpp \ 
+           outputoss.cpp \
            settingsdialog.cpp
 
 TARGET=$$PLUGINS_PREFIX/Output/oss
@@ -25,22 +25,6 @@ DEFINES += HAVE_SYS_SOUNDCARD_H
 TEMPLATE = lib
 LIBS += -lqmmp
 
-TRANSLATIONS = translations/oss_plugin_cs.ts \
-               translations/oss_plugin_de.ts \
-               translations/oss_plugin_zh_CN.ts \
-               translations/oss_plugin_zh_TW.ts \
-               translations/oss_plugin_ru.ts \
-               translations/oss_plugin_pl.ts \
-               translations/oss_plugin_uk_UA.ts \
-               translations/oss_plugin_it.ts \
-               translations/oss_plugin_tr.ts \
-               translations/oss_plugin_lt.ts \
-               translations/oss_plugin_nl.ts \
-               translations/oss_plugin_ja.ts \
-               translations/oss_plugin_es.ts \
-               translations/oss_plugin_sr_BA.ts \
-               translations/oss_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 isEmpty (LIB_DIR){
 LIB_DIR = /lib
diff --git a/src/plugins/Output/oss4/CMakeLists.txt b/src/plugins/Output/oss4/CMakeLists.txt
index 8425d7f57..bf3fd6f6a 100644
--- a/src/plugins/Output/oss4/CMakeLists.txt
+++ b/src/plugins/Output/oss4/CMakeLists.txt
@@ -73,11 +73,6 @@ SET(liboss4_SRCS
   settingsdialog.cpp
 )
 
-SET(liboss4_MOC_HDRS
-  outputoss4factory.h
-  settingsdialog.h
-)
-
 SET(liboss4_HDRS
   outputoss4.h
 )
@@ -86,8 +81,6 @@ SET(liboss4_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(liboss4_RCC_SRCS ${liboss4_RCCS})
 
-QT4_WRAP_CPP(liboss4_MOC_SRCS ${liboss4_MOC_HDRS})
-
 SET(liboss4_UIS
     settingsdialog.ui
 )
@@ -95,7 +88,7 @@ SET(liboss4_UIS
 IF(OSS4_FOUND)
 QT4_WRAP_UI(liboss4_UIS_H ${liboss4_UIS})
 
-ADD_LIBRARY(oss4 MODULE ${liboss4_SRCS} ${liboss4_MOC_SRCS} ${liboss4_UIS_H} ${liboss4_RCC_SRCS} ${liboss4_HDRS})
+ADD_LIBRARY(oss4 MODULE ${liboss4_SRCS} ${liboss4_UIS_H} ${liboss4_RCC_SRCS} ${liboss4_HDRS})
 add_dependencies(oss4 qmmp)
 target_link_libraries(oss4 ${QT_LIBRARIES} -lqmmp)
 install(TARGETS oss4 DESTINATION ${LIB_DIR}/qmmp/Output)
diff --git a/src/plugins/Output/pulseaudio/CMakeLists.txt b/src/plugins/Output/pulseaudio/CMakeLists.txt
index b7e736621..db5825c08 100644
--- a/src/plugins/Output/pulseaudio/CMakeLists.txt
+++ b/src/plugins/Output/pulseaudio/CMakeLists.txt
@@ -37,10 +37,6 @@ SET(libpulseaudio_SRCS
   outputpulseaudiofactory.cpp
 )
 
-SET(libpulseaudio_MOC_HDRS
-  outputpulseaudiofactory.h
-)
-
 SET(libpulseaudio_HDRS
   outputpulseaudio.h
 )
@@ -49,15 +45,12 @@ SET(libpulseaudio_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libpulseaudio_RCC_SRCS ${libpulseaudio_RCCS})
 
-QT4_WRAP_CPP(libpulseaudio_MOC_SRCS ${libpulseaudio_MOC_HDRS})
-
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(PULSE_FOUND)
-ADD_LIBRARY(pulseaudio MODULE ${libpulseaudio_SRCS} ${libpulseaudio_MOC_SRCS} ${libpulseaudio_UIS_H}
+ADD_LIBRARY(pulseaudio MODULE ${libpulseaudio_SRCS} ${libpulseaudio_UIS_H}
   ${libpulseaudio_RCC_SRCS} ${libpulseaudio_HDRS})
 add_dependencies(pulseaudio qmmp)
 target_link_libraries(pulseaudio ${QT_LIBRARIES} -lqmmp ${PULSE_LDFLAGS})
diff --git a/src/plugins/Output/pulseaudio/pulseaudio.pro b/src/plugins/Output/pulseaudio/pulseaudio.pro
index 77bf7177f..3b507bf9d 100644
--- a/src/plugins/Output/pulseaudio/pulseaudio.pro
+++ b/src/plugins/Output/pulseaudio/pulseaudio.pro
@@ -23,22 +23,6 @@ LIBS += -lqmmp
 
 PKGCONFIG += libpulse-simple
 
-TRANSLATIONS = translations/pulseaudio_plugin_cs.ts \
-               translations/pulseaudio_plugin_de.ts \
-               translations/pulseaudio_plugin_zh_CN.ts \
-               translations/pulseaudio_plugin_zh_TW.ts \
-               translations/pulseaudio_plugin_ru.ts \
-               translations/pulseaudio_plugin_pl.ts \
-               translations/pulseaudio_plugin_uk_UA.ts \
-               translations/pulseaudio_plugin_it.ts \
-               translations/pulseaudio_plugin_tr.ts \
-               translations/pulseaudio_plugin_lt.ts \
-               translations/pulseaudio_plugin_nl.ts \
-               translations/pulseaudio_plugin_ja.ts \
-               translations/pulseaudio_plugin_es.ts \
-               translations/pulseaudio_plugin_sr_BA.ts \
-               translations/pulseaudio_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 isEmpty (LIB_DIR){
diff --git a/src/plugins/Output/waveout/CMakeLists.txt b/src/plugins/Output/waveout/CMakeLists.txt
index 241b23fee..377004296 100644
--- a/src/plugins/Output/waveout/CMakeLists.txt
+++ b/src/plugins/Output/waveout/CMakeLists.txt
@@ -35,10 +35,6 @@ SET(libwaveout_SRCS
   outputwaveoutfactory.cpp
 )
 
-SET(libwaveout_MOC_HDRS
-  outputwaveoutfactory.h
-)
-
 SET(libwaveout_HDRS
   outputwaveout.h
 )
@@ -47,11 +43,9 @@ SET(libwaveout_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libwaveout_RCC_SRCS ${libwaveout_RCCS})
 
-QT4_WRAP_CPP(libwaveout_MOC_SRCS ${libwaveout_MOC_HDRS})
-
 
 IF(WINDOWS_H_FOUND)
-ADD_LIBRARY(waveout MODULE ${libwaveout_SRCS} ${libwaveout_MOC_SRCS} ${libwaveout_RCC_SRCS} ${libwaveout_HDRS})
+ADD_LIBRARY(waveout MODULE ${libwaveout_SRCS} ${libwaveout_RCC_SRCS} ${libwaveout_HDRS})
 add_dependencies(waveout qmmp)
 target_link_libraries(waveout ${QT_LIBRARIES} -lqmmp -lwinmm)
 install(TARGETS waveout DESTINATION ${LIB_DIR}/qmmp/Output)
diff --git a/src/plugins/Output/waveout/waveout.pro b/src/plugins/Output/waveout/waveout.pro
index d369c7052..35f77d82c 100644
--- a/src/plugins/Output/waveout/waveout.pro
+++ b/src/plugins/Output/waveout/waveout.pro
@@ -16,26 +16,11 @@ QMAKE_LIBDIR += ../../../../bin
 
 CONFIG += warn_on \
 thread \
-plugin 
+plugin
 
 TEMPLATE = lib
 LIBS += -lqmmp0 -lwinmm
 
-TRANSLATIONS = translations/waveout_plugin_cs.ts \
-               translations/waveout_plugin_de.ts \
-               translations/waveout_plugin_zh_CN.ts \
-               translations/waveout_plugin_zh_TW.ts \
-               translations/waveout_plugin_ru.ts \
-               translations/waveout_plugin_pl.ts \
-               translations/waveout_plugin_uk_UA.ts \
-               translations/waveout_plugin_it.ts \
-               translations/waveout_plugin_tr.ts \
-               translations/waveout_plugin_lt.ts \
-               translations/waveout_plugin_nl.ts \
-               translations/waveout_plugin_ja.ts \
-               translations/waveout_plugin_es.ts \
-               translations/waveout_plugin_sr_BA.ts \
-               translations/waveout_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 isEmpty (LIB_DIR){