diff options
| -rw-r--r-- | src/plugins/General/copypaste/copypaste.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/skinreader.cpp | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/General/copypaste/copypaste.cpp b/src/plugins/General/copypaste/copypaste.cpp index c1b1ae626..83c0db1af 100644 --- a/src/plugins/General/copypaste/copypaste.cpp +++ b/src/plugins/General/copypaste/copypaste.cpp @@ -25,7 +25,6 @@ #include <QMessageBox> #include <QFile> #include <QDir> -#include <QProcess> #include <qmmp/soundcore.h> #include <qmmpui/uihelper.h> #include <qmmpui/playlistmodel.h> diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp index cbfa099f9..b3b63d898 100644 --- a/src/plugins/Ui/skinned/skinreader.cpp +++ b/src/plugins/Ui/skinned/skinreader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2015 by Ilya Kotov * + * Copyright (C) 2008-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -149,9 +149,7 @@ const QPixmap SkinReader::getPreview(const QString &skinPath) void SkinReader::untar(const QString &from, const QString &to, bool preview) { QByteArray array; - QStringList args; - //list archive - args << "tf" <<from; + QStringList args = { "tf", from }; //list archive m_process->start("tar", args); m_process->waitForFinished(); array = m_process->readAllStandardOutput (); @@ -186,10 +184,9 @@ void SkinReader::untar(const QString &from, const QString &to, bool preview) void SkinReader::unzip(const QString &from, const QString &to, bool preview) { - QStringList args; if (preview) { - args << "-C" << "-j" << "-o" << "-qq" << "-d" << to << from << "main.*" << "*/main.*"; + QStringList args = { "-C", "-j", "-o", "-qq", "-d", to, from, "main.*", "*/main.*" }; QProcess::execute("unzip", args); QDir dir(to); dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); @@ -205,7 +202,7 @@ void SkinReader::unzip(const QString &from, const QString &to, bool preview) } else { - args << "-j" << "-o" << "-qq" << "-d" << to << from; + QStringList args = { "-j", "-o", "-qq", "-d", to, from }; QProcess::execute("unzip", args); } } |