diff options
author | Pekka Vuorela <pvuorela@iki.fi> | 2012-08-21 14:19:47 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-23 11:20:37 +0200 |
commit | 2292bf06693c683ba353bcbea6ab9bd1209044ea (patch) | |
tree | 897c4d627f8123357637c6017b5633b22591d04e /src/gui/kernel | |
parent | b6f92043e054ca348bf82555d7f0bb5ed44af66c (diff) |
Remove remaining bits of deprecated QInputPanel
Introduced during Qt5 development and renamed to QInputMethod.
Change-Id: If6744648dc98b779e65c449ae32626db574181df
Reviewed-by: Joona Petrell <joona.petrell@gmail.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/kernel.pri | 2 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 17 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication.h | 5 | ||||
-rw-r--r-- | src/gui/kernel/qinputpanel.h | 60 | ||||
-rw-r--r-- | src/gui/kernel/qinputpanel_p.h | 60 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontext.h | 2 |
6 files changed, 4 insertions, 142 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index b8a86ad2a7..f766b5fbaf 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -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 \ diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 5f4cbce73b..bc77205e41 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -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() { @@ -2382,19 +2382,6 @@ QInputMethod *QGuiApplication::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() This signal is emitted when application fonts are loaded or removed. diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index e171f81418..9d90cde993 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -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(); diff --git a/src/gui/kernel/qinputpanel.h b/src/gui/kernel/qinputpanel.h deleted file mode 100644 index 95be71d7b5..0000000000 --- a/src/gui/kernel/qinputpanel.h +++ /dev/null @@ -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 diff --git a/src/gui/kernel/qinputpanel_p.h b/src/gui/kernel/qinputpanel_p.h deleted file mode 100644 index a4f24505c6..0000000000 --- a/src/gui/kernel/qinputpanel_p.h +++ /dev/null @@ -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 diff --git a/src/gui/kernel/qplatforminputcontext.h b/src/gui/kernel/qplatforminputcontext.h index f6ff9f930c..d93bc475f0 100644 --- a/src/gui/kernel/qplatforminputcontext.h +++ b/src/gui/kernel/qplatforminputcontext.h @@ -51,7 +51,7 @@ // source and binary incompatible with future versions of Qt. // -#include <QtGui/qinputpanel.h> +#include <QtGui/qinputmethod.h> QT_BEGIN_HEADER |