summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativefontloader.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-12-22 00:33:21 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-04 18:49:38 +0100
commit99f138ad08101315cc871489c78cd10755b046b0 (patch)
tree6c4e9dd42803e201ea302fe37305bdba28d61da4 /src/declarative/util/qdeclarativefontloader.cpp
parent768bf08a1ff3eed8b9367fa3d4a34ea987425af7 (diff)
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] qmlplugindump/main.cpp:180:75: error: unused parameter 'engine' [-Werror,-Wunused-parameter] qml/qdeclarativefastproperties_p.h:53:1: error: class 'QMetaObject' was previously declared as a struct [-Werror,-Wmismatched-tags] Change-Id: I1e91252d048e36e684a854ca1c6eb92e5a871444 Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'src/declarative/util/qdeclarativefontloader.cpp')
-rw-r--r--src/declarative/util/qdeclarativefontloader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 6304ee40..60b3f9be 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -64,7 +64,7 @@ class QDeclarativeFontObject : public QObject
Q_OBJECT
public:
- QDeclarativeFontObject(int _id);
+ QDeclarativeFontObject(int _id = -1);
void download(const QUrl &url, QNetworkAccessManager *manager);
@@ -84,7 +84,7 @@ private:
Q_DISABLE_COPY(QDeclarativeFontObject)
};
-QDeclarativeFontObject::QDeclarativeFontObject(int _id = -1)
+QDeclarativeFontObject::QDeclarativeFontObject(int _id)
: QObject(0), id(_id), reply(0), redirectCount(0) {}