An application can now specify the delimiter to use for csv import and export

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=638091

diff --git a/kdeeducore/keduvoccsvreader.cpp b/kdeeducore/keduvoccsvreader.cpp
index 295ff987f0807b731abac008c41c1ede65050d36..865cc735d7247f0438df116dbc4eae8ac03e8a14 100644 (file)
--- a/kdeeducore/keduvoccsvreader.cpp
+++ b/kdeeducore/keduvoccsvreader.cpp
@@ -42,8 +42,7 @@ bool KEduVocCsvReader::readDoc(KEduVocDocument *doc)
 {
   m_doc = doc;
 
-  ///@todo handle more delimiters
-  QString separator = QString(",");
+  QString separator = m_doc->csvDelimiter();
 
   QTextStream inputStream(m_inputFile);
   inputStream.setCodec("UTF-8");

diff --git a/kdeeducore/keduvoccsvwriter.cpp b/kdeeducore/keduvoccsvwriter.cpp
index 9be56eb67baddc3d2c81824d0c1c5e8756d96350..cd6f51f54b389585fec91ff3c3d49ae002cbe439 100644 (file)
--- a/kdeeducore/keduvoccsvwriter.cpp
+++ b/kdeeducore/keduvoccsvwriter.cpp
@@ -36,7 +36,7 @@ bool KEduVocCsvWriter::writeDoc(KEduVocDocument *doc, const QString &generator)
 
   m_doc = doc;
 
-  QString separator = ",";
+  QString separator = m_doc->csvDelimiter();;
 
   QTextStream outputStream;
   outputStream.setDevice(m_outputFile);

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 419d0464bd02d4a73f68d5103270f62538dc2ec2..607a84e3beec1f96e7d89aafcd5a31000e3b9b73 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -111,6 +111,7 @@ void KEduVocDocument::Init ()
   m_remark = "";
   m_version = "";
   m_generator = "";
+  m_csvDelimiter = QString('\t');
 //  m_font = NULL;
 
   m_activeLeitnerSystem = false;

diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h
index be056c3f8b4eb6b7be808b7a16efedcff256829e..9fd6ff8a17336b14fe551df443b04dd4d561a5af 100644 (file)
--- a/kdeeducore/keduvocdocument.h
+++ b/kdeeducore/keduvocdocument.h
@@ -726,6 +726,21 @@ public:
    */
   void setSizeHint (int index, const int width);
 
+  /**
+   * Returns the delimiter (separator) used for csv import and export.
+   * The default is a single tab character
+   *
+   * @returns                the delimiter used
+   */
+  inline QString csvDelimiter() const { return m_csvDelimiter; }
+
+  /**
+   * Sets the delimiter (separator) used for csv import and export
+   *
+   * @param delimiter        the delimiter to use
+   */
+  inline void setCsvDelimiter(const QString &delimiter) { m_csvDelimiter = delimiter; }
+
   bool leitnerSystemActive();
   void setLeitnerSystemActive(bool yes);
   void createStandardLeitnerSystem();
@@ -768,6 +783,7 @@ private:
   QString                   m_license;
   QString                   m_remark;
   QString                   m_version;
+  QString                   m_csvDelimiter;
 
   QList<KEduVocArticle>     m_articles;
   QList<KEduVocConjugation> m_conjugations;