1 files changed, 24 insertions, 25 deletions

diff --git a/src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp b/src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp
index 7cedfc0..067b4db 100644
--- a/src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp
+++ b/src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp
@@ -7,31 +7,26 @@
 *
 **********/
 
-//BibleTime includes
-#include "ckeyreferencewidget.h"
+#include "frontend/keychooser/versekeychooser/ckeyreferencewidget.h"
 
-#include "../cscrollerwidgetset.h"
-#include "btdropdownchooserbutton.h"
-
-#include "backend/config/cbtconfig.h"
-
-#include "backend/keys/cswordversekey.h"
-
-#include "util/cresmgr.h"
-#include "util/directoryutil.h"
-
-//Qt includes
 #include <QApplication>
 #include <QDebug>
+#include <QEvent>
+#include <QFocusEvent>
 #include <QHBoxLayout>
 #include <QLineEdit>
-#include <QEvent>
 #include <QMouseEvent>
 #include <QPixmap>
 #include <QString>
 #include <QStringList>
 #include <QToolButton>
-#include <QFocusEvent>
+#include "backend/config/cbtconfig.h"
+#include "backend/keys/cswordversekey.h"
+#include "frontend/keychooser/cscrollerwidgetset.h"
+#include "frontend/keychooser/versekeychooser/btdropdownchooserbutton.h"
+#include "util/cresmgr.h"
+#include "util/directory.h"
+
 
 class BtLineEdit : public QLineEdit {
     public:
@@ -54,6 +49,7 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers
         QWidget(parent),
         m_key(key),
         m_dropDownHoverTimer(this) {
+    namespace DU = util::directory;
 
     updatelock = false;
     m_module = mod;
@@ -61,7 +57,7 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers
     setFocusPolicy(Qt::WheelFocus);
 
     QToolButton* clearRef = new QToolButton(this);
-    clearRef->setIcon(util::filesystem::DirectoryUtil::getIcon("edit_clear_locationbar"));
+    clearRef->setIcon(DU::getIcon("edit_clear_locationbar"));
     clearRef->setAutoRaise(true);
     clearRef->setStyleSheet("QToolButton{margin:0px;}");
     connect(clearRef, SIGNAL(clicked()), SLOT(slotClearRef()) );
@@ -243,32 +239,33 @@ void CKeyReferenceWidget::slotUpdateUnlock() {
 }
 
 void CKeyReferenceWidget::slotStepBook(int n) {
-    CSwordVerseKey key = *m_key;
-    n > 0 ? key.next( CSwordVerseKey::UseBook ) : key.previous( CSwordVerseKey::UseBook );
+	emit beforeChange(m_key);
+    n > 0 ? m_key->next( CSwordVerseKey::UseBook ) : m_key->previous( CSwordVerseKey::UseBook );
     if (!updatelock)
-        emit changed(&key); // does *m_key = key
+        emit changed(m_key);
     updateText();
 }
 
 void CKeyReferenceWidget::slotStepChapter(int n) {
-    CSwordVerseKey key = *m_key;
-    n > 0 ? key.next( CSwordVerseKey::UseChapter ) : key.previous( CSwordVerseKey::UseChapter );
+	emit beforeChange(m_key);
+    n > 0 ? m_key->next( CSwordVerseKey::UseChapter ) : m_key->previous( CSwordVerseKey::UseChapter );
     if (!updatelock)
-        emit changed(&key); // does *m_key = key
+        emit changed(m_key);
     updateText();
 }
 
 void CKeyReferenceWidget::slotStepVerse(int n) {
-    CSwordVerseKey key = *m_key;
-    n > 0 ? key.next( CSwordVerseKey::UseVerse ) : key.previous( CSwordVerseKey::UseVerse );
+	emit beforeChange(m_key);
+    n > 0 ? m_key->next( CSwordVerseKey::UseVerse ) : m_key->previous( CSwordVerseKey::UseVerse );
     if (!updatelock)
-        emit changed(&key); // does *m_key = key
+        emit changed(m_key);
     updateText();
 }
 
 
 void CKeyReferenceWidget::slotChangeVerse(int n) {
     if (m_key->Verse() != n) {
+		emit beforeChange(m_key);
         m_key->Verse( n );
         setKey( m_key );
     }
@@ -278,6 +275,7 @@ void CKeyReferenceWidget::slotChangeVerse(int n) {
 
 void CKeyReferenceWidget::slotChangeChapter(int n) {
     if (m_key->Chapter() != n) {
+		emit beforeChange(m_key);
         m_key->Chapter( n );
         setKey( m_key );
     }
@@ -288,6 +286,7 @@ void CKeyReferenceWidget::slotChangeChapter(int n) {
 
 void CKeyReferenceWidget::slotChangeBook(QString bookname) {
     if (m_key->book() != bookname) {
+		emit beforeChange(m_key);
         m_key->book( bookname );
         setKey( m_key );
     }