Qt4 style includes. Get rid of warnings.

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

diff --git a/kdeeducore/keduvocdata.cpp b/kdeeducore/keduvocdata.cpp
index 52b8e0cd58fdde8ca43d922c110d236c467c63b0..7e97be3254cdf0fff6cc305cbb17a9978bb1c809 100644 (file)
--- a/kdeeducore/keduvocdata.cpp
+++ b/kdeeducore/keduvocdata.cpp
@@ -16,12 +16,12 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "keduvocdata.h"
-
-#include <qfile.h>
+#include <QFile>
 
 #include <kdebug.h>
 
+#include "keduvocdata.h"
+
 ////////////////////////////////////////////////////////////////////////////////
 // class KEduVocDataItem
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/kdeeducore/keduvocdata.h b/kdeeducore/keduvocdata.h
index 4728a1248c02ce8f0dcc7631a1e14b6575e83519..d1f94b3911a8dd16651b3a5dcfbad0b0f63de5ec 100644 (file)
--- a/kdeeducore/keduvocdata.h
+++ b/kdeeducore/keduvocdata.h
@@ -19,8 +19,9 @@
 #ifndef KEDUVOCDATA_H
 #define KEDUVOCDATA_H
 
-#include <qdom.h>
-#include <qlist.h>
+#include <QtXml>
+#include <QList>
+
 #include <kdemacros.h>
 
 class KDE_EXPORT KEduVocDataItem

diff --git a/kdeeducore/keduvocmultiplechoice.h b/kdeeducore/keduvocmultiplechoice.h
index 55efe698af468c83f2fc65b97723cb8c43282d73..b59f4d08ae09833abde16fbe4433b1073848c9a4 100644 (file)
--- a/kdeeducore/keduvocmultiplechoice.h
+++ b/kdeeducore/keduvocmultiplechoice.h
@@ -27,7 +27,7 @@
 #ifndef MultipleChoice_included
 #define MultipleChoice_included
 
-#include <qstring.h>
+#include <QString>
 
 #define MAX_MULTIPLE_CHOICE  5  // select one out of x
 

diff --git a/kdeeducore/keduvocwqlreader.cpp b/kdeeducore/keduvocwqlreader.cpp
index d1b7e550a874c0bfa60cc9e1d3b60802b6d6b626..57be9ece7eee8d938a325b4d807706cebe7845bb 100644 (file)
--- a/kdeeducore/keduvocwqlreader.cpp
+++ b/kdeeducore/keduvocwqlreader.cpp
@@ -15,14 +15,14 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QDom>
+#include <QTextStream>
+
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include <qdom.h>
-#include <qtextstream.h>
-
 #include "keduvocwqlreader.h"
 #include "keduvocdocument.h"
 

diff --git a/kdeeducore/keduvocwqlwriter.cpp b/kdeeducore/keduvocwqlwriter.cpp
index 9beda3d0476de9d7d2eac2cfdd53da586d118530..a2988b9aba91e416649bf3e0ce4136f8f2bdef43 100644 (file)
--- a/kdeeducore/keduvocwqlwriter.cpp
+++ b/kdeeducore/keduvocwqlwriter.cpp
@@ -15,10 +15,11 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QDom>
+#include <QTextStream>
+#include <QFont>
+
 #include <kdebug.h>
-#include <qdom.h>
-#include <qtextstream.h>
-#include <qfont.h>
 
 #include "keduvocwqlwriter.h"
 #include "keduvocdocument.h"

diff --git a/kdeeducore/keduvowqlreader.cpp b/kdeeducore/keduvowqlreader.cpp
index fea891fea131725bed28b461308e09ff56460fa3..a15756082cb238291e441b7a7652f4baa6dd305e 100644 (file)
--- a/kdeeducore/keduvowqlreader.cpp
+++ b/kdeeducore/keduvowqlreader.cpp
@@ -15,14 +15,14 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QtXml>
+#include <QTextStream>
+
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include <qdom.h>
-#include <qtextstream.h>
-
 #include "keduvocwqlreader.h"
 #include "keduvocdocument.h"
 

diff --git a/kdeeducore/keduvowqlwriter.cpp b/kdeeducore/keduvowqlwriter.cpp
index a353bd9754d187a7d080dd115ad914b25d3cf7d6..15854e4b6c1bac89ab2ccd627ef5da35f621a68d 100644 (file)
--- a/kdeeducore/keduvowqlwriter.cpp
+++ b/kdeeducore/keduvowqlwriter.cpp
@@ -15,10 +15,11 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QtXml>
+#include <QTextStream>
+#include <QFont>
+
 #include <kdebug.h>
-#include <qdom.h>
-#include <qtextstream.h>
-#include <qfont.h>
 
 #include "keduvocwqlwriter.h"
 #include "keduvocdocument.h"
@@ -125,4 +126,4 @@ void KEduVocWqlWriter::writeItem( const QString & left, const QString & right, i
 {
   m_outputStream << left  << QString( "   [%1]").arg(rh * 15, 10, 10 ) << winendl ;
   m_outputStream << right << winendl;
-}
\ No newline at end of file
+}