From 2fbc5a3f87fdf9b6b329766c52b130d8d1987ac1 Mon Sep 17 00:00:00 2001 From: Peter Hedlund Date: Wed, 21 Feb 2007 19:24:13 +0000 Subject: [PATCH] Remove support for obsolete file formats (.lex, .vcb). svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=636060 --- kdeeducore/keduvocdocument.cpp | 37 +--------------------------------- kdeeducore/keduvocdocument.h | 12 +---------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp index 8c13b7e..18f3a16 100644 --- a/kdeeducore/keduvocdocument.cpp +++ b/kdeeducore/keduvocdocument.cpp @@ -162,18 +162,13 @@ KEduVocDocument::FileType KEduVocDocument::detectFileType(const QString &fileNam else return kvtml; } + if (line == WQL_IDENT) return wql; if (c1 == '"' && (line.contains('"') == 1 || line.contains(QRegExp("\",[0-9]")))) return vokabeln; - if (line.indexOf(VCB_SEPARATOR) >= 0) - return vt_vcb; - - if (line == LEX_IDENT_50) - return vt_lex; - return csv; } @@ -239,20 +234,6 @@ bool KEduVocDocument::open(const KUrl& url, bool /*append*/) } break; - case vt_lex: - { - //QTextStream is (&f); - //TODO read = loadFromLex (is); - } - break; - - case vt_vcb: - { - //QTextStream is (&f); - //TODO read = loadFromVcb (is); - } - break; - case csv: { //QTextStream is(&f); @@ -301,10 +282,6 @@ bool KEduVocDocument::saveAs(QObject *parent, const KUrl & url, FileType ft, con ft = kvtml; else if (tmp.path().right(strlen("." WQL_EXT)) == "." WQL_EXT) ft = wql; - else if (tmp.path().right(strlen("." VT5_LEX_EXT)) == "." VT5_LEX_EXT) - ft = vt_lex; - else if (tmp.path().right(strlen("." VCB_EXT)) == "." VCB_EXT) - ft = vt_vcb; else if (tmp.path().right(strlen("." CSV_EXT)) == "." CSV_EXT) ft = csv; else @@ -340,18 +317,6 @@ bool KEduVocDocument::saveAs(QObject *parent, const KUrl & url, FileType ft, con } break; - case vt_lex: { - QTextStream os( &f ); // serialize using f - //TODO saved = saveToLex(os, title); - } - break; - - case vt_vcb: { - QTextStream os( &f ); // serialize using f - //TODO saved = saveToVcb(os, title); - } - break; - case csv: { QTextStream os( &f ); // serialize using f //TODO saved = saveToCsv(os, title); diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h index f9f2d5d..9f45602 100644 --- a/kdeeducore/keduvocdocument.h +++ b/kdeeducore/keduvocdocument.h @@ -222,20 +222,13 @@ static const QLatin1String KV_ART_ENTRY("e"); // article entry #define KV_CON_P3PN "p3n" // 3. person plural natural #define KV_CONJ_COMMON "common" // female contains common for all three -#define LEX_IDENT_50 "Vocabulary Trainer V5.0" #define WQL_IDENT "WordQuiz" #define KVTML_EXT "kvtml" -#define VT5_LEX_EXT "lex" -#define QVOCAB_EXT "qvo" -#define VCB_EXT "vocab" -#define KVL_EXT "vl" #define CSV_EXT "csv" #define TXT_EXT "txt" #define WQL_EXT "wql" -#define VCB_SEPARATOR "__" - #include #include #include @@ -259,7 +252,7 @@ class KDEEDUCORE_EXPORT KEduVocDocument : public QObject friend class KEduVocKvtmlReader; friend class KEduVocWqlReader; - public: +public: enum FileType { kvd_none, automatic, @@ -267,9 +260,6 @@ class KDEEDUCORE_EXPORT KEduVocDocument : public QObject wql, pauker, vokabeln, - kvtbin, - vt_lex, - vt_vcb, csv }; /** -- 2.47.3