summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/components
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-09-28 12:27:40 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-29 06:12:09 (GMT)
commit66e7e69f00a08664f0c0a6ed62a37a6918eaf8f3 (patch)
tree0984d6a3680374b6c13daf2d0c1cc78e4660d268 /tools/designer/src/components
parent619136931e2c985377348d196d488e429a4858d6 (diff)
downloadQt-66e7e69f00a08664f0c0a6ed62a37a6918eaf8f3.zip
Qt-66e7e69f00a08664f0c0a6ed62a37a6918eaf8f3.tar.gz
Qt-66e7e69f00a08664f0c0a6ed62a37a6918eaf8f3.tar.bz2
Fix gcc 4.6 warnings about assigned/unused variables in Qt Designer.
Change-Id: Ic983e09769c812412defd6f84298770235c3ed48 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'tools/designer/src/components')
-rw-r--r--tools/designer/src/components/formeditor/formwindow.cpp2
-rw-r--r--tools/designer/src/components/formeditor/widgetselection.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp
index 5e017b5..dd17ee8 100644
--- a/tools/designer/src/components/formeditor/formwindow.cpp
+++ b/tools/designer/src/components/formeditor/formwindow.cpp
@@ -2178,7 +2178,7 @@ void FormWindow::layoutContainer(QWidget *w, int type)
// find managed widget children
QWidgetList widgets;
const QObjectList::const_iterator ocend = l.constEnd();
- for (QObjectList::const_iterator it = l.constBegin(); it != l.constEnd(); ++it)
+ for (QObjectList::const_iterator it = l.constBegin(); it != ocend; ++it)
if ( (*it)->isWidgetType() ) {
QWidget *widget = static_cast<QWidget*>(*it);
if (widget->isVisibleTo(this) && isManaged(widget))
diff --git a/tools/designer/src/components/formeditor/widgetselection.cpp b/tools/designer/src/components/formeditor/widgetselection.cpp
index 376c2f9..62cf3c9 100644
--- a/tools/designer/src/components/formeditor/widgetselection.cpp
+++ b/tools/designer/src/components/formeditor/widgetselection.cpp
@@ -439,8 +439,6 @@ void WidgetHandle::changeGridLayoutItemSpan()
if (!grid)
return;
- const QSize size = m_widget->parentWidget()->size();
-
const int index = deco->indexOf(m_widget);
const QRect info = deco->itemInfo(index);
const int top = deco->findItemAt(info.top() - 1, info.left());