mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-25 08:25:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated compressed_archive_test for being able to use unarr, remove unecessary includes in compressed_archive within unarr-wrapper.pri

Browse Source
This commit is contained in:
Luis Ángel San Martín
2015-03-21 15:17:47 +01:00
parent 29ec149b79 e62d696339
commit 43aeb9d242
18 changed files with 136 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compressed_archive/compressed_archive.cpp
View File

@ -4,12 +4,11 @@
#include <QLibrary>
#include <QFileInfo>
#include <QDebug>
#include <QApplication>
#include <QCoreApplication>
#include "open_callbacks.h"
#include "extract_callbacks.h"
#include "yacreader_global.h"
//DEFINE_GUID(CLSID_CFormat7z,0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00);
//DEFINE_GUID(IArchiveKK,0x23170F69, 0x40C1, 0x278A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x60, 0x00, 0x00);
@ -231,13 +230,13 @@ bool CompressedArchive::loadFunctions()
sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so");
}
#else
sevenzLib = new QLibrary(QApplication::applicationDirPath()+"/utils/7z");
sevenzLib = new QLibrary(QCoreApplication::applicationDirPath()+"/utils/7z");
#endif
}
if(!sevenzLib->load())
{
qDebug() << "Error Loading 7z.dll : " + sevenzLib->errorString() << endl;
QApplication::exit(YACReader::SevenZNotFound);
QCoreApplication::exit(700); //TODO yacreader_global can't be used here, it is GUI dependant, YACReader::SevenZNotFound
return false;
}
else

2
compressed_archive/unarr/compressed_archive.cpp
View File

@ -2,9 +2,7 @@
#include <QFileInfo>
#include <QDebug>
#include <QApplication>
#include "yacreader_global.h"
#include "extract_delegate.h"
extern"C" {