Remove support for deprecated date format

svn path=/branches/work/kwordquiz/src/keduvocdocument.h; revision=437127

diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp
index 53cbc9536d31ce80edaf66c98a944616c90f851d..9f7a17a5cc127953624e566b09c04100e0ae3dd3 100644 (file)
--- a/kwordquiz/keduvocdocument.cpp
+++ b/kwordquiz/keduvocdocument.cpp
@@ -3,7 +3,7 @@
     -----------------------------------------------------------------------
     copyright            : (C) 1999-2001 Ewald Arnold
                            (C) 2001 The KDE-EDU team
-                           (C) 2005 Peter Hedlung
+                           (C) 2005 Peter Hedlund
     email                : peter@peterandlinda.com
  ***************************************************************************/
 
@@ -993,44 +993,6 @@ int KEduVocDocument::search(QString substr, int id,
    return -1;
 }
 
-#define _OFFSET     0x40
-#define _BITMASK    0x3F
-#define _BITUSED    6
-
-QString KEduVocDocument::compressDate(unsigned long l) const
-{
-   if (l == 0)
-     return "";
-
-   QString res;
-   if (l <= KVD_ZERO_TIME)
-     l = 1;
-   else
-     l -= KVD_ZERO_TIME;
-   while (l != 0) {
-     char c = _OFFSET + (l & _BITMASK);
-     res.insert (0, c);
-     l >>= _BITUSED;
-   }
-   return res;
-}
-
-
-unsigned long KEduVocDocument::decompressDate(QString s) const
-{
-   if (s.isEmpty())
-     return 0;
-
-   long res = 0;
-   unsigned incr = 0;
-   for (int i = s.length()-1; i >= 0; i--) {
-     char c = s.local8Bit()[i];
-     res += ((c - _OFFSET) & _BITMASK) << incr ;
-     incr += _BITUSED;
-   }
-   return res > 48 ? res+KVD_ZERO_TIME : 0;  // early bug with "0"
-}
-
 
 KEduVocDocument::FileType KEduVocDocument::detectFileType(const QString &filename)
 {

diff --git a/kwordquiz/keduvocdocument.h b/kwordquiz/keduvocdocument.h
index fc8b4b3717f65e93c50abf170a8d79841c57439c..cf42eabee6fe370cb7a5ddc18638c51d75436d47 100644 (file)
--- a/kwordquiz/keduvocdocument.h
+++ b/kwordquiz/keduvocdocument.h
@@ -3,7 +3,7 @@
     -----------------------------------------------------------------------
     copyright            : (C) 1999-2001 Ewald Arnold
                            (C) 2001 The KDE-EDU team
-                           (C) 2005 Peter Hedlung
+                           (C) 2005 Peter Hedlund
     email                : peter@peterandlinda.com
  ***************************************************************************/
 
@@ -48,7 +48,7 @@
 #define KV_CHARSET     "charset"   // recommended charset (obsolete!)
 #define KV_BAD         "b"         // number of times failed
 #define KV_DATE        "d"         // last query date
-#define KV_DATE2       "w"         // last query date, compressed format
+#define KV_DATE2       "w"         // last query date, compressed format, deprecated, currently ignored
 #define KV_REMARK      "r"         // remark for this entry
 #define KV_FAUX_AMI_F  "ff"        // false friend of this entry from org
 #define KV_FAUX_AMI_T  "tf"        // false friend of this entry to org
@@ -584,12 +584,6 @@ class KEduVocDocument : public QObject
    */
   void setArticle(int index, const Article &art);
 
-  /** compress date */
-  QString compressDate(unsigned long) const;
-
-  /** decompress date */
-  unsigned long decompressDate(QString) const;
-
   /** returns recommended size
    *
    * @param index            number of expr, -1 = lesson

diff --git a/kwordquiz/keduvockvtmlreader.cpp b/kwordquiz/keduvockvtmlreader.cpp
index d8a3352672700e7bbf8b1faebbef8554d0b27af0..405deaa1ead60b6030d830e582c79608a9e4bf7c 100644 (file)
--- a/kwordquiz/keduvockvtmlreader.cpp
+++ b/kwordquiz/keduvockvtmlreader.cpp
@@ -840,14 +840,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
   QDomAttr domAttrDate2 = domElementExpressionChild.attributeNode(KV_DATE2);
   if (!domAttrDate2.isNull())
   {
-    QString s = domAttrDate2.value();
-    if ((pos = s.find(';')) >= 1)
-    {
-      date = m_doc->decompressDate(s.left(pos));
-      rev_date = m_doc->decompressDate(s.mid(pos+1, s.length()));
-    }
-    else
-      date = m_doc->decompressDate(s);
+    //this format is deprecated and ignored.
   }
 
   remark = "";