Includes and whitespace cleanup.

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

diff --git a/keduvocdocument/keduvocarticle.cpp b/keduvocdocument/keduvocarticle.cpp
index 7eba2c032de3ee36cc841ccfba90cfd896245b22..d81d126ec700c33b7ed1d0cfb1643ec2a65483ef 100644 (file)
--- 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 d1672dfa996480c26ca9e903c07fca9a191b4428..f6784da98b6412f62579e8b8432f94b56ca28172 100644 (file)
--- 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 bc2b4c5d2f3ca071778065eb4be0dfe7cdd0ec6e..50a7165619b9a1c34a4f1340b29336cecba90167 100644 (file)
--- 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 06a3e3c3352a050e1130221147b002ed7aae35c5..6d5f845355a5bfe2c274aff0dc0ea577b9aa2d7d 100644 (file)
--- 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 ead419f7631a25f482857888af71c6185741bd2f..5a4afc34fdebb7aac477a9a47243a8a3291f0c99 100644 (file)
--- 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 22218b1bee588dca01c89666281397b86b3fc579..d79c11635efc7e8f513027818f191d49d1781e66 100644 (file)
--- 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 c9d81e1da6ab5259451290d5f7e72cbe6a80e0f7..c27db3e8c5240546ed22c1bbeb2ffed1fb9d37d4 100644 (file)
--- 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 45d93d077c03cada5f97cc2a20bb560c2c1bebb0..ee99fd93913cffe7c55871b1d3e6c1b80694d2c4 100644 (file)
--- 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 cc77d53b68e145ec3db2929c7d7bcd5fee884146..496914fc3fb8883613c00cd43fc1ea3b0ad6b651 100644 (file)
--- 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 02403c06d6d6c2c55b798ddd20d4f991e10a1e26..890e6bbc0b5869c07f82df581cb9cdffc1b6884d 100644 (file)
--- 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 d18ea2dfd148fb754747f7d031535b5f2947747f..87aeebbbb823af93aa4dcb2128911f1430d5d61a 100644 (file)
--- a/keduvocdocument/keduvocwordtype.cpp
+++ b/keduvocdocument/keduvocwordtype.cpp
@@ -18,8 +18,6 @@
 
 #include "keduvocexpression.h"
 
-#include <KDebug>
-
 #include <QtCore/QList>
 #include <QtCore/QSet>