category utf8 fixes

2 files changed, 4 insertions, 43 deletions

diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index b88e729..24b8349 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -65,5 +65,4 @@ class SharpParser : public QObject
   public:
     SharpParser( Calendar *calendar ) : mCalendar( calendar ) {
-        oldCategories = 0;
     }
   
@@ -171,5 +170,5 @@ class SharpParser : public QObject
         
             QString categoryList = attList[1] ;
-            event->setCategories( lookupCategories( categoryList ) );
+            event->setCategories( categoryList );
 
             // strange 0 semms to mean: alarm enabled
@@ -225,5 +224,5 @@ class SharpParser : public QObject
         
             QString categoryList = attList[1];
-            todo->setCategories( lookupCategories( categoryList ) );
+            todo->setCategories(  categoryList );
         
        
@@ -272,9 +271,4 @@ class SharpParser : public QObject
 
    
-    void  setCategoriesList ( QStringList * c )
-    {
-        oldCategories = c;
-    }
-
    QDateTime fromString ( QString  s, bool useTz = true ) {
        QDateTime dt;
@@ -302,43 +296,12 @@ class SharpParser : public QObject
     }
 
-    QStringList lookupCategories( const QString &categoryList )
-    {
-      QStringList categoryIds = QStringList::split( ";", categoryList );
-      QStringList categories;
-      QStringList::ConstIterator it;
-      for( it = categoryIds.begin(); it != categoryIds.end(); ++it ) {
-          QString cate = category( *it );
-          if ( oldCategories ) {
-              if ( ! oldCategories->contains( cate ) )
-                  oldCategories->append( cate );
-              }
-          categories.append(cate );
-      }
-      return categories;
-    }
-
   private:
     Calendar *mCalendar;
-    QStringList * oldCategories;
-    static QString category( const QString &id )
-    {
-      QMap<QString,QString>::ConstIterator it = mCategoriesMap.find( id );
-      if ( it == mCategoriesMap.end() ) return id;
-      else return *it;
-    }
-
-    static void setCategory( const QString &id, const QString &name )
-    {
-      mCategoriesMap.insert( id, name );
-    }
-
-    static QMap<QString,QString> mCategoriesMap;
 };
 
-QMap<QString,QString> SharpParser::mCategoriesMap;
 
 SharpFormat::SharpFormat()
 {
-    mCategories = 0;
+    
 }
 
@@ -1019,5 +982,5 @@ bool SharpFormat::fromString2Cal( Calendar *calendar,Calendar *existingCalendar,
     start = end;
     SharpParser handler( calendar );
-    handler.setCategoriesList( mCategories );
+    // handler.setCategoriesList( mCategories );
     while ( start > 0 ) {
         templist.clear();
diff --git a/libkcal/sharpformat.h b/libkcal/sharpformat.h
index 0b13862..a71177d 100644
--- a/libkcal/sharpformat.h
+++ b/libkcal/sharpformat.h
@@ -41,5 +41,4 @@ class SharpFormat : public QObject {
     bool load( Calendar * ,Calendar *);
     bool save( Calendar * );
-    void setCategoriesList (  QStringList * cat   ){ mCategories = cat; }
     bool fromString2Cal( Calendar *, Calendar *, const QString & , const QString & );  
     bool fromString( Calendar *, const QString & );  
@@ -52,5 +51,4 @@ class SharpFormat : public QObject {
     QString dtToString( const QDateTime& dt, bool useTZ = true );
     
-    QStringList *mCategories;
     int  getNumFromRecord( QString answer,Incidence* inc  ) ;
     QString getPart( const QString & text, bool &ok, int &start );