mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix nix build

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-07-18 20:23:01 +03:00
parent 27259ff52d
commit aa265a45ee
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
7 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
launcher/archive/ArchiveReader.cpp
View file

@ -33,6 +33,7 @@
* limitations under the License.
*/
#include "ArchiveReader.h"
#include <archive.h>
#include <archive_entry.h>
#include <QDir>
#include <QFileInfo>
@ -239,4 +240,5 @@ bool ArchiveReader::exists(const QString& filePath) const
return false;
}
ArchiveReader::File::File() : m_archive(ArchivePtr(archive_read_new(), archive_read_free)) {}
} // namespace MMCZip

9
launcher/archive/ArchiveReader.h
View file

@ -34,14 +34,13 @@
*/
#pragma once
#include <archive.h>
#include <archive_entry.h>
#include <QByteArray>
#include <QDateTime>
#include <QStringList>
#include <memory>
struct archive;
struct archive_entry;
namespace MMCZip {
class ArchiveReader {
public:
@ -56,8 +55,8 @@ class ArchiveReader {
class File {
public:
File() : m_archive(ArchivePtr(archive_read_new(), archive_read_free)) {}
virtual ~File() {}
File();
virtual ~File() = default;
QString filename();
bool isFile();

1
launcher/archive/ArchiveWriter.cpp
View file

@ -34,6 +34,7 @@
*/
#include "ArchiveWriter.h"
#include <archive.h>
#include <archive_entry.h>
#include <QFile>
#include <QFileInfo>

4
launcher/archive/ArchiveWriter.h
View file

@ -34,13 +34,11 @@
*/
#pragma once
#include <archive.h>
#include <archive_entry.h>
#include <QByteArray>
#include <QFileDevice>
#include "archive/ArchiveReader.h"
struct archive;
namespace MMCZip {
class ArchiveWriter {

2
launcher/archive/ExportToZipTask.h
View file

@ -39,7 +39,7 @@
#include <QFuture>
#include <QFutureWatcher>
#include "ArchiveWriter.h"
#include "archive/ArchiveWriter.h"
#include "tasks/Task.h"
namespace MMCZip {

2
launcher/minecraft/mod/tasks/LocalModParseTask.cpp
View file

@ -1,7 +1,6 @@
#include "LocalModParseTask.h"
#include <qdcss.h>
#include <qstringview.h>
#include <toml++/toml.h>
#include <QJsonArray>
#include <QJsonDocument>
@ -14,7 +13,6 @@
#include "Json.h"
#include "archive/ArchiveReader.h"
#include "minecraft/mod/ModDetails.h"
#include "modplatform/ModIndex.h"
#include "settings/INIFile.h"
static const QRegularExpression s_newlineRegex("\r\n|\n|\r");

3
launcher/modplatform/flame/FlamePackExportTask.cpp
View file

@ -30,7 +30,6 @@
#include <memory>
#include "Application.h"
#include "Json.h"
#include "archive/ExportToZipTask.h"
#include "minecraft/PackProfile.h"
#include "minecraft/mod/ModFolderModel.h"
#include "modplatform/ModIndex.h"
@ -38,6 +37,8 @@
#include "modplatform/helpers/HashUtils.h"
#include "tasks/Task.h"
#include "archive/ExportToZipTask.h"
const QString FlamePackExportTask::TEMPLATE = "<li><a href=\"{url}\">{name}{authors}</a></li>\n";
const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "zip" });