From kde-commits  Sat Mar 19 23:12:40 2005
From: Allen Winter <winterz () verizon ! net>
Date: Sat, 19 Mar 2005 23:12:40 +0000
To: kde-commits
Subject: kdepim
Message-Id: <20050319231240.039AB1763F () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111127398029805

CVS commit by winterz: 

Rename Calendar::incidenceCategories() to Calendar::categories().


  M +1 -1      korganizer/calendarview.cpp   1.332
  M +5 -5      libkcal/calendar.cpp   1.66
  M +1 -2      libkcal/calendar.h   1.70


--- kdepim/libkcal/calendar.cpp  #1.65:1.66
@@ -123,8 +123,8 @@ CalFilter *Calendar::filter()
 }
 
-QStringList Calendar::incidenceCategories()
+QStringList Calendar::categories()
 {
   Incidence::List rawInc( rawIncidences() );
-  QStringList categories, thisCats;
+  QStringList cats, thisCats;
   // @TODO: For now just iterate over all incidences. In the future,
   // the list of categories should be built when reading the file.
@@ -134,10 +134,10 @@ QStringList Calendar::incidenceCategorie
     for ( QStringList::ConstIterator si = thisCats.constBegin();
           si != thisCats.constEnd(); ++si ) {
-      if ( categories.find( *si ) == categories.end() ) {
-        categories.append( *si );
+      if ( cats.find( *si ) == cats.end() ) {
+        cats.append( *si );
       }
     }
   }
-  return categories;
+  return cats;
 }
 

--- kdepim/libkcal/calendar.h  #1.69:1.70
@@ -294,6 +294,5 @@ class LIBKCAL_EXPORT Calendar : public Q
        @return a QStringList containing all the categories.
     */
-    //TODO: need a better method name.  how about categories()?
-    QStringList incidenceCategories();
+    QStringList categories();
 
 // Incidence Specific Methods //

--- kdepim/korganizer/calendarview.cpp  #1.331:1.332
@@ -2053,5 +2053,5 @@ void CalendarView::showErrorMessage( con
 void CalendarView::updateCategories()
 {
-  QStringList allCats( calendar()->incidenceCategories() );
+  QStringList allCats( calendar()->categories() );
   allCats.sort();
   QStringList categories( KOPrefs::instance()->mCustomCategories );