diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h index d39798df6..ba795763c 100644 --- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h +++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h @@ -30,7 +30,7 @@ struct PluginCommand generic_string _pluginName; int _funcID = 0; PFUNCPLUGINCMD _pFunc = nullptr; - PluginCommand(const TCHAR *pluginName, int funcID, PFUNCPLUGINCMD pFunc): _funcID(funcID), _pFunc(pFunc), _pluginName(pluginName){}; + PluginCommand(const TCHAR *pluginName, int funcID, PFUNCPLUGINCMD pFunc): _pluginName(pluginName), _funcID(funcID), _pFunc(pFunc) {}; }; struct PluginInfo diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index 82f14df46..0a83aba76 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -185,7 +185,7 @@ public: struct sessionFileInfo : public Position { sessionFileInfo(const TCHAR *fn, const TCHAR *ln, int encoding, bool userReadOnly, const Position& pos, const TCHAR *backupFilePath, FILETIME originalFileLastModifTimestamp, const MapPosition & mapPos) : - _isUserReadOnly(userReadOnly), _encoding(encoding), Position(pos), _originalFileLastModifTimestamp(originalFileLastModifTimestamp), _mapPos(mapPos) + Position(pos), _encoding(encoding), _isUserReadOnly(userReadOnly), _originalFileLastModifTimestamp(originalFileLastModifTimestamp), _mapPos(mapPos) { if (fn) _fileName = fn; if (ln) _langName = ln; @@ -332,7 +332,7 @@ struct PluginDlgDockingInfo final bool _isVisible = false; PluginDlgDockingInfo(const TCHAR* pluginName, int id, int curr, int prev, bool isVis) - : _internalID(id), _currContainer(curr), _prevContainer(prev), _isVisible(isVis), _name(pluginName) + : _name(pluginName), _internalID(id), _currContainer(curr), _prevContainer(prev), _isVisible(isVis) {} bool operator == (const PluginDlgDockingInfo& rhs) const @@ -1082,8 +1082,8 @@ private: StyleArray _styles; generic_string _name; generic_string _ext; - generic_string _udlVersion; bool _isDarkModeTheme = false; + generic_string _udlVersion; TCHAR _keywordLists[SCE_USER_KWLIST_TOTAL][max_char]; bool _isPrefix[SCE_USER_TOTAL_KEYWORD_GROUPS] = {false}; diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.h b/PowerEditor/src/ScintillaComponent/ScintillaEditView.h index 15821f7a7..d2602d08f 100644 --- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.h +++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.h @@ -138,8 +138,8 @@ struct ColumnModeInfo { intptr_t _selRpos = 0; intptr_t _order = -1; // 0 based index bool _direction = L2R; // L2R or R2L - intptr_t _nbVirtualCaretSpc = 0; intptr_t _nbVirtualAnchorSpc = 0; + intptr_t _nbVirtualCaretSpc = 0; ColumnModeInfo(intptr_t lPos, intptr_t rPos, intptr_t order, bool dir = L2R, intptr_t vAnchorNbSpc = 0, intptr_t vCaretNbSpc = 0) : _selLpos(lPos), _selRpos(rPos), _order(order), _direction(dir), _nbVirtualAnchorSpc(vAnchorNbSpc), _nbVirtualCaretSpc(vCaretNbSpc){}; diff --git a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h index 9317f7346..65cdebbca 100644 --- a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h +++ b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h @@ -52,8 +52,8 @@ public: void setName(generic_string name) { _name = name; }; private: - FolderInfo *_parent = nullptr; generic_string _name; + FolderInfo *_parent = nullptr; }; @@ -79,8 +79,8 @@ public: private: std::vector _subFolders; std::vector _files; - FolderInfo* _parent = nullptr; generic_string _name; + FolderInfo* _parent = nullptr; generic_string _rootPath; // set only for root folder; empty for normal folder }; diff --git a/PowerEditor/src/WinControls/Grid/ShortcutMapper.h b/PowerEditor/src/WinControls/Grid/ShortcutMapper.h index 0a266f574..a96f02907 100644 --- a/PowerEditor/src/WinControls/Grid/ShortcutMapper.h +++ b/PowerEditor/src/WinControls/Grid/ShortcutMapper.h @@ -26,7 +26,7 @@ enum GridState {STATE_MENU, STATE_MACRO, STATE_USER, STATE_PLUGIN, STATE_SCINTIL class ShortcutMapper : public StaticDialog { public: - ShortcutMapper() : _currentState(STATE_MENU), StaticDialog() { + ShortcutMapper() : StaticDialog(), _currentState(STATE_MENU) { _shortcutFilter = TEXT(""); _dialogInitDone = false; }; diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.h b/PowerEditor/src/WinControls/shortcut/shortcut.h index 070c726d0..203927650 100644 --- a/PowerEditor/src/WinControls/shortcut/shortcut.h +++ b/PowerEditor/src/WinControls/shortcut/shortcut.h @@ -198,7 +198,7 @@ private : class ScintillaKeyMap : public Shortcut { public: - ScintillaKeyMap(const Shortcut& sc, unsigned long scintillaKeyID, unsigned long id): Shortcut(sc), _menuCmdID(id), _scintillaKeyID(scintillaKeyID) { + ScintillaKeyMap(const Shortcut& sc, unsigned long scintillaKeyID, unsigned long id): Shortcut(sc), _scintillaKeyID(scintillaKeyID), _menuCmdID(id) { _keyCombos.clear(); _keyCombos.push_back(_keyCombo); _keyCombo._key = 0;