tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 23:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code improvement

Browse Source 
Closes #3582
This commit is contained in:
SinghRajenM 2017-08-01 22:32:01 +05:30 committed by Don HO
parent fbbe9344d9
commit 295cbafe7d
7 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/installer/nsisInclude/autoCompletion.nsh
View File

@ -209,10 +209,6 @@ SectionGroup un.autoCompletionComponent
Delete "$INSTDIR\plugins\APIs\nsis.xml" Delete "$INSTDIR\plugins\APIs\nsis.xml"
SectionEnd SectionEnd
Section un.AWK
Delete "$INSTDIR\plugins\APIs\awk.xml"
SectionEnd
Section un.CMAKE Section un.CMAKE
Delete "$INSTDIR\plugins\APIs\cmake.xml" Delete "$INSTDIR\plugins\APIs\cmake.xml"
SectionEnd SectionEnd

9
PowerEditor/src/MISC/Common/Common.h
View File

@ -115,6 +115,11 @@ protected:
WcharMbcsConvertor() {} WcharMbcsConvertor() {}
~WcharMbcsConvertor() {} ~WcharMbcsConvertor() {}
// Since there's no public ctor, we need to void the default assignment operator and copy ctor.
// Since these are marked as deleted does not matter under which access specifier are kept
WcharMbcsConvertor(const WcharMbcsConvertor&) = delete;
WcharMbcsConvertor& operator= (const WcharMbcsConvertor&) = delete;
static WcharMbcsConvertor* _pSelf; static WcharMbcsConvertor* _pSelf;
template <class T> template <class T>
@ -154,10 +159,6 @@ protected:
StringBuffer<char> _multiByteStr; StringBuffer<char> _multiByteStr;
StringBuffer<wchar_t> _wideCharStr; StringBuffer<wchar_t> _wideCharStr;
private:
// Since there's no public ctor, we need to void the default assignment operator.
WcharMbcsConvertor& operator= (const WcharMbcsConvertor&);
}; };

2
PowerEditor/src/Parameters.h
View File

@ -874,7 +874,7 @@ struct ScintillaViewParams
int _zoom = 0; int _zoom = 0;
int _zoom2 = 0; int _zoom2 = 0;
bool _whiteSpaceShow = false; bool _whiteSpaceShow = false;
bool _eolShow; bool _eolShow = false;
int _borderWidth = 2; int _borderWidth = 2;
bool _scrollBeyondLastLine = false; bool _scrollBeyondLastLine = false;
bool _disableAdvancedScrolling = false; bool _disableAdvancedScrolling = false;

2
PowerEditor/src/ScitillaComponent/AutoCompletion.h
View File

