diff options
Diffstat (limited to 'src/plugins/platforms/haiku')
18 files changed, 78 insertions, 78 deletions
diff --git a/src/plugins/platforms/haiku/main.cpp b/src/plugins/platforms/haiku/main.cpp index 02168d0165..841891970d 100644 --- a/src/plugins/platforms/haiku/main.cpp +++ b/src/plugins/platforms/haiku/main.cpp @@ -47,7 +47,7 @@ QPlatformIntegration *QHaikuIntegrationPlugin::create(const QString& system, con if (!system.compare(QLatin1String("haiku"), Qt::CaseInsensitive)) return new QHaikuIntegration(paramList); - return Q_NULLPTR; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/haiku/main.h b/src/plugins/platforms/haiku/main.h index 82f3313652..e316b79d7c 100644 --- a/src/plugins/platforms/haiku/main.h +++ b/src/plugins/platforms/haiku/main.h @@ -47,7 +47,7 @@ class QHaikuIntegrationPlugin : public QPlatformIntegrationPlugin Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "haiku.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/haiku/qhaikuapplication.h b/src/plugins/platforms/haiku/qhaikuapplication.h index 0696df8109..a9ea442691 100644 --- a/src/plugins/platforms/haiku/qhaikuapplication.h +++ b/src/plugins/platforms/haiku/qhaikuapplication.h @@ -49,8 +49,8 @@ class QHaikuApplication : public BApplication public: explicit QHaikuApplication(const char *signature); - bool QuitRequested() Q_DECL_OVERRIDE; - void RefsReceived(BMessage* message) Q_DECL_OVERRIDE; + bool QuitRequested() override; + void RefsReceived(BMessage* message) override; }; #endif diff --git a/src/plugins/platforms/haiku/qhaikubuffer.cpp b/src/plugins/platforms/haiku/qhaikubuffer.cpp index c6f6ffe6bc..f25ddef86b 100644 --- a/src/plugins/platforms/haiku/qhaikubuffer.cpp +++ b/src/plugins/platforms/haiku/qhaikubuffer.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE QHaikuBuffer::QHaikuBuffer() - : m_buffer(Q_NULLPTR) + : m_buffer(nullptr) { } @@ -63,12 +63,12 @@ BBitmap* QHaikuBuffer::nativeBuffer() const const QImage *QHaikuBuffer::image() const { - return (m_buffer != Q_NULLPTR) ? &m_image : Q_NULLPTR; + return (m_buffer != nullptr) ? &m_image : nullptr; } QImage *QHaikuBuffer::image() { - return (m_buffer != Q_NULLPTR) ? &m_image : Q_NULLPTR; + return (m_buffer != nullptr) ? &m_image : nullptr; } QRect QHaikuBuffer::rect() const diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.cpp b/src/plugins/platforms/haiku/qhaikuclipboard.cpp index 774da4432a..20519e21d0 100644 --- a/src/plugins/platforms/haiku/qhaikuclipboard.cpp +++ b/src/plugins/platforms/haiku/qhaikuclipboard.cpp @@ -47,8 +47,8 @@ #include <Clipboard.h> QHaikuClipboard::QHaikuClipboard() - : m_systemMimeData(Q_NULLPTR) - , m_userMimeData(Q_NULLPTR) + : m_systemMimeData(nullptr) + , m_userMimeData(nullptr) { if (be_clipboard) be_clipboard->StartWatching(BMessenger(this)); @@ -81,12 +81,12 @@ QMimeData *QHaikuClipboard::mimeData(QClipboard::Mode mode) const BMessage *clipboard = be_clipboard->Data(); if (clipboard) { - char *name = Q_NULLPTR; + char *name = nullptr; uint32 type = 0; int32 count = 0; for (int i = 0; clipboard->GetInfo(B_MIME_TYPE, i, &name, &type, &count) == B_OK; i++) { - const void *data = Q_NULLPTR; + const void *data = nullptr; int32 dataLen = 0; const status_t status = clipboard->FindData(name, B_MIME_TYPE, &data, &dataLen); @@ -162,7 +162,7 @@ void QHaikuClipboard::MessageReceived(BMessage* message) { if (message->what == B_CLIPBOARD_CHANGED) { delete m_userMimeData; - m_userMimeData = Q_NULLPTR; + m_userMimeData = nullptr; emitChanged(QClipboard::Clipboard); } diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.h b/src/plugins/platforms/haiku/qhaikuclipboard.h index 3dd4496e8d..b6eb3f591f 100644 --- a/src/plugins/platforms/haiku/qhaikuclipboard.h +++ b/src/plugins/platforms/haiku/qhaikuclipboard.h @@ -54,13 +54,13 @@ public: QHaikuClipboard(); ~QHaikuClipboard(); - QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; - bool ownsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; + QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override; + void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override; + bool supportsMode(QClipboard::Mode mode) const override; + bool ownsMode(QClipboard::Mode mode) const override; // override from BHandler to catch change notifications from Haiku clipboard - void MessageReceived(BMessage* message) Q_DECL_OVERRIDE; + void MessageReceived(BMessage* message) override; private: QMimeData *m_systemMimeData; diff --git a/src/plugins/platforms/haiku/qhaikucursor.h b/src/plugins/platforms/haiku/qhaikucursor.h index 5d70c97d9e..73a1d2c492 100644 --- a/src/plugins/platforms/haiku/qhaikucursor.h +++ b/src/plugins/platforms/haiku/qhaikucursor.h @@ -52,7 +52,7 @@ public: QHaikuCursor(); #ifndef QT_NO_CURSOR - void changeCursor(QCursor *windowCursor, QWindow *window) Q_DECL_OVERRIDE; + void changeCursor(QCursor *windowCursor, QWindow *window) override; #endif private: diff --git a/src/plugins/platforms/haiku/qhaikuintegration.cpp b/src/plugins/platforms/haiku/qhaikuintegration.cpp index d46d77ff18..8bd2171794 100644 --- a/src/plugins/platforms/haiku/qhaikuintegration.cpp +++ b/src/plugins/platforms/haiku/qhaikuintegration.cpp @@ -87,13 +87,13 @@ QHaikuIntegration::QHaikuIntegration(const QStringList ¶meters) QHaikuIntegration::~QHaikuIntegration() { destroyScreen(m_screen); - m_screen = Q_NULLPTR; + m_screen = nullptr; delete m_services; - m_services = Q_NULLPTR; + m_services = nullptr; delete m_clipboard; - m_clipboard = Q_NULLPTR; + m_clipboard = nullptr; be_app->LockLooper(); be_app->Quit(); diff --git a/src/plugins/platforms/haiku/qhaikuintegration.h b/src/plugins/platforms/haiku/qhaikuintegration.h index 1b938acb82..5c7a173c91 100644 --- a/src/plugins/platforms/haiku/qhaikuintegration.h +++ b/src/plugins/platforms/haiku/qhaikuintegration.h @@ -54,17 +54,17 @@ public: explicit QHaikuIntegration(const QStringList ¶mList); ~QHaikuIntegration(); - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; + bool hasCapability(QPlatformIntegration::Capability cap) const override; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; + QAbstractEventDispatcher *createEventDispatcher() const override; - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; - QPlatformServices *services() const Q_DECL_OVERRIDE; + QPlatformFontDatabase *fontDatabase() const override; + QPlatformServices *services() const override; #ifndef QT_NO_CLIPBOARD - QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; + QPlatformClipboard *clipboard() const override; #endif private: diff --git a/src/plugins/platforms/haiku/qhaikurasterbackingstore.cpp b/src/plugins/platforms/haiku/qhaikurasterbackingstore.cpp index ee53f693cd..613ae471cb 100644 --- a/src/plugins/platforms/haiku/qhaikurasterbackingstore.cpp +++ b/src/plugins/platforms/haiku/qhaikurasterbackingstore.cpp @@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE QHaikuRasterBackingStore::QHaikuRasterBackingStore(QWindow *window) : QPlatformBackingStore(window) - , m_bitmap(Q_NULLPTR) + , m_bitmap(nullptr) { } QHaikuRasterBackingStore::~QHaikuRasterBackingStore() { delete m_bitmap; - m_bitmap = Q_NULLPTR; + m_bitmap = nullptr; } QPaintDevice *QHaikuRasterBackingStore::paintDevice() @@ -62,7 +62,7 @@ QPaintDevice *QHaikuRasterBackingStore::paintDevice() if (!m_bufferSize.isEmpty() && m_bitmap) return m_buffer.image(); - return Q_NULLPTR; + return nullptr; } void QHaikuRasterBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoint &offset) diff --git a/src/plugins/platforms/haiku/qhaikurasterbackingstore.h b/src/plugins/platforms/haiku/qhaikurasterbackingstore.h index 06a46e7eb3..060ab27126 100644 --- a/src/plugins/platforms/haiku/qhaikurasterbackingstore.h +++ b/src/plugins/platforms/haiku/qhaikurasterbackingstore.h @@ -55,9 +55,9 @@ public: explicit QHaikuRasterBackingStore(QWindow *window); ~QHaikuRasterBackingStore(); - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; + void resize(const QSize &size, const QRegion &staticContents) override; private: BBitmap *m_bitmap; diff --git a/src/plugins/platforms/haiku/qhaikurasterwindow.cpp b/src/plugins/platforms/haiku/qhaikurasterwindow.cpp index 9834b7cbc7..7e57e67bab 100644 --- a/src/plugins/platforms/haiku/qhaikurasterwindow.cpp +++ b/src/plugins/platforms/haiku/qhaikurasterwindow.cpp @@ -211,7 +211,7 @@ void HaikuViewProxy::handleKeyEvent(QEvent::Type type, BMessage *message) { int32 key = 0; uint32 code = 0; - const char *bytes = Q_NULLPTR; + const char *bytes = nullptr; QString text; if (message) { @@ -265,7 +265,7 @@ QHaikuRasterWindow::~QHaikuRasterWindow() m_window->UnlockLooper(); delete m_view; - m_view = Q_NULLPTR; + m_view = nullptr; } BView* QHaikuRasterWindow::nativeViewHandle() const diff --git a/src/plugins/platforms/haiku/qhaikurasterwindow.h b/src/plugins/platforms/haiku/qhaikurasterwindow.h index ae57e0f0e4..24b13aa122 100644 --- a/src/plugins/platforms/haiku/qhaikurasterwindow.h +++ b/src/plugins/platforms/haiku/qhaikurasterwindow.h @@ -51,15 +51,15 @@ class HaikuViewProxy : public QObject, public BView Q_OBJECT public: - explicit HaikuViewProxy(BWindow *window, QObject *parent = Q_NULLPTR); + explicit HaikuViewProxy(BWindow *window, QObject *parent = nullptr); - void MessageReceived(BMessage *message) Q_DECL_OVERRIDE; - void Draw(BRect updateRect) Q_DECL_OVERRIDE; - void MouseDown(BPoint pos) Q_DECL_OVERRIDE; - void MouseUp(BPoint pos) Q_DECL_OVERRIDE; - void MouseMoved(BPoint pos, uint32 code, const BMessage *dragMessage) Q_DECL_OVERRIDE; - void KeyDown(const char *bytes, int32 numBytes) Q_DECL_OVERRIDE; - void KeyUp(const char *bytes, int32 numBytes) Q_DECL_OVERRIDE; + void MessageReceived(BMessage *message) override; + void Draw(BRect updateRect) override; + void MouseDown(BPoint pos) override; + void MouseUp(BPoint pos) override; + void MouseMoved(BPoint pos, uint32 code, const BMessage *dragMessage) override; + void KeyDown(const char *bytes, int32 numBytes) override; + void KeyUp(const char *bytes, int32 numBytes) override; Q_SIGNALS: void mouseEvent(const QPoint &localPosition, const QPoint &globalPosition, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source); diff --git a/src/plugins/platforms/haiku/qhaikuscreen.cpp b/src/plugins/platforms/haiku/qhaikuscreen.cpp index 54951a0af5..2c8abba8aa 100644 --- a/src/plugins/platforms/haiku/qhaikuscreen.cpp +++ b/src/plugins/platforms/haiku/qhaikuscreen.cpp @@ -58,10 +58,10 @@ QHaikuScreen::QHaikuScreen() QHaikuScreen::~QHaikuScreen() { delete m_cursor; - m_cursor = Q_NULLPTR; + m_cursor = nullptr; delete m_screen; - m_screen = Q_NULLPTR; + m_screen = nullptr; } QPixmap QHaikuScreen::grabWindow(WId winId, int x, int y, int width, int height) const @@ -69,8 +69,8 @@ QPixmap QHaikuScreen::grabWindow(WId winId, int x, int y, int width, int height) if (width == 0 || height == 0) return QPixmap(); - BScreen screen(Q_NULLPTR); - BBitmap *bitmap = Q_NULLPTR; + BScreen screen(nullptr); + BBitmap *bitmap = nullptr; screen.GetBitmap(&bitmap); const BRect frame = (winId ? ((BWindow*)winId)->Frame() : screen.Frame()); diff --git a/src/plugins/platforms/haiku/qhaikuscreen.h b/src/plugins/platforms/haiku/qhaikuscreen.h index 49fa3f0a60..98de6fdd03 100644 --- a/src/plugins/platforms/haiku/qhaikuscreen.h +++ b/src/plugins/platforms/haiku/qhaikuscreen.h @@ -53,13 +53,13 @@ public: QHaikuScreen(); ~QHaikuScreen(); - QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE; + QPixmap grabWindow(WId window, int x, int y, int width, int height) const override; - QRect geometry() const Q_DECL_OVERRIDE; - int depth() const Q_DECL_OVERRIDE; - QImage::Format format() const Q_DECL_OVERRIDE; + QRect geometry() const override; + int depth() const override; + QImage::Format format() const override; - QPlatformCursor *cursor() const Q_DECL_OVERRIDE; + QPlatformCursor *cursor() const override; private: BScreen *m_screen; diff --git a/src/plugins/platforms/haiku/qhaikuservices.h b/src/plugins/platforms/haiku/qhaikuservices.h index a210eb8b61..59ff6395fb 100644 --- a/src/plugins/platforms/haiku/qhaikuservices.h +++ b/src/plugins/platforms/haiku/qhaikuservices.h @@ -47,10 +47,10 @@ QT_BEGIN_NAMESPACE class QHaikuServices : public QPlatformServices { public: - bool openUrl(const QUrl &url) Q_DECL_OVERRIDE; - bool openDocument(const QUrl &url) Q_DECL_OVERRIDE; + bool openUrl(const QUrl &url) override; + bool openDocument(const QUrl &url) override; - QByteArray desktopEnvironment() const Q_DECL_OVERRIDE; + QByteArray desktopEnvironment() const override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/haiku/qhaikuwindow.cpp b/src/plugins/platforms/haiku/qhaikuwindow.cpp index 4bea7f7ff6..f8fdf3f92d 100644 --- a/src/plugins/platforms/haiku/qhaikuwindow.cpp +++ b/src/plugins/platforms/haiku/qhaikuwindow.cpp @@ -118,12 +118,12 @@ void HaikuWindowProxy::zoomByQt() QHaikuWindow::QHaikuWindow(QWindow *window) : QPlatformWindow(window) - , m_window(Q_NULLPTR) + , m_window(nullptr) , m_windowState(Qt::WindowNoState) { const QRect rect = initialGeometry(window, window->geometry(), DefaultWindowWidth, DefaultWindowHeight); - HaikuWindowProxy *haikuWindow = new HaikuWindowProxy(window, rect, Q_NULLPTR); + HaikuWindowProxy *haikuWindow = new HaikuWindowProxy(window, rect, nullptr); connect(haikuWindow, SIGNAL(moved(QPoint)), SLOT(haikuWindowMoved(QPoint))); connect(haikuWindow, SIGNAL(resized(QSize,bool)), SLOT(haikuWindowResized(QSize,bool))); connect(haikuWindow, SIGNAL(windowActivated(bool)), SLOT(haikuWindowActivated(bool))); @@ -145,7 +145,7 @@ QHaikuWindow::~QHaikuWindow() m_window->LockLooper(); m_window->Quit(); - m_window = Q_NULLPTR; + m_window = nullptr; } void QHaikuWindow::setGeometry(const QRect &rect) @@ -330,7 +330,7 @@ void QHaikuWindow::haikuWindowResized(const QSize &size, bool zoomInProgress) void QHaikuWindow::haikuWindowActivated(bool activated) { - QWindowSystemInterface::handleWindowActivated(activated ? window() : Q_NULLPTR); + QWindowSystemInterface::handleWindowActivated(activated ? window() : nullptr); } void QHaikuWindow::haikuWindowMinimized(bool minimize) diff --git a/src/plugins/platforms/haiku/qhaikuwindow.h b/src/plugins/platforms/haiku/qhaikuwindow.h index 5bfb99e532..bb57742087 100644 --- a/src/plugins/platforms/haiku/qhaikuwindow.h +++ b/src/plugins/platforms/haiku/qhaikuwindow.h @@ -51,14 +51,14 @@ class HaikuWindowProxy : public QObject, public BWindow Q_OBJECT public: - explicit HaikuWindowProxy(QWindow *window, const QRect &rect, QObject *parent = Q_NULLPTR); + explicit HaikuWindowProxy(QWindow *window, const QRect &rect, QObject *parent = nullptr); - void FrameMoved(BPoint pos) Q_DECL_OVERRIDE; - void FrameResized(float width, float height) Q_DECL_OVERRIDE; - void WindowActivated(bool activated) Q_DECL_OVERRIDE; - void Minimize(bool minimize) Q_DECL_OVERRIDE; - void Zoom(BPoint pos, float width, float height) Q_DECL_OVERRIDE; - bool QuitRequested() Q_DECL_OVERRIDE; + void FrameMoved(BPoint pos) override; + void FrameResized(float width, float height) override; + void WindowActivated(bool activated) override; + void Minimize(bool minimize) override; + void Zoom(BPoint pos, float width, float height) override; + bool QuitRequested() override; void zoomByQt(); @@ -83,23 +83,23 @@ public: explicit QHaikuWindow(QWindow *window); virtual ~QHaikuWindow(); - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - QMargins frameMargins() const Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; + QMargins frameMargins() const override; + void setVisible(bool visible) override; - bool isExposed() const Q_DECL_OVERRIDE; - bool isActive() const Q_DECL_OVERRIDE; + bool isExposed() const override; + bool isActive() const override; - WId winId() const Q_DECL_OVERRIDE; + WId winId() const override; BWindow* nativeHandle() const; - void requestActivateWindow() Q_DECL_OVERRIDE; - void setWindowState(Qt::WindowStates state) Q_DECL_OVERRIDE; - void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE; + void requestActivateWindow() override; + void setWindowState(Qt::WindowStates state) override; + void setWindowFlags(Qt::WindowFlags flags) override; - void setWindowTitle(const QString &title) Q_DECL_OVERRIDE; + void setWindowTitle(const QString &title) override; - void propagateSizeHints() Q_DECL_OVERRIDE; + void propagateSizeHints() override; protected: HaikuWindowProxy *m_window; |