Skip to content

Commit 1d69887

Browse files
thiagomacieiraThe Qt Project
authored and
The Qt Project
committed
Fix some warnings in qtquick1 found by Clang
qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess] qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value] util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member] Cherry-picked from qtquick1/99f138ad08101315cc871489c78cd10755b046b0 Change-Id: If0a690eacf9421f932214d2917cd3fa0a7daac9a Reviewed-by: Thiago Macieira <[email protected]> Reviewed-by: Alan Alpert <[email protected]>
1 parent 5a3fcbf commit 1d69887

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/declarative/qml/qdeclarativemetatype.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ QObject *QDeclarativeType::create() const
448448
d->m_newFunc(rv);
449449

450450
if (rv && !d->m_metaObjects.isEmpty())
451-
(void *)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects);
451+
(void)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects);
452452

453453
return rv;
454454
}
@@ -461,7 +461,7 @@ void QDeclarativeType::create(QObject **out, void **memory, size_t additionalMem
461461
d->m_newFunc(rv);
462462

463463
if (rv && !d->m_metaObjects.isEmpty())
464-
(void *)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects);
464+
(void)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects);
465465

466466
*out = rv;
467467
*memory = ((char *)rv) + d->m_allocationSize;

src/declarative/qml/qdeclarativevme.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEObjectStack &stack,
283283
{
284284
QObject *o = (QObject *)operator new(instr.createSimple.typeSize +
285285
sizeof(QDeclarativeData));
286-
::memset(o, 0, instr.createSimple.typeSize + sizeof(QDeclarativeData));
286+
::memset(static_cast<void *>(o), 0, instr.createSimple.typeSize + sizeof(QDeclarativeData));
287287
instr.createSimple.create(o);
288288

289289
QDeclarativeData *ddata = (QDeclarativeData *)(((const char *)o) + instr.createSimple.typeSize);

src/declarative/util/qdeclarativefontloader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class QDeclarativeFontObject : public QObject
6464
Q_OBJECT
6565

6666
public:
67-
QDeclarativeFontObject(int _id);
67+
QDeclarativeFontObject(int _id = -1);
6868

6969
void download(const QUrl &url, QNetworkAccessManager *manager);
7070

@@ -84,7 +84,7 @@ private Q_SLOTS:
8484
Q_DISABLE_COPY(QDeclarativeFontObject)
8585
};
8686

87-
QDeclarativeFontObject::QDeclarativeFontObject(int _id = -1)
87+
QDeclarativeFontObject::QDeclarativeFontObject(int _id)
8888
: QObject(0), id(_id), reply(0), redirectCount(0) {}
8989

9090

0 commit comments

Comments
 (0)