[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [cervisia] /: Port missing part to Qt4 (click stops completion). Disallow HTML input
From:       Martin Koller <kollix () aon ! at>
Date:       2015-09-26 19:26:17
Message-ID: E1Zfv6v-0006SK-JF () scm ! kde ! org
[Download RAW message or body]

Git commit c72a00ccdf4a07c4a7ce65ed3e19d93dd8e7691a by Martin Koller.
Committed on 26/09/2015 at 19:25.
Pushed by mkoller into branch 'master'.

Port missing part to Qt4 (click stops completion). Disallow HTML input

M  +8    -8    logmessageedit.cpp
M  +2    -1    logmessageedit.h

http://commits.kde.org/cervisia/c72a00ccdf4a07c4a7ce65ed3e19d93dd8e7691a

diff --git a/logmessageedit.cpp b/logmessageedit.cpp
index e215257..ff709fd 100644
--- a/logmessageedit.cpp
+++ b/logmessageedit.cpp
@@ -35,19 +35,19 @@ LogMessageEdit::LogMessageEdit(QWidget* parent)
     , m_completionStartPos(0)
     , m_checkSpellingEnabledBeforeCompletion(false)
 {
+    setAcceptRichText(false);
+
     // create the completion object
     completionObject();
+}
 
-#ifdef __GNUC__
-#warning XXX: port to Qt4
-#endif
-#if 0
+void LogMessageEdit::mousePressEvent(QMouseEvent *event)
+{
     // a mouse click stops the completion process
-    connect( this, SIGNAL(clicked(int,int)), SLOT(stopCompletion()) );
-#endif
+    QTextEdit::mousePressEvent(event);
+    stopCompletion();
 }
 
-
 void LogMessageEdit::setCompletedText(const QString& match)
 {
     QTextCursor cursor = this->textCursor();
@@ -186,7 +186,7 @@ void LogMessageEdit::tryCompletion()
             cursor.movePosition(QTextCursor::Left);
             setTextCursor(cursor);
 
-			setCompletedText(match);
+            setCompletedText(match);
         }
         else
         {
diff --git a/logmessageedit.h b/logmessageedit.h
index 1cc14f1..7b666d8 100644
--- a/logmessageedit.h
+++ b/logmessageedit.h
@@ -41,7 +41,8 @@ public:
     virtual void setCompletedItems(const QStringList& items, bool autoSuggest =true);
 
 protected:
-    void keyPressEvent(QKeyEvent* event);
+    virtual void keyPressEvent(QKeyEvent* event);
+    virtual void mousePressEvent(QMouseEvent *event);
 
 private slots:
     void stopCompletion();
[prev in list] [next in list] [prev in thread] [next in thread]