fixed moc warnings

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

14 files changed, 82 insertions, 38 deletions

diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt
index 2284ef36a..226d38b48 100644
--- a/src/plugins/Input/aac/CMakeLists.txt
+++ b/src/plugins/Input/aac/CMakeLists.txt
@@ -68,11 +68,14 @@ SET(libaac_SRCS
   aacfile.cpp
 )
 
+SET(libaac_HDRS
+  decoder_aac.h
+  aacfile.h
+)
+
 SET(libaac_MOC_HDRS
   decoderaacfactory.h
-  decoder_aac.h
   aacmetadatamodel.h
-  aacfile.h
 )
 
 SET(libaac_RCCS translations/translations.qrc)
@@ -86,7 +89,7 @@ QT4_WRAP_CPP(libaac_MOC_SRCS ${libaac_MOC_HDRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FAAD_FOUND)
-ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_MOC_SRCS} ${libaac_RCC_SRCS})
+ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_MOC_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS})
 add_dependencies(aac qmmp)
 target_link_libraries(aac ${QT_LIBRARIES} -lqmmp -lfaad ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS})
 install(TARGETS aac DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt
index b05617e1c..a21cbe706 100644
--- a/src/plugins/Input/cdaudio/CMakeLists.txt
+++ b/src/plugins/Input/cdaudio/CMakeLists.txt
@@ -33,10 +33,13 @@ SET(libcdaudio_SRCS
   settingsdialog.cpp
 )
 
+SET(libcdaudio_HDRS
+  decoder_cdaudio.h
+)
+
 SET(libcdaudio_MOC_HDRS
   settingsdialog.h
   decodercdaudiofactory.h
-  decoder_cdaudio.h
 )
 
 SET(libcdaudio_RCCS translations/translations.qrc)
@@ -57,7 +60,8 @@ QT4_WRAP_UI(libcdaudio_UIS_H ${libcdaudio_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(CDIO_FOUND)
-ADD_LIBRARY(cdaudio MODULE ${libcdaudio_SRCS} ${libcdaudio_MOC_SRCS} ${libcdaudio_UIS_H} ${libcdaudio_RCC_SRCS})
+ADD_LIBRARY(cdaudio MODULE ${libcdaudio_SRCS} ${libcdaudio_MOC_SRCS} ${libcdaudio_UIS_H} ${libcdaudio_RCC_SRCS}
+${libcdaudio_HDRS})
 add_dependencies(cdaudio qmmp)
 target_link_libraries(cdaudio ${QT_LIBRARIES} -lqmmp ${CDIO_LDFLAGS} ${CDIO_CFLAGS})
 install(TARGETS cdaudio DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt
index f1ae8a4cc..279a99eee 100644
--- a/src/plugins/Input/cue/CMakeLists.txt
+++ b/src/plugins/Input/cue/CMakeLists.txt
@@ -40,11 +40,14 @@ SET(libcue_SRCS
   cuemetadatamodel.cpp
 )
 
+SET(libcue_HDRS
+  decoder_cue.h
+  cueparser.h
+)
+
 SET(libcue_MOC_HDRS
   decodercuefactory.h
-  decoder_cue.h
   settingsdialog.h
-  cueparser.h
   cuemetadatamodel.h
 )
 
@@ -66,7 +69,7 @@ QT4_WRAP_UI(libcue_UIS_H ${libcue_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_MOC_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H})
+ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_MOC_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H} ${libcue_HDRS})
 add_dependencies(cue qmmp)
 IF(USE_ENCA AND ENCA_FOUND)
 target_link_libraries(cue ${QT_LIBRARIES} -lqmmp ${ENCA_LDFLAGS} ${ENCA_CFLAGS})
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt
index 86a41c4a4..dfad4a427 100644
--- a/src/plugins/Input/ffmpeg/CMakeLists.txt
+++ b/src/plugins/Input/ffmpeg/CMakeLists.txt
@@ -43,9 +43,12 @@ SET(libffmpeg_SRCS
   settingsdialog.cpp
 )
 
+SET(libffmpeg_HDRS
+  decoder_ffmpeg.h
+)
+
 SET(libffmpeg_MOC_HDRS
   decoderffmpegfactory.h
-  decoder_ffmpeg.h
   ffmpegmetadatamodel.h
   settingsdialog.h
 )
@@ -70,7 +73,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FFMPEG_FOUND)
 ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H}
-  ${libffmpeg_RCC_SRCS})
+  ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS})
 add_dependencies(ffmpeg qmmp)
 target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS} ${FFMPEG_CFLAGS})
 install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts
index 6b304abb3..2c65dd8bd 100644
--- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts
+++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="uk">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS>
+<TS version="2.0" language="uk">
 <context>
     <name>DecoderFFmpegFactory</name>
     <message>
diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt
index bb5d09175..9b1aa7a56 100644
--- a/src/plugins/Input/flac/CMakeLists.txt
+++ b/src/plugins/Input/flac/CMakeLists.txt
@@ -44,14 +44,17 @@ SET(libflac_SRCS
   replaygainreader.cpp
 )
 
