Merge branch 'pre_clang_format_fixes_2' into 'master'

Fixes before applying clang-format 2

See merge request OpenMW/openmw!2401

apps/opencs/model/doc/document.cpp

@@ -87,7 +87,7 @@ void CSMDoc::Document::addOptionalGlobals()
         "DaysPassed",
         "PCWerewolf",
         "PCYear",
-        0
+        nullptr,
     };
 
     for (int i=0; sGlobals[i]; ++i)
@@ -162,7 +162,7 @@ void CSMDoc::Document::createBase()
         "PCVampire",
         "PCWerewolf",
         "PCYear",
-        0
+        nullptr,
     };
 
     for (int i=0; sGlobals[i]; ++i)
@@ -200,7 +200,7 @@ void CSMDoc::Document::createBase()
         "Idle",
         "Flee",
         "Hit",
-        0
+        nullptr,
     };
 
     for (int i=0; sVoice[i]; ++i)
@@ -225,7 +225,7 @@ void CSMDoc::Document::createBase()
         "Greeting 7",
         "Greeting 8",
         "Greeting 9",
-        0
+        nullptr,
     };
 
     for (int i=0; sGreetings[i]; ++i)
@@ -250,7 +250,7 @@ void CSMDoc::Document::createBase()
         "Admire Fail",
         "Taunt Fail",
         "Bribe Fail",
-        0
+        nullptr,
     };
 
     for (int i=0; sPersuasion[i]; ++i)

apps/opencs/model/filter/parser.cpp

@@ -199,7 +199,7 @@ CSMFilter::Token CSMFilter::Parser::checkKeywords (const Token& token)
         "true", "false",
         "and", "or", "not",
         "string", "value",
-        0
+        nullptr,
     };
 
     std::string string = Misc::StringUtils::lowerCase (token.mString);

apps/opencs/model/prefs/shortcutmanager.cpp

@@ -780,7 +780,7 @@ namespace CSMPrefs
         std::make_pair((int)Qt::Key_LastNumberRedial       , "LastNumberRedial"),
         std::make_pair((int)Qt::Key_Camera                 , "Camera"),
         std::make_pair((int)Qt::Key_CameraFocus            , "CameraFocus"),
-        std::make_pair(0                                   , (const char*) nullptr)
+        std::make_pair(0                                   , static_cast<const char*>(nullptr)),
     };
 
 }

apps/opencs/model/tools/tools.cpp

@@ -245,7 +245,7 @@ int CSMTools::Tools::getRunningOperations() const
        CSMDoc::State_Verifying,
        CSMDoc::State_Searching,
        CSMDoc::State_Merging,
-        -1
+        -1,
     };
 
     int result = 0;

apps/opencs/model/world/columnbase.cpp

@@ -91,7 +91,7 @@ bool CSMWorld::ColumnBase::isId (Display display)
         Display_EffectAttribute,
         Display_IngredEffectId,
 
-        Display_None
+        Display_None,
     };
 
     for (int i=0; ids[i]!=Display_None; ++i)

apps/opencs/model/world/infoselectwrapper.cpp

@@ -98,7 +98,7 @@ const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] =
     "Not Race",
     "Not Cell",
     "Not Local",
-    0
+    nullptr,
 };
 
 const char* CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[] =
@@ -109,7 +109,7 @@ const char* CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[] =
     ">=",
     "<",
     "<=",
-    0
+    nullptr,
 };
 
 const char* CSMWorld::ConstInfoSelectWrapper::ComparisonEnumStrings[] =
@@ -117,7 +117,7 @@ const char* CSMWorld::ConstInfoSelectWrapper::ComparisonEnumStrings[] =
     "Boolean",
     "Integer",
     "Numeric",
-    0
+    nullptr,
 };
 
 // static functions

apps/opencs/model/world/universalid.cpp

@@ -54,7 +54,8 @@ namespace
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Pathgrids, "Pathgrids", ":./pathgrid.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_StartScripts, "Start Scripts", ":./start-script.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MetaDatas, "Metadata", ":./metadata.png" },
-        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
+        // end marker
+        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 },
     };
 
     static const TypeData sIdArg[] =
@@ -120,8 +121,8 @@ namespace
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Pathgrid, "Pathgrid", ":./pathgrid.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_StartScript, "Start Script", ":./start-script.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MetaData, "Metadata", ":./metadata.png" },
-
+        // end marker
-        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
+        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 },
     };
 
     static const TypeData sIndexArg[] =
@@ -129,7 +130,8 @@ namespace
         { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults, "Verification Results", ":./menu-verify.png" },
         { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_LoadErrorLog, "Load Error Log", ":./error-log.png" },
         { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_Search, "Global Search", ":./menu-search.png" },
-        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
+        // end marker
+        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 },
     };
 }
 

apps/opencs/view/doc/view.cpp

