qmllint: Cleanup

qmllint needed to be refactored before we can add any new functionality:
* Fix all the (C++) linter warnings
* Remove pointless namespaces
* Merge ScopeTree and FakeMetaObject into one class
* Remove the "Fake" from class and variable names
* Remove dead code
* Add "We mean it" warnings everywhere
* Unify #include style

This also "accidentally" fixes the automatic matching of signal handlers
in Connections elements to signals in their parent scopes.

Change-Id: Idf8daae34dfd6c0ee00da28b017f921da3eba25c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 20 insertions, 23 deletions

diff --git a/tools/qmllint/componentversion.h b/tools/qmllint/componentversion.h
index 9d079f1d30..9c4604b9a3 100644
--- a/tools/qmllint/componentversion.h
+++ b/tools/qmllint/componentversion.h
@@ -29,36 +29,35 @@
 #ifndef COMPONENTVERSION_H
 #define COMPONENTVERSION_H
 
-#include <qglobal.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
 
-QT_BEGIN_NAMESPACE
-class QCryptographicHash;
-QT_END_NAMESPACE
-
-namespace LanguageUtils {
+#include <QtCore/qglobal.h>
 
 class ComponentVersion
 {
-    int _major;
-    int _minor;
-
 public:
-    static const int NoVersion;
-    static const int MaxVersion;
+    static const int NoVersion = -1;
 
-    ComponentVersion();
-    ComponentVersion(int major, int minor);
+    ComponentVersion() = default;
+    ComponentVersion(int major, int minor) : m_major(major), m_minor(minor) {}
     explicit ComponentVersion(const QString &versionString);
-    ~ComponentVersion();
 
-    int majorVersion() const
-    { return _major; }
-    int minorVersion() const
-    { return _minor; }
+    int majorVersion() const { return m_major; }
+    int minorVersion() const { return m_minor; }
 
-    bool isValid() const;
-    QString toString() const;
-    void addToHash(QCryptographicHash &hash) const;
+    bool isValid() const { return m_major >= 0 && m_minor >= 0; }
+
+private:
+    int m_major = NoVersion;
+    int m_minor = NoVersion;
 };
 
 bool operator<(const ComponentVersion &lhs, const ComponentVersion &rhs);
@@ -68,6 +67,4 @@ bool operator>=(const ComponentVersion &lhs, const ComponentVersion &rhs);
 bool operator==(const ComponentVersion &lhs, const ComponentVersion &rhs);
 bool operator!=(const ComponentVersion &lhs, const ComponentVersion &rhs);
 
-} // namespace LanguageUtils
-
 #endif // COMPONENTVERSION_H