Port to verdigris

Author: jcelerier

CMakeLists.txt

@@ -80,7 +80,7 @@ set(SOURCE_FILES
 )
 
 # Create code for QObjects
-set(CMAKE_AUTOMOC On)
+set(CMAKE_AUTOMOC OFF)
 
 # Create code from resource files
 set(CMAKE_AUTORCC ON)
@@ -102,6 +102,7 @@ add_library(QCodeEditor STATIC
 
 target_include_directories(QCodeEditor PUBLIC
     include
+    "${OSSIA_3RDPARTY_FOLDER}/verdigris/src"
 )
 
 if(CMAKE_COMPILER_IS_GNUCXX)

include/internal/QCXXHighlighter.hpp

@@ -7,6 +7,7 @@
 // Qt
 #include <QRegularExpression>
 #include <QVector>
+#include <verdigris>
 
 class QSyntaxStyle;
 
@@ -16,7 +17,7 @@ class QSyntaxStyle;
  */
 class QCXXHighlighter : public QStyleSyntaxHighlighter
 {
-    Q_OBJECT
+    W_OBJECT(QCXXHighlighter)
   public:
     /**
      * @brief Constructor.

include/internal/QCodeEditor.hpp

@@ -2,6 +2,7 @@
 
 // Qt
 #include <QTextEdit> // Required for inheritance
+#include <verdigris>
 
 class QCompleter;
 class QLineNumberArea;
@@ -14,7 +15,7 @@ class QFramedTextAttribute;
  */
 class QCodeEditor : public QTextEdit
 {
-    Q_OBJECT
+    W_OBJECT(QCodeEditor)
 
   public:
     /**
@@ -142,97 +143,110 @@ class QCodeEditor : public QTextEdit
      */
     void clearSquiggle();
 
-  Q_SIGNALS:
+  public:
     /**
      * @brief Signal, the font is changed by the wheel event.
      */
-    void fontChanged(const QFont &newFont);
+    void fontChanged(const QFont &newFont) W_SIGNAL(fontChanged, newFont);
 
     /**
      * @brief Signal, like QLineEdit::editingFinished
      */
-    void editingFinished();
+    void editingFinished() W_SIGNAL(editingFinished);
 
     /**
      * @brief CTRL+Enter
      */
-    void livecodeTrigger();
-
-  public Q_SLOTS:
+    void livecodeTrigger() W_SIGNAL(livecodeTrigger);
 
+  public:
     /**
      * @brief Slot, that performs insertion of
      * completion info into code.
      * @param s Data.
      */
     void insertCompletion(const QString &s);
+    W_SLOT(insertCompletion);
 
     /**
      * @brief Slot, that performs update of
      * internal editor viewport based on line
      * number area width.
      */
     void updateLineNumberAreaWidth(int);
+    W_SLOT(updateLineNumberAreaWidth);
 
     /**
      * @brief Slot, that performs update of some
      * part of line number area.
      * @param rect Area that has to be updated.
      */
     void updateLineNumberArea(QRect rect);
+    W_SLOT(updateLineNumberArea);
 
     /**
      * @brief Slot, that will proceed extra selection
      * for current cursor position.
      */
     void updateExtraSelection1();
+    W_SLOT(updateExtraSelection1);
     void updateExtraSelection2();
+    W_SLOT(updateExtraSelection2);
 
     /**
      * @brief Slot, that will update editor style.
      */
     void updateStyle();
+    W_SLOT(updateStyle);
 
     /**
      * @brief Slot, that indent the selected lines.
      */
     void indent();
+    W_SLOT(indent);
 
     /**
      * @brief Slot, that unindent the selected lines.
      */
     void unindent();
+    W_SLOT(unindent);
 
     /**
      * @brief Slot, that swap the selected lines up.
      */
     void swapLineUp();
+    W_SLOT(swapLineUp);
 
     /**
      * @brief Slot, that swap the selected lines down.
      */
     void swapLineDown();
+    W_SLOT(swapLineDown);
 
     /**
      * @brief Slot, that delete the selected lines.
      */
     void deleteLine();
+    W_SLOT(deleteLine);
 
     /**
      * @brief Slot, that duplicate the current line or the selection.
      */
     void duplicate();
+    W_SLOT(duplicate);
 
     /**
      * @brief Slot, that toggle single line comment of the
      * selected lines.
      */
     void toggleComment();
+    W_SLOT(toggleComment);
 
     /**
      * @brief Slot, that toggle block comment of the selection.
      */
     void toggleBlockComment();
+    W_SLOT(toggleBlockComment);
 
   protected:
     /**
@@ -293,11 +307,12 @@ class QCodeEditor : public QTextEdit
      */
     bool event(QEvent *e) override;
 
-  private Q_SLOTS:
+  private:
     /**
      * @brief Slot, that updates the bottom margin.
      */
     void updateBottomMargin();
+    W_SLOT(updateBottomMargin)
 
   private:
     /**

include/internal/QGLSLCompleter.hpp

@@ -2,14 +2,15 @@
 
 // Qt
 #include <QCompleter> // Required for inheritance
+#include <verdigris>
 
 /**
  * @brief Class, that describes completer with
  * glsl specific types and functions.
  */
 class QGLSLCompleter : public QCompleter
 {
-    Q_OBJECT
+    W_OBJECT(QGLSLCompleter)
 
   public:
     /**

include/internal/QGLSLHighlighter.hpp

@@ -7,6 +7,7 @@
 // Qt
 #include <QRegularExpression>
 #include <QVector>
+#include <verdigris>
 
 class QSyntaxStyle;
 
@@ -16,7 +17,7 @@ class QSyntaxStyle;
  */
 class QGLSLHighlighter : public QStyleSyntaxHighlighter
 {
-    Q_OBJECT
+    W_OBJECT(QGLSLHighlighter)
   public:
     /**
      * @brief Constructor.

include/internal/QHighlightBlockRule.hpp

@@ -3,6 +3,7 @@
 // Qt
 #include <QRegularExpression>
 #include <QString>
+#include <verdigris>
 
 struct QHighlightBlockRule
 {

include/internal/QHighlightRule.hpp

@@ -3,6 +3,7 @@
 // Qt
 #include <QRegularExpression>
 #include <QString>
+#include <verdigris>
 
 struct QHighlightRule
 {
@@ -16,4 +17,4 @@ struct QHighlightRule
 
     QRegularExpression pattern;
     QString formatName;
-};
+};

include/internal/QJSHighlighter.hpp

@@ -6,6 +6,7 @@
 // Qt
 #include <QRegularExpression>
 #include <QVector>
+#include <verdigris>
 
 class QSyntaxStyle;
 
@@ -14,7 +15,7 @@ class QSyntaxStyle;
  */
 class QJSHighlighter : public QStyleSyntaxHighlighter
 {
-    Q_OBJECT
+    W_OBJECT(QJSHighlighter)
 
   public:
     /**

include/internal/QJSONHighlighter.hpp

@@ -6,14 +6,15 @@
 
 // Qt
 #include <QVector>
+#include <verdigris>
 
 /**
  * @brief Class, that describes JSON code
  * highlighter.
  */
 class QJSONHighlighter : public QStyleSyntaxHighlighter
 {
-    Q_OBJECT
+    W_OBJECT(QJSONHighlighter)
   public:
     /**
      * @brief Constructor.

include/internal/QJavaHighlighter.hpp

@@ -7,6 +7,7 @@
 // Qt
 #include <QRegularExpression>
 #include <QVector>
+#include <verdigris>
 
 class QSyntaxStyle;
 
@@ -15,7 +16,7 @@ class QSyntaxStyle;
  */
 class QJavaHighlighter : public QStyleSyntaxHighlighter
 {
-    Q_OBJECT
+    W_OBJECT(QJavaHighlighter)
   public:
     /**
      * @brief Constructs a new instance of a Java highlighter.