Merge remote-tracking branch 'rohit-n/reorder'

2025-01-16 18:19:55 +00:00 · 2015-04-29 12:09:55 +02:00 · 2015-04-29 12:09:55 +02:00 · ba57a648db
commit ba57a648db
parent 607a16eb01 997347b01e
39 changed files with 129 additions and 131 deletions
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@ -24,10 +24,10 @@
 const char *Launcher::DataFilesPage::mDefaultContentListName = "Default";

 Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings, Config::LauncherSettings &launcherSettings, QWidget *parent)
-    : mCfgMgr(cfg)
+    : QWidget(parent)
+    , mCfgMgr(cfg)
    , mGameSettings(gameSettings)
    , mLauncherSettings(launcherSettings)
-    , QWidget(parent)
 {
    ui.setupUi (this);
    setObjectName ("DataFilesPage");
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@ -25,7 +25,7 @@
 using namespace Process;

 Launcher::MainDialog::MainDialog(QWidget *parent)
-    : mGameSettings(mCfgMgr), QMainWindow (parent)
+    : QMainWindow(parent), mGameSettings (mCfgMgr)
 {
    setupUi(this);

--- a/apps/opencs/view/settings/rangeview.cpp
+++ b/apps/opencs/view/settings/rangeview.cpp
@ -12,7 +12,7 @@

 CSVSettings::RangeView::RangeView (CSMSettings::Setting *setting,
                                       Page *parent)
-    : mRangeWidget (0), mRangeType (setting->type()), View (setting, parent)
+    : View (setting, parent), mRangeWidget (0), mRangeType (setting->type())
 {

    mRangeWidget = 0;
--- a/apps/opencs/view/settings/textview.cpp
+++ b/apps/opencs/view/settings/textview.cpp
@ -5,7 +5,7 @@
 #include "../../model/settings/setting.hpp"

 CSVSettings::TextView::TextView(CSMSettings::Setting *setting, Page *parent)
-    : mDelimiter (setting->delimiter()), View (setting, parent)
+    : View (setting, parent), mDelimiter (setting->delimiter())

 {
    if (setting->isMultiLine())
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@ -174,24 +174,24 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
 }

 OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
-  : mOgre (0)
+  : mEncoding(ToUTF8::WINDOWS_1252)
+  , mEncoder(NULL)
+  , mOgre (0)
  , mVerboseScripts (false)
  , mSkipMenu (false)
  , mUseSound (true)
  , mCompileAll (false)
  , mCompileAllDialogue (false)
  , mWarningsMode (1)
-  , mScriptContext (0)
-  , mFSStrict (false)
  , mScriptConsoleMode (false)
-  , mCfgMgr(configurationManager)
-  , mEncoding(ToUTF8::WINDOWS_1252)
-  , mEncoder(NULL)
  , mActivationDistanceOverride(-1)
  , mGrab(true)
-  , mScriptBlacklistUse (true)
  , mExportFonts(false)
+  , mScriptContext (0)
+  , mFSStrict (false)
+  , mScriptBlacklistUse (true)
  , mNewGame (false)
+  , mCfgMgr(configurationManager)
 {
    OEngine::Misc::Rng::init();
    std::srand ( static_cast<unsigned int>(std::time(NULL)) );
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@ -77,8 +77,6 @@ namespace MWGui
        , mMagicka(NULL)
        , mStamina(NULL)
        , mDrowning(NULL)
-        , mDrowningFrame(NULL)
-        , mDrowningFlash(NULL)
        , mWeapImage(NULL)
        , mSpellImage(NULL)
        , mWeapStatus(NULL)
@ -87,6 +85,9 @@ namespace MWGui
        , mMinimap(NULL)
        , mCompass(NULL)
        , mCrosshair(NULL)
+        , mCellNameBox(NULL)
+        , mDrowningFrame(NULL)
+        , mDrowningFlash(NULL)
        , mFpsBox(NULL)
        , mFpsCounter(NULL)
        , mTriangleCounter(NULL)
@ -94,19 +95,18 @@ namespace MWGui
        , mHealthManaStaminaBaseLeft(0)
        , mWeapBoxBaseLeft(0)
        , mSpellBoxBaseLeft(0)
-        , mEffectBoxBaseRight(0)
        , mMinimapBoxBaseRight(0)
+        , mEffectBoxBaseRight(0)
        , mDragAndDrop(dragAndDrop)
        , mCellNameTimer(0.0f)
-        , mCellNameBox(NULL)
+        , mWeaponSpellTimer(0.f)
        , mMapVisible(true)
        , mWeaponVisible(true)
        , mSpellVisible(true)
        , mWorldMouseOver(false)
-        , mEnemyHealthTimer(-1)
        , mEnemyActorId(-1)
+        , mEnemyHealthTimer(-1)
        , mIsDrowning(false)
-        , mWeaponSpellTimer(0.f)
        , mDrowningFlashTheta(0.f)
    {
        mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@ -31,11 +31,11 @@ namespace MWGui

    MainMenu::MainMenu(int w, int h)
        : OEngine::GUI::Layout("openmw_mainmenu.layout")
-        , mButtonBox(0), mWidth (w), mHeight (h)
-        , mSaveGameDialog(NULL)
+        , mWidth (w), mHeight (h), mButtonBox(0)
        , mBackground(NULL)
        , mVideoBackground(NULL)
        , mVideo(NULL)
+        , mSaveGameDialog(NULL)
    {
        getWidget(mVersionText, "VersionText");
        std::stringstream sstream;
--- a/apps/openmw/mwgui/spellicons.hpp
+++ b/apps/openmw/mwgui/spellicons.hpp
@ -24,10 +24,10 @@ namespace MWGui
    struct MagicEffectInfo
    {
        MagicEffectInfo()
-            : mPermanent(false)
-            , mMagnitude(0)
+            : mMagnitude(0)
            , mRemainingTime(0.f)
            , mTotalTime(0.f)
+            , mPermanent(false)
        {}
        std::string mSource; // display name for effect source (e.g. potion name)
        MWMechanics::EffectKey mKey;
--- a/apps/openmw/mwgui/spellmodel.hpp
+++ b/apps/openmw/mwgui/spellmodel.hpp
@ -24,9 +24,9 @@ namespace MWGui
        bool mActive; // (Items only) is the item equipped?

        Spell()
-            : mSelected(false)
+            : mType(Type_Spell)
+            , mSelected(false)
            , mActive(false)
-            , mType(Type_Spell)
        {
        }
    };
--- a/apps/openmw/mwgui/spellview.cpp
+++ b/apps/openmw/mwgui/spellview.cpp
@ -21,9 +21,9 @@ namespace MWGui
    }

    SpellView::SpellView()
-        : mShowCostColumn(true)
+        : mScrollView(NULL)
+        , mShowCostColumn(true)
        , mHighlightSelected(true)
-        , mScrollView(NULL)
    {
    }

--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@ -20,10 +20,10 @@ namespace MWGui
    {
    public:
        ToolTipInfo()
-            : isPotion(false)
-            , imageSize(32)
-            , wordWrap(true)
+            : imageSize(32)
            , remainingEnchantCharge(-1)
+            , isPotion(false)
+            , wordWrap(true)
        {}

        std::string caption;
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@ -54,10 +54,10 @@ namespace MWGui

    TradeWindow::TradeWindow()
        : WindowBase("openmw_trade_window.layout")
-        , mCurrentBalance(0)
-        , mItemToSell(-1)
-        , mTradeModel(NULL)
        , mSortModel(NULL)
+        , mTradeModel(NULL)
+        , mItemToSell(-1)
+        , mCurrentBalance(0)
        , mCurrentMerchantOffer(0)
    {
        getWidget(mFilterAll, "AllButton");
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@ -36,17 +36,17 @@ namespace MWGui
        struct SpellEffectParams
        {
            SpellEffectParams()
-                : mMagnMin(-1)
+                : mNoTarget(false)
+                , mIsConstant(false)
+                , mKnown(true)
+                , mEffectID(-1)
+                , mSkill(-1)
+                , mAttribute(-1)
+                , mMagnMin(-1)
                , mMagnMax(-1)
                , mRange(-1)
                , mDuration(-1)
-                , mSkill(-1)
                , mArea(0)
-                , mAttribute(-1)
-                , mEffectID(-1)
-                , mNoTarget(false)
-                , mIsConstant(false)
-                , mKnown(true)
            {
            }

--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@ -102,6 +102,7 @@ namespace MWGui
            const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts,
            Translation::Storage& translationDataStorage, ToUTF8::FromType encoding, bool exportFonts, const std::map<std::string, std::string>& fallbackMap)
      : mConsoleOnlyScripts(consoleOnlyScripts)
+      , mCurrentModals()
      , mGuiManager(NULL)
      , mRendering(ogre)
      , mHud(NULL)
@ -135,8 +136,8 @@ namespace MWGui
      , mTrainingWindow(NULL)
      , mMerchantRepair(NULL)
      , mSoulgemDialog(NULL)
-      , mRecharge(NULL)
      , mRepair(NULL)
+      , mRecharge(NULL)
      , mCompanionWindow(NULL)
      , mVideoBackground(NULL)
      , mVideoWidget(NULL)
@ -159,8 +160,8 @@ namespace MWGui
      , mPlayerName()
      , mPlayerRaceId()
      , mPlayerAttributes()
-      , mPlayerMinorSkills()
      , mPlayerMajorSkills()
+      , mPlayerMinorSkills()
      , mPlayerSkillValues()
      , mGui(NULL)
      , mGuiModes()
@ -173,7 +174,6 @@ namespace MWGui
      , mFPS(0.0f)
      , mTriangleCount(0)
      , mBatchCount(0)
-      , mCurrentModals()
      , mFallbackMap(fallbackMap)
    {
        // Set up the GUI system
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@ -102,32 +102,32 @@ namespace MWInput
            OMW::Engine& engine,
            const std::string& userFile, bool userFileExists,
            const std::string& controllerBindingsFile, bool grab)
-        : mOgre(ogre)
+        : mJoystickLastUsed(false)
+        , mOgre(ogre)
        , mPlayer(NULL)
        , mEngine(engine)
-        , mMouseLookEnabled(false)
-        , mMouseX(ogre.getWindow()->getWidth ()/2.f)
-        , mMouseY(ogre.getWindow()->getHeight ()/2.f)
-        , mMouseWheel(0)
-        , mDragDrop(false)
-        , mGuiCursorEnabled(true)
        , mUserFile(userFile)
-        , mUserFileExists(userFileExists)
+        , mDragDrop(false)
+        , mGrabCursor (Settings::Manager::getBool("grab cursor", "Input"))
        , mInvertY (Settings::Manager::getBool("invert y axis", "Input"))
+        , mControlsDisabled(false)
        , mCameraSensitivity (Settings::Manager::getFloat("camera sensitivity", "Input"))
        , mUISensitivity (Settings::Manager::getFloat("ui sensitivity", "Input"))
        , mCameraYMultiplier (Settings::Manager::getFloat("camera y multiplier", "Input"))
-        , mGrabCursor (Settings::Manager::getBool("grab cursor", "Input"))
        , mPreviewPOVDelay(0.f)
        , mTimeIdle(0.f)
+        , mMouseLookEnabled(false)
+        , mGuiCursorEnabled(true)
+        , mDetectingKeyboard(false)
        , mOverencumberedMessageDelay(0.f)
+        , mMouseX(ogre.getWindow()->getWidth ()/2.f)
+        , mMouseY(ogre.getWindow()->getHeight ()/2.f)
+        , mMouseWheel(0)
+        , mUserFileExists(userFileExists)
        , mAlwaysRunActive(Settings::Manager::getBool("always run", "Input"))
        , mSneakToggles(Settings::Manager::getBool("toggle sneak", "Input"))
        , mSneaking(false)
        , mAttemptJump(false)
-        , mControlsDisabled(false)
-        , mJoystickLastUsed(false)
-        , mDetectingKeyboard(false)
        , mFakeDeviceID(1)
    {

--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@ -66,7 +66,7 @@ namespace MWMechanics
    public:
        /// \a weapon may be empty for hand-to-hand combat
        ActionWeapon(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo = MWWorld::Ptr())
-            : mWeapon(weapon), mAmmunition(ammo) {}
+            : mAmmunition(ammo), mWeapon(weapon) {}
        /// Equips the given weapon.
        virtual void prepare(const MWWorld::Ptr& actor);
        virtual void getCombatRange (float& rangeAttack, float& rangeFollow);
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@ -65,6 +65,7 @@ void Animation::EffectAnimationTime::setValue(Ogre::Real)

 Animation::Animation(const MWWorld::Ptr &ptr, Ogre::SceneNode *node)
    : mPtr(ptr)
+    , mGlowLight(NULL)
    , mInsert(node)
    , mSkelBase(NULL)
    , mAccumRoot(NULL)
@ -72,7 +73,6 @@ Animation::Animation(const MWWorld::Ptr &ptr, Ogre::SceneNode *node)
    , mNonAccumCtrl(NULL)
    , mAccumulate(0.0f)
    , mNullAnimationTimePtr(OGRE_NEW NullAnimationTime)
-    , mGlowLight(NULL)
 {
    for(size_t i = 0;i < sNumGroups;i++)
        mAnimationTimePtr[i].bind(OGRE_NEW AnimationTime(this));
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@ -25,7 +25,12 @@ namespace MWRender

    CharacterPreview::CharacterPreview(MWWorld::Ptr character, int sizeX, int sizeY, const std::string& name,
                                       Ogre::Vector3 position, Ogre::Vector3 lookAt)
-        : mSceneMgr (0)
+        : mRecover(false)
+        , mRenderTarget(NULL)
+        , mViewport(NULL)
+        , mCamera(NULL)
+        , mSceneMgr (0)
+        , mNode(NULL)
        , mPosition(position)
        , mLookAt(lookAt)
        , mCharacter(character)
@ -33,11 +38,6 @@ namespace MWRender
        , mName(name)
        , mSizeX(sizeX)
        , mSizeY(sizeY)
-        , mRenderTarget(NULL)
-        , mViewport(NULL)
-        , mCamera(NULL)
-        , mNode(NULL)
-        , mRecover(false)
    {
        mCharacter.mCell = NULL;
    }
@ -161,9 +161,9 @@ namespace MWRender

    InventoryPreview::InventoryPreview(MWWorld::Ptr character)
        : CharacterPreview(character, 512, 1024, "CharacterPreview", Ogre::Vector3(0, 71, -700), Ogre::Vector3(0,71,0))
-        , mSelectionBuffer(NULL)
        , mSizeX(0)
        , mSizeY(0)
+        , mSelectionBuffer(NULL)
    {
    }

--- a/apps/openmw/mwrender/debugging.cpp
+++ b/apps/openmw/mwrender/debugging.cpp
@ -155,10 +155,10 @@ ManualObject *Debugging::createPathgridPoints(const ESM::Pathgrid *pathgrid)
 }

 Debugging::Debugging(SceneNode *root, OEngine::Physic::PhysicEngine *engine) :
-    mRootNode(root), mEngine(engine),
-    mSceneMgr(root->getCreator()),
+    mEngine(engine), mSceneMgr(root->getCreator()),
    mPathgridEnabled(false),
-    mInteriorPathgridNode(NULL), mPathGridRoot(NULL),
+    mRootNode(root),
+    mPathGridRoot(NULL), mInteriorPathgridNode(NULL),
    mGridMatsCreated(false)
 {
    ResourceGroupManager::getSingleton().createResourceGroup(DEBUGGING_GROUP);
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@ -25,9 +25,9 @@ using namespace MWRender;
 using namespace Ogre;

 LocalMap::LocalMap(OEngine::Render::OgreRenderer* rend, MWRender::RenderingManager* rendering)
-    : mInterior(false)
+    : mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
    , mAngle(0.f)
-    , mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
+    , mInterior(false)
 {
    mRendering = rend;
    mRenderingManager = rendering;
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@ -91,7 +91,7 @@ namespace MWRender
 {

 HeadAnimationTime::HeadAnimationTime(MWWorld::Ptr reference)
-    : mReference(reference), mTalkStart(0), mTalkStop(0), mBlinkStart(0), mBlinkStop(0), mValue(0), mEnabled(true)
+    : mReference(reference), mTalkStart(0), mTalkStop(0), mBlinkStart(0), mBlinkStop(0), mEnabled(true), mValue(0)
 {
    resetBlinkTimer();
 }
@ -203,17 +203,17 @@ NpcAnimation::~NpcAnimation()

 NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, int visibilityFlags, bool disableListener, bool disableSounds, ViewMode viewMode)
  : Animation(ptr, node),
-    mVisibilityFlags(visibilityFlags),
    mListenerDisabled(disableListener),
    mViewMode(viewMode),
    mShowWeapons(false),
    mShowCarriedLeft(true),
+    mNpcType(Type_Normal),
+    mVisibilityFlags(visibilityFlags),
    mFirstPersonOffset(0.f, 0.f, 0.f),
    mAlpha(1.f),
-    mNpcType(Type_Normal),
    mSoundsDisabled(disableSounds),
-    mHeadPitch(0.f),
-    mHeadYaw(0.f)
+    mHeadYaw(0.f),
+    mHeadPitch(0.f)
 {
    mNpc = mPtr.get<ESM::NPC>()->mBase;

--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@ -56,14 +56,14 @@ namespace MWRender {
 RenderingManager::RenderingManager(OEngine::Render::OgreRenderer& _rend, const boost::filesystem::path& resDir,
                                   const boost::filesystem::path& cacheDir, OEngine::Physic::PhysicEngine* engine,
                                   MWWorld::Fallback* fallback)
-    : mRendering(_rend)
+    : mSunEnabled(0)
    , mFallback(fallback)
+    , mTerrain(NULL)
+    , mRendering(_rend)
+    , mEffectManager(NULL)
    , mPlayerAnimation(NULL)
    , mAmbientMode(0)
-    , mSunEnabled(0)
    , mPhysicsEngine(engine)
-    , mTerrain(NULL)
-    , mEffectManager(NULL)
    , mRenderWorld(true)
 {
    mActors = new MWRender::Actors(mRendering, this);
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@ -247,9 +247,13 @@ unsigned int Moon::getPhaseInt() const
 }

 SkyManager::SkyManager(Ogre::SceneNode *root, Ogre::Camera *pCamera)
-    : mHour(0.0f)
+    : mCreated(false)
+    , mMoonRed(false)
+    , mIsStorm(false)
+    , mHour(0.0f)
    , mDay(0)
    , mMonth(0)
+    , mCloudAnimationTimer(0.f)
    , mSun(NULL)
    , mSunGlare(NULL)
    , mMasser(NULL)
@ -260,6 +264,9 @@ SkyManager::SkyManager(Ogre::SceneNode *root, Ogre::Camera *pCamera)
    , mAtmosphereDay(NULL)
    , mAtmosphereNight(NULL)
    , mCloudNode(NULL)
+    , mParticleNode(NULL)
+    , mRainTimer(0)
+    , mStormDirection(0,-1,0)
    , mClouds()
    , mNextClouds()
    , mCloudBlendFactor(0.0f)
@ -268,22 +275,15 @@ SkyManager::SkyManager(Ogre::SceneNode *root, Ogre::Camera *pCamera)
    , mStarsOpacity(0.0f)
    , mLightning(NULL)
    , mRemainingTransitionTime(0.0f)
-    , mGlareFade(0.0f)
    , mGlare(0.0f)
+    , mGlareFade(0.0f)
+    , mRainEnabled(false)
+    , mRainSpeed(0)
+    , mRainFrequency(1)
    , mEnabled(true)
    , mSunEnabled(true)
    , mMasserEnabled(true)
    , mSecundaEnabled(true)
-    , mCreated(false)
-    , mCloudAnimationTimer(0.f)
-    , mMoonRed(false)
-    , mParticleNode(NULL)
-    , mRainEnabled(false)
-    , mRainTimer(0)
-    , mRainSpeed(0)
-    , mRainFrequency(1)
-    , mStormDirection(0,-1,0)
-    , mIsStorm(false)
 {
    mSceneMgr = root->getCreator();
    mRootNode = mSceneMgr->getRootSceneNode()->createChildSceneNode();
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@ -46,10 +46,10 @@ namespace MWRender {
    {
    public:
        Reflection(Ogre::SceneManager* sceneManager)
-            : mSceneMgr(sceneManager)
-            , mIsUnderwater(false)
-            , mCamera(NULL)
+            : mCamera(NULL)
            , mParentCamera(NULL)
+            , mSceneMgr(sceneManager)
+            , mIsUnderwater(false)
            {}
        virtual ~Reflection() {}

--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@ -25,10 +25,10 @@
 using namespace Process;

 Wizard::MainWizard::MainWizard(QWidget *parent) :
-    mGameSettings(mCfgMgr),
    QWizard(parent),
+    mInstallations(),
    mError(false),
-    mInstallations()
+    mGameSettings(mCfgMgr)
 {
 #ifndef Q_OS_MAC
    setWizardStyle(QWizard::ModernStyle);
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@ -21,9 +21,9 @@ ESM_Context ESMReader::getContext()
 }

 ESMReader::ESMReader()
-    : mBuffer(50*1024)
+    : mIdx(0)
    , mRecordFlags(0)
-    , mIdx(0)
+    , mBuffer(50*1024)
    , mGlobalReaderList(NULL)
    , mEncoder(NULL)
 {
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@ -9,10 +9,10 @@
 namespace ESM
 {
    ESMWriter::ESMWriter()
-        : mEncoder (0)
+        : mStream(NULL)
+        , mEncoder (0)
        , mRecordCount (0)
        , mCounting (true)
-        , mStream(NULL)
    {}

    unsigned int ESMWriter::getVersion() const
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@ -78,9 +78,9 @@ struct Cell
    float mFogDensity;
  };

-  Cell() : mWater(0),
-           mName(""),
+  Cell() : mName(""),
           mRegion(""),
+           mWater(0),
           mWaterInt(false),
           mMapColor(0),
           mRefNumCounter(0)
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@ -67,11 +67,11 @@ Land::Land()
    : mFlags(0)
    , mX(0)
    , mY(0)
+    , mPlugin(0)
    , mEsm(NULL)
    , mDataTypes(0)
    , mDataLoaded(false)
    , mLandData(NULL)
-    , mPlugin(0)
 {
 }

--- a/components/files/fixedpath.hpp
+++ b/components/files/fixedpath.hpp
@ -57,8 +57,8 @@ struct FixedPath
        , mGlobalConfigPath(mPath.getGlobalConfigPath())
        , mLocalPath(mPath.getLocalPath())
        , mGlobalDataPath(mPath.getGlobalDataPath())
-        , mInstallPath(mPath.getInstallPath())
        , mCachePath(mPath.getCachePath())
+        , mInstallPath(mPath.getInstallPath())
    {
    }

--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@ -35,7 +35,7 @@ public:

    NIFFile * const file;

-    NIFStream (NIFFile * file, Ogre::DataStreamPtr inp): file (file), inp (inp) {}
+    NIFStream (NIFFile * file, Ogre::DataStreamPtr inp): inp (inp), file (file) {}

    void skip(size_t size) { inp->skip(size); }

--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@ -69,8 +69,8 @@ class ManualBulletShapeLoader : public OEngine::Physic::BulletShapeLoader
 public:
    ManualBulletShapeLoader(bool showMarkers=false)
      : mShape(NULL)
-      , mStaticMesh(NULL)
      , mCompoundShape(NULL)
+      , mStaticMesh(NULL)
      , mBoundingBox(NULL)
      , mShowMarkers(showMarkers)
    {
--- a/components/nifogre/ogrenifloader.hpp
+++ b/components/nifogre/ogrenifloader.hpp
@ -75,7 +75,7 @@ struct ObjectScene {

    std::vector<Ogre::Controller<Ogre::Real> > mControllers;

-    ObjectScene(Ogre::SceneManager* sceneMgr) : mSkelBase(0), mMaxControllerLength(0), mSceneMgr(sceneMgr)
+    ObjectScene(Ogre::SceneManager* sceneMgr) : mSkelBase(0), mSceneMgr(sceneMgr), mMaxControllerLength(0)
    { }

    ~ObjectScene();
--- a/components/terrain/defaultworld.cpp
+++ b/components/terrain/defaultworld.cpp
@ -78,15 +78,15 @@ namespace Terrain
    DefaultWorld::DefaultWorld(Ogre::SceneManager* sceneMgr,
                     Storage* storage, int visibilityFlags, bool shaders, Alignment align, float minBatchSize, float maxBatchSize)
        : World(sceneMgr, storage, visibilityFlags, shaders, align)
+        , mWorkQueueChannel(0)
+        , mVisible(true)
+        , mChunksLoading(0)
+        , mMinX(0)
+        , mMaxX(0)
+        , mMinY(0)
+        , mMaxY(0)
        , mMinBatchSize(minBatchSize)
        , mMaxBatchSize(maxBatchSize)
-        , mVisible(true)
-        , mMaxX(0)
-        , mMinX(0)
-        , mMaxY(0)
-        , mMinY(0)
-        , mChunksLoading(0)
-        , mWorkQueueChannel(0)
        , mLayerLoadPending(true)
    {
 #if TERRAIN_USE_SHADER == 0
--- a/components/terrain/quadtreenode.cpp
+++ b/components/terrain/quadtreenode.cpp
@ -133,6 +133,7 @@ namespace

 QuadTreeNode::QuadTreeNode(DefaultWorld* terrain, ChildDirection dir, float size, const Ogre::Vector2 &center, QuadTreeNode* parent)
    : mMaterialGenerator(NULL)
+    , mLoadState(LS_Unloaded)
    , mIsDummy(false)
    , mSize(size)
    , mLodLevel(Log2(static_cast<int>(mSize)))
@ -142,9 +143,8 @@ QuadTreeNode::QuadTreeNode(DefaultWorld* terrain, ChildDirection dir, float size
    , mCenter(center)
    , mSceneNode(NULL)
    , mParent(parent)
-    , mTerrain(terrain)
    , mChunk(NULL)
-    , mLoadState(LS_Unloaded)
+    , mTerrain(terrain)
 {
    mBounds.setNull();
    for (int i=0; i<4; ++i)
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@ -30,14 +30,14 @@ namespace Terrain

 World::World(Ogre::SceneManager* sceneMgr,
                 Storage* storage, int visibilityFlags, bool shaders, Alignment align)
-    : mStorage(storage)
-    , mSceneMgr(sceneMgr)
-    , mVisibilityFlags(visibilityFlags)
-    , mShaders(shaders)
-    , mAlign(align)
-    , mCache(storage->getCellVertices())
+    : mShaders(shaders)
    , mShadows(false)
    , mSplitShadows(false)
+    , mAlign(align)
+    , mStorage(storage)
+    , mVisibilityFlags(visibilityFlags)
+    , mSceneMgr(sceneMgr)
+    , mCache(storage->getCellVertices())
 {
 }

--- a/components/widgets/list.cpp
+++ b/components/widgets/list.cpp
@ -9,8 +9,8 @@ namespace Gui
 {

    MWList::MWList() :
-        mClient(0)
-        , mScrollView(0)
+        mScrollView(0)
+        ,mClient(0)
        , mItemHeight(0)
    {
    }
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@ -74,13 +74,11 @@ namespace Physic
 {

    PhysicActor::PhysicActor(const std::string &name, const std::string &mesh, PhysicEngine *engine, const Ogre::Vector3 &position, const Ogre::Quaternion &rotation, float scale)
-      : mName(name), mEngine(engine), mMesh(mesh)
-      , mBody(0), mOnGround(false), mInternalCollisionMode(true)
+      : mCanWaterWalk(false), mWalkingOnWater(false)
+      , mBody(0), mScale(scale), mForce(0.0f), mOnGround(false)
+      , mInternalCollisionMode(true)
      , mExternalCollisionMode(true)
-      , mForce(0.0f)
-      , mScale(scale)
-      , mWalkingOnWater(false)
-      , mCanWaterWalk(false)
+      , mMesh(mesh), mName(name), mEngine(engine)
    {
        if (!NifBullet::getBoundingBox(mMesh, mHalfExtents, mMeshTranslation, mMeshOrientation))
        {
@ -239,8 +237,8 @@ namespace Physic


    PhysicEngine::PhysicEngine(BulletShapeLoader* shapeLoader) :
-        mDebugActive(0)
-      , mSceneMgr(NULL)
+        mSceneMgr(NULL)
+      , mDebugActive(0)
    {
        // Set up the collision configuration and dispatcher
        collisionConfiguration = new btDefaultCollisionConfiguration();
--- a/libs/openengine/gui/manager.cpp
+++ b/libs/openengine/gui/manager.cpp
@ -99,8 +99,8 @@ public:
        mManualRender(false),
        mCountBatch(0),
        mVertexProgramNoTexture(NULL),
-        mFragmentProgramNoTexture(NULL),
        mVertexProgramOneTexture(NULL),
+        mFragmentProgramNoTexture(NULL),
        mFragmentProgramOneTexture(NULL)
    {
        mTextureAddressMode.u = Ogre::TextureUnitState::TAM_CLAMP;