summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-10-17 16:26:38 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-04 19:01:59 +0000
commitd683861584a38a1d1b855bde25412c06c878a1c1 (patch)
tree98fcb75bf3ad492136339e9a752278e6bbb8d532
parent46a7f8f47a365e27cb523241eb9cb8fa76abbca4 (diff)
downloadqttools-d683861584a38a1d1b855bde25412c06c878a1c1.tar.gz
clazy: Fix clazy-detaching-temporary
Fix in Qt Designer, pixeltool, qtattributionsscanner and qtpaths. Change-Id: Ideae055e8880552c1b8bf5a2a38326ac1356ffcb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
-rw-r--r--src/designer/src/components/widgetbox/widgetbox_dnditem.cpp2
-rw-r--r--src/designer/src/components/widgetbox/widgetboxtreewidget.cpp2
-rw-r--r--src/designer/src/lib/uilib/abstractformbuilder.cpp2
-rw-r--r--src/designer/src/uitools/quiloader.cpp2
-rw-r--r--src/pixeltool/main.cpp2
-rw-r--r--src/pixeltool/qpixeltool.cpp2
-rw-r--r--src/qtattributionsscanner/main.cpp2
-rw-r--r--src/qtpaths/qtpaths.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index aad1689cc..367e01b82 100644
--- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -175,7 +175,7 @@ static QWidget *decorationFromDomWidget(DomUI *dom_ui, QDesignerFormEditorInterf
fakeTopLevel->setParent(0, Qt::ToolTip); // Container
// Actual widget
const DomWidget *domW = dom_ui->elementWidget()->elementWidget().front();
- QWidget *w = fakeTopLevel->findChildren<QWidget*>().front();
+ QWidget *w = fakeTopLevel->findChildren<QWidget*>().constFirst();
Q_ASSERT(w);
// hack begin;
// We set _q_dockDrag dynamic property which will be detected in drag enter event of form window.
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 0f75b6d45..b6ebc7d47 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -925,7 +925,7 @@ void WidgetBoxTreeWidget::dropWidgets(const QList<QDesignerDnDItemInterface*> &i
DomWidget *fakeTopLevel = dom_ui->takeElementWidget();
DomWidget *firstWidget = 0;
if (fakeTopLevel && !fakeTopLevel->elementWidget().isEmpty()) {
- firstWidget = fakeTopLevel->elementWidget().first();
+ firstWidget = fakeTopLevel->elementWidget().constFirst();
dom_ui->setElementWidget(firstWidget);
} else {
dom_ui->setElementWidget(fakeTopLevel);
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 8bac11285..6607c9c2a 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -357,7 +357,7 @@ QWidget *QAbstractFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidge
if (QWidget *child = create(ui_child, w)) {
children += child;
} else {
- const QString className = ui_child->elementClass().empty() ? QString() : ui_child->elementClass().front();
+ const QString className = ui_child->elementClass().value(0);
uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "The creation of a widget of the class '%1' failed.").arg(className));
}
}
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp
index 74a03e3a9..b4ead5bc5 100644
--- a/src/designer/src/uitools/quiloader.cpp
+++ b/src/designer/src/uitools/quiloader.cpp
@@ -132,7 +132,7 @@ QVariant TranslatingTextBuilder::toNativeValue(const QVariant &value) const
if (value.canConvert<QUiTranslatableStringValue>()) {
QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(value);
if (!m_trEnabled)
- return QString::fromUtf8(tsv.value().data());
+ return QString::fromUtf8(tsv.value().constData());
return QVariant::fromValue(
QCoreApplication::translate(m_className, tsv.value(), tsv.comment()));
}
diff --git a/src/pixeltool/main.cpp b/src/pixeltool/main.cpp
index 36f411749..3e17d61b5 100644
--- a/src/pixeltool/main.cpp
+++ b/src/pixeltool/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
QPixelTool pixelTool;
if (!parser.positionalArguments().isEmpty()) {
- const QString previewImageFileName = parser.positionalArguments().first();
+ const QString previewImageFileName = parser.positionalArguments().constFirst();
if (QFileInfo(previewImageFileName).exists()) {
QImage previewImage(previewImageFileName);
if (!previewImage.size().isEmpty())
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp
index 6e4c9f9ff..1d94ddb8a 100644
--- a/src/pixeltool/qpixeltool.cpp
+++ b/src/pixeltool/qpixeltool.cpp
@@ -562,7 +562,7 @@ void QPixelTool::saveToFile()
}
while (fileDialog.exec() == QDialog::Accepted
- && !m_buffer.save(fileDialog.selectedFiles().first())) {
+ && !m_buffer.save(fileDialog.selectedFiles().constFirst())) {
QMessageBox::warning(this, QLatin1String("Unable to write image"),
QLatin1String("Unable to write ")
+ QDir::toNativeSeparators(fileDialog.selectedFiles().first()));
diff --git a/src/qtattributionsscanner/main.cpp b/src/qtattributionsscanner/main.cpp
index cd9bc1fed..908b24ca4 100644
--- a/src/qtattributionsscanner/main.cpp
+++ b/src/qtattributionsscanner/main.cpp
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
if (parser.positionalArguments().size() != 1)
parser.showHelp(2);
- const QString directory = parser.positionalArguments().last();
+ const QString directory = parser.positionalArguments().constLast();
if (logLevel == VerboseLog)
std::cerr << qPrintable(tr("Recursively scanning %1 for qt_attribution.json files...").arg(
diff --git a/src/qtpaths/qtpaths.cpp b/src/qtpaths/qtpaths.cpp
index 37bdcf465..648e0cabb 100644
--- a/src/qtpaths/qtpaths.cpp
+++ b/src/qtpaths/qtpaths.cpp
@@ -140,7 +140,7 @@ static QString searchStringOrError(QCommandLineParser *parser)
int positionalArgumentCount = parser->positionalArguments().size();
if (positionalArgumentCount != 1)
error(QCoreApplication::translate("qtpaths", "Exactly one argument needed as searchitem"));
- return parser->positionalArguments().first();
+ return parser->positionalArguments().constFirst();
}
int main(int argc, char **argv)