Merge branch 'compile_no_evil' into 'master'

Remove dead code

See merge request OpenMW/openmw!1327

apps/opencs/model/world/scriptcontext.cpp

@@ -102,11 +102,6 @@ bool CSMWorld::ScriptContext::isId (const std::string& name) const
     return std::binary_search (mIds.begin(), mIds.end(), Misc::StringUtils::lowerCase (name));
 }
 
-bool CSMWorld::ScriptContext::isJournalId (const std::string& name) const
-{
-    return mData.getJournals().searchId (name)!=-1;
-}
-
 void CSMWorld::ScriptContext::invalidateIds()
 {
     mIdsUpdated = false;

apps/opencs/model/world/scriptcontext.hpp

@@ -39,9 +39,6 @@ namespace CSMWorld
             bool isId (const std::string& name) const override;
             ///< Does \a name match an ID, that can be referenced?
 
-            bool isJournalId (const std::string& name) const override;
-            ///< Does \a name match a journal ID?
-
             void invalidateIds();
 
             void clear();

apps/openmw/mwscript/compilercontext.cpp

@@ -86,14 +86,4 @@ namespace MWScript
             store.get<ESM::Weapon>().search (name) ||
             store.get<ESM::Script>().search (name);
     }
-
-    bool CompilerContext::isJournalId (const std::string& name) const
-    {
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
-
-        const ESM::Dialogue *topic = store.get<ESM::Dialogue>().search (name);
-
-        return topic && topic->mType==ESM::Dialogue::Journal;
-    }
 }

apps/openmw/mwscript/compilercontext.hpp

@@ -39,9 +39,6 @@ namespace MWScript
 
             bool isId (const std::string& name) const override;
             ///< Does \a name match an ID, that can be referenced?
-
-            bool isJournalId (const std::string& name) const override;
-            ///< Does \a name match a journal ID?
     };
 }
 

components/compiler/context.hpp

@@ -42,9 +42,6 @@ namespace Compiler
 
             virtual bool isId (const std::string& name) const = 0;
             ///< Does \a name match an ID, that can be referenced?
-
-            virtual bool isJournalId (const std::string& name) const = 0;
-            ///< Does \a name match a journal ID?
     };
 }