summaryrefslogtreecommitdiff
authorzecke <zecke>2003-08-25 15:06:32 (UTC)
committer zecke <zecke>2003-08-25 15:06:32 (UTC)
commit44b9e62c1e5071fc6e5f8e80204b9974dbc704b6 (patch) (side-by-side diff)
tree2ed47cff84f9b9cfb94fd38f6931ba69316f32aa
parentbf3c4abb9dff716e098f05852d9a3d8ac8cbcb44 (diff)
downloadopie-44b9e62c1e5071fc6e5f8e80204b9974dbc704b6.zip
opie-44b9e62c1e5071fc6e5f8e80204b9974dbc704b6.tar.gz
opie-44b9e62c1e5071fc6e5f8e80204b9974dbc704b6.tar.bz2
add a qtopia method we need for the new launcher
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/backend/categories.cpp8
-rw-r--r--library/backend/categories.h3
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
@@ -928,4 +928,12 @@ void CheckedListView::setChecked( const QStringList &checked )
/*! \fn CategoryGroup::CategoryGroup(const CategoryGroup &c)
\internal
*/
+
+/* ### FIXME properly merge */
+QStringList Categories::labels( const QString & app, const QArray<int> &catids ) const
+{
+ QStringList strs = mGlobalCats.labels( catids );
+ strs += mAppCats[app].labels( catids );
+ return strs;
+}
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
@@ -150,8 +150,11 @@ public:
QStringList labels( const QString &app,
bool includeGlobal = TRUE,
ExtraLabels extra = NoExtra ) const;
+ QStringList labels( const QString &app,
+ const QArray<int> &catids ) const;
+
enum DisplaySingle { ShowMulti, ShowAll, ShowFirst };
/** Returns a single string associated with the cat ids for display in
* a combobox or any area that requires one string. If catids are empty