From e9ccc40c28d11d7d17e6c79a627590f730b7c120 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Wed, 28 Sep 2011 20:30:25 +0200
Subject: Get rid of the last traces of QMimeSource

The class has been deprecated since Qt 4.0, but
couldn't be removed as QDropEvent inherited from
it.

Change-Id: I9caa19b30977a319e79255900dee8b2425783f46
Reviewed-on: http://codereview.qt-project.org/5754
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
---
 src/widgets/dialogs/qcolordialog.cpp        | 2 +-
 src/widgets/dialogs/qfilesystemmodel.cpp    | 2 +-
 src/widgets/itemviews/qabstractitemview_p.h | 2 +-
 src/widgets/itemviews/qdirmodel.cpp         | 2 +-
 src/widgets/widgets/qlineedit_p.h           | 1 +
 src/widgets/widgets/qplaintextedit.cpp      | 1 -
 src/widgets/widgets/qtextedit.cpp           | 1 -
 src/widgets/widgets/qwidgettextcontrol.cpp  | 1 -
 src/widgets/widgets/qwidgettextcontrol_p.h  | 2 +-
 9 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index b26e911899..ce3e54f1f3 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -60,7 +60,7 @@
 #include "qstyle.h"
 #include "qstyleoption.h"
 #include "qvalidator.h"
-#include "qmime.h"
+#include "qmimedata.h"
 #include "qspinbox.h"
 #include "qdialogbuttonbox.h"
 #include "private/qguiplatformplugin_p.h"
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index 10d627c594..82de3f724b 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -42,7 +42,7 @@
 #include "qfilesystemmodel_p.h"
 #include "qfilesystemmodel.h"
 #include <qlocale.h>
-#include <qmime.h>
+#include <qmimedata.h>
 #include <qurl.h>
 #include <qdebug.h>
 #include <qmessagebox.h>
diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h
index cd15694ffe..e1cda31915 100644
--- a/src/widgets/itemviews/qabstractitemview_p.h
+++ b/src/widgets/itemviews/qabstractitemview_p.h
@@ -57,7 +57,7 @@
 #include "private/qabstractitemmodel_p.h"
 #include "QtWidgets/qapplication.h"
 #include "QtGui/qevent.h"
-#include "QtGui/qmime.h"
+#include "QtCore/qmimedata.h"
 #include "QtGui/qpainter.h"
 #include "QtCore/qpair.h"
 #include "QtGui/qregion.h"
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp
index 70958195f7..fd9f0f748a 100644
--- a/src/widgets/itemviews/qdirmodel.cpp
+++ b/src/widgets/itemviews/qdirmodel.cpp
@@ -46,7 +46,7 @@
 #include <qfile.h>
 #include <qfilesystemmodel.h>
 #include <qurl.h>
-#include <qmime.h>
+#include <qmimedata.h>
 #include <qpair.h>
 #include <qvector.h>
 #include <qobject.h>
diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h
index c7d14cbd32..d916ae3185 100644
--- a/src/widgets/widgets/qlineedit_p.h
+++ b/src/widgets/widgets/qlineedit_p.h
@@ -63,6 +63,7 @@
 #include "QtCore/qbasictimer.h"
 #include "QtWidgets/qcompleter.h"
 #include "QtCore/qpointer.h"
+#include "QtCore/qmimedata.h"
 #include "QtWidgets/qlineedit.h"
 
 #include "private/qwidgetlinecontrol_p.h"
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index 550b2c4784..ec9d251a91 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -46,7 +46,6 @@
 #include <qpainter.h>
 #include <qevent.h>
 #include <qdebug.h>
-#include <qmime.h>
 #include <qdrag.h>
 #include <qclipboard.h>
 #include <qmenu.h>
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 13f03b9908..46a263e0ae 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -48,7 +48,6 @@
 #include <qpainter.h>
 #include <qevent.h>
 #include <qdebug.h>
-#include <qmime.h>
 #include <qdrag.h>
 #include <qclipboard.h>
 #include <qmenu.h>
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 43ebb6b078..e1be88f81b 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -48,7 +48,6 @@
 #include <qpainter.h>
 #include <qevent.h>
 #include <qdebug.h>
-#include <qmime.h>
 #include <qdrag.h>
 #include <qclipboard.h>
 #include <qmenu.h>
diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h
index 67ae0596b3..f1ac09d459 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p.h
@@ -63,6 +63,7 @@
 #include <QtGui/qabstracttextdocumentlayout.h>
 #include <QtGui/qtextdocumentfragment.h>
 #include <QtGui/qclipboard.h>
+#include <QtCore/qmimedata.h>
 
 QT_BEGIN_HEADER
 
@@ -74,7 +75,6 @@ class QStyleSheet;
 class QTextDocument;
 class QMenu;
 class QWidgetTextControlPrivate;
-class QMimeData;
 class QAbstractScrollArea;
 class QEvent;
 class QTimerEvent;
-- 
cgit v1.2.3