From 4ef8c9707f8723c2c7c990a9cbd5edbd2d09d977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Skowro=C5=84ski?= Date: Sun, 14 Feb 2016 08:20:13 +0100 Subject: [PATCH] Qt5 compatibility changes. QString::fromAscii() is obsolete in Qt5. Replace it with fromLatin1(). QString::toAscii() is obsolete in Qt5. Replace it with toLatin1(). QChar::fromAscii() is obsolete in Qt5. Replace it with fromLatin1(). This change is Qt4/Qt5 neutral. --- src/Gui/ExpressionCompleter.cpp | 2 +- src/Gui/WidgetFactory.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Gui/ExpressionCompleter.cpp b/src/Gui/ExpressionCompleter.cpp index 6ac89197e..533534346 100644 --- a/src/Gui/ExpressionCompleter.cpp +++ b/src/Gui/ExpressionCompleter.cpp @@ -236,7 +236,7 @@ QStringList ExpressionCompleter::splitPath ( const QString & path ) const void ExpressionCompleter::slotUpdate(const QString & prefix) { using namespace boost::tuples; - int j = (prefix.size() > 0 && prefix.at(0) == QChar::fromAscii('=')) ? 1 : 0; + int j = (prefix.size() > 0 && prefix.at(0) == QChar::fromLatin1('=')) ? 1 : 0; std::vector > tokens = ExpressionParser::tokenize(Base::Tools::toStdString(prefix.mid(j))); std::string completionPrefix; diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp index da660c4c1..6593d9fef 100644 --- a/src/Gui/WidgetFactory.cpp +++ b/src/Gui/WidgetFactory.cpp @@ -991,7 +991,7 @@ bool PyResource::connect(const char* sender, const char* signal, PyObject* cb) QList list = myDlg->findChildren(); QList::const_iterator it = list.begin(); QObject *obj; - QString sigStr = QString::fromAscii("2%1").arg(QString::fromAscii(signal)); + QString sigStr = QString::fromLatin1("2%1").arg(QString::fromLatin1(signal)); while ( it != list.end() ) { obj = *it; @@ -1005,7 +1005,7 @@ bool PyResource::connect(const char* sender, const char* signal, PyObject* cb) if (objS) { SignalConnect* sc = new SignalConnect(this, cb); mySingals.push_back(sc); - return QObject::connect(objS, sigStr.toAscii(), sc, SLOT ( onExecute() ) ); + return QObject::connect(objS, sigStr.toLatin1(), sc, SLOT ( onExecute() ) ); } else qWarning( "'%s' does not exist.\n", sender ); @@ -1063,14 +1063,14 @@ Py::Object PyResource::value(const Py::Tuple& args) int nSize = str.count(); Py::List slist(nSize); for (int i=0; i