Commit 92323132 authored by René J.V. Bertin's avatar René J.V. Bertin

make Mac-specific code build with QT_NO_CAST_FROM_ASCII

parent d3cb7d24
...@@ -800,7 +800,7 @@ protected: ...@@ -800,7 +800,7 @@ protected:
struct proc_vnodepathinfo vpi; struct proc_vnodepathinfo vpi;
const int nb = proc_pidinfo(aPid, PROC_PIDVNODEPATHINFO, 0, &vpi, sizeof(vpi)); const int nb = proc_pidinfo(aPid, PROC_PIDVNODEPATHINFO, 0, &vpi, sizeof(vpi));
if (nb == sizeof(vpi)) { if (nb == sizeof(vpi)) {
setCurrentDir(QString(vpi.pvi_cdir.vip_path)); setCurrentDir(QString::fromUtf8(vpi.pvi_cdir.vip_path));
return true; return true;
} }
return false; return false;
...@@ -827,8 +827,8 @@ private: ...@@ -827,8 +827,8 @@ private:
delete [] kInfoProc; delete [] kInfoProc;
return false; return false;
} else { } else {
const QString deviceNumber = QString(devname(((&kInfoProc->kp_eproc)->e_tdev), S_IFCHR)); const QString deviceNumber = QString::fromUtf8(devname(((&kInfoProc->kp_eproc)->e_tdev), S_IFCHR));
const QString fullDeviceName = QString("/dev/") + deviceNumber.rightJustified(3, '0'); const QString fullDeviceName = QStringLiteral("/dev/") + deviceNumber.rightJustified(3, QLatin1Char('0'));
delete [] kInfoProc; delete [] kInfoProc;
const QByteArray deviceName = fullDeviceName.toLatin1(); const QByteArray deviceName = fullDeviceName.toLatin1();
...@@ -852,7 +852,7 @@ private: ...@@ -852,7 +852,7 @@ private:
return false; return false;
// The foreground program is the first one // The foreground program is the first one
setName(QString(kInfoProc->kp_proc.p_comm)); setName(QString::fromUtf8(kInfoProc->kp_proc.p_comm));
delete [] kInfoProc; delete [] kInfoProc;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment