TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared/shared.cpp: remove a few minor C++11-isms.

Browse Source 
These are the only issues preventing linuxdeployqt
from building on non-C++11 compilers.

Uses of the range-based for loop are replaced with
Qt's foreach macro.

Uses of auto are replaced with appropriate types.
This commit is contained in:
Mikkel Krautz
2016-11-12 11:00:25 +01:00
parent 5c79e30f19
commit d57f180179
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+5 -5
View File
@@ -163,7 +163,7 @@ LddInfo findDependencyInfo(const QString &binaryPath)
} }
if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) and (!output.contains("linux-vdso.so.1"))) { if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) and (!output.contains("linux-vdso.so.1"))) {
const auto match = regexp.match(outputLines.first()); const QRegularExpressionMatch match = regexp.match(outputLines.first());
if (match.hasMatch()) { if (match.hasMatch()) {
info.installName = match.captured(1); info.installName = match.captured(1);
} else { } else {
@@ -172,8 +172,8 @@ LddInfo findDependencyInfo(const QString &binaryPath)
outputLines.removeFirst(); outputLines.removeFirst();
} }
for (const QString &outputLine : outputLines) { foreach (const QString &outputLine, outputLines) {
const auto match = regexp.match(outputLine); const QRegularExpressionMatch match = regexp.match(outputLine);
if (match.hasMatch()) { if (match.hasMatch()) {
DylibInfo dylib; DylibInfo dylib;
dylib.binaryPath = match.captured(1).trimmed(); dylib.binaryPath = match.captured(1).trimmed();
@@ -357,7 +357,7 @@ QStringList findAppLibraries(const QString &appDirPath)
QList<LibraryInfo> getQtLibraries(const QList<DylibInfo> &dependencies, const QString &appDirPath, const QSet<QString> &rpaths) QList<LibraryInfo> getQtLibraries(const QList<DylibInfo> &dependencies, const QString &appDirPath, const QSet<QString> &rpaths)
{ {
QList<LibraryInfo> libraries; QList<LibraryInfo> libraries;
for (const DylibInfo &dylibInfo : dependencies) { foreach (const DylibInfo &dylibInfo, dependencies) {
LibraryInfo info = parseLddLibraryLine(dylibInfo.binaryPath, appDirPath, rpaths); LibraryInfo info = parseLddLibraryLine(dylibInfo.binaryPath, appDirPath, rpaths);
if (info.libraryName.isEmpty() == false) { if (info.libraryName.isEmpty() == false) {
LogDebug() << "Adding library:"; LogDebug() << "Adding library:";
@@ -444,7 +444,7 @@ QStringList getBinaryDependencies(const QString executablePath,
{ {
QStringList binaries; QStringList binaries;
const auto dependencies = findDependencyInfo(path).dependencies; const QList<DylibInfo> dependencies = findDependencyInfo(path).dependencies;
bool rpathsLoaded = false; bool rpathsLoaded = false;
QSet<QString> rpaths; QSet<QString> rpaths;