projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to make the QTBUG-6322 workaround work in more cases
[quassel.git]
/
src
/
qtui
/
inputwidget.h
diff --git
a/src/qtui/inputwidget.h
b/src/qtui/inputwidget.h
index
aeb63f8
..
7d7c053
100644
(file)
--- a/
src/qtui/inputwidget.h
+++ b/
src/qtui/inputwidget.h
@@
-44,7
+44,6
@@
public:
protected:
virtual bool eventFilter(QObject *watched, QEvent *event);
protected:
virtual bool eventFilter(QObject *watched, QEvent *event);
- virtual void keyPressEvent(QKeyEvent * event);
protected slots:
virtual void currentChanged(const QModelIndex ¤t, const QModelIndex &previous);
protected slots:
virtual void currentChanged(const QModelIndex ¤t, const QModelIndex &previous);
@@
-53,12
+52,14
@@
protected slots:
private slots:
void setCustomFont(const QVariant &font);
private slots:
void setCustomFont(const QVariant &font);
+ void setUseCustomFont(const QVariant &);
void setEnableSpellCheck(const QVariant &);
void setShowNickSelector(const QVariant &);
void setMaxLines(const QVariant &);
void setEnableSpellCheck(const QVariant &);
void setShowNickSelector(const QVariant &);
void setMaxLines(const QVariant &);
- void setEnableScrollBars(const QVariant &);
+ void setMultiLineEnabled(const QVariant &);
+ void setScrollBarsEnabled(const QVariant &);
- void
sendText
(const QString &text) const;
+ void
on_inputEdit_textEntered
(const QString &text) const;
void changeNick(const QString &newNick) const;
void setNetwork(NetworkId networkId);
void changeNick(const QString &newNick) const;
void setNetwork(NetworkId networkId);