Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include QRect, QSize and QString from wx/qt/private/converter.h

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2019-01-30 18:11:03 +01:00
parent b0d88a306d
commit 5154cc711a
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,23 +12,23 @@
#define _WX_QT_CONVERTER_H_ #define _WX_QT_CONVERTER_H_
#include "wx/defs.h" #include "wx/defs.h"
#include <QtCore/Qt>
#include "wx/kbdstate.h" #include "wx/kbdstate.h"
#include "wx/gdicmn.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 // 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 QPoint;
wxPoint wxQtConvertPoint( const QPoint &point ); wxPoint wxQtConvertPoint( const QPoint &point );
QPoint wxQtConvertPoint( const wxPoint &point ); QPoint wxQtConvertPoint( const wxPoint &point );
class QRect;
wxRect wxQtConvertRect( const QRect &rect ); wxRect wxQtConvertRect( const QRect &rect );
QRect wxQtConvertRect( const wxRect &rect ); QRect wxQtConvertRect( const wxRect &rect );
class QString;
wxString wxQtConvertString( const QString &str ); wxString wxQtConvertString( const QString &str );
QString wxQtConvertString( const wxString &str ); QString wxQtConvertString( const wxString &str );
@@ -42,7 +42,6 @@ QDate wxQtConvertDate(const wxDateTime& date);
#endif // wxUSE_DATETIME #endif // wxUSE_DATETIME
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

@@ -13,10 +13,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#include <QtCore/QRect>
#include <QtCore/QString>
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtCore/QSize>
#if wxUSE_DATETIME #if wxUSE_DATETIME
#include "wx/datetime.h" #include "wx/datetime.h"