renaming experimental branch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4675 90c681e8-e032-0410-971d-27865f9a5e38
author: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> 2015-01-09 12:01:22 +0000
committer: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> 2015-01-09 12:01:22 +0000
commit: ebd7f9bc697973366de8a6bf7265051e825e0680 (patch)
tree: 1feb9df1c5fe3493e9aa1dd8f5d6233a38ae9d3c /src/plugins
parent: bc7ad688c646afd2a89e5c5ff58696f2df2c8605 (diff)
download: qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.gz
qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.bz2
qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.zip
123 files changed, 109 insertions, 1451 deletions
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt
index 9262accd4..002a27bf8 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt
@@ -31,22 +31,16 @@ SET(libincdecvolumeoption_SRCS
     incdecvolumeoption.cpp
 )
 
-SET(libincdecvolumeoption_MOC_HDRS
-    incdecvolumeoption.h
-)
-
 SET(libincdecvolumeoption_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libincdecvolumeoption_RCC_SRCS ${libincdecvolumeoption_RCCS})
 
-QT4_WRAP_CPP(libincdecvolumeoption_MOC_SRCS ${libincdecvolumeoption_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(incdecvolumeoption MODULE ${libincdecvolumeoption_SRCS} ${libincdecvolumeoption_MOC_SRCS} 
+ADD_LIBRARY(incdecvolumeoption MODULE ${libincdecvolumeoption_SRCS}
            ${libincdecvolumeoption_RCC_SRCS})
 add_dependencies(incdecvolumeoption qmmpui)
 target_link_libraries(incdecvolumeoption ${QT_LIBRARIES} -lqmmpui -lqmmp)
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
index e337a0f03..16ee5dcfc 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
@@ -10,22 +10,6 @@ QMAKE_CLEAN =$$PLUGINS_PREFIX/CommandLineOptions/libincdecvolumeoption.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/incdecvolume_plugin_cs.ts \
-               translations/incdecvolume_plugin_de.ts \
-               translations/incdecvolume_plugin_pl.ts \
-               translations/incdecvolume_plugin_ru.ts \
-               translations/incdecvolume_plugin_uk_UA.ts \
-               translations/incdecvolume_plugin_zh_TW.ts \
-               translations/incdecvolume_plugin_zh_CN.ts \
-               translations/incdecvolume_plugin_it.ts \
-               translations/incdecvolume_plugin_tr.ts \
-               translations/incdecvolume_plugin_lt.ts \
-               translations/incdecvolume_plugin_nl.ts \
-               translations/incdecvolume_plugin_ja.ts \
-               translations/incdecvolume_plugin_es.ts \
-               translations/incdecvolume_plugin_sr_BA.ts \
-               translations/incdecvolume_plugin_sr_RS.ts \
-
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt
index 2b9e5c4cc..fb0f6fbad 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt
+++ b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt
@@ -31,22 +31,16 @@ SET(libplaylistoption_SRCS
     playlistoption.cpp
 )
 
-SET(libplaylistoption_MOC_HDRS
-    playlistoption.h
-)
-
 SET(libplaylistoption_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libplaylistoption_RCC_SRCS ${libplaylistoption_RCCS})
 
-QT4_WRAP_CPP(libplaylistoption_MOC_SRCS ${libplaylistoption_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(playlistoption MODULE ${libplaylistoption_SRCS} ${libplaylistoption_MOC_SRCS} 
+ADD_LIBRARY(playlistoption MODULE ${libplaylistoption_SRCS}
            ${libplaylistoption_RCC_SRCS})
 add_dependencies(playlistoption qmmpui)
 target_link_libraries(playlistoption ${QT_LIBRARIES} -lqmmpui -lqmmp)
diff --git a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
index 9973d36d9..fd1522a17 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
+++ b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
@@ -10,22 +10,6 @@ QMAKE_CLEAN =$$PLUGINS_PREFIX/CommandLineOptions/libplaylistoption.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/playlist_plugin_cs.ts \
-               translations/playlist_plugin_de.ts \
-               translations/playlist_plugin_pl.ts \
-               translations/playlist_plugin_ru.ts \
-               translations/playlist_plugin_uk_UA.ts \
-               translations/playlist_plugin_zh_TW.ts \
-               translations/playlist_plugin_zh_CN.ts \
-               translations/playlist_plugin_it.ts \
-               translations/playlist_plugin_tr.ts \
-               translations/playlist_plugin_lt.ts \
-               translations/playlist_plugin_nl.ts \
-               translations/playlist_plugin_ja.ts \
-               translations/playlist_plugin_es.ts \
-               translations/playlist_plugin_sr_BA.ts \
-               translations/playlist_plugin_sr_RS.ts \
-
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt
index 6fdfdc123..b028002a7 100644
--- a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt
+++ b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt
@@ -31,22 +31,16 @@ SET(seekoption_SRCS
     seekoption.cpp
 )
 
-SET(seekoption_MOC_HDRS
-    seekoption.h
-)
-
 SET(seekoption_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(seekoption_RCC_SRCS ${seekoption_RCCS})
 
-QT4_WRAP_CPP(seekoption_MOC_SRCS ${seekoption_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(seekoption MODULE ${seekoption_SRCS} ${seekoption_MOC_SRCS} ${seekoption_RCC_SRCS})
+ADD_LIBRARY(seekoption MODULE ${seekoption_SRCS} ${seekoption_RCC_SRCS})
 add_dependencies(seekoption qmmpui)
 target_link_libraries(seekoption ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS seekoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions)
diff --git a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
index 77bd889fe..5c63eb0e4 100644
--- a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
+++ b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
@@ -10,21 +10,6 @@ QMAKE_CLEAN = $$PLUGINS_PREFIX/CommandLineOptions/libseekoption.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/seek_plugin_cs.ts \
-               translations/seek_plugin_de.ts \
-               translations/seek_plugin_pl.ts \
-               translations/seek_plugin_ru.ts \
-               translations/seek_plugin_uk_UA.ts \
-               translations/seek_plugin_zh_TW.ts \
-               translations/seek_plugin_zh_CN.ts \
-               translations/seek_plugin_it.ts \
-               translations/seek_plugin_tr.ts \
-               translations/seek_plugin_lt.ts \
-               translations/seek_plugin_nl.ts \
-               translations/seek_plugin_ja.ts \
-               translations/seek_plugin_es.ts \
-               translations/seek_plugin_sr_BA.ts \
-               translations/seek_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt
index 1b695c4bf..e1a576e5b 100644
--- a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt
+++ b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt
@@ -31,22 +31,16 @@ SET(statusoption_SRCS
     statusoption.cpp
 )
 
-SET(statusoption_MOC_HDRS
-    statusoption.h
-)
-
 SET(statusoption_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(statusoption_RCC_SRCS ${statusoption_RCCS})
 
-QT4_WRAP_CPP(statusoption_MOC_SRCS ${statusoption_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(statusoption MODULE ${statusoption_SRCS} ${statusoption_MOC_SRCS} ${statusoption_RCC_SRCS})
+ADD_LIBRARY(statusoption MODULE ${statusoption_SRCS} ${statusoption_RCC_SRCS})
 add_dependencies(statusoption qmmpui)
 target_link_libraries(statusoption ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS statusoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions)
diff --git a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
index e40f750d8..d988e1f35 100644
--- a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
+++ b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
@@ -10,21 +10,6 @@ QMAKE_CLEAN = $$PLUGINS_PREFIX/CommandLineOptions/libstatusoption.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/status_plugin_cs.ts \
-               translations/status_plugin_de.ts \
-               translations/status_plugin_pl.ts \
-               translations/status_plugin_ru.ts \
-               translations/status_plugin_uk_UA.ts \
-               translations/status_plugin_zh_TW.ts \
-               translations/status_plugin_zh_CN.ts \
-               translations/status_plugin_it.ts \
-               translations/status_plugin_tr.ts \
-               translations/status_plugin_lt.ts \
-               translations/status_plugin_nl.ts \
-               translations/status_plugin_ja.ts \
-               translations/status_plugin_es.ts \
-               translations/status_plugin_sr_BA.ts \
-               translations/status_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/Effect/bs2b/CMakeLists.txt b/src/plugins/Effect/bs2b/CMakeLists.txt
index 309ddaee2..d9a808c53 100644
--- a/src/plugins/Effect/bs2b/CMakeLists.txt
+++ b/src/plugins/Effect/bs2b/CMakeLists.txt
@@ -35,17 +35,10 @@ SET(libbs2b_HDRS
     bs2bplugin.h
 )
 
-SET(libbs2b_MOC_HDRS
-    settingsdialog.h
-    effectbs2bfactory.h
-)
-
 SET(libbs2b_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libbs2b_RCC_SRCS ${libbs2b_RCCS})
 
-QT4_WRAP_CPP(libbs2b_MOC_SRCS ${libbs2b_MOC_HDRS})
-
 pkg_search_module(BS2B libbs2b>=3.0.0)
 
 include_directories(${BS2B_INCLUDE_DIRS})
@@ -64,7 +57,7 @@ QT4_WRAP_UI(libbs2b_UIS_H ${libbs2b_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(BS2B_FOUND)
-ADD_LIBRARY(bs2b MODULE ${libbs2b_SRCS} ${libbs2b_MOC_SRCS} ${libbs2b_UIS_H}
+ADD_LIBRARY(bs2b MODULE ${libbs2b_SRCS} ${libbs2b_UIS_H}
   ${libbs2b_RCC_SRCS} ${libbs2b_HDRS})
 add_dependencies(bs2b qmmp)
 target_link_libraries(bs2b ${QT_LIBRARIES} -lqmmp ${BS2B_LDFLAGS})
diff --git a/src/plugins/Effect/bs2b/bs2b.pro b/src/plugins/Effect/bs2b/bs2b.pro
index 6882e6aae..c4dd9419d 100644
--- a/src/plugins/Effect/bs2b/bs2b.pro
+++ b/src/plugins/Effect/bs2b/bs2b.pro
@@ -15,26 +15,9 @@ CONFIG += warn_on \
 plugin \
 link_pkgconfig
 
-
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/bs2b_plugin_cs.ts \
-               translations/bs2b_plugin_de.ts \
-               translations/bs2b_plugin_zh_CN.ts \
-               translations/bs2b_plugin_zh_TW.ts \
-               translations/bs2b_plugin_uk_UA.ts \
-               translations/bs2b_plugin_pl.ts \
-               translations/bs2b_plugin_ru.ts \
-               translations/bs2b_plugin_it.ts \
-               translations/bs2b_plugin_tr.ts \
-               translations/bs2b_plugin_lt.ts \
-               translations/bs2b_plugin_nl.ts \
-               translations/bs2b_plugin_ja.ts \
-               translations/bs2b_plugin_es.ts \
-               translations/bs2b_plugin_sr_BA.ts \
-               translations/bs2b_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/Effect/crossfade/CMakeLists.txt b/src/plugins/Effect/crossfade/CMakeLists.txt
index 7775e3f11..d388e797d 100644
--- a/src/plugins/Effect/crossfade/CMakeLists.txt
+++ b/src/plugins/Effect/crossfade/CMakeLists.txt
@@ -35,17 +35,10 @@ SET(libcrossfade_HDRS
     crossfadeplugin.h
 )
 
-SET(libcrossfade_MOC_HDRS
-    settingsdialog.h
-    effectcrossfadefactory.h
-)
-
 SET(libcrossfade_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libcrossfade_RCC_SRCS ${libcrossfade_RCCS})
 
-QT4_WRAP_CPP(libcrossfade_MOC_SRCS ${libcrossfade_MOC_HDRS})
-
 # user interface
 
 SET(libcrossfade_UIS
@@ -58,7 +51,7 @@ QT4_WRAP_UI(libcrossfade_UIS_H ${libcrossfade_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 
-ADD_LIBRARY(crossfade MODULE ${libcrossfade_SRCS} ${libcrossfade_MOC_SRCS} ${libcrossfade_UIS_H} ${libcrossfade_RCC_SRCS}
+ADD_LIBRARY(crossfade MODULE ${libcrossfade_SRCS} ${libcrossfade_UIS_H} ${libcrossfade_RCC_SRCS}
 ${libcrossfade_HDRS})
 add_dependencies(crossfade qmmp)
 target_link_libraries(crossfade ${QT_LIBRARIES} -lqmmp)
diff --git a/src/plugins/Effect/crossfade/crossfade.pro b/src/plugins/Effect/crossfade/crossfade.pro
index 749eb1c33..7298a4939 100644
--- a/src/plugins/Effect/crossfade/crossfade.pro
+++ b/src/plugins/Effect/crossfade/crossfade.pro
@@ -17,22 +17,6 @@ plugin
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/crossfade_plugin_cs.ts \
-               translations/crossfade_plugin_de.ts \
-               translations/crossfade_plugin_zh_CN.ts \
-               translations/crossfade_plugin_zh_TW.ts \
-               translations/crossfade_plugin_uk_UA.ts \
-               translations/crossfade_plugin_pl.ts \
-               translations/crossfade_plugin_ru.ts \
-               translations/crossfade_plugin_it.ts \
-               translations/crossfade_plugin_tr.ts \
-               translations/crossfade_plugin_lt.ts \
-               translations/crossfade_plugin_nl.ts \
-               translations/crossfade_plugin_ja.ts \
-               translations/crossfade_plugin_es.ts \
-               translations/crossfade_plugin_sr_BA.ts \
-               translations/crossfade_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/Effect/ladspa/CMakeLists.txt b/src/plugins/Effect/ladspa/CMakeLists.txt
index 47e29be57..e6123d95f 100644
--- a/src/plugins/Effect/ladspa/CMakeLists.txt
+++ b/src/plugins/Effect/ladspa/CMakeLists.txt
@@ -38,20 +38,10 @@ SET(libladspa_HDRS
     ladspahelper.h
 )
 
-SET(libladspa_MOC_HDRS
-    ladspahost.h
-    ladspaslider.h
-    ladspabutton.h
-    settingsdialog.h
-    effectladspafactory.h
-)
-
 SET(libladspa_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libladspa_RCC_SRCS ${libladspa_RCCS})
 
-QT4_WRAP_CPP(libladspa_MOC_SRCS ${libladspa_MOC_HDRS})
-
 # user interface
 
 SET(libladspa_UIS
@@ -63,7 +53,7 @@ QT4_WRAP_UI(libladspa_UIS_H ${libladspa_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(ladspa MODULE ${libladspa_SRCS} ${libladspa_MOC_SRCS} ${libladspa_UIS_H}
+ADD_LIBRARY(ladspa MODULE ${libladspa_SRCS} ${libladspa_UIS_H}
   ${libladspa_RCC_SRCS} ${libladspa_HDRS})
 add_dependencies(ladspa qmmp)
 target_link_libraries(ladspa ${QT_LIBRARIES} -lqmmp ${CMAKE_DL_LIBS})
diff --git a/src/plugins/Effect/ladspa/ladspa.pro b/src/plugins/Effect/ladspa/ladspa.pro
index f86f92806..59f18dacd 100644
--- a/src/plugins/Effect/ladspa/ladspa.pro
+++ b/src/plugins/Effect/ladspa/ladspa.pro
@@ -26,22 +26,6 @@ LIBS += -lqmmp \
 
 linux-g++|linux-g++-32|linux-g++-64:LIBS += -ldl
 
-TRANSLATIONS = translations/ladspa_plugin_cs.ts \
-    translations/ladspa_plugin_de.ts \
-    translations/ladspa_plugin_zh_CN.ts \
-    translations/ladspa_plugin_zh_TW.ts \
-    translations/ladspa_plugin_uk_UA.ts \
-    translations/ladspa_plugin_pl.ts \
-    translations/ladspa_plugin_ru.ts \
-    translations/ladspa_plugin_it.ts \
-    translations/ladspa_plugin_tr.ts \
-    translations/ladspa_plugin_lt.ts \
-    translations/ladspa_plugin_nl.ts \
-    translations/ladspa_plugin_ja.ts \
-    translations/ladspa_plugin_es.ts \
-    translations/ladspa_plugin_sr_BA.ts \
-    translations/ladspa_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Effect
diff --git a/src/plugins/Effect/srconverter/CMakeLists.txt b/src/plugins/Effect/srconverter/CMakeLists.txt
index 15decb947..c46286bd9 100644
--- a/src/plugins/Effect/srconverter/CMakeLists.txt
+++ b/src/plugins/Effect/srconverter/CMakeLists.txt
@@ -41,18 +41,10 @@ SET(libsrconverter_HDRS
     srconverter.h
 )
 
-SET(libsrconverter_MOC_HDRS
-    
-    settingsdialog.h
-    effectsrconverterfactory.h
-)
-
 SET(libsrconverter_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libsrconverter_RCC_SRCS ${libsrconverter_RCCS})
 
-QT4_WRAP_CPP(libsrconverter_MOC_SRCS ${libsrconverter_MOC_HDRS})
-
 # user interface
 
 
@@ -66,7 +58,7 @@ QT4_WRAP_UI(libsrconverter_UIS_H ${libsrconverter_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(SAMPLERATE_FOUND)
-ADD_LIBRARY(srconverter MODULE ${libsrconverter_SRCS} ${libsrconverter_MOC_SRCS} ${libsrconverter_UIS_H}
+ADD_LIBRARY(srconverter MODULE ${libsrconverter_SRCS} ${libsrconverter_UIS_H}
   ${libsrconverter_RCC_SRCS} ${libsrconverter_HDRS})
 add_dependencies(srconverter qmmp)
 target_link_libraries(srconverter ${QT_LIBRARIES} -lqmmp ${SAMPLERATE_LDFLAGS})
diff --git a/src/plugins/Effect/srconverter/srconverter.h b/src/plugins/Effect/srconverter/srconverter.h
index b214c866f..ef2501525 100644
--- a/src/plugins/Effect/srconverter/srconverter.h
+++ b/src/plugins/Effect/srconverter/srconverter.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -44,7 +44,6 @@ private:
     int m_srcError;
     int m_converter_type;
     int m_sz; //sample size
-    quint32 m_freq;
 };
 
 #endif
diff --git a/src/plugins/Effect/srconverter/srconverter.pro b/src/plugins/Effect/srconverter/srconverter.pro
index bbc7c61de..b9e809a8e 100644
--- a/src/plugins/Effect/srconverter/srconverter.pro
+++ b/src/plugins/Effect/srconverter/srconverter.pro
@@ -20,22 +20,6 @@ TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp -L/usr/lib -I/usr/include
 
-TRANSLATIONS = translations/srconverter_plugin_cs.ts \
-               translations/srconverter_plugin_de.ts \
-               translations/srconverter_plugin_zh_CN.ts \
-               translations/srconverter_plugin_zh_TW.ts \
-               translations/srconverter_plugin_uk_UA.ts \
-               translations/srconverter_plugin_pl.ts \
-               translations/srconverter_plugin_ru.ts \
-               translations/srconverter_plugin_it.ts \
-               translations/srconverter_plugin_tr.ts \
-               translations/srconverter_plugin_lt.ts \
-               translations/srconverter_plugin_nl.ts \
-               translations/srconverter_plugin_ja.ts \
-               translations/srconverter_plugin_es.ts \
-               translations/srconverter_plugin_sr_BA.ts \
-               translations/srconverter_plugin_sr_RS.ts
-               
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/Effect/stereo/CMakeLists.txt b/src/plugins/Effect/stereo/CMakeLists.txt
index 7717d5302..eb5aafe36 100644
--- a/src/plugins/Effect/stereo/CMakeLists.txt
+++ b/src/plugins/Effect/stereo/CMakeLists.txt
@@ -35,17 +35,10 @@ SET(libstereo_HDRS
     stereoplugin.h
 )
 
-SET(libstereo_MOC_HDRS
-    settingsdialog.h
-    effectstereofactory.h
-)
-
 SET(libstereo_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libstereo_RCC_SRCS ${libstereo_RCCS})
 
-QT4_WRAP_CPP(libstereo_MOC_SRCS ${libstereo_MOC_HDRS})
-
 # user interface
 
 SET(libstereo_UIS
@@ -58,7 +51,7 @@ QT4_WRAP_UI(libstereo_UIS_H ${libstereo_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 
-ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_MOC_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS} ${libstereo_HDRS})
+ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS} ${libstereo_HDRS})
 add_dependencies(stereo qmmp)
 target_link_libraries(stereo ${QT_LIBRARIES} -lqmmp)
 install(TARGETS stereo DESTINATION ${LIB_DIR}/qmmp/Effect)
diff --git a/src/plugins/Effect/stereo/stereo.pro b/src/plugins/Effect/stereo/stereo.pro
index d5136cbea..c89c2309d 100644
--- a/src/plugins/Effect/stereo/stereo.pro
+++ b/src/plugins/Effect/stereo/stereo.pro
@@ -17,21 +17,6 @@ plugin
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/stereo_plugin_cs.ts \
-               translations/stereo_plugin_de.ts \
-               translations/stereo_plugin_zh_CN.ts \
-               translations/stereo_plugin_zh_TW.ts \
-               translations/stereo_plugin_uk_UA.ts \
-               translations/stereo_plugin_pl.ts \
-               translations/stereo_plugin_ru.ts \
-               translations/stereo_plugin_it.ts \
-               translations/stereo_plugin_tr.ts \
-               translations/stereo_plugin_lt.ts \
-               translations/stereo_plugin_nl.ts \
-               translations/stereo_plugin_ja.ts \
-               translations/stereo_plugin_es.ts \
-               translations/stereo_plugin_sr_BA.ts \
-               translations/stereo_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/Engines/mplayer/CMakeLists.txt b/src/plugins/Engines/mplayer/CMakeLists.txt
index 1dea9477b..66f17afde 100644
--- a/src/plugins/Engines/mplayer/CMakeLists.txt
+++ b/src/plugins/Engines/mplayer/CMakeLists.txt
@@ -34,19 +34,10 @@ SET(libmplayer_SRCS
     settingsdialog.cpp
 )
 
-SET(libmplayer_MOC_HDRS
-    mplayerenginefactory.h
-    mplayerengine.h
-    mplayermetadatamodel.h
-    settingsdialog.h
-)
-
 SET(libmplayer_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libmplayer_RCC_SRCS ${libmplayer_RCCS})
 
-QT4_WRAP_CPP(libmplayer_MOC_SRCS ${libmplayer_MOC_HDRS})
-
 # user interface
 
 
@@ -59,7 +50,7 @@ QT4_WRAP_UI(libmplayer_UIS_H ${libmplayer_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(mplayer MODULE ${libmplayer_SRCS} ${libmplayer_MOC_SRCS} ${libmplayer_RCC_SRCS} ${libmplayer_UIS_H})
+ADD_LIBRARY(mplayer MODULE ${libmplayer_SRCS} ${libmplayer_RCC_SRCS} ${libmplayer_UIS_H})
 add_dependencies(mplayer qmmp)
 target_link_libraries(mplayer ${QT_LIBRARIES} -lqmmp)
 install(TARGETS mplayer DESTINATION ${LIB_DIR}/qmmp/Engines)
diff --git a/src/plugins/Engines/mplayer/mplayer.pro b/src/plugins/Engines/mplayer/mplayer.pro
index c0183d077..5f6575c45 100644
--- a/src/plugins/Engines/mplayer/mplayer.pro
+++ b/src/plugins/Engines/mplayer/mplayer.pro
@@ -16,21 +16,7 @@ TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp \
     -L/usr/lib
-TRANSLATIONS = translations/mplayer_plugin_ru.ts \
-    translations/mplayer_plugin_uk_UA.ts \
-    translations/mplayer_plugin_zh_CN.ts \
-    translations/mplayer_plugin_zh_TW.ts \
-    translations/mplayer_plugin_cs.ts \
-    translations/mplayer_plugin_pl.ts \
-    translations/mplayer_plugin_de.ts \
-    translations/mplayer_plugin_it.ts \
-    translations/mplayer_plugin_tr.ts \
-    translations/mplayer_plugin_lt.ts \
-    translations/mplayer_plugin_nl.ts \
-    translations/mplayer_plugin_ja.ts \
-    translations/mplayer_plugin_es.ts \
-    translations/mplayer_plugin_sr_BA.ts \
-    translations/mplayer_plugin_sr_RS.ts
+
 RESOURCES = translations/translations.qrc
 isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Engines
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt
index 03ca6249d..c591c0c19 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt
+++ b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt
@@ -32,18 +32,11 @@ SET(libqmmpfiledialog_SRCS
     qmmpfiledialog.cpp
 )
 
-SET(libqmmpfiledialog_MOC_HDRS
-    qmmpfiledialogimpl.h
-    qmmpfiledialog.h
-)
-
 SET(libqmmpfiledialog_RCCS
     translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libqmmpfiledialog_RCC_SRCS ${libqmmpfiledialog_RCCS})
 
-QT4_WRAP_CPP(libqmmpfiledialog_MOC_SRCS ${libqmmpfiledialog_MOC_HDRS})
-
 # user interface
 
 
@@ -56,7 +49,7 @@ QT4_WRAP_UI(libqmmpfiledialog_UIS_H ${libqmmpfiledialog_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(qmmpfiledialog MODULE ${libqmmpfiledialog_SRCS} ${libqmmpfiledialog_MOC_SRCS} ${libqmmpfiledialog_UIS_H} ${libqmmpfiledialog_RCC_SRCS})
+ADD_LIBRARY(qmmpfiledialog MODULE ${libqmmpfiledialog_SRCS} ${libqmmpfiledialog_UIS_H} ${libqmmpfiledialog_RCC_SRCS})
 add_dependencies(qmmpfiledialog qmmpui)
 target_link_libraries(qmmpfiledialog ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS qmmpfiledialog DESTINATION ${LIB_DIR}/qmmp/FileDialogs)
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
index 2935a13c9..dd30694b6 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
+++ b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
@@ -20,24 +20,6 @@ TEMPLATE = lib
 
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/qmmp_file_dialog_plugin_ru.ts \
-               translations/qmmp_file_dialog_plugin_tr.ts \
-               translations/qmmp_file_dialog_plugin_zh_CN.ts \
-               translations/qmmp_file_dialog_plugin_cs.ts \
-               translations/qmmp_file_dialog_plugin_pl.ts \
-               translations/qmmp_file_dialog_plugin_pt_BR.ts \
-               translations/qmmp_file_dialog_plugin_uk_UA.ts \
-               translations/qmmp_file_dialog_plugin_zh_TW.ts \
-               translations/qmmp_file_dialog_plugin_de.ts \
-               translations/qmmp_file_dialog_plugin_it.ts \
-               translations/qmmp_file_dialog_plugin_lt.ts \
-               translations/qmmp_file_dialog_plugin_nl.ts \
-               translations/qmmp_file_dialog_plugin_ja.ts \
-               translations/qmmp_file_dialog_plugin_es.ts \
-               translations/qmmp_file_dialog_plugin_sr_BA.ts \
-               translations/qmmp_file_dialog_plugin_sr_RS.ts
-
 RESOURCES += translations/translations.qrc
 
 unix {
diff --git a/src/plugins/General/converter/CMakeLists.txt b/src/plugins/General/converter/CMakeLists.txt
index 180c967c2..85081775e 100644
--- a/src/plugins/General/converter/CMakeLists.txt
+++ b/src/plugins/General/converter/CMakeLists.txt
@@ -43,21 +43,11 @@ SET(libconverter_SRCS
     preseteditor.cpp
 )
 
-SET(libconverter_MOC_HDRS
-    converterfactory.h
-    converter.h
-    converterhelper.h
-    converterdialog.h
-    preseteditor.h
-)
-
 SET(libconverter_RCCS 
     translations/translations.qrc presets.qrc)
 
 QT4_ADD_RESOURCES(libconverter_RCC_SRCS ${libconverter_RCCS})
 
-QT4_WRAP_CPP(libconverter_MOC_SRCS ${libconverter_MOC_HDRS})
-
 # user interface
 
 SET(libconverter_UIS
@@ -70,7 +60,7 @@ QT4_WRAP_UI(libconverter_UIS_H ${libconverter_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(converter MODULE ${libconverter_SRCS} ${libconverter_MOC_SRCS} ${libconverter_UIS_H} ${libconverter_RCC_SRCS})
+ADD_LIBRARY(converter MODULE ${libconverter_SRCS} ${libconverter_UIS_H} ${libconverter_RCC_SRCS})
 add_dependencies(converter qmmpui)
 target_link_libraries(converter ${QT_LIBRARIES} -lqmmpui -lqmmp ${TAGLIB_LDFLAGS})
 install(TARGETS converter DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro
index 19d104b5b..6808448b7 100644
--- a/src/plugins/General/converter/converter.pro
+++ b/src/plugins/General/converter/converter.pro
@@ -18,21 +18,6 @@ PKGCONFIG += taglib
 win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
-TRANSLATIONS = translations/converter_plugin_cs.ts \
-               translations/converter_plugin_de.ts \
-               translations/converter_plugin_zh_CN.ts \
-               translations/converter_plugin_zh_TW.ts \
-               translations/converter_plugin_ru.ts \
-               translations/converter_plugin_pl.ts \
-               translations/converter_plugin_uk_UA.ts \
-               translations/converter_plugin_it.ts \
-               translations/converter_plugin_tr.ts \
-               translations/converter_plugin_lt.ts \
-               translations/converter_plugin_nl.ts \
-               translations/converter_plugin_ja.ts \
-               translations/converter_plugin_es.ts \
-               translations/converter_plugin_sr_BA.ts \
-               translations/converter_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc presets.qrc
 unix{
 isEmpty(LIB_DIR){
diff --git a/src/plugins/General/copypaste/CMakeLists.txt b/src/plugins/General/copypaste/CMakeLists.txt
index 3445ffacc..c64d9d3c1 100644
--- a/src/plugins/General/copypaste/CMakeLists.txt
+++ b/src/plugins/General/copypaste/CMakeLists.txt
@@ -34,23 +34,16 @@ SET(libcopypaste_SRCS
     copypastefactory.cpp
 )
 
-SET(libcopypaste_MOC_HDRS
-    copypastefactory.h
-    copypaste.h
-)
-
 SET(libcopypaste_RCCS 
     translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libcopypaste_RCC_SRCS ${libcopypaste_RCCS})
 
-QT4_WRAP_CPP(libcopypaste_MOC_SRCS ${libcopypaste_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(copypaste MODULE ${libcopypaste_SRCS} ${libcopypaste_MOC_SRCS} ${libcopypaste_UIS_H} ${libcopypaste_RCC_SRCS})
+ADD_LIBRARY(copypaste MODULE ${libcopypaste_SRCS} ${libcopypaste_UIS_H} ${libcopypaste_RCC_SRCS})
 add_dependencies(copypaste qmmpui)
 target_link_libraries(copypaste ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS copypaste DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/covermanager/CMakeLists.txt b/src/plugins/General/covermanager/CMakeLists.txt
index 01fabe8ae..8fc9522cf 100644
--- a/src/plugins/General/covermanager/CMakeLists.txt
+++ b/src/plugins/General/covermanager/CMakeLists.txt
@@ -35,12 +35,6 @@ SET(libcovermanager_SRCS
     covermanagerfactory.cpp
 )
 
-SET(libcovermanager_MOC_HDRS
-    coverwidget.h
-    covermanager.h
-    covermanagerfactory.h
-)
-
 SET(libcovermanager_RCCS
     translations/translations.qrc
     images/cm_images.qrc
@@ -48,8 +42,6 @@ SET(libcovermanager_RCCS
 
 QT4_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS})
 
-QT4_WRAP_CPP(libcovermanager_MOC_SRCS ${libcovermanager_MOC_HDRS})
-
 # user interface
 
 
@@ -61,7 +53,7 @@ QT4_WRAP_UI(libcovermanager_UIS_H ${libcovermanager_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(covermanager MODULE ${libcovermanager_SRCS} ${libcovermanager_MOC_SRCS} ${libcovermanager_UIS_H}
+ADD_LIBRARY(covermanager MODULE ${libcovermanager_SRCS} ${libcovermanager_UIS_H}
   ${libcovermanager_RCC_SRCS})
 add_dependencies(covermanager qmmpui)
 target_link_libraries(covermanager ${QT_LIBRARIES} -lqmmpui -lqmmp)
diff --git a/src/plugins/General/fileops/CMakeLists.txt b/src/plugins/General/fileops/CMakeLists.txt
index d525022ed..268af2fed 100644
--- a/src/plugins/General/fileops/CMakeLists.txt
+++ b/src/plugins/General/fileops/CMakeLists.txt
@@ -36,20 +36,11 @@ SET(libfileops_SRCS
     hotkeydialog.cpp
 )
 
-SET(libfileops_MOC_HDRS
-    fileopsfactory.h
-    fileops.h
-    settingsdialog.h
-    hotkeydialog.h
-)
-
 SET(libfileops_RCCS 
     translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libfileops_RCC_SRCS ${libfileops_RCCS})
 
-QT4_WRAP_CPP(libfileops_MOC_SRCS ${libfileops_MOC_HDRS})
-
 # user interface
 
 SET(libfileops_UIS
@@ -62,7 +53,7 @@ QT4_WRAP_UI(libfileops_UIS_H ${libfileops_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(fileops MODULE ${libfileops_SRCS} ${libfileops_MOC_SRCS} ${libfileops_UIS_H} ${libfileops_RCC_SRCS})
+ADD_LIBRARY(fileops MODULE ${libfileops_SRCS} ${libfileops_UIS_H} ${libfileops_RCC_SRCS})
 add_dependencies(fileops qmmpui)
 target_link_libraries(fileops ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS fileops DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/fileops/fileops.pro b/src/plugins/General/fileops/fileops.pro
index a270db913..c03a7f81c 100644
--- a/src/plugins/General/fileops/fileops.pro
+++ b/src/plugins/General/fileops/fileops.pro
@@ -2,7 +2,7 @@ include(../../plugins.pri)
 
 INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
-plugin 
+plugin
 
 TARGET =$$PLUGINS_PREFIX/General/fileops
 unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libfileops.so
@@ -15,21 +15,6 @@ unix : LIBS += -lqmmpui -lqmmp
 win32 : QMAKE_LIBDIR += ../../../../bin
 win32 : LIBS += -lqmmpui0 -lqmmp0
 
-TRANSLATIONS = translations/fileops_plugin_cs.ts \
-               translations/fileops_plugin_de.ts \
-               translations/fileops_plugin_zh_CN.ts \
-               translations/fileops_plugin_zh_TW.ts \
-               translations/fileops_plugin_ru.ts \
-               translations/fileops_plugin_pl.ts \
-               translations/fileops_plugin_uk_UA.ts \
-               translations/fileops_plugin_it.ts \
-               translations/fileops_plugin_tr.ts \
-               translations/fileops_plugin_lt.ts \
-               translations/fileops_plugin_nl.ts \
-               translations/fileops_plugin_ja.ts \
-               translations/fileops_plugin_es.ts \
-               translations/fileops_plugin_sr_BA.ts \
-               translations/fileops_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 unix {
     isEmpty(LIB_DIR){
diff --git a/src/plugins/General/gnomehotkey/CMakeLists.txt b/src/plugins/General/gnomehotkey/CMakeLists.txt
index af69b0483..f36beb0be 100644
--- a/src/plugins/General/gnomehotkey/CMakeLists.txt
+++ b/src/plugins/General/gnomehotkey/CMakeLists.txt
@@ -32,23 +32,15 @@ SET(libgnomehotkey_SRCS
     mediakeys.cpp
 )
 
-SET(libgnomehotkey_MOC_HDRS
-    gnomehotkeyfactory.h
-    mediakeys.h
-)
-
 SET(libgnomehotkey_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libgnomehotkey_RCC_SRCS ${libgnomehotkey_RCCS})
 
-QT4_WRAP_CPP(libgnomehotkey_MOC_SRCS ${libgnomehotkey_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(gnomehotkey MODULE ${libgnomehotkey_SRCS} ${libgnomehotkey_MOC_SRCS} ${libgnomehotkey_RCC_SRCS})
+ADD_LIBRARY(gnomehotkey MODULE ${libgnomehotkey_SRCS} ${libgnomehotkey_RCC_SRCS})
 add_dependencies(gnomehotkey qmmpui)
 target_link_libraries(gnomehotkey ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS gnomehotkey DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/gnomehotkey/gnomehotkey.pro b/src/plugins/General/gnomehotkey/gnomehotkey.pro
index 5ae45e2aa..1c693f1b7 100644
--- a/src/plugins/General/gnomehotkey/gnomehotkey.pro
+++ b/src/plugins/General/gnomehotkey/gnomehotkey.pro
@@ -11,22 +11,6 @@ QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libgnomehotkey.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/gnomehotkey_plugin_cs.ts \
-               translations/gnomehotkey_plugin_de.ts \
-               translations/gnomehotkey_plugin_zh_CN.ts \
-               translations/gnomehotkey_plugin_zh_TW.ts \
-               translations/gnomehotkey_plugin_ru.ts \
-               translations/gnomehotkey_plugin_pl.ts \
-               translations/gnomehotkey_plugin_uk_UA.ts \
-               translations/gnomehotkey_plugin_it.ts \
-               translations/gnomehotkey_plugin_tr.ts \
-               translations/gnomehotkey_plugin_lt.ts \
-               translations/gnomehotkey_plugin_nl.ts \
-               translations/gnomehotkey_plugin_ja.ts \
-               translations/gnomehotkey_plugin_es.ts \
-               translations/gnomehotkey_plugin_sr_BA.ts \
-               translations/gnomehotkey_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/General/hal/CMakeLists.txt b/src/plugins/General/hal/CMakeLists.txt
index fe07dd690..b436fcfce 100644
--- a/src/plugins/General/hal/CMakeLists.txt
+++ b/src/plugins/General/hal/CMakeLists.txt
@@ -35,20 +35,10 @@ SET(libhal_SRCS
     settingsdialog.cpp
 )
 
-SET(libhal_MOC_HDRS
-    halfactory.h
-    halmanager.h
-    halplugin.h
-    haldevice.h
-    settingsdialog.h
-)
-
 SET(libhal_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libhal_RCC_SRCS ${libhal_RCCS})
 
-QT4_WRAP_CPP(libhal_MOC_SRCS ${libhal_MOC_HDRS})
-
 # user interface
 
 SET(libhal_UIS
@@ -60,7 +50,7 @@ QT4_WRAP_UI(libhal_UIS_H ${libhal_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(hal MODULE ${libhal_SRCS} ${libhal_MOC_SRCS} ${libhal_UIS_H} ${libhal_RCC_SRCS})
+ADD_LIBRARY(hal MODULE ${libhal_SRCS} ${libhal_UIS_H} ${libhal_RCC_SRCS})
 add_dependencies(hal qmmpui)
 target_link_libraries(hal ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS hal DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro
index 434898891..0ba95a02b 100644
--- a/src/plugins/General/hal/hal.pro
+++ b/src/plugins/General/hal/hal.pro
@@ -11,22 +11,6 @@ QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhal.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/hal_plugin_cs.ts \
-               translations/hal_plugin_de.ts \
-               translations/hal_plugin_zh_CN.ts \
-               translations/hal_plugin_zh_TW.ts \
-               translations/hal_plugin_ru.ts \
-               translations/hal_plugin_pl.ts \
-               translations/hal_plugin_uk_UA.ts \
-               translations/hal_plugin_it.ts \
-               translations/hal_plugin_tr.ts \
-               translations/hal_plugin_lt.ts \
-               translations/hal_plugin_nl.ts \
-               translations/hal_plugin_ja.ts \
-               translations/hal_plugin_es.ts \
-               translations/hal_plugin_sr_BA.ts \
-               translations/hal_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt
index 62845b042..1e489598e 100644
--- a/src/plugins/General/hotkey/CMakeLists.txt
+++ b/src/plugins/General/hotkey/CMakeLists.txt
@@ -47,21 +47,12 @@ SET(libhotkey_SRCS
     hotkeydialog.cpp
 )
 
-SET(libhotkey_MOC_HDRS
-    settingsdialog.h
-    hotkeyfactory.h
-    hotkeymanager.h
-    hotkeydialog.h
-)
-
 SET(libhotkey_RCCS
     translations/translations.qrc
 )
 
 QT4_ADD_RESOURCES(libhotkey_RCC_SRCS ${libhotkey_RCCS})
 
-QT4_WRAP_CPP(libhotkey_MOC_SRCS ${libhotkey_MOC_HDRS})
-
 # user interface
 
 
@@ -76,7 +67,7 @@ QT4_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(X11_FOUND)
-ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_MOC_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS})
+ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS})
 add_dependencies(hotkey qmmpui)
 target_link_libraries(hotkey ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS})
 install(TARGETS hotkey DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index e209a5e74..f166ebae1 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -12,21 +12,6 @@ TARGET = $$PLUGINS_PREFIX/General/hotkey
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/hotkey_plugin_cs.ts \
-               translations/hotkey_plugin_de.ts \
-               translations/hotkey_plugin_zh_CN.ts \
-               translations/hotkey_plugin_zh_TW.ts \
-               translations/hotkey_plugin_ru.ts \
-               translations/hotkey_plugin_pl.ts \
-               translations/hotkey_plugin_uk_UA.ts \
-               translations/hotkey_plugin_it.ts \
-               translations/hotkey_plugin_tr.ts \
-               translations/hotkey_plugin_lt.ts \
-               translations/hotkey_plugin_nl.ts \
-               translations/hotkey_plugin_ja.ts \
-               translations/hotkey_plugin_es.ts \
-               translations/hotkey_plugin_sr_BA.ts \
-               translations/hotkey_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 target.path = $$LIB_DIR/qmmp/General
diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp
index c8d71ea9f..bf2b2165e 100644
--- a/src/plugins/General/hotkey/hotkeymanager_win.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_win.cpp
@@ -298,5 +298,8 @@ quint32 HotkeyManager::keycodeToKeysym(quint32 keycode)
     }
     return MapVirtualKey(keycode, 1);
 }
+
+#include "moc_hotkeymanager.cpp"
+
 #endif
 
diff --git a/src/plugins/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp
index 21e3bdab8..b24feab84 100644
--- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2014 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   Copyright (C) 2003-2007 by Justin Karneges and Michail Pishchagin     *
@@ -316,4 +316,7 @@ quint32 HotkeyManager::keycodeToKeysym(quint32 keycode)
     return XKeycodeToKeysym(QX11Info::display(), keycode,0);
 #endif
 }
+
+#include "moc_hotkeymanager.cpp"
+
 #endif
diff --git a/src/plugins/General/kdenotify/CMakeLists.txt b/src/plugins/General/kdenotify/CMakeLists.txt
index d62a7b8f4..5fac1e62e 100644
--- a/src/plugins/General/kdenotify/CMakeLists.txt
+++ b/src/plugins/General/kdenotify/CMakeLists.txt
@@ -35,18 +35,10 @@ SET(libkdenotify_SRCS
     settingsdialog.cpp
 )
 
-SET(libkdenotify_MOC_HDRS
-    kdenotifyfactory.h
-    kdenotify.h
-    settingsdialog.h
-)
-
 SET(libkdenotify_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libkdenotify_RCC_SRCS ${libkdenotify_RCCS})
 
-QT4_WRAP_CPP(libkdenotify_MOC_SRCS ${libkdenotify_MOC_HDRS})
-
 # user interface
 SET(libkdenotify_UIS
     settingsdialog.ui
@@ -59,7 +51,7 @@ QT4_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(kdenotify MODULE ${libkdenotify_SRCS} ${libkdenotify_MOC_SRCS} ${libkdenotify_RCC_SRCS} ${libkdenotify_UIS_H})
+ADD_LIBRARY(kdenotify MODULE ${libkdenotify_SRCS} ${libkdenotify_RCC_SRCS} ${libkdenotify_UIS_H})
 add_dependencies(kdenotify qmmpui)
 target_link_libraries(kdenotify ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS kdenotify DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro
index 36b612814..49d0acbcd 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -9,12 +9,12 @@ CONFIG += warn_on \
 unix:TARGET = $$PLUGINS_PREFIX/General/kdenotify
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libkdenotify.so
 TEMPLATE = lib
-unix { 
+unix {
     QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmpui \
         -lqmmp
 }
-unix { 
+unix {
     isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
@@ -28,22 +28,6 @@ HEADERS += kdenotifyfactory.h \
 RESOURCES += translations/translations.qrc
 FORMS += settingsdialog.ui
 
-TRANSLATIONS = translations/kdenotify_plugin_cs.ts \
-               translations/kdenotify_plugin_de.ts \
-               translations/kdenotify_plugin_zh_CN.ts \
-               translations/kdenotify_plugin_zh_TW.ts \
-               translations/kdenotify_plugin_ru.ts \
-               translations/kdenotify_plugin_pl.ts \
-               translations/kdenotify_plugin_uk_UA.ts \
-               translations/kdenotify_plugin_it.ts \
-               translations/kdenotify_plugin_tr.ts \
-               translations/kdenotify_plugin_lt.ts \
-               translations/kdenotify_plugin_nl.ts \
-               translations/kdenotify_plugin_ja.ts \
-               translations/kdenotify_plugin_es.ts \
-               translations/kdenotify_plugin_sr_BA.ts \
-               translations/kdenotify_plugin_sr_RS.ts
-
 images.files = images/app_icon.png \
                images/empty_cover.png
 images.path = /share/qmmp/images/
diff --git a/src/plugins/General/lyrics/CMakeLists.txt b/src/plugins/General/lyrics/CMakeLists.txt
index 3f98e4b51..82a45f332 100644
--- a/src/plugins/General/lyrics/CMakeLists.txt
+++ b/src/plugins/General/lyrics/CMakeLists.txt
@@ -38,19 +38,11 @@ SET(liblyrics_SRCS
     lyricswindow.cpp
 )
 
-SET(liblyrics_MOC_HDRS
-    lyricsfactory.h
-    lyrics.h
-    lyricswindow.h
-)
-
 SET(liblyrics_RCCS 
     translations/translations.qrc)
 
 QT4_ADD_RESOURCES(liblyrics_RCC_SRCS ${liblyrics_RCCS})
 
-QT4_WRAP_CPP(liblyrics_MOC_SRCS ${liblyrics_MOC_HDRS})
-
 # user interface
 
 SET(liblyrics_UIS
@@ -62,7 +54,7 @@ QT4_WRAP_UI(liblyrics_UIS_H ${liblyrics_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(lyrics MODULE ${liblyrics_SRCS} ${liblyrics_MOC_SRCS} ${liblyrics_UIS_H} ${liblyrics_RCC_SRCS})
+ADD_LIBRARY(lyrics MODULE ${liblyrics_SRCS} ${liblyrics_UIS_H} ${liblyrics_RCC_SRCS})
 add_dependencies(lyrics qmmpui)
 target_link_libraries(lyrics ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS lyrics DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro
index ddb7ec5c8..ccb4f3ca8 100644
--- a/src/plugins/General/lyrics/lyrics.pro
+++ b/src/plugins/General/lyrics/lyrics.pro
@@ -2,7 +2,7 @@ include(../../plugins.pri)
 
 INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
-plugin 
+plugin
 
 TARGET =$$PLUGINS_PREFIX/General/lyrics
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/liblyrics.so
@@ -15,21 +15,6 @@ unix:LIBS += -lqmmpui -lqmmp
 win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
-TRANSLATIONS = translations/lyrics_plugin_cs.ts \
-               translations/lyrics_plugin_de.ts \
-               translations/lyrics_plugin_zh_CN.ts \
-               translations/lyrics_plugin_zh_TW.ts \
-               translations/lyrics_plugin_ru.ts \
-               translations/lyrics_plugin_pl.ts \
-               translations/lyrics_plugin_uk_UA.ts \
-               translations/lyrics_plugin_it.ts \
-               translations/lyrics_plugin_tr.ts \
-               translations/lyrics_plugin_lt.ts \
-               translations/lyrics_plugin_nl.ts \
-               translations/lyrics_plugin_ja.ts \
-               translations/lyrics_plugin_es.ts \
-               translations/lyrics_plugin_sr_BA.ts \
-               translations/lyrics_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 unix{
 isEmpty(LIB_DIR){
diff --git a/src/plugins/General/mpris/CMakeLists.txt b/src/plugins/General/mpris/CMakeLists.txt
index c9327ca6d..ec0bad8de 100644
--- a/src/plugins/General/mpris/CMakeLists.txt
+++ b/src/plugins/General/mpris/CMakeLists.txt
@@ -39,22 +39,10 @@ SET(libmpris_SRCS
     mpris2/player2object.cpp
 )
 
-SET(libmpris_MOC_HDRS
-    mprisfactory.h
-    mpris.h
-    mpris1/rootobject.h
-    mpris1/playerobject.h
-    mpris1/tracklistobject.h
-    mpris2/root2object.h
-    mpris2/player2object.h
-)
-
 SET(libmpris_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libmpris_RCC_SRCS ${libmpris_RCCS})
 
-QT4_WRAP_CPP(libmpris_MOC_SRCS ${libmpris_MOC_HDRS})
-
 # user interface
 
 
@@ -63,7 +51,7 @@ QT4_WRAP_CPP(libmpris_MOC_SRCS ${libmpris_MOC_HDRS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(mpris MODULE ${libmpris_SRCS} ${libmpris_MOC_SRCS} ${libmpris_RCC_SRCS})
+ADD_LIBRARY(mpris MODULE ${libmpris_SRCS} ${libmpris_RCC_SRCS})
 add_dependencies(mpris qmmpui)
 target_link_libraries(mpris ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS mpris DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/mpris/mpris.pro b/src/plugins/General/mpris/mpris.pro
index 820f7c516..096bce200 100644
--- a/src/plugins/General/mpris/mpris.pro
+++ b/src/plugins/General/mpris/mpris.pro
@@ -11,21 +11,6 @@ QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libmpris.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/mpris_plugin_cs.ts \
-               translations/mpris_plugin_de.ts \
-               translations/mpris_plugin_zh_CN.ts \
-               translations/mpris_plugin_zh_TW.ts \
-               translations/mpris_plugin_ru.ts \
-               translations/mpris_plugin_pl.ts \
-               translations/mpris_plugin_uk_UA.ts \
-               translations/mpris_plugin_it.ts \
-               translations/mpris_plugin_tr.ts \
-               translations/mpris_plugin_lt.ts \
-               translations/mpris_plugin_nl.ts \
-               translations/mpris_plugin_ja.ts \
-               translations/mpris_plugin_es.ts \
-               translations/mpris_plugin_sr_BA.ts \
-               translations/mpris_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/General/mpris/mpris1/tracklistobject.cpp b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
index 2cef4a8c7..a7dd70aa9 100644
--- a/src/plugins/General/mpris/mpris1/tracklistobject.cpp
+++ b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,7 +33,7 @@ TrackListObject::TrackListObject(QObject *parent) : QObject(parent)
     m_ui_settings = QmmpUiSettings::instance();
     m_pl_manager = m_player->playListManager();
     m_model = m_pl_manager->currentPlayList();
-    connect (m_model, SIGNAL(listChanged()), SLOT(updateTrackList()));
+    connect (m_model, SIGNAL(listChanged(int)), SLOT(updateTrackList(int)));
     connect (m_pl_manager, SIGNAL(currentPlayListChanged(PlayListModel*,PlayListModel*)),
              SLOT(switchPlayList(PlayListModel*,PlayListModel*)));
     m_prev_count = 0;
@@ -119,16 +119,17 @@ void TrackListObject::playTrack(PlayListTrack *track)
     disconnect(m_model,SIGNAL(trackAdded(PlayListTrack*)), this, SLOT(playTrack(PlayListTrack*)));
 }
 
-void  TrackListObject::updateTrackList()
+void  TrackListObject::updateTrackList(int flags)
 {
-    emit TrackListChange(m_model->numberOfTrack(m_model->count() - 1) + 1);
+    if(flags & PlayListModel::STRUCTURE)
+        emit TrackListChange(m_model->numberOfTrack(m_model->count() - 1) + 1);
 }
 
 void TrackListObject::switchPlayList(PlayListModel *cur, PlayListModel *prev)
 {
     m_model = cur;
-    connect (m_model, SIGNAL(listChanged()), SLOT(updateTrackList()));
+    connect (m_model, SIGNAL(listChanged(int)), SLOT(updateTrackList(int)));
     if(prev)
         disconnect(prev,0,this,0);
-    updateTrackList();
+    updateTrackList(PlayListModel::STRUCTURE);
 }
diff --git a/src/plugins/General/mpris/mpris1/tracklistobject.h b/src/plugins/General/mpris/mpris1/tracklistobject.h
index c5eca61d4..47c7148fb 100644
--- a/src/plugins/General/mpris/mpris1/tracklistobject.h
+++ b/src/plugins/General/mpris/mpris1/tracklistobject.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -57,7 +57,7 @@ signals:
 
 private slots:
     void playTrack(PlayListTrack *track);
-    void updateTrackList();
+    void updateTrackList(int flags);
     void switchPlayList(PlayListModel *cur, PlayListModel *prev);
 
 private:
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp
index 9bf7e539e..3168c6c53 100644
--- a/src/plugins/General/mpris/mpris2/player2object.cpp
+++ b/src/plugins/General/mpris/mpris2/player2object.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -369,7 +369,7 @@ void Player2Object::setModel(PlayListModel *selected, PlayListModel *previous)
 {
     if(previous)
         disconnect(previous, 0, this, 0); //disconnect previous model
-    connect(selected, SIGNAL(listChanged()), SLOT(emitPropertiesChanged()));
+    connect(selected, SIGNAL(listChanged(int)), SLOT(emitPropertiesChanged()));
 }
 
 void Player2Object::syncProperties()
diff --git a/src/plugins/General/mpris/mpris2/player2object.h b/src/plugins/General/mpris/mpris2/player2object.h
index f66b55664..e51489e16 100644
--- a/src/plugins/General/mpris/mpris2/player2object.h
+++ b/src/plugins/General/mpris/mpris2/player2object.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt
index 17bfd1d7e..3ee3300bb 100644
--- a/src/plugins/General/notifier/CMakeLists.txt
+++ b/src/plugins/General/notifier/CMakeLists.txt
@@ -34,21 +34,12 @@ SET(libnotifier_SRCS
     popupwidget.cpp
 )
 
-SET(libnotifier_MOC_HDRS
-    settingsdialog.h
-    notifierfactory.h
-    notifier.h
-    popupwidget.h
-)
-
 SET(libnotifier_RCCS 
     translations/translations.qrc
     notifier_images.qrc)
 
 QT4_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS})
 
-QT4_WRAP_CPP(libnotifier_MOC_SRCS ${libnotifier_MOC_HDRS})
-
 # user interface
 
 
@@ -61,7 +52,7 @@ QT4_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(notifier MODULE ${libnotifier_SRCS} ${libnotifier_MOC_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS})
+ADD_LIBRARY(notifier MODULE ${libnotifier_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS})
 add_dependencies(notifier qmmpui)
 target_link_libraries(notifier ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS notifier DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index dc5fd3056..4a602ae77 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -14,21 +14,6 @@ unix:LIBS += -lqmmpui -lqmmp
 win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
-TRANSLATIONS = translations/notifier_plugin_cs.ts \
-               translations/notifier_plugin_de.ts \
-               translations/notifier_plugin_zh_CN.ts \
-               translations/notifier_plugin_zh_TW.ts \
-               translations/notifier_plugin_ru.ts \
-               translations/notifier_plugin_pl.ts \
-               translations/notifier_plugin_uk_UA.ts \
-               translations/notifier_plugin_it.ts \
-               translations/notifier_plugin_tr.ts \
-               translations/notifier_plugin_lt.ts \
-               translations/notifier_plugin_nl.ts \
-               translations/notifier_plugin_ja.ts \
-               translations/notifier_plugin_es.ts \
-               translations/notifier_plugin_sr_BA.ts \
-               translations/notifier_plugin_sr_RS.ts
 RESOURCES = notifier_images.qrc \
             translations/translations.qrc
 
diff --git a/src/plugins/General/rgscan/CMakeLists.txt b/src/plugins/General/rgscan/CMakeLists.txt
index 67ea35089..89eb3054d 100644
--- a/src/plugins/General/rgscan/CMakeLists.txt
+++ b/src/plugins/General/rgscan/CMakeLists.txt
@@ -43,13 +43,6 @@ SET(librgscan_SRCS
     gain_analysis.c
 )
 
-SET(librgscan_MOC_HDRS
-    rgscanfactory.h
-    rgscanhelper.h
-    rgscandialog.h
-    rgscanner.h
-)
-
 SET(librgscan_HDRS
    gain_analysis.h
 )
@@ -60,8 +53,6 @@ SET(librgscan_RCCS
 
 QT4_ADD_RESOURCES(librgscan_RCC_SRCS ${librgscan_RCCS})
 
-QT4_WRAP_CPP(librgscan_MOC_SRCS ${librgscan_MOC_HDRS})
-
 # user interface
 
 SET(librgscan_UIS
@@ -73,7 +64,7 @@ QT4_WRAP_UI(librgscan_UIS_H ${librgscan_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(rgscan MODULE ${librgscan_SRCS} ${librgscan_MOC_SRCS} ${librgscan_UIS_H} ${librgscan_HDRS} ${librgscan_RCC_SRCS})
+ADD_LIBRARY(rgscan MODULE ${librgscan_SRCS} ${librgscan_UIS_H} ${librgscan_HDRS} ${librgscan_RCC_SRCS})
 add_dependencies(rgscan qmmpui)
 target_link_libraries(rgscan ${QT_LIBRARIES} -lqmmpui -lqmmp ${TAGLIB_LDFLAGS})
 install(TARGETS rgscan DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro
index d9e7b6122..a05a4f885 100644
--- a/src/plugins/General/rgscan/rgscan.pro
+++ b/src/plugins/General/rgscan/rgscan.pro
@@ -13,26 +13,9 @@ TEMPLATE = lib
 unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
-
-
 win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0 -ltag.dll
 
-TRANSLATIONS = translations/rgscan_plugin_cs.ts \
-               translations/rgscan_plugin_de.ts \
-               translations/rgscan_plugin_zh_CN.ts \
-               translations/rgscan_plugin_zh_TW.ts \
-               translations/rgscan_plugin_ru.ts \
-               translations/rgscan_plugin_pl.ts \
-               translations/rgscan_plugin_uk_UA.ts \
-               translations/rgscan_plugin_it.ts \
-               translations/rgscan_plugin_tr.ts \
-               translations/rgscan_plugin_lt.ts \
-               translations/rgscan_plugin_nl.ts \
-               translations/rgscan_plugin_ja.ts \
-               translations/rgscan_plugin_es.ts \
-               translations/rgscan_plugin_sr_BA.ts \
-               translations/rgscan_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 unix{
 isEmpty(LIB_DIR){
diff --git a/src/plugins/General/scrobbler/CMakeLists.txt b/src/plugins/General/scrobbler/CMakeLists.txt
index 6e490677c..67213747e 100644
--- a/src/plugins/General/scrobbler/CMakeLists.txt
+++ b/src/plugins/General/scrobbler/CMakeLists.txt
@@ -36,13 +36,6 @@ SET(libscrobbler_SRCS
     scrobbler.cpp
 )
 
-SET(libscrobbler_MOC_HDRS
-    settingsdialog.h
-    scrobblerfactory.h
-    scrobblerhandler.h
-    scrobbler.h
-)
-
 SET(libscrobbler_HDRS
     scrobblercache.h
     defines.h
@@ -52,8 +45,6 @@ SET(libscrobbler_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libscrobbler_RCC_SRCS ${libscrobbler_RCCS})
 
-QT4_WRAP_CPP(libscrobbler_MOC_SRCS ${libscrobbler_MOC_HDRS})
-
 # user interface
 
 
@@ -66,7 +57,7 @@ QT4_WRAP_UI(libscrobbler_UIS_H ${libscrobbler_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(scrobbler MODULE ${libscrobbler_SRCS} ${libscrobbler_MOC_SRCS} ${libscrobbler_UIS_H}
+ADD_LIBRARY(scrobbler MODULE ${libscrobbler_SRCS} ${libscrobbler_UIS_H}
   ${libscrobbler_RCC_SRCS} ${libscrobbler_HDRS})
 add_dependencies(scrobbler qmmpui)
 target_link_libraries(scrobbler ${QT_LIBRARIES} -lqmmpui -lqmmp)
diff --git a/src/plugins/General/scrobbler/scrobbler.pro b/src/plugins/General/scrobbler/scrobbler.pro
index 8c24a01b8..ff34ea725 100644
--- a/src/plugins/General/scrobbler/scrobbler.pro
+++ b/src/plugins/General/scrobbler/scrobbler.pro
@@ -6,21 +6,6 @@ unix:QMAKE_LIBDIR += ../../../../lib
 win32:QMAKE_LIBDIR += ../../../../bin
 TARGET = $$PLUGINS_PREFIX/General/scrobbler
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libscrobbler.so
-TRANSLATIONS = translations/scrobbler_plugin_cs.ts \
-    translations/scrobbler_plugin_de.ts \
-    translations/scrobbler_plugin_zh_CN.ts \
-    translations/scrobbler_plugin_zh_TW.ts \
-    translations/scrobbler_plugin_ru.ts \
-    translations/scrobbler_plugin_pl.ts \
-    translations/scrobbler_plugin_uk_UA.ts \
-    translations/scrobbler_plugin_it.ts \
-    translations/scrobbler_plugin_tr.ts \
-    translations/scrobbler_plugin_lt.ts \
-    translations/scrobbler_plugin_nl.ts \
-    translations/scrobbler_plugin_ja.ts \
-    translations/scrobbler_plugin_es.ts \
-    translations/scrobbler_plugin_sr_BA.ts \
-    translations/scrobbler_plugin_sr_RS.ts
 
 RESOURCES = translations/translations.qrc
 unix {
diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt
index f912b11a5..b9cb7ff5c 100644
--- a/src/plugins/General/statusicon/CMakeLists.txt
+++ b/src/plugins/General/statusicon/CMakeLists.txt
@@ -36,23 +36,12 @@ SET(libstatusicon_SRCS
     coverwidget.cpp
 )
 
-SET(libstatusicon_MOC_HDRS
-    settingsdialog.h
-    statusiconfactory.h
-    statusicon.h
-    qmmptrayicon.h
-    statusiconpopupwidget.h
-    coverwidget.h
-)
-
 SET(libstatusicon_RCCS 
     translations/translations.qrc
     images/tray_images.qrc)
 
 QT4_ADD_RESOURCES(libstatusicon_RCC_SRCS ${libstatusicon_RCCS})
 
-QT4_WRAP_CPP(libstatusicon_MOC_SRCS ${libstatusicon_MOC_HDRS})
-
 # user interface
 
 
@@ -65,7 +54,7 @@ QT4_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(statusicon MODULE ${libstatusicon_SRCS} ${libstatusicon_MOC_SRCS} ${libstatusicon_UIS_H} ${libstatusicon_RCC_SRCS})
+ADD_LIBRARY(statusicon MODULE ${libstatusicon_SRCS} ${libstatusicon_UIS_H} ${libstatusicon_RCC_SRCS})
 add_dependencies(statusicon qmmpui libqmmp)
 target_link_libraries(statusicon ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS statusicon DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro
index 3f201fd83..3da40e0b6 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -6,34 +6,19 @@ unix:TARGET = $$PLUGINS_PREFIX/General/statusicon
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstatusicon.so
 win32:TARGET = $$PLUGINS_PREFIX/General/statusicon
 TEMPLATE = lib
-unix { 
+unix {
     QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmpui \
         -lqmmp
 }
-win32 { 
+win32 {
     QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmpui0 \
         -lqmmp0
 }
-TRANSLATIONS = translations/statusicon_plugin_cs.ts \
-    translations/statusicon_plugin_de.ts \
-    translations/statusicon_plugin_zh_CN.ts \
-    translations/statusicon_plugin_zh_TW.ts \
-    translations/statusicon_plugin_ru.ts \
-    translations/statusicon_plugin_pl.ts \
-    translations/statusicon_plugin_uk_UA.ts \
-    translations/statusicon_plugin_it.ts \
-    translations/statusicon_plugin_tr.ts \
-    translations/statusicon_plugin_lt.ts \
-    translations/statusicon_plugin_nl.ts \
-    translations/statusicon_plugin_ja.ts \
-    translations/statusicon_plugin_es.ts \
-    translations/statusicon_plugin_sr_BA.ts \
-    translations/statusicon_plugin_sr_RS.ts
 
 RESOURCES = translations/translations.qrc
-unix { 
+unix {
     isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
diff --git a/src/plugins/General/streambrowser/CMakeLists.txt b/src/plugins/General/streambrowser/CMakeLists.txt
index d1059701c..7cea884be 100644
--- a/src/plugins/General/streambrowser/CMakeLists.txt
+++ b/src/plugins/General/streambrowser/CMakeLists.txt
@@ -38,19 +38,11 @@ SET(libstreambrowser_SRCS
     streamwindow.cpp
 )
 
-SET(libstreambrowser_MOC_HDRS
-    streambrowserfactory.h
-    streambrowser.h
-    streamwindow.h
-)
-
 SET(libstreambrowser_RCCS 
     translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libstreambrowser_RCC_SRCS ${libstreambrowser_RCCS})
 
-QT4_WRAP_CPP(libstreambrowser_MOC_SRCS ${libstreambrowser_MOC_HDRS})
-
 # user interface
 
 SET(libstreambrowser_UIS
@@ -62,7 +54,7 @@ QT4_WRAP_UI(libstreambrowser_UIS_H ${libstreambrowser_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(streambrowser MODULE ${libstreambrowser_SRCS} ${libstreambrowser_MOC_SRCS} ${libstreambrowser_UIS_H} ${libstreambrowser_RCC_SRCS})
+ADD_LIBRARY(streambrowser MODULE ${libstreambrowser_SRCS} ${libstreambrowser_UIS_H} ${libstreambrowser_RCC_SRCS})
 add_dependencies(streambrowser qmmpui)
 target_link_libraries(streambrowser ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS streambrowser DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/streambrowser/streambrowser.pro b/src/plugins/General/streambrowser/streambrowser.pro
index 0c8e5e797..abf3fcd26 100644
--- a/src/plugins/General/streambrowser/streambrowser.pro
+++ b/src/plugins/General/streambrowser/streambrowser.pro
@@ -15,21 +15,6 @@ unix:LIBS += -lqmmpui -lqmmp
 win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
-TRANSLATIONS = translations/streambrowser_plugin_cs.ts \
-               translations/streambrowser_plugin_de.ts \
-               translations/streambrowser_plugin_zh_CN.ts \
-               translations/streambrowser_plugin_zh_TW.ts \
-               translations/streambrowser_plugin_ru.ts \
-               translations/streambrowser_plugin_pl.ts \
-               translations/streambrowser_plugin_uk_UA.ts \
-               translations/streambrowser_plugin_it.ts \
-               translations/streambrowser_plugin_tr.ts \
-               translations/streambrowser_plugin_lt.ts \
-               translations/streambrowser_plugin_nl.ts \
-               translations/streambrowser_plugin_ja.ts \
-               translations/streambrowser_plugin_es.ts \
-               translations/streambrowser_plugin_sr_BA.ts \
-               translations/streambrowser_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 unix{
 isEmpty(LIB_DIR){
diff --git a/src/plugins/General/trackchange/CMakeLists.txt b/src/plugins/General/trackchange/CMakeLists.txt
index 99bdbe495..555ac570a 100644
--- a/src/plugins/General/trackchange/CMakeLists.txt
+++ b/src/plugins/General/trackchange/CMakeLists.txt
@@ -35,19 +35,11 @@ SET(libtrackchange_SRCS
     settingsdialog.cpp
 )
 
-SET(libtrackchange_MOC_HDRS
-    trackchangefactory.h
-    trackchange.h
-    settingsdialog.h
-)
-
 SET(libtrackchange_RCCS 
     translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libtrackchange_RCC_SRCS ${libtrackchange_RCCS})
 
-QT4_WRAP_CPP(libtrackchange_MOC_SRCS ${libtrackchange_MOC_HDRS})
-
 # user interface
 SET(libtrackchange_UIS
     settingsdialog.ui
@@ -58,7 +50,7 @@ QT4_WRAP_UI(libtrackchange_UIS_H ${libtrackchange_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(trackchange MODULE ${libtrackchange_SRCS} ${libtrackchange_MOC_SRCS} ${libtrackchange_UIS_H} ${libtrackchange_RCC_SRCS})
+ADD_LIBRARY(trackchange MODULE ${libtrackchange_SRCS} ${libtrackchange_UIS_H} ${libtrackchange_RCC_SRCS})
 add_dependencies(trackchange qmmpui)
 target_link_libraries(trackchange ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS trackchange DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/udisks/CMakeLists.txt b/src/plugins/General/udisks/CMakeLists.txt
index 186c3ed5e..d62c54704 100644
--- a/src/plugins/General/udisks/CMakeLists.txt
+++ b/src/plugins/General/udisks/CMakeLists.txt
@@ -35,20 +35,10 @@ SET(libudisks_SRCS
     settingsdialog.cpp
 )
 
-SET(libudisks_MOC_HDRS
-    udisksfactory.h
-    udisksmanager.h
-    udisksplugin.h
-    udisksdevice.h
-    settingsdialog.h
-)
-
 SET(libudisks_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libudisks_RCC_SRCS ${libudisks_RCCS})
 
-QT4_WRAP_CPP(libudisks_MOC_SRCS ${libudisks_MOC_HDRS})
-
 # user interface
 
 SET(libudisks_UIS
@@ -60,7 +50,7 @@ QT4_WRAP_UI(libudisks_UIS_H ${libudisks_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(udisks MODULE ${libudisks_SRCS} ${libudisks_MOC_SRCS} ${libudisks_UIS_H} ${libudisks_RCC_SRCS})
+ADD_LIBRARY(udisks MODULE ${libudisks_SRCS} ${libudisks_UIS_H} ${libudisks_RCC_SRCS})
 add_dependencies(udisks qmmpui)
 target_link_libraries(udisks ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS udisks DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro
index c19fd5dc7..c6c906c29 100644
--- a/src/plugins/General/udisks/udisks.pro
+++ b/src/plugins/General/udisks/udisks.pro
@@ -11,22 +11,6 @@ QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/udisks_plugin_cs.ts \
-               translations/udisks_plugin_de.ts \
-               translations/udisks_plugin_zh_CN.ts \
-               translations/udisks_plugin_zh_TW.ts \
-               translations/udisks_plugin_ru.ts \
-               translations/udisks_plugin_pl.ts \
-               translations/udisks_plugin_uk_UA.ts \
-               translations/udisks_plugin_it.ts \
-               translations/udisks_plugin_tr.ts \
-               translations/udisks_plugin_lt.ts \
-               translations/udisks_plugin_nl.ts \
-               translations/udisks_plugin_ja.ts \
-               translations/udisks_plugin_es.ts \
-               translations/udisks_plugin_sr_BA.ts \
-               translations/udisks_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/General/udisks2/CMakeLists.txt b/src/plugins/General/udisks2/CMakeLists.txt
index fde34f804..b178936d1 100644
--- a/src/plugins/General/udisks2/CMakeLists.txt
+++ b/src/plugins/General/udisks2/CMakeLists.txt
@@ -35,20 +35,10 @@ SET(libudisks2_SRCS
     settingsdialog.cpp
 )
 
-SET(libudisks2_MOC_HDRS
-    udisks2factory.h
-    udisks2manager.h
-    udisks2plugin.h
-    udisks2device.h
-    settingsdialog.h
-)
-
 SET(libudisks2_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS})
 
-QT4_WRAP_CPP(libudisks2_MOC_SRCS ${libudisks2_MOC_HDRS})
-
 # user interface
 
 SET(libudisks2_UIS
@@ -60,7 +50,7 @@ QT4_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(udisks2 MODULE ${libudisks2_SRCS} ${libudisks2_MOC_SRCS} ${libudisks2_UIS_H} ${libudisks2_RCC_SRCS})
+ADD_LIBRARY(udisks2 MODULE ${libudisks2_SRCS} ${libudisks2_UIS_H} ${libudisks2_RCC_SRCS})
 add_dependencies(udisks2 qmmpui)
 target_link_libraries(udisks2 ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS udisks2 DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro
index 7c72fb4d8..7e76eb3f0 100644
--- a/src/plugins/General/udisks2/udisks2.pro
+++ b/src/plugins/General/udisks2/udisks2.pro
@@ -11,22 +11,6 @@ QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks2.so
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/udisks2_plugin_cs.ts \
-               translations/udisks2_plugin_de.ts \
-               translations/udisks2_plugin_zh_CN.ts \
-               translations/udisks2_plugin_zh_TW.ts \
-               translations/udisks2_plugin_ru.ts \
-               translations/udisks2_plugin_pl.ts \
-               translations/udisks2_plugin_uk_UA.ts \
-               translations/udisks2_plugin_it.ts \
-               translations/udisks2_plugin_tr.ts \
-               translations/udisks2_plugin_lt.ts \
-               translations/udisks2_plugin_nl.ts \
-               translations/udisks2_plugin_ja.ts \
-               translations/udisks2_plugin_es.ts \
-               translations/udisks2_plugin_sr_BA.ts \
-               translations/udisks2_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt
index 4daf39098..7238af106 100644
--- a/src/plugins/Input/aac/CMakeLists.txt
+++ b/src/plugins/Input/aac/CMakeLists.txt
@@ -74,23 +74,16 @@ SET(libaac_HDRS
   aacfile.h
 )
 
-SET(libaac_MOC_HDRS
-  decoderaacfactory.h
-  aacmetadatamodel.h
-)
-
 SET(libaac_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libaac_RCC_SRCS ${libaac_RCCS})
 
-QT4_WRAP_CPP(libaac_MOC_SRCS ${libaac_MOC_HDRS})
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FAAD_FOUND)
-ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_MOC_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS})
+ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS})
 add_dependencies(aac qmmp)
 target_link_libraries(aac ${QT_LIBRARIES} -lqmmp -lfaad ${TAGLIB_LDFLAGS})
 install(TARGETS aac DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/aac/aac.pro b/src/plugins/Input/aac/aac.pro
index 3dbabd407..b5759e714 100644
--- a/src/plugins/Input/aac/aac.pro
+++ b/src/plugins/Input/aac/aac.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decoderaacfactory.h \
     decoder_aac.h \
     aacfile.h \
@@ -21,21 +21,6 @@ LIBS += -lqmmp \
     -L/usr/lib \
     -I/usr/include
 PKGCONFIG += taglib
-TRANSLATIONS = translations/aac_plugin_ru.ts \
-    translations/aac_plugin_uk_UA.ts \
-    translations/aac_plugin_zh_CN.ts \
-    translations/aac_plugin_zh_TW.ts \
-    translations/aac_plugin_cs.ts \
-    translations/aac_plugin_pl.ts \
-    translations/aac_plugin_de.ts \
-    translations/aac_plugin_it.ts \
-    translations/aac_plugin_tr.ts \
-    translations/aac_plugin_lt.ts \
-    translations/aac_plugin_nl.ts \
-    translations/aac_plugin_ja.ts \
-    translations/aac_plugin_es.ts \
-    translations/aac_plugin_sr_BA.ts \
-    translations/aac_plugin_sr_RS.ts
 
 RESOURCES = translations/translations.qrc
 isEmpty(LIB_DIR):LIB_DIR = /lib
diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt
index 59733fde9..dccfc530b 100644
--- a/src/plugins/Input/cdaudio/CMakeLists.txt
+++ b/src/plugins/Input/cdaudio/CMakeLists.txt
@@ -38,17 +38,10 @@ SET(libcdaudio_HDRS
   decoder_cdaudio.h
 )
 
-SET(libcdaudio_MOC_HDRS
-  settingsdialog.h
-  decodercdaudiofactory.h
-)
-
 SET(libcdaudio_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libcdaudio_RCC_SRCS ${libcdaudio_RCCS})
 
-QT4_WRAP_CPP(libcdaudio_MOC_SRCS ${libcdaudio_MOC_HDRS})
-
 # user interface
 
 SET(libcdaudio_UIS
@@ -61,7 +54,7 @@ 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_UIS_H} ${libcdaudio_RCC_SRCS}
 ${libcdaudio_HDRS})
 add_dependencies(cdaudio qmmp)
 target_link_libraries(cdaudio ${QT_LIBRARIES} -lqmmp ${CDIO_LDFLAGS})
diff --git a/src/plugins/Input/cdaudio/cdaudio.pro b/src/plugins/Input/cdaudio/cdaudio.pro
index ec21e3ddf..903202edf 100644
--- a/src/plugins/Input/cdaudio/cdaudio.pro
+++ b/src/plugins/Input/cdaudio/cdaudio.pro
@@ -16,23 +16,6 @@ TEMPLATE = lib
 
 TARGET =$$PLUGINS_PREFIX/Input/cdaudio
 
-
-TRANSLATIONS = translations/cdaudio_plugin_ru.ts \
-               translations/cdaudio_plugin_uk_UA.ts \
-               translations/cdaudio_plugin_zh_CN.ts \
-               translations/cdaudio_plugin_zh_TW.ts \
-               translations/cdaudio_plugin_cs.ts \
-               translations/cdaudio_plugin_pl.ts \
-               translations/cdaudio_plugin_de.ts \
-               translations/cdaudio_plugin_it.ts \
-               translations/cdaudio_plugin_tr.ts \
-               translations/cdaudio_plugin_lt.ts \
-               translations/cdaudio_plugin_nl.ts \
-               translations/cdaudio_plugin_ja.ts \
-               translations/cdaudio_plugin_es.ts \
-               translations/cdaudio_plugin_sr_BA.ts \
-               translations/cdaudio_plugin_sr_RS.ts
- 
 RESOURCES = translations/translations.qrc
 
 
diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt
index 9d1463696..ba2e4fe02 100644
--- a/src/plugins/Input/cue/CMakeLists.txt
+++ b/src/plugins/Input/cue/CMakeLists.txt
@@ -46,18 +46,10 @@ SET(libcue_HDRS
   cueparser.h
 )
 
-SET(libcue_MOC_HDRS
-  decodercuefactory.h
-  settingsdialog.h
-  cuemetadatamodel.h
-)
-
 SET(libcue_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libcue_RCC_SRCS ${libcue_RCCS})
 
-QT4_WRAP_CPP(libcue_MOC_SRCS ${libcue_MOC_HDRS})
-
 # user interface
 
 
@@ -70,7 +62,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} ${libcue_HDRS})
+ADD_LIBRARY(cue MODULE ${libcue_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})
diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro
index c8f205eec..48fe2bda7 100644
--- a/src/plugins/Input/cue/cue.pro
+++ b/src/plugins/Input/cue/cue.pro
@@ -36,24 +36,8 @@ contains(CONFIG, WITH_ENCA){
 
 }
 
-TRANSLATIONS = translations/cue_plugin_ru.ts \
-    translations/cue_plugin_uk_UA.ts \
-    translations/cue_plugin_zh_CN.ts \
-    translations/cue_plugin_zh_TW.ts \
-    translations/cue_plugin_cs.ts \
-    translations/cue_plugin_pl.ts \
-    translations/cue_plugin_de.ts \
-    translations/cue_plugin_it.ts \
-    translations/cue_plugin_tr.ts \
-    translations/cue_plugin_lt.ts \
-    translations/cue_plugin_nl.ts \
-    translations/cue_plugin_ja.ts \
-    translations/cue_plugin_es.ts \
-    translations/cue_plugin_sr_BA.ts \
-    translations/cue_plugin_sr_RS.ts
-  
 RESOURCES = translations/translations.qrc
-unix { 
+unix {
     isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     desktop.files = qmmp_cue.desktop
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt
index b36645f98..615096abf 100644
--- a/src/plugins/Input/ffmpeg/CMakeLists.txt
+++ b/src/plugins/Input/ffmpeg/CMakeLists.txt
@@ -47,18 +47,10 @@ SET(libffmpeg_HDRS
   decoder_ffmpeg.h
 )
 
-SET(libffmpeg_MOC_HDRS
-  decoderffmpegfactory.h
-  ffmpegmetadatamodel.h
-  settingsdialog.h
-)
-
 SET(libffmpeg_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS})
 
-QT4_WRAP_CPP(libffmpeg_MOC_SRCS ${libffmpeg_MOC_HDRS})
-
 # user interface
 
 
@@ -72,7 +64,7 @@ QT4_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FFMPEG_FOUND)
-ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H}
+ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H}
   ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS})
 add_dependencies(ffmpeg qmmp)
 target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS})
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 41ed21a8f..3e4304d89 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -112,6 +112,7 @@ bool DecoderFFmpeg::initialize()
     ic = avformat_alloc_context();
 
     AVProbeData  pd;
+    memset(&pd, 0, sizeof(pd));
     uint8_t buf[PROBE_BUFFER_SIZE + AVPROBE_PADDING_SIZE];
     pd.filename = m_path.toLocal8Bit().constData();
     pd.buf_size = input()->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE);
diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro
index a1b0458d6..0897240ff 100644
--- a/src/plugins/Input/ffmpeg/ffmpeg.pro
+++ b/src/plugins/Input/ffmpeg/ffmpeg.pro
@@ -40,21 +40,4 @@ win32 {
 
 DEFINES += __STDC_CONSTANT_MACROS
 
-TRANSLATIONS = translations/ffmpeg_plugin_ru.ts \
-    translations/ffmpeg_plugin_uk_UA.ts \
-    translations/ffmpeg_plugin_zh_CN.ts \
-    translations/ffmpeg_plugin_zh_TW.ts \
-    translations/ffmpeg_plugin_cs.ts \
-    translations/ffmpeg_plugin_pl.ts \
-    translations/ffmpeg_plugin_de.ts \
-    translations/ffmpeg_plugin_it.ts \
-    translations/ffmpeg_plugin_tr.ts \
-    translations/ffmpeg_plugin_lt.ts \
-    translations/ffmpeg_plugin_nl.ts \
-    translations/ffmpeg_plugin_ja.ts \
-    translations/ffmpeg_plugin_es.ts \
-    translations/ffmpeg_plugin_sr_BA.ts \
-    translations/ffmpeg_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
-
diff --git a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt
index f480476dd..a6e295a41 100644
--- a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt
+++ b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt
@@ -53,18 +53,10 @@ SET(libffmpeg_HDRS
   decoder_ffmpeg.h
 )
 
-SET(libffmpeg_MOC_HDRS
-  decoderffmpegfactory.h
-  ffmpegmetadatamodel.h
-  settingsdialog.h
-)
-
 SET(libffmpeg_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS})
 
-QT4_WRAP_CPP(libffmpeg_MOC_SRCS ${libffmpeg_MOC_HDRS})
-
 # user interface
 
 
@@ -78,7 +70,7 @@ QT4_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FFMPEG_LEGACY_FOUND)
-ADD_LIBRARY(ffmpeg_legacy MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H}
+ADD_LIBRARY(ffmpeg_legacy MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H}
   ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS})
 add_dependencies(ffmpeg_legacy qmmp)
 target_link_libraries(ffmpeg_legacy ${QT_LIBRARIES} -lqmmp ${FFMPEG_LEGACY_LDFLAGS})
diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
index 6713487e1..1e92b1976 100644
--- a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
+++ b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
@@ -40,21 +40,5 @@ win32 {
 
 DEFINES += __STDC_CONSTANT_MACROS
 
-TRANSLATIONS = translations/ffmpeg_plugin_legacy_ru.ts \
-    translations/ffmpeg_plugin_legacy_uk_UA.ts \
-    translations/ffmpeg_plugin_legacy_zh_CN.ts \
-    translations/ffmpeg_plugin_legacy_zh_TW.ts \
-    translations/ffmpeg_plugin_legacy_cs.ts \
-    translations/ffmpeg_plugin_legacy_pl.ts \
-    translations/ffmpeg_plugin_legacy_de.ts \
-    translations/ffmpeg_plugin_legacy_it.ts \
-    translations/ffmpeg_plugin_legacy_tr.ts \
-    translations/ffmpeg_plugin_legacy_lt.ts \
-    translations/ffmpeg_plugin_legacy_nl.ts \
-    translations/ffmpeg_plugin_legacy_ja.ts \
-    translations/ffmpeg_plugin_legacy_es.ts \
-    translations/ffmpeg_plugin_legacy_sr_BA.ts \
-    translations/ffmpeg_plugin_legacy_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt
index 5fc0b81c8..5611d5325 100644
--- a/src/plugins/Input/flac/CMakeLists.txt
+++ b/src/plugins/Input/flac/CMakeLists.txt
@@ -52,23 +52,16 @@ SET(libflac_HDRS
   replaygainreader.h
 )
 
-SET(libflac_MOC_HDRS
-  decoderflacfactory.h
-  flacmetadatamodel.h
-)
-
 SET(libflac_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libflac_RCC_SRCS ${libflac_RCCS})
 
-QT4_WRAP_CPP(libflac_MOC_SRCS ${libflac_MOC_HDRS})
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FLAC_FOUND)
-ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_RCC_SRCS} ${libflac_HDRS})
+ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_RCC_SRCS} ${libflac_HDRS})
 add_dependencies(flac qmmp)
 target_link_libraries(flac ${QT_LIBRARIES} -lqmmp ${FLAC_LDFLAGS} ${TAGLIB_LDFLAGS})
 install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro
index 45a78077a..e412b1eb4 100644
--- a/src/plugins/Input/flac/flac.pro
+++ b/src/plugins/Input/flac/flac.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decoderflacfactory.h \
     decoder_flac.h \
     cueparser.h \
@@ -19,23 +19,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/flac_plugin_ru.ts \
-    translations/flac_plugin_uk_UA.ts \
-    translations/flac_plugin_zh_CN.ts \
-    translations/flac_plugin_zh_TW.ts \
-    translations/flac_plugin_cs.ts \
-    translations/flac_plugin_pl.ts \
-    translations/flac_plugin_de.ts \
-    translations/flac_plugin_it.ts \
-    translations/flac_plugin_tr.ts \
-    translations/flac_plugin_lt.ts \
-    translations/flac_plugin_nl.ts \
-    translations/flac_plugin_ja.ts \
-    translations/flac_plugin_es.ts \
-    translations/flac_plugin_sr_BA.ts \
-    translations/flac_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt
index fd871ca1b..b4aca13cf 100644
--- a/src/plugins/Input/gme/CMakeLists.txt
+++ b/src/plugins/Input/gme/CMakeLists.txt
@@ -49,22 +49,16 @@ SET(libgme_HDRS
   gmehelper.h
 )
 
-SET(libgme_MOC_HDRS
-  decodergmefactory.h 
-)
-
 SET(libgme_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libgme_RCC_SRCS ${libgme_RCCS})
 
-QT4_WRAP_CPP(libgme_MOC_SRCS ${libgme_MOC_HDRS})
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(GME_FOUND)
-ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_MOC_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS})
+ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS})
 add_dependencies(gme qmmp)
 target_link_libraries(gme ${QT_LIBRARIES} -lqmmp ${GME_LIB})
 install(TARGETS gme DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/gme/gme.pro b/src/plugins/Input/gme/gme.pro
index 668189ebc..76728e884 100644
--- a/src/plugins/Input/gme/gme.pro
+++ b/src/plugins/Input/gme/gme.pro
@@ -13,21 +13,6 @@ CONFIG += warn_on \
     plugin
 TEMPLATE = lib
 
-TRANSLATIONS = translations/gme_plugin_it.ts \
-               translations/gme_plugin_ru.ts \
-               translations/gme_plugin_cs.ts \
-               translations/gme_plugin_de.ts \
-               translations/gme_plugin_zh_CN.ts \
-               translations/gme_plugin_zh_TW.ts \
-               translations/gme_plugin_uk_UA.ts \
-               translations/gme_plugin_pl.ts \
-               translations/gme_plugin_tr.ts \
-               translations/gme_plugin_lt.ts \
-               translations/gme_plugin_nl.ts \
-               translations/gme_plugin_ja.ts \
-               translations/gme_plugin_sr_BA.ts \
-               translations/gme_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix{
diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt
index 7120face0..e44c74d75 100644
--- a/src/plugins/Input/mad/CMakeLists.txt
+++ b/src/plugins/Input/mad/CMakeLists.txt
@@ -48,18 +48,10 @@ SET(libmad_HDRS
   replaygainreader.h
 )
 
-SET(libmad_MOC_HDRS
-  settingsdialog.h
-  decodermadfactory.h
-  mpegmetadatamodel.h
-)
-
 SET(libmad_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libmad_RCC_SRCS ${libmad_RCCS})
 
-QT4_WRAP_CPP(libmad_MOC_SRCS ${libmad_MOC_HDRS})
-
 # user interface
 
 
@@ -73,7 +65,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} ${libmad_HDRS})
+ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS} ${libmad_HDRS})
 add_dependencies(mad qmmp)
 target_link_libraries(mad ${QT_LIBRARIES} -lqmmp ${MAD_LDFLAGS} ${TAGLIB_LDFLAGS})
 install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/mad/mad.pro b/src/plugins/Input/mad/mad.pro
index 74f902380..e7d9156db 100644
--- a/src/plugins/Input/mad/mad.pro
+++ b/src/plugins/Input/mad/mad.pro
@@ -21,26 +21,8 @@ CONFIG += warn_on \
     link_pkgconfig
 TEMPLATE = lib
 
-
-TRANSLATIONS = translations/mad_plugin_ru.ts \
-    translations/mad_plugin_uk_UA.ts \
-    translations/mad_plugin_zh_CN.ts \
-    translations/mad_plugin_zh_TW.ts \
-    translations/mad_plugin_cs.ts \
-    translations/mad_plugin_pl.ts \
-    translations/mad_plugin_de.ts \
-    translations/mad_plugin_it.ts \
-    translations/mad_plugin_tr.ts \
-    translations/mad_plugin_tr.ts \
-    translations/mad_plugin_lt.ts \
-    translations/mad_plugin_nl.ts \
-    translations/mad_plugin_ja.ts \
-    translations/mad_plugin_es.ts \
-    translations/mad_plugin_sr_BA.ts \
-    translations/mad_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
-unix { 
+unix {
     isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
diff --git a/src/plugins/Input/modplug/CMakeLists.txt b/src/plugins/Input/modplug/CMakeLists.txt
index cbc000843..bc38fee1e 100644
--- a/src/plugins/Input/modplug/CMakeLists.txt
+++ b/src/plugins/Input/modplug/CMakeLists.txt
@@ -58,20 +58,10 @@ SET(libmodplug_HDRS
   decoder_modplug.h
 )
 
-SET(libmodplug_MOC_HDRS
-  decodermodplugfactory.h
-  
-  modplugmetadatamodel.h
-  settingsdialog.h
-  archivereader.h
-)
-
 SET(libmodplug_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libmodplug_RCC_SRCS ${libmodplug_RCCS})
 
-QT4_WRAP_CPP(libmodplug_MOC_SRCS ${libmodplug_MOC_HDRS})
-
 # user interface
 
 SET(libmodplug_UIS
@@ -84,7 +74,7 @@ QT4_WRAP_UI(libmodplug_UIS_H ${libmodplug_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(MODPLUG_FOUND)
-ADD_LIBRARY(modplug MODULE ${libmodplug_SRCS} ${libmodplug_MOC_SRCS} ${libmodplug_UIS_H}
+ADD_LIBRARY(modplug MODULE ${libmodplug_SRCS} ${libmodplug_UIS_H}
   ${libmodplug_RCC_SRCS} ${libmodplug_HDRS})
 add_dependencies(modplug qmmp)
 target_link_libraries(modplug ${QT_LIBRARIES} -lqmmp ${MODPLUG_LDFLAGS})
diff --git a/src/plugins/Input/modplug/modplug.pro b/src/plugins/Input/modplug/modplug.pro
index 90a067a48..dc2d5a9bb 100644
--- a/src/plugins/Input/modplug/modplug.pro
+++ b/src/plugins/Input/modplug/modplug.pro
@@ -21,23 +21,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/modplug_plugin_cs.ts \
-    translations/modplug_plugin_de.ts \
-    translations/modplug_plugin_zh_CN.ts \
-    translations/modplug_plugin_zh_TW.ts \
-    translations/modplug_plugin_ru.ts \
-    translations/modplug_plugin_pl.ts \
-    translations/modplug_plugin_uk_UA.ts \
-    translations/modplug_plugin_it.ts \
-    translations/modplug_plugin_tr.ts \
-    translations/modplug_plugin_lt.ts \
-    translations/modplug_plugin_nl.ts \
-    translations/modplug_plugin_ja.ts \
-    translations/modplug_plugin_es.ts \
-    translations/modplug_plugin_sr_BA.ts \
-    translations/modplug_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt
index c8bdd0860..71b13b439 100644
--- a/src/plugins/Input/mpc/CMakeLists.txt
+++ b/src/plugins/Input/mpc/CMakeLists.txt
@@ -57,21 +57,14 @@ SET(libmpc_HDRS
   decoder_mpc.h
 )
 
-SET(libmpc_MOC_HDRS
-  decodermpcfactory.h
-  mpcmetadatamodel.h
-)
-
 SET(libmpc_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libmpc_RCC_SRCS ${libmpc_RCCS})
 
-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} ${libmpc_HDRS})
+ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_RCC_SRCS} ${libmpc_HDRS})
 add_dependencies(mpc qmmp)
 target_link_libraries(mpc ${QT_LIBRARIES} -lqmmp ${MPC_LIB} ${TAGLIB_LDFLAGS})
 install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro
index 41ef3d4c6..93ed9df2c 100644
--- a/src/plugins/Input/mpc/mpc.pro
+++ b/src/plugins/Input/mpc/mpc.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decodermpcfactory.h \
     decoder_mpc.h \
     mpcmetadatamodel.h
@@ -15,22 +15,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/mpc_plugin_ru.ts \
-    translations/mpc_plugin_uk_UA.ts \
-    translations/mpc_plugin_zh_CN.ts \
-    translations/mpc_plugin_zh_TW.ts \
-    translations/mpc_plugin_cs.ts \
-    translations/mpc_plugin_pl.ts \
-    translations/mpc_plugin_de.ts \
-    translations/mpc_plugin_it.ts \
-    translations/mpc_plugin_tr.ts \
-    translations/mpc_plugin_lt.ts \
-    translations/mpc_plugin_nl.ts \
-    translations/mpc_plugin_ja.ts \
-    translations/mpc_plugin_es.ts \
-    translations/mpc_plugin_sr_BA.ts \
-    translations/mpc_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 unix {
     isEmpty(LIB_DIR):LIB_DIR = /lib
diff --git a/src/plugins/Input/opus/CMakeLists.txt b/src/plugins/Input/opus/CMakeLists.txt
index a34b087b1..ac4b72d6a 100644
--- a/src/plugins/Input/opus/CMakeLists.txt
+++ b/src/plugins/Input/opus/CMakeLists.txt
@@ -50,17 +50,10 @@ SET(libopus_HDRS
   tdebug.h
 )
 
-SET(libopus_MOC_HDRS
-  decoderopusfactory.h
-  opusmetadatamodel.h
-)
-
 SET(libopus_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libopus_RCC_SRCS ${libopus_RCCS})
 
-QT4_WRAP_CPP(libopus_MOC_SRCS ${libopus_MOC_HDRS})
-
 # user interface
 
 QT4_WRAP_UI(libopus_UIS_H ${libopus_UIS})
@@ -69,7 +62,7 @@ QT4_WRAP_UI(libopus_UIS_H ${libopus_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(OPUS_FOUND)
-ADD_LIBRARY(opus MODULE ${libopus_SRCS} ${libopus_MOC_SRCS} ${libopus_RCC_SRCS} ${libopus_HDRS})
+ADD_LIBRARY(opus MODULE ${libopus_SRCS} ${libopus_RCC_SRCS} ${libopus_HDRS})
 add_dependencies(opus qmmp)
 target_link_libraries(opus ${QT_LIBRARIES} -lqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS})
 install(TARGETS opus DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/opus/opus.pro b/src/plugins/Input/opus/opus.pro
index 911606ee0..3276e6f7b 100644
--- a/src/plugins/Input/opus/opus.pro
+++ b/src/plugins/Input/opus/opus.pro
@@ -23,23 +23,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/opus_plugin_ru.ts \
-    translations/opus_plugin_uk_UA.ts \
-    translations/opus_plugin_zh_CN.ts \
-    translations/opus_plugin_zh_TW.ts \
-    translations/opus_plugin_cs.ts \
-    translations/opus_plugin_pl.ts \
-    translations/opus_plugin_de.ts \
-    translations/opus_plugin_it.ts \
-    translations/opus_plugin_tr.ts \
-    translations/opus_plugin_lt.ts \
-    translations/opus_plugin_nl.ts \
-    translations/opus_plugin_ja.ts \
-    translations/opus_plugin_es.ts \
-    translations/opus_plugin_sr_BA.ts \
-    translations/opus_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 
diff --git a/src/plugins/Input/sid/CMakeLists.txt b/src/plugins/Input/sid/CMakeLists.txt
index 2fd786dc9..db662630f 100644
--- a/src/plugins/Input/sid/CMakeLists.txt
+++ b/src/plugins/Input/sid/CMakeLists.txt
@@ -46,17 +46,10 @@ SET(libsid_HDRS
   sidhelper.h
 )
 
-SET(libsid_MOC_HDRS
-  decodersidfactory.h
-  settingsdialog.h
-)
-
 SET(libsid_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libsid_RCC_SRCS ${libsid_RCCS})
 
-QT4_WRAP_CPP(libsid_MOC_SRCS ${libsid_MOC_HDRS})
-
 # user interface
 
 SET(libsid_UIS
@@ -69,7 +62,7 @@ QT4_WRAP_UI(libsid_UIS_H ${libsid_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(SIDPLAYFP_FOUND)
-ADD_LIBRARY(sid MODULE ${libsid_SRCS} ${libsid_MOC_SRCS} ${libsid_UIS_H}
+ADD_LIBRARY(sid MODULE ${libsid_SRCS} ${libsid_UIS_H}
   ${libsid_RCC_SRCS} ${libsid_HDRS})
 add_dependencies(sid qmmp)
 target_link_libraries(sid ${QT_LIBRARIES} -lqmmp ${SIDPLAYFP_LDFLAGS})
diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt
index 4e96aca36..30467ce26 100644
--- a/src/plugins/Input/sndfile/CMakeLists.txt
+++ b/src/plugins/Input/sndfile/CMakeLists.txt
@@ -41,23 +41,16 @@ SET(libsndfile_HDRS
   decoder_sndfile.h
 )
 
-SET(libsndfile_MOC_HDRS
-  decodersndfilefactory.h
-)
-
 SET(libsndfile_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libsndfile_RCC_SRCS ${libsndfile_RCCS})
 
-QT4_WRAP_CPP(libsndfile_MOC_SRCS ${libsndfile_MOC_HDRS})
-
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(SNDFILE_FOUND)
-ADD_LIBRARY(sndfile MODULE ${libsndfile_SRCS} ${libsndfile_MOC_SRCS} ${libsndfile_UIS_H}
+ADD_LIBRARY(sndfile MODULE ${libsndfile_SRCS} ${libsndfile_UIS_H}
   ${libsndfile_RCC_SRCS} ${libsndfile_HDRS})
 add_dependencies(sndfile qmmp)
 target_link_libraries(sndfile ${QT_LIBRARIES} -lqmmp ${SNDFILE_LDFLAGS})
diff --git a/src/plugins/Input/sndfile/sndfile.pro b/src/plugins/Input/sndfile/sndfile.pro
index 6aa7ed26f..c583386e5 100644
--- a/src/plugins/Input/sndfile/sndfile.pro
+++ b/src/plugins/Input/sndfile/sndfile.pro
@@ -1,7 +1,7 @@
 include(../../plugins.pri)
 
 HEADERS += decodersndfilefactory.h \
-           decoder_sndfile.h 
+           decoder_sndfile.h
 SOURCES += decoder_sndfile.cpp \
            decodersndfilefactory.cpp
 
@@ -17,23 +17,6 @@ TEMPLATE = lib
 
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/sndfile_plugin_cs.ts \
-               translations/sndfile_plugin_de.ts \
-               translations/sndfile_plugin_zh_CN.ts \
-               translations/sndfile_plugin_zh_TW.ts \
-               translations/sndfile_plugin_ru.ts \
-               translations/sndfile_plugin_pl.ts \
-               translations/sndfile_plugin_uk_UA.ts \
-               translations/sndfile_plugin_it.ts \
-               translations/sndfile_plugin_tr.ts \
-               translations/sndfile_plugin_lt.ts \
-               translations/sndfile_plugin_nl.ts \
-               translations/sndfile_plugin_ja.ts \
-               translations/sndfile_plugin_es.ts \
-               translations/sndfile_plugin_sr_BA.ts \
-               translations/sndfile_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt
index c3ae5fe4d..009decbee 100644
--- a/src/plugins/Input/vorbis/CMakeLists.txt
+++ b/src/plugins/Input/vorbis/CMakeLists.txt
@@ -44,17 +44,10 @@ SET(libvorbis_HDRS
   replaygainreader.h
 )
 
-SET(libvorbis_MOC_HDRS
-  decodervorbisfactory.h
-  vorbismetadatamodel.h
-)
-
 SET(libvorbis_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libvorbis_RCC_SRCS ${libvorbis_RCCS})
 
-QT4_WRAP_CPP(libvorbis_MOC_SRCS ${libvorbis_MOC_HDRS})
-
 # user interface
 
 QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS})
@@ -63,7 +56,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} ${libvorbis_HDRS})
+ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_RCC_SRCS} ${libvorbis_HDRS})
 add_dependencies(vorbis qmmp)
 target_link_libraries(vorbis ${QT_LIBRARIES} -lqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS})
 install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index 00255ec8d..1e841171c 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decodervorbisfactory.h \
     decoder_vorbis.h \
     vorbismetadatamodel.h \
@@ -17,23 +17,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/vorbis_plugin_ru.ts \
-    translations/vorbis_plugin_uk_UA.ts \
-    translations/vorbis_plugin_zh_CN.ts \
-    translations/vorbis_plugin_zh_TW.ts \
-    translations/vorbis_plugin_cs.ts \
-    translations/vorbis_plugin_pl.ts \
-    translations/vorbis_plugin_de.ts \
-    translations/vorbis_plugin_it.ts \
-    translations/vorbis_plugin_tr.ts \
-    translations/vorbis_plugin_lt.ts \
-    translations/vorbis_plugin_nl.ts \
-    translations/vorbis_plugin_ja.ts \
-    translations/vorbis_plugin_es.ts \
-    translations/vorbis_plugin_sr_BA.ts \
-    translations/vorbis_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt
index 2ef6f2465..55c1dc464 100644
--- a/src/plugins/Input/wavpack/CMakeLists.txt
+++ b/src/plugins/Input/wavpack/CMakeLists.txt
@@ -46,21 +46,14 @@ SET(libwavpack_HDRS
   replaygainreader.h
 )
 
-SET(libwavpack_MOC_HDRS
-  decoderwavpackfactory.h
-  wavpackmetadatamodel.h
-)
-
 SET(libwavpack_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libwavpack_RCC_SRCS ${libwavpack_RCCS})
 
-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} ${libwavpack_HDRS})
+ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_RCC_SRCS} ${libwavpack_HDRS})
 add_dependencies(wavpack qmmp)
 target_link_libraries(wavpack ${QT_LIBRARIES} -lqmmp ${WAVPACK_LDFLAGS})
 install(TARGETS wavpack DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/wavpack/wavpack.pro b/src/plugins/Input/wavpack/wavpack.pro
index 37d8b9f9c..b8b4b28b9 100644
--- a/src/plugins/Input/wavpack/wavpack.pro
+++ b/src/plugins/Input/wavpack/wavpack.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decoderwavpackfactory.h \
     decoder_wavpack.h \
     cueparser.h \
@@ -19,23 +19,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/wavpack_plugin_cs.ts \
-    translations/wavpack_plugin_de.ts \
-    translations/wavpack_plugin_zh_CN.ts \
-    translations/wavpack_plugin_zh_TW.ts \
-    translations/wavpack_plugin_ru.ts \
-    translations/wavpack_plugin_pl.ts \
-    translations/wavpack_plugin_uk_UA.ts \
-    translations/wavpack_plugin_it.ts \
-    translations/wavpack_plugin_tr.ts \
-    translations/wavpack_plugin_lt.ts \
-    translations/wavpack_plugin_nl.ts \
-    translations/wavpack_plugin_ja.ts \
-    translations/wavpack_plugin_es.ts \
-    translations/wavpack_plugin_sr_BA.ts \
-    translations/wavpack_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt
index a99a958fe..f24e9862f 100644
--- a/src/plugins/Input/wildmidi/CMakeLists.txt
+++ b/src/plugins/Input/wildmidi/CMakeLists.txt
@@ -40,13 +40,6 @@ SET(libwildmidi_HDRS
   decoder_wildmidi.h
 )
 
-SET(libwildmidi_MOC_HDRS
-  
-  decoderwildmidifactory.h
-  settingsdialog.h
-  wildmidihelper.h
-)
-
 # libwildmidi
 CHECK_INCLUDE_FILE(wildmidi_lib.h WILDMIDI_HEADER_FOUND)
 FIND_LIBRARY(WILDMIDI_LIB NAME WildMidi PATHS /usr/lib /usr/lib32  /usr/local/lib /usr/local/lib32)
@@ -62,8 +55,6 @@ SET(libwildmidi_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libwildmidi_RCC_SRCS ${libwildmidi_RCCS})
 
-QT4_WRAP_CPP(libwildmidi_MOC_SRCS ${libwildmidi_MOC_HDRS})
-
 # user interface
 
 
@@ -77,7 +68,7 @@ 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_UIS_H} ${libwildmidi_RCC_SRCS}
 ${libwildmidi_HDRS})
 add_dependencies(wildmidi qmmp)
 target_link_libraries(wildmidi ${QT_LIBRARIES} -lqmmp ${WILDMIDI_LIB})
diff --git a/src/plugins/Input/wildmidi/wildmidi.pro b/src/plugins/Input/wildmidi/wildmidi.pro
index 1f4819946..566489524 100644
--- a/src/plugins/Input/wildmidi/wildmidi.pro
+++ b/src/plugins/Input/wildmidi/wildmidi.pro
@@ -19,20 +19,6 @@ LIBS += -lqmmp \
     -L/usr/lib \
     -I/usr/include \
     -lWildMidi
-TRANSLATIONS = translations/wildmidi_plugin_it.ts \
-               translations/wildmidi_plugin_ru.ts \
-               translations/wildmidi_plugin_cs.ts \
-               translations/wildmidi_plugin_de.ts \
-               translations/wildmidi_plugin_zh_CN.ts \
-               translations/wildmidi_plugin_zh_TW.ts \
-               translations/wildmidi_plugin_uk_UA.ts \
-               translations/wildmidi_plugin_pl.ts \
-               translations/wildmidi_plugin_tr.ts \
-               translations/wildmidi_plugin_lt.ts \
-               translations/wildmidi_plugin_nl.ts \
-               translations/wildmidi_plugin_ja.ts \
-               translations/wildmidi_plugin_sr_BA.ts \
-               translations/wildmidi_plugin_sr_RS.ts
 
 RESOURCES = translations/translations.qrc
 isEmpty (LIB_DIR):LIB_DIR = /lib
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){
diff --git a/src/plugins/PlayListFormats/m3u/CMakeLists.txt b/src/plugins/PlayListFormats/m3u/CMakeLists.txt
index cbed694fe..f40c5d5b1 100644
--- a/src/plugins/PlayListFormats/m3u/CMakeLists.txt
+++ b/src/plugins/PlayListFormats/m3u/CMakeLists.txt
@@ -30,20 +30,13 @@ SET(libm3uplaylistformat_SRCS
     m3uplaylistformat.cpp
 )
 
-SET(libm3uplaylistformat_MOC_HDRS
-    m3uplaylistformat.h
-)
-
 QT4_ADD_RESOURCES(libm3uplaylistformat_RCC_SRCS ${libm3uplaylistformat_RCCS})
 
-QT4_WRAP_CPP(libm3uplaylistformat_MOC_SRCS ${libm3uplaylistformat_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(m3uplaylistformat MODULE ${libm3uplaylistformat_SRCS} ${libm3uplaylistformat_MOC_SRCS})
+ADD_LIBRARY(m3uplaylistformat MODULE ${libm3uplaylistformat_SRCS})
 add_dependencies(m3uplaylistformat qmmpui)
 target_link_libraries(m3uplaylistformat ${QT_LIBRARIES} -lqmmpui)
 install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats)
diff --git a/src/plugins/PlayListFormats/pls/CMakeLists.txt b/src/plugins/PlayListFormats/pls/CMakeLists.txt
index 4e221e436..f22d1d33e 100644
--- a/src/plugins/PlayListFormats/pls/CMakeLists.txt
+++ b/src/plugins/PlayListFormats/pls/CMakeLists.txt
@@ -30,20 +30,13 @@ SET(libplsplaylistformat_SRCS
     plsplaylistformat.cpp
 )
 
-SET(libplsplaylistformat_MOC_HDRS
-    plsplaylistformat.h
-)
-
 QT4_ADD_RESOURCES(libplsplaylistformat_RCC_SRCS ${libplsplaylistformat_RCCS})
 
-QT4_WRAP_CPP(libplsplaylistformat_MOC_SRCS ${libplsplaylistformat_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(plsplaylistformat MODULE ${libplsplaylistformat_SRCS} ${libplsplaylistformat_MOC_SRCS})
+ADD_LIBRARY(plsplaylistformat MODULE ${libplsplaylistformat_SRCS})
 add_dependencies(plsplaylistformat qmmpui)
 target_link_libraries(plsplaylistformat ${QT_LIBRARIES} -lqmmpui)
 install(TARGETS plsplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats)
diff --git a/src/plugins/PlayListFormats/xspf/CMakeLists.txt b/src/plugins/PlayListFormats/xspf/CMakeLists.txt
index a0779a562..60635e7d8 100644
--- a/src/plugins/PlayListFormats/xspf/CMakeLists.txt
+++ b/src/plugins/PlayListFormats/xspf/CMakeLists.txt
@@ -30,20 +30,13 @@ SET(libxspfplaylistformat_SRCS
     xspfplaylistformat.cpp
 )
 
-SET(libxspfplaylistformat_MOC_HDRS
-    xspfplaylistformat.h
-)
-
 QT4_ADD_RESOURCES(libxspfplaylistformat_RCC_SRCS ${libxspfplaylistformat_RCCS})
 
-QT4_WRAP_CPP(libxspfplaylistformat_MOC_SRCS ${libxspfplaylistformat_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(xspfplaylistformat MODULE ${libxspfplaylistformat_SRCS} ${libxspfplaylistformat_MOC_SRCS})
+ADD_LIBRARY(xspfplaylistformat MODULE ${libxspfplaylistformat_SRCS})
 add_dependencies(xspfplaylistformat qmmpui)
 target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats)
diff --git a/src/plugins/Transports/http/CMakeLists.txt b/src/plugins/Transports/http/CMakeLists.txt
index c310990a0..793dde428 100644
--- a/src/plugins/Transports/http/CMakeLists.txt
+++ b/src/plugins/Transports/http/CMakeLists.txt
@@ -46,13 +46,6 @@ SET(libhttp_SRCS
     settingsdialog.cpp
 )
 
-SET(libhttp_MOC_HDRS
-    httpinputfactory.h
-    httpinputsource.h
-    httpstreamreader.h
-    settingsdialog.h
-)
-
 # resources
 SET(libhttp_RCCS translations/translations.qrc)
 QT4_ADD_RESOURCES(libhttp_RCC_SRCS ${libhttp_RCCS})
@@ -64,15 +57,12 @@ SET(libhttp_UIS
 QT4_WRAP_UI(libhttp_UIS_H ${libhttp_UIS})
 
 
-
-QT4_WRAP_CPP(libhttp_MOC_SRCS ${libhttp_MOC_HDRS})
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(CURL_FOUND)
-ADD_LIBRARY(http MODULE ${libhttp_SRCS} ${libhttp_MOC_SRCS} ${libhttp_UIS_H} ${libhttp_RCC_SRCS})
+ADD_LIBRARY(http MODULE ${libhttp_SRCS} ${libhttp_UIS_H} ${libhttp_RCC_SRCS})
 
 IF(USE_ENCA AND ENCA_FOUND)
 target_link_libraries(http ${QT_LIBRARIES} -lqmmp ${CURL_LDFLAGS} ${CURL_CFLAGS} ${ENCA_LDFLAGS} ${ENCA_CFLAGS})
diff --git a/src/plugins/Transports/http/http.pro b/src/plugins/Transports/http/http.pro
index f12d0b0b2..c844c52ce 100644
--- a/src/plugins/Transports/http/http.pro
+++ b/src/plugins/Transports/http/http.pro
@@ -18,7 +18,7 @@ CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-unix { 
+unix {
     QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp \
         -L/usr/lib
@@ -27,7 +27,7 @@ unix {
     target.path = $$LIB_DIR/qmmp/Transports
     INSTALLS += target
 }
-win32 { 
+win32 {
     QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 \
         -lcurldll
@@ -43,20 +43,4 @@ contains(CONFIG, WITH_ENCA){
 
 FORMS += settingsdialog.ui
 
-TRANSLATIONS = translations/http_plugin_ru.ts \
-    translations/http_plugin_uk_UA.ts \
-    translations/http_plugin_zh_CN.ts \
-    translations/http_plugin_zh_TW.ts \
-    translations/http_plugin_cs.ts \
-    translations/http_plugin_pl.ts \
-    translations/http_plugin_de.ts \
-    translations/http_plugin_it.ts \
-    translations/http_plugin_tr.ts \
-    translations/http_plugin_lt.ts \
-    translations/http_plugin_nl.ts \
-    translations/http_plugin_ja.ts \
-    translations/http_plugin_es.ts \
-    translations/http_plugin_sr_BA.ts \
-    translations/http_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
diff --git a/src/plugins/Transports/mms/CMakeLists.txt b/src/plugins/Transports/mms/CMakeLists.txt
index 3a1ec888a..b5c365548 100644
--- a/src/plugins/Transports/mms/CMakeLists.txt
+++ b/src/plugins/Transports/mms/CMakeLists.txt
@@ -40,13 +40,6 @@ SET(libmms_SRCS
     settingsdialog.cpp
 )
 
-SET(libmms_MOC_HDRS
-    mmsinputfactory.h
-    mmsinputsource.h
-    mmsstreamreader.h
-    settingsdialog.h
-)
-
 # resources
 SET(libmms_RCCS translations/translations.qrc)
 QT4_ADD_RESOURCES(libmms_RCC_SRCS ${libmms_RCCS})
@@ -58,14 +51,11 @@ SET(libmms_UIS
 QT4_WRAP_UI(libmms_UIS_H ${libmms_UIS})
 
 
-
-QT4_WRAP_CPP(libmms_MOC_SRCS ${libmms_MOC_HDRS})
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 IF(MMS_FOUND)
-ADD_LIBRARY(mms MODULE ${libmms_SRCS} ${libmms_MOC_SRCS} ${libmms_UIS_H} ${libmms_RCC_SRCS})
+ADD_LIBRARY(mms MODULE ${libmms_SRCS} ${libmms_UIS_H} ${libmms_RCC_SRCS})
 target_link_libraries(mms ${QT_LIBRARIES} -lqmmp ${MMS_LDFLAGS})
 add_dependencies(mms qmmp)
 install(TARGETS mms DESTINATION ${LIB_DIR}/qmmp/Transports)
diff --git a/src/plugins/Transports/mms/mms.pro b/src/plugins/Transports/mms/mms.pro
index 9354a7eec..bf1cd1b92 100644
--- a/src/plugins/Transports/mms/mms.pro
+++ b/src/plugins/Transports/mms/mms.pro
@@ -18,7 +18,7 @@ CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
- 
+
 QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp -L/usr/lib
 PKGCONFIG += libmms
@@ -26,24 +26,6 @@ isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Transports
 INSTALLS += target
 
-
 FORMS += settingsdialog.ui
 
-TRANSLATIONS = translations/mms_plugin_ru.ts \
-    translations/mms_plugin_uk_UA.ts \
-    translations/mms_plugin_zh_CN.ts \
-    translations/mms_plugin_zh_TW.ts \
-    translations/mms_plugin_cs.ts \
-    translations/mms_plugin_pl.ts \
-    translations/mms_plugin_de.ts \
-    translations/mms_plugin_it.ts \
-    translations/mms_plugin_tr.ts \
-    translations/mms_plugin_lt.ts \
-    translations/mms_plugin_nl.ts \
-    translations/mms_plugin_ja.ts \
-    translations/mms_plugin_es.ts \
-    translations/mms_plugin_sr_BA.ts \
-    translations/mms_plugin_sr_RS.ts
-
-
 RESOURCES = translations/translations.qrc
diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt
index a052d39f3..698a0adee 100644
--- a/src/plugins/Ui/skinned/CMakeLists.txt
+++ b/src/plugins/Ui/skinned/CMakeLists.txt
@@ -94,58 +94,10 @@ SET(skinned_HDRS
     shortcutitem.h
 )
 
-SET(skinned_MOC_HDRS
-    balancebar.h
-    button.h
-    skinnedsettings.h
-    display.h
-    dock.h
-    eqgraph.h
-    eqslider.h
-    eqtitlebar.h
-    eqwidget.h
-    listwidget.h
-    mainvisual.h
-    mainwindow.h
-    monostereo.h
-    number.h
-    pixmapwidget.h
-    playlistcontrol.h
-    playlist.h
-    playlistslider.h
-    playlisttitlebar.h
-    playstatus.h
-    positionbar.h
-    preseteditor.h
-    shadedbar.h
-    shadedvisual.h
-    skin.h
-    skinreader.h
-    symboldisplay.h
-    textscroller.h
-    timeindicator.h
-    titlebarcontrol.h
-    titlebar.h
-    togglebutton.h
-    visualmenu.h
-    volumebar.h
-    playlistbrowser.h
-    playlistselector.h
-    popupwidget.h
-    popupsettings.h
-    actionmanager.h
-    shortcutdialog.h
-    skinnedfactory.h
-    hotkeyeditor.h
-)
-
 SET(skinned_RCCS default/default.qrc resources/resources.qrc translations/translations.qrc)
 
 QT4_ADD_RESOURCES(skinned_RCC_SRCS ${skinned_RCCS})
 
-QT4_AUTOMOC(${skinned_MOC_SRC})
-QT4_WRAP_CPP(skinned_MOC_SRCS ${skinned_MOC_HDRS})
-
 # user interface
 
 SET(skinned_UIS
@@ -163,7 +115,7 @@ QT4_WRAP_UI(skinned_UIS_H ${skinned_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(X11_FOUND)
-ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_MOC_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS})
+ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS})
 target_link_libraries(skinned ${QT_LIBRARIES} libqmmp qmmpui ${X11_LDFLAGS})
 add_dependencies(skinned qmmpui libqmmp)
 target_link_libraries(skinned ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS})
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index c324eda66..0f6c9bf89 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -333,21 +333,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e)
 
         if ((Qt::ShiftModifier & e->modifiers()))
         {
-            bool select = true;
-            if (m_pressed_index > m_anchor_index)
-            {
-                for (int j = m_anchor_index;j <= m_pressed_index;j++)
-                {
-                    m_model->setSelected(j, select);
-                }
-            }
-            else
-            {
-                for (int j = m_anchor_index;j >= m_pressed_index;j--)
-                {
-                    m_model->setSelected(j, select);
-                }
-            }
+            m_model->setSelected(m_pressed_index, m_anchor_index, true);
             m_anchor_index = m_pressed_index;
         }
         else //ShiftModifier released
@@ -516,7 +502,7 @@ void ListWidget::setModel(PlayListModel *selected, PlayListModel *previous)
     recenterCurrent();
     updateList();
     connect (m_model, SIGNAL(currentChanged()), SLOT(recenterCurrent()));
-    connect (m_model, SIGNAL(listChanged()), SLOT(updateList()));
+    connect (m_model, SIGNAL(listChanged(int)), SLOT(updateList()));
 }
 
 void ListWidget::scroll(int sc)
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp
index 8496903cc..e7c1f266b 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.cpp
+++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp
@@ -204,7 +204,7 @@ void PlayListTitleBar::setModel(PlayListModel *selected, PlayListModel *previous
     if(previous)
         disconnect(previous, 0, this, 0); //disconnect previous model
     m_model = selected;
-    connect (m_model, SIGNAL(listChanged()), SLOT(showCurrent()));
+    connect (m_model, SIGNAL(listChanged(int)), SLOT(showCurrent()));
     showCurrent();
 }
 
@@ -212,7 +212,7 @@ void PlayListTitleBar::readSettings()
 {
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     m_font.fromString(settings.value("Skinned/pl_font", QApplication::font().toString()).toString());
-    m_font.setPointSize(8);
+    m_font.setPointSize(6);
 }
 
 void PlayListTitleBar::updateSkin()
diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index 7f42b6f89..4223dc6b4 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -718,7 +718,7 @@ void Skin::loadVolume()
 
     m_volume.clear();
     for (int i = 0; i < 28; ++i)
-        m_volume.append(pixmap->copy (0,i*15, pixmap->width(),13));
+        m_volume.append(pixmap->copy (0,i*15, qMin(pixmap->width(), 68), 13));
     if (pixmap->height() > 425)
     {
         buttons [BT_VOL_N] = pixmap->copy (15,422,14, pixmap->height() - 422);
diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro
index 58b7c75f4..f1ab2f846 100644
--- a/src/plugins/Ui/skinned/skinned.pro
+++ b/src/plugins/Ui/skinned/skinned.pro
@@ -136,21 +136,3 @@ PKGCONFIG += x11
 INCLUDEPATH += ../../../
 
 RESOURCES += translations/translations.qrc
-TRANSLATIONS = translations/skinned_plugin_ru.ts \
-    translations/skinned_plugin_tr.ts \
-    translations/skinned_plugin_zh_CN.ts \
-    translations/skinned_plugin_cs.ts \
-    translations/skinned_plugin_pt_BR.ts \
-    translations/skinned_plugin_uk_UA.ts \
-    translations/skinned_plugin_zh_TW.ts \
-    translations/skinned_plugin_de.ts \
-    translations/skinned_plugin_pl_PL.ts \
-    translations/skinned_plugin_it.ts \
-    translations/skinned_plugin_lt.ts \
-    translations/skinned_plugin_hu.ts \
-    translations/skinned_plugin_nl.ts \
-    translations/skinned_plugin_ja.ts \
-    translations/skinned_plugin_es.ts \
-    translations/skinned_plugin_sk.ts \
-    translations/skinned_plugin_sr_BA.ts \
-    translations/skinned_plugin_sr_RS.ts
diff --git a/src/plugins/Visual/analyzer/CMakeLists.txt b/src/plugins/Visual/analyzer/CMakeLists.txt
index 5a363b2fc..c9de44a21 100644
--- a/src/plugins/Visual/analyzer/CMakeLists.txt
+++ b/src/plugins/Visual/analyzer/CMakeLists.txt
@@ -38,19 +38,10 @@ SET(libanalyzer_HDRS
    fft.h
 )
 
-SET(libanalyzer_MOC_HDRS
-    analyzer.h
-    colorwidget.h
-    settingsdialog.h
-    visualanalyzerfactory.h
-)
-
 SET(libanalyzer_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libanalyzer_RCC_SRCS ${libanalyzer_RCCS})
 
-QT4_WRAP_CPP(libanalyzer_MOC_SRCS ${libanalyzer_MOC_HDRS})
-
 # user interface
 
 
@@ -63,7 +54,7 @@ QT4_WRAP_UI(libanalyzer_UIS_H ${libanalyzer_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(analyzer MODULE ${libanalyzer_SRCS} ${libanalyzer_MOC_SRCS} ${libanalyzer_UIS_H}
+ADD_LIBRARY(analyzer MODULE ${libanalyzer_SRCS} ${libanalyzer_UIS_H}
   ${libanalyzer_RCC_SRCS} ${libanalyzer_HDRS})
 add_dependencies(analyzer qmmp)
 target_link_libraries(analyzer ${QT_LIBRARIES} -lqmmp)
diff --git a/src/plugins/Visual/projectm/CMakeLists.txt b/src/plugins/Visual/projectm/CMakeLists.txt
index 0d698f232..4afdfd25e 100644
--- a/src/plugins/Visual/projectm/CMakeLists.txt
+++ b/src/plugins/Visual/projectm/CMakeLists.txt
@@ -54,25 +54,15 @@ SET(libprojectm_SRCS
     projectmwrapper.cpp
 )
 
-SET(libprojectm_MOC_HDRS
-    projectmwidget.h
-    projectmplugin.h
-    visualprojectmfactory.h
-    projectmwrapper.h
-)
-
 SET(libprojectm_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libprojectm_RCC_SRCS ${libprojectm_RCCS})
 
-QT4_WRAP_CPP(libprojectm_MOC_SRCS ${libprojectm_MOC_HDRS})
-
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 IF(PROJECTM_FOUND)
-ADD_LIBRARY(projectm MODULE ${libprojectm_SRCS} ${libprojectm_MOC_SRCS} ${libprojectm_RCC_SRCS})
+ADD_LIBRARY(projectm MODULE ${libprojectm_SRCS} ${libprojectm_RCC_SRCS})
 add_dependencies(projectm qmmp)
 target_link_libraries(projectm ${QT_LIBRARIES} -lqmmp ${PROJECTM_LDFLAGS} -lGL)
 install(TARGETS projectm DESTINATION ${LIB_DIR}/qmmp/Visual)
author	trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>	2015-01-09 12:01:22 +0000
committer	trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>	2015-01-09 12:01:22 +0000
commit	ebd7f9bc697973366de8a6bf7265051e825e0680 (patch)
tree	1feb9df1c5fe3493e9aa1dd8f5d6233a38ae9d3c /src/plugins
parent	bc7ad688c646afd2a89e5c5ff58696f2df2c8605 (diff)
download	qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.gz qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.bz2 qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.zip