New upstream version 2.11.0

1 files changed, 35 insertions, 35 deletions

diff --git a/src/frontend/displaywindow/cbookreadwindow.cpp b/src/frontend/displaywindow/cbookreadwindow.cpp
index fade4d5..6c68264 100644
--- a/src/frontend/displaywindow/cbookreadwindow.cpp
+++ b/src/frontend/displaywindow/cbookreadwindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2014 by the BibleTime developers.
+* Copyright 1999-2016 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -21,6 +21,8 @@
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "frontend/displaywindow/btdisplaysettingsbutton.h"
 #include "frontend/keychooser/cbooktreechooser.h"
+#include "util/btassert.h"
+#include "util/btconnect.h"
 #include "util/cresmgr.h"
 #include "util/tool.h"
 
@@ -28,16 +30,16 @@
 void CBookReadWindow::applyProfileSettings(const QString & windowGroup) {
     CLexiconReadWindow::applyProfileSettings(windowGroup);
 
-    Q_ASSERT(m_treeAction);
-    Q_ASSERT(windowGroup.endsWith('/'));
+    BT_ASSERT(m_treeAction);
+    BT_ASSERT(windowGroup.endsWith('/'));
     if (btConfig().sessionValue<bool>(windowGroup + "treeShown", true) != m_treeAction->isChecked())
         m_treeAction->activate(QAction::Trigger);
 }
 
-void CBookReadWindow::storeProfileSettings(const QString & windowGroup) {
+void CBookReadWindow::storeProfileSettings(QString const & windowGroup) const {
     CLexiconReadWindow::storeProfileSettings(windowGroup);
 
-    Q_ASSERT(windowGroup.endsWith('/'));
+    BT_ASSERT(windowGroup.endsWith('/'));
     btConfig().setSessionValue(windowGroup + "treeShown", m_treeAction->isChecked());
 }
 
@@ -47,17 +49,12 @@ void CBookReadWindow::initActions() {
     insertKeyboardActions(ac);
 
     //cleanup, not a clean oo-solution
-    QAction *a = ac->action("nextEntry");
-    Q_ASSERT(a != 0);
-    a->setEnabled(false);
-    a = ac->action("previousEntry");
-    Q_ASSERT(a != 0);
-    a->setEnabled(false);
-
-    m_treeAction = ac->action("toggleTree");
-    Q_ASSERT(m_treeAction != 0);
-    QObject::connect(m_treeAction, SIGNAL(triggered()),
-                     this,         SLOT(treeToggled()));
+    ac->action("nextEntry").setEnabled(false);
+    ac->action("previousEntry").setEnabled(false);
+
+    m_treeAction = &ac->action("toggleTree");
+    BT_ASSERT(m_treeAction);
+    BT_CONNECT(m_treeAction, SIGNAL(triggered()), this, SLOT(treeToggled()));
     addAction(m_treeAction);
 
     ac->readShortcuts("Book shortcuts");
@@ -69,7 +66,7 @@ void CBookReadWindow::insertKeyboardActions( BtActionCollection* const a ) {
     qaction = new QAction( /* QIcon(CResMgr::displaywindows::bookWindow::toggleTree::icon), */
         tr("Toggle tree view"), a);
     qaction->setCheckable(true);
-    qaction->setShortcut(CResMgr::displaywindows::bookWindow::toggleTree::accel);
+    // qaction->setShortcut(CResMgr::displaywindows::bookWindow::toggleTree::accel);
     a->addAction("toggleTree", qaction);
 }
 
@@ -77,9 +74,12 @@ void CBookReadWindow::insertKeyboardActions( BtActionCollection* const a ) {
 void CBookReadWindow::initConnections() {
     CLexiconReadWindow::initConnections();
 
-    connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)), this, SLOT(lookupSwordKey(CSwordKey*)));
-    connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)), keyChooser(), SLOT(updateKey(CSwordKey*)));
-    connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), m_treeChooser, SLOT(updateKey(CSwordKey*)));
+    BT_CONNECT(m_treeChooser, SIGNAL(keyChanged(CSwordKey *)),
+               this,          SLOT(lookupSwordKey(CSwordKey *)));
+    BT_CONNECT(m_treeChooser, SIGNAL(keyChanged(CSwordKey *)),
+               keyChooser(),  SLOT(updateKey(CSwordKey *)));
+    BT_CONNECT(keyChooser(),  SIGNAL(keyChanged(CSwordKey *)),
+               m_treeChooser, SLOT(updateKey(CSwordKey *)));
 }
 
 /** Init the view */
