Use the new item checker functions instead of equal operator

This commit is contained in:
Veronica Berglyd Olsen
2022-09-11 17:22:46 +02:00
parent 5cba10151a
commit 73b8e3e0fb
8 changed files with 23 additions and 24 deletions
+2 -2
View File
@@ -221,7 +221,7 @@ class NWIndex:
if theItem is None:
logger.info("Not indexing unknown item '%s'", tHandle)
return False
if theItem.itemType != nwItemType.FILE:
if not theItem.isFileType():
logger.info("Not indexing non-file item '%s'", tHandle)
return False
@@ -792,7 +792,7 @@ class ItemIndex:
for tItem in self.theProject.tree:
if tItem is None:
continue
if tItem.itemLayout == nwItemLayout.NOTE:
if tItem.isNoteLayout():
continue
if skipExcl and not tItem.isExported:
continue
+1 -1
View File
@@ -183,7 +183,7 @@ class NWProject():
tItem = self._projTree[tHandle]
if tItem is None:
return False
if tItem.itemType != nwItemType.FILE:
if not tItem.isFileType():
return False
newDoc = NWDoc(self, tHandle)
+3 -3
View File
@@ -29,7 +29,7 @@ import logging
from lxml import etree
from novelwriter.enum import nwItemType, nwItemClass, nwItemLayout
from novelwriter.enum import nwItemClass, nwItemLayout
from novelwriter.error import logException
from novelwriter.common import checkHandle
from novelwriter.constants import nwFiles
@@ -94,7 +94,7 @@ class NWTree():
nwItem.setHandle(tHandle)
nwItem.setParent(pHandle)
if nwItem.itemType == nwItemType.ROOT:
if nwItem.isRootType():
logger.verbose("Item '%s' is a root item", str(tHandle))
self._treeRoots[tHandle] = nwItem
if nwItem.itemClass == nwItemClass.ARCHIVE:
@@ -357,7 +357,7 @@ class NWTree():
tItem = self.__getitem__(tHandle)
if tItem is None:
return False
if tItem.itemType != nwItemType.FILE:
if not tItem.isFileType():
logger.error("Item '%s' is not a file", tHandle)
return False
if not isinstance(itemLayout, nwItemLayout):