summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@collabora.com>2011-12-20 15:31:41 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-27 23:38:26 +0100
commitc559edd76bdb6cdaf86389789ab05cfff648b195 (patch)
tree335f77c35605d36c8aabf371fce1d553230e12bd /src/gui/kernel
parent7f32f6d6828e7c2c7defc8f476541969e2821cfa (diff)
Remove non-const getters marked for elimination.
These all have consted overloads, so there's no need for them. Change-Id: I3d4f63b8eb8f1b7df7fa772d6172e0a954184d24 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qevent.cpp31
-rw-r--r--src/gui/kernel/qevent.h4
2 files changed, 0 insertions, 35 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index f69445109c..7bcc2b407e 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -941,15 +941,6 @@ QFocusEvent::~QFocusEvent()
{
}
-// ### Qt 5: remove
-/*!
- \internal
- */
-Qt::FocusReason QFocusEvent::reason()
-{
- return m_reason;
-}
-
/*!
Returns the reason for this focus event.
*/
@@ -3232,13 +3223,6 @@ QClipboardEvent::~QClipboardEvent()
Returns the key sequence that triggered the event.
*/
-// ### Qt 5: remove
-/*!
- \fn const QKeySequence &QShortcutEvent::key()
-
- \internal
-*/
-
/*!
\fn int QShortcutEvent::shortcutId() const
@@ -3248,14 +3232,6 @@ QClipboardEvent::~QClipboardEvent()
\sa QShortcut::id()
*/
-// ### Qt 5: remove
-/*!
- \fn int QShortcutEvent::shortcutId()
- \overload
-
- \internal
-*/
-
/*!
\fn bool QShortcutEvent::isAmbiguous() const
@@ -3265,13 +3241,6 @@ QClipboardEvent::~QClipboardEvent()
\sa QShortcut::activatedAmbiguously()
*/
-// ### Qt 5: remove
-/*!
- \fn bool QShortcutEvent::isAmbiguous()
-
- \internal
-*/
-
/*!
\class QWindowStateChangeEvent
\ingroup events
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index a4d287f16e..c8155026cc 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -266,7 +266,6 @@ public:
inline bool gotFocus() const { return type() == FocusIn; }
inline bool lostFocus() const { return type() == FocusOut; }
- Qt::FocusReason reason();
Qt::FocusReason reason() const;
private:
@@ -639,11 +638,8 @@ public:
QShortcutEvent(const QKeySequence &key, int id, bool ambiguous = false);
~QShortcutEvent();
- inline const QKeySequence &key() { return sequence; }
inline const QKeySequence &key() const { return sequence; }
- inline int shortcutId() { return sid; }
inline int shortcutId() const { return sid; }
- inline bool isAmbiguous() { return ambig; }
inline bool isAmbiguous() const { return ambig; }
protected:
QKeySequence sequence;