From c7ae7baae2a25f24f1e262f51a8788fdfa684e62 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Tue, 1 May 2018 11:52:29 +0200
Subject: [PATCH] using QStringList instead og QVector< QString > - although
 QList is not the better choice

---
 src/inputpanel/QskInputEngine.cpp        | 4 ++--
 src/inputpanel/QskInputEngine.h          | 3 ++-
 src/inputpanel/QskInputPanel.cpp         | 8 +++-----
 src/inputpanel/QskInputPanel.h           | 5 ++---
 src/inputpanel/QskInputPredictionBar.cpp | 8 ++++----
 src/inputpanel/QskInputPredictionBar.h   | 4 ++--
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/inputpanel/QskInputEngine.cpp b/src/inputpanel/QskInputEngine.cpp
index df28f93d..40749f09 100644
--- a/src/inputpanel/QskInputEngine.cpp
+++ b/src/inputpanel/QskInputEngine.cpp
@@ -100,9 +100,9 @@ QskTextPredictor* QskInputEngine::predictor() const
     return m_data->predictor;
 }
 
-QVector< QString > QskInputEngine::prediction() const
+QStringList QskInputEngine::prediction() const
 {
-    QVector< QString > candidates;
+    QStringList candidates;
 
     if ( const auto predictor = m_data->predictor )
     {
diff --git a/src/inputpanel/QskInputEngine.h b/src/inputpanel/QskInputEngine.h
index 1c468811..aca0ba3a 100644
--- a/src/inputpanel/QskInputEngine.h
+++ b/src/inputpanel/QskInputEngine.h
@@ -12,6 +12,7 @@
 
 class QskTextPredictor;
 class QQuickItem;
+class QStringList;
 
 class QSK_EXPORT QskInputEngine : public QObject
 {
@@ -39,7 +40,7 @@ public:
         Qt::InputMethodHints, int spaceLeft = -1 );
 
     QString predictiveText( int ) const;
-    QVector< QString > prediction() const;
+    QStringList prediction() const;
 
     void reset();
 
diff --git a/src/inputpanel/QskInputPanel.cpp b/src/inputpanel/QskInputPanel.cpp
index 37ad0997..069f9f42 100644
--- a/src/inputpanel/QskInputPanel.cpp
+++ b/src/inputpanel/QskInputPanel.cpp
@@ -219,7 +219,7 @@ void QskInputPanel::setEngine( QskInputEngine* engine )
     if ( engine )
     {
         connect( engine, &QskInputEngine::predictionChanged,
-            this, &QskInputPanel::updatePredictionBar );
+            this, &QskInputPanel::updatePrediction );
     }
 
     m_data->predictionBar->setVisible(
@@ -265,7 +265,7 @@ QQuickItem* QskInputPanel::attachedInputItem() const
     return m_data->inputItem;
 }
 
-void QskInputPanel::updatePredictionBar()
+void QskInputPanel::updatePrediction()
 {
     m_data->predictionBar->setPrediction(
         m_data->engine->prediction() );
@@ -328,15 +328,13 @@ void QskInputPanel::setInputProxy( bool on )
 
 void QskInputPanel::commitPredictiveText( int index )
 {
-    m_data->predictionBar->setPrediction( QVector< QString >() );
+    m_data->predictionBar->setPrediction( QStringList() );
 
     if ( m_data->engine )
     {
         const QString text = m_data->engine->predictiveText( index );
 
         m_data->engine->reset();
-        m_data->predictionBar->setPrediction( QVector< QString >() );
-
         qskSendText( m_data->receiverItem(), text, true );
     }
 }
diff --git a/src/inputpanel/QskInputPanel.h b/src/inputpanel/QskInputPanel.h
index 0cffc876..79f72160 100644
--- a/src/inputpanel/QskInputPanel.h
+++ b/src/inputpanel/QskInputPanel.h
@@ -14,8 +14,6 @@ class QskInputEngine;
 class QString;
 class QLocale;
 
-template class QVector< QString >;
-
 class QSK_EXPORT QskInputPanel : public QskBox
 {
     Q_OBJECT
@@ -66,8 +64,9 @@ protected:
     virtual void processKey( int key,
         Qt::InputMethodHints, int spaceLeft );
 
+    virtual void updatePrediction();
+
 private:
-    void updatePredictionBar();
     void commitKey( int key );
     void commitPredictiveText( int );
 
diff --git a/src/inputpanel/QskInputPredictionBar.cpp b/src/inputpanel/QskInputPredictionBar.cpp
index da12e9f2..5066dabc 100644
--- a/src/inputpanel/QskInputPredictionBar.cpp
+++ b/src/inputpanel/QskInputPredictionBar.cpp
@@ -9,7 +9,7 @@
 #include "QskTextOptions.h"
 
 #include <QFontMetricsF>
-#include <QVector>
+#include <QStringList>
 
 QSK_SUBCONTROL( QskInputPredictionBar, Panel )
 QSK_SUBCONTROL( QskInputPredictionBar, ButtonPanel )
@@ -60,7 +60,7 @@ class QskInputPredictionBar::PrivateData
 {
 public:
     QskLinearBox* layoutBox;
-    QVector< QString > candidates;
+    QStringList candidates;
 
     int scrollOffset = 0;
     const int buttonCount = 12;
@@ -105,7 +105,7 @@ QskAspect::Subcontrol QskInputPredictionBar::effectiveSubcontrol(
     return subControl;
 }
 
-void QskInputPredictionBar::setPrediction( const QVector< QString >& candidates )
+void QskInputPredictionBar::setPrediction( const QStringList& candidates )
 {
     if( m_data->candidates != candidates )
     {
@@ -114,7 +114,7 @@ void QskInputPredictionBar::setPrediction( const QVector< QString >& candidates
     }
 }
 
-QVector< QString > QskInputPredictionBar::candidates() const
+QStringList QskInputPredictionBar::candidates() const
 {
     return m_data->candidates;
 }
diff --git a/src/inputpanel/QskInputPredictionBar.h b/src/inputpanel/QskInputPredictionBar.h
index 3b1a45fd..b9d104b1 100644
--- a/src/inputpanel/QskInputPredictionBar.h
+++ b/src/inputpanel/QskInputPredictionBar.h
@@ -23,13 +23,13 @@ public:
     virtual QskAspect::Subcontrol effectiveSubcontrol(
         QskAspect::Subcontrol subControl ) const override;
 
-    QVector< QString > candidates() const;
+    QStringList candidates() const;
 
 Q_SIGNALS:
     void predictiveTextSelected( int );
 
 public Q_SLOTS:
-    void setPrediction( const QVector< QString >& );
+    void setPrediction( const QStringList& );
 
 private:
     void buttonClicked();