@ -56,8 +56,6 @@ private:
class AutoCompletion { class AutoCompletion {
public: public:
enum ActiveCompletion {CompletionNone = 0, CompletionAuto, CompletionWord, CompletionFunc, CompletionPath};
explicit AutoCompletion(ScintillaEditView * pEditView): _pEditView(pEditView), _funcCalltip(pEditView) { explicit AutoCompletion(ScintillaEditView * pEditView): _pEditView(pEditView), _funcCalltip(pEditView) {
//Do not load any language yet //Do not load any language yet
_insertedMatchedChars.init(_pEditView); _insertedMatchedChars.init(_pEditView);

28
PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
View File

@ -212,7 +212,7 @@ tTbData* DockingCont::findToolbarByName(TCHAR* pszName)
void DockingCont::setActiveTb(tTbData* pTbData) void DockingCont::setActiveTb(tTbData* pTbData)
{ {
int iItem = SearchPosInTab(pTbData); int iItem = searchPosInTab(pTbData);
setActiveTb(iItem); setActiveTb(iItem);
} }
@ -221,7 +221,7 @@ void DockingCont::setActiveTb(int iItem)
//if ((iItem != -1) && (iItem < ::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0))) //if ((iItem != -1) && (iItem < ::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0)))
if (iItem < ::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0)) if (iItem < ::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0))
{ {
SelectTab(iItem); selectTab(iItem);
} }
} }
@ -658,7 +658,7 @@ LRESULT DockingCont::runProcTab(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l
info.pt.y = HIWORD(lParam); info.pt.y = HIWORD(lParam);
iItem = static_cast<int32_t>(::SendMessage(hwnd, TCM_HITTEST, 0, reinterpret_cast<LPARAM>(&info))); iItem = static_cast<int32_t>(::SendMessage(hwnd, TCM_HITTEST, 0, reinterpret_cast<LPARAM>(&info)));
SelectTab(iItem); selectTab(iItem);
_beginDrag = FALSE; _beginDrag = FALSE;
return TRUE; return TRUE;
} }
@ -678,7 +678,7 @@ LRESULT DockingCont::runProcTab(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l
info.pt.y = HIWORD(lParam); info.pt.y = HIWORD(lParam);
iItem = static_cast<int32_t>(::SendMessage(hwnd, TCM_HITTEST, 0, reinterpret_cast<LPARAM>(&info))); iItem = static_cast<int32_t>(::SendMessage(hwnd, TCM_HITTEST, 0, reinterpret_cast<LPARAM>(&info)));
SelectTab(iItem); selectTab(iItem);
// get data and hide toolbar // get data and hide toolbar
tcItem.mask = TCIF_PARAM; tcItem.mask = TCIF_PARAM;
@ -707,7 +707,7 @@ LRESULT DockingCont::runProcTab(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l
if ((_beginDrag == TRUE) && (wParam == MK_LBUTTON)) if ((_beginDrag == TRUE) && (wParam == MK_LBUTTON))
{ {
SelectTab(iItem); selectTab(iItem);
// send moving message to parent window // send moving message to parent window
_dragFromTab = TRUE; _dragFromTab = TRUE;
@ -811,7 +811,7 @@ LRESULT DockingCont::runProcTab(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l
info.pt.y = HIWORD(lParam); info.pt.y = HIWORD(lParam);
iItem = static_cast<int32_t>(::SendMessage(hwnd, TCM_HITTEST, 0, reinterpret_cast<LPARAM>(&info))); iItem = static_cast<int32_t>(::SendMessage(hwnd, TCM_HITTEST, 0, reinterpret_cast<LPARAM>(&info)));
SelectTab(iItem); selectTab(iItem);
} }
break; break;
} }
@ -1146,7 +1146,7 @@ void DockingCont::doClose()
TCITEM tcItem = {0}; TCITEM tcItem = {0};
// get item data // get item data
SelectTab(iItemOff); selectTab(iItemOff);
tcItem.mask = TCIF_PARAM; tcItem.mask = TCIF_PARAM;
::SendMessage(_hContTab, TCM_GETITEM, iItemOff, reinterpret_cast<LPARAM>(&tcItem)); ::SendMessage(_hContTab, TCM_GETITEM, iItemOff, reinterpret_cast<LPARAM>(&tcItem));
if (!tcItem.lParam) if (!tcItem.lParam)
@ -1186,7 +1186,7 @@ void DockingCont::showToolbar(tTbData* pTbData, BOOL state)
int DockingCont::hideToolbar(tTbData *pTbData, BOOL hideClient) int DockingCont::hideToolbar(tTbData *pTbData, BOOL hideClient)
{ {
int iItem = SearchPosInTab(pTbData); int iItem = searchPosInTab(pTbData);
// delete item // delete item
if (TRUE == ::SendMessage(_hContTab, TCM_DELETEITEM, iItem, 0)) if (TRUE == ::SendMessage(_hContTab, TCM_DELETEITEM, iItem, 0))
@ -1206,7 +1206,7 @@ int DockingCont::hideToolbar(tTbData *pTbData, BOOL hideClient)
// activate new selected item and view plugin dialog // activate new selected item and view plugin dialog
_prevItem = iItem; _prevItem = iItem;
SelectTab(iItem); selectTab(iItem);
// hide tabs if only one element // hide tabs if only one element
if (iItemCnt == 1) if (iItemCnt == 1)
@ -1256,7 +1256,7 @@ void DockingCont::viewToolbar(tTbData *pTbData)
} }
// create new tab if it not exists // create new tab if it not exists
int iTabPos = SearchPosInTab(pTbData); int iTabPos = searchPosInTab(pTbData);
tcItem.mask = TCIF_PARAM; tcItem.mask = TCIF_PARAM;
tcItem.lParam = reinterpret_cast<LPARAM>(pTbData); tcItem.lParam = reinterpret_cast<LPARAM>(pTbData);
@ -1264,13 +1264,13 @@ void DockingCont::viewToolbar(tTbData *pTbData)
{ {
// set only params and text even if icon available // set only params and text even if icon available
::SendMessage(_hContTab, TCM_INSERTITEM, iItemCnt, reinterpret_cast<LPARAM>(&tcItem)); ::SendMessage(_hContTab, TCM_INSERTITEM, iItemCnt, reinterpret_cast<LPARAM>(&tcItem));
SelectTab(iItemCnt); selectTab(iItemCnt);
} }
// if exists select it and update data // if exists select it and update data
else else
{ {
::SendMessage(_hContTab, TCM_SETITEM, iTabPos, reinterpret_cast<LPARAM>(&tcItem)); ::SendMessage(_hContTab, TCM_SETITEM, iTabPos, reinterpret_cast<LPARAM>(&tcItem));
SelectTab(iTabPos); selectTab(iTabPos);
} }
// show dialog and notify parent to update dialog view // show dialog and notify parent to update dialog view
@ -1284,7 +1284,7 @@ void DockingCont::viewToolbar(tTbData *pTbData)
onSize(); onSize();
} }
int DockingCont::SearchPosInTab(tTbData* pTbData) int DockingCont::searchPosInTab(tTbData* pTbData)
{ {
TCITEM tcItem = {0}; TCITEM tcItem = {0};
int iItemCnt = static_cast<int32_t>(::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0)); int iItemCnt = static_cast<int32_t>(::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0));
@ -1303,7 +1303,7 @@ int DockingCont::SearchPosInTab(tTbData* pTbData)
return -1; return -1;
} }
void DockingCont::SelectTab(int iTab) void DockingCont::selectTab(int iTab)
{ {
if (iTab != -1) if (iTab != -1)
{ {

14
PowerEditor/src/WinControls/DockingWnd/DockingCont.h
View File

@ -90,8 +90,8 @@ public:
}; };
void setActiveTb(tTbData* pTbData); void setActiveTb(tTbData* pTbData);
void setActiveTb(INT iItem); void setActiveTb(int iItem);
INT getActiveTb(); int getActiveTb();
tTbData * getDataOfActiveTb(); tTbData * getDataOfActiveTb();
std::vector<tTbData *> getDataOfAllTb() { std::vector<tTbData *> getDataOfAllTb() {
return _vTbData; return _vTbData;
@ -163,18 +163,18 @@ protected :
void onSize(); void onSize();
// functions for caption handling and drawing // functions for caption handling and drawing
eMousePos isInRect(HWND hwnd, INT x, INT y); eMousePos isInRect(HWND hwnd, int x, int y);
// handling of toolbars // handling of toolbars
void doClose(); void doClose();
// return new item // return new item
INT SearchPosInTab(tTbData* pTbData); int searchPosInTab(tTbData* pTbData);
void SelectTab(INT iTab); void selectTab(int iTab);
INT hideToolbar(tTbData* pTbData, BOOL hideClient = TRUE); int hideToolbar(tTbData* pTbData, BOOL hideClient = TRUE);
void viewToolbar(tTbData *pTbData); void viewToolbar(tTbData *pTbData);
INT removeTab(tTbData* pTbData) { int removeTab(tTbData* pTbData) {
return hideToolbar(pTbData, FALSE); return hideToolbar(pTbData, FALSE);
}; };

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

@ -186,7 +186,6 @@ protected:
BrowserNodeType getNodeType(HTREEITEM hItem); BrowserNodeType getNodeType(HTREEITEM hItem);
void popupMenuCmd(int cmdID); void popupMenuCmd(int cmdID);
POINT getMenuDisplayPoint(int iButton);
virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
void notified(LPNMHDR notification); void notified(LPNMHDR notification);
void showContextMenu(int x, int y); void showContextMenu(int x, int y);