From 41a46b756407a1b28cba2b005265a0084d23fda4 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <gladhorn@kde.org>
Date: Sun, 18 Jan 2009 22:02:54 +0000
Subject: [PATCH] when using assert, use Q_ASSERT, but it's not needed to check
 for the existence of a d-ptr

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=913204
---
 keduvocdocument/keduvoctranslation.cpp | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/keduvocdocument/keduvoctranslation.cpp b/keduvocdocument/keduvoctranslation.cpp
index 1aaf884..167a76e 100644
--- a/keduvocdocument/keduvoctranslation.cpp
+++ b/keduvocdocument/keduvoctranslation.cpp
@@ -24,7 +24,6 @@
 #include "keduvockvtml2writer.h"
 #include <KDebug>
 #include <QtCore/QMap>
-#include <assert.h>
 
 class KEduVocTranslation::KEduVocTranslationPrivate
 {
@@ -86,25 +85,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 )
@@ -133,9 +126,6 @@ KEduVocTranslation::KEduVocTranslation( const KEduVocTranslation &other )
     if (other.d->m_declension) {
         d->m_declension = new KEduVocDeclension(*other.d->m_declension);
     }
-
- assert(d);
-
 }
 
 KEduVocTranslation::~KEduVocTranslation()
@@ -198,8 +188,6 @@ KEduVocTranslation & KEduVocTranslation::operator = ( const KEduVocTranslation &
         d->m_declension = new KEduVocDeclension(*translation.d->m_declension);
     }
 
-    assert(d);
-
     return *this;
 }
 
@@ -359,10 +347,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)
-- 
2.47.3