diff options
author | Tobias Weimer <wishmaster51@googlemail.com> | 2014-11-28 21:19:14 +0000 |
---|---|---|
committer | Tobias Weimer <wishmaster51@googlemail.com> | 2014-11-28 21:19:14 +0000 |
commit | 6895d635acb37ba42e53ba95ca3eee2ddbbef24d (patch) | |
tree | f85a1d97784c4597099864119acb027b9a3f2dba /plugins/HistoryStats/src | |
parent | 8ef06acf351fdb6034b6e13670d84bfd79161956 (diff) |
Massive code cleanup and fixes for a lot of warnings reported in #837
git-svn-id: http://svn.miranda-ng.org/main/trunk@11136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/HistoryStats/src')
-rw-r--r-- | plugins/HistoryStats/src/bandctrlimpl.cpp | 2 | ||||
-rw-r--r-- | plugins/HistoryStats/src/dlgfilterwords.cpp | 2 | ||||
-rw-r--r-- | plugins/HistoryStats/src/dlgoption_subcolumns.cpp | 4 | ||||
-rw-r--r-- | plugins/HistoryStats/src/dlgoption_subglobal.cpp | 2 | ||||
-rw-r--r-- | plugins/HistoryStats/src/dlgoption_subinput.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/plugins/HistoryStats/src/bandctrlimpl.cpp b/plugins/HistoryStats/src/bandctrlimpl.cpp index b68dadee1d..feeabb2eb1 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.cpp +++ b/plugins/HistoryStats/src/bandctrlimpl.cpp @@ -124,7 +124,7 @@ LRESULT CALLBACK BandCtrlImpl::staticWndProc(HWND hWnd, UINT msg, WPARAM wParam, case BCM_SETBUTTONDATA:
assert(wParam >= 1 && wParam <= pCtrl->m_Items.size());
- pCtrl->m_Items[wParam - 1].dwData = static_cast<DWORD>(lParam);
+ pCtrl->m_Items[wParam - 1].dwData = static_cast<INT_PTR>(lParam);
return 0;
case BCM_ISBUTTONVISIBLE:
diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp index cb5a0ff30d..be60d0bbf2 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.cpp +++ b/plugins/HistoryStats/src/dlgfilterwords.cpp @@ -102,7 +102,7 @@ void DlgFilterWords::onWMInitDialog() {
const Filter* pFilter = *i;
- HANDLE hCheck = m_Sets.insertCheck(NULL, pFilter->getName().c_str(), 0, reinterpret_cast<DWORD>(pFilter));
+ HANDLE hCheck = m_Sets.insertCheck(NULL, pFilter->getName().c_str(), 0, reinterpret_cast<INT_PTR>(pFilter));
if (m_bColProvided && m_ColFilters.find(pFilter->getID()) != m_ColFilters.end())
m_Sets.checkItem(hCheck, true);
diff --git a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp index 24cff27083..a11e1e0f52 100644 --- a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp +++ b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp @@ -238,7 +238,7 @@ void DlgOption::SubColumns::loadSettings() {
Column* pCol = localS.getCol(j);
ext::string colTitle = pCol->getTitleForOptions();
- OptionsCtrl::Check hColCheck = m_Columns.insertCheck(NULL, colTitle.c_str(), 0, reinterpret_cast<DWORD>(pCol));
+ OptionsCtrl::Check hColCheck = m_Columns.insertCheck(NULL, colTitle.c_str(), 0, reinterpret_cast<INT_PTR>(pCol));
m_Columns.checkItem(hColCheck, pCol->isEnabled());
@@ -332,7 +332,7 @@ void DlgOption::SubColumns::addCol(int nCol) getParent()->getLocalSettings().addCol(pCol);
- OptionsCtrl::Check hColCheck = m_Columns.insertCheck(NULL, pCol->getTitle(), 0, reinterpret_cast<DWORD>(pCol));
+ OptionsCtrl::Check hColCheck = m_Columns.insertCheck(NULL, pCol->getTitle(), 0, reinterpret_cast<INT_PTR>(pCol));
m_Columns.checkItem(hColCheck, pCol->isEnabled());
diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index b89a9e1e0f..6ea0d7944c 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -249,7 +249,7 @@ void DlgOption::SubGlobal::onWMInitDialog() m_hProtocols,
Protocol::getDisplayName(protoList[i]->szModuleName).c_str(),
0,
- reinterpret_cast<DWORD>(protoList[i]->szModuleName)));
+ reinterpret_cast<INT_PTR>(protoList[i]->szModuleName)));
}
}
diff --git a/plugins/HistoryStats/src/dlgoption_subinput.cpp b/plugins/HistoryStats/src/dlgoption_subinput.cpp index 7d61c56b63..d499f8d6de 100644 --- a/plugins/HistoryStats/src/dlgoption_subinput.cpp +++ b/plugins/HistoryStats/src/dlgoption_subinput.cpp @@ -111,7 +111,7 @@ void DlgOption::SubInput::onWMInitDialog() m_hProtocols,
Protocol::getDisplayName(protoList[i]->szModuleName).c_str(),
0,
- reinterpret_cast<DWORD>(protoList[i]->szModuleName)));
+ reinterpret_cast<INT_PTR>(protoList[i]->szModuleName)));
}
}
|