1 files changed, 15 insertions, 14 deletions

diff --git a/src/frontend/displaywindow/cbookreadwindow.cpp b/src/frontend/displaywindow/cbookreadwindow.cpp
index 3aba333..ff2adf2 100644
--- a/src/frontend/displaywindow/cbookreadwindow.cpp
+++ b/src/frontend/displaywindow/cbookreadwindow.cpp
@@ -39,8 +39,7 @@ CBookReadWindow::~CBookReadWindow() {
 void CBookReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
     CLexiconReadWindow::applyProfileSettings(profileWindow);
 
-    const bool enable = static_cast<bool>( profileWindow->windowSettings() );
-    if (enable) {
+    if (profileWindow->windowSettings) {
         m_treeAction->activate(QAction::Trigger);
     }
 }
@@ -49,7 +48,7 @@ void CBookReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
     CLexiconReadWindow::storeProfileSettings(profileWindow);
 
     //store information about our show tree structure button
-    profileWindow->setWindowSettings( static_cast<int>( m_treeAction->isChecked() ) );
+    profileWindow->windowSettings = m_treeAction->isChecked();
 }
 
 void CBookReadWindow::initActions() {
@@ -58,13 +57,17 @@ void CBookReadWindow::initActions() {
     insertKeyboardActions(ac);
 
     //cleanup, not a clean oo-solution
-    Q_ASSERT(ac->action("nextEntry"));
-    Q_ASSERT(ac->action("previousEntry"));
-    ac->action("nextEntry")->setEnabled(false);
-    ac->action("previousEntry")->setEnabled(false);
+    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");
-    QObject::connect(m_treeAction, SIGNAL(triggered()), this, SLOT(treeToggled()) );
+    Q_ASSERT(m_treeAction != 0);
+    QObject::connect(m_treeAction, SIGNAL(triggered()),
+                     this,         SLOT(treeToggled()));
     addAction(m_treeAction);
 
     CBTConfig::setupAccelSettings(CBTConfig::bookWindow, ac);
@@ -132,9 +135,8 @@ void CBookReadWindow::initToolbars() {
     BtDisplaySettingsButton* button = new BtDisplaySettingsButton(buttonsToolBar());
     setDisplaySettingsButton(button);
     buttonsToolBar()->addWidget(button);  // Display settings
-    QAction* action = qobject_cast<QAction*>(actionCollection()->action(
-                          CResMgr::displaywindows::general::search::actionName ));
-    if (action) {
+    QAction *action = actionCollection()->action(CResMgr::displaywindows::general::search::actionName);
+    if (action != 0) {
         buttonsToolBar()->addAction(action);  // Search
     }
 }
@@ -158,9 +160,8 @@ void CBookReadWindow::setupMainWindowToolBars() {
     BtDisplaySettingsButton* button = new BtDisplaySettingsButton(buttonsToolBar());
     setDisplaySettingsButton(button);
     btMainWindow()->toolsToolBar()->addWidget(button);  // Display settings
-    QAction* action = qobject_cast<QAction*>(actionCollection()->action(
-                          CResMgr::displaywindows::general::search::actionName ));
-    if (action) {
+    QAction *action = actionCollection()->action(CResMgr::displaywindows::general::search::actionName);
+    if (action != 0) {
         btMainWindow()->toolsToolBar()->addAction(action);  // Search
     }
 }