X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=e29ef205581b0e1bcb6ea696bad702fbe1fd5334;hb=1d3537dca504cb52ff0434471537a96ca4432007;hp=aed4af79a38d132da42a6a003c3b8d6ef7ac1477;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49;p=quassel.git

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index aed4af79..e29ef205 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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  *
@@ -48,12 +48,12 @@ MultiLineEdit::MultiLineEdit(QWidget *parent)
 #endif
 
     setAcceptRichText(false);
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
     enableFindReplace(false);
 #endif
 
     setMode(SingleLine);
-    setWordWrapEnabled(false);
+    setLineWrapEnabled(false);
     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)
@@ -199,7 +206,7 @@ void MultiLineEdit::setEmacsMode(bool enable)
 
 void MultiLineEdit::setSpellCheckEnabled(bool enable)
 {
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
     setCheckSpellingEnabled(enable);
 #else
     Q_UNUSED(enable)
@@ -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;
@@ -301,7 +301,7 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event)
     if (event == QKeySequence::InsertLineSeparator) {
 #else
 
-# ifdef Q_WS_MAC
+# ifdef Q_OS_MAC
     if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && event->modifiers() & Qt::META) {
 # else
     if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && event->modifiers() & Qt::SHIFT) {
@@ -470,7 +470,7 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event)
         }
     }
 
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
     KTextEdit::keyPressEvent(event);
 #else
     QTextEdit::keyPressEvent(event);
@@ -718,7 +718,11 @@ void MultiLineEdit::on_textChanged()
                 QString msg = tr("Do you really want to paste %n line(s)?", "", lines.count());
                 msg += "<p>";
                 for (int i = 0; i < 4; i++) {
+#if QT_VERSION < 0x050000
                     msg += Qt::escape(lines[i].left(40));
+#else
+                    msg += lines[i].left(40).toHtmlEscaped();
+#endif
                     if (lines[i].count() > 40)
                         msg += "...";
                     msg += "<br />";
@@ -726,7 +730,7 @@ void MultiLineEdit::on_textChanged()
                 msg += "...</p>";
                 QMessageBox question(QMessageBox::NoIcon, tr("Paste Protection"), msg, QMessageBox::Yes|QMessageBox::No);
                 question.setDefaultButton(QMessageBox::No);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
                 question.setWindowFlags(question.windowFlags() | Qt::Sheet);
 #endif
                 if (question.exec() != QMessageBox::Yes)