1 files changed, 17 insertions, 15 deletions

diff --git a/src/frontend/displaywindow/creadwindow.cpp b/src/frontend/displaywindow/creadwindow.cpp
index b65cf8c..07c0abb 100644
--- a/src/frontend/displaywindow/creadwindow.cpp
+++ b/src/frontend/displaywindow/creadwindow.cpp
@@ -26,11 +26,9 @@
 
 using namespace Profile;
 
-typedef BtHtmlReadDisplay HTMLREADDISPLAY;
-
 CReadWindow::CReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent)
         : CDisplayWindow(modules, parent),
-        m_displayWidget(0) {
+        m_readDisplayWidget(0) {
     qDebug() << "CReadWindow::CReadWindow";
     //   installEventFilter(this);
 }
@@ -41,34 +39,38 @@ CReadWindow::~CReadWindow() {
 
 /** Sets the display widget of this display window. */
 void CReadWindow::setDisplayWidget( CDisplay* newDisplay ) {
-    Q_ASSERT(dynamic_cast<CReadDisplay*>(newDisplay));
+    // Lets be orwellianly paranoid here:
+    Q_ASSERT(dynamic_cast<CReadDisplay*>(newDisplay) != 0);
+
     CDisplayWindow::setDisplayWidget(newDisplay);
-    if (m_displayWidget) {
-        disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)), this, SLOT(lookupModKey(const QString&, const QString&)));
-        disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)), this, SLOT(lookupKey(const QString&)));
+    if (m_readDisplayWidget) {
+        disconnect(m_readDisplayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)),
+                   this, SLOT(lookupModKey(const QString&, const QString&)));
+        disconnect(m_readDisplayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)),
+                   this, SLOT(lookupKey(const QString&)));
 
-        HTMLREADDISPLAY* v = dynamic_cast<HTMLREADDISPLAY*>(m_displayWidget);
+        BtHtmlReadDisplay* v = dynamic_cast<BtHtmlReadDisplay*>(m_readDisplayWidget);
         if (v) {
             QObject::disconnect(v, SIGNAL(completed()), this, SLOT(slotMoveToAnchor()) );
         }
 
     }
 
-    m_displayWidget = (CReadDisplay*)newDisplay;
+    m_readDisplayWidget = static_cast<CReadDisplay*>(newDisplay);
     connect(
-        m_displayWidget->connectionsProxy(),
+        m_readDisplayWidget->connectionsProxy(),
         SIGNAL(referenceClicked(const QString&, const QString&)),
         this,
         SLOT(lookupModKey(const QString&, const QString&))
     );
 
     connect(
-        m_displayWidget->connectionsProxy(),
+        m_readDisplayWidget->connectionsProxy(),
         SIGNAL(referenceDropped(const QString&)),
         this,
         SLOT(lookupKey(const QString&))
     );
-    HTMLREADDISPLAY* v = dynamic_cast<HTMLREADDISPLAY*>(m_displayWidget);
+    BtHtmlReadDisplay* v = dynamic_cast<BtHtmlReadDisplay*>(m_readDisplayWidget);
     if (v) {
         QObject::connect(v, SIGNAL(completed()), this, SLOT(slotMoveToAnchor()) );
     }
@@ -193,9 +195,9 @@ void CReadWindow::openSearchStrongsDialog() {
     QString searchText = QString::null;
 
     if (displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null) {
-    	Q_FOREACH(QString strongNumber, displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma].split("|")) {
-    		searchText.append("strong:").append( strongNumber ).append(" ");
-    	}
+        Q_FOREACH(QString strongNumber, displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma].split("|")) {
+            searchText.append("strong:").append( strongNumber ).append(" ");
+        }
     }
 
     Search::CSearchDialog::openDialog( modules(), searchText, 0 );