From 4363d836f6a2b245e8e12d1e5eb08db791e95fce Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 21 Jun 2011 16:00:36 +0200 Subject: remove the plugin support for QInputContext This will be handled through the lighthouse plugin instead. --- src/plugins/inputmethods/imsw-multi/imsw-multi.pro | 14 -- .../inputmethods/imsw-multi/qmultiinputcontext.cpp | 212 --------------------- .../inputmethods/imsw-multi/qmultiinputcontext.h | 117 ------------ .../imsw-multi/qmultiinputcontextplugin.cpp | 111 ----------- .../imsw-multi/qmultiinputcontextplugin.h | 85 --------- src/plugins/inputmethods/inputmethods.pro | 3 - src/plugins/plugins.pro | 1 - 7 files changed, 543 deletions(-) delete mode 100644 src/plugins/inputmethods/imsw-multi/imsw-multi.pro delete mode 100644 src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp delete mode 100644 src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h delete mode 100644 src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp delete mode 100644 src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h delete mode 100644 src/plugins/inputmethods/inputmethods.pro (limited to 'src/plugins') diff --git a/src/plugins/inputmethods/imsw-multi/imsw-multi.pro b/src/plugins/inputmethods/imsw-multi/imsw-multi.pro deleted file mode 100644 index c67be02ba4..0000000000 --- a/src/plugins/inputmethods/imsw-multi/imsw-multi.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = qimsw-multi -load(qt_plugin) -CONFIG += warn_on -QT += widgets - -DESTDIR = $$QT.gui.plugins/inputmethods - -HEADERS += qmultiinputcontext.h \ - qmultiinputcontextplugin.h -SOURCES += qmultiinputcontext.cpp \ - qmultiinputcontextplugin.cpp - -target.path += $$[QT_INSTALL_PLUGINS]/inputmethods -INSTALLS += target diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp deleted file mode 100644 index 258d586564..0000000000 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ /dev/null @@ -1,212 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins 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$ -** -****************************************************************************/ - -/**************************************************************************** -** -** Implementation of QMultiInputContext class -** -** Copyright (C) 2004 immodule for Qt Project. All rights reserved. -** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own -** licence. You may use this file under your Qt license. Following -** description is copied from their original file headers. Contact -** immodule-qt@freedesktop.org if any conditions of this licensing are -** not clear to you. -** -****************************************************************************/ - -#ifndef QT_NO_IM -#include "qmultiinputcontext.h" -#include -#include -#include -#include -#include - -#include - -QT_BEGIN_NAMESPACE - -QMultiInputContext::QMultiInputContext() - : QInputContext(), current(-1) -{ - keys = QInputContextFactory::keys(); - for (int i = keys.size()-1; i >= 0; --i) - if (keys.at(i).contains(QLatin1String("imsw"))) - keys.removeAt(i); - - QString def = QLatin1String(getenv("QT4_IM_MODULE")); - if (def.isEmpty()) - def = QLatin1String(getenv("QT_IM_MODULE")); - if (def.isEmpty()) { - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); - settings.beginGroup(QLatin1String("Qt")); - def = settings.value(QLatin1String("DefaultInputMethod"), QLatin1String("xim")).toString(); - } - current = keys.indexOf(def); - if (current < 0) - current = 0; - - menu = new QMenu(tr("Select IM")); - separator = new QAction(this); - separator->setSeparator(true); - - QActionGroup *group = new QActionGroup(this); - for (int i = 0; i < keys.size(); ++i) { - slaves.append(0); - const QString key = keys.at(i); - QAction *a = menu->addAction(QInputContextFactory::displayName(key)); - a->setData(key); - a->setCheckable(true); - group->addAction(a); - if (i == current) { - slaves.replace(current, QInputContextFactory::create(key, this)); - a->setChecked(true); - } - } - connect(group, SIGNAL(triggered(QAction*)), this, SLOT(changeSlave(QAction*))); -} - -QMultiInputContext::~QMultiInputContext() -{ - delete menu; -} - - -QString QMultiInputContext::identifierName() -{ - return (slave()) ? slave()->identifierName() : QLatin1String(""); -} - -QString QMultiInputContext::language() -{ - return (slave()) ? slave()->language() : QLatin1String(""); -} - - -#if defined(Q_WS_X11) -bool QMultiInputContext::x11FilterEvent(QWidget *keywidget, XEvent *event) -{ - return (slave()) ? slave()->x11FilterEvent(keywidget, event) : false; -} -#endif // Q_WS_X11 - - -bool QMultiInputContext::filterEvent(const QEvent *event) -{ - return (slave()) ? slave()->filterEvent(event) : false; -} - -void QMultiInputContext::reset() -{ - if (slave()) - slave()->reset(); -} - -void QMultiInputContext::update() -{ - if (slave()) - slave()->update(); -} - -void QMultiInputContext::mouseHandler(int x, QMouseEvent *event) -{ - if (slave()) - slave()->mouseHandler(x, event); -} - -QFont QMultiInputContext::font() const -{ - return (slave()) ? slave()->font() : QInputContext::font(); -} - -void QMultiInputContext::setFocusWidget(QWidget *w) -{ - QInputContext::setFocusWidget(w); - if (slave()) - slave()->setFocusWidget(w); -} - -QWidget *QMultiInputContext::focusWidget() const -{ - return QInputContext::focusWidget(); -} - -void QMultiInputContext::widgetDestroyed(QWidget *w) -{ - if (slave()) - slave()->widgetDestroyed(w); -} - -bool QMultiInputContext::isComposing() const -{ - return (slave()) ? slave()->isComposing() : false; -} - -QList QMultiInputContext::actions() -{ - QList a = slave()->actions(); - a.append(separator); - a.append(menu->menuAction()); - return a; -} - -void QMultiInputContext::changeSlave(QAction *a) -{ - for (int i = 0; i < slaves.size(); ++i) { - if (keys.at(i) == a->data().toString()) { - if (slaves.at(i) == 0) - slaves.replace(i, QInputContextFactory::create(keys.at(i), this)); - QInputContext *qic = slaves.at(current); - QWidget *oldWidget = qic->focusWidget(); - qic->reset(); - qic->setFocusWidget(0); - current = i; - qic = slaves.at(current); - qic->setFocusWidget(oldWidget); - return; - } - } -} - -QT_END_NAMESPACE - -#endif // QT_NO_IM diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h deleted file mode 100644 index d965920d98..0000000000 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h +++ /dev/null @@ -1,117 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins 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$ -** -****************************************************************************/ - -/**************************************************************************** -** -** Definition of QMultiInputContext class -** -** Copyright (C) 2004 immodule for Qt Project. All rights reserved. -** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own -** licence. You may use this file under your Qt license. Following -** description is copied from their original file headers. Contact -** immodule-qt@freedesktop.org if any conditions of this licensing are -** not clear to you. -** -****************************************************************************/ - -#ifndef QMULTIINPUTCONTEXT_H -#define QMULTIINPUTCONTEXT_H - -#ifndef QT_NO_IM - -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QMultiInputContext : public QInputContext -{ - Q_OBJECT -public: - QMultiInputContext(); - ~QMultiInputContext(); - - QString identifierName(); - QString language(); - -#if defined(Q_WS_X11) - bool x11FilterEvent( QWidget *keywidget, XEvent *event ); -#endif // Q_WS_X11 - bool filterEvent( const QEvent *event ); - - void reset(); - void update(); - void mouseHandler( int x, QMouseEvent *event ); - QFont font() const; - bool isComposing() const; - - QList actions(); - - QWidget *focusWidget() const; - void setFocusWidget(QWidget *w); - - void widgetDestroyed( QWidget *w ); - - QInputContext *slave() { return slaves.at(current); } - const QInputContext *slave() const { return slaves.at(current); } - -protected Q_SLOTS: - void changeSlave(QAction *); -private: - void *unused; - int current; - QList slaves; - QMenu *menu; - QAction *separator; - QStringList keys; -}; - -#endif // Q_NO_IM - -QT_END_NAMESPACE - -#endif // QMULTIINPUTCONTEXT_H diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp deleted file mode 100644 index 1f56e2350b..0000000000 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins 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$ -** -****************************************************************************/ - -/**************************************************************************** -** -** Implementation of QMultiInputContextPlugin class -** -** Copyright (C) 2004 immodule for Qt Project. All rights reserved. -** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own -** license. You may use this file under your Qt license. Following -** description is copied from their original file headers. Contact -** immodule-qt@freedesktop.org if any conditions of this licensing are -** not clear to you. -** -****************************************************************************/ - -#ifndef QT_NO_IM -#include "qmultiinputcontext.h" -#include "qmultiinputcontextplugin.h" -#include -#include - -QT_BEGIN_NAMESPACE - -QMultiInputContextPlugin::QMultiInputContextPlugin() -{ -} - -QMultiInputContextPlugin::~QMultiInputContextPlugin() -{ -} - -QStringList QMultiInputContextPlugin::keys() const -{ - // input method switcher should named with "imsw-" prefix to - // prevent to be listed in ordinary input method list. - return QStringList( QLatin1String("imsw-multi") ); -} - -QInputContext *QMultiInputContextPlugin::create( const QString &key ) -{ - if (key != QLatin1String("imsw-multi")) - return 0; - return new QMultiInputContext; -} - -QStringList QMultiInputContextPlugin::languages( const QString & ) -{ - return QStringList(); -} - -QString QMultiInputContextPlugin::displayName( const QString &key ) -{ - if (key != QLatin1String("imsw-multi")) - return QString(); - return tr( "Multiple input method switcher" ); -} - -QString QMultiInputContextPlugin::description( const QString &key ) -{ - if (key != QLatin1String("imsw-multi")) - return QString(); - return tr( "Multiple input method switcher that uses the context menu of the text widgets" ); -} - - -Q_EXPORT_STATIC_PLUGIN(QMultiInputContextPlugin) -Q_EXPORT_PLUGIN2(qimsw_multi, QMultiInputContextPlugin) - -QT_END_NAMESPACE - -#endif diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h deleted file mode 100644 index d119b9dc7f..0000000000 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins 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$ -** -****************************************************************************/ - -/**************************************************************************** -** -** Definition of QMultiInputContextPlugin class -** -** Copyright (C) 2004 immodule for Qt Project. All rights reserved. -** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own -** license. You may use this file under your Qt license. Following -** description is copied from their original file headers. Contact -** immodule-qt@freedesktop.org if any conditions of this licensing are -** not clear to you. -** -****************************************************************************/ - -#ifndef QMULTIINPUTCONTEXTPLUGIN_H -#define QMULTIINPUTCONTEXTPLUGIN_H - -#ifndef QT_NO_IM - -#include "qmultiinputcontext.h" -#include -#include - -QT_BEGIN_NAMESPACE - -class QMultiInputContextPlugin : public QInputContextPlugin -{ - Q_OBJECT -public: - QMultiInputContextPlugin(); - ~QMultiInputContextPlugin(); - - QStringList keys() const; - QInputContext *create( const QString &key ); - QStringList languages( const QString &key ); - QString displayName( const QString &key ); - QString description( const QString &key ); -}; - -#endif // QT_NO_IM - -QT_END_NAMESPACE - -#endif // QMULTIINPUTCONTEXTPLUGIN_H diff --git a/src/plugins/inputmethods/inputmethods.pro b/src/plugins/inputmethods/inputmethods.pro deleted file mode 100644 index e1ca847519..0000000000 --- a/src/plugins/inputmethods/inputmethods.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = imsw-multi diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 6950114aaa..0936cd2102 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -7,7 +7,6 @@ unix:!symbian { SUBDIRS *= codecs } !contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats -!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 qpa:SUBDIRS += platforms -- cgit v1.2.3