1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining bits of deprecated QInputPanel

Browse Source 
Introduced during Qt5 development and renamed to QInputMethod.

Change-Id: If6744648dc98b779e65c449ae32626db574181df
Reviewed-by: Joona Petrell <joona.petrell@gmail.com>
This commit is contained in:
Pekka Vuorela 2012-08-21 14:19:47 +03:00 committed by Qt by Nokia
parent b6f92043e0
commit 2292bf0669
7 changed files with 7 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/kernel.pri
View File

@ -45,8 +45,6 @@ HEADERS += \
kernel/qevent_p.h \
kernel/qinputmethod.h \
kernel/qinputmethod_p.h \
kernel/qinputpanel.h \
kernel/qinputpanel_p.h \
kernel/qkeysequence.h \
kernel/qkeysequence_p.h \
kernel/qkeymapper_p.h \

17
src/gui/kernel/qguiapplication.cpp
View File

@ -68,7 +68,7 @@
#include <QtGui/qgenericpluginfactory.h>
#include <qpa/qplatformintegration.h>
#include <QtGui/qstylehints.h>
#include <QtGui/qinputpanel.h>
#include <QtGui/qinputmethod.h>
#include <QtGui/qpixmapcache.h>
#include <qpa/qplatformtheme.h>
#include <qpa/qplatforminputcontext.h>
@ -2372,7 +2372,7 @@ bool QGuiApplication::desktopSettingsAware()
the virtual keyboard. It also provides information about the position of the
current focused input element.
\sa QInputPanel
\sa QInputMethod
*/
QInputMethod *QGuiApplication::inputMethod()
{
@ -2381,19 +2381,6 @@ QInputMethod *QGuiApplication::inputMethod()
return qGuiApp->d_func()->inputMethod;
}
/*!
\fn QInputPanel *QGuiApplication::inputPanel() const
returns the input panel.
The input panel returns properties about the state and position of
the virtual keyboard. It also provides information about the position of the
current focused input element.
\obsolete
\sa inputMethod()
*/
/*!
\fn void QGuiApplication::fontDatabaseChanged()

5
src/gui/kernel/qguiapplication.h
View File

@ -44,7 +44,7 @@
#include <QtCore/qcoreapplication.h>
#include <QtGui/qwindowdefs.h>
#include <QtGui/qinputpanel.h>
#include <QtGui/qinputmethod.h>
#include <QtCore/qlocale.h>
#include <QtCore/qpoint.h>
#include <QtCore/qsize.h>
@ -131,9 +131,6 @@ public:
static void setDesktopSettingsAware(bool on);
static bool desktopSettingsAware();
#if QT_DEPRECATED_SINCE(5, 0)
QT_DEPRECATED QInputPanel *inputPanel() const { return inputMethod(); }
#endif
static QInputMethod *inputMethod();
static QPlatformNativeInterface *platformNativeInterface();

60
src/gui/kernel/qinputpanel.h
View File

@ -1,60 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** 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, Nokia gives you certain additional
** rights. These rights are described in the Nokia 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.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QINPUTPANEL_H
#define QINPUTPANEL_H
#include <QtGui/qinputmethod.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
#pragma qt_class(QInputPanel)
#endif
#define QInputPanel QInputMethod
QT_END_NAMESPACE
QT_END_HEADER
#endif

60
src/gui/kernel/qinputpanel_p.h
View File

@ -1,60 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** 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, Nokia gives you certain additional
** rights. These rights are described in the Nokia 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.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QINPUTPANEL_P_H
#define QINPUTPANEL_P_H
#include <private/qinputmethod_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
#pragma qt_class(QInputPanelPrivate)
#endif
#define QInputPanelPrivate QInputMethodPrivate
QT_END_NAMESPACE
QT_END_HEADER
#endif

2
src/gui/kernel/qplatforminputcontext.h
View File

@ -51,7 +51,7 @@
// source and binary incompatible with future versions of Qt.
//
#include <QtGui/qinputpanel.h>
#include <QtGui/qinputmethod.h>
QT_BEGIN_HEADER

6
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -9010,13 +9010,13 @@ void tst_QWidget::focusProxyAndInputMethods()
// and that the input method gets the focus proxy passed
// as the focus widget instead of the child widget.
// otherwise input method queries go to the wrong widget
QCOMPARE(qApp->inputPanel()->inputItem(), toplevel.data());
QCOMPARE(qApp->inputMethod()->inputItem(), toplevel.data());
toplevel->setAttribute(Qt::WA_InputMethodEnabled, false);
QVERIFY(!qApp->inputPanel()->inputItem());
QVERIFY(!qApp->inputMethod()->inputItem());
toplevel->setAttribute(Qt::WA_InputMethodEnabled, true);
QCOMPARE(qApp->inputPanel()->inputItem(), toplevel.data());
QCOMPARE(qApp->inputMethod()->inputItem(), toplevel.data());
}
#ifdef QT_BUILD_INTERNAL