From b0d88a306dc5d59804d848553f1b61337cc37b3f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 30 Jan 2019 18:07:33 +0100 Subject: [PATCH] Include wx/qt/private/converter.h from src/qt/converter.cpp Follow standard practice and include the header corresponding to the source file from it explicitly. Also include wx/gdicmn.h from the header itself, this is a pretty common header and there is no real advantage in avoiding it there and including it allows to avoid a bunch of forward declarations. --- include/wx/qt/private/converter.h | 5 +---- src/qt/converter.cpp | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/wx/qt/private/converter.h b/include/wx/qt/private/converter.h index f6406a8009..5f7b406a08 100644 --- a/include/wx/qt/private/converter.h +++ b/include/wx/qt/private/converter.h @@ -15,21 +15,19 @@ #include #include "wx/kbdstate.h" +#include "wx/gdicmn.h" // Rely on overloading and let the compiler pick the correct version, which makes // them easier to use then to write wxQtConvertQtRectToWxRect() or wxQtConvertWxRectToQtRect() -class WXDLLIMPEXP_FWD_CORE wxPoint; class QPoint; wxPoint wxQtConvertPoint( const QPoint &point ); QPoint wxQtConvertPoint( const wxPoint &point ); -class WXDLLIMPEXP_FWD_CORE wxRect; class QRect; wxRect wxQtConvertRect( const QRect &rect ); QRect wxQtConvertRect( const wxRect &rect ); -class WXDLLIMPEXP_FWD_BASE wxString; class QString; wxString wxQtConvertString( const QString &str ); QString wxQtConvertString( const wxString &str ); @@ -44,7 +42,6 @@ QDate wxQtConvertDate(const wxDateTime& date); #endif // wxUSE_DATETIME -class WXDLLIMPEXP_FWD_BASE wxSize; 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 9e71dffd24..86b7724dcc 100644 --- a/src/qt/converter.cpp +++ b/src/qt/converter.cpp @@ -23,8 +23,7 @@ #include #endif // wxUSE_DATETIME -#include "wx/kbdstate.h" -#include "wx/gdicmn.h" +#include "wx/qt/private/converter.h" wxPoint wxQtConvertPoint( const QPoint &point )