diff options
Diffstat (limited to 'src/plugins')
43 files changed, 121 insertions, 121 deletions
diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index 4d263831e1..8d9a968b4f 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -98,7 +98,7 @@ namespace QtAndroidAccessibility QAccessibleInterface *interfaceFromId(jint objectId) { - QAccessibleInterface *iface = 0; + QAccessibleInterface *iface = nullptr; if (objectId == -1) { QWindow *win = qApp->focusWindow(); if (win) @@ -164,7 +164,7 @@ namespace QtAndroidAccessibility QPoint pos = QHighDpi::fromNativePixels(QPoint(int(x), int(y)), root->window()); QAccessibleInterface *child = root->childAt(pos.x(), pos.y()); - QAccessibleInterface *lastChild = 0; + QAccessibleInterface *lastChild = nullptr; while (child && (child != lastChild)) { lastChild = child; child = child->childAt(pos.x(), pos.y()); diff --git a/src/plugins/platforms/android/androidjnimain.h b/src/plugins/platforms/android/androidjnimain.h index 63be5910f9..6902f89341 100644 --- a/src/plugins/platforms/android/androidjnimain.h +++ b/src/plugins/platforms/android/androidjnimain.h @@ -96,9 +96,9 @@ namespace QtAndroid }; void setSystemUiVisibility(SystemUiVisibility uiVisibility); - jobject createBitmap(QImage img, JNIEnv *env = 0); + jobject createBitmap(QImage img, JNIEnv *env = nullptr); jobject createBitmap(int width, int height, QImage::Format format, JNIEnv *env); - jobject createBitmapDrawable(jobject bitmap, JNIEnv *env = 0); + jobject createBitmapDrawable(jobject bitmap, JNIEnv *env = nullptr); const char *classErrorMsgFmt(); const char *methodErrorMsgFmt(); diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp index de2fdaa0e2..fe5de1f882 100644 --- a/src/plugins/platforms/android/androidjnimenu.cpp +++ b/src/plugins/platforms/android/androidjnimenu.cpp @@ -59,12 +59,12 @@ using namespace QtAndroid; namespace QtAndroidMenu { static QList<QAndroidPlatformMenu *> pendingContextMenus; - static QAndroidPlatformMenu *visibleMenu = 0; + static QAndroidPlatformMenu *visibleMenu = nullptr; static QRecursiveMutex visibleMenuMutex; static QSet<QAndroidPlatformMenuBar *> menuBars; - static QAndroidPlatformMenuBar *visibleMenuBar = 0; - static QWindow *activeTopLevelWindow = 0; + static QAndroidPlatformMenuBar *visibleMenuBar = nullptr; + static QWindow *activeTopLevelWindow = nullptr; static QRecursiveMutex menuBarMutex; static jmethodID openContextMenuMethodID = 0; diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h index 85d4cee6cb..8a29ed7e7e 100644 --- a/src/plugins/platforms/android/qandroideventdispatcher.h +++ b/src/plugins/platforms/android/qandroideventdispatcher.h @@ -48,7 +48,7 @@ class QAndroidEventDispatcher : public QUnixEventDispatcherQPA { Q_OBJECT public: - explicit QAndroidEventDispatcher(QObject *parent = 0); + explicit QAndroidEventDispatcher(QObject *parent = nullptr); ~QAndroidEventDispatcher(); void start(); void stop(); diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 5add7b0746..fc71b391c0 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -91,7 +91,7 @@ private: } // namespace anonymous -static QAndroidInputContext *m_androidInputContext = 0; +static QAndroidInputContext *m_androidInputContext = nullptr; static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt/android/QtNativeInputConnection"; static char const *const QtExtractedTextClassName = "org/qtproject/qt/android/QtExtractedText"; static jclass m_extractedTextClass = 0; diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp index de84827777..85e7f08917 100644 --- a/src/plugins/platforms/directfb/main.cpp +++ b/src/plugins/platforms/directfb/main.cpp @@ -64,7 +64,7 @@ public: QPlatformIntegration * QDirectFbIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - QDirectFbIntegration *integration = 0; + QDirectFbIntegration *integration = nullptr; if (!system.compare(QLatin1String("directfb"), Qt::CaseInsensitive)) integration = new QDirectFbIntegration; diff --git a/src/plugins/platforms/directfb/qdirectfb_egl.cpp b/src/plugins/platforms/directfb/qdirectfb_egl.cpp index 95e6093fab..f38ad8f306 100644 --- a/src/plugins/platforms/directfb/qdirectfb_egl.cpp +++ b/src/plugins/platforms/directfb/qdirectfb_egl.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE extern QDirectFBEGLHooks platform_hook; static QDirectFBEGLHooks *hooks = &platform_hook; #else -static QDirectFBEGLHooks *hooks = 0; +static QDirectFBEGLHooks *hooks = nullptr; #endif /** diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp index c67a76f989..460596a18c 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE IDirectFB *QDirectFbConvenience::dfbInterface() { - static IDirectFB *dfb = 0; + static IDirectFB *dfb = nullptr; if (!dfb) { DFBResult result = DirectFBCreate(&dfb); if (result != DFB_OK) { @@ -247,7 +247,7 @@ QEvent::Type QDirectFbConvenience::eventType(DFBWindowEventType type) return QEvent::None; } } -QDirectFbKeyMap *QDirectFbConvenience::dfbKeymap = 0; +QDirectFbKeyMap *QDirectFbConvenience::dfbKeymap = nullptr; QDirectFbKeyMap *QDirectFbConvenience::keyMap() { if (!dfbKeymap) diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.h b/src/plugins/platforms/directfb/qdirectfbconvenience.h index 19fc068307..dd10f6bc85 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.h +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.h @@ -98,13 +98,13 @@ template <typename T> class QDirectFBPointer : public QScopedPointer<T, QDirectFBInterfaceCleanupHandler<T> > { public: - QDirectFBPointer(T *t = 0) + QDirectFBPointer(T *t = nullptr) : QScopedPointer<T, QDirectFBInterfaceCleanupHandler<T> >(t) {} T** outPtr() { - this->reset(0); + this->reset(nullptr); return &this->d; } }; diff --git a/src/plugins/platforms/integrity/qintegrityhidmanager.h b/src/plugins/platforms/integrity/qintegrityhidmanager.h index c8780b2dc2..1e421328c2 100644 --- a/src/plugins/platforms/integrity/qintegrityhidmanager.h +++ b/src/plugins/platforms/integrity/qintegrityhidmanager.h @@ -52,7 +52,7 @@ class QIntegrityHIDManager : public QThread { Q_OBJECT public: - QIntegrityHIDManager(const QString &key, const QString &specification, QObject *parent = 0); + QIntegrityHIDManager(const QString &key, const QString &specification, QObject *parent = nullptr); ~QIntegrityHIDManager(); void run(void); diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm index 8b372b8749..2a3d8c603e 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm @@ -52,7 +52,7 @@ class QIosOptionalPlugin_NSPhotoLibrary : public QObject, QIosOptionalPluginInte Q_INTERFACES(QIosOptionalPluginInterface) public: - explicit QIosOptionalPlugin_NSPhotoLibrary(QObject* = 0) {}; + explicit QIosOptionalPlugin_NSPhotoLibrary(QObject * = nullptr) {}; ~QIosOptionalPlugin_NSPhotoLibrary() {} UIViewController* createImagePickerController(QIOSFileDialog *fileDialog) const override diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm index c5244a51ad..01524a00e8 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm @@ -54,7 +54,7 @@ static QThreadStorage<QString> g_iteratorCurrentUrl; static QThreadStorage<QPointer<QIOSAssetData> > g_assetDataCache; static const int kBufferSize = 10; -static ALAsset *kNoAsset = 0; +static ALAsset *kNoAsset = nullptr; static bool ensureAuthorizationDialogNotBlocked() { @@ -366,7 +366,7 @@ bool QIOSFileEngineAssetsLibrary::close() // Delete later, so that we can reuse the asset if a QFile is // opened with the same path during the same event loop cycle. m_data->deleteLater(); - m_data = 0; + m_data = nullptr; } return true; } @@ -410,7 +410,7 @@ qint64 QIOSFileEngineAssetsLibrary::read(char *data, qint64 maxlen) if (!bytesRead) return 0; - NSError *error = 0; + NSError *error = nullptr; [[asset defaultRepresentation] getBytes:(uint8_t *)data fromOffset:m_offset length:bytesRead error:&error]; if (error) { diff --git a/src/plugins/platforms/ios/qioseventdispatcher.h b/src/plugins/platforms/ios/qioseventdispatcher.h index 1f4c78dc74..cdbaa0931d 100644 --- a/src/plugins/platforms/ios/qioseventdispatcher.h +++ b/src/plugins/platforms/ios/qioseventdispatcher.h @@ -53,7 +53,7 @@ public: bool processPostedEvents() override; protected: - explicit QIOSEventDispatcher(QObject *parent = 0); + explicit QIOSEventDispatcher(QObject *parent = nullptr); }; class QIOSJumpingEventDispatcher : public QIOSEventDispatcher @@ -61,7 +61,7 @@ class QIOSJumpingEventDispatcher : public QIOSEventDispatcher Q_OBJECT public: - QIOSJumpingEventDispatcher(QObject *parent = 0); + QIOSJumpingEventDispatcher(QObject *parent = nullptr); bool processEvents(QEventLoop::ProcessEventsFlags flags) override; // Public since we can't friend Objective-C methods @@ -76,4 +76,4 @@ private: QT_END_NAMESPACE -#endif // QIOSEVENTDISPATCHER_H
\ No newline at end of file +#endif // QIOSEVENTDISPATCHER_H diff --git a/src/plugins/platforms/ios/qiosglobal.mm b/src/plugins/platforms/ios/qiosglobal.mm index a523d1be45..c0428dacb9 100644 --- a/src/plugins/platforms/ios/qiosglobal.mm +++ b/src/plugins/platforms/ios/qiosglobal.mm @@ -185,7 +185,7 @@ FirstResponderCandidate::FirstResponderCandidate(UIResponder *responder) { } -UIResponder *FirstResponderCandidate::s_firstResponderCandidate = 0; +UIResponder *FirstResponderCandidate::s_firstResponderCandidate = nullptr; QT_END_NAMESPACE diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h index c59c5328af..36421a57c3 100644 --- a/src/plugins/platforms/ios/qiosinputcontext.h +++ b/src/plugins/platforms/ios/qiosinputcontext.h @@ -111,7 +111,7 @@ public: void scrollToCursor(); void scroll(int y); - void updateKeyboardState(NSNotification *notification = 0); + void updateKeyboardState(NSNotification *notification = nullptr); const ImeState &imeState() { return m_imeState; } const KeyboardState &keyboardState() { return m_keyboardState; } diff --git a/src/plugins/platforms/ios/qiosmenu.mm b/src/plugins/platforms/ios/qiosmenu.mm index 74a77de757..737d7798ab 100644 --- a/src/plugins/platforms/ios/qiosmenu.mm +++ b/src/plugins/platforms/ios/qiosmenu.mm @@ -54,7 +54,7 @@ // m_currentMenu points to the currently visible menu. // Only one menu will be visible at a time, and if a second menu // is shown on top of a first, the first one will be told to hide. -QIOSMenu *QIOSMenu::m_currentMenu = 0; +QIOSMenu *QIOSMenu::m_currentMenu = nullptr; // ------------------------------------------------------------------------- @@ -441,7 +441,7 @@ void QIOSMenu::dismiss() break; } - m_currentMenu = 0; + m_currentMenu = nullptr; m_visible = false; } @@ -458,13 +458,13 @@ void QIOSMenu::toggleShowUsingUIMenuController(bool show) Q_ASSERT(m_menuController); [[UIMenuController sharedMenuController] setMenuVisible:NO animated:YES]; [m_menuController release]; - m_menuController = 0; + m_menuController = nullptr; } } void QIOSMenu::toggleShowUsingUIPickerView(bool show) { - static QObject *focusObjectWithPickerView = 0; + static QObject *focusObjectWithPickerView = nullptr; if (show) { Q_ASSERT(!m_pickerView); @@ -477,12 +477,12 @@ void QIOSMenu::toggleShowUsingUIPickerView(bool show) } else { Q_ASSERT(focusObjectWithPickerView); focusObjectWithPickerView->removeEventFilter(this); - focusObjectWithPickerView = 0; + focusObjectWithPickerView = nullptr; Q_ASSERT(m_pickerView); [m_pickerView listenForKeyboardWillHideNotification:NO]; [m_pickerView release]; - m_pickerView = 0; + m_pickerView = nullptr; qApp->inputMethod()->update(Qt::ImEnabled | Qt::ImPlatformData); } diff --git a/src/plugins/platforms/qnx/qqnxabstractnavigator.h b/src/plugins/platforms/qnx/qqnxabstractnavigator.h index 24e28dae96..abacf80f54 100644 --- a/src/plugins/platforms/qnx/qqnxabstractnavigator.h +++ b/src/plugins/platforms/qnx/qqnxabstractnavigator.h @@ -50,7 +50,7 @@ class QQnxAbstractNavigator : public QObject { Q_OBJECT public: - explicit QQnxAbstractNavigator(QObject *parent = 0); + explicit QQnxAbstractNavigator(QObject *parent = nullptr); ~QQnxAbstractNavigator(); bool invokeUrl(const QUrl &url); diff --git a/src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h b/src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h index 24be03b46c..92f6308487 100644 --- a/src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h +++ b/src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h @@ -64,7 +64,7 @@ public: enum KeyboardMode { Default, Url, Email, Web, NumPunc, Number, Symbol, Phone, Pin, Password, Alphanumeric }; enum EnterKeyType { DefaultReturn, Connect, Done, Go, Join, Next, Search, Send, Submit }; - explicit QQnxAbstractVirtualKeyboard(QObject *parent = 0); + explicit QQnxAbstractVirtualKeyboard(QObject *parent = nullptr); virtual bool showKeyboard() = 0; virtual bool hideKeyboard() = 0; diff --git a/src/plugins/platforms/qnx/qqnxbuffer.cpp b/src/plugins/platforms/qnx/qqnxbuffer.cpp index cd05a679b1..b02a989ea8 100644 --- a/src/plugins/platforms/qnx/qqnxbuffer.cpp +++ b/src/plugins/platforms/qnx/qqnxbuffer.cpp @@ -77,7 +77,7 @@ QQnxBuffer::QQnxBuffer(screen_buffer_t buffer) // Get access to buffer's data errno = 0; - uchar *dataPtr = 0; + uchar *dataPtr = nullptr; Q_SCREEN_CRITICALERROR( screen_get_buffer_property_pv(buffer, SCREEN_PROPERTY_POINTER, (void **)&dataPtr), "Failed to query buffer pointer"); diff --git a/src/plugins/platforms/qnx/qqnxbuffer.h b/src/plugins/platforms/qnx/qqnxbuffer.h index 9ee0d5d60c..4b8adb20db 100644 --- a/src/plugins/platforms/qnx/qqnxbuffer.h +++ b/src/plugins/platforms/qnx/qqnxbuffer.h @@ -55,8 +55,8 @@ public: virtual ~QQnxBuffer(); screen_buffer_t nativeBuffer() const { return m_buffer; } - const QImage *image() const { return (m_buffer != 0) ? &m_image : 0; } - QImage *image() { return (m_buffer != 0) ? &m_image : 0; } + const QImage *image() const { return (m_buffer != nullptr) ? &m_image : nullptr; } + QImage *image() { return (m_buffer != nullptr) ? &m_image : nullptr; } QRect rect() const { return m_image.rect(); } diff --git a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h index aa2c118b3a..7cc67f2459 100644 --- a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h +++ b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h @@ -64,7 +64,7 @@ public: ButtonDown }; - explicit QQnxButtonEventNotifier(QObject *parent = 0); + explicit QQnxButtonEventNotifier(QObject *parent = nullptr); ~QQnxButtonEventNotifier(); public Q_SLOTS: diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp b/src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp index ce3a445d7c..79f6273e9f 100644 --- a/src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp +++ b/src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp @@ -76,8 +76,8 @@ static QQnxInputContext *sInputContextInstance; static QColor sSelectedColor(0,0xb8,0,85); -static const input_session_t *sSpellCheckSession = 0; -static const input_session_t *sInputSession = 0; +static const input_session_t *sSpellCheckSession = nullptr; +static const input_session_t *sInputSession = nullptr; static bool isSessionOkay(input_session_t *ic) { return ic !=0 && sInputSession != 0 && ic->component_id == sInputSession->component_id; @@ -515,13 +515,13 @@ static spannable_string_t *toSpannableString(const QString &text) } -static const input_session_t *(*p_ictrl_open_session)(connection_interface_t *) = 0; -static void (*p_ictrl_close_session)(input_session_t *) = 0; -static int32_t (*p_ictrl_dispatch_event)(event_t*) = 0; -static int32_t (*p_imf_client_init)() = 0; -static void (*p_imf_client_disconnect)() = 0; -static int32_t (*p_vkb_init_selection_service)() = 0; -static int32_t (*p_ictrl_get_num_active_sessions)() = 0; +static const input_session_t *(*p_ictrl_open_session)(connection_interface_t *) = nullptr; +static void (*p_ictrl_close_session)(input_session_t *) = nullptr; +static int32_t (*p_ictrl_dispatch_event)(event_t*) = nullptr; +static int32_t (*p_imf_client_init)() = nullptr; +static void (*p_imf_client_disconnect)() = nullptr; +static int32_t (*p_vkb_init_selection_service)() = nullptr; +static int32_t (*p_ictrl_get_num_active_sessions)() = nullptr; static bool s_imfInitFailed = false; static bool imfAvailable() @@ -602,7 +602,7 @@ QQnxInputContext::~QQnxInputContext() qInputContextDebug(); Q_ASSERT(sInputContextInstance == this); - sInputContextInstance = 0; + sInputContextInstance = nullptr; if (!imfAvailable()) return; @@ -735,7 +735,7 @@ void QQnxInputContext::closeSession() if (sInputSession) { p_ictrl_close_session((input_session_t *)sInputSession); - sInputSession = 0; + sInputSession = nullptr; } // These are likely already in the right state but this depends on the text control // having called reset or commit. So, just in case, set them to proper values. diff --git a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h index 3e10052459..6bedfaf963 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h +++ b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h @@ -48,7 +48,7 @@ class QQnxNavigatorEventHandler : public QObject { Q_OBJECT public: - explicit QQnxNavigatorEventHandler(QObject *parent = 0); + explicit QQnxNavigatorEventHandler(QObject *parent = nullptr); bool handleOrientationCheck(int angle); void handleOrientationChange(int angle); diff --git a/src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h b/src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h index 17c31c096c..a761faea1c 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h +++ b/src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h @@ -51,7 +51,7 @@ class QQnxNavigatorEventNotifier : public QObject { Q_OBJECT public: - explicit QQnxNavigatorEventNotifier(QQnxNavigatorEventHandler *eventHandler, QObject *parent = 0); + explicit QQnxNavigatorEventNotifier(QQnxNavigatorEventHandler *eventHandler, QObject *parent = nullptr); ~QQnxNavigatorEventNotifier(); public Q_SLOTS: diff --git a/src/plugins/platforms/qnx/qqnxnavigatorpps.h b/src/plugins/platforms/qnx/qqnxnavigatorpps.h index 3c818f51a6..c58903b6b6 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatorpps.h +++ b/src/plugins/platforms/qnx/qqnxnavigatorpps.h @@ -50,7 +50,7 @@ class QQnxNavigatorPps : public QQnxAbstractNavigator { Q_OBJECT public: - explicit QQnxNavigatorPps(QObject *parent = 0); + explicit QQnxNavigatorPps(QObject *parent = nullptr); ~QQnxNavigatorPps(); protected: diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp index e70092b97e..fe68927fda 100644 --- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp +++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp @@ -89,7 +89,7 @@ void QQnxRasterBackingStore::flush(QWindow *window, const QRegion ®ion, const if (!m_needsPosting) return; - QQnxWindow *targetWindow = 0; + QQnxWindow *targetWindow = nullptr; if (window) targetWindow = static_cast<QQnxWindow *>(window->handle()); diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index 22a00d3d40..9d3b921c44 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -566,7 +566,7 @@ void QQnxWindow::removeFromParent() if (Q_UNLIKELY(!m_parentWindow->m_childWindows.removeAll(this))) qFatal("QQnxWindow: Window Hierarchy broken; window has parent, but parent hasn't got child."); else - m_parentWindow = 0; + m_parentWindow = nullptr; } else if (m_screen) { m_screen->removeWindow(this); } @@ -634,7 +634,7 @@ void QQnxWindow::lower() void QQnxWindow::requestActivateWindow() { - QQnxWindow *focusWindow = 0; + QQnxWindow *focusWindow = nullptr; if (QGuiApplication::focusWindow()) focusWindow = static_cast<QQnxWindow*>(QGuiApplication::focusWindow()->handle()); @@ -664,7 +664,7 @@ void QQnxWindow::requestActivateWindow() platformScreen->rootWindow()->m_windowGroupName == currentWindow->m_parentGroupName) { currentWindow = platformScreen->rootWindow(); } else { - currentWindow = 0; + currentWindow = nullptr; } } diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index 72fccd4a2b..9a16ae7719 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -454,7 +454,7 @@ void QWasmCompositor::drawFrameWindow(QWasmFrameOptions options, QPainter *paint const QColor &c2 = options.palette.shadow().color(); const QColor &c3 = options.palette.midlight().color(); const QColor &c4 = options.palette.dark().color(); - const QBrush *fill = 0; + const QBrush *fill = nullptr; const qreal devicePixelRatio = painter->device()->devicePixelRatio(); if (!qFuzzyCompare(devicePixelRatio, qreal(1))) { diff --git a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp index b4a9d64eb8..0eb522e1ed 100644 --- a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp @@ -320,7 +320,7 @@ static void init_direct(QXcbColormapPrivate *d, bool ownColormap) XStoreColors(X11->display, d->colormap, colorTable.data(), colorTable.count()); } -static QXcbColormap **cmaps = 0; +static QXcbColormap **cmaps = nullptr; void QXcbColormap::initialize() { @@ -343,7 +343,7 @@ void QXcbColormap::initialize() d->visual = DefaultVisual(display, i); d->defaultVisual = true; - Visual *argbVisual = 0; + Visual *argbVisual = nullptr; if (X11->visual && i == DefaultScreen(display)) { // only use the outside colormap on the default screen @@ -356,7 +356,7 @@ void QXcbColormap::initialize() d->visual = find_visual(display, i, X11->visual_class, X11->visual_id, &d->depth, &d->defaultVisual); } else if (!X11->custom_cmap) { - XStandardColormap *stdcmap = 0; + XStandardColormap *stdcmap = nullptr; int ncmaps = 0; #if QT_CONFIG(xrender) diff --git a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp index d55a49768c..bf45b409c5 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp @@ -282,9 +282,9 @@ static uint n_bits(uint v) return i; } -static uint *red_scale_table = 0; -static uint *green_scale_table = 0; -static uint *blue_scale_table = 0; +static uint *red_scale_table = nullptr; +static uint *green_scale_table = nullptr; +static uint *blue_scale_table = nullptr; static void cleanup_scale_tables() { @@ -546,10 +546,10 @@ void QX11PlatformPixmap::fromImage(const QImage &img, Qt::ImageConversionFlags f Display *dpy = xinfo.display(); Visual *visual = (Visual *)xinfo.visual(); - XImage *xi = 0; + XImage *xi = nullptr; bool trucol = (visual->c_class >= TrueColor); size_t nbytes = image.sizeInBytes(); - uchar *newbits= 0; + uchar *newbits= nullptr; #if QT_CONFIG(xrender) if (alphaCheck.hasXRenderAndAlpha()) { diff --git a/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp b/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp index 1afa00cfc9..388f5aba76 100644 --- a/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp @@ -725,7 +725,7 @@ void QTessellatorPrivate::cancelCoincidingEdges() { Vertex **vv = vertices.sorted; - QCoincidingEdge *tl = 0; + QCoincidingEdge *tl = nullptr; int tlSize = 0; for (int i = 0; i < vertices.nPoints - 1; ++i) { diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index 401863790c..d2143ce953 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -95,9 +95,9 @@ static xcb_window_t xdndProxy(QXcbConnection *c, xcb_window_t w) if (reply && reply->type == XCB_ATOM_WINDOW) { xcb_window_t p = *((xcb_window_t *)xcb_get_property_value(reply.get())); if (proxy != p) - proxy = 0; + proxy = XCB_NONE; } else { - proxy = 0; + proxy = XCB_NONE; } return proxy; @@ -690,7 +690,7 @@ int QXcbDrag::findTransactionByTime(xcb_timestamp_t timestamp) #if 0 // for embedding only -static QWidget* current_embedding_widget = 0; +static QWidget* current_embedding_widget = nullptr; static xcb_client_message_event_t last_enter_event; diff --git a/src/plugins/sqldrivers/db2/qsql_db2.cpp b/src/plugins/sqldrivers/db2/qsql_db2.cpp index e644a556e6..e3cfa0ae15 100644 --- a/src/plugins/sqldrivers/db2/qsql_db2.cpp +++ b/src/plugins/sqldrivers/db2/qsql_db2.cpp @@ -1052,7 +1052,7 @@ QVariant QDB2Result::data(int field) return *d->valueCache[field]; - QVariant* v = 0; + QVariant *v = nullptr; switch (info.metaType().id()) { case QVariant::LongLong: v = new QVariant((qint64) qGetBigIntData(d->hStmt, field, isNull)); diff --git a/src/plugins/sqldrivers/db2/qsql_db2_p.h b/src/plugins/sqldrivers/db2/qsql_db2_p.h index 79ae54ab2d..abe65c4208 100644 --- a/src/plugins/sqldrivers/db2/qsql_db2_p.h +++ b/src/plugins/sqldrivers/db2/qsql_db2_p.h @@ -72,8 +72,8 @@ class Q_EXPORT_SQLDRIVER_DB2 QDB2Driver : public QSqlDriver friend class QDB2ResultPrivate; public: - explicit QDB2Driver(QObject* parent = 0); - QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject* parent = 0); + explicit QDB2Driver(QObject *parent = nullptr); + QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject *parent = nullptr); ~QDB2Driver(); bool hasFeature(DriverFeature) const override; void close() override; diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index 6b7ee8f133..7be2df6dd9 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -487,7 +487,7 @@ QVariant QIBaseResultPrivate::fetchBlob(ISC_QUAD *bId) } template<typename T> -static QList<QVariant> toList(char** buf, int count, T* = 0) +static QList<QVariant> toList(char** buf, int count, T* = nullptr) { QList<QVariant> res; for (int i = 0; i < count; ++i) { @@ -624,7 +624,7 @@ QVariant QIBaseResultPrivate::fetchArray(int pos, ISC_QUAD *arr) } template<typename T> -static char* fillList(char *buffer, const QList<QVariant> &list, T* = 0) +static char* fillList(char *buffer, const QList<QVariant> &list, T* = nullptr) { for (int i = 0; i < list.size(); ++i) { T val; diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h index e7c908cf2b..9109c2b40f 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h +++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h @@ -73,8 +73,8 @@ class Q_EXPORT_SQLDRIVER_IBASE QIBaseDriver : public QSqlDriver Q_DECLARE_PRIVATE(QIBaseDriver) Q_OBJECT public: - explicit QIBaseDriver(QObject *parent = 0); - explicit QIBaseDriver(isc_db_handle connection, QObject *parent = 0); + explicit QIBaseDriver(QObject *parent = nullptr); + explicit QIBaseDriver(isc_db_handle connection, QObject *parent = nullptr); virtual ~QIBaseDriver(); bool hasFeature(DriverFeature f) const override; bool open(const QString &db, diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 4edafd1029..5bf9400180 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -511,7 +511,7 @@ int QOCIResultPrivate::bindValues(QVariantList &values, IndicatorArray &indicato values[i].detach(); const QVariant &val = values.at(i); - OCIBind * hbnd = 0; // Oracle handles these automatically + OCIBind * hbnd = nullptr; // Oracle handles these automatically sb2 *indPtr = &indicators[i]; *indPtr = val.isNull() ? -1 : 0; @@ -897,10 +897,10 @@ QOCICols::QOCICols(int size, QOCIResultPrivate* dp) : fieldInf(size), d(dp) { ub4 dataSize = 0; - OCIDefine* dfn = 0; + OCIDefine *dfn = nullptr; int r; - OCIParam* param = 0; + OCIParam *param = nullptr; sb4 parmStatus = 0; ub4 count = 1; int idx = 0; @@ -1184,7 +1184,7 @@ OraFieldInfo QOCICols::qMakeOraField(const QOCIResultPrivate* p, OCIParam* param { OraFieldInfo ofi; ub2 colType(0); - text *colName = 0; + text *colName = nullptr; ub4 colNameLen(0); sb1 colScale(0); ub2 colLength(0); diff --git a/src/plugins/sqldrivers/oci/qsql_oci_p.h b/src/plugins/sqldrivers/oci/qsql_oci_p.h index 295c131f1a..a3366abb77 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci_p.h +++ b/src/plugins/sqldrivers/oci/qsql_oci_p.h @@ -75,8 +75,8 @@ class Q_EXPORT_SQLDRIVER_OCI QOCIDriver : public QSqlDriver friend class QOCIResultPrivate; public: - explicit QOCIDriver(QObject* parent = 0); - QOCIDriver(OCIEnv* env, OCISvcCtx* ctx, QObject* parent = 0); + explicit QOCIDriver(QObject *parent = nullptr); + QOCIDriver(OCIEnv *env, OCISvcCtx *ctx, QObject *parent = nullptr); ~QOCIDriver(); bool hasFeature(DriverFeature f) const; bool open(const QString &db, diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index a58c782b60..5a00a000f7 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -227,7 +227,7 @@ void QODBCResultPrivate::updateStmtHandleState() disconnectCount = drv_d_func() ? drv_d_func()->disconnectCount : 0; } -static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode = 0) +static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode = nullptr) { SQLINTEGER nativeCode_ = 0; SQLSMALLINT msgLen = 0; @@ -275,7 +275,7 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode } static QString qODBCWarn(const SQLHANDLE hStmt, const SQLHANDLE envHandle = 0, - const SQLHANDLE pDbC = 0, int *nativeCode = 0) + const SQLHANDLE pDbC = 0, int *nativeCode = nullptr) { QString result; if (envHandle) @@ -299,12 +299,12 @@ static QString qODBCWarn(const SQLHANDLE hStmt, const SQLHANDLE envHandle = 0, return result; } -static QString qODBCWarn(const QODBCResultPrivate* odbc, int *nativeCode = 0) +static QString qODBCWarn(const QODBCResultPrivate* odbc, int *nativeCode = nullptr) { return qODBCWarn(odbc->hStmt, odbc->dpEnv(), odbc->dpDbc(), nativeCode); } -static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = 0) +static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = nullptr) { return qODBCWarn(0, odbc->hEnv, odbc->hDbc, nativeCode); } diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp index 8036655b04..d19e249cb4 100644 --- a/src/plugins/styles/android/qandroidstyle.cpp +++ b/src/plugins/styles/android/qandroidstyle.cpp @@ -1193,7 +1193,7 @@ QSize QAndroidStyle::AndroidStateDrawable::sizeImage(const QStyleOption *opt) co const QAndroidStyle::AndroidDrawable * QAndroidStyle::AndroidStateDrawable::bestAndroidStateMatch(const QStyleOption *opt) const { - const AndroidDrawable *bestMatch = 0; + const AndroidDrawable *bestMatch = nullptr; if (!opt) { if (m_states.size()) return m_states[0].second; diff --git a/src/plugins/styles/android/qandroidstyle_p.h b/src/plugins/styles/android/qandroidstyle_p.h index 5730bdfe2c..ca4b435046 100644 --- a/src/plugins/styles/android/qandroidstyle_p.h +++ b/src/plugins/styles/android/qandroidstyle_p.h @@ -257,10 +257,10 @@ public: virtual void drawControl(const QStyleOption *opt, QPainter *p, const QWidget *w); virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const; @@ -294,7 +294,7 @@ public: virtual void drawControl(const QStyleOption *option, QPainter *p, const QWidget *w); virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, @@ -315,7 +315,7 @@ public: QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const; QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; private: AndroidDrawable *m_seekBarThumb; }; @@ -327,7 +327,7 @@ public: virtual ~AndroidSpinnerControl(){} virtual QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; }; typedef QList<AndroidItemStateInfo *> AndroidItemStateInfoList; @@ -337,34 +337,34 @@ public: ~QAndroidStyle(); virtual void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; virtual void drawControl(QStyle::ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *widget = 0) const; + const QPoint &pt, const QWidget *widget = nullptr) const; virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget = 0) const; + SubControl sc, const QWidget *widget = nullptr) const; - virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const; virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *w = 0) const; + const QSize &contentsSize, const QWidget *w = nullptr) const; - virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const; virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const; - int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const; + int styleHint(StyleHint hint, const QStyleOption *option = nullptr, const QWidget *widget = nullptr, + QStyleHintReturn *returnData = nullptr) const; virtual QPalette standardPalette() const; void polish(QWidget *widget); diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 904f94fc95..c0862001f4 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -1469,7 +1469,7 @@ QStyleHelper::WidgetSizePolicy QMacStylePrivate::aquaSizeConstrain(const QStyleO if (guess_size) ret = qt_aqua_guess_size(widg, large, small, mini); - QSize *sz = 0; + QSize *sz = nullptr; if (ret == QStyleHelper::SizeSmall) sz = &small; else if (ret == QStyleHelper::SizeLarge) @@ -6489,7 +6489,7 @@ bool QMacStyle::event(QEvent *e) { Q_D(QMacStyle); if(e->type() == QEvent::FocusIn) { - QWidget *f = 0; + QWidget *f = nullptr; QWidget *focusWidget = QApplication::focusWidget(); #if QT_CONFIG(graphicsview) if (QGraphicsView *graphicsView = qobject_cast<QGraphicsView *>(focusWidget)) { diff --git a/src/plugins/styles/mac/qmacstyle_mac_p.h b/src/plugins/styles/mac/qmacstyle_mac_p.h index 88f104cccf..d1d6bc6339 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p.h @@ -77,28 +77,28 @@ public: void polish(QPalette &pal); void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const; + const QWidget *w = nullptr) const; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = 0) const; + const QPoint &pt, const QWidget *w = nullptr) const; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *w = 0) const; + const QSize &contentsSize, const QWidget *w = nullptr) const; - int pixelMetric(PixelMetric pm, const QStyleOption *opt = 0, const QWidget *widget = 0) const; + int pixelMetric(PixelMetric pm, const QStyleOption *opt = 0, const QWidget *widget = nullptr) const; QPalette standardPalette() const; - virtual int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0, - QStyleHintReturn *shret = 0) const; + virtual int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = nullptr, + QStyleHintReturn *shret = nullptr) const; QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const; @@ -108,11 +108,11 @@ public: bool event(QEvent *e); - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, - Qt::Orientation orientation, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + Qt::Orientation orientation, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const; private: Q_DISABLE_COPY_MOVE(QMacStyle) |