renaming experimental branch

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

39 files changed, 44 insertions, 432 deletions

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){