suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #94 from f3nix/qt5-compatibility-1

Browse Source 
Qt5 compatibility changes.
This commit is contained in:
wwmayer 2016-02-16 10:01:45 +01:00
commit 69c241ba89
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/ExpressionCompleter.cpp
View File

@ -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<boost::tuple<int, int, std::string> > tokens = ExpressionParser::tokenize(Base::Tools::toStdString(prefix.mid(j)));
std::string completionPrefix;

12
src/Gui/WidgetFactory.cpp
View File

@ -991,7 +991,7 @@ bool PyResource::connect(const char* sender, const char* signal, PyObject* cb)
QList<QWidget*> list = myDlg->findChildren<QWidget*>();
QList<QWidget*>::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<nSize;++i) {
slist.setItem(i, Py::String(str[i].toAscii()));
slist.setItem(i, Py::String(str[i].toLatin1()));
}
item = slist;
} break;
case QVariant::ByteArray:
break;
case QVariant::String:
item = Py::String(v.toString().toAscii());
item = Py::String(v.toString().toLatin1());
break;
case QVariant::Double:
item = Py::Float(v.toDouble());
@ -1107,7 +1107,7 @@ Py::Object PyResource::setValue(const Py::Tuple& args)
QVariant v;
if (PyString_Check(psValue)) {
v = QString::fromAscii(PyString_AsString(psValue));
v = QString::fromLatin1(PyString_AsString(psValue));
}
else if (PyInt_Check(psValue)) {
int val = PyInt_AsLong(psValue);
@ -1129,7 +1129,7 @@ Py::Object PyResource::setValue(const Py::Tuple& args)
continue;
char* pItem = PyString_AsString(item);
str.append(QString::fromAscii(pItem));
str.append(QString::fromLatin1(pItem));
}
v = str;