@@ -538,7 +538,8 @@ void CSVDoc::View::updateDocumentState()
     {
         CSMDoc::State_Saving, CSMDoc::State_Verifying, CSMDoc::State_Searching,
         CSMDoc::State_Merging,
-        -1 // end marker
+        // end marker
+        -1,
     };
 
     int state = mDocument->getState() ;

apps/opencs/view/doc/viewmanager.cpp

@@ -112,7 +112,7 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
         { CSMWorld::ColumnBase::Display_BookType, CSMWorld::Columns::ColumnId_BookType, false },
         { CSMWorld::ColumnBase::Display_BloodType, CSMWorld::Columns::ColumnId_BloodType, false },
         { CSMWorld::ColumnBase::Display_EmitterType, CSMWorld::Columns::ColumnId_EmitterType, false },
-        { CSMWorld::ColumnBase::Display_GenderNpc, CSMWorld::Columns::ColumnId_Gender, false }
+        { CSMWorld::ColumnBase::Display_GenderNpc, CSMWorld::Columns::ColumnId_Gender, false },
     };
 
     for (std::size_t i=0; i<sizeof (sMapping)/sizeof (Mapping); ++i)

apps/opencs/view/world/subviews.cpp

@@ -45,8 +45,8 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Spells,
         CSMWorld::UniversalId::Type_Enchantments,
         CSMWorld::UniversalId::Type_SoundGens,
-
+        // end marker
-        CSMWorld::UniversalId::Type_None // end marker
+        CSMWorld::UniversalId::Type_None,
     };
 
     for (int i=0; sTableTypes[i]!=CSMWorld::UniversalId::Type_None; ++i)
@@ -141,8 +141,8 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Faction,
         CSMWorld::UniversalId::Type_Enchantment,
         CSMWorld::UniversalId::Type_SoundGen,
-
+        // end marker
-        CSMWorld::UniversalId::Type_None // end marker
+        CSMWorld::UniversalId::Type_None,
     };
 
     for (int i=0; sTableTypes2[i]!=CSMWorld::UniversalId::Type_None; ++i)

apps/openmw/mwdialogue/selectwrapper.cpp

@@ -202,7 +202,8 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
         Function_WerewolfKills,
         Function_RankLow, Function_RankHigh,
         Function_CreatureTargetted,
-        Function_None // end marker
+        // end marker
+        Function_None,
     };
 
     static const Function numericFunctions[] =
@@ -210,7 +211,8 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
         Function_Global, Function_Local, Function_NotLocal,
         Function_PcDynamicStat, Function_PcHealthPercent,
         Function_HealthPercent,
-        Function_None // end marker
+        // end marker
+        Function_None,
     };
 
     static const Function booleanFunctions[] =
@@ -223,14 +225,16 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
         Function_Alarmed, Function_Detected,
         Function_Attacked, Function_ShouldAttack,
         Function_Werewolf,
-        Function_None // end marker
+        // end marker
+        Function_None,
     };
 
     static const Function invertedBooleanFunctions[] =
     {
         Function_NotId, Function_NotFaction, Function_NotClass,
         Function_NotRace, Function_NotCell,
-        Function_None // end marker
+        // end marker
+        Function_None,
     };
 
     Function function = getFunction();
@@ -264,7 +268,8 @@ bool MWDialogue::SelectWrapper::isNpcOnly() const
         Function_Reputation, Function_FactionRankDiff,
         Function_Werewolf, Function_WerewolfKills,
         Function_RankLow, Function_RankHigh,
-        Function_None // end marker
+        // end marker
+        Function_None,
     };
 
     Function function = getFunction();

apps/openmw/mwgui/charactercreation.cpp

@@ -105,7 +105,7 @@ namespace MWGui
         static const char *ids[] =
         {
             "AttribVal1", "AttribVal2", "AttribVal3", "AttribVal4",
-            "AttribVal5", "AttribVal6", "AttribVal7", "AttribVal8", 0
+            "AttribVal5", "AttribVal6", "AttribVal7", "AttribVal8", nullptr,
         };
 
         for (int i=0; ids[i]; ++i)

apps/openmw/mwgui/statswindow.cpp

@@ -163,7 +163,7 @@ namespace MWGui
         {
             "AttribVal1", "AttribVal2", "AttribVal3", "AttribVal4", "AttribVal5",
             "AttribVal6", "AttribVal7", "AttribVal8",
-            0
+            nullptr,
         };
 
         for (int i=0; ids[i]; ++i)

apps/openmw/mwmechanics/actors.cpp

