compilation fix for xiphos with libsword 1.7
diff -urN xiphos-3.1.5+dfsg/src/backend/module_manager.cc xiphos-3.1.5+dfsg.mine/src/backend/module_manager.cc
--- xiphos-3.1.5+dfsg/src/backend/module_manager.cc 2012-02-25 22:50:47.000000000 +0000
+++ xiphos-3.1.5+dfsg.mine/src/backend/module_manager.cc 2014-06-09 10:07:57.921822742 +0000
@@ -122,7 +122,7 @@
}
-char *backend_mod_mgr_get_config_entry(char *module_name,
+char *backend_mod_mgr_get_config_entry(const char *module_name,
const char *entry) {
SWModule *mod;
ModMap::iterator it; //-- iteratior
@@ -168,13 +168,13 @@
if (list_it != list_end) {
module = list_it->second;
mod_info = g_new(MOD_MGR, 1);
- gchar *name = module->Name();
+ const gchar *name = module->getName();
if (name) {
mod_info->name = g_strdup(name);
mod_info->language =
main_get_language_map(module->Lang());
- mod_info->type = g_strdup(module->Type());
+ mod_info->type = g_strdup(module->getType());
mod_info->about = g_strdup((char *)module->getConfigEntry("About"));
char *vers = (char *)module->getConfigEntry("Version");
@@ -213,7 +213,7 @@
backend_mod_mgr_get_config_entry(name, "Version");
mod_info->installed =
backend_mod_mgr_is_module(name);
- mod_info->description = module->Description();
+ mod_info->description = (char *)module->getDescription();
mod_info->locked =
((module->getConfigEntry("CipherKey")) ? 1 : 0);
list_it++;
@@ -318,7 +318,7 @@
return -1;
}
module = it->second;
- retval = installMgr->removeModule(tmp_mgr, module->Name());
+ retval = installMgr->removeModule(tmp_mgr, module->getName());
delete tmp_mgr;
return retval;
}
@@ -750,7 +750,7 @@
if (installMgr)
delete installMgr;
- installMgr = new InstallMgr(baseDir,
+ installMgr = new InstallMgr(baseDir.c_str(),
statusReporter,
(SWBuf)"ftp",
(SWBuf)"xip...@xiphos.org");
diff -urN xiphos-3.1.5+dfsg/src/backend/module_manager.hh xiphos-3.1.5+dfsg.mine/src/backend/module_manager.hh
--- xiphos-3.1.5+dfsg/src/backend/module_manager.hh 2012-02-25 22:50:47.000000000 +0000
+++ xiphos-3.1.5+dfsg.mine/src/backend/module_manager.hh 2014-06-09 09:43:55.404508602 +0000
@@ -27,7 +27,9 @@
#include <installmgr.h>
#include <filemgr.h>
-#include <ftptrans.h>
+#include <remotetrans.h>
+//#include <ftptrans.h>
+//#include <curlftpt.h>
using namespace std;
using namespace sword;
diff -urN xiphos-3.1.5+dfsg/src/backend/sword_main.cc xiphos-3.1.5+dfsg.mine/src/backend/sword_main.cc
--- xiphos-3.1.5+dfsg/src/backend/sword_main.cc 2012-02-25 22:50:47.000000000 +0000
+++ xiphos-3.1.5+dfsg.mine/src/backend/sword_main.cc 2014-06-09 10:22:27.410612461 +0000
@@ -131,23 +131,23 @@
for (it = main_mgr->Modules.begin();
it != main_mgr->Modules.end(); it++) {
display_mod = (*it).second;
- if (!strcmp(display_mod->Type(), TEXT_MODS)) {
+ if (!strcmp(display_mod->getType(), TEXT_MODS)) {
display_mod->setDisplay(textDisplay);
}
- if (!strcmp(display_mod->Type(), COMM_MODS)) {
+ if (!strcmp(display_mod->getType(), COMM_MODS)) {
display_mod->setDisplay(commDisplay);
}
- if (!strcmp(display_mod->Type(), DICT_MODS)) {
+ if (!strcmp(display_mod->getType(), DICT_MODS)) {
display_mod->setDisplay(dictDisplay);
}
- if (!strcmp(display_mod->Type(), BOOK_MODS)) {
+ if (!strcmp(display_mod->getType(), BOOK_MODS)) {
display_mod->setDisplay(bookDisplay);
}
}
} else if (gsType == 1) { // dialogs
for (it = main_mgr->Modules.begin(); it != main_mgr->Modules.end(); it++) {
display_mod = (*it).second;
- if (!strcmp(display_mod->Type(), TEXT_MODS)) {
+ if (!strcmp(display_mod->getType(), TEXT_MODS)) {
display_mod->setDisplay(chapDisplay);
} else {
display_mod->setDisplay(entryDisplay);
@@ -167,61 +167,61 @@
for (it = main_mgr->Modules.begin();
it != main_mgr->Modules.end(); it++) {
- if (!strcmp((*it).second->Type(), TEXT_MODS)) {
+ if (!strcmp((*it).second->getType(), TEXT_MODS)) {
mods->biblemods =
g_list_append(mods->biblemods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
mods->text_descriptions =
g_list_append(mods->text_descriptions,
strdup((char *) (*it).second->
- Description()));
+ getDescription()));
}
- if (!strcmp((*it).second->Type(), COMM_MODS)) {
+ if (!strcmp((*it).second->getType(), COMM_MODS)) {
mods->commentarymods =
g_list_append(mods->commentarymods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
mods->comm_descriptions =
g_list_append(mods->comm_descriptions,
strdup((char *) (*it).second->
- Description()));
+ getDescription()));
if (!strcmp((*it).second->getConfigEntry("ModDrv")
, "RawFiles")) {
mods->percommods = g_list_append(mods->percommods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
}
}
- if (!strcmp((*it).second->Type(), DICT_MODS)) {
+ if (!strcmp((*it).second->getType(), DICT_MODS)) {
char *feature =
(char *) (*it).second->getConfigEntry("Feature");
if (feature && !strcmp(feature, "DailyDevotion")) {
mods->devotionmods =
g_list_append(mods->devotionmods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
} else {
mods->dictionarymods =
g_list_append(mods->dictionarymods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
mods->dict_descriptions =
g_list_append(mods->dict_descriptions,
strdup((char *) (*it).second->
- Description()));
+ getDescription()));
}
}
- if (!strcmp((*it).second->Type(), BOOK_MODS)) {
+ if (!strcmp((*it).second->getType(), BOOK_MODS)) {
if ((*it).second->getConfigEntry("GSType") &&
!strcmp((*it).second->getConfigEntry("GSType")
, "PrayerList")) {
mods->prayermods = g_list_append(mods->prayermods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
} else {
mods->bookmods =
g_list_append(mods->bookmods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
mods->book_descriptions =
g_list_append(mods->book_descriptions,
strdup((char *) (*it).second->
- Description()));
+ getDescription()));
}
}
@@ -232,11 +232,11 @@
if (!strcmp(category, "Maps"))
mods->mapmods
= g_list_append(mods->mapmods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
if (!strcmp(category, "Images"))
mods->imagemods
= g_list_append(mods->imagemods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
}
}
@@ -517,21 +517,21 @@
it = main_mgr->Modules.find(mod_name);
if (it != main_mgr->Modules.end()) {
- if (!strcmp((*it).second->Type(), TEXT_MODS)) {
+ if (!strcmp((*it).second->getType(), TEXT_MODS)) {
return TEXT_TYPE;
}
- if (!strcmp((*it).second->Type(), COMM_MODS)) {
+ if (!strcmp((*it).second->getType(), COMM_MODS)) {
if (!strcmp((char *) (*it).second->getConfigEntry("ModDrv"), "RawFiles"))
return PERCOM_TYPE;
return COMMENTARY_TYPE;
}
- if (!strcmp((*it).second->Type(), DICT_MODS)) {
+ if (!strcmp((*it).second->getType(), DICT_MODS)) {
return DICTIONARY_TYPE;
}
- if (!strcmp((*it).second->Type(), BOOK_MODS)) {
+ if (!strcmp((*it).second->getType(), BOOK_MODS)) {
if ((*it).second->getConfigEntry("GSType") &&
!strcmp((char *) (*it).second->getConfigEntry("GSType"), "PrayerList"))
return PRAYERLIST_TYPE;
@@ -541,7 +541,7 @@
return -1;
}
-char *BackEnd::module_description(char *mod_name)
+const char *BackEnd::module_description(char *mod_name)
{
ModMap::iterator it;
@@ -550,7 +550,7 @@
it = main_mgr->Modules.find(mod_name);
if (it != main_mgr->Modules.end()) {
- return (*it).second->Description();
+ return (*it).second->getDescription();
}
return NULL;
}
@@ -565,8 +565,8 @@
for (it = main_mgr->Modules.begin();
it != main_mgr->Modules.end(); it++) {
- if (!strcmp((*it).second->Description(), description))
- retval = strdup((*it).second->Name());
+ if (!strcmp((*it).second->getDescription(), description))
+ retval = strdup((*it).second->getName());
}
return retval;
}
diff -urN xiphos-3.1.5+dfsg/src/backend/sword_main.hh xiphos-3.1.5+dfsg.mine/src/backend/sword_main.hh
--- xiphos-3.1.5+dfsg/src/backend/sword_main.hh 2012-02-25 22:50:47.000000000 +0000
+++ xiphos-3.1.5+dfsg.mine/src/backend/sword_main.hh 2014-06-09 10:24:25.066717107 +0000
@@ -100,7 +100,7 @@
char *navigate_module(int direction);
int module_type(const char *mod_name);
- char *module_description(char *mod_name);
+ const char *module_description(char *mod_name);
char *module_name_from_description(char *description);
const char *module_get_language(const char *module_name);
char **get_module_language_list(void);
diff -urN xiphos-3.1.5+dfsg/src/main/display.cc xiphos-3.1.5+dfsg.mine/src/main/display.cc
--- xiphos-3.1.5+dfsg/src/main/display.cc 2012-02-25 22:50:47.000000000 +0000
+++ xiphos-3.1.5+dfsg.mine/src/main/display.cc 2014-06-09 12:53:58.790886724 +0000
@@ -625,9 +625,10 @@
GString *
CleanupContent(GString *text,
GLOBAL_OPS *ops,
- char *name,
+ const char *name,
bool reset = true)
{
+
if (ops->image_content == 0)
ClearImages((gchar *)text->str);
else if ((ops->image_content == -1) && // "unknown"
@@ -738,7 +739,7 @@
ops->morphs)
? block_render(preverse2)
: preverse2));
- text = CleanupContent(text, ops, mod.Name(), false);
+ text = CleanupContent(text, ops, mod.getName(), false);
cVerse.AppendHeader(text->str);
// g_free((gchar *)preverse2);
@@ -801,6 +802,13 @@
//
// display of commentary by chapter.
//
+
+char
+GTKEntryDisp::displayByChapter(SWModule &imodule)
+{
+return DisplayByChapter(imodule);
+}
+
char
GTKEntryDisp::DisplayByChapter(SWModule &imodule)
{
@@ -812,7 +820,7 @@
int curChapter = key->Chapter();
int curBook = key->Book();
gchar *buf, *vbuf, *num;
- char *ModuleName = imodule.Name();
+ const char *ModuleName = imodule.getName();
GString *rework; // for image size analysis rework.
footnote = xref = 0;
@@ -855,14 +863,14 @@
// use the module cache rather than re-accessing Sword.
// but editable personal commentaries don't use the cache.
if (!cVerse.CacheIsValid(cache_flags) &&
- (backend->module_type(imodule.Name()) != PERCOM_TYPE)) {
+ (backend->module_type(imodule.getName()) != PERCOM_TYPE)) {
rework = g_string_new(strongs_or_morph
? block_render(imodule.RenderText())
: imodule.RenderText());
- rework = CleanupContent(rework, ops, imodule.Name());
+ rework = CleanupContent(rework, ops, imodule.getName());
cVerse.SetText(rework->str, cache_flags);
} else {
- if (backend->module_type(imodule.Name()) == PERCOM_TYPE)
+ if (backend->module_type(imodule.getName()) == PERCOM_TYPE)
rework = g_string_new(strongs_or_morph
? block_render(imodule.getRawEntry())
: imodule.getRawEntry());
@@ -960,6 +968,12 @@
// general display of entries: commentary, genbook, lexdict
//
char
+GTKEntryDisp::display(SWModule &imodule)
+{
+return Display(imodule);
+}
+
+char
GTKEntryDisp::Display(SWModule &imodule)
{
#ifdef USE_XIPHOS_HTML
@@ -968,11 +982,11 @@
#endif
gchar *buf;
- mf = get_font(imodule.Name());
+ mf = get_font((gchar *)imodule.getName());
swbuf = "";
footnote = xref = 0;
- ops = main_new_globals(imodule.Name());
+ ops = main_new_globals((gchar *)imodule.getName());
GString *rework; // for image size analysis rework.
@@ -1005,9 +1019,9 @@
((mf->old_font) ? mf->old_font : ""),
mf->old_font_size_value,
imodule.Description(),
- imodule.Name(),
+ imodule.getName(),
settings.bible_verse_num_color,
- imodule.Name());
+ imodule.getName());
swbuf.append(buf);
g_free(buf);
@@ -1032,10 +1046,10 @@
// for handling potential clearing of images, due to the
// difference in how modules are being accessed.
- if (backend->module_type(imodule.Name()) == COMMENTARY_TYPE) {
+ if (backend->module_type(imodule.getName()) == COMMENTARY_TYPE) {
VerseKey *key = (VerseKey *)(SWKey *)imodule;
cache_flags = ConstructFlags(ops);
- const char *ModuleName = imodule.Name();
+ const char *ModuleName = imodule.getName();
ModuleCache::CacheVerse& cVerse = ModuleMap
[ModuleName]
@@ -1049,15 +1063,15 @@
rework = g_string_new(strongs_or_morph
? block_render(imodule.RenderText())
: imodule.RenderText());
- rework = CleanupContent(rework, ops, imodule.Name());
+ rework = CleanupContent(rework, ops, imodule.getName());
cVerse.SetText(rework->str, cache_flags);
} else
rework = g_string_new(cVerse.GetText());
} else {
- if ((backend->module_type(imodule.Name()) == PERCOM_TYPE) ||
- (backend->module_type(imodule.Name()) == PRAYERLIST_TYPE))
+ if ((backend->module_type(imodule.getName()) == PERCOM_TYPE) ||
+ (backend->module_type(imodule.getName()) == PRAYERLIST_TYPE))
rework = g_string_new(strongs_or_morph
? block_render(imodule.getRawEntry())
: imodule.getRawEntry());
@@ -1065,7 +1079,7 @@
rework = g_string_new(strongs_or_morph
? block_render(imodule.RenderText())
: imodule.RenderText());
- rework = CleanupContent(rework, ops, imodule.Name());
+ rework = CleanupContent(rework, ops, imodule.getName());
}
swbuf.append(settings.imageresize
@@ -1096,7 +1110,7 @@
int curBook = key->Book();
int curTest = key->Testament();
#if 0
- const char *ModuleName = imodule.Name();
+ const char *ModuleName = imodule.getName();
#endif
key->Verse(1);
@@ -1240,7 +1254,7 @@
{
gchar *buf;
#if 0
- const char *ModuleName = imodule.Name();
+ const char *ModuleName = imodule.getName();
#endif
sword::VerseKey *key = (VerseKey *)(SWKey *)imodule;
@@ -1320,6 +1334,12 @@
}
char
+GTKChapDisp::display(SWModule &imodule)
+{
+return GTKChapDisp::Display(imodule);
+}
+
+char
GTKChapDisp::Display(SWModule &imodule)
{
// following line ensures linked verses work correctly
@@ -1334,13 +1354,13 @@
const gchar *paragraphMark = NULL;
gboolean newparagraph = FALSE;
GString *rework; // for image size analysis rework.
- char *ModuleName = imodule.Name();
- ops = main_new_globals(ModuleName);
+ const char *ModuleName = imodule.getName();
+ ops = main_new_globals((gchar *)ModuleName);
cache_flags = ConstructFlags(ops);
marked_element *e = NULL;
is_rtol = main_is_mod_rtol(ModuleName);
- mf = get_font(ModuleName);
+ mf = get_font((gchar *)ModuleName);
if (!gtk_widget_get_realized (GTK_WIDGET(gtkText))) return 0;
@@ -1365,7 +1385,7 @@
(marked_cache_modname ? marked_cache_modname : "")) ||
strcasecmp(key->getBookAbbrev(), marked_cache_book) ||
(curChapter != marked_cache_chapter))
- marked_cache_fill(ModuleName, settings.currentverse);
+ marked_cache_fill((gchar *)ModuleName, settings.currentverse);
if (!strcmp(ModuleName, "KJV"))
paragraphMark = "¶ ";
@@ -1431,7 +1451,7 @@
rework = g_string_new(strongs_or_morph
? block_render(imodule.RenderText())
: imodule.RenderText());
- rework = CleanupContent(rework, ops, imodule.Name());
+ rework = CleanupContent(rework, ops, imodule.getName());
cVerse.SetText(rework->str, cache_flags);
} else
rework = g_string_new(cVerse.GetText());
@@ -1611,6 +1631,12 @@
// display of commentary by chapter.
//
char
+DialogEntryDisp::displayByChapter(SWModule &imodule)
+{
+return DisplayByChapter(imodule);
+}
+
+char
DialogEntryDisp::DisplayByChapter(SWModule &imodule)
{
imodule.setSkipConsecutiveLinks(true);
@@ -1619,7 +1645,7 @@
int curChapter = key->Chapter();
int curBook = key->Book();
gchar *buf;
- char *ModuleName = imodule.Name();
+ const char *ModuleName = imodule.getName();
GString *rework; // for image size analysis rework.
footnote = xref = 0;
@@ -1660,7 +1686,7 @@
rework = g_string_new(strongs_or_morph
? block_render(imodule.RenderText())
: imodule.RenderText());
- rework = CleanupContent(rework, ops, imodule.Name());
+ rework = CleanupContent(rework, ops, imodule.getName());
cVerse.SetText(rework->str, cache_flags);
} else
rework = g_string_new(cVerse.GetText());
@@ -1688,12 +1714,18 @@
}
char
+DialogEntryDisp::display(SWModule &imodule)
+{
+return Display(imodule);
+}
+
+char
DialogEntryDisp::Display(SWModule &imodule)
{
swbuf = "";
char *buf;
- mf = get_font(imodule.Name());
- ops = main_new_globals(imodule.Name());
+ mf = get_font((gchar *)imodule.getName());
+ ops = main_new_globals((gchar *)imodule.getName());
main_set_global_options(ops);
GString *rework; // for image size analysis rework.
footnote = xref = 0;
@@ -1714,8 +1746,8 @@
mf->old_font_size_value,
settings.bible_verse_num_color,
imodule.Description(),
- imodule.Name(),
- imodule.Name());
+ imodule.getName(),
+ imodule.getName());
swbuf.append(buf);
g_free(buf);
@@ -1726,10 +1758,10 @@
if (ops->commentary_by_chapter)
return DisplayByChapter(imodule);
- if (be->module_type(imodule.Name()) == COMMENTARY_TYPE) {
+ if (be->module_type(imodule.getName()) == COMMENTARY_TYPE) {
VerseKey *key = (VerseKey *)(SWKey *)imodule;
cache_flags = ConstructFlags(ops);
- const char *ModuleName = imodule.Name();
+ const char *ModuleName = imodule.getName();
ModuleCache::CacheVerse& cVerse = ModuleMap
[ModuleName]
@@ -1741,19 +1773,19 @@
// use the module cache rather than re-accessing Sword.
if (!cVerse.CacheIsValid(cache_flags)) {
rework = g_string_new((const char *)imodule);
- rework = CleanupContent(rework, ops, imodule.Name());
+ rework = CleanupContent(rework, ops, imodule.getName());
cVerse.SetText(rework->str, cache_flags);
} else
rework = g_string_new(cVerse.GetText());
} else {
- if ((be->module_type(imodule.Name()) == PERCOM_TYPE) ||
- (be->module_type(imodule.Name()) == PRAYERLIST_TYPE))
+ if ((be->module_type(imodule.getName()) == PERCOM_TYPE) ||
+ (be->module_type(imodule.getName()) == PRAYERLIST_TYPE))
rework = g_string_new(imodule.getRawEntry());
else
rework = g_string_new((const char *)imodule);
- rework = CleanupContent(rework, ops, imodule.Name());
+ rework = CleanupContent(rework, ops, imodule.getName());
}
swbuf.append(settings.imageresize
@@ -1772,6 +1804,11 @@
return 0;
}
+char
+DialogChapDisp::display(SWModule &imodule)
+{
+return Display(imodule);
+}
char
DialogChapDisp::Display(SWModule &imodule)
@@ -1788,12 +1825,12 @@
GString *rework; // for image size analysis rework.
marked_element *e = NULL;
- char *ModuleName = imodule.Name();
- ops = main_new_globals(ModuleName);
+ const char *ModuleName = imodule.getName();
+ ops = main_new_globals((gchar *)ModuleName);
cache_flags = ConstructFlags(ops);
is_rtol = main_is_mod_rtol(ModuleName);
- mf = get_font(ModuleName);
+ mf = get_font((gchar *)ModuleName);
strongs_and_morph = ((ops->strongs || ops->lemmas) &&
ops->morphs);
@@ -1816,7 +1853,7 @@
(marked_cache_modname ? marked_cache_modname : "")) ||
strcasecmp(key->getBookName(), marked_cache_book) ||
(curChapter != marked_cache_chapter))
- marked_cache_fill(ModuleName, (gchar *)key->getShortText());
+ marked_cache_fill((gchar *)ModuleName, (gchar *)key->getShortText());
if (!strcmp(ModuleName, "KJV"))
paragraphMark = "¶ ";
@@ -1880,7 +1917,7 @@
rework = g_string_new(strongs_or_morph
? block_render(imodule.RenderText())
: imodule.RenderText());
- rework = CleanupContent(rework, ops, imodule.Name());
+ rework = CleanupContent(rework, ops, imodule.getName());
cVerse.SetText(rework->str, cache_flags);
} else
rework = g_string_new(cVerse.GetText());
@@ -2061,6 +2098,11 @@
return 0;
}
+char
+GTKPrintEntryDisp::display(SWModule &imodule)
+{
+return Display(imodule);
+}
char
GTKPrintEntryDisp::Display(SWModule &imodule)
@@ -2070,14 +2112,14 @@
gchar *buf;
SWBuf swbuf = "";
gint mod_type;
- MOD_FONT *mf = get_font(imodule.Name());
+ MOD_FONT *mf = get_font((gchar *)imodule.getName());
- GLOBAL_OPS * ops = main_new_globals(imodule.Name());
+ GLOBAL_OPS * ops = main_new_globals((gchar *)imodule.getName());
(const char *)imodule; // snap to entry
GS_message(("%s",(const char *)imodule.getRawEntry()));
main_set_global_options(ops);
- mod_type = backend->module_type(imodule.Name());
+ mod_type = backend->module_type(imodule.getName());
if (mod_type == BOOK_TYPE)
keytext = strdup(backend->treekey_get_local_name(
@@ -2101,8 +2143,8 @@
mf->old_font_size_value,
settings.bible_verse_num_color,
imodule.Description(),
- imodule.Name(),
- imodule.Name(),
+ imodule.getName(),
+ imodule.getName(),
(gchar*)keytext );
swbuf.append(buf);
g_free(buf);
@@ -2120,6 +2162,12 @@
}
char
+GTKPrintChapDisp::display(SWModule &imodule)
+{
+return Display(imodule);
+}
+
+char
GTKPrintChapDisp::Display(SWModule &imodule)
{
#ifdef USE_XIPHOS_HTML
@@ -2135,12 +2183,12 @@
SWBuf swbuf;
char *num;
- GLOBAL_OPS * ops = main_new_globals(imodule.Name());
- gboolean is_rtol = main_is_mod_rtol(imodule.Name());
+ GLOBAL_OPS * ops = main_new_globals((gchar *)imodule.getName());
+ gboolean is_rtol = main_is_mod_rtol(imodule.getName());
gboolean newparagraph = FALSE;
- mf = get_font(imodule.Name());
+ mf = get_font((gchar *)imodule.getName());
- if (!strcmp(imodule.Name(), "KJV"))
+ if (!strcmp(imodule.getName(), "KJV"))
paragraphMark = "¶ ";
else
paragraphMark = "";
diff -urN xiphos-3.1.5+dfsg/src/main/display.hh xiphos-3.1.5+dfsg.mine/src/main/display.hh
--- xiphos-3.1.5+dfsg/src/main/display.hh 2012-02-25 22:50:47.000000000 +0000
+++ xiphos-3.1.5+dfsg.mine/src/main/display.hh 2014-06-09 12:50:18.726686990 +0000
@@ -52,6 +52,8 @@
cache_flags(0)
{
}
+ virtual char display(SWModule &imodule);
+ virtual char displayByChapter(SWModule &imodule);
virtual char Display(SWModule &imodule);
virtual char DisplayByChapter(SWModule &imodule);
@@ -74,6 +76,7 @@
: GTKEntryDisp(_gtkText, _be)
{
}
+ virtual char display(SWModule &imodule);
virtual char Display(SWModule &imodule);
virtual void getVerseBefore(SWModule &imodule);
virtual void getVerseAfter(SWModule &imodule);
@@ -97,6 +100,8 @@
cache_flags(0)
{
}
+ virtual char display(SWModule &imodule);
+ virtual char displayByChapter(SWModule &imodule);
virtual char Display(SWModule &imodule);
virtual char DisplayByChapter(SWModule &imodule);
@@ -121,6 +126,7 @@
: DialogEntryDisp(_gtkText, _d, _be)
{
}
+ virtual char display(SWModule &imodule);
virtual char Display(SWModule &imodule);
};
@@ -133,6 +139,7 @@
be(_be)
{
}
+ virtual char display(SWModule &imodule);
virtual char Display(SWModule &imodule);
protected:
@@ -147,6 +154,7 @@
: GTKPrintEntryDisp(_gtkText, _be)
{
}
+ virtual char display(SWModule &imodule);
virtual char Display(SWModule &imodule);
MOD_FONT *mf;
};
diff -urN xiphos-3.1.5+dfsg/src/main/search_dialog.cc xiphos-3.1.5+dfsg.mine/src/main/search_dialog.cc
--- xiphos-3.1.5+dfsg/src/main/search_dialog.cc 2012-02-25 22:50:47.000000000 +0000
+++ xiphos-3.1.5+dfsg.mine/src/main/search_dialog.cc 2014-06-12 11:45:36.793501288 +0000
@@ -723,7 +723,7 @@
GtkTreeIter selected_modules_lists;
GtkListStore *list_store;
GtkListStore *store_modules_lists;
- gchar *mod_description = NULL;
+ const gchar *mod_description = NULL;
gchar *mod_list = NULL;
GList *mods = NULL;
GtkTreeSelection *selection_modules_lists;
@@ -736,7 +736,7 @@
model_mods = gtk_tree_view_get_model(GTK_TREE_VIEW(tree_widget));
list_store = GTK_LIST_STORE(model_mods);
- mod_description = backendSearch->module_description(mod_name);
+ mod_description = backendSearch->module_description((char *)mod_name);
gtk_list_store_append(list_store, &iter);
gtk_list_store_set(list_store, &iter,
@@ -780,7 +780,7 @@
GtkWidget * tree_widget)
{
gchar *mod = NULL;
- gchar *mod_description = NULL;
+ const gchar *mod_description = NULL;
gchar *mod_list = NULL;
GList *mods = NULL;
GtkListStore *store_modules_lists;
@@ -817,7 +817,7 @@
gtk_tree_model_get(model, &selected, UTIL_COL_MODULE, &mod, -1);
if (mod) {
mod_description =
- backendSearch->module_description(mod);
+ backendSearch->module_description((char *)mod);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_current_module))) {
search1.search_mod = g_strdup(mod);
diff -urN xiphos-3.1.5+dfsg/src/main/sword.cc xiphos-3.1.5+dfsg.mine/src/main/sword.cc
--- xiphos-3.1.5+dfsg/src/main/sword.cc 2012-02-25 22:50:47.000000000 +0000
+++ xiphos-3.1.5+dfsg.mine/src/main/sword.cc 2014-06-16 10:43:10.585182988 +0000
@@ -1702,7 +1702,7 @@
char *main_get_module_description(char * module_name)
{
- return backend->module_description(module_name);
+ return (char *)backend->module_description(module_name);
}
/******************************************************************************
signature.asc
Description: Digital signature
