author | drw <drw> | 2004-07-16 16:01:46 (UTC) |
---|---|---|
committer | drw <drw> | 2004-07-16 16:01:46 (UTC) |
commit | f02993238f76eb8975bb4138f213d2211710afa4 (patch) (unidiff) | |
tree | bfc6e3c46405456f4aace685a187e8c4cf628e8b | |
parent | e9a15ba751cd53dd6baafceb8a3a5bbfcb5f2bfc (diff) | |
download | opie-f02993238f76eb8975bb4138f213d2211710afa4.zip opie-f02993238f76eb8975bb4138f213d2211710afa4.tar.gz opie-f02993238f76eb8975bb4138f213d2211710afa4.tar.bz2 |
Fix to work with newest version of libsword (OptionsList -> StringList)
-rw-r--r-- | noncore/apps/dagger/mainwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/apps/dagger/mainwindow.cpp b/noncore/apps/dagger/mainwindow.cpp index b2e00e8..e886bd8 100644 --- a/noncore/apps/dagger/mainwindow.cpp +++ b/noncore/apps/dagger/mainwindow.cpp | |||
@@ -38,34 +38,34 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
38 | 38 | ||
39 | #include <markupfiltmgr.h> | 39 | #include <markupfiltmgr.h> |
40 | 40 | ||
41 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ ) | 41 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ ) |
42 | : QMainWindow( parent, name, WStyle_ContextHelp ) | 42 | : QMainWindow( parent, name, WStyle_ContextHelp ) |
43 | , m_config( "dagger" ) | 43 | , m_config( "dagger" ) |
44 | , m_tabs( this ) | 44 | , m_tabs( this ) |
45 | , m_autoScrollTimer( this ) | 45 | , m_autoScrollTimer( this ) |
46 | { | 46 | { |
47 | // Initialize sword library manager | 47 | // Initialize sword library manager |
48 | m_config.setGroup( "Sword" ); | 48 | m_config.setGroup( "Sword" ); |
49 | m_modulePath = m_config.readEntry( "ModPath", "/usr/local/share/sword" ); | 49 | m_modulePath = m_config.readEntry( "ModPath", "/usr/local/share/sword" ); |
50 | m_swordMgr = new sword::SWMgr( m_modulePath.latin1(), true, | 50 | m_swordMgr = new sword::SWMgr( m_modulePath.latin1(), true, |
51 | new sword::MarkupFilterMgr( sword::FMT_HTMLHREF ) ); | 51 | new sword::MarkupFilterMgr( sword::FMT_HTMLHREF ) ); |
52 | 52 | ||
53 | // Retrieve list of available Sword module options (e.g. footnotes, Strong's numbers, etc.) | 53 | // Retrieve list of available Sword module options (e.g. footnotes, Strong's numbers, etc.) |
54 | sword::OptionsList swordOpts = m_swordMgr->getGlobalOptions(); | 54 | sword::StringList swordOpts = m_swordMgr->getGlobalOptions(); |
55 | for ( sword::OptionsList::iterator it = swordOpts.begin(); it != swordOpts.end(); it++ ) | 55 | for ( sword::StringList::iterator it = swordOpts.begin(); it != swordOpts.end(); it++ ) |
56 | m_actionSwordOpts.append( new QAction( (*it).c_str(), QString::null, 0, this, 0 ) ); | 56 | m_actionSwordOpts.append( new QAction( (*it).c_str(), QString::null, 0, this, 0 ) ); |
57 | m_actionSwordOpts.sort(); | 57 | m_actionSwordOpts.sort(); |
58 | 58 | ||
59 | // Initialize user interface | 59 | // Initialize user interface |
60 | setCaption( tr( "Dagger" ) ); | 60 | setCaption( tr( "Dagger" ) ); |
61 | initUI(); | 61 | initUI(); |
62 | 62 | ||
63 | connect( &m_tabs, SIGNAL(currentChanged(QWidget *)), this, SLOT( slotTextDisplayed(QWidget *)) ); | 63 | connect( &m_tabs, SIGNAL(currentChanged(QWidget *)), this, SLOT( slotTextDisplayed(QWidget *)) ); |
64 | connect( &m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(slotNavNextVerse()) ); | 64 | connect( &m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(slotNavNextVerse()) ); |
65 | 65 | ||
66 | m_bibleIcon = new QPixmap( Resource::loadPixmap( "dagger/bibletext" ) ); | 66 | m_bibleIcon = new QPixmap( Resource::loadPixmap( "dagger/bibletext" ) ); |
67 | m_commentaryIcon = new QPixmap( Resource::loadPixmap( "dagger/commentary" ) ); | 67 | m_commentaryIcon = new QPixmap( Resource::loadPixmap( "dagger/commentary" ) ); |
68 | m_lexiconIcon = new QPixmap( Resource::loadPixmap( "dagger/lexicon" ) ); | 68 | m_lexiconIcon = new QPixmap( Resource::loadPixmap( "dagger/lexicon" ) ); |
69 | 69 | ||
70 | // Load initial configuration | 70 | // Load initial configuration |
71 | QTimer::singleShot( 100, this, SLOT( initConfig() ) ); | 71 | QTimer::singleShot( 100, this, SLOT( initConfig() ) ); |