diff --git a/devices/audiocddevice.cpp b/devices/audiocddevice.cpp index eaf16f392..be0788eb6 100644 --- a/devices/audiocddevice.cpp +++ b/devices/audiocddevice.cpp @@ -29,6 +29,7 @@ #include "musicbrainz.h" #endif #include "localize.h" +#include "qtplural.h" #include "musiclibraryitemsong.h" #include "musiclibrarymodel.h" #include "dirviewmodel.h" diff --git a/dynamic/dynamic.cpp b/dynamic/dynamic.cpp index 1f8030860..a5da0239c 100644 --- a/dynamic/dynamic.cpp +++ b/dynamic/dynamic.cpp @@ -30,6 +30,7 @@ #include "networkaccessmanager.h" #include "settings.h" #include "localize.h" +#include "qtplural.h" #include "actioncollection.h" #ifdef ENABLE_KDE_SUPPORT #include diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index e0168d7c3..cbbaec686 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -44,6 +44,7 @@ #include "networkproxyfactory.h" #endif #include "localize.h" +#include "qtplural.h" #include "mainwindow.h" #if defined ENABLE_HTTP_STREAM_PLAYBACK && QT_VERSION < 0x050000 #include diff --git a/gui/qtplural.h b/gui/qtplural.h index 753be01ad..989b33b1d 100644 --- a/gui/qtplural.h +++ b/gui/qtplural.h @@ -24,6 +24,8 @@ #ifndef QT_PLURAL_H #define QT_PLURAL_H +#ifndef ENABLE_KDE_SUPPORT + #define QTP_TRACKS_STR(C) \ (1==(C) ? QObject::tr("1 Track", "Singular") : \ QObject::tr("%1 Tracks", "Plural (N!=1)").arg((C))) @@ -52,6 +54,7 @@ (1==(C) ? QObject::tr("1 Rule", "Singular") : \ QObject::tr("%1 Rules", "Plural (N!=1)").arg((C))) +#endif #endif diff --git a/models/albumsmodel.cpp b/models/albumsmodel.cpp index c158457b4..25d0b599e 100644 --- a/models/albumsmodel.cpp +++ b/models/albumsmodel.cpp @@ -28,6 +28,7 @@ #include #include #include "localize.h" +#include "qtplural.h" #ifdef ENABLE_KDE_SUPPORT #include #endif diff --git a/models/dirviewmodel.cpp b/models/dirviewmodel.cpp index 42ec3a5f2..a647e90de 100644 --- a/models/dirviewmodel.cpp +++ b/models/dirviewmodel.cpp @@ -29,6 +29,7 @@ #include #include #include "localize.h" +#include "qtplural.h" #include "dirviewmodel.h" #include "dirviewitem.h" #include "dirviewitemfile.h" diff --git a/models/musicmodel.cpp b/models/musicmodel.cpp index 4efabaa6d..b3c6a80fe 100644 --- a/models/musicmodel.cpp +++ b/models/musicmodel.cpp @@ -28,6 +28,7 @@ #include "musicmodel.h" #include "itemview.h" #include "localize.h" +#include "qtplural.h" #include "icons.h" #include "covers.h" #include diff --git a/models/onlineservicesmodel.cpp b/models/onlineservicesmodel.cpp index 8652137f4..babad813f 100644 --- a/models/onlineservicesmodel.cpp +++ b/models/onlineservicesmodel.cpp @@ -37,6 +37,7 @@ #include "itemview.h" #include "mpdparseutils.h" #include "localize.h" +#include "qtplural.h" #include "icons.h" #include "filejob.h" #include "utils.h" diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp index 1fc31ddd6..bcdd8b92b 100644 --- a/models/playlistsmodel.cpp +++ b/models/playlistsmodel.cpp @@ -30,6 +30,7 @@ #include "playlistsmodel.h" #include "playlistsproxymodel.h" #include "itemview.h" +#include "qtplural.h" #include "groupedview.h" #include "localize.h" #include "utils.h" diff --git a/models/streamsearchmodel.cpp b/models/streamsearchmodel.cpp index 08d8b3e7b..309f21964 100644 --- a/models/streamsearchmodel.cpp +++ b/models/streamsearchmodel.cpp @@ -25,6 +25,7 @@ #include "icons.h" #include "itemview.h" #include "localize.h" +#include "qtplural.h" #include "playqueuemodel.h" #include "networkaccessmanager.h" #include "stdactions.h" diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp index 74904f5e7..f94a1d071 100644 --- a/models/streamsmodel.cpp +++ b/models/streamsmodel.cpp @@ -25,6 +25,7 @@ #include "icons.h" #include "networkaccessmanager.h" #include "localize.h" +#include "qtplural.h" #include "utils.h" #include "mpdconnection.h" #include "mpdparseutils.h" diff --git a/support/localize.h b/support/localize.h index 5091dc71a..52cc0d32a 100644 --- a/support/localize.h +++ b/support/localize.h @@ -28,7 +28,6 @@ #include #else #include -#include "qtplural.h" inline QString i18n(const char *text) { diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp index 02040f4fc..26f84f51a 100644 --- a/widgets/groupedview.cpp +++ b/widgets/groupedview.cpp @@ -29,6 +29,7 @@ #include "itemview.h" #include "config.h" #include "localize.h" +#include "qtplural.h" #include "icons.h" #include "gtkstyle.h" #include