X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.h;h=70e55800c573bec1f82363a15675259339658833;hp=f83c4de44f17f8eede099ca2c0dd1012f0794572;hb=0ba56e60f400621ddc291669dc2c03a8e461c224;hpb=8cece06596c290d69c1f32b7221c796437f5fabb diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h index f83c4de4..70e55800 100644 --- a/src/uisupport/multilineedit.h +++ b/src/uisupport/multilineedit.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -61,8 +61,8 @@ public: inline bool isSingleLine() const { return _singleLine; } inline bool pasteProtectionEnabled() const { return _pasteProtectionEnabled; } - virtual QSize sizeHint() const; - virtual QSize minimumSizeHint() const; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; inline QString mircColorFromRGB(QString rgbColor) const { return _mircColorMap.key(rgbColor); } inline QString rgbColorFromMirc(QString mircColor) const { return _mircColorMap[mircColor]; } @@ -74,6 +74,9 @@ public: inline bool emacsMode() const { return _emacsMode; } void addCompletionSpace(); +#if defined HAVE_KF5 || defined HAVE_KDE4 + void createHighlighter() override; +#endif public slots: void setMode(Mode mode); @@ -94,9 +97,9 @@ signals: void noTextEntered(); protected: - virtual bool event(QEvent *e); - virtual void keyPressEvent(QKeyEvent *event); - virtual void resizeEvent(QResizeEvent *event); + bool event(QEvent *e) override; + void keyPressEvent(QKeyEvent *event) override; + void resizeEvent(QResizeEvent *event) override; private slots: void on_returnPressed();