Index: src/frontend/cmoduleindexdialog.cpp =================================================================== --- src/frontend/cmoduleindexdialog.cpp (Revision 1214) +++ src/frontend/cmoduleindexdialog.cpp (Revision 1215) @@ -12,8 +12,6 @@ #include "util/cpointers.h" #include "backend/managers/cswordbackend.h" -#include - //Qt includes #include #include Index: src/frontend/searchdialog/btsearchresultarea.cpp =================================================================== --- src/frontend/searchdialog/btsearchresultarea.cpp (Revision 1214) +++ src/frontend/searchdialog/btsearchresultarea.cpp (Revision 1215) @@ -427,7 +427,7 @@ //char buf8[1000]; //standard::WhitespaceAnalyzer analyzer; //lucene_utf8towcs(m_wcharBuffer, searchedText.utf8(), MAX_CONV_SIZE); - //boost::scoped_ptr q( QueryParser::parse(m_wcharBuffer, _T("content"), &analyzer) ); + //QSharedPointer q( QueryParser::parse(m_wcharBuffer, _T("content"), &analyzer) ); //StringReader reader(m_wcharBuffer); //TokenStream* tokenStream = analyzer.tokenStream( _T("field"), &reader); //Token token; Index: src/frontend/cexportmanager.cpp =================================================================== --- src/frontend/cexportmanager.cpp (Revision 1214) +++ src/frontend/cexportmanager.cpp (Revision 1215) @@ -23,7 +23,7 @@ #include "frontend/cprinter.h" #include "util/ctoolclass.h" -#include +#include //Qt includes #include @@ -73,7 +73,7 @@ filterOptions.textualVariants = false; CHTMLExportRendering::Settings settings(addText); - boost::scoped_ptr render ( + QSharedPointer render ( (format == HTML) ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) @@ -120,7 +120,7 @@ filterOptions.textualVariants = false; CHTMLExportRendering::Settings settings(addText); - boost::scoped_ptr render ( + QSharedPointer render ( (format == HTML) ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) @@ -168,7 +168,7 @@ filterOptions.textualVariants = false; CHTMLExportRendering::Settings settings(addText); - boost::scoped_ptr render ( + QSharedPointer render ( (format == HTML) ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) @@ -214,7 +214,7 @@ filterOptions.textualVariants = false; CHTMLExportRendering::Settings settings(addText); - boost::scoped_ptr render ( + QSharedPointer render ( (format == HTML) ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) @@ -256,7 +256,7 @@ filterOptions.textualVariants = false; CHTMLExportRendering::Settings settings(addText); - boost::scoped_ptr render ( + QSharedPointer render ( (format == HTML) ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) @@ -292,7 +292,7 @@ filterOptions.textualVariants = false; CHTMLExportRendering::Settings settings(addText); - boost::scoped_ptr render ( + QSharedPointer render ( (format == HTML) ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) @@ -342,7 +342,7 @@ incProgress(); } - boost::scoped_ptr printer(new CPrinter(0, displayOptions, filterOptions)); + QSharedPointer printer(new CPrinter(0, displayOptions, filterOptions)); if (!progressWasCancelled()) { printer->printKeyTree(tree); @@ -368,7 +368,7 @@ tree.append( new CPrinter::KeyTreeItem(startKey, module, settings) ); } - boost::scoped_ptr printer(new CPrinter(0, displayOptions, filterOptions)); + QSharedPointer printer(new CPrinter(0, displayOptions, filterOptions)); printer->printKeyTree(tree); return true; } @@ -383,7 +383,7 @@ CPrinter::KeyTree tree; tree.append( new CPrinter::KeyTreeItem(key->key(), key->module(), settings) ); - boost::scoped_ptr printer(new CPrinter(0, displayOptions, filterOptions)); + QSharedPointer printer(new CPrinter(0, displayOptions, filterOptions)); printer->printKeyTree(tree); return true; } @@ -434,7 +434,7 @@ } } - boost::scoped_ptr printer(new CPrinter(0, displayOptions, filterOptions)); + QSharedPointer printer(new CPrinter(0, displayOptions, filterOptions)); printer->printKeyTree(tree); return true; } @@ -455,7 +455,7 @@ incProgress(); } - boost::scoped_ptr printer(new CPrinter(0, displayOptions, filterOptions)); + QSharedPointer printer(new CPrinter(0, displayOptions, filterOptions)); if (!progressWasCancelled()) { printer->printKeyTree(tree); Index: src/frontend/cinfodisplay.cpp =================================================================== --- src/frontend/cinfodisplay.cpp (Revision 1214) +++ src/frontend/cinfodisplay.cpp (Revision 1215) @@ -22,7 +22,7 @@ #include "frontend/display/cdisplay.h" #include "frontend/display/creaddisplay.h" -#include +#include // Sword includes #include @@ -78,7 +78,7 @@ if (!m) return; - boost::scoped_ptr key( CSwordKey::createInstance(m) ); + QSharedPointer key( CSwordKey::createInstance(m) ); key->key( key_text ); CDisplayTemplateMgr* mgr = CPointers::displayTemplateManager(); @@ -295,7 +295,7 @@ return QString::null; } - boost::scoped_ptr key( CSwordKey::createInstance(module) ); + QSharedPointer key( CSwordKey::createInstance(module) ); key->key(keyname); key->renderedText(); //force entryAttributes @@ -330,7 +330,7 @@ QString text; if (module) { - boost::scoped_ptr key( CSwordKey::createInstance(module) ); + QSharedPointer key( CSwordKey::createInstance(module) ); key->key( (*it).mid(1) ); //skip H or G (language sign), will have to change later if we have better modules text = key->renderedText(); } @@ -400,7 +400,7 @@ QString text; //Q_ASSERT(module); if (module) { - boost::scoped_ptr key( CSwordKey::createInstance(module) ); + QSharedPointer key( CSwordKey::createInstance(module) ); //skip H or G (language sign) if we have to skip it const bool isOk = key->key( skipFirstChar ? value.mid(1) : value ); @@ -432,7 +432,7 @@ return QString::null; } - boost::scoped_ptr key( CSwordKey::createInstance(module) ); + QSharedPointer key( CSwordKey::createInstance(module) ); key->key( data ); if (key->key().toUpper() != data.toUpper()) { //key not present in the lexicon return QString::null; Index: src/frontend/display/creaddisplay.cpp =================================================================== --- src/frontend/display/creaddisplay.cpp (Revision 1214) +++ src/frontend/display/creaddisplay.cpp (Revision 1215) @@ -26,11 +26,6 @@ #include "frontend/cexportmanager.h" -#include - -//KDE includes - - CReadDisplay::CReadDisplay(CReadWindow* readWindow) : CDisplay(readWindow), m_activeAnchor(QString::null), Index: src/frontend/display/cplainwritedisplay.cpp =================================================================== --- src/frontend/display/cplainwritedisplay.cpp (Revision 1214) +++ src/frontend/display/cplainwritedisplay.cpp (Revision 1215) @@ -15,7 +15,7 @@ #include "backend/keys/cswordkey.h" -#include +#include //Qt includes #include @@ -141,7 +141,7 @@ for (it = items.begin(); it != items.end(); ++it) { CSwordModuleInfo* module = backend()->findModuleByName((*it).module()); - boost::scoped_ptr key( CSwordKey::createInstance(module) ); + QSharedPointer key( CSwordKey::createInstance(module) ); key->key( (*it).key() ); QString moduleText = key->strippedText(); Index: src/frontend/display/bthtmlreaddisplay.cpp =================================================================== --- src/frontend/display/bthtmlreaddisplay.cpp (Revision 1214) +++ src/frontend/display/bthtmlreaddisplay.cpp (Revision 1215) @@ -19,7 +19,7 @@ #include "util/ctoolclass.h" #include "util/cpointers.h" #include "util/directoryutil.h" -#include +#include #include #include @@ -164,7 +164,7 @@ if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) { - boost::scoped_ptr key( CSwordKey::createInstance(module) ); + QSharedPointer key( CSwordKey::createInstance(module) ); key->key( keyName ); return key->strippedText(); @@ -181,7 +181,7 @@ if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) { - boost::scoped_ptr key( CSwordKey::createInstance(module) ); + QSharedPointer key( CSwordKey::createInstance(module) ); key->key( keyName ); //TODO: This is a BAD HACK, we have to fnd a better solution to manage the settings now Index: src/frontend/display/bthtmljsobject.cpp =================================================================== --- src/frontend/display/bthtmljsobject.cpp (Revision 1214) +++ src/frontend/display/bthtmljsobject.cpp (Revision 1215) @@ -14,7 +14,7 @@ #include "backend/managers/cswordbackend.h" #include "backend/keys/cswordkey.h" #include "backend/config/cbtconfig.h" -#include +#include #include using namespace InfoDisplay; @@ -100,7 +100,7 @@ //add real Bible text from module/key if (CSwordModuleInfo* module = CPointers::backend()->findModuleByName(moduleName)) { - boost::scoped_ptr key( CSwordKey::createInstance(module) ); + QSharedPointer key( CSwordKey::createInstance(module) ); key->key( keyName ); mimedata->setText(key->strippedText()); // This works across applications! } Index: src/frontend/bookshelfmanager/installpage/btsourcearea.h =================================================================== --- src/frontend/bookshelfmanager/installpage/btsourcearea.h (Revision 1214) +++ src/frontend/bookshelfmanager/installpage/btsourcearea.h (Revision 1215) @@ -12,7 +12,7 @@ #include "backend/btmoduletreeitem.h" -#include +#include #include @@ -48,7 +48,7 @@ InstalledFilter(QString sourceName); bool filter(CSwordModuleInfo*); sword::InstallSource m_source; - boost::scoped_ptr m_swordBackend; + QSharedPointer m_swordBackend; }; BtSourceArea(const QString& sourceName); Index: src/frontend/bookshelfmanager/installpage/btinstallpage.cpp =================================================================== --- src/frontend/bookshelfmanager/installpage/btinstallpage.cpp (Revision 1214) +++ src/frontend/bookshelfmanager/installpage/btinstallpage.cpp (Revision 1215) @@ -32,9 +32,6 @@ #include "util/cresmgr.h" #include "util/directoryutil.h" -#include - - #include #include #include Index: src/frontend/bookshelfmanager/installpage/btinstallthread.h =================================================================== --- src/frontend/bookshelfmanager/installpage/btinstallthread.h (Revision 1214) +++ src/frontend/bookshelfmanager/installpage/btinstallthread.h (Revision 1215) @@ -14,7 +14,7 @@ #include -#include +#include class BtInstallProgressDialog; @@ -82,7 +82,7 @@ sword::InstallSource m_installSource; //TODO: it would be best to get the backend from the bookshelf manager install page // where it has already been created. Could fasten the progress dialog startup. - boost::scoped_ptr m_backendForSource; + QSharedPointer m_backendForSource; signals: /** Emitted when the install progress status is updated. */ Index: src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp =================================================================== --- src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp (Revision 1214) +++ src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp (Revision 1215) @@ -12,7 +12,7 @@ #include "frontend/bookshelfmanager/instbackend.h" -#include +#include //Qt includes #include @@ -158,7 +158,7 @@ sword::InstallSource CSwordSetupInstallSourcesDialog::getSource() { - boost::scoped_ptr dlg( new CSwordSetupInstallSourcesDialog() ); + QSharedPointer dlg( new CSwordSetupInstallSourcesDialog() ); sword::InstallSource newSource(""); //empty, invalid Source if (dlg->exec() == QDialog::Accepted) { Index: src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp =================================================================== --- src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp (Revision 1214) +++ src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp (Revision 1215) @@ -33,7 +33,7 @@ -CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVerseKey *key, QWidget *parent, const char* /*name*/) : +CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVerseKey *key, QWidget *parent, const char* /*name*/) : QWidget(parent), m_key(new CSwordVerseKey(mod)) { @@ -70,7 +70,7 @@ editorAndButtonsLayout->setContentsMargins(0,0,0,0); dropdownButtonsLayout->setSpacing(0); editorAndButtonsLayout->setSpacing(0); - + dropdownButtonsLayout->addWidget(m_bookDropdownButton, 2); dropdownButtonsLayout->addWidget(m_chapterDropdownButton,1); dropdownButtonsLayout->addWidget(m_verseDropdownButton,1); @@ -143,7 +143,7 @@ bool CKeyReferenceWidget::setKey(CSwordVerseKey *key) { if (!key) return false; - + m_key->key(key->key()); updateText(); return true; @@ -158,8 +158,8 @@ { m_key->key(m_textbox->text()); updateText(); - - emit changed(m_key.get()); + + emit changed(m_key.data()); } /* Handlers for the various scroller widgetsets. Do we really want a verse scroller? */ @@ -172,28 +172,28 @@ void CKeyReferenceWidget::slotUpdateUnlock() { updatelock = false; - if (oldKey != m_key->key()) emit changed(m_key.get()); + if (oldKey != m_key->key()) emit changed(m_key.data()); } void CKeyReferenceWidget::slotStepBook(int n) { n > 0 ? m_key->next( CSwordVerseKey::UseBook ) : m_key->previous( CSwordVerseKey::UseBook ); updateText(); - if (!updatelock) emit changed(m_key.get()); + if (!updatelock) emit changed(m_key.data()); } void CKeyReferenceWidget::slotStepChapter(int n) { n > 0 ? m_key->next( CSwordVerseKey::UseChapter ) : m_key->previous( CSwordVerseKey::UseChapter ); updateText(); - if (!updatelock) emit changed(m_key.get()); + if (!updatelock) emit changed(m_key.data()); } void CKeyReferenceWidget::slotStepVerse(int n) { n > 0 ? m_key->next( CSwordVerseKey::UseVerse ) : m_key->previous( CSwordVerseKey::UseVerse ); updateText(); - if (!updatelock) emit changed(m_key.get()); + if (!updatelock) emit changed(m_key.data()); } @@ -201,29 +201,29 @@ { if (m_key->Verse() != n) { m_key->Verse( n ); - setKey( m_key.get() ); + setKey( m_key.data() ); } updateText(); - if (!updatelock) emit changed(m_key.get()); + if (!updatelock) emit changed(m_key.data()); } void CKeyReferenceWidget::slotChangeChapter(int n) { if (m_key->Chapter() != n) { m_key->Chapter( n ); - setKey( m_key.get() ); + setKey( m_key.data() ); } updateText(); - if (!updatelock) emit changed(m_key.get()); + if (!updatelock) emit changed(m_key.data()); } void CKeyReferenceWidget::slotChangeBook(QString bookname) { if (m_key->book() != bookname) { m_key->book( bookname ); - setKey( m_key.get() ); + setKey( m_key.data() ); } updateText(); - if (!updatelock) emit changed(m_key.get()); + if (!updatelock) emit changed(m_key.data()); } Index: src/frontend/keychooser/versekeychooser/ckeyreferencewidget.h =================================================================== --- src/frontend/keychooser/versekeychooser/ckeyreferencewidget.h (Revision 1214) +++ src/frontend/keychooser/versekeychooser/ckeyreferencewidget.h (Revision 1215) @@ -15,7 +15,7 @@ #include -#include +#include class CLexiconKeyChooser; @@ -66,7 +66,7 @@ friend class BtChapterDropdownChooserButton; friend class BtVerseDropdownChooserButton; - boost::scoped_ptr m_key; + QSharedPointer m_key; QLineEdit* m_textbox; Index: src/frontend/mainindex/bookmarks/cbookmarkindex.cpp =================================================================== --- src/frontend/mainindex/bookmarks/cbookmarkindex.cpp (Revision 1214) +++ src/frontend/mainindex/bookmarks/cbookmarkindex.cpp (Revision 1215) @@ -29,7 +29,7 @@ #include "util/directoryutil.h" #include "util/ctoolclass.h" -#include +#include //Qt includes #include @@ -660,7 +660,7 @@ qWarning("Tried to print empty bookmark list."); return; } - boost::scoped_ptr printer( + QSharedPointer printer( new Printing::CPrinter( this, CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() ) ); printer->printKeyTree(tree); Index: src/frontend/mainindex/bookmarks/btbookmarkitem.cpp =================================================================== --- src/frontend/mainindex/bookmarks/btbookmarkitem.cpp (Revision 1214) +++ src/frontend/mainindex/bookmarks/btbookmarkitem.cpp (Revision 1215) @@ -21,7 +21,7 @@ #include -#include +#include BtBookmarkItem::BtBookmarkItem(CSwordModuleInfo* module, QString key, QString& description) @@ -101,14 +101,14 @@ CPointers::backend()->setFilterOptions(filterOptions); QString ret; - boost::scoped_ptr k( CSwordKey::createInstance(module()) ); + QSharedPointer k( CSwordKey::createInstance(module()) ); k->key(this->key()); const CLanguageMgr::Language* lang = module()->language(); CBTConfig::FontSettingsPair fontPair = CBTConfig::get (lang); - Q_ASSERT(k.get()); + Q_ASSERT(k.data()); if (fontPair.first) { //use a special font ret = QString::fromLatin1("%1 (%2)
%3") .arg(key()) Index: src/frontend/mainindex/bookshelf/cbookshelfindex.cpp =================================================================== --- src/frontend/mainindex/bookshelf/cbookshelfindex.cpp (Revision 1214) +++ src/frontend/mainindex/bookshelf/cbookshelfindex.cpp (Revision 1215) @@ -40,10 +40,8 @@ #include #include -#include - CBookshelfIndex::CBookshelfIndex(QWidget *parent) : QTreeWidget(parent), m_searchDialog(0), Index: src/main.cpp =================================================================== --- src/main.cpp (Revision 1214) +++ src/main.cpp (Revision 1215) @@ -22,8 +22,6 @@ #include #include -#include - #include #include #include Index: src/backend/filters/bt_thmlhtml.cpp =================================================================== --- src/backend/filters/bt_thmlhtml.cpp (Revision 1214) +++ src/backend/filters/bt_thmlhtml.cpp (Revision 1215) @@ -15,7 +15,6 @@ #include "backend/config/cbtconfig.h" #include "util/cpointers.h" -#include //Sword includes #include @@ -319,7 +318,7 @@ CReferenceManager::ParseOptions options; options.refBase = QString::fromUtf8(myUserData->key->getText()); - + options.sourceLanguage = myModule->Lang(); options.destinationLanguage = QString("en"); Index: src/backend/rendering/cbookdisplay.cpp =================================================================== --- src/backend/rendering/cbookdisplay.cpp (Revision 1214) +++ src/backend/rendering/cbookdisplay.cpp (Revision 1215) @@ -13,8 +13,8 @@ #include "backend/drivers/cswordbookmoduleinfo.h" #include "backend/keys/cswordtreekey.h" -//Util -#include +// Qt +#include /** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */ const QString Rendering::CBookDisplay::text( const QList& modules, const QString& keyName, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions ) { @@ -31,7 +31,7 @@ // the number of levels which should be display together, 1 means display no entries together int displayLevel = book->config( CSwordModuleInfo::DisplayLevel ).toInt(); - boost::scoped_ptr key ( + QSharedPointer key ( dynamic_cast( CSwordKey::createInstance(book) ) ); key->key(keyName); //set the key to position we'd like to get @@ -103,7 +103,7 @@ //const bool hasToplevelText = !key->strippedText().isEmpty(); key->firstChild(); //go to the first sibling on the same level - setupRenderTree(key.get(), &tree, keyName); + setupRenderTree(key.data(), &tree, keyName); const QString renderedText = render.renderKeyTree(tree); Index: src/backend/rendering/ctextrendering.cpp =================================================================== --- src/backend/rendering/ctextrendering.cpp (Revision 1214) +++ src/backend/rendering/ctextrendering.cpp (Revision 1215) @@ -16,7 +16,7 @@ #include "backend/managers/cdisplaytemplatemgr.h" #include "backend/managers/creferencemanager.h" -#include +#include #include "util/ctoolclass.h" //Sword @@ -34,7 +34,7 @@ m_key( key ), m_childList(), m_stopKey( QString::null ), - m_alternativeContent( QString::null ) + m_alternativeContent( QString::null ) { m_moduleList.append( const_cast(mod) ); //BAD CODE } @@ -65,7 +65,7 @@ m_key(QString::null), m_childList(), m_stopKey(QString::null), - m_alternativeContent(QString::null) + m_alternativeContent(QString::null) { } @@ -75,7 +75,7 @@ m_key( i.m_key ), m_childList(), m_stopKey( i.m_stopKey ), - m_alternativeContent( i.m_alternativeContent ) + m_alternativeContent( i.m_alternativeContent ) { foreach(KeyTreeItem* item, (*i.childList())){ m_childList.append(new KeyTreeItem((*item))); //deep copy @@ -113,8 +113,8 @@ m_childList.append( new KeyTreeItem(start.key(), module, KeyTreeItem::Settings(false, settings.keyRenderingFace)) ); - + ok = start.next(CSwordVerseKey::UseVerse); } } @@ -183,14 +183,14 @@ QString t; //optimization for entries with the same key - boost::scoped_ptr key( + QSharedPointer key( (modules.count() == 1) ? CSwordKey::createInstance(modules.first()) : 0 ); foreach (KeyTreeItem* c, tree) { if (modules.count() == 1) { //this optimizes the rendering, only one key created for all items key->key( c->key() ); - t.append( renderEntry( *c, key.get()) ); + t.append( renderEntry( *c, key.data()) ); } else { t.append( renderEntry( *c ) ); @@ -204,15 +204,15 @@ CSwordModuleInfo* module = modules.first(); //qWarning( "renderKeyRange start %s stop %s \n", start.latin1(), stop.latin1() ); - - boost::scoped_ptr lowerBound( CSwordKey::createInstance(module) ); + + QSharedPointer lowerBound( CSwordKey::createInstance(module) ); lowerBound->key(start); - boost::scoped_ptr upperBound( CSwordKey::createInstance(module) ); + QSharedPointer upperBound( CSwordKey::createInstance(module) ); upperBound->key(stop); - sword::SWKey* sw_start = dynamic_cast(lowerBound.get()); - sword::SWKey* sw_stop = dynamic_cast(upperBound.get()); + sword::SWKey* sw_start = dynamic_cast(lowerBound.data()); + sword::SWKey* sw_stop = dynamic_cast(upperBound.data()); Q_ASSERT((*sw_start == *sw_stop) || (*sw_start < *sw_stop)); @@ -223,10 +223,10 @@ KeyTree tree; KeyTreeItem::Settings settings = keySettings; - CSwordVerseKey* vk_start = dynamic_cast(lowerBound.get()); + CSwordVerseKey* vk_start = dynamic_cast(lowerBound.data()); Q_ASSERT(vk_start); - CSwordVerseKey* vk_stop = dynamic_cast(upperBound.get()); + CSwordVerseKey* vk_stop = dynamic_cast(upperBound.data()); Q_ASSERT(vk_stop); bool ok = true; @@ -236,7 +236,7 @@ /*TODO: We need to take care of linked verses if we render one or (esp) more modules If the verses 2,3,4,5 are linked to 1, it should be displayed as one entry with the caption 1-5 */ - + if (vk_start->Chapter() == 0){ //range was 0:0-1:x, render 0:0 first and jump to 1:0 vk_start->Verse(0); tree.append( new KeyTreeItem(vk_start->key(), modules, settings) ); Index: src/backend/rendering/chtmlexportrendering.cpp =================================================================== --- src/backend/rendering/chtmlexportrendering.cpp (Revision 1214) +++ src/backend/rendering/chtmlexportrendering.cpp (Revision 1215) @@ -16,7 +16,7 @@ #include "backend/drivers/cswordmoduleinfo.h" #include "util/cpointers.h" -#include +#include #include @@ -55,7 +55,7 @@ CHTMLExportRendering::~CHTMLExportRendering() {} const QString CHTMLExportRendering::renderEntry( const KeyTreeItem& i, CSwordKey* k) { - + if (i.hasAlternativeContent()) { QString ret = QString(i.settings().highlight ? "
" : "
"); ret.append(i.getAlternativeContent()); @@ -86,8 +86,8 @@ return QString(""); //no module present for rendering } - boost::scoped_ptr scoped_key( !k ? CSwordKey::createInstance(modules.first()) : 0 ); - CSwordKey* key = k ? k : scoped_key.get(); + QSharedPointer scoped_key( !k ? CSwordKey::createInstance(modules.first()) : 0 ); + CSwordKey* key = k ? k : scoped_key.data(); Q_ASSERT(key); CSwordVerseKey* myVK = dynamic_cast(key); Index: src/backend/rendering/centrydisplay.cpp =================================================================== --- src/backend/rendering/centrydisplay.cpp (Revision 1214) +++ src/backend/rendering/centrydisplay.cpp (Revision 1215) @@ -18,7 +18,6 @@ #include "cdisplayrendering.h" #include "backend/config/cbtconfig.h" -#include //Qt includes #include @@ -27,7 +26,7 @@ using namespace Rendering; /** Returns the rendered text using the modules in the list and using the key parameter. - * The displayoptions and filter options are used, too. + * The displayoptions and filter options are used, too. */ const QString CEntryDisplay::text( const QList& modules, const QString& keyName, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions ) { CDisplayRendering render(displayOptions, filterOptions); @@ -44,7 +43,7 @@ CSwordVerseKey k1(module); k1.Headings(1); k1.key(keyName); - + // don't print the key CTextRendering::KeyTreeItem::Settings preverse_settings(false, CTextRendering::KeyTreeItem::Settings::NoKey); Index: src/backend/rendering/cplaintextexportrendering.cpp =================================================================== --- src/backend/rendering/cplaintextexportrendering.cpp (Revision 1214) +++ src/backend/rendering/cplaintextexportrendering.cpp (Revision 1215) @@ -12,7 +12,7 @@ #include "backend/keys/cswordkey.h" //Util -#include +#include namespace Rendering { @@ -27,7 +27,7 @@ } QList modules = i.modules(); - boost::scoped_ptr key( CSwordKey::createInstance(modules.first()) ); + QSharedPointer key( CSwordKey::createInstance(modules.first()) ); QString renderedText = QString(i.key()).append(":\n"); QString entry; Index: src/backend/drivers/cswordbiblemoduleinfo.cpp =================================================================== --- src/backend/drivers/cswordbiblemoduleinfo.cpp (Revision 1214) +++ src/backend/drivers/cswordbiblemoduleinfo.cpp (Revision 1215) @@ -18,7 +18,7 @@ //Sword #include -#include +#include CSwordBibleModuleInfo::CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend ) @@ -112,7 +112,7 @@ max = -1; } - boost::scoped_ptr key((sword::VerseKey *)module()->CreateKey()); + QSharedPointer key((sword::VerseKey *)module()->CreateKey()); (*key) = sword::TOP; for (key->Testament(min+1); !key->Error() && (key->Testament()-1) <= max; key->Book(key->Book()+1)) { @@ -129,7 +129,7 @@ unsigned int CSwordBibleModuleInfo::chapterCount(const unsigned int book) { int result = 0; - boost::scoped_ptr key((sword::VerseKey *)module()->CreateKey()); + QSharedPointer key((sword::VerseKey *)module()->CreateKey()); (*key) = sword::TOP; // works for old and new versions @@ -149,7 +149,7 @@ unsigned int CSwordBibleModuleInfo::verseCount( const unsigned int book, const unsigned int chapter ) { unsigned int result = 0; - boost::scoped_ptr key((sword::VerseKey *)module()->CreateKey()); + QSharedPointer key((sword::VerseKey *)module()->CreateKey()); (*key) = sword::TOP; // works for old and new versions @@ -174,7 +174,7 @@ //find out if we have ot and nt, only ot or only nt initBounds(); - boost::scoped_ptr key((sword::VerseKey *)module()->CreateKey()); + QSharedPointer key((sword::VerseKey *)module()->CreateKey()); (*key) = sword::TOP; #ifdef SWORD_MULTIVERSE Index: src/backend/drivers/cswordmoduleinfo.cpp =================================================================== --- src/backend/drivers/cswordmoduleinfo.cpp (Revision 1214) +++ src/backend/drivers/cswordmoduleinfo.cpp (Revision 1215) @@ -23,7 +23,7 @@ #include "backend/config/cbtconfig.h" -#include +#include //Qt includes #include @@ -251,7 +251,7 @@ } } - boost::scoped_ptr writer( new lucene::index::IndexWriter(index.toAscii().constData(), &an, true) ); //always create a new index + QSharedPointer writer( new lucene::index::IndexWriter(index.toAscii().constData(), &an, true) ); //always create a new index writer->setMaxFieldLength(BT_MAX_LUCENE_FIELD_LENGTH); writer->setUseCompoundFile(true); //merge segments into a single file writer->setMinMergeDocs(1000); @@ -305,7 +305,7 @@ } } - boost::scoped_ptr doc(new lucene::document::Document()); + QSharedPointer doc(new lucene::document::Document()); //index the key lucene_utf8towcs(wcharBuffer, key->getText(), BT_MAX_LUCENE_FIELD_LENGTH); @@ -358,7 +358,7 @@ } } // for attListI - writer->addDocument(doc.get()); + writer->addDocument(doc.data()); //Index() is not implemented properly for lexicons, so we use a //workaround. if (type() == CSwordModuleInfo::Lexicon){ @@ -422,8 +422,8 @@ wchar_t wcharBuffer[BT_MAX_LUCENE_FIELD_LENGTH + 1]; // work around Swords thread insafety for Bibles and Commentaries - boost::scoped_ptr < CSwordKey > key(CSwordKey::createInstance(this)); - sword::SWKey* s = dynamic_cast < sword::SWKey * >(key.get()); + QSharedPointer < CSwordKey > key(CSwordKey::createInstance(this)); + sword::SWKey* s = dynamic_cast < sword::SWKey * >(key.data()); QList list; if (s) { @@ -438,15 +438,15 @@ lucene::analysis::standard::StandardAnalyzer analyzer( stop_words ); lucene::search::IndexSearcher searcher(getModuleStandardIndexLocation().toAscii().constData()); lucene_utf8towcs(wcharBuffer, searchedText.toUtf8().constData(), BT_MAX_LUCENE_FIELD_LENGTH); - boost::scoped_ptr q( lucene::queryParser::QueryParser::parse((const TCHAR*)wcharBuffer, (const TCHAR*)_T("content"), &analyzer) ); + QSharedPointer q( lucene::queryParser::QueryParser::parse((const TCHAR*)wcharBuffer, (const TCHAR*)_T("content"), &analyzer) ); - boost::scoped_ptr h( searcher.search(q.get(), lucene::search::Sort::INDEXORDER) ); + QSharedPointer h( searcher.search(q.data(), lucene::search::Sort::INDEXORDER) ); const bool useScope = (scope.Count() > 0); // const bool isVerseModule = (type() == CSwordModuleInfo::Bible) || (type() == CSwordModuleInfo::Commentary); lucene::document::Document* doc = 0; - boost::scoped_ptr swKey( module()->CreateKey() ); + QSharedPointer swKey( module()->CreateKey() ); for (int i = 0; i < h->length(); ++i) { Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (Revision 1214) +++ CMakeLists.txt (Revision 1215) @@ -30,7 +30,6 @@ # #SET(QT_DBUSXML2CPP_EXECUTABLE "/usr/bin/qdbusxml2cpp") #TEMP HACK? -FIND_PACKAGE(Boost REQUIRED) # #custom includes # @@ -58,7 +57,6 @@ ${CMAKE_CURRENT_SOURCE_DIR}/src # so that include paths like "frontend/..." work ${CLUCENE_INCLUDE_DIR} #CLucene headers ${CLUCENE_LIBRARY_DIR} #CLucene/clucene-config.h - ${Boost_INCLUDE_DIRS} ${SWORD_INCLUDE_DIR} ) Index: README =================================================================== --- README (Revision 1214) +++ README (Revision 1215) @@ -9,7 +9,6 @@ -QT 4.4+ -Sword 1.5.9+ (http://crosswire.org/sword) -CLucene 0.9.16a+ (http://clucene.sf.net) - -Boost header files (libboost-dev) -cmake 2.4.0+ (http://cmake.org) 1.2 DEVELOPER-ONLY REQUIREMENTS