-SET(libflac_MOC_HDRS
-  decoderflacfactory.h
+SET(libflac_HDRS
   decoder_flac.h
-  flacmetadatamodel.h
   cueparser.h
   replaygainreader.h
 )
 
+SET(libflac_MOC_HDRS
+  decoderflacfactory.h
+  flacmetadatamodel.h
+)
+
 SET(libflac_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libflac_RCC_SRCS ${libflac_RCCS})
@@ -63,7 +66,7 @@ QT4_WRAP_CPP(libflac_MOC_SRCS ${libflac_MOC_HDRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FLAC_FOUND)
-ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_RCC_SRCS})
+ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_RCC_SRCS} ${libflac_HDRS})
 add_dependencies(flac qmmp)
 target_link_libraries(flac ${QT_LIBRARIES} -lqmmp ${FLAC_LDFLAGS} ${FLAC_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS})
 install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt
index c960f489c..d1e698e0d 100644
--- a/src/plugins/Input/gme/CMakeLists.txt
+++ b/src/plugins/Input/gme/CMakeLists.txt
@@ -43,12 +43,15 @@ SET(libgme_SRCS
   gmehelper.cpp
 )
 
-SET(libgme_MOC_HDRS
-  decodergmefactory.h
+SET(libgme_HDRS
   decoder_gme.h
   gmehelper.h
 )
 
+SET(libgme_MOC_HDRS
+  decodergmefactory.h 
+)
+
 SET(libgme_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libgme_RCC_SRCS ${libgme_RCCS})
@@ -60,7 +63,7 @@ QT4_WRAP_CPP(libgme_MOC_SRCS ${libgme_MOC_HDRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(GME_FOUND)
-ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_MOC_SRCS} ${libgme_RCC_SRCS})
+ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_MOC_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS})
 add_dependencies(gme qmmp)
 target_link_libraries(gme ${QT_LIBRARIES} -lqmmp -lgme ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS})
 install(TARGETS gme DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt
index e4e0d8130..b5d04d932 100644
--- a/src/plugins/Input/mad/CMakeLists.txt
+++ b/src/plugins/Input/mad/CMakeLists.txt
@@ -41,13 +41,16 @@ SET(libmad_SRCS
   replaygainreader.cpp
 )
 
+SET(libmad_HDRS
+  decoder_mad.h
+  tagextractor.h
+  replaygainreader.h
+)
+
 SET(libmad_MOC_HDRS
   settingsdialog.h
   decodermadfactory.h
-  decoder_mad.h
-  tagextractor.h
   mpegmetadatamodel.h
-  replaygainreader.h
 )
 
 SET(libmad_RCCS translations/translations.qrc)
@@ -69,7 +72,7 @@ QT4_WRAP_UI(libmad_UIS_H ${libmad_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(MAD_FOUND)
-ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_MOC_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS})
+ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_MOC_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS} ${libmad_HDRS})
 add_dependencies(mad qmmp)
 target_link_libraries(mad ${QT_LIBRARIES} -lqmmp ${MAD_LDFLAGS} ${MAD_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS})
 install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/modplug/CMakeLists.txt b/src/plugins/Input/modplug/CMakeLists.txt
index fad0d66ac..d745e4c03 100644
--- a/src/plugins/Input/modplug/CMakeLists.txt
+++ b/src/plugins/Input/modplug/CMakeLists.txt
@@ -53,9 +53,13 @@ SET(libmodplug_SRCS
   archivereader.cpp
 )
 
+SET(libmodplug_HDRS
+  decoder_modplug.h
+)
+
 SET(libmodplug_MOC_HDRS
   decodermodplugfactory.h
-  decoder_modplug.h
+  
   modplugmetadatamodel.h
   settingsdialog.h
   archivereader.h
@@ -80,7 +84,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(MODPLUG_FOUND)
 ADD_LIBRARY(modplug MODULE ${libmodplug_SRCS} ${libmodplug_MOC_SRCS} ${libmodplug_UIS_H}
-  ${libmodplug_RCC_SRCS})
+  ${libmodplug_RCC_SRCS} ${libmodplug_HDRS})
 add_dependencies(modplug qmmp)
 target_link_libraries(modplug ${QT_LIBRARIES} -lqmmp ${MODPLUG_LDFLAGS} ${MODPLUG_CFLAGS})
 install(TARGETS modplug DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt
index 825daf9b9..72f1eb2ff 100644
--- a/src/plugins/Input/mpc/CMakeLists.txt
+++ b/src/plugins/Input/mpc/CMakeLists.txt
@@ -48,9 +48,13 @@ SET(libmpc_SRCS
   mpcmetadatamodel.cpp
 )
 
+SET(libmpc_HDRS
+  decoder_mpc.h
+)
+
 SET(libmpc_MOC_HDRS
   decodermpcfactory.h
-  decoder_mpc.h
+  
   mpcmetadatamodel.h
 )
 
@@ -63,7 +67,7 @@ QT4_WRAP_CPP(libmpc_MOC_SRCS ${libmpc_MOC_HDRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(MPC_FOUND)
-ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_MOC_SRCS} ${libmpc_RCC_SRCS})
+ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_MOC_SRCS} ${libmpc_RCC_SRCS} ${libmpc_HDRS})
 add_dependencies(mpc qmmp)
 target_link_libraries(mpc ${QT_LIBRARIES} -lqmmp -lmpcdec ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS})
 install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt
