make them a bit more Qt4-ish

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

diff --git a/kdeeducore/keduvocgrammar.cpp b/kdeeducore/keduvocgrammar.cpp
index c15b61b69e5ecf2434fc194a1231ef2a54f3d13b..6dff1b295a309adaae537c678b5858b4b78a01a1 100644 (file)
--- a/kdeeducore/keduvocgrammar.cpp
+++ b/kdeeducore/keduvocgrammar.cpp
@@ -166,24 +166,30 @@ void KEduVocArticle::setNatural(const QString &def, const QString &indef)
 }
 
 
-void KEduVocArticle::female(QString &def, QString &indef) const
+void KEduVocArticle::getFemale(QString *def, QString *indef) const
 {
-  def = fem_def;
-  indef = fem_indef;
+  if (def)
+    *def = fem_def;
+  if (indef)
+    *indef = fem_indef;
 }
 
 
-void KEduVocArticle::male(QString &def, QString &indef) const
+void KEduVocArticle::getMale(QString *def, QString *indef) const
 {
-  def = mal_def;
-  indef = mal_indef;
+  if (def)
+    *def = mal_def;
+  if (indef)
+    *indef = mal_indef;
 }
 
 
-void KEduVocArticle::natural(QString &def, QString &indef) const
+void KEduVocArticle::getNatural(QString *def, QString *indef) const
 {
-  def = nat_def;
-  indef = nat_indef;
+  if (def)
+    *def = nat_def;
+  if (indef)
+    *indef = nat_indef;
 }
 
 

diff --git a/kdeeducore/keduvocgrammar.h b/kdeeducore/keduvocgrammar.h
index 97794c5cf68cb54fecd278394cd67aabf1af6567..0728545716b65b23ee656b90c913d82308031c96 100644 (file)
--- a/kdeeducore/keduvocgrammar.h
+++ b/kdeeducore/keduvocgrammar.h
@@ -91,9 +91,9 @@ public:
    */
   void setNatural(const QString &def, const QString &indef);
 
-  void female  (QString &def, QString &indef) const;
-  void male    (QString &def, QString &indef) const;
-  void natural (QString &def, QString &indef) const;
+  void getFemale (QString *def, QString *indef) const;
+  void getMale   (QString *def, QString *indef) const;
+  void getNatural(QString *def, QString *indef) const;
 
 private:
   QString fem_def;

diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index 58adc01ef0628a35d9f5c6050243b3d6c554cca8..f178d4e2771a6f5367b04ba0151afca22a99c636 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -378,7 +378,7 @@ bool KEduVocKvtmlWriter::writeArticle(QDomDocument &domDoc, QDomElement &domElem
     }
     domElementEntry.setAttribute(KV_LANG, s);
 
-    m_doc->article(lfn).female(def, indef);
+    m_doc->article(lfn).getFemale(&def, &indef);
     if (!def.isEmpty())
     {
       QDomElement domElementFD = domDoc.createElement(KV_ART_FD);
@@ -396,7 +396,7 @@ bool KEduVocKvtmlWriter::writeArticle(QDomDocument &domDoc, QDomElement &domElem
       domElementEntry.appendChild(domElementFI);
     }
 
-    m_doc->article(lfn).male(def, indef);
+    m_doc->article(lfn).getMale(&def, &indef);
     if (!def.isEmpty())
     {
       QDomElement domElementMD = domDoc.createElement(KV_ART_MD);
@@ -414,7 +414,7 @@ bool KEduVocKvtmlWriter::writeArticle(QDomDocument &domDoc, QDomElement &domElem
       domElementEntry.appendChild(domElementMI);
     }
 
-    m_doc->article(lfn).natural(def, indef);
+    m_doc->article(lfn).getNatural(&def, &indef);
     if (!def.isEmpty())
     {
       QDomElement domElementND = domDoc.createElement(KV_ART_ND);