Imported Upstream version 2.9.1

1 files changed, 12 insertions, 4 deletions

diff --git a/src/backend/keys/cswordkey.h b/src/backend/keys/cswordkey.h
index 48e511c..9b043b7 100644
--- a/src/backend/keys/cswordkey.h
+++ b/src/backend/keys/cswordkey.h
@@ -81,14 +81,14 @@ class CSwordKey {
         /** Returns the raw, unchanged text. Returns the text without any filter modifications,
          * just in the way it comes out of the module.
          */
-        virtual QString rawText();
+        QString rawText();
         /** Returns the rendered text. Returns the text of the current key after passing it through the
          * modules filters.
          */
-        virtual QString renderedText( const CSwordKey::TextRenderType mode = CSwordKey::Normal );
+        QString renderedText( const CSwordKey::TextRenderType mode = CSwordKey::Normal );
         /** Stripped down text. Returns the text after removing all markup tags from it.
          */
-        virtual QString strippedText();
+        QString strippedText();
 
         const BtSignal *signaler();
 
@@ -100,13 +100,21 @@ class CSwordKey {
          */
         static CSwordKey* createInstance(const CSwordModuleInfo *module);
 
+        /**
+         * This is called before a key change to emit a signal
+         * */
+        void emitBeforeChanged();
+        /**
+         * This is called after a key change to emit a signal
+         * */
+        void emitChanged();
+
     protected:
         /**
          * Returns the encoded key appropriate for use directly with Sword.
          */
         virtual const char * rawKey() const = 0;
         static inline const QTextCodec *cp1252Codec() { return m_cp1252Codec; };
-        void emitChanged();
 
     private:
         /**