diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoapplication.h | 1 | ||||
| -rw-r--r-- | include/aocharbutton.h | 3 | ||||
| -rw-r--r-- | include/aoevidencebutton.h | 3 | ||||
| -rw-r--r-- | include/aotextarea.h | 4 | ||||
| -rw-r--r-- | include/courtroom.h | 2 | ||||
| -rw-r--r-- | include/datatypes.h | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h index 4f2c585a..16895d85 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -16,7 +16,6 @@ #include <QVector> #include <QDebug> -#include <QDesktopWidget> #include <QRect> #include <QCryptographicHash> diff --git a/include/aocharbutton.h b/include/aocharbutton.h index dd27e62c..8e8038f9 100644 --- a/include/aocharbutton.h +++ b/include/aocharbutton.h @@ -6,6 +6,7 @@ #include <QFile> #include <QPushButton> +#include <QEnterEvent> #include <QString> #include <QWidget> @@ -37,7 +38,7 @@ private: AOImage *ui_selector; protected: - void enterEvent(QEvent *e); + void enterEvent(QEnterEvent *e); void leaveEvent(QEvent *e); }; diff --git a/include/aoevidencebutton.h b/include/aoevidencebutton.h index d7812fe9..1898539f 100644 --- a/include/aoevidencebutton.h +++ b/include/aoevidencebutton.h @@ -6,6 +6,7 @@ #include <QDebug> #include <QPushButton> +#include <QEnterEvent> #include <QString> class AOEvidenceButton : public QPushButton { @@ -31,7 +32,7 @@ private: int m_id = 0; protected: - void enterEvent(QEvent *e); + void enterEvent(QEnterEvent *e); void leaveEvent(QEvent *e); void mouseDoubleClickEvent(QMouseEvent *e); /* diff --git a/include/aotextarea.h b/include/aotextarea.h index 60b4b7ca..405f4eb4 100644 --- a/include/aotextarea.h +++ b/include/aotextarea.h @@ -2,7 +2,7 @@ #define AOTEXTAREA_H #include <QDebug> -#include <QRegExp> +#include <QRegularExpression> #include <QScrollBar> #include <QTextBrowser> #include <QTextCursor> @@ -17,7 +17,7 @@ public: void append_error(QString p_message); private: - const QRegExp url_parser_regex = QRegExp("\\b(https?://\\S+\\.\\S+)\\b"); + const QRegularExpression url_parser_regex = QRegularExpression("\\b(https?://\\S+\\.\\S+)\\b"); void auto_scroll(QTextCursor old_cursor, int scrollbar_value, bool is_scrolled_down); diff --git a/include/courtroom.h b/include/courtroom.h index 45c040fb..d767f0af 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -55,7 +55,7 @@ #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) #include <QRandomGenerator> //added in Qt 5.10 #endif -#include <QRegExp> +#include <QRegularExpression> #include <QScrollBar> #include <QTextBoundaryFinder> #include <QTextCharFormat> diff --git a/include/datatypes.h b/include/datatypes.h index d5d8551e..682d68a5 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -113,7 +113,7 @@ enum CHAT_MESSAGE { EFFECTS, }; -enum EMOTE_MOD { +enum EMOTE_MOD_TYPE { IDLE = 0, PREANIM = 1, ZOOM = 5, |