From 416e71efd71a053dab07526762f1e7d8478de491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 21 Mar 2015 19:18:38 +0100 Subject: [PATCH] fixed compressed_archive.cpp for removing unnecessary dependencies in linux/macosx --- compressed_archive/compressed_archive.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/compressed_archive/compressed_archive.cpp b/compressed_archive/compressed_archive.cpp index 57c0756f..83d1895e 100644 --- a/compressed_archive/compressed_archive.cpp +++ b/compressed_archive/compressed_archive.cpp @@ -177,16 +177,12 @@ CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) CompressedArchive::~CompressedArchive() { - #ifdef Q_OS_UNIX if(isRar) //TODO: fix this!!! Possible memory leak. If AddRef is not used, a crash occurs in "delete szInterface" szInterface->archive->AddRef(); #endif if(valid) //TODO: fix this!!! Memory leak. - { - szInterface->archive->Close(); delete szInterface; - } #ifdef Q_OS_UNIX delete rarLib; #endif @@ -203,7 +199,7 @@ bool CompressedArchive::loadFunctions() { #if defined Q_OS_UNIX #if defined Q_OS_MAC - rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29"); + rarLib = new QLibrary(QCoreApplication::applicationDirPath()+"/utils/Codecs/Rar29"); #else //check if a yacreader specific version of p7zip exists on the system QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so"); @@ -219,7 +215,7 @@ bool CompressedArchive::loadFunctions() if(!rarLib->load()) { qDebug() << "Error Loading Rar29.so : " + rarLib->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; } #endif