summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2011-11-02 09:29:20 +0200
committerQt by Nokia <qt-info@nokia.com>2012-03-15 10:34:13 +0100
commit412b92e5348e82c59cee30d83fc8d0c264fb5260 (patch)
tree6a236355113bfae532860464b4b6638d79d9ba68
parent9912af2108398b8633f91300c455455f6e16e482 (diff)
Fixed compiler warnings about unused q and d pointers.
The q and d pointers were not used in these functions at all, or they were used only inside some #ifdef quard such as QT_NO_ACCESSIBILITY. Moved the Q_D and Q_Q macros inside the appropriate scope. Task-number: QTBUG-22512 Change-Id: I1624a1d800c7ce21cde4af1678d93e6f615edd45 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--src/gui/itemviews/qtableview.cpp2
-rw-r--r--src/gui/text/qtextcontrol.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp
index 4edc94d3f3..016032961b 100644
--- a/src/gui/itemviews/qtableview.cpp
+++ b/src/gui/itemviews/qtableview.cpp
@@ -3186,8 +3186,8 @@ void QTableView::currentChanged(const QModelIndex &current, const QModelIndex &p
void QTableView::selectionChanged(const QItemSelection &selected,
const QItemSelection &deselected)
{
- Q_D(QTableView);
#ifndef QT_NO_ACCESSIBILITY
+ Q_D(QTableView);
if (QAccessible::isActive()) {
// ### does not work properly for selection ranges.
QModelIndex sel = selected.indexes().value(0);
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 1f81463254..a0a4e76e52 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -405,7 +405,6 @@ void QTextControlPrivate::createAutoBulletList()
void QTextControlPrivate::init(Qt::TextFormat format, const QString &text, QTextDocument *document)
{
- Q_Q(QTextControl);
setContent(format, text, document);
doc->setUndoRedoEnabled(interactionFlags & Qt::TextEditable);