projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Bug #1293: --syslog option writes to emergency level
[quassel.git]
/
src
/
uisupport
/
multilineedit.cpp
diff --git
a/src/uisupport/multilineedit.cpp
b/src/uisupport/multilineedit.cpp
index
fa9eddf
..
54558b5
100644
(file)
--- a/
src/uisupport/multilineedit.cpp
+++ b/
src/uisupport/multilineedit.cpp
@@
-53,7
+53,7
@@
MultiLineEdit::MultiLineEdit(QWidget *parent)
#endif
setMode(SingleLine);
#endif
setMode(SingleLine);
- set
Word
WrapEnabled(false);
+ set
Line
WrapEnabled(false);
reset();
connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
reset();
connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
@@
-98,6
+98,13
@@
void MultiLineEdit::setMode(Mode mode)
}
}
+void MultiLineEdit::setLineWrapEnabled(bool enable)
+{
+ setLineWrapMode(enable ? WidgetWidth : NoWrap);
+ updateSizeHint();
+}
+
+
void MultiLineEdit::setMinHeight(int lines)
{
if (lines == _minHeight)
void MultiLineEdit::setMinHeight(int lines)
{
if (lines == _minHeight)
@@
-207,13
+214,6
@@
void MultiLineEdit::setSpellCheckEnabled(bool enable)
}
}
-void MultiLineEdit::setWordWrapEnabled(bool enable)
-{
- setLineWrapMode(enable ? WidgetWidth : NoWrap);
- updateSizeHint();
-}
-
-
void MultiLineEdit::setPasteProtectionEnabled(bool enable, QWidget *)
{
_pasteProtectionEnabled = enable;
void MultiLineEdit::setPasteProtectionEnabled(bool enable, QWidget *)
{
_pasteProtectionEnabled = enable;