From 7f801ed73a3b9e9098fafed64c21e98ae7d73dff Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Tue, 16 Aug 2016 10:01:05 +0200
Subject: tuiotouch: clean up

- order includes from most specific to most general
- include only what you need
- port uses of inefficient QLists to QVector
  (required adding default ctors to the payload types)
- mark types as Q_MOVABLE_TYPE
- inline some trivial functions
- add explicit to ctors
- mark plugin with QT_NO_FOREACH

Change-Id: I7ae13141ece22bfdf49be42deb0987d51da2d72b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 src/plugins/generic/tuiotouch/qoscbundle_p.h | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/plugins/generic/tuiotouch/qoscbundle_p.h')

diff --git a/src/plugins/generic/tuiotouch/qoscbundle_p.h b/src/plugins/generic/tuiotouch/qoscbundle_p.h
index e95a202ae7..cb3ec4d251 100644
--- a/src/plugins/generic/tuiotouch/qoscbundle_p.h
+++ b/src/plugins/generic/tuiotouch/qoscbundle_p.h
@@ -43,25 +43,32 @@
 
 #include "qoscmessage_p.h"
 
+#include <QtCore/QVector>
+
 QT_BEGIN_NAMESPACE
 
+class QByteArray;
+
 class QOscBundle
 {
+    QOscBundle(); // for QVector, don't use
+    friend class QVector<QOscBundle>;
 public:
-    QOscBundle(const QByteArray &data);
+    explicit QOscBundle(const QByteArray &data);
 
-    bool isValid() const;
-    QList<QOscBundle> bundles() const;
-    QList<QOscMessage> messages() const;
+    bool isValid() const { return m_isValid; }
+    QVector<QOscBundle> bundles() const { return m_bundles; }
+    QVector<QOscMessage> messages() const { return m_messages; }
 
 private:
     bool m_isValid;
     bool m_immediate;
     quint32 m_timeEpoch;
     quint32 m_timePico;
-    QList<QOscBundle> m_bundles;
-    QList<QOscMessage> m_messages;
+    QVector<QOscBundle> m_bundles;
+    QVector<QOscMessage> m_messages;
 };
+Q_DECLARE_TYPEINFO(QOscBundle, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-- 
cgit v1.2.3