From 4451a50e9a7b9bfef0d3178db8061508bf9e4fae Mon Sep 17 00:00:00 2001
From: Peter Hedlund <peter@peterandlinda.com>
Date: Fri, 15 Jan 2010 22:25:28 +0000
Subject: [PATCH] Includes and whitespace cleanup.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=1075354
---
 keduvocdocument/keduvocarticle.cpp          | 1 -
 keduvocdocument/keduvocconjugation.cpp      | 4 ++--
 keduvocdocument/keduvoccontainer.h          | 8 ++++----
 keduvocdocument/keduvocidentifier.cpp       | 2 --
 keduvocdocument/keduvockvtmlcompability.cpp | 3 ++-
 keduvocdocument/keduvockvtmlcompability.h   | 1 -
 keduvocdocument/keduvocleitnerbox.cpp       | 2 --
 keduvocdocument/keduvocmultiplechoice.cpp   | 2 --
 keduvocdocument/keduvocpersonalpronoun.cpp  | 6 +++---
 keduvocdocument/keduvoctext.cpp             | 2 +-
 keduvocdocument/keduvocwordtype.cpp         | 2 --
 11 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/keduvocdocument/keduvocarticle.cpp b/keduvocdocument/keduvocarticle.cpp
index 7eba2c0..d81d126 100644
--- a/keduvocdocument/keduvocarticle.cpp
+++ b/keduvocdocument/keduvocarticle.cpp
@@ -19,7 +19,6 @@
 #include "keduvocwordflags.h"
 
 #include <QtCore/QMap>
