From: Frederik Gladhorn <gladhorn@kde.org>
Date: Sun, 18 Jan 2009 22:05:39 +0000 (+0000)
Subject: backport assert fix r913204
X-Git-Tag: v4.2.0~1
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=25b3a8b13c278cf008d7c20d22ecbfc6dc0313ad;p=libqmvoc.git

backport assert fix r913204

svn path=/branches/KDE/4.2/kdeedu/libkdeedu/; revision=913205
---

diff --git a/keduvocdocument/keduvoctranslation.cpp b/keduvocdocument/keduvoctranslation.cpp
index 1aaf884..c963eb9 100644
--- a/keduvocdocument/keduvoctranslation.cpp
+++ b/keduvocdocument/keduvoctranslation.cpp
@@ -86,25 +86,19 @@ KEduVocTranslation::KEduVocTranslationPrivate::KEduVocTranslationPrivate(KEduVoc
 }
 
 
-KEduVocTranslation::KEduVocTranslationPrivate::~ KEduVocTranslationPrivate()
+KEduVocTranslation::KEduVocTranslationPrivate::~KEduVocTranslationPrivate()
 {
     delete m_declension;
 }
 
 KEduVocTranslation::KEduVocTranslation(KEduVocExpression* entry) : d( new KEduVocTranslationPrivate(entry) )
 {
-
-    assert(d);
-
 }
 
 
 KEduVocTranslation::KEduVocTranslation(KEduVocExpression* entry, const QString &translation ) : d( new KEduVocTranslationPrivate(entry) )
 {
     setText(translation.simplified());
-
-    assert(d);
-
 }
 
 KEduVocTranslation::KEduVocTranslation( const KEduVocTranslation &other )
@@ -198,8 +192,6 @@ KEduVocTranslation & KEduVocTranslation::operator = ( const KEduVocTranslation &
         d->m_declension = new KEduVocDeclension(*translation.d->m_declension);
     }
 
-    assert(d);
-
     return *this;
 }
 
@@ -359,10 +351,11 @@ void KEduVocTranslation::setImageUrl(const KUrl &url)
 
 KEduVocWordType * KEduVocTranslation::wordType() const
 {
-    if (d)
+    if (d) {
         return d->m_wordType;
-    else
+    } else {
         return 0;
+    }
 }
 
 void KEduVocTranslation::setWordType(KEduVocWordType * wordType)