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

Merged in mechtex/yacreader-pr/bug-createlib-nulterm (pull request #6)

Browse Source 
Replace potentially unterminated std::string::data() for pre-c++11
This commit is contained in:
Luis Ángel San Martín
2014-07-03 14:32:20 +02:00
parent 8c73ce7e81 8d9548e3c7
commit 692a924954
40 changed files with 1667 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compressed_archive/compressed_archive.cpp
View File

@ -197,8 +197,12 @@ bool CompressedArchive::loadFunctions()
// fix2: rename 7z.so to 7z.dylib
if(sevenzLib == 0)
{
#ifdef Q_OS_UNIX
rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29");
#if defined Q_OS_UNIX
#if defined Q_OS_MAC
rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29");
#else
rarLib = new QLibrary(QString(LIBDIR)+"/p7zip/Codecs/Rar29.so");
#endif
if(!rarLib->load())
{
qDebug() << "Error Loading Rar29.so : " + rarLib->errorString() << endl;
@ -206,7 +210,11 @@ bool CompressedArchive::loadFunctions()
return false;
}
#endif
sevenzLib = new QLibrary(QApplication::applicationDirPath()+"/utils/7z");
#if defined Q_OS_UNIX && !defined Q_OS_MAC
sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so");
#else
sevenzLib = new QLibrary(QApplication::applicationDirPath()+"/utils/7z");
#endif
}
if(!sevenzLib->load())
{