From cd853c0ad7a74a81aa831968c7ded60874b161ae Mon Sep 17 00:00:00 2001
From: Jan-Arve Saether <jan-arve.saether@nokia.com>
Date: Wed, 23 May 2012 10:11:58 +0200
Subject: Remove some unused variables from QAccessibleWidgetPrivate

Change-Id: I22fd67d63131d48356023c26eb0689587ce96967
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
---
 src/widgets/accessible/qaccessiblewidget.cpp | 71 ++--------------------------
 src/widgets/accessible/qaccessiblewidget.h   |  4 --
 2 files changed, 3 insertions(+), 72 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index bf3c187d62..a4e8043000 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -161,10 +161,6 @@ public:
 
     QAccessible::Role role;
     QString name;
-    QString description;
-    QString value;
-    QString help;
-    QString accelerator;
     QStringList primarySignals;
     const QAccessibleInterface *asking;
 };
@@ -283,58 +279,6 @@ void QAccessibleWidget::addControllingSignal(const QString &signal)
     d->primarySignals << QLatin1String(s);
 }
 
-/*!
-    Sets the value of this interface implementation to \a value.
-
-    The default implementation of text() returns the set value for
-    the Value text.
-
-    Note that the object wrapped by this interface is not modified.
-*/
-void QAccessibleWidget::setValue(const QString &value)
-{
-    d->value = value;
-}
-
-/*!
-    Sets the description of this interface implementation to \a desc.
-
-    The default implementation of text() returns the set value for
-    the Description text.
-
-    Note that the object wrapped by this interface is not modified.
-*/
-void QAccessibleWidget::setDescription(const QString &desc)
-{
-    d->description = desc;
-}
-
-/*!
-    Sets the help of this interface implementation to \a help.
-
-    The default implementation of text() returns the set value for
-    the Help text.
-
-    Note that the object wrapped by this interface is not modified.
-*/
-void QAccessibleWidget::setHelp(const QString &help)
-{
-    d->help = help;
-}
-
-/*!
-    Sets the accelerator of this interface implementation to \a accel.
-
-    The default implementation of text() returns the set value for
-    the Accelerator text.
-
-    Note that the object wrapped by this interface is not modified.
-*/
-void QAccessibleWidget::setAccelerator(const QString &accel)
-{
-    d->accelerator = accel;
-}
-
 static inline bool isAncestor(const QObject *obj, const QObject *child)
 {
     while (child) {
@@ -469,9 +413,7 @@ QString QAccessibleWidget::text(QAccessible::Text t) const
         }
         break;
     case QAccessible::Description:
-        if (!d->description.isEmpty())
-            str = d->description;
-        else if (!widget()->accessibleDescription().isEmpty())
+        if (!widget()->accessibleDescription().isEmpty())
             str = widget()->accessibleDescription();
 #ifndef QT_NO_TOOLTIP
         else
@@ -479,21 +421,14 @@ QString QAccessibleWidget::text(QAccessible::Text t) const
 #endif
         break;
     case QAccessible::Help:
-        if (!d->help.isEmpty())
-            str = d->help;
 #ifndef QT_NO_WHATSTHIS
-        else
-            str = widget()->whatsThis();
+        str = widget()->whatsThis();
 #endif
         break;
     case QAccessible::Accelerator:
-        if (!d->accelerator.isEmpty())
-            str = d->accelerator;
-        else
-            str = qt_accHotKey(buddyString(widget()));
+        str = qt_accHotKey(buddyString(widget()));
         break;
     case QAccessible::Value:
-        str = d->value;
         break;
     default:
         break;
diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h
index 4b480ca0ee..4027daa688 100644
--- a/src/widgets/accessible/qaccessiblewidget.h
+++ b/src/widgets/accessible/qaccessiblewidget.h
@@ -88,10 +88,6 @@ protected:
     QObject *parentObject() const;
 
     void addControllingSignal(const QString &signal);
-    void setValue(const QString &value);
-    void setDescription(const QString &desc);
-    void setHelp(const QString &help);
-    void setAccelerator(const QString &accel);
 
 private:
     QAccessibleWidgetPrivate *d;
-- 
cgit v1.2.3