Remove QtVirtualKeyboard namespace from the public API

This change removes the QtVirtualKeyboard namespace from the public API.

This change was suggested in the API review. Use of namespace is
uncommon in a public Qt module. Prefixed names are preferred instead.

[ChangeLog] Removed QtVirtualKeyboard namespace from the public C++ API and
prefixed class names with QVirtualKeyboard. The new class names are
QVirtualKeyboardAbstractInputMethod, QVirtualKeyboardInputContext,
QVirtualKeyboardInputEngine, QVirtualKeyboardSelectionListModel and
QVirtualKeyboardTrace.

Change-Id: I52d35090b544dc7e8c8c8e5632ce24c455730755
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

1 files changed, 13 insertions, 15 deletions

diff --git a/src/virtualkeyboard/selectionlistmodel.h b/src/virtualkeyboard/selectionlistmodel.h
index 22d0ed3d..19347ddf 100644
--- a/src/virtualkeyboard/selectionlistmodel.h
+++ b/src/virtualkeyboard/selectionlistmodel.h
@@ -34,19 +34,18 @@
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 
 QT_BEGIN_NAMESPACE
-namespace QtVirtualKeyboard {
 
-class AbstractInputMethod;
-class InputEngine;
-class SelectionListModelPrivate;
+class QVirtualKeyboardAbstractInputMethod;
+class QVirtualKeyboardInputEngine;
+class QVirtualKeyboardSelectionListModelPrivate;
 
-class QVIRTUALKEYBOARD_EXPORT SelectionListModel : public QAbstractListModel
+class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardSelectionListModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(SelectionListModel)
+    Q_DECLARE_PRIVATE(QVirtualKeyboardSelectionListModel)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
-    explicit SelectionListModel(QObject *parent = nullptr);
+    explicit QVirtualKeyboardSelectionListModel(QObject *parent = nullptr);
 
 public:
     enum Type
@@ -70,9 +69,9 @@ public:
     Q_ENUM(Role)
     Q_ENUM(DictionaryType)
 
-    ~SelectionListModel();
-    void setDataSource(AbstractInputMethod *dataSource, Type type);
-    AbstractInputMethod *dataSource() const;
+    ~QVirtualKeyboardSelectionListModel();
+    void setDataSource(QVirtualKeyboardAbstractInputMethod *dataSource, Type type);
+    QVirtualKeyboardAbstractInputMethod *dataSource() const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     QHash<int,QByteArray> roleNames() const;
@@ -93,14 +92,13 @@ protected Q_SLOTS:
     void selectionListActiveItemChanged(int type, int index);
 
 private:
-    friend class InputEngine;
+    friend class QVirtualKeyboardInputEngine;
 };
 
-} // namespace QtVirtualKeyboard
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::SelectionListModel::Type)
-Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::SelectionListModel::Role)
-Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::SelectionListModel::DictionaryType)
+Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::Type)
+Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::Role)
+Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::DictionaryType)
 
 #endif // SELECTIONLISTMODEL_H