@@ -112,8 +112,8 @@ void CBookReadWindow::initView() {
 }
 
 void CBookReadWindow::initToolbars() {
-    Q_ASSERT(m_treeAction);
-    Q_ASSERT(m_actions.backInHistory);
+    BT_ASSERT(m_treeAction);
+    BT_ASSERT(m_actions.backInHistory);
 
     mainToolBar()->addAction(m_actions.backInHistory);
     mainToolBar()->addAction(m_actions.forwardInHistory);
@@ -125,10 +125,10 @@ void CBookReadWindow::initToolbars() {
     BtDisplaySettingsButton* button = new BtDisplaySettingsButton(buttonsToolBar());
     setDisplaySettingsButton(button);
     buttonsToolBar()->addWidget(button);  // Display settings
-    QAction *action = actionCollection()->action(CResMgr::displaywindows::general::search::actionName);
-    if (action != 0) {
-        buttonsToolBar()->addAction(action);  // Search
-    }
+    // Search:
+    buttonsToolBar()->addAction(
+            &actionCollection()->action(
+                    CResMgr::displaywindows::general::search::actionName));
 }
 
 void CBookReadWindow::setupMainWindowToolBars() {
@@ -137,10 +137,10 @@ void CBookReadWindow::setupMainWindowToolBars() {
     btMainWindow()->navToolBar()->addAction(m_actions.forwardInHistory); //2nd button
     CKeyChooser* keyChooser = CKeyChooser::createInstance(modules(), history(), key(), btMainWindow()->navToolBar() );
     btMainWindow()->navToolBar()->addWidget(keyChooser);
-    bool ok = connect(keyChooser, SIGNAL(keyChanged(CSwordKey*)), this, SLOT(lookupSwordKey(CSwordKey*)));
-    Q_ASSERT(ok);
-    ok = connect(this, SIGNAL(sigKeyChanged(CSwordKey*)), keyChooser, SLOT(updateKey(CSwordKey*)) );
-    Q_ASSERT(ok);
+    BT_CONNECT(keyChooser, SIGNAL(keyChanged(CSwordKey *)),
+               this,       SLOT(lookupSwordKey(CSwordKey *)));
+    BT_CONNECT(this,       SIGNAL(sigKeyChanged(CSwordKey *)),
+               keyChooser, SLOT(updateKey(CSwordKey *)));
 
     // Works toolbar
     btMainWindow()->worksToolBar()->setModules(getModuleList(), modules().first()->type(), this);
@@ -150,16 +150,16 @@ void CBookReadWindow::setupMainWindowToolBars() {
     BtDisplaySettingsButton* button = new BtDisplaySettingsButton(buttonsToolBar());
     setDisplaySettingsButton(button);
     btMainWindow()->toolsToolBar()->addWidget(button);  // Display settings
-    QAction *action = actionCollection()->action(CResMgr::displaywindows::general::search::actionName);
-    if (action != 0) {
-        btMainWindow()->toolsToolBar()->addAction(action);  // Search
-    }
+    // Search:
+    btMainWindow()->toolsToolBar()->addAction(
+            &actionCollection()->action(
+                    CResMgr::displaywindows::general::search::actionName));
 }
 
 /** Is called when the action was executed to toggle the tree view. */
 void CBookReadWindow::treeToggled() {
     if (m_treeAction->isChecked()) {
-        m_treeChooser->show();
+        m_treeChooser->doShow();
     }
     else {
         m_treeChooser->hide();