From 9d1f059fc534a26ccac699721512e1fd709ebd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 12 May 2014 17:40:53 +0200 Subject: qpa: Rename qwidgetwindow_qpa_p.h to qwidgetwindow_p.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I24835b86194653e89c0bacefd22ddbff06b6e97b Reviewed-by: Tor Arne Vestbø --- src/widgets/kernel/kernel.pri | 2 +- src/widgets/kernel/qapplication.cpp | 2 +- src/widgets/kernel/qgesturemanager.cpp | 2 +- src/widgets/kernel/qshortcut.cpp | 2 +- src/widgets/kernel/qwidget.cpp | 2 +- src/widgets/kernel/qwidgetwindow.cpp | 2 +- src/widgets/kernel/qwidgetwindow_p.h | 125 +++++++++++++++++++++++++++++++ src/widgets/kernel/qwidgetwindow_qpa_p.h | 125 ------------------------------- 8 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 src/widgets/kernel/qwidgetwindow_p.h delete mode 100644 src/widgets/kernel/qwidgetwindow_qpa_p.h (limited to 'src/widgets') diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 3157227925..a9b8627beb 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -34,7 +34,7 @@ HEADERS += \ kernel/qgesturerecognizer.h \ kernel/qgesturemanager_p.h \ kernel/qdesktopwidget_p.h \ - kernel/qwidgetwindow_qpa_p.h \ + kernel/qwidgetwindow_p.h \ kernel/qwindowcontainer_p.h SOURCES += \ diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 4ebcfc45f9..edb9e9036c 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -68,7 +68,7 @@ #include "private/qstylesheetstyle_p.h" #include "private/qstyle_p.h" #include "qmessagebox.h" -#include "qwidgetwindow_qpa_p.h" +#include "qwidgetwindow_p.h" #include #include #include diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index 929e5e2fcf..532cea1f67 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -46,7 +46,7 @@ #include "private/qgraphicsitem_p.h" #include "private/qevent_p.h" #include "private/qapplication_p.h" -#include "private/qwidgetwindow_qpa_p.h" +#include "private/qwidgetwindow_p.h" #include "qgesture.h" #include "qevent.h" #include "qgraphicsitem.h" diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp index dcf6aed591..217f0386cb 100644 --- a/src/widgets/kernel/qshortcut.cpp +++ b/src/widgets/kernel/qshortcut.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 3bc21f5d21..7c5def5bd6 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -69,7 +69,7 @@ # include #endif #include -#include "private/qwidgetwindow_qpa_p.h" +#include "private/qwidgetwindow_p.h" #include "qpainter.h" #include "qtooltip.h" #include "qwhatsthis.h" diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 06a4d8c960..9a7017503f 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "private/qwindow_p.h" -#include "qwidgetwindow_qpa_p.h" +#include "qwidgetwindow_p.h" #include "private/qwidget_p.h" #include "private/qapplication_p.h" diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h new file mode 100644 index 0000000000..be2adddff5 --- /dev/null +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -0,0 +1,125 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtWidgets 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt 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 QWIDGETWINDOW_P_H +#define QWIDGETWINDOW_P_H + +#include + +#include +#include + +QT_BEGIN_NAMESPACE + + +class QCloseEvent; +class QMoveEvent; + +class QWidgetWindow : public QWindow +{ + Q_OBJECT +public: + QWidgetWindow(QWidget *widget); + ~QWidgetWindow(); + + QWidget *widget() const { return m_widget; } +#ifndef QT_NO_ACCESSIBILITY + QAccessibleInterface *accessibleRoot() const; +#endif + + QObject *focusObject() const; +protected: + bool event(QEvent *); + + void handleCloseEvent(QCloseEvent *); + void handleEnterLeaveEvent(QEvent *); + void handleFocusInEvent(QFocusEvent *); + void handleKeyEvent(QKeyEvent *); + void handleMouseEvent(QMouseEvent *); + void handleNonClientAreaMouseEvent(QMouseEvent *); + void handleTouchEvent(QTouchEvent *); + void handleMoveEvent(QMoveEvent *); + void handleResizeEvent(QResizeEvent *); +#ifndef QT_NO_WHEELEVENT + void handleWheelEvent(QWheelEvent *); +#endif +#ifndef QT_NO_DRAGANDDROP + void handleDragEnterMoveEvent(QDragMoveEvent *); + void handleDragLeaveEvent(QDragLeaveEvent *); + void handleDropEvent(QDropEvent *); +#endif + void handleExposeEvent(QExposeEvent *); + void handleWindowStateChangedEvent(QWindowStateChangeEvent *event); + bool nativeEvent(const QByteArray &eventType, void *message, long *result); +#ifndef QT_NO_TABLETEVENT + void handleTabletEvent(QTabletEvent *); +#endif +#ifndef QT_NO_GESTURES + void handleGestureEvent(QNativeGestureEvent *); +#endif +#ifndef QT_NO_CONTEXTMENU + void handleContextMenuEvent(QContextMenuEvent *); +#endif + +private slots: + void updateObjectName(); + void repaintWindow(); + +private: + void updateGeometry(); + void updateNormalGeometry(); + + enum FocusWidgets { + FirstFocusWidget, + LastFocusWidget + }; + QWidget *getFocusWidget(FocusWidgets fw); + + QWidget *m_widget; + QPointer m_implicit_mouse_grabber; +#ifndef QT_NO_DRAGANDDROP + QPointer m_dragTarget; +#endif +}; + +QT_END_NAMESPACE + +#endif // QWIDGETWINDOW_P_H diff --git a/src/widgets/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h deleted file mode 100644 index 06ba8ea646..0000000000 --- a/src/widgets/kernel/qwidgetwindow_qpa_p.h +++ /dev/null @@ -1,125 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtWidgets 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt 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 QWIDGETWINDOW_QPA_P_H -#define QWIDGETWINDOW_QPA_P_H - -#include - -#include -#include - -QT_BEGIN_NAMESPACE - - -class QCloseEvent; -class QMoveEvent; - -class QWidgetWindow : public QWindow -{ - Q_OBJECT -public: - QWidgetWindow(QWidget *widget); - ~QWidgetWindow(); - - QWidget *widget() const { return m_widget; } -#ifndef QT_NO_ACCESSIBILITY - QAccessibleInterface *accessibleRoot() const; -#endif - - QObject *focusObject() const; -protected: - bool event(QEvent *); - - void handleCloseEvent(QCloseEvent *); - void handleEnterLeaveEvent(QEvent *); - void handleFocusInEvent(QFocusEvent *); - void handleKeyEvent(QKeyEvent *); - void handleMouseEvent(QMouseEvent *); - void handleNonClientAreaMouseEvent(QMouseEvent *); - void handleTouchEvent(QTouchEvent *); - void handleMoveEvent(QMoveEvent *); - void handleResizeEvent(QResizeEvent *); -#ifndef QT_NO_WHEELEVENT - void handleWheelEvent(QWheelEvent *); -#endif -#ifndef QT_NO_DRAGANDDROP - void handleDragEnterMoveEvent(QDragMoveEvent *); - void handleDragLeaveEvent(QDragLeaveEvent *); - void handleDropEvent(QDropEvent *); -#endif - void handleExposeEvent(QExposeEvent *); - void handleWindowStateChangedEvent(QWindowStateChangeEvent *event); - bool nativeEvent(const QByteArray &eventType, void *message, long *result); -#ifndef QT_NO_TABLETEVENT - void handleTabletEvent(QTabletEvent *); -#endif -#ifndef QT_NO_GESTURES - void handleGestureEvent(QNativeGestureEvent *); -#endif -#ifndef QT_NO_CONTEXTMENU - void handleContextMenuEvent(QContextMenuEvent *); -#endif - -private slots: - void updateObjectName(); - void repaintWindow(); - -private: - void updateGeometry(); - void updateNormalGeometry(); - - enum FocusWidgets { - FirstFocusWidget, - LastFocusWidget - }; - QWidget *getFocusWidget(FocusWidgets fw); - - QWidget *m_widget; - QPointer m_implicit_mouse_grabber; -#ifndef QT_NO_DRAGANDDROP - QPointer m_dragTarget; -#endif -}; - -QT_END_NAMESPACE - -#endif // QWIDGETWINDOW_QPA_P_H -- cgit v1.2.3