kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

QString::toAscii() is obsolete in Qt5. Replace it with toLatin1().

Browse Source 
This change is Qt4/Qt5 neutral.
This commit is contained in:
Mateusz Skowroński
2015-12-15 06:58:54 +01:00
committed by wmayer
parent e55ba2d24d
commit d5c074f80d
61 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Gui/WidgetFactory.cpp
View File

@@ -549,8 +549,8 @@ QWidget* UiLoader::createWidget(const QString & className, QWidget * parent,
if (this->cw.contains(className))
return QUiLoader::createWidget(className, parent, name);
QWidget* w = 0;
if (WidgetFactory().CanProduce((const char*)className.toAscii()))
w = WidgetFactory().createWidget((const char*)className.toAscii(), parent);
if (WidgetFactory().CanProduce((const char*)className.toLatin1()))
w = WidgetFactory().createWidget((const char*)className.toLatin1(), parent);
if (w) w->setObjectName(name);
return w;
}
@@ -1055,7 +1055,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 );
@@ -1165,14 +1165,14 @@ PyObject *PyResource::value(PyObject *args)
int nSize = str.count();
PyObject* slist = PyList_New(nSize);
for (int i=0; i<nSize;++i) {
PyObject* item = PyString_FromString(str[i].toAscii());
PyObject* item = PyString_FromString(str[i].toLatin1());
PyList_SetItem(slist, i, item);
}
} break;
case QVariant::ByteArray:
break;
case QVariant::String:
pItem = PyString_FromString(v.toString().toAscii());
pItem = PyString_FromString(v.toString().toLatin1());
break;
case QVariant::Double:
pItem = PyFloat_FromDouble(v.toDouble());