index 0634b03b0..1beb8b476 100644
--- a/src/plugins/Input/sndfile/CMakeLists.txt
+++ b/src/plugins/Input/sndfile/CMakeLists.txt
@@ -36,9 +36,12 @@ SET(libsndfile_SRCS
   decodersndfilefactory.cpp
 )
 
+SET(libsndfile_HDRS
+  decoder_sndfile.h
+)
+
 SET(libsndfile_MOC_HDRS
   decodersndfilefactory.h
-  decoder_sndfile.h
 )
 
 SET(libsndfile_RCCS translations/translations.qrc)
@@ -54,7 +57,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(SNDFILE_FOUND)
 ADD_LIBRARY(sndfile MODULE ${libsndfile_SRCS} ${libsndfile_MOC_SRCS} ${libsndfile_UIS_H}
-  ${libsndfile_RCC_SRCS})
+  ${libsndfile_RCC_SRCS} ${libsndfile_HDRS})
 add_dependencies(sndfile qmmp)
 target_link_libraries(sndfile ${QT_LIBRARIES} -lqmmp ${SNDFILE_LDFLAGS} ${SNDFILE_CFLAGS})
 install(TARGETS sndfile DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt
index 3b8356c04..c9d3cd5c6 100644
--- a/src/plugins/Input/vorbis/CMakeLists.txt
+++ b/src/plugins/Input/vorbis/CMakeLists.txt
@@ -38,11 +38,14 @@ SET(libvorbis_SRCS
   replaygainreader.cpp
 )
 
+SET(libvorbis_HDRS
+  decoder_vorbis.h
+  replaygainreader.h
+)
+
 SET(libvorbis_MOC_HDRS
   decodervorbisfactory.h
-  decoder_vorbis.h
   vorbismetadatamodel.h
-  replaygainreader.h
 )
 
 SET(libvorbis_RCCS translations/translations.qrc)
@@ -59,7 +62,7 @@ QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(VORBIS_FOUND)
-ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_RCC_SRCS})
+ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_RCC_SRCS} ${libvorbis_HDRS})
 add_dependencies(vorbis qmmp)
 target_link_libraries(vorbis ${QT_LIBRARIES} -lqmmp ${VORBIS_LDFLAGS} ${VORBIS_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS})
 install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt
index cce3ec3e5..114ba4290 100644
--- a/src/plugins/Input/wavpack/CMakeLists.txt
+++ b/src/plugins/Input/wavpack/CMakeLists.txt
@@ -39,14 +39,17 @@ SET(libwavpack_SRCS
   replaygainreader.cpp
 )
 
-SET(libwavpack_MOC_HDRS
-  decoderwavpackfactory.h
+SET(libwavpack_HDRS
   decoder_wavpack.h
-  wavpackmetadatamodel.h
   cueparser.h
   replaygainreader.h
 )
 
+SET(libwavpack_MOC_HDRS
+  decoderwavpackfactory.h
+  wavpackmetadatamodel.h
+)
+
 SET(libwavpack_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libwavpack_RCC_SRCS ${libwavpack_RCCS})
@@ -56,7 +59,7 @@ QT4_WRAP_CPP(libwavpack_MOC_SRCS ${libwavpack_MOC_HDRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(WAVPACK_FOUND)
-ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_MOC_SRCS} ${libwavpack_RCC_SRCS})
+ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_MOC_SRCS} ${libwavpack_RCC_SRCS} ${libwavpack_HDRS})
 add_dependencies(wavpack qmmp)
 target_link_libraries(wavpack ${QT_LIBRARIES} -lqmmp ${WAVPACK_LDFLAGS} ${WAVPACK_CLAGS})
 install(TARGETS wavpack DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt
index e417cde9a..66ff4b495 100644
--- a/src/plugins/Input/wildmidi/CMakeLists.txt
+++ b/src/plugins/Input/wildmidi/CMakeLists.txt
@@ -36,8 +36,12 @@ SET(libwildmidi_SRCS
   wildmidihelper.cpp
 )
 
-SET(libwildmidi_MOC_HDRS
+SET(libwildmidi_HDRS
   decoder_wildmidi.h
+)
+
+SET(libwildmidi_MOC_HDRS
+  
   decoderwildmidifactory.h
   settingsdialog.h
   wildmidihelper.h
@@ -70,7 +74,8 @@ QT4_WRAP_UI(libwildmidi_UIS_H ${libwildmidi_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(WILDMIDI_FOUND)
-ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_MOC_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS})
+ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_MOC_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS}
+${libwildmidi_HDRS})
 add_dependencies(wildmidi qmmp)
 target_link_libraries(wildmidi ${QT_LIBRARIES} -lqmmp -lWildMidi)
 install(TARGETS wildmidi DESTINATION ${LIB_DIR}/qmmp/Input)