From b3b6d3fc71ff70df590de301fd1046940621960b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 14 Jul 2015 14:43:26 +0200 Subject: [PATCH] QmlDesigner: Change signature of our exceptions to use QByteArray instead of QString This allows to use macros like __FUNCTION__ for the exceptions if QT_NO_CAST_FROM_ASCII is defined. Change-Id: Ib629482bb60502cb311cb2657f1a73c730daf6aa Reviewed-by: Tim Jenssen --- .../designercore/exceptions/exception.cpp | 10 +++++----- .../exceptions/invalidargumentexception.cpp | 8 ++++---- .../exceptions/invalididexception.cpp | 20 +++++++++---------- .../exceptions/invalidmetainfoexception.cpp | 4 ++-- .../exceptions/invalidmodelnodeexception.cpp | 4 ++-- .../exceptions/invalidmodelstateexception.cpp | 4 ++-- .../exceptions/invalidpropertyexception.cpp | 8 ++++---- .../exceptions/invalidqmlsourceexception.cpp | 8 ++++---- .../invalidreparentingexception.cpp | 4 ++-- .../exceptions/invalidslideindexexception.cpp | 4 ++-- .../exceptions/notimplementedexception.cpp | 4 ++-- .../exceptions/removebasestateexception.cpp | 4 ++-- .../exceptions/rewritingexception.cpp | 8 ++++---- .../designercore/include/exception.h | 4 ++-- .../include/invalidargumentexception.h | 6 +++--- .../designercore/include/invalididexception.h | 14 ++++++------- .../include/invalidmetainfoexception.h | 4 ++-- .../include/invalidmodelnodeexception.h | 4 ++-- .../include/invalidmodelstateexception.h | 4 ++-- .../include/invalidpropertyexception.h | 6 +++--- .../include/invalidqmlsourceexception.h | 6 +++--- .../include/invalidreparentingexception.h | 4 ++-- .../include/invalidslideindexexception.h | 4 ++-- .../include/notimplementedexception.h | 4 ++-- .../include/removebasestateexception.h | 4 ++-- .../designercore/include/rewritingexception.h | 6 +++--- .../qmldesigner/designercore/model/model.cpp | 14 +++++++------ .../designercore/model/modelnode.cpp | 4 ++-- .../designercore/model/rewriterview.cpp | 2 +- 29 files changed, 91 insertions(+), 89 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp index 6c3c44c5579..9994857ad86 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp @@ -100,11 +100,11 @@ bool Exception::warnAboutException() the __FILE__ macro. */ Exception::Exception(int line, - const QString &function, - const QString &file) + const QByteArray &_function, + const QByteArray &_file) : m_line(line), - m_function(function), - m_file(file) + m_function(QString::fromLatin1(_function)), + m_file(QString::fromLatin1(_file)) { #ifdef Q_OS_LINUX void * array[50]; @@ -120,7 +120,7 @@ Exception::Exception(int line, #endif if (s_shouldAssert) - Q_ASSERT_X(false, function.toUtf8(), QString("%1:%2 - %3").arg(file).arg(line).arg(function).toUtf8()); + Q_ASSERT_X(false, _function, QString(QStringLiteral("%1:%2 - %3")).arg(m_file).arg(m_line).arg(m_function).toLatin1()); } Exception::~Exception() diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp index 9c2608e504b..bec15c30100 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp @@ -46,10 +46,10 @@ namespace QmlDesigner { the __FILE__ macro. */ InvalidArgumentException::InvalidArgumentException(int line, - const QString &function, - const QString &file, - const QString &argument) - : Exception(line, function, file), m_argument(argument) + const QByteArray &function, + const QByteArray &file, + const QByteArray &argument) + : Exception(line, function, file), m_argument(QString::fromLatin1(argument)) { createWarning(); } diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp index 6b79e01574e..c7f267f1015 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp @@ -35,12 +35,12 @@ namespace QmlDesigner { InvalidIdException::InvalidIdException(int line, - const QString &function, - const QString &file, - const QString &id, + const QByteArray &function, + const QByteArray &file, + const QByteArray &id, Reason reason) : InvalidArgumentException(line, function, file, "id"), - m_id(id) + m_id(QString::fromLatin1(id)) { if (reason == InvalidCharacters) m_description = QCoreApplication::translate("InvalidIdException", "Only alphanumeric characters and underscore allowed.\nIds must begin with a lowercase letter."); @@ -49,13 +49,13 @@ InvalidIdException::InvalidIdException(int line, } InvalidIdException::InvalidIdException(int line, - const QString &function, - const QString &file, - const QString &id, - const QString &description) : + const QByteArray &function, + const QByteArray &file, + const QByteArray &id, + const QByteArray &description) : InvalidArgumentException(line, function, file, "id"), - m_id(id), - m_description(description) + m_id(QString::fromLatin1(id)), + m_description(QString::fromLatin1(description)) { createWarning(); } diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalidmetainfoexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidmetainfoexception.cpp index 2e00a4f7540..cefcbe742ca 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalidmetainfoexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalidmetainfoexception.cpp @@ -45,8 +45,8 @@ namespace QmlDesigner { the __FILE__ macro. */ InvalidMetaInfoException::InvalidMetaInfoException(int line, - const QString &function, - const QString &file) + const QByteArray &function, + const QByteArray &file) : Exception(line, function, file) { createWarning(); diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalidmodelnodeexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidmodelnodeexception.cpp index 04a16691e65..9e160e69359 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalidmodelnodeexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalidmodelnodeexception.cpp @@ -45,8 +45,8 @@ namespace QmlDesigner { the __FILE__ macro. */ InvalidModelNodeException::InvalidModelNodeException(int line, - const QString &function, - const QString &file) + const QByteArray &function, + const QByteArray &file) : Exception(line, function, file) { createWarning(); diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalidmodelstateexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidmodelstateexception.cpp index 21a960d852d..b8916588ca1 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalidmodelstateexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalidmodelstateexception.cpp @@ -46,8 +46,8 @@ namespace QmlDesigner { the __FILE__ macro. */ InvalidModelStateException::InvalidModelStateException(int line, - const QString &function, - const QString &file) + const QByteArray &function, + const QByteArray &file) : Exception(line, function, file) { createWarning(); diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalidpropertyexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidpropertyexception.cpp index 28465704eed..cdbeaa10f9f 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalidpropertyexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalidpropertyexception.cpp @@ -44,10 +44,10 @@ namespace QmlDesigner { the __FILE__ macro. */ InvalidPropertyException::InvalidPropertyException(int line, - const QString &function, - const QString &file, - const QString &argument) - : Exception(line, function, file), m_argument(argument) + const QByteArray &function, + const QByteArray &file, + const QByteArray &argument) + : Exception(line, function, file), m_argument(QString::fromLatin1(argument)) { createWarning(); } diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalidqmlsourceexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidqmlsourceexception.cpp index 5627bc9b8f1..ead9493df37 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalidqmlsourceexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalidqmlsourceexception.cpp @@ -44,11 +44,11 @@ namespace QmlDesigner { the __FILE__ macro. */ InvalidQmlSourceException::InvalidQmlSourceException(int line, - const QString &function, - const QString &file, - const QString &qmlSource) + const QByteArray &function, + const QByteArray &file, + const QByteArray &qmlSource) : Exception(line, function, file), - m_qmlSource(qmlSource) + m_qmlSource(QString::fromUtf8(qmlSource)) { createWarning(); } diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalidreparentingexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidreparentingexception.cpp index b978598454b..0f63376ac20 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalidreparentingexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalidreparentingexception.cpp @@ -44,8 +44,8 @@ namespace QmlDesigner { the __FILE__ macro. */ InvalidReparentingException::InvalidReparentingException(int line, - const QString &function, - const QString &file) + const QByteArray &function, + const QByteArray &file) : Exception(line, function, file) { createWarning(); diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalidslideindexexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidslideindexexception.cpp index a48fd76d7d0..73524155e6e 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/invalidslideindexexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/invalidslideindexexception.cpp @@ -45,8 +45,8 @@ namespace QmlDesigner { the __FILE__ macro. */ InvalidSlideIndexException::InvalidSlideIndexException(int line, - const QString &function, - const QString &file) + const QByteArray &function, + const QByteArray &file) : Exception(line, function, file) { createWarning(); diff --git a/src/plugins/qmldesigner/designercore/exceptions/notimplementedexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/notimplementedexception.cpp index c54731755ec..2c3f522fe00 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/notimplementedexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/notimplementedexception.cpp @@ -33,8 +33,8 @@ namespace QmlDesigner { NotImplementedException::NotImplementedException(int line, - const QString &function, - const QString &file): + const QByteArray &function, + const QByteArray &file): Exception(line, function, file) { } diff --git a/src/plugins/qmldesigner/designercore/exceptions/removebasestateexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/removebasestateexception.cpp index 01d5b2c3766..ba9c0c609cd 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/removebasestateexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/removebasestateexception.cpp @@ -45,8 +45,8 @@ namespace QmlDesigner { the __FILE__ macro. */ RemoveBaseStateException::RemoveBaseStateException(int line, - const QString &function, - const QString &file) + const QByteArray &function, + const QByteArray &file) : Exception(line, function, file) { createWarning(); diff --git a/src/plugins/qmldesigner/designercore/exceptions/rewritingexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/rewritingexception.cpp index eea3b5ab46d..78583b22acc 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/rewritingexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/rewritingexception.cpp @@ -33,11 +33,11 @@ using namespace QmlDesigner; RewritingException::RewritingException(int line, - const QString &function, - const QString &file, - const QString &description, + const QByteArray &function, + const QByteArray &file, + const QByteArray &description, const QString &documentTextContent): - Exception(line, function, file), m_description(description), m_documentTextContent(documentTextContent) + Exception(line, function, file), m_description(QString::fromLatin1(description)), m_documentTextContent(documentTextContent) { createWarning(); } diff --git a/src/plugins/qmldesigner/designercore/include/exception.h b/src/plugins/qmldesigner/designercore/include/exception.h index 7ec3abf1b56..fca0cfbccbf 100644 --- a/src/plugins/qmldesigner/designercore/include/exception.h +++ b/src/plugins/qmldesigner/designercore/include/exception.h @@ -42,8 +42,8 @@ class QMLDESIGNERCORE_EXPORT Exception { public: Exception(int line, - const QString &function, - const QString &file); + const QByteArray &function, + const QByteArray &file); virtual ~Exception(); virtual QString type() const = 0; diff --git a/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h b/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h index 8fd00a0ead4..9a8033ccae4 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h @@ -40,9 +40,9 @@ class QMLDESIGNERCORE_EXPORT InvalidArgumentException : public Exception { public: InvalidArgumentException(int line, - const QString &function, - const QString &file, - const QString &argument); + const QByteArray &function, + const QByteArray &file, + const QByteArray &argument); QString type() const; QString argument() const; diff --git a/src/plugins/qmldesigner/designercore/include/invalididexception.h b/src/plugins/qmldesigner/designercore/include/invalididexception.h index 726846ad6ee..0e786b29e88 100644 --- a/src/plugins/qmldesigner/designercore/include/invalididexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalididexception.h @@ -41,16 +41,16 @@ public: enum Reason { InvalidCharacters, DuplicateId }; InvalidIdException(int line, - const QString &function, - const QString &file, - const QString &id, + const QByteArray &function, + const QByteArray &file, + const QByteArray &id, Reason reason); InvalidIdException(int line, - const QString &function, - const QString &file, - const QString &id, - const QString &description); + const QByteArray &function, + const QByteArray &file, + const QByteArray &id, + const QByteArray &description); QString type() const; QString description() const; diff --git a/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h b/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h index 376ac4d36f6..027f0f49c11 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h @@ -39,8 +39,8 @@ class QMLDESIGNERCORE_EXPORT InvalidMetaInfoException : public Exception { public: InvalidMetaInfoException(int line, - const QString &function, - const QString &file); + const QByteArray &function, + const QByteArray &file); QString type() const; diff --git a/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h b/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h index aa4049e0bdf..c23df0c56a6 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h @@ -39,8 +39,8 @@ class QMLDESIGNERCORE_EXPORT InvalidModelNodeException : public Exception { public: InvalidModelNodeException(int line, - const QString &function, - const QString &file); + const QByteArray &function, + const QByteArray &file); QString type() const; diff --git a/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h b/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h index e957c92a789..1ec69bbd429 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h @@ -39,8 +39,8 @@ class QMLDESIGNERCORE_EXPORT InvalidModelStateException : public Exception { public: InvalidModelStateException(int line, - const QString &function, - const QString &file); + const QByteArray &function, + const QByteArray &file); QString type() const; diff --git a/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h b/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h index 0dfe4f3c605..d5408dcfedf 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h @@ -39,9 +39,9 @@ class QMLDESIGNERCORE_EXPORT InvalidPropertyException : public Exception { public: InvalidPropertyException(int line, - const QString &function, - const QString &file, - const QString &argument); + const QByteArray &function, + const QByteArray &file, + const QByteArray &argument); QString type() const; QString argument() const; diff --git a/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h b/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h index 3aab458a290..17e2bd7b755 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h @@ -39,9 +39,9 @@ class QMLDESIGNERCORE_EXPORT InvalidQmlSourceException : public QmlDesigner::Exc { public: InvalidQmlSourceException(int line, - const QString &function, - const QString &file, - const QString &qmlSource = QString()); + const QByteArray &function, + const QByteArray &file, + const QByteArray &qmlSource = QByteArray()); QString type() const; QString description() const; diff --git a/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h b/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h index 044fd91123f..8be82ce6b1f 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h @@ -39,8 +39,8 @@ class QMLDESIGNERCORE_EXPORT InvalidReparentingException : public Exception { public: InvalidReparentingException(int line, - const QString &function, - const QString &file); + const QByteArray &function, + const QByteArray &file); QString type() const; }; diff --git a/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h b/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h index 293f82c54a0..17cc7a5b95e 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h @@ -39,8 +39,8 @@ class QMLDESIGNERCORE_EXPORT InvalidSlideIndexException : public Exception { public: InvalidSlideIndexException(int line, - const QString &function, - const QString &file); + const QByteArray &function, + const QByteArray &file); QString type() const; }; diff --git a/src/plugins/qmldesigner/designercore/include/notimplementedexception.h b/src/plugins/qmldesigner/designercore/include/notimplementedexception.h index 357bf306417..8b805d2430a 100644 --- a/src/plugins/qmldesigner/designercore/include/notimplementedexception.h +++ b/src/plugins/qmldesigner/designercore/include/notimplementedexception.h @@ -39,8 +39,8 @@ class QMLDESIGNERCORE_EXPORT NotImplementedException : public Exception { public: NotImplementedException(int line, - const QString &function, - const QString &file); + const QByteArray &function, + const QByteArray &file); QString type() const; diff --git a/src/plugins/qmldesigner/designercore/include/removebasestateexception.h b/src/plugins/qmldesigner/designercore/include/removebasestateexception.h index f9126305b90..f11243d742d 100644 --- a/src/plugins/qmldesigner/designercore/include/removebasestateexception.h +++ b/src/plugins/qmldesigner/designercore/include/removebasestateexception.h @@ -39,8 +39,8 @@ class QMLDESIGNERCORE_EXPORT RemoveBaseStateException : public Exception { public: RemoveBaseStateException(int line, - const QString &function, - const QString &file); + const QByteArray &function, + const QByteArray &file); QString type() const; diff --git a/src/plugins/qmldesigner/designercore/include/rewritingexception.h b/src/plugins/qmldesigner/designercore/include/rewritingexception.h index 6b151e3065a..34a7abb3f9f 100644 --- a/src/plugins/qmldesigner/designercore/include/rewritingexception.h +++ b/src/plugins/qmldesigner/designercore/include/rewritingexception.h @@ -39,9 +39,9 @@ class QMLDESIGNERCORE_EXPORT RewritingException: public Exception { public: RewritingException(int line, - const QString &function, - const QString &file, - const QString &description, + const QByteArray &function, + const QByteArray &file, + const QByteArray &description, const QString &documentTextContent); virtual QString type() const; diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 7acabb974c6..e843c824cac 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -201,7 +201,7 @@ InternalNode::Pointer ModelPrivate::createNode(const TypeName &typeName, bool isRootNode) { if (typeName.isEmpty()) - throw InvalidArgumentException(__LINE__, __FUNCTION__, __FILE__, tr("invalid type")); + throw InvalidArgumentException(__LINE__, __FUNCTION__, __FILE__, tr("invalid type").toLatin1()); qint32 internalId = 0; @@ -309,8 +309,10 @@ void ModelPrivate::changeNodeId(const InternalNode::Pointer& internalNodePointer try { notifyNodeIdChanged(internalNodePointer, id, oldId); + } catch (const RewritingException &e) { - throw InvalidIdException(__LINE__, __FUNCTION__, __FILE__, id, e.description()); + throw InvalidIdException(__LINE__, __FUNCTION__, __FILE__, id.toLatin1(), e.description().toLatin1()); + } } @@ -321,9 +323,9 @@ void ModelPrivate::checkPropertyName(const QString &propertyName) throw InvalidPropertyException(__LINE__, __FUNCTION__, __FILE__, ""); } - if (propertyName == "id") { - Q_ASSERT_X(propertyName != "id", Q_FUNC_INFO, "cannot add property id"); - throw InvalidPropertyException(__LINE__, __FUNCTION__, __FILE__, propertyName); + if (propertyName == QLatin1String("id")) { + Q_ASSERT_X(propertyName != QLatin1String("id"), Q_FUNC_INFO, "cannot add property id"); + throw InvalidPropertyException(__LINE__, __FUNCTION__, __FILE__, propertyName.toLatin1()); } } @@ -821,7 +823,7 @@ void ModelPrivate::resetModelByRewriter(const QString &description) if (rewriterView()) rewriterView()->resetToLastCorrectQml(); - throw RewritingException(__LINE__, __FUNCTION__, __FILE__, description, rewriterView()->textModifierContent()); + throw RewritingException(__LINE__, __FUNCTION__, __FILE__, description.toLatin1(), rewriterView()->textModifierContent()); } diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 6de7f7648e8..cf9e4f0a546 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -193,13 +193,13 @@ void ModelNode::setIdWithoutRefactoring(const QString &id) } if (!isValidId(id)) - throw InvalidIdException(__LINE__, __FUNCTION__, __FILE__, id, InvalidIdException::InvalidCharacters); + throw InvalidIdException(__LINE__, __FUNCTION__, __FILE__, id.toLatin1(), InvalidIdException::InvalidCharacters); if (id == m_internalNode->id()) return; if (view()->hasId(id)) - throw InvalidIdException(__LINE__, __FUNCTION__, __FILE__, id, InvalidIdException::DuplicateId); + throw InvalidIdException(__LINE__, __FUNCTION__, __FILE__, id.toLatin1(), InvalidIdException::DuplicateId); m_model.data()->d->changeNodeId(internalNode(), id); } diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index 81f08d6231b..4ff6161398a 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -537,7 +537,7 @@ void RewriterView::applyChanges() qDebug() << "Content:" << content; if (!errors().isEmpty()) qDebug() << "Error:" << errors().first().description(); - throw RewritingException(__LINE__, __FUNCTION__, __FILE__, m_rewritingErrorMessage, content); + throw RewritingException(__LINE__, __FUNCTION__, __FILE__, m_rewritingErrorMessage.toLatin1(), content.toLatin1()); } }