X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.h;h=f83c4de44f17f8eede099ca2c0dd1012f0794572;hp=899cc07eb6e65d4b6a4d87fdc1368137085e5cc9;hb=e56629542168c203cac8504085fc96c7f7b73d90;hpb=ce26c3770b254362c7bd1e094ba8f8bf22133653 diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h index 899cc07e..f83c4de4 100644 --- a/src/uisupport/multilineedit.h +++ b/src/uisupport/multilineedit.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -24,17 +24,17 @@ #include #include -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include # define MultiLineEditParent KTextEdit +#elif defined HAVE_KF5 +# include +# define MultiLineEditParent KTextEdit #else # include # define MultiLineEditParent QTextEdit #endif -class QKeyEvent; -class TabCompleter; - class MultiLineEdit : public MultiLineEditParent { Q_OBJECT @@ -73,6 +73,8 @@ public: inline qint32 idx() const { return _idx; } inline bool emacsMode() const { return _emacsMode; } + void addCompletionSpace(); + public slots: void setMode(Mode mode); void setMinHeight(int numLines); @@ -98,7 +100,7 @@ protected: private slots: void on_returnPressed(); - void on_returnPressed(const QString &text); + void on_returnPressed(QString text); void on_textChanged(); void on_documentHeightChanged(qreal height); @@ -121,6 +123,7 @@ private: bool _scrollBarsEnabled; bool _pasteProtectionEnabled; bool _emacsMode; + int _completionSpace; QSize _sizeHint; qreal _lastDocumentHeight;