From a5bac3d2092e9a5363a035ec76ff25cf018b8c22 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 22 Jan 2014 09:14:52 -0800 Subject: [PATCH] fix a couple of warnings by using QString for object name --- libraries/script-engine/src/ScriptEngine.cpp | 2 +- libraries/script-engine/src/ScriptEngine.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index c335f30093..a5cb903320 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -71,7 +71,7 @@ ScriptEngine::~ScriptEngine() { //printf("ScriptEngine::~ScriptEngine()...\n"); } -void ScriptEngine::setAvatarData(AvatarData* avatarData, char* objectName) { +void ScriptEngine::setAvatarData(AvatarData* avatarData, const QString& objectName) { _avatarData = avatarData; // remove the old Avatar property, if it exists diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index a153d46bb4..ab0129bc6f 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -59,7 +59,7 @@ public: void setIsAvatar(bool isAvatar) { _isAvatar = isAvatar; } bool isAvatar() const { return _isAvatar; } - void setAvatarData(AvatarData* avatarData, char* objectName); + void setAvatarData(AvatarData* avatarData, const QString& objectName); public slots: void init();