Includes and copyright.

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 59de6beb35833df462ea19cb8651e5024d454516..86824a5bfb091100b9be054bd22ce1fc26081f76 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -18,10 +18,10 @@
 
 #include "keduvocdocument.h"
 
-#include <QFileInfo>
-#include <QTextStream>
-#include <QtAlgorithms>
-#include <QIODevice>
+#include <QtCore/QFileInfo>
+#include <QtCore/QTextStream>
+#include <QtCore/QtAlgorithms>
+#include <QtCore/QIODevice>
 
 #include <klocale.h>
 #include <kdebug.h>

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index 04fc5b3dcc2aef163b21a2c059bfcac8699e0791..4a227282a421b3fce8bda2b24abcd021b10b26b1 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -33,7 +33,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 
-#include <kurl.h>
+#include <KUrl>
 
 #include "keduvocgrammar.h"
 #include "keduvocwordtype.h"

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index b9bd394da774b539266357d6f11709a46dbaecc6..0d9ec62ebb5cfb812b968536fc1236863e3a3f47 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -5,6 +5,7 @@
                           (C) 2001 The KDE-EDU team
                           (C) 2005 Eric Pignet <eric at erixpage.com>
                           (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
+                          (C) 2007 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
@@ -18,9 +19,9 @@
 
 #include "keduvockvtml2reader.h"
 
-#include <QTextStream>
-#include <QList>
-#include <QIODevice>
+#include <QtCore/QTextStream>
+#include <QtCore/QList>
+#include <QtCore/QIODevice>
 
 #include <klocale.h>
 

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index f7dcbc05bb1a73420a94c01a6d57cd8abc26c631..98c5b0b7df9b093e71cb6be8c7cb5ad25e3cd009 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -2,6 +2,7 @@
                    export a KEduVocDocument to a KVTML file
     -----------------------------------------------------------------------
     copyright           : (C) 2007 Jeremy Whiting <jeremy@scitools.com>
+                          (C) 2007 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
@@ -15,10 +16,10 @@
 
 #include "keduvockvtml2writer.h"
 
-#include <QTextStream>
-#include <QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
 
-#include <kdebug.h>
+#include <KDebug>
 
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"

diff --git a/keduvocdocument/keduvockvtml2writer.h b/keduvocdocument/keduvockvtml2writer.h
index ad6ee4c029236d440426cd40b49153801daa4ae4..3b2fde249d86bfaac7078bb5b9c31738c6bf5fb3 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.h
+++ b/keduvocdocument/keduvockvtml2writer.h
@@ -2,6 +2,7 @@
                      export a KEduVocDocument to a KVTML file
     -----------------------------------------------------------------------
     copyright       : (C) 2007 Jeremy Whiting <jeremy@scitools.com>
+                      (C) 2007 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
@@ -17,8 +18,8 @@
 #define KEDUVOCKVTML2WRITER_H
 
 #include <QtXml/QDomDocument>
-#include <QList>
-#include <QFile>
+#include <QtCore/QList>
+#include <QtCore/QFile>
 
 #include "keduvocgrammar.h"
 #include "keduvocmultiplechoice.h"
@@ -32,7 +33,7 @@ public:
   KEduVocKvtml2Writer(QFile *file);
 
   bool writeDoc(KEduVocDocument *doc, const QString &generator);
-  
+
   /** write information entries
    * @param informationElement QDomElement information to write to
    * @param generator text describing generator
@@ -43,31 +44,31 @@ public:
    * @param identifiersElement QDomElement identifiers to write to
    */
   bool writeIdentifiers(QDomElement &identifiersElement);
-  
+
   /** write article
    * @param articleElement QDomElement article to write to
    * @param article the article number to write
    */
   bool writeArticle(QDomElement &articleElement, int article);
-  
+
   /** write conjugation
    * @param conjugationElement QDomElement conjugation or personalpronouns to write to
    * @param conjugation object to write
    * @param type conjugation type
    */
-  bool writeConjugation(QDomElement &conjugationElement, const KEduVocConjugation &conjugation, 
+  bool writeConjugation(QDomElement &conjugationElement, const KEduVocConjugation &conjugation,
                         const QString &type);
 
   /** write types
    * @param typesElement QDomElement types to write to
    */
   bool writeTypes(QDomElement &typesElement);
-  
+
   /** write tenses
    * @param tensesElement QDomElement tenses to write to
    */
   bool writeTenses(QDomElement &tensesElement);
-  
+
   /** write usages
    * @param usagesElement QDomElement usages to write to
    */
@@ -77,25 +78,25 @@ public:
    * @param entriesElement QDomElement entries to write to
    */
   bool writeEntries(QDomElement &entriesElement);
-  
+
   /** write a translation
    * @param translationElement QDomElement translation to write to, with id pre-set
    * @param translation object to write
    */
   bool writeTranslation(QDomElement &translationElement, KEduVocTranslation &translation);
-  
+
   /** write the lesson group
    * @param lessonsElement QDomElement lessons to write to
    */
   bool writeLessons(QDomElement &lessonsElement);
- 
+
   /** write a comparison
    * @param comparisonElement QDomElement comparison to write to
    * @param comparison object to write
    * @returns success
    */
   bool writeComparison(QDomElement &comparisonElement, const KEduVocComparison &comparison);
-  
+
   /** write multiple choice choices
    * @param multipleChoiceElement QDomElement multiplechoice to write to
    * @returns success
@@ -105,10 +106,10 @@ public:
 private:
 
   QDomElement newTextElement(const QString &elementName, const QString &text);
-  
+
   QFile *m_outputFile;
   KEduVocDocument *m_doc;
-  
+
   QDomDocument m_domDoc;
 };
 

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index a8324a657100eb08611360f04b554f6f4a4c8fc1..0f3720154e43e5f2c68f99d7a02ea1d0a6c905bd 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -19,9 +19,9 @@
 
 #include "keduvockvtmlreader.h"
 
-#include <QTextStream>
-#include <QList>
-#include <QIODevice>
+#include <QtCore/QTextStream>
+#include <QtCore/QList>
+#include <QtCore/QIODevice>
 
 #include <kdebug.h>
 #include <klocale.h>

diff --git a/keduvocdocument/keduvockvtmlreader.h b/keduvocdocument/keduvockvtmlreader.h
index 354d7c01f21320a07ed5656597faad0cb6548c87..c983ff5b8d3c7212e5b54d0e99f05a24344e6452 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.h
+++ b/keduvocdocument/keduvockvtmlreader.h
@@ -21,7 +21,7 @@
 #define KEDUVOCKVTMLREADER_H
 
 #include <QtXml/QDomDocument>
-#include <QList>
+#include <QtCore/QList>
 
 
 #include "keduvocexpression.h"

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index b93d37c7826f36a2b4aa97ef9facb781cf68177d..f284ae541b1776c8b77a1bdcb706c5b12c2ee072 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -5,6 +5,7 @@
                           (C) 2001 The KDE-EDU team
                           (C) 2005 Eric Pignet <eric at erixpage.com>
                           (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
+                          (C) 2007 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
@@ -18,10 +19,10 @@
 
 #include "keduvockvtmlwriter.h"
 
-#include <QTextStream>
-#include <QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
 
-#include <kdebug.h>
+#include <KDebug>
 
 #include "keduvocdocument.h"
 #include "keduvoclesson.h"

diff --git a/keduvocdocument/keduvockvtmlwriter.h b/keduvocdocument/keduvockvtmlwriter.h
index d23c3a2d5e92abf6ce17942b2cc59b53e08cb34e..9d07f7f6d4f2a0528bd948a3cf721c7b3fe3af16 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.h
+++ b/keduvocdocument/keduvockvtmlwriter.h
@@ -5,6 +5,7 @@
                       (C) 2001 The KDE-EDU team
                       (C) 2005 Eric Pignet <eric at erixpage.com>
                       (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
+                      (C) 2007 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
@@ -20,8 +21,8 @@
 #define KEDUVOCKVTMLWRITER_H
 
 #include <QtXml/QDomDocument>
-#include <QList>
-#include <QFile>
+#include <QtCore/QList>
+#include <QtCore/QFile>
 
 #include "keduvocgrammar.h"
 #include "keduvocmultiplechoice.h"

diff --git a/keduvocdocument/keduvocwordtype.cpp b/keduvocdocument/keduvocwordtype.cpp
index c155717354e187e29f0e208e6246e3678d11f47b..d903480d9f29376d30566d6114c481d928412dc3 100644 (file)
--- a/keduvocdocument/keduvocwordtype.cpp
+++ b/keduvocdocument/keduvocwordtype.cpp
@@ -23,7 +23,7 @@
 
 #include "keduvocwordtype.h"
 
-#include <klocale.h>
+#include <KLocale>
 
 // #define QM_VERB           "v"    // go
 // #define   QM_VERB_IRR     "ir"

diff --git a/keduvocdocument/kvtml2defs.h b/keduvocdocument/kvtml2defs.h
index 0bcd5296ddbe385d60498a89182b3340d9c52c64..696aee83c53acf6e93acabd0edb5bc05c18b3ab0 100644 (file)
--- a/keduvocdocument/kvtml2defs.h
+++ b/keduvocdocument/kvtml2defs.h
@@ -2,6 +2,7 @@
                    Vocabulary Document for KDE Edu KVTML version 2
     -----------------------------------------------------------------------
     copyright     : (C) 2007 Jeremy Whiting <jeremy@scitools.com>
+                    (C) 2007 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************

diff --git a/keduvocdocument/kvtmldefs.h b/keduvocdocument/kvtmldefs.h
index ac65d193f15f314ee150d633c23b45e20a1a71f4..c5e71d88b6062299f9634af86b9ee365168ec2f5 100644 (file)
--- a/keduvocdocument/kvtmldefs.h
+++ b/keduvocdocument/kvtmldefs.h
@@ -4,6 +4,7 @@
     copyright     : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
                     (C) 2001 The KDE-EDU team
                     (C) 2005, 2007 Peter Hedlund <peter.hedlund@kdemail.net>
+                    (C) 2007 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************