From: Peter Hedlund <peter@peterandlinda.com>
Date: Tue, 8 Nov 2005 02:50:22 +0000 (+0000)
Subject: Qt4 style includes. Get rid of warnings.
X-Git-Tag: v3.80.2~223
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=ff3876974b42f59e1eb579c80a721c1ce0708bc0;p=libqmvoc.git

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 52b8e0c..7e97be3 100644
--- 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 4728a12..d1f94b3 100644
--- 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 55efe69..b59f4d0 100644
--- 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 d1b7e55..57be9ec 100644
--- 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 9beda3d..a2988b9 100644
--- 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 fea891f..a157560 100644
--- 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 a353bd9..15854e4 100644
--- 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
+}