projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use braced-init list when returning types
[quassel.git]
/
src
/
uisupport
/
multilineedit.h
diff --git
a/src/uisupport/multilineedit.h
b/src/uisupport/multilineedit.h
index
bd59bbc
..
bd06172
100644
(file)
--- a/
src/uisupport/multilineedit.h
+++ b/
src/uisupport/multilineedit.h
@@
-18,16
+18,14
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef MULTILINEEDIT_H_
-#define MULTILINEEDIT_H_
+#pragma once
+
+#include "uisupport-export.h"
#include <QKeyEvent>
#include <QHash>
#include <QKeyEvent>
#include <QHash>
-#ifdef HAVE_KDE4
-# include <KDE/KTextEdit>
-# define MultiLineEditParent KTextEdit
-#elif defined HAVE_KF5
+#if defined HAVE_KF5
# include <KTextWidgets/KTextEdit>
# define MultiLineEditParent KTextEdit
#else
# include <KTextWidgets/KTextEdit>
# define MultiLineEditParent KTextEdit
#else
@@
-41,7
+39,7
@@
# include <Sonnet/SpellCheckDecorator>
#endif
# include <Sonnet/SpellCheckDecorator>
#endif
-class MultiLineEdit : public MultiLineEditParent
+class
UISUPPORT_EXPORT
MultiLineEdit : public MultiLineEditParent
{
Q_OBJECT
{
Q_OBJECT
@@
-51,8
+49,7
@@
public:
MultiLine
};
MultiLine
};
- MultiLineEdit(QWidget *parent = 0);
- ~MultiLineEdit();
+ MultiLineEdit(QWidget *parent = nullptr);
void setCustomFont(const QFont &); // should be used instead setFont(), so we can set our size correctly
void setCustomFont(const QFont &); // should be used instead setFont(), so we can set our size correctly
@@
-87,7
+84,7
@@
public slots:
void setMaxHeight(int numLines);
void setEmacsMode(bool enable = true);
void setScrollBarsEnabled(bool enable = true);
void setMaxHeight(int numLines);
void setEmacsMode(bool enable = true);
void setScrollBarsEnabled(bool enable = true);
- void setPasteProtectionEnabled(bool enable = true, QWidget *msgBoxParent =
0
);
+ void setPasteProtectionEnabled(bool enable = true, QWidget *msgBoxParent =
nullptr
);
void setLineWrapEnabled(bool enable = false);
inline void setHistory(QStringList history) { _history = history; }
void setLineWrapEnabled(bool enable = false);
inline void setHistory(QStringList history) { _history = history; }
@@
-130,18
+127,18
@@
private:
private:
QStringList _history;
QHash<int, QString> _tempHistory;
private:
QStringList _history;
QHash<int, QString> _tempHistory;
- qint32 _idx;
- Mode _mode;
- bool _singleLine;
- int _minHeight;
- int _maxHeight;
- bool _scrollBarsEnabled;
- bool _pasteProtectionEnabled;
- bool _emacsMode;
- int _completionSpace;
+ qint32 _idx
{0}
;
+ Mode _mode
{SingleLine}
;
+ bool _singleLine
{true}
;
+ int _minHeight
{1}
;
+ int _maxHeight
{5}
;
+ bool _scrollBarsEnabled
{true}
;
+ bool _pasteProtectionEnabled
{true}
;
+ bool _emacsMode
{false}
;
+ int _completionSpace
{0}
;
QSize _sizeHint;
QSize _sizeHint;
- qreal _lastDocumentHeight;
+ qreal _lastDocumentHeight
{-1}
;
QMap<QString, QString> _mircColorMap;
QMap<QString, QString> _mircColorMap;
@@
-156,6
+153,3
@@
private:
Sonnet::SpellCheckDecorator *_spellCheckDecorator{nullptr};
#endif
};
Sonnet::SpellCheckDecorator *_spellCheckDecorator{nullptr};
#endif
};
-
-
-#endif