Move the project index into the project class

novelwriter/core/project.py

@@ -37,6 +37,7 @@ from PyQt5.QtCore import QCoreApplication
 
 from novelwriter.core.tree import NWTree
 from novelwriter.core.item import NWItem
+from novelwriter.core.index import NWIndex
 from novelwriter.core.status import NWStatus
 from novelwriter.core.options import OptionState
 from novelwriter.core.document import NWDoc
@@ -62,9 +63,10 @@ class NWProject():
         self.mainConf  = novelwriter.CONFIG
 
         # Core Elements
-        self.optState = OptionState(self)  # Project-specific GUI options
-        self.projTree = NWTree(self)       # The project tree
-        self.langData = {}                 # Localisation data
+        self.optState  = OptionState(self)  # Project-specific GUI options
+        self.projTree  = NWTree(self)       # The project tree
+        self._projIndex = NWIndex(self)      # The projecty index
+        self.langData  = {}                 # Localisation data
 
         # Project Status
         self.projOpened  = 0      # The time stamp of when the project file was opened
@@ -116,6 +118,14 @@ class NWProject():
 
         return
 
+    ##
+    #  Properties
+    ##
+
+    @property
+    def index(self):
+        return self._projIndex
+
     ##
     #  Item Methods
     ##

novelwriter/core/tohtml.py

@@ -451,7 +451,7 @@ class ToHtml(Tokenizer):
     def _formatKeywords(self, tText):
         """Apply HTML formatting to keywords.
         """
-        isValid, theBits, _ = self.theParent.theIndex.scanThis("@"+tText)
+        isValid, theBits, _ = self.theProject.index.scanThis("@"+tText)
         if not isValid or not theBits:
             return ""
 

novelwriter/core/tomd.py

@@ -193,7 +193,7 @@ class ToMarkdown(Tokenizer):
     def _formatKeywords(self, tText, tStyle):
         """Apply Markdown formatting to keywords.
         """
-        isValid, theBits, _ = self.theParent.theIndex.scanThis("@"+tText)
+        isValid, theBits, _ = self.theProject.index.scanThis("@"+tText)
         if not isValid or not theBits:
             return ""
 

novelwriter/core/toodt.py

@@ -550,7 +550,7 @@ class ToOdt(Tokenizer):
     def _formatKeywords(self, tText):
         """Apply formatting to keywords.
         """
-        isValid, theBits, _ = self.theParent.theIndex.scanThis("@"+tText)
+        isValid, theBits, _ = self.theProject.index.scanThis("@"+tText)
         if not isValid or not theBits:
             return ""