From: Jeremy Paul Whiting <jpwhiting@kde.org>
Date: Tue, 3 Jul 2007 19:11:53 +0000 (+0000)
Subject: fix krazy issues inline methods and malformed markup
X-Git-Tag: v3.92.0~46
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=36c1410d87f3063bc30d0a6598c302dce08bd959;p=libqmvoc.git

fix krazy issues inline methods and malformed markup

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=682964
---

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 001f44d..3049619 100644
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -211,7 +211,7 @@ bool KEduVocDocument::open(const KUrl& url)
     d->m_url = url;
 
   bool read = false;
-  QString errorMessage = i18n("<qt>Cannot open file<br><b>%1</b></qt>", url.path());
+  QString errorMessage = i18n("<qt>Cannot open file<br /><b>%1</b></qt>", url.path());
   QString temporaryFile;
   if (KIO::NetAccess::download(url, temporaryFile, 0))
   {
@@ -332,7 +332,7 @@ bool KEduVocDocument::saveAs(const KUrl & url, FileType ft, const QString & gene
 
     if (!f.open(QIODevice::WriteOnly))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>", tmp.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot write to file<br /><b>%1</b></qt>", tmp.path()));
       return false;
     }
 
diff --git a/kdeeducore/keduvocgrammar.cpp b/kdeeducore/keduvocgrammar.cpp
index 0c6b8f6..01111de 100644
--- a/kdeeducore/keduvocgrammar.cpp
+++ b/kdeeducore/keduvocgrammar.cpp
@@ -221,6 +221,17 @@ void KEduVocArticle::getNatural(QString *def, QString *indef) const
     *indef = nat_indef;
 }
 
+//==============================================================
+
+QString KEduVocTenseRelation::shortStr() const 
+{ 
+    return shortId; 
+}
+
+QString KEduVocTenseRelation::longStr()  const 
+{ 
+    return longId;  
+}
 
 
 //==============================================================
diff --git a/kdeeducore/keduvocgrammar.h b/kdeeducore/keduvocgrammar.h
index 6774b1d..5753bd6 100644
--- a/kdeeducore/keduvocgrammar.h
+++ b/kdeeducore/keduvocgrammar.h
@@ -148,8 +148,8 @@ public:
   KEduVocTenseRelation() {}
   KEduVocTenseRelation (const QString & _short, const QString & _long): shortId (_short), longId(_long) {}
 
-  inline QString shortStr() const { return shortId; }
-  inline QString longStr()  const { return longId;  }
+  QString shortStr() const;
+  QString longStr()  const;
 
 private:
   QString shortId;