Change Qt smart pointers with wx ones to fix compilation

2019-02-27 22:06:47 +02:00
parent 66f6559a58
commit 934698d8ac
4 changed files with 10 additions and 12 deletions
--- a/include/wx/qt/window.h
+++ b/include/wx/qt/window.h
@@ -9,8 +9,6 @@
 #ifndef _WX_QT_WINDOW_H_
 #define _WX_QT_WINDOW_H_

-#include <QtCore/QScopedPointer>
-
 class QShortcut;
 template < class T > class QList;

@@ -229,13 +227,13 @@ private:
    bool QtSetBackgroundStyle();

    QPicture *m_qtPicture;                                   // not owned
-    QScopedPointer<QPainter> m_qtPainter;                    // always allocated
+    wxScopedPtr<QPainter> m_qtPainter;                       // always allocated

    bool m_mouseInside;

 #if wxUSE_ACCEL
    wxVector<QShortcut*> m_qtShortcuts; // owned by whatever GetHandle() returns
-    QScopedPointer<wxQtShortcutHandler> m_qtShortcutHandler; // always allocated
+    wxScopedPtr<wxQtShortcutHandler> m_qtShortcutHandler;    // always allocated
    bool m_processingShortcut;
 #endif // wxUSE_ACCEL