github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix gcc reorder warnings 

Fix #12132, close #12133
pull/12140/head
ozone10 2022-09-08 19:02:10 +02:00 committed by Don Ho
parent 82055985f3
commit 233c697183
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/MISC/PluginsManager/PluginsManager.h
View File

@ -30,7 +30,7 @@ struct PluginCommand
generic_string _pluginName; generic_string _pluginName;
int _funcID = 0; int _funcID = 0;
PFUNCPLUGINCMD _pFunc = nullptr; 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 struct PluginInfo

6
PowerEditor/src/Parameters.h
View File

@ -185,7 +185,7 @@ public:
struct sessionFileInfo : public Position 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) : 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 (fn) _fileName = fn;
if (ln) _langName = ln; if (ln) _langName = ln;
@ -332,7 +332,7 @@ struct PluginDlgDockingInfo final
bool _isVisible = false; bool _isVisible = false;
PluginDlgDockingInfo(const TCHAR* pluginName, int id, int curr, int prev, bool isVis) 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 bool operator == (const PluginDlgDockingInfo& rhs) const
@ -1082,8 +1082,8 @@ private:
StyleArray _styles; StyleArray _styles;
generic_string _name; generic_string _name;
generic_string _ext; generic_string _ext;
generic_string _udlVersion;
bool _isDarkModeTheme = false; bool _isDarkModeTheme = false;
generic_string _udlVersion;
TCHAR _keywordLists[SCE_USER_KWLIST_TOTAL][max_char]; TCHAR _keywordLists[SCE_USER_KWLIST_TOTAL][max_char];
bool _isPrefix[SCE_USER_TOTAL_KEYWORD_GROUPS] = {false}; bool _isPrefix[SCE_USER_TOTAL_KEYWORD_GROUPS] = {false};

2
PowerEditor/src/ScintillaComponent/ScintillaEditView.h
View File

@ -138,8 +138,8 @@ struct ColumnModeInfo {
intptr_t _selRpos = 0; intptr_t _selRpos = 0;
intptr_t _order = -1; // 0 based index intptr_t _order = -1; // 0 based index
bool _direction = L2R; // L2R or R2L bool _direction = L2R; // L2R or R2L
intptr_t _nbVirtualCaretSpc = 0;
intptr_t _nbVirtualAnchorSpc = 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) 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){}; : _selLpos(lPos), _selRpos(rPos), _order(order), _direction(dir), _nbVirtualAnchorSpc(vAnchorNbSpc), _nbVirtualCaretSpc(vCaretNbSpc){};

4
PowerEditor/src/WinControls/FileBrowser/fileBrowser.h
View File

@ -52,8 +52,8 @@ public:
void setName(generic_string name) { _name = name; }; void setName(generic_string name) { _name = name; };
private: private:
FolderInfo *_parent = nullptr;
generic_string _name; generic_string _name;
FolderInfo *_parent = nullptr;
}; };
@ -79,8 +79,8 @@ public:
private: private:
std::vector<FolderInfo> _subFolders; std::vector<FolderInfo> _subFolders;
std::vector<FileInfo> _files; std::vector<FileInfo> _files;
FolderInfo* _parent = nullptr;
generic_string _name; generic_string _name;
FolderInfo* _parent = nullptr;
generic_string _rootPath; // set only for root folder; empty for normal folder generic_string _rootPath; // set only for root folder; empty for normal folder
}; };

2
PowerEditor/src/WinControls/Grid/ShortcutMapper.h
View File

@ -26,7 +26,7 @@ enum GridState {STATE_MENU, STATE_MACRO, STATE_USER, STATE_PLUGIN, STATE_SCINTIL
class ShortcutMapper : public StaticDialog { class ShortcutMapper : public StaticDialog {
public: public:
ShortcutMapper() : _currentState(STATE_MENU), StaticDialog() { ShortcutMapper() : StaticDialog(), _currentState(STATE_MENU) {
_shortcutFilter = TEXT(""); _shortcutFilter = TEXT("");
_dialogInitDone = false; _dialogInitDone = false;
}; };

2
PowerEditor/src/WinControls/shortcut/shortcut.h
View File

@ -198,7 +198,7 @@ private :
class ScintillaKeyMap : public Shortcut { class ScintillaKeyMap : public Shortcut {
public: 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.clear();
_keyCombos.push_back(_keyCombo); _keyCombos.push_back(_keyCombo);
_keyCombo._key = 0; _keyCombo._key = 0;