AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include wx/qt/private/converter.h from src/qt/converter.cpp

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin 2019-01-30 18:07:33 +01:00
parent 6bd15cd1ee
commit b0d88a306d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/qt/private/converter.h
View File

@ -15,21 +15,19 @@
#include <QtCore/Qt> #include <QtCore/Qt>
#include "wx/kbdstate.h" #include "wx/kbdstate.h"
#include "wx/gdicmn.h"
// Rely on overloading and let the compiler pick the correct version, which makes // Rely on overloading and let the compiler pick the correct version, which makes
// them easier to use then to write wxQtConvertQtRectToWxRect() or wxQtConvertWxRectToQtRect() // them easier to use then to write wxQtConvertQtRectToWxRect() or wxQtConvertWxRectToQtRect()
class WXDLLIMPEXP_FWD_CORE wxPoint;
class QPoint; class QPoint;
wxPoint wxQtConvertPoint( const QPoint &point ); wxPoint wxQtConvertPoint( const QPoint &point );
QPoint wxQtConvertPoint( const wxPoint &point ); QPoint wxQtConvertPoint( const wxPoint &point );
class WXDLLIMPEXP_FWD_CORE wxRect;
class QRect; class QRect;
wxRect wxQtConvertRect( const QRect &rect ); wxRect wxQtConvertRect( const QRect &rect );
QRect wxQtConvertRect( const wxRect &rect ); QRect wxQtConvertRect( const wxRect &rect );
class WXDLLIMPEXP_FWD_BASE wxString;
class QString; class QString;
wxString wxQtConvertString( const QString &str ); wxString wxQtConvertString( const QString &str );
QString wxQtConvertString( const wxString &str ); QString wxQtConvertString( const wxString &str );
@ -44,7 +42,6 @@ QDate wxQtConvertDate(const wxDateTime& date);
#endif // wxUSE_DATETIME #endif // wxUSE_DATETIME
class WXDLLIMPEXP_FWD_BASE wxSize;
class QSize; class QSize;
wxSize wxQtConvertSize( const QSize &size ); wxSize wxQtConvertSize( const QSize &size );
QSize wxQtConvertSize( const wxSize &size ); QSize wxQtConvertSize( const wxSize &size );

3
src/qt/converter.cpp
View File

@ -23,8 +23,7 @@
#include <QtCore/QDate> #include <QtCore/QDate>
#endif // wxUSE_DATETIME #endif // wxUSE_DATETIME
#include "wx/kbdstate.h" #include "wx/qt/private/converter.h"
#include "wx/gdicmn.h"
wxPoint wxQtConvertPoint( const QPoint &point ) wxPoint wxQtConvertPoint( const QPoint &point )