From 3bf7fae3e8fc1de1847d160c19501b225f023f2e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 21 Sep 2016 15:14:59 +0000 Subject: [PATCH] various cleanups Signed-off-by: Ivailo Monev --- src/gui/inputmethod/qinputcontextfactory.cpp | 10 --- src/gui/inputmethod/qwininputcontext_p.h | 113 --------------------------- src/gui/kernel/qwidget.cpp | 49 +----------- src/network/access/qnetworkreplydataimpl_p.h | 1 - 4 files changed, 1 insertion(+), 172 deletions(-) delete mode 100644 src/gui/inputmethod/qwininputcontext_p.h diff --git a/src/gui/inputmethod/qinputcontextfactory.cpp b/src/gui/inputmethod/qinputcontextfactory.cpp index 5207448c5..7e1cd48d9 100644 --- a/src/gui/inputmethod/qinputcontextfactory.cpp +++ b/src/gui/inputmethod/qinputcontextfactory.cpp @@ -128,16 +128,6 @@ QInputContext *QInputContextFactory::create( const QString& key, QObject *parent result = new QXIMInputContext; } #endif -#if defined(Q_WS_WIN) - if (key == QLatin1String("win")) { - result = new QWinInputContext; - } -#endif -#if defined(Q_WS_MAC) - if (key == QLatin1String("mac")) { - result = new QMacInputContext; - } -#endif #ifdef QT_NO_LIBRARY Q_UNUSED(key); #else diff --git a/src/gui/inputmethod/qwininputcontext_p.h b/src/gui/inputmethod/qwininputcontext_p.h deleted file mode 100644 index 07b58d941..000000000 --- a/src/gui/inputmethod/qwininputcontext_p.h +++ /dev/null @@ -1,113 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QWININPUTCONTEXT_P_H -#define QWININPUTCONTEXT_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of qinputcontext.cpp. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// -#include -#ifndef QT_NO_IM - -#include "QtGui/qinputcontext.h" -#include "QtCore/qt_windows.h" - -#if !defined(IMR_RECONVERTSTRING) -typedef struct tagRECONVERTSTRING { - DWORD dwSize; - DWORD dwVersion; - DWORD dwStrLen; - DWORD dwStrOffset; - DWORD dwCompStrLen; - DWORD dwCompStrOffset; - DWORD dwTargetStrLen; - DWORD dwTargetStrOffset; -} RECONVERTSTRING, *PRECONVERTSTRING; -#endif - -QT_BEGIN_NAMESPACE - -class QWinInputContext : public QInputContext -{ - Q_OBJECT -public: - explicit QWinInputContext(QObject* parent = 0); - virtual ~QWinInputContext(); - - virtual QString identifierName() { return QLatin1String("win"); } - virtual QString language(); - - virtual void reset(); - virtual void update(); - - virtual void mouseHandler(int x, QMouseEvent *event); - virtual bool isComposing() const; - - virtual void setFocusWidget(QWidget *w); - - bool startComposition(); - bool endComposition(); - bool composition(LPARAM lparam); - int reconvertString(RECONVERTSTRING *reconv); - - static void TranslateMessage(const MSG *msg); - static LRESULT DefWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); - - static void updateImeStatus(QWidget *w, bool hasFocus); - static void enablePopupChild(QWidget *w, bool e); - static void enable(QWidget *w, bool e); - -private: - void init(); - bool recursionGuard; -}; - -QT_END_NAMESPACE -#endif // QT_NO_IM -#endif // QWININPUTCONTEXT_P_H diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 869677385..2bd27e881 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -60,16 +60,6 @@ #ifndef QT_NO_ACCESSIBILITY # include "qaccessible.h" #endif -#if defined(Q_WS_WIN) -# include "qt_windows.h" -#endif -#ifdef Q_WS_MAC -# include "qt_mac_p.h" -# include "qt_cocoa_helpers_mac_p.h" -# include "qmainwindow.h" -# include "qtoolbar.h" -# include -#endif #include "qpainter.h" #include "qtooltip.h" #include "qwhatsthis.h" @@ -79,10 +69,6 @@ #include "qinputcontext_p.h" #include "qfileinfo.h" -#if defined (Q_WS_WIN) -# include -#endif - #if defined(Q_WS_X11) # include # include "qx11info_x11.h" @@ -91,9 +77,6 @@ #include #include #include -#ifdef Q_WS_MAC -# include -#endif #include @@ -256,15 +239,6 @@ QWidgetPrivate::QWidgetPrivate(int version) , inSetParent(0) #if defined(Q_WS_X11) , picture(0) -#elif defined(Q_WS_WIN) - , noPaintOnScreen(0) - #ifndef QT_NO_GESTURES - , nativeGesturePanEnabled(0) - #endif -#elif defined(Q_WS_MAC) - , needWindowChange(0) - , window_event(0) - , qd_hd(0) #endif { if (!qApp) { @@ -1352,15 +1326,6 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow) << "Alien?" << !testAttribute(Qt::WA_NativeWindow); #endif -#if defined (Q_WS_WIN) && !defined(QT_NO_DRAGANDDROP) - // Unregister the dropsite (if already registered) before we - // re-create the widget with a native window. - if (testAttribute(Qt::WA_WState_Created) && !internalWinId() && testAttribute(Qt::WA_NativeWindow) - && d->extra && d->extra->dropTarget) { - d->registerDropSite(false); - } -#endif // defined (Q_WS_WIN) && !defined(QT_NO_DRAGANDDROP) - d->updateIsOpaque(); setAttribute(Qt::WA_WState_Created); // set created flag @@ -1470,7 +1435,7 @@ QWidget::~QWidget() } } -#if defined(Q_WS_WIN) || defined(Q_WS_X11)|| defined(Q_WS_MAC) +#if defined(Q_WS_X11) else if (!internalWinId() && isVisible()) { qApp->d_func()->sendSyntheticEnterLeave(this); } @@ -2121,28 +2086,16 @@ void QWidgetPrivate::setOpaque(bool opaque) if (isOpaque == opaque) return; isOpaque = opaque; -#ifdef Q_WS_MAC - macUpdateIsOpaque(); -#endif #ifdef Q_WS_X11 x11UpdateIsOpaque(); #endif -#ifdef Q_WS_WIN - winUpdateIsOpaque(); -#endif } void QWidgetPrivate::updateIsTranslucent() { -#ifdef Q_WS_MAC - macUpdateIsOpaque(); -#endif #ifdef Q_WS_X11 x11UpdateIsOpaque(); #endif -#ifdef Q_WS_WIN - winUpdateIsOpaque(); -#endif } /*! diff --git a/src/network/access/qnetworkreplydataimpl_p.h b/src/network/access/qnetworkreplydataimpl_p.h index 5b84756e2..af82bb9e8 100644 --- a/src/network/access/qnetworkreplydataimpl_p.h +++ b/src/network/access/qnetworkreplydataimpl_p.h @@ -67,7 +67,6 @@ class QNetworkReplyDataImpl: public QNetworkReply Q_OBJECT public: QNetworkReplyDataImpl(QObject *parent, const QNetworkRequest &req, const QNetworkAccessManager::Operation op); - ~QNetworkReplyDataImpl(); virtual void abort(); // reimplemented from QNetworkReply -- 2.11.0