author | drw <drw> | 2004-07-16 16:01:46 (UTC) |
---|---|---|
committer | drw <drw> | 2004-07-16 16:01:46 (UTC) |
commit | f02993238f76eb8975bb4138f213d2211710afa4 (patch) (side-by-side diff) | |
tree | bfc6e3c46405456f4aace685a187e8c4cf628e8b /noncore/apps | |
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 @@ -30,50 +30,50 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include <qaction.h> #include <qclipboard.h> #include <qmenubar.h> #include <qobjectlist.h> #include <qpopupmenu.h> #include <qtimer.h> #include <qtoolbar.h> #include <markupfiltmgr.h> MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ ) : QMainWindow( parent, name, WStyle_ContextHelp ) , m_config( "dagger" ) , m_tabs( this ) , m_autoScrollTimer( this ) { // Initialize sword library manager m_config.setGroup( "Sword" ); m_modulePath = m_config.readEntry( "ModPath", "/usr/local/share/sword" ); m_swordMgr = new sword::SWMgr( m_modulePath.latin1(), true, new sword::MarkupFilterMgr( sword::FMT_HTMLHREF ) ); // Retrieve list of available Sword module options (e.g. footnotes, Strong's numbers, etc.) - sword::OptionsList swordOpts = m_swordMgr->getGlobalOptions(); - for ( sword::OptionsList::iterator it = swordOpts.begin(); it != swordOpts.end(); it++ ) + sword::StringList swordOpts = m_swordMgr->getGlobalOptions(); + for ( sword::StringList::iterator it = swordOpts.begin(); it != swordOpts.end(); it++ ) m_actionSwordOpts.append( new QAction( (*it).c_str(), QString::null, 0, this, 0 ) ); m_actionSwordOpts.sort(); // Initialize user interface setCaption( tr( "Dagger" ) ); initUI(); connect( &m_tabs, SIGNAL(currentChanged(QWidget *)), this, SLOT( slotTextDisplayed(QWidget *)) ); connect( &m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(slotNavNextVerse()) ); m_bibleIcon = new QPixmap( Resource::loadPixmap( "dagger/bibletext" ) ); m_commentaryIcon = new QPixmap( Resource::loadPixmap( "dagger/commentary" ) ); m_lexiconIcon = new QPixmap( Resource::loadPixmap( "dagger/lexicon" ) ); // Load initial configuration QTimer::singleShot( 100, this, SLOT( initConfig() ) ); } MainWindow::~MainWindow() { // Re-enable screen blanking if it was disabled QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; // Save Sword options |