medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[app] Fixed ZLibrary::ourApplicationDirectory

Browse source 
It wasn't pointing where FBReader code was expecting it to point.
Particularly, FBReader wasn't finding format-specific XML entities.
This commit is contained in:
Slava Monich 2015-12-14 12:18:22 +03:00
parent 4704c68caf
commit e3fc9982c6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/ZLibrary.cpp
View file

@ -118,7 +118,6 @@ bool ZLibrary::init(int& aArgc, char** &aArgv)
if (slash) { if (slash) {
slash[0] = 0; slash[0] = 0;
HDEBUG("app dir" << info.dli_fname); HDEBUG("app dir" << info.dli_fname);
ourApplicationDirectory = info.dli_fname;
slash = (char*)strrchr(info.dli_fname, '/'); slash = (char*)strrchr(info.dli_fname, '/');
if (slash) { if (slash) {
slash[0] = 0; slash[0] = 0;
@ -135,9 +134,9 @@ bool ZLibrary::init(int& aArgc, char** &aArgv)
((std::string&)BaseDirectory) = rootDir; ((std::string&)BaseDirectory) = rootDir;
ourApplicationName = BOOKS_APP_NAME; ourApplicationName = BOOKS_APP_NAME;
ourZLibraryDirectory = BaseDirectory + BOOKS_DATA_DIR; ourZLibraryDirectory = BaseDirectory + BOOKS_DATA_DIR;
ourApplicationDirectory = BaseDirectory + BOOKS_DATA_ROOT;
ourImageDirectory = BaseDirectory + BOOKS_ICONS_DIR; ourImageDirectory = BaseDirectory + BOOKS_ICONS_DIR;
ourDefaultFilesPathPrefix = ourZLibraryDirectory + "/"; ourDefaultFilesPathPrefix = ourZLibraryDirectory + "/";
ourApplicationDirectory = ourZLibraryDirectory;
ourApplicationImageDirectory = ourImageDirectory; ourApplicationImageDirectory = ourImageDirectory;
ourApplicationWritableDirectory = ourApplicationWritableDirectory =
(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + (QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +