diff options
author | Yuchen Deng <loaden@gmail.com> | 2012-02-15 09:24:58 +0800 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 06:32:18 +0100 |
commit | 6fbe4a4a8a2e3feb76f0dab1bc95cd307738df61 (patch) | |
tree | 026deddbde615267eea4932da6be0dc5c5f55a88 /src/plugins | |
parent | 0b1bdba6ab8fbd90efca622a5783da1d142a6ab6 (diff) |
Buid fix if use '-no-stl' configure option
error C2039: 'toStdString' : is not a member of 'QString'
Change-Id: If56f3e3dc2424c4fd96883f3b211bedc4b495781
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/sceneformats/assimp/ailoaderiosystem.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sceneformats/assimp/qailoader.cpp | 16 | ||||
-rw-r--r-- | src/plugins/sceneformats/assimp/qaimesh.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sceneformats/assimp/qaiscenehandler.cpp | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/sceneformats/assimp/ailoaderiosystem.cpp b/src/plugins/sceneformats/assimp/ailoaderiosystem.cpp index 46addd479..661ccd8c1 100644 --- a/src/plugins/sceneformats/assimp/ailoaderiosystem.cpp +++ b/src/plugins/sceneformats/assimp/ailoaderiosystem.cpp @@ -137,7 +137,7 @@ Assimp::IOStream* AiLoaderIOSystem::Open(const char* pFile, const char* pMode) if (!res) { std::string err("Error: could not open subsequent file:"); - err.append(pFile).append("--").append(f->errorString().toStdString()); + err.append(pFile).append("--").append(f->errorString().toAscii().constData()); Assimp::DefaultLogger::get()->warn(err); delete f; return 0; diff --git a/src/plugins/sceneformats/assimp/qailoader.cpp b/src/plugins/sceneformats/assimp/qailoader.cpp index c8b2cd2cd..a9444b5b6 100644 --- a/src/plugins/sceneformats/assimp/qailoader.cpp +++ b/src/plugins/sceneformats/assimp/qailoader.cpp @@ -129,7 +129,7 @@ void QAiLoader::loadMesh(aiMesh *mesh) { QString error = QLatin1String("Bad primitive type in mesh %1 : %2"); error = error.arg(name).arg(mesh->mPrimitiveTypes); - Assimp::DefaultLogger::get()->warn(error.toStdString()); + Assimp::DefaultLogger::get()->warn(error.toAscii().constData()); } } @@ -147,7 +147,7 @@ void QAiLoader::loadMesh(aiMesh *mesh) "Found color information in mesh %1, channel %2" "- per vertex color not yet supported"); error = error.arg(name).arg(i); - Assimp::DefaultLogger::get()->warn(error.toStdString()); + Assimp::DefaultLogger::get()->warn(error.toAscii().constData()); break; } } @@ -157,14 +157,14 @@ void QAiLoader::loadMesh(aiMesh *mesh) // TODO: Implement skeletal animation QString error = QLatin1String("Bones in mesh %1 not yet supported"); error.arg(name); - Assimp::DefaultLogger::get()->warn(error.toStdString()); + Assimp::DefaultLogger::get()->warn(error.toAscii().constData()); } if (mesh->HasTangentsAndBitangents()) { // TODO: Implement normal maps - here and in the texture import QString error = QLatin1String("Tangents for normal map in mesh %1 not yet supported"); error.arg(name); - Assimp::DefaultLogger::get()->warn(error.toStdString()); + Assimp::DefaultLogger::get()->warn(error.toAscii().constData()); } } } @@ -280,7 +280,7 @@ QGLSceneNode *QAiLoader::loadMeshes() QUrl url = m_handler->url(); message = message.arg(url.toString()).arg(m_meshes.size()) .arg(m_nodes.size()).arg(m_root->palette()->size()); - Assimp::DefaultLogger::get()->warn(message.toStdString()); + Assimp::DefaultLogger::get()->warn(message.toAscii().constData()); } //#define DEBUG_ME @@ -438,7 +438,7 @@ void QAiLoader::loadTextures(aiMaterial *ma, QGLMaterial *mq) { QString error = QLatin1String("Unsupported texture type \"%1\" in material \"%2\"."); error.arg(typeNames[i]).arg(mq->objectName()); - Assimp::DefaultLogger::get()->warn(error.toStdString()); + Assimp::DefaultLogger::get()->warn(error.toAscii().constData()); } } } @@ -451,7 +451,7 @@ void QAiLoader::loadTextures(aiMaterial *ma, QGLMaterial *mq) { QString error = QLatin1String("Multi-textures not supported: \"%1\" has %2"); error.arg(mq->objectName()).arg(texCount); - Assimp::DefaultLogger::get()->warn(error.toStdString()); + Assimp::DefaultLogger::get()->warn(error.toAscii().constData()); } else { @@ -465,7 +465,7 @@ void QAiLoader::loadTextures(aiMaterial *ma, QGLMaterial *mq) { QString error = QLatin1String("Could not load texture: %1 for material %2"); error.arg(url.toString()).arg(mq->objectName()); - Assimp::DefaultLogger::get()->warn(error.toStdString()); + Assimp::DefaultLogger::get()->warn(error.toAscii().constData()); } } else diff --git a/src/plugins/sceneformats/assimp/qaimesh.cpp b/src/plugins/sceneformats/assimp/qaimesh.cpp index b3562edf5..918f36af0 100644 --- a/src/plugins/sceneformats/assimp/qaimesh.cpp +++ b/src/plugins/sceneformats/assimp/qaimesh.cpp @@ -122,7 +122,7 @@ void QAiMesh::build(QGLBuilder &builder, bool showWarnings) { QString error = QLatin1String("Mesh %1 has zero vertex/face count"); error.arg(name.isEmpty() ? QString(QLatin1String("<unnamed mesh>")) : name); - Assimp::DefaultLogger::get()->warn(error.toStdString()); + Assimp::DefaultLogger::get()->warn(error.toAscii().constData()); } return; } diff --git a/src/plugins/sceneformats/assimp/qaiscenehandler.cpp b/src/plugins/sceneformats/assimp/qaiscenehandler.cpp index 1df438233..1f86fe869 100644 --- a/src/plugins/sceneformats/assimp/qaiscenehandler.cpp +++ b/src/plugins/sceneformats/assimp/qaiscenehandler.cpp @@ -257,7 +257,7 @@ QGLAbstractScene *QAiSceneHandler::read() // the importer owns the scene, so when the it goes out of scope on exiting // this function the scene will get destroyed - const aiScene* scene = m_importer.ReadFile(path.toStdString(), m_options); + const aiScene* scene = m_importer.ReadFile(path.toAscii().constData(), m_options); if (!scene) { |