-#include <KDebug>
 
 class KEduVocArticle::Private
 {
diff --git a/keduvocdocument/keduvocconjugation.cpp b/keduvocdocument/keduvocconjugation.cpp
index d1672df..f6784da 100644
--- a/keduvocdocument/keduvocconjugation.cpp
+++ b/keduvocdocument/keduvocconjugation.cpp
@@ -23,10 +23,10 @@
 
 #include "keduvocconjugation.h"
 #include "keduvoccommon_p.h"
+#include "keduvoctext.h"
 #include "kvtml2defs.h"
 
-#include <KLocalizedString>
-#include <KDebug>
+#include <QtCore/QMap>
 #include <QtXml/QDomDocument>
 
 class KEduVocConjugation::Private
diff --git a/keduvocdocument/keduvoccontainer.h b/keduvocdocument/keduvoccontainer.h
index bc2b4c5..50a7165 100644
--- a/keduvocdocument/keduvoccontainer.h
+++ b/keduvocdocument/keduvoccontainer.h
@@ -65,8 +65,8 @@ public:
 
     /**
      * Find a child container
-     * @param name 
-     * @return 
+     * @param name
+     * @return
      */
 //     KEduVocContainer *childContainer(const QString& name);
 
@@ -99,7 +99,7 @@ public:
 
     /**
      * Removes a translation. This has to be called when a language is removed from a document.
-     * @param translation 
+     * @param translation
      */
     void removeTranslation(int translation);
 
@@ -111,7 +111,7 @@ public:
 
     /**
      * The type of this container. @see EnumContainerType
-     * @return 
+     * @return
      */
     KEduVocContainer::EnumContainerType containerType();
 
diff --git a/keduvocdocument/keduvocidentifier.cpp b/keduvocdocument/keduvocidentifier.cpp
index 06a3e3c..6d5f845 100644
--- a/keduvocdocument/keduvocidentifier.cpp
+++ b/keduvocdocument/keduvocidentifier.cpp
@@ -12,8 +12,6 @@
  ***************************************************************************/
 #include "keduvocidentifier.h"
 
-#include <KLocalizedString>
-
 class KEduVocIdentifier::Private
 {
 public:
diff --git a/keduvocdocument/keduvockvtmlcompability.cpp b/keduvocdocument/keduvockvtmlcompability.cpp
index ead419f..5a4afc3 100644
--- a/keduvocdocument/keduvockvtmlcompability.cpp
+++ b/keduvocdocument/keduvockvtmlcompability.cpp
@@ -22,8 +22,9 @@
  ***************************************************************************/
 
 #include "keduvockvtmlcompability.h"
-
 #include "keduvocwordtype.h"
+
+#include <KLocale>
 #include <KDebug>
 
 const QString KEduVocKvtmlCompability::KVTML_1_USER_DEFINED = QString( "#" );
diff --git a/keduvocdocument/keduvockvtmlcompability.h b/keduvocdocument/keduvockvtmlcompability.h
index 22218b1..d79c116 100644
--- a/keduvocdocument/keduvockvtmlcompability.h
+++ b/keduvocdocument/keduvockvtmlcompability.h
@@ -24,7 +24,6 @@
 #ifndef KEDUVOCKVTMLCOMPABILITY_H
 #define KEDUVOCKVTMLCOMPABILITY_H
 
-#include <KDE/KLocalizedString>
 #include <QtCore/QString>
 #include <QtCore/QMap>
 #include <QtCore/QSet>
diff --git a/keduvocdocument/keduvocleitnerbox.cpp b/keduvocdocument/keduvocleitnerbox.cpp
index c9d81e1..c27db3e 100644
--- a/keduvocdocument/keduvocleitnerbox.cpp
+++ b/keduvocdocument/keduvocleitnerbox.cpp
@@ -15,8 +15,6 @@
 
 #include "keduvocexpression.h"
 
-#include <KDebug>
-
 #include <QtCore/QSet>
 
 class KEduVocLeitnerBox::Private
diff --git a/keduvocdocument/keduvocmultiplechoice.cpp b/keduvocdocument/keduvocmultiplechoice.cpp
index 45d93d0..ee99fd9 100644
--- a/keduvocdocument/keduvocmultiplechoice.cpp
+++ b/keduvocdocument/keduvocmultiplechoice.cpp
@@ -24,7 +24,6 @@
  ***************************************************************************/
 
 #include "keduvocmultiplechoice.h"
-#include "kdebug.h"
 
 class KEduVocMultipleChoice::KEduVocMultipleChoicePrivate
 {
@@ -101,7 +100,6 @@ bool KEduVocMultipleChoice::operator== ( const KEduVocMultipleChoice &choice ) c
 void KEduVocMultipleChoice::appendChoice( const QString &s )
 {
     if ( !s.isEmpty() ) {
-        kDebug() << s;
         d->m_choices.append( s );
     }
 }
diff --git a/keduvocdocument/keduvocpersonalpronoun.cpp b/keduvocdocument/keduvocpersonalpronoun.cpp
index cc77d53..496914f 100644
--- a/keduvocdocument/keduvocpersonalpronoun.cpp
+++ b/keduvocdocument/keduvocpersonalpronoun.cpp
@@ -13,8 +13,8 @@
 
 #include "keduvocpersonalpronoun.h"
 #include "keduvoccommon_p.h"
-#include <KLocalizedString>
-#include <KDebug>
+
+#include <QtCore/QMap>
 
 class KEduVocPersonalPronoun::Private
 {
@@ -80,7 +80,7 @@ QString KEduVocPersonalPronoun::personalPronoun(KEduVocWordFlags flags) const
         QString p = d->m_personalpronouns.value(flags & (KEduVocWordFlag::persons | KEduVocWordFlag::numbers| KEduVocWordFlag::genders));
         if (p.isEmpty() && !(flags & KEduVocWordFlag::genders) && d->m_maleFemaleDifferent && d->m_neutralExists)
         {
-            kDebug() << "initial flag lookup failed, added neuter gender flag";
+           //initial flag lookup failed, adding neuter gender flag
            flags |= KEduVocWordFlag::Neuter;
            p = d->m_personalpronouns.value(flags & (KEduVocWordFlag::persons | KEduVocWordFlag::numbers| KEduVocWordFlag::genders));
         }
diff --git a/keduvocdocument/keduvoctext.cpp b/keduvocdocument/keduvoctext.cpp
index 02403c0..890e6bb 100644
--- a/keduvocdocument/keduvoctext.cpp
+++ b/keduvocdocument/keduvoctext.cpp
@@ -12,10 +12,10 @@
  ***************************************************************************/
 
 #include "keduvoctext.h"
+
 #include "kvtml2defs.h"
 #include "keduvockvtml2writer.h"
 
-#include <KDE/KDebug>
 #include <QtXml/QDomDocument>
 
 class KEduVocText::KEduVocTextPrivate
diff --git a/keduvocdocument/keduvocwordtype.cpp b/keduvocdocument/keduvocwordtype.cpp
index d18ea2d..87aeebb 100644
--- a/keduvocdocument/keduvocwordtype.cpp
+++ b/keduvocdocument/keduvocwordtype.cpp
@@ -18,8 +18,6 @@
 
 #include "keduvocexpression.h"
 
-#include <KDebug>
-
 #include <QtCore/QList>
 #include <QtCore/QSet>
 
-- 
2.47.3