OSDN Git Service

avoid old-style casts in debug/warning messages
authorIvailo Monev <xakepa10@gmail.com>
Thu, 26 May 2016 10:09:34 +0000 (10:09 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Thu, 26 May 2016 10:09:34 +0000 (10:09 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/kernel/qobject.cpp
src/core/plugin/qpluginloader.cpp

index bceaeb2..3abd186 100644 (file)
@@ -3503,7 +3503,7 @@ static void dumpRecursive(int level, QObject *object)
             }
         }
 #endif
-        qDebug("%s%s::%s %s", (const char*)buf, object->metaObject()->className(), name.toLocal8Bit().data(),
+        qDebug("%s%s::%s %s", buf.data(), object->metaObject()->className(), name.toLocal8Bit().data(),
                flags.toLatin1().data());
         QObjectList children = object->children();
         if (!children.isEmpty()) {
index a30c4f5..0cf1465 100644 (file)
@@ -289,7 +289,7 @@ void QPluginLoader::setFileName(const QString &fileName)
 #else
     if (qt_debug_component()) {
         qWarning("Cannot load %s into a statically linked Qt library.",
-            (const char*)QFile::encodeName(fileName));
+            QFile::encodeName(fileName).data());
     }
     Q_UNUSED(fileName);
 #endif