From 5154cc711a97b243e54f4dea9f32ac62a6bac44f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 30 Jan 2019 18:11:03 +0100
Subject: [PATCH] Include QRect, QSize and QString from
 wx/qt/private/converter.h

Similarly to the previous commit, it doesn't seem to be worth it to
avoid including these simple and common headers from there and it
simplifies code and will allow making the converter functions inline.
---
 include/wx/qt/private/converter.h | 9 ++++-----
 src/qt/converter.cpp              | 3 ---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/wx/qt/private/converter.h b/include/wx/qt/private/converter.h
index 5f7b406a08..d55e9e8110 100644
--- a/include/wx/qt/private/converter.h
+++ b/include/wx/qt/private/converter.h
@@ -12,23 +12,23 @@
 #define _WX_QT_CONVERTER_H_
 
 #include "wx/defs.h"
-#include <QtCore/Qt>
 
 #include "wx/kbdstate.h"
 #include "wx/gdicmn.h"
 
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+#include <QtCore/QString>
+
 // Rely on overloading and let the compiler pick the correct version, which makes
 // them easier to use then to write wxQtConvertQtRectToWxRect() or wxQtConvertWxRectToQtRect()
 
-class QPoint;
 wxPoint wxQtConvertPoint( const QPoint &point );
 QPoint wxQtConvertPoint( const wxPoint &point );
 
-class QRect;
 wxRect wxQtConvertRect( const QRect &rect );
 QRect  wxQtConvertRect( const wxRect &rect );
 
-class QString;
 wxString wxQtConvertString( const QString &str );
 QString  wxQtConvertString( const wxString &str );
 
@@ -42,7 +42,6 @@ QDate wxQtConvertDate(const wxDateTime& date);
 
 #endif // wxUSE_DATETIME
 
-class QSize;
 wxSize wxQtConvertSize( const QSize  &size );
 QSize  wxQtConvertSize( const wxSize &size );
 
diff --git a/src/qt/converter.cpp b/src/qt/converter.cpp
index 86b7724dcc..f2941e322d 100644
--- a/src/qt/converter.cpp
+++ b/src/qt/converter.cpp
@@ -13,10 +13,7 @@
     #pragma hdrstop
 #endif
 
-#include <QtCore/QRect>
-#include <QtCore/QString>
 #include <QtGui/QFont>
-#include <QtCore/QSize>
 
 #if wxUSE_DATETIME
     #include "wx/datetime.h"