Simplify code, fix potential crash

[quassel.git] / src / uisupport / multilineedit.h

diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h
index 1348592..d12dfe6 100644 (file)
--- a/src/uisupport/multilineedit.h
+++ b/src/uisupport/multilineedit.h
@@ -59,15 +59,22 @@ public:
   inline void backspace() { keyPressEvent(new QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier)); }
   inline bool hasSelectedText() { return textCursor().hasSelection(); }
 
+  inline bool isSingleLine() const { return _singleLine; }
+  inline bool pasteProtectionEnabled() const { return _pasteProtectionEnabled; }
+
   virtual QSize sizeHint() const;
   virtual QSize minimumSizeHint() const;
 
 public slots:
   void setMode(Mode mode);
-  void setWrapMode(QTextOption::WrapMode = QTextOption::NoWrap);
   void setMinHeight(int numLines);
   void setMaxHeight(int numLines);
-  void enableScrollBars(bool enable = true);
+  void setScrollBarsEnabled(bool enable = true);
+  void setSpellCheckEnabled(bool enable = true);
+  void setPasteProtectionEnabled(bool enable = true, QWidget *msgBoxParent = 0);
+
+  // Note: Enabling wrap will make isSingleLine() not work correctly, so only use this if minHeight() > 1!
+  void setWordWrapEnabled(bool enable = true);
 
 signals:
   void textEntered(const QString &text);
@@ -78,6 +85,7 @@ protected:
 
 private slots:
   void on_returnPressed();
+  void on_returnPressed(const QString &text);
   void on_textChanged();
   void on_documentHeightChanged(qreal height);
 
@@ -90,11 +98,11 @@ private:
   QHash<int, QString> tempHistory;
   qint32 idx;
   Mode _mode;
-  QTextOption::WrapMode _wrapMode;
-  int _numLines;
+  bool _singleLine;
   int _minHeight;
   int _maxHeight;
   bool _scrollBarsEnabled;
+  bool _pasteProtectionEnabled;
 
   QSize _sizeHint;
   qreal _lastDocumentHeight;
@@ -102,9 +110,7 @@ private:
   void reset();
   void showHistoryEntry();
   void updateScrollBars();
-
-  inline int numLines() const { return _numLines; }
-  void setNumLines(int);
+  void updateSizeHint();
 };
 
 #endif