diff --git a/apps/opencs/model/filter/filter.hpp b/apps/opencs/model/filter/filter.hpp index 7630ad410..62170ca80 100644 --- a/apps/opencs/model/filter/filter.hpp +++ b/apps/opencs/model/filter/filter.hpp @@ -13,10 +13,9 @@ namespace CSMFilter { enum Scope { - Scope_Global = 0, // per user - Scope_Project = 1, // per project - Scope_Session = 2, // exists only for one editing session; not saved - Scope_Content = 3 // embedded in the edited content file + Scope_Project = 0, // per project + Scope_Session = 1, // exists only for one editing session; not saved + Scope_Content = 2 // embedded in the edited content file }; Scope mScope; diff --git a/apps/opencs/view/filter/filtercreator.cpp b/apps/opencs/view/filter/filtercreator.cpp index 476eacbe1..47925ea57 100644 --- a/apps/opencs/view/filter/filtercreator.cpp +++ b/apps/opencs/view/filter/filtercreator.cpp @@ -10,7 +10,6 @@ std::string CSVFilter::FilterCreator::getNamespace() const { switch (mScope->currentIndex()) { - case CSMFilter::Filter::Scope_Global: return "global::"; case CSMFilter::Filter::Scope_Project: return "project::"; case CSMFilter::Filter::Scope_Session: return "session::"; } @@ -38,7 +37,6 @@ CSVFilter::FilterCreator::FilterCreator (CSMWorld::Data& data, QUndoStack& undoS mScope = new QComboBox (this); - mScope->addItem ("Global"); mScope->addItem ("Project"); mScope->addItem ("Session"); /// \ŧodo re-enable for OpenMW 1.1 @@ -51,7 +49,7 @@ CSVFilter::FilterCreator::FilterCreator (CSMWorld::Data& data, QUndoStack& undoS QLabel *label = new QLabel ("Scope", this); insertAtBeginning (label, false); - mScope->setCurrentIndex (2); + mScope->setCurrentIndex (1); } void CSVFilter::FilterCreator::reset()