diff options
Diffstat (limited to 'bibletime/backend/cswordversekey.cpp')
| -rw-r--r-- | bibletime/backend/cswordversekey.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bibletime/backend/cswordversekey.cpp b/bibletime/backend/cswordversekey.cpp index 344795e..96f88f5 100644 --- a/bibletime/backend/cswordversekey.cpp +++ b/bibletime/backend/cswordversekey.cpp @@ -14,7 +14,7 @@ #include "cswordbiblemoduleinfo.h" #include "cswordcommentarymoduleinfo.h" -//Qt includes +//TQt includes #include <tqstringlist.h> //Sword includes @@ -112,7 +112,7 @@ const TQString CSwordVerseKey::book( const TQString& newBook ) { } //return TQString::fromUtf8( books[min][0].name ); //return the first book, i.e. Genesis - return TQString::null; + return TQString(); } /** Sets the key we use to the parameter. */ @@ -173,19 +173,19 @@ const bool CSwordVerseKey::next( const JumpType type ) { case UseVerse: { if (m_module && m_module->module()) { - const bool oldStatus = m_module->module()->getSkipConsecutiveLinks(); + const bool oldtqStatus = m_module->module()->getSkipConsecutiveLinks(); m_module->module()->setSkipConsecutiveLinks(true); //disable headings for next verse const bool useHeaders = (Verse() == 0); - const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders ); + const bool oldHeadingstqStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders ); //don't use setKey(), that would create a new key without Headings set m_module->module()->getKey()->setText( (const char*)key().utf8() ); (*(m_module->module()) )++; - ((VerseKey*)(m_module->module()->getKey()))->Headings(oldHeadingsStatus); - m_module->module()->setSkipConsecutiveLinks(oldStatus); + ((VerseKey*)(m_module->module()->getKey()))->Headings(oldHeadingstqStatus); + m_module->module()->setSkipConsecutiveLinks(oldtqStatus); if (!m_module->module()->Error()) { key( TQString::fromUtf8(m_module->module()->KeyText()) ); @@ -258,16 +258,16 @@ const bool CSwordVerseKey::previous( const JumpType type ) { case UseVerse: { if (m_module && m_module->module()) { const bool useHeaders = (Verse() == 0); - const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders ); + const bool oldHeadingstqStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders ); m_module->module()->getKey()->setText( (const char*)key().utf8() ); - const bool oldStatus = m_module->module()->getSkipConsecutiveLinks(); + const bool oldtqStatus = m_module->module()->getSkipConsecutiveLinks(); m_module->module()->setSkipConsecutiveLinks(true); ( *( m_module->module() ) )--; - ((VerseKey*)(m_module->module()->getKey()))->Headings( oldHeadingsStatus ); - m_module->module()->setSkipConsecutiveLinks(oldStatus); + ((VerseKey*)(m_module->module()->getKey()))->Headings( oldHeadingstqStatus ); + m_module->module()->setSkipConsecutiveLinks(oldtqStatus); if (!m_module->module()->Error()) { key( TQString::fromUtf8(m_module->module()->KeyText()) );//don't use fromUtf8 |