From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/bandctrlimpl.cpp | 4 ++-- plugins/HistoryStats/src/canvas.cpp | 2 +- plugins/HistoryStats/src/column.h | 2 +- plugins/HistoryStats/src/column_chatduration.cpp | 4 ++-- plugins/HistoryStats/src/column_events.cpp | 4 ++-- plugins/HistoryStats/src/column_inout.cpp | 10 +++++----- plugins/HistoryStats/src/column_inoutgraph.cpp | 8 ++++---- plugins/HistoryStats/src/column_split.cpp | 12 ++++++------ plugins/HistoryStats/src/column_splittimeline.cpp | 10 +++++----- plugins/HistoryStats/src/column_timeline.cpp | 4 ++-- plugins/HistoryStats/src/column_wordcount.cpp | 6 +++--- plugins/HistoryStats/src/column_words.cpp | 6 +++--- plugins/HistoryStats/src/dlgfilterwords.cpp | 4 ++-- plugins/HistoryStats/src/dlgoption_subcolumns.cpp | 14 +++++++------- plugins/HistoryStats/src/dlgoption_subglobal.cpp | 8 ++++---- plugins/HistoryStats/src/dlgoption_suboutput.cpp | 6 +++--- plugins/HistoryStats/src/iconlib.cpp | 4 ++-- plugins/HistoryStats/src/mirandasettings.cpp | 4 ++-- plugins/HistoryStats/src/mu_common.cpp | 12 ++++++------ plugins/HistoryStats/src/statistic.cpp | 2 +- plugins/HistoryStats/src/utils.cpp | 12 ++++++------ 21 files changed, 69 insertions(+), 69 deletions(-) (limited to 'plugins/HistoryStats/src') diff --git a/plugins/HistoryStats/src/bandctrlimpl.cpp b/plugins/HistoryStats/src/bandctrlimpl.cpp index d3ed8a4f65..0bd72c9e5a 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.cpp +++ b/plugins/HistoryStats/src/bandctrlimpl.cpp @@ -461,8 +461,8 @@ int BandCtrlImpl::onBCMAddButton(BCBUTTON *pButton) id.bChecked = bool_(pButton->dwFlags & BCF_CHECKED); id.bVisible = !(pButton->dwFlags & BCF_HIDDEN); id.bDropDown = bool_(pButton->dwFlags & BCF_DROPDOWN); - id.text = (pButton->dwFlags & BCF_TEXT) ? TranslateTS(pButton->m_szText) : L""; - id.tooltip = (pButton->dwFlags & BCF_TOOLTIP) ? TranslateTS(pButton->m_szTooltip) : L""; + id.text = (pButton->dwFlags & BCF_TEXT) ? TranslateW(pButton->m_szText) : L""; + id.tooltip = (pButton->dwFlags & BCF_TOOLTIP) ? TranslateW(pButton->m_szTooltip) : L""; id.uTTId = -1; id.dwData = (pButton->dwFlags & BCF_DATA) ? pButton->dwData : 0; id.bEnabled = !(pButton->dwFlags & BCF_DISABLED); diff --git a/plugins/HistoryStats/src/canvas.cpp b/plugins/HistoryStats/src/canvas.cpp index 118534209d..945b22351b 100644 --- a/plugins/HistoryStats/src/canvas.cpp +++ b/plugins/HistoryStats/src/canvas.cpp @@ -139,5 +139,5 @@ bool Canvas::writePNG(const wchar_t* szFileName) img.hbm = m_hBmp; img.fif = FIF_PNG; img.tszName = (wchar_t*)szFileName; - return CallService(MS_IMG_SAVE, (WPARAM)&img, IMGL_TCHAR) == 0; + return CallService(MS_IMG_SAVE, (WPARAM)&img, IMGL_WCHAR) == 0; } diff --git a/plugins/HistoryStats/src/column.h b/plugins/HistoryStats/src/column.h index bb03bc1291..acd99f933e 100644 --- a/plugins/HistoryStats/src/column.h +++ b/plugins/HistoryStats/src/column.h @@ -155,7 +155,7 @@ public: void setCustomTitle(const ext::string& customTitle) { m_CustomTitle = customTitle; } const ext::string getCustomTitle() const { return m_CustomTitle; } const ext::string getCustomTitle(const ext::string& strShort, const ext::string& strLong) const; - ext::string getTitleForOptions() { return m_CustomTitle.empty() ? TranslateTS(getTitle()) : (m_CustomTitle + L" (" + TranslateTS(getTitle()) + L")"); } + ext::string getTitleForOptions() { return m_CustomTitle.empty() ? TranslateW(getTitle()) : (m_CustomTitle + L" (" + TranslateW(getTitle()) + L")"); } void setHelpers(Statistic* pStatistic, Settings* pSettings, Settings::CharMapper* pCharMapper) { m_pStatistic = pStatistic; m_pSettings = pSettings; m_pCharMapper = pCharMapper; } Statistic* getStatistic() const { return m_pStatistic; } diff --git a/plugins/HistoryStats/src/column_chatduration.cpp b/plugins/HistoryStats/src/column_chatduration.cpp index 762e750d1b..96af1bc4aa 100644 --- a/plugins/HistoryStats/src/column_chatduration.cpp +++ b/plugins/HistoryStats/src/column_chatduration.cpp @@ -88,7 +88,7 @@ void ColChatDuration::impl_outputRenderHeader(ext::ostream& tos, int row, int ro if (row == 1) { - ext::string szLong = TranslateTS(szVisModeDesc[m_nVisMode]); + ext::string szLong = TranslateW(szVisModeDesc[m_nVisMode]); writeRowspanTD(tos, getCustomTitle(TranslateT("Chat duration"), szLong) + (m_bGraph ? L"
" : L""), row, 1, rowSpan); } } @@ -176,7 +176,7 @@ void ColChatDuration::impl_outputRenderRow(ext::ostream& tos, const Contact& con { if (i != m_nVisMode) { - strTooltip += ext::str(ext::kformat(TranslateTS(szPrefixes[i])) % L"#{amount}" * strAll[i]); + strTooltip += ext::str(ext::kformat(TranslateW(szPrefixes[i])) % L"#{amount}" * strAll[i]); ++nSegments; if (nSegments < 3) diff --git a/plugins/HistoryStats/src/column_events.cpp b/plugins/HistoryStats/src/column_events.cpp index 1ecea2f2d5..bdee38136a 100644 --- a/plugins/HistoryStats/src/column_events.cpp +++ b/plugins/HistoryStats/src/column_events.cpp @@ -42,7 +42,7 @@ void ColEvents::impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup) array_each_(i, sourceTexts) { - Opt.addComboItem(m_hSource, TranslateTS(sourceTexts[i])); + Opt.addComboItem(m_hSource, TranslateW(sourceTexts[i])); } Opt.setComboSelected(m_hSource, m_nSource); @@ -71,7 +71,7 @@ void ColEvents::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) if (row == 1) { - writeRowspanTD(tos, getCustomTitle(TranslateTS(szShortDesc[m_nSource / 3]), TranslateTS(szSourceDesc[m_nSource])), row, 1, rowSpan); + writeRowspanTD(tos, getCustomTitle(TranslateW(szShortDesc[m_nSource / 3]), TranslateW(szSourceDesc[m_nSource])), row, 1, rowSpan); } } diff --git a/plugins/HistoryStats/src/column_inout.cpp b/plugins/HistoryStats/src/column_inout.cpp index 67a8d7d35f..d305783e91 100644 --- a/plugins/HistoryStats/src/column_inout.cpp +++ b/plugins/HistoryStats/src/column_inout.cpp @@ -60,7 +60,7 @@ void ColInOut::impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup) array_each_(i, sourceTexts) { - Opt.addComboItem(m_hSource, TranslateTS(sourceTexts[i])); + Opt.addComboItem(m_hSource, TranslateW(sourceTexts[i])); } Opt.setComboSelected(m_hSource , m_nSource ); @@ -107,16 +107,16 @@ void ColInOut::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) if (m_bAbsolute) { - strTitle = TranslateTS(szSourceDesc[m_nSource]); + strTitle = TranslateW(szSourceDesc[m_nSource]); } else { strTitle = str(ext::kformat(TranslateT("#{data} per #{unit}")) - % L"#{data}" * TranslateTS(szSourceDesc[m_nSource]) - % L"#{unit}" * TranslateTS(szUnitDesc[m_nAbsTime])); + % L"#{data}" * TranslateW(szSourceDesc[m_nSource]) + % L"#{unit}" * TranslateW(szUnitDesc[m_nAbsTime])); } - writeRowspanTD(tos, getCustomTitle(TranslateTS(szShortDesc[m_nSource / 3]), strTitle), row, 1, rowSpan); + writeRowspanTD(tos, getCustomTitle(TranslateW(szShortDesc[m_nSource / 3]), strTitle), row, 1, rowSpan); } } diff --git a/plugins/HistoryStats/src/column_inoutgraph.cpp b/plugins/HistoryStats/src/column_inoutgraph.cpp index 288080c6fa..e448e40b73 100644 --- a/plugins/HistoryStats/src/column_inoutgraph.cpp +++ b/plugins/HistoryStats/src/column_inoutgraph.cpp @@ -150,16 +150,16 @@ void ColInOutGraph::impl_outputRenderHeader(ext::ostream& tos, int row, int rowS if (m_bAbsolute) { - strTitle = TranslateTS(szSourceDesc[m_nSource]); + strTitle = TranslateW(szSourceDesc[m_nSource]); } else { strTitle = str(ext::kformat(TranslateT("#{data} per #{unit}")) - % L"#{data}" * TranslateTS(szSourceDesc[m_nSource]) - % L"#{unit}" * TranslateTS(szSourceUnit[m_nAbsTime])); + % L"#{data}" * TranslateW(szSourceDesc[m_nSource]) + % L"#{unit}" * TranslateW(szSourceUnit[m_nAbsTime])); } - writeRowspanTD(tos, getCustomTitle(TranslateTS(szSourceDesc[m_nSource]), strTitle) + L"
", 1, 2, rowSpan, 2); + writeRowspanTD(tos, getCustomTitle(TranslateW(szSourceDesc[m_nSource]), strTitle) + L"
", 1, 2, rowSpan, 2); } else if (row == 2) { diff --git a/plugins/HistoryStats/src/column_split.cpp b/plugins/HistoryStats/src/column_split.cpp index c0b2ce3990..512875a3c0 100644 --- a/plugins/HistoryStats/src/column_split.cpp +++ b/plugins/HistoryStats/src/column_split.cpp @@ -87,7 +87,7 @@ void ColSplit::impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup) array_each_(i, sourceTexts) { - Opt.addComboItem(m_hSource, TranslateTS(sourceTexts[i])); + Opt.addComboItem(m_hSource, TranslateW(sourceTexts[i])); } static const wchar_t* unitTexts[] = { @@ -98,7 +98,7 @@ void ColSplit::impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup) array_each_(i, unitTexts) { - Opt.addComboItem(m_hBlockUnit, TranslateTS(unitTexts[i])); + Opt.addComboItem(m_hBlockUnit, TranslateW(unitTexts[i])); } Opt.setComboSelected(m_hSource , 3 * m_nSource + m_nSourceType); @@ -285,10 +285,10 @@ void ColSplit::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) { SplitParams params = getParams(); ext::string strTitle = str(ext::kformat(TranslateT("#{type} for #{data}")) - % L"#{type}" * TranslateTS(szTypeDesc[params.effective_vis_mode]) - % L"#{data}" * TranslateTS(szSourceDesc[3 * m_nSource + m_nSourceType])); + % L"#{type}" * TranslateW(szTypeDesc[params.effective_vis_mode]) + % L"#{data}" * TranslateW(szSourceDesc[3 * m_nSource + m_nSourceType])); - writeRowspanTD(tos, getCustomTitle(TranslateTS(szTypeDesc[params.effective_vis_mode]), strTitle) + ext::str(ext::format(L"
") % (5 * params.blocks_in_column - 1)), row, 1, rowSpan); + writeRowspanTD(tos, getCustomTitle(TranslateW(szTypeDesc[params.effective_vis_mode]), strTitle) + ext::str(ext::format(L"
") % (5 * params.blocks_in_column - 1)), row, 1, rowSpan); } } @@ -427,7 +427,7 @@ void ColSplit::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, D else if (params.effective_vis_mode == 1) { divTitle = ext::str(ext::kformat(TranslateT("[#{day}] #{amount}")) - % L"#{day}" * utils::stripPrefix(L"wday3:", TranslateTS(szWDayName[j])) + % L"#{day}" * utils::stripPrefix(L"wday3:", TranslateW(szWDayName[j])) % L"#{amount}" * utils::intToGrouped(part_top)); } else diff --git a/plugins/HistoryStats/src/column_splittimeline.cpp b/plugins/HistoryStats/src/column_splittimeline.cpp index 55d8f791c3..a5b75c0918 100644 --- a/plugins/HistoryStats/src/column_splittimeline.cpp +++ b/plugins/HistoryStats/src/column_splittimeline.cpp @@ -107,7 +107,7 @@ void ColSplitTimeline::impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGrou array_each_(i, sourceTexts) { - Opt.addComboItem(m_hSource, TranslateTS(sourceTexts[i])); + Opt.addComboItem(m_hSource, TranslateW(sourceTexts[i])); } static const wchar_t* unitTexts[] = { @@ -118,7 +118,7 @@ void ColSplitTimeline::impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGrou array_each_(i, unitTexts) { - Opt.addComboItem(m_hBlockUnit, TranslateTS(unitTexts[i])); + Opt.addComboItem(m_hBlockUnit, TranslateW(unitTexts[i])); } Opt.setComboSelected(m_hSource , 4 * m_nSource + m_nSourceType); @@ -275,10 +275,10 @@ void ColSplitTimeline::impl_outputRenderHeader(ext::ostream& tos, int row, int r { SplitParams params = getParams(); ext::string strTitle = str(ext::kformat(TranslateT("#{type} for #{data}")) - % L"#{type}" * TranslateTS(szTypeDesc[params.effective_vis_mode]) - % L"#{data}" * TranslateTS(szSourceDesc[4 * m_nSource + m_nSourceType])); + % L"#{type}" * TranslateW(szTypeDesc[params.effective_vis_mode]) + % L"#{data}" * TranslateW(szSourceDesc[4 * m_nSource + m_nSourceType])); - writeRowspanTD(tos, getCustomTitle(TranslateTS(szTypeDesc[params.effective_vis_mode]), strTitle) + L"
", row, 1, rowSpan); + writeRowspanTD(tos, getCustomTitle(TranslateW(szTypeDesc[params.effective_vis_mode]), strTitle) + L"
", row, 1, rowSpan); } } diff --git a/plugins/HistoryStats/src/column_timeline.cpp b/plugins/HistoryStats/src/column_timeline.cpp index 67e579ca0e..9c82240562 100644 --- a/plugins/HistoryStats/src/column_timeline.cpp +++ b/plugins/HistoryStats/src/column_timeline.cpp @@ -64,7 +64,7 @@ void ColTimeline::impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup) array_each_(i, sourceTexts) { - Opt.addComboItem(m_hSource, TranslateTS(sourceTexts[i])); + Opt.addComboItem(m_hSource, TranslateW(sourceTexts[i])); } Opt.setComboSelected(m_hSource , 4 * m_nSource + m_nSourceType); @@ -208,7 +208,7 @@ void ColTimeline::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpa if (row == 1) { ext::string strTitle = str(ext::kformat(TranslateT("Timeline for #{data}")) - % L"#{data}" * TranslateTS(szSourceDesc[4 * m_nSource + m_nSourceType])); + % L"#{data}" * TranslateW(szSourceDesc[4 * m_nSource + m_nSourceType])); writeRowspanTD(tos, getCustomTitle(TranslateT("Timeline"), strTitle) + L"
", row, 1, rowSpan); } diff --git a/plugins/HistoryStats/src/column_wordcount.cpp b/plugins/HistoryStats/src/column_wordcount.cpp index a83f27e652..65d59fe21d 100644 --- a/plugins/HistoryStats/src/column_wordcount.cpp +++ b/plugins/HistoryStats/src/column_wordcount.cpp @@ -125,10 +125,10 @@ void ColWordCount::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSp if (row == 1) { ext::string strTitle = str(ext::kformat(TranslateT("#{type} for #{data}")) - % L"#{type}" * TranslateTS(szTypeDesc[m_nVisMode]) - % L"#{data}" * TranslateTS(szSourceDesc[m_nSource])); + % L"#{type}" * TranslateW(szTypeDesc[m_nVisMode]) + % L"#{data}" * TranslateW(szSourceDesc[m_nSource])); - writeRowspanTD(tos, getCustomTitle(TranslateTS(szTypeDesc[m_nVisMode]), strTitle), row, 1, rowSpan); + writeRowspanTD(tos, getCustomTitle(TranslateW(szTypeDesc[m_nVisMode]), strTitle), row, 1, rowSpan); } } diff --git a/plugins/HistoryStats/src/column_words.cpp b/plugins/HistoryStats/src/column_words.cpp index 7d79cb467f..b19b363913 100644 --- a/plugins/HistoryStats/src/column_words.cpp +++ b/plugins/HistoryStats/src/column_words.cpp @@ -231,10 +231,10 @@ void ColWords::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) if (row == 1) { ext::string strTitle = str(ext::kformat(TranslateT("#{type} for #{data}")) - % L"#{type}" * TranslateTS(szTypeDesc[m_nVisMode]) - % L"#{data}" * TranslateTS(szSourceDesc[m_nSource])); + % L"#{type}" * TranslateW(szTypeDesc[m_nVisMode]) + % L"#{data}" * TranslateW(szSourceDesc[m_nSource])); - writeRowspanTD(tos, getCustomTitle(TranslateTS(szTypeDesc[m_nVisMode]), strTitle), row, 1, rowSpan); + writeRowspanTD(tos, getCustomTitle(TranslateW(szTypeDesc[m_nVisMode]), strTitle), row, 1, rowSpan); } } diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp index 9344e55f19..372b39d186 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.cpp +++ b/plugins/HistoryStats/src/dlgfilterwords.cpp @@ -90,7 +90,7 @@ void DlgFilterWords::onWMInitDialog() HICON hIcon = reinterpret_cast(LoadImage(g_hInst, MAKEINTRESOURCE(columnBand[i].iconId), IMAGE_ICON, OS::smIconCX(), OS::smIconCY(), 0)); DWORD dwFlags = (columnBand[i].bDisabled ? BandCtrl::BCF_DISABLED : 0); - m_hActionButtons[i] = m_Band.addButton(dwFlags, hIcon, i, TranslateTS(columnBand[i].szTooltip)); + m_hActionButtons[i] = m_Band.addButton(dwFlags, hIcon, i, TranslateW(columnBand[i].szTooltip)); DestroyIcon(hIcon); } @@ -122,7 +122,7 @@ void DlgFilterWords::onWMInitDialog() array_each_(i, szWordFilterModes) { - SendDlgItemMessage(m_hWnd, IDC_MODE, CB_ADDSTRING, 0, reinterpret_cast(TranslateTS(szWordFilterModes[i]))); + SendDlgItemMessage(m_hWnd, IDC_MODE, CB_ADDSTRING, 0, reinterpret_cast(TranslateW(szWordFilterModes[i]))); } SendDlgItemMessage(m_hWnd, IDC_MODE, CB_SETCURSEL, 0, 0); diff --git a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp index f6c635bfa0..a2ff5e6ca8 100644 --- a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp +++ b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp @@ -23,7 +23,7 @@ INT_PTR CALLBACK DlgOption::SubColumns::staticAddProc(HWND hDlg, UINT msg, WPARA upto_each_(i, Column::countColInfo()) { - int nIndex = SendMessage(hWndList, LB_ADDSTRING, 0, reinterpret_cast(TranslateTS(Column::getColInfo(i).m_Title))); + int nIndex = SendMessage(hWndList, LB_ADDSTRING, 0, reinterpret_cast(TranslateW(Column::getColInfo(i).m_Title))); SendMessage(hWndList, LB_SETITEMDATA, nIndex, i); } @@ -183,7 +183,7 @@ void DlgOption::SubColumns::onWMInitDialog() (columnBand[i].bDropDown ? BandCtrl::BCF_DROPDOWN : 0) | (columnBand[i].bDisabled ? BandCtrl::BCF_DISABLED : 0); - m_hActionButtons[i] = m_Band.addButton(dwFlags, hIcon, i, TranslateTS(columnBand[i].szTooltip)); + m_hActionButtons[i] = m_Band.addButton(dwFlags, hIcon, i, TranslateW(columnBand[i].szTooltip)); DestroyIcon(hIcon); } @@ -313,7 +313,7 @@ void DlgOption::SubColumns::toggleInfo() HWND hInfo = GetDlgItem(getHWnd(), IDC_INFO); const wchar_t* szInfoLabelText = m_bShowInfo ? LPGENW("Hide additional column info...") : LPGENW("Show additional column info..."); - SetDlgItemText(getHWnd(), IDC_INFOLABEL, TranslateTS(szInfoLabelText)); + SetDlgItemText(getHWnd(), IDC_INFOLABEL, TranslateW(szInfoLabelText)); ShowWindow(hInfo, m_bShowInfo ? SW_SHOW : SW_HIDE); EnableWindow(hInfo, BOOL_(m_bShowInfo)); @@ -327,7 +327,7 @@ void DlgOption::SubColumns::addCol(int nCol) getParent()->getLocalSettings().addCol(pCol); - OptionsCtrl::Check hColCheck = m_Columns.insertCheck(NULL, TranslateTS(pCol->getTitle()), 0, reinterpret_cast(pCol)); + OptionsCtrl::Check hColCheck = m_Columns.insertCheck(NULL, TranslateW(pCol->getTitle()), 0, reinterpret_cast(pCol)); m_Columns.checkItem(hColCheck, pCol->isEnabled()); @@ -541,7 +541,7 @@ void DlgOption::SubColumns::onBandDropDown(HANDLE hButton, INT_PTR dwData) upto_each_(i, Column::countColInfo()) { - AppendMenu(hPopup, MF_STRING, i + 1, TranslateTS(Column::getColInfo(i).m_Title)); + AppendMenu(hPopup, MF_STRING, i + 1, TranslateW(Column::getColInfo(i).m_Title)); } int nCol = -1 + TrackPopupMenu( @@ -674,7 +674,7 @@ bool DlgOption::SubColumns::configHasConflicts(HelpVec* pHelp) if (pHelp) { pHelp->push_back(HelpPair()); - pHelp->back().first = TranslateTS(pCol->getTitle()); + pHelp->back().first = TranslateW(pCol->getTitle()); pHelp->back().first += L": "; pHelp->back().first += TranslateT("HTML output unsupported."); @@ -694,7 +694,7 @@ bool DlgOption::SubColumns::configHasConflicts(HelpVec* pHelp) if (pHelp) { pHelp->push_back(HelpPair()); - pHelp->back().first = TranslateTS(pCol->getTitle()); + pHelp->back().first = TranslateW(pCol->getTitle()); pHelp->back().first += L": "; if (nPNGMode == Settings::pmHTMLFallBack) diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index ec6c21ae94..51732bfa40 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -22,12 +22,12 @@ INT_PTR CALLBACK DlgOption::SubGlobal::staticInfoProc(HWND hDlg, UINT msg, WPARA const SupportInfo& info = *reinterpret_cast(lParam); SetDlgItemText(hDlg, IDC_PLUGIN, info.szPlugin); - SetDlgItemText(hDlg, IDC_FEATURES, TranslateTS(info.szTeaser)); - SetDlgItemText(hDlg, IDC_DESCRIPTION, TranslateTS(info.szDescription)); + SetDlgItemText(hDlg, IDC_FEATURES, TranslateW(info.szTeaser)); + SetDlgItemText(hDlg, IDC_DESCRIPTION, TranslateW(info.szDescription)); static const WORD LinkIDs[] = { IDC_LINK2, IDC_LINK1 }; - ext::string linkTexts = TranslateTS(info.szLinkTexts); + ext::string linkTexts = TranslateW(info.szLinkTexts); ext::string linkURLs = info.szLinkURLs; int nCurLink = 0; @@ -387,7 +387,7 @@ void DlgOption::SubGlobal::toggleInfo() HWND hInfo = GetDlgItem(getHWnd(), IDC_INFO); const wchar_t* szInfoLabelText = m_bShowInfo ? LPGENW("HistoryStats supports several plugins. Click to hide info...") : LPGENW("HistoryStats supports several plugins. Click to learn more..."); - SetDlgItemText(getHWnd(), IDC_INFOLABEL, TranslateTS(szInfoLabelText)); + SetDlgItemText(getHWnd(), IDC_INFOLABEL, TranslateW(szInfoLabelText)); ShowWindow(hInfo, m_bShowInfo ? SW_SHOW : SW_HIDE); EnableWindow(hInfo, BOOL_(m_bShowInfo)); diff --git a/plugins/HistoryStats/src/dlgoption_suboutput.cpp b/plugins/HistoryStats/src/dlgoption_suboutput.cpp index 67c58f9910..97be76691a 100644 --- a/plugins/HistoryStats/src/dlgoption_suboutput.cpp +++ b/plugins/HistoryStats/src/dlgoption_suboutput.cpp @@ -188,7 +188,7 @@ void DlgOption::SubOutput::onWMInitDialog() array_each_(i, sortLevels) { - m_hSortBy[i] = m_Options.insertCombo(m_hSort, TranslateTS(sortLevels[i]), (i == 0) ? 0 : OptionsCtrl::OCF_DISABLECHILDSONINDEX0); + m_hSortBy[i] = m_Options.insertCombo(m_hSort, TranslateW(sortLevels[i]), (i == 0) ? 0 : OptionsCtrl::OCF_DISABLECHILDSONINDEX0); if (i != 0) { @@ -197,7 +197,7 @@ void DlgOption::SubOutput::onWMInitDialog() array_each_(j, sortKeys) { - m_Options.addComboItem(m_hSortBy[i], TranslateTS(sortKeys[j].desc)); + m_Options.addComboItem(m_hSortBy[i], TranslateW(sortKeys[j].desc)); } m_hSortDir[i] = m_Options.insertRadio(m_hSortBy[i], NULL, TranslateT("Ascending")); @@ -229,7 +229,7 @@ void DlgOption::SubOutput::onWMInitDialog() array_each_(i, omitData) { - m_Options.addComboItem(m_hOmitByValueData, TranslateTS(omitData[i])); + m_Options.addComboItem(m_hOmitByValueData, TranslateW(omitData[i])); } m_Options.ensureVisible(NULL); diff --git a/plugins/HistoryStats/src/iconlib.cpp b/plugins/HistoryStats/src/iconlib.cpp index 7993c26a3b..d8a6dc5417 100644 --- a/plugins/HistoryStats/src/iconlib.cpp +++ b/plugins/HistoryStats/src/iconlib.cpp @@ -71,12 +71,12 @@ void IconLib::init() if (m_IconInfo[i].szSection) { strSection += L"/"; - strSection += TranslateTS(m_IconInfo[i].szSection); + strSection += TranslateW(m_IconInfo[i].szSection); } mu::icolib::addIcon( strSection.c_str(), - TranslateTS(m_IconInfo[i].szDescription), + TranslateW(m_IconInfo[i].szDescription), (m_IconName + m_IconInfo[i].szIconName).c_str(), szModule, -m_IconInfo[i].wID); diff --git a/plugins/HistoryStats/src/mirandasettings.cpp b/plugins/HistoryStats/src/mirandasettings.cpp index e2b9bc9d49..9840e1ae0a 100644 --- a/plugins/HistoryStats/src/mirandasettings.cpp +++ b/plugins/HistoryStats/src/mirandasettings.cpp @@ -100,12 +100,12 @@ void MirandaSettings::writeDWord(const char* szSetting, int dwValue) const void MirandaSettings::writeStr(const char* szSetting, const wchar_t* szValue) const { - db_set_ts(m_hContact, m_strModule.c_str(), szSetting, szValue); + db_set_ws(m_hContact, m_strModule.c_str(), szSetting, szValue); } void MirandaSettings::writeStrDirect(const char* szSetting, const wchar_t* szValue) const { - db_set_ts(m_hContact, m_strModule.c_str(), szSetting, szValue); + db_set_ws(m_hContact, m_strModule.c_str(), szSetting, szValue); } void MirandaSettings::writeTree(const char* szSetting, const SettingsTree& value) const diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 7b1ee72f8d..ef5bfc66e2 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -20,7 +20,7 @@ namespace mu // TODO: support for unicode-core with unicode-aware CList CMenuItem mi; mi.name.w = (wchar_t*)pszName; - mi.flags = flags | CMIF_TCHAR; + mi.flags = flags | CMIF_UNICODE; mi.position = position; mi.hIcolibItem = hIcon; mi.pszService = const_cast(pszService); @@ -34,7 +34,7 @@ namespace mu // TODO: support for unicode-core with unicode-aware CList CMenuItem mi; mi.name.w = (wchar_t*)pszName; - mi.flags = flags | CMIF_TCHAR; + mi.flags = flags | CMIF_UNICODE; mi.position = position; mi.hIcolibItem = hIcon; mi.pszService = const_cast(pszService); @@ -51,12 +51,12 @@ namespace mu { int getProfilePath(int cbName, wchar_t* pszName) { - return CallService(MS_DB_GETPROFILEPATHT, cbName, reinterpret_cast(pszName)); + return CallService(MS_DB_GETPROFILEPATHW, cbName, reinterpret_cast(pszName)); } int getProfileName(int cbName, wchar_t* pszName) { - return CallService(MS_DB_GETPROFILENAMET, cbName, reinterpret_cast(pszName)); + return CallService(MS_DB_GETPROFILENAMEW, cbName, reinterpret_cast(pszName)); } void setSafetyMode(bool safetyMode) @@ -103,7 +103,7 @@ namespace mu sid.pszName = const_cast(szIconName); sid.defaultFile.a = const_cast(szDefaultFile); sid.iDefaultIndex = iDefaultIndex; - sid.flags = SIDF_TCHAR; + sid.flags = SIDF_UNICODE; IcoLib_AddIcon(&sid); } @@ -127,7 +127,7 @@ namespace mu odp.pszTemplate = const_cast(pszTemplate); odp.hInstance = hInstance; odp.pwszGroup = const_cast(pszGroup); - odp.flags = flags | ODPF_TCHAR; + odp.flags = flags | ODPF_UNICODE; odp.pwszTab = const_cast(pszTab); Options_AddPage(addInfo, &odp); } diff --git a/plugins/HistoryStats/src/statistic.cpp b/plugins/HistoryStats/src/statistic.cpp index 0d9b1deea9..b064304cbf 100644 --- a/plugins/HistoryStats/src/statistic.cpp +++ b/plugins/HistoryStats/src/statistic.cpp @@ -1352,7 +1352,7 @@ bool Statistic::createStatisticsSteps() array_each_(i, stepsInfo) { - setProgressLabel(false, TranslateTS(stepsInfo[i].stepMsg)); + setProgressLabel(false, TranslateW(stepsInfo[i].stepMsg)); if (!(this->*stepsInfo[i].stepFn)()) return false; diff --git a/plugins/HistoryStats/src/utils.cpp b/plugins/HistoryStats/src/utils.cpp index b70ee4630e..bc1c1f272b 100644 --- a/plugins/HistoryStats/src/utils.cpp +++ b/plugins/HistoryStats/src/utils.cpp @@ -282,10 +282,10 @@ namespace utils strSubst = intToPadded(timeTM->tm_mon + 1, 2); } else if (strVar == L"MMM") { - strSubst = stripPrefix(L"month3:", TranslateTS(szMonthName[timeTM->tm_mon % 12][0])); + strSubst = stripPrefix(L"month3:", TranslateW(szMonthName[timeTM->tm_mon % 12][0])); } else if (strVar == L"MMMM") { - strSubst = stripPrefix(L"monthF:", TranslateTS(szMonthName[timeTM->tm_mon % 12][1])); + strSubst = stripPrefix(L"monthF:", TranslateW(szMonthName[timeTM->tm_mon % 12][1])); } else if (strVar == L"d") { strSubst = intToString(timeTM->tm_mday); @@ -294,13 +294,13 @@ namespace utils strSubst = intToPadded(timeTM->tm_mday, 2); } else if (strVar == L"ww") { - strSubst = stripPrefix(L"wday2:", TranslateTS(szWDayName[(timeTM->tm_wday + 6) % 7][0])); + strSubst = stripPrefix(L"wday2:", TranslateW(szWDayName[(timeTM->tm_wday + 6) % 7][0])); } else if (strVar == L"www") { - strSubst = stripPrefix(L"wday3:", TranslateTS(szWDayName[(timeTM->tm_wday + 6) % 7][1])); + strSubst = stripPrefix(L"wday3:", TranslateW(szWDayName[(timeTM->tm_wday + 6) % 7][1])); } else if (strVar == L"wwww") { - strSubst = stripPrefix(L"wdayF:", TranslateTS(szWDayName[(timeTM->tm_wday + 6) % 7][2])); + strSubst = stripPrefix(L"wdayF:", TranslateW(szWDayName[(timeTM->tm_wday + 6) % 7][2])); } else if (strVar == L"miranda_path") { strSubst = getMirandaPath(); @@ -895,7 +895,7 @@ namespace utils if (strMirandaPath.empty()) { wchar_t szPath[MAX_PATH] = { 0 }; - PathToAbsoluteT(L"x", szPath); + PathToAbsoluteW(L"x", szPath); strMirandaPath = extractPath(szPath); } -- cgit v1.2.3