-rw-r--r-- | library/backend/categories.cpp | 8 | ||||
-rw-r--r-- | library/backend/categories.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/library/backend/categories.cpp b/library/backend/categories.cpp index cce9f38..34ff6fe 100644 --- a/library/backend/categories.cpp +++ b/library/backend/categories.cpp | |||
@@ -929,3 +929,11 @@ void CheckedListView::setChecked( const QStringList &checked ) | |||
929 | \internal | 929 | \internal |
930 | */ | 930 | */ |
931 | 931 | ||
932 | |||
933 | /* ### FIXME properly merge */ | ||
934 | QStringList Categories::labels( const QString & app, const QArray<int> &catids ) const | ||
935 | { | ||
936 | QStringList strs = mGlobalCats.labels( catids ); | ||
937 | strs += mAppCats[app].labels( catids ); | ||
938 | return strs; | ||
939 | } | ||
diff --git a/library/backend/categories.h b/library/backend/categories.h index d5b3669..91c93e7 100644 --- a/library/backend/categories.h +++ b/library/backend/categories.h | |||
@@ -151,6 +151,9 @@ public: | |||
151 | bool includeGlobal = TRUE, | 151 | bool includeGlobal = TRUE, |
152 | ExtraLabels extra = NoExtra ) const; | 152 | ExtraLabels extra = NoExtra ) const; |
153 | 153 | ||
154 | QStringList labels( const QString &app, | ||
155 | const QArray<int> &catids ) const; | ||
156 | |||
154 | enum DisplaySingle { ShowMulti, ShowAll, ShowFirst }; | 157 | enum DisplaySingle { ShowMulti, ShowAll, ShowFirst }; |
155 | 158 | ||
156 | /** Returns a single string associated with the cat ids for display in | 159 | /** Returns a single string associated with the cat ids for display in |