@@ -728,7 +728,7 @@ namespace MWMechanics
                 {
                     static const std::array<int, 7> damageEffects{
                         ESM::MagicEffect::FireDamage, ESM::MagicEffect::ShockDamage, ESM::MagicEffect::FrostDamage, ESM::MagicEffect::Poison,
-                        ESM::MagicEffect::SunDamage, ESM::MagicEffect::DamageHealth, ESM::MagicEffect::AbsorbHealth
+                        ESM::MagicEffect::SunDamage, ESM::MagicEffect::DamageHealth, ESM::MagicEffect::AbsorbHealth,
                     };
 
                     const bool isDamageEffect = std::find(damageEffects.begin(), damageEffects.end(), effect.mEffectId) != damageEffects.end();

apps/openmw/mwmechanics/spelleffects.cpp

@@ -379,7 +379,7 @@ namespace
         {ESM::MagicEffect::BoundLongsword, "sMagicBoundLongswordID"},
         {ESM::MagicEffect::BoundMace, "sMagicBoundMaceID"},
         {ESM::MagicEffect::BoundShield, "sMagicBoundShieldID"},
-        {ESM::MagicEffect::BoundSpear, "sMagicBoundSpearID"}
+        {ESM::MagicEffect::BoundSpear, "sMagicBoundSpearID"},
     };
 }
 
@@ -787,7 +787,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
                 MWWorld::InventoryStore::Slot_RightGauntlet,
                 MWWorld::InventoryStore::Slot_Helmet,
                 MWWorld::InventoryStore::Slot_Greaves,
-                MWWorld::InventoryStore::Slot_Boots
+                MWWorld::InventoryStore::Slot_Boots,
             };
             for (const int priority : priorities)
             {

apps/openmw/mwmechanics/spellpriority.cpp

@@ -495,7 +495,7 @@ namespace MWMechanics
                     MWWorld::InventoryStore::Slot_RightGauntlet,
                     MWWorld::InventoryStore::Slot_Helmet,
                     MWWorld::InventoryStore::Slot_Greaves,
-                    MWWorld::InventoryStore::Slot_Boots
+                    MWWorld::InventoryStore::Slot_Boots,
                 };
 
                 bool enemyHasArmor = false;

apps/openmw/mwmechanics/spellutil.cpp

@@ -20,7 +20,7 @@ namespace MWMechanics
         static const std::array<ESM::Skill::SkillEnum, 6> schoolSkillArray
         {
             ESM::Skill::Alteration, ESM::Skill::Conjuration, ESM::Skill::Destruction,
-            ESM::Skill::Illusion, ESM::Skill::Mysticism, ESM::Skill::Restoration
+            ESM::Skill::Illusion, ESM::Skill::Mysticism, ESM::Skill::Restoration,
         };
         return schoolSkillArray.at(school);
     }

apps/openmw/mwmechanics/summoning.cpp

@@ -55,7 +55,7 @@ namespace MWMechanics
             {ESM::MagicEffect::SummonBear, "sMagicCreature02ID"},
             {ESM::MagicEffect::SummonBonewolf, "sMagicCreature03ID"},
             {ESM::MagicEffect::SummonCreature04, "sMagicCreature04ID"},
-            {ESM::MagicEffect::SummonCreature05, "sMagicCreature05ID"}
+            {ESM::MagicEffect::SummonCreature05, "sMagicCreature05ID"},
         };
 
         auto it = summonMap.find(effectId);

apps/openmw/mwworld/inventorystore.cpp

@@ -243,7 +243,7 @@ void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots
         ESM::Skill::Spear,
         ESM::Skill::ShortBlade,
         ESM::Skill::Marksman,
-        ESM::Skill::BluntWeapon
+        ESM::Skill::BluntWeapon,
     };
     const size_t weaponSkillsLength = sizeof(weaponSkills) / sizeof(weaponSkills[0]);
 

components/compiler/scanner.cpp

@@ -249,7 +249,7 @@ namespace Compiler
         "return",
         "messagebox",
         "set", "to",
-        nullptr
+        nullptr,
     };
 
     bool Scanner::scanName (MultiChar& c, Parser& parser, bool& cont, std::string name)

components/nif/niffile.cpp

@@ -196,7 +196,7 @@ void NIFFile::parse(Files::IStreamPtr&& stream)
     static const std::array<std::string, 2> verStrings =
     {
         "NetImmerse File Format",
-        "Gamebryo File Format"
+        "Gamebryo File Format",
     };
     const bool supportedHeader = std::any_of(verStrings.begin(), verStrings.end(),
         [&] (const std::string& verString) { return head.compare(0, verString.size(), verString) == 0; });
@@ -210,7 +210,7 @@ void NIFFile::parse(Files::IStreamPtr&& stream)
     static const std::array<uint32_t, 2> supportedVers =
     {
         NIFStream::generateVersion(4,0,0,0),
-        VER_MW
+        VER_MW,
     };
     const bool supportedVersion = std::find(supportedVers.begin(), supportedVers.end(), ver) != supportedVers.end();
     if (!supportedVersion)

components/stereo/frustum.cpp

@@ -75,7 +75,7 @@ namespace Stereo
             {-1.0,  1.0, -1.0},
             { 1.0,  1.0, -1.0},
             { 1.0,  1.0,  1.0},
-            {-1.0,  1.0,  1.0}
+            {-1.0,  1.0,  1.0},
         }};
 
         osg::Matrix slaveClipToView;