From 2ac76cf429a695063e42c8af1797fd509f496978 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 18 May 2016 11:54:51 +0000 Subject: [PATCH] remove some unnecessary old-style casts Signed-off-by: Ivailo Monev --- src/core/plugin/qlibrary.cpp | 4 ++-- src/gui/image/qpicture.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/plugin/qlibrary.cpp b/src/core/plugin/qlibrary.cpp index 4fb198365..23e48aa96 100644 --- a/src/core/plugin/qlibrary.cpp +++ b/src/core/plugin/qlibrary.cpp @@ -344,7 +344,7 @@ static bool qt_unix_query(const QString &library, uint *version, bool *debug, QL if (lib) lib->errorString = file.errorString(); if (qt_debug_component()) { - qWarning("%s: %s", (const char*) QFile::encodeName(library), + qWarning("%s: %s", QFile::encodeName(library).data(), qPrintable(qt_error_string(errno))); } return false; @@ -798,7 +798,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings) if (qt_debug_component()) { qWarning("In %s:\n" " Plugin uses incompatible Qt library (%d.%d.%d) [%s]", - (const char*) QFile::encodeName(fileName), + QFile::encodeName(fileName).data(), (qt_version&0xff0000) >> 16, (qt_version&0xff00) >> 8, qt_version&0xff, debug ? "debug" : "release"); } diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 490d255e9..ededafa1e 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1370,7 +1370,7 @@ void QPictureIO::init() QPictureIO::~QPictureIO() { if (d->parameters) - delete [] (char*)d->parameters; + delete [] d->parameters; delete d; } -- 2.11.0