My reasoning behind this, is because i got a couple of changes for dc++, but think making a bug for them is a bit excessive.
i.e. This one will get rid of the compiler warning about something which is coded fine, but the warnings are annoying.
Code: Select all
Index: trunk/windows/ExListViewCtrl.cpp
===================================================================
--- trunk/windows/ExListViewCtrl.cpp (revision 613)
+++ trunk/windows/ExListViewCtrl.cpp (working copy)
@@ -45,9 +45,9 @@
lvi.iItem = newPos;
}
int i = InsertItem(&lvi);
- int j = 0;
- for(TStringIter k = l.begin(); k != l.end(); ++k, j++) {
- SetItemText(i, j, k->c_str());
+ int m = 0;
+ for(TStringIter k = l.begin(); k != l.end(); ++k, m++) {
+ SetItemText(i, m, k->c_str());
}
EnsureVisible(i, FALSE);
Code: Select all
Index: trunk/windows/ADLSProperties.cpp
===================================================================
--- trunk/windows/ADLSProperties.cpp (revision 613)
+++ trunk/windows/ADLSProperties.cpp (working copy)
@@ -40,21 +40,14 @@
SetDlgItemText(IDC_AUTOQUEUE, CTSTRING(ADLS_DOWNLOAD));
// Initialize combo boxes
- ::SendMessage(GetDlgItem(IDC_SOURCE_TYPE), CB_ADDSTRING, 0,
- (LPARAM)search->SourceTypeToDisplayString(ADLSearch::OnlyFile).c_str());
- ::SendMessage(GetDlgItem(IDC_SOURCE_TYPE), CB_ADDSTRING, 0,
- (LPARAM)search->SourceTypeToDisplayString(ADLSearch::OnlyDirectory).c_str());
- ::SendMessage(GetDlgItem(IDC_SOURCE_TYPE), CB_ADDSTRING, 0,
- (LPARAM)search->SourceTypeToDisplayString(ADLSearch::FullPath).c_str());
+ ::SendMessage(GetDlgItem(IDC_SOURCE_TYPE), CB_ADDSTRING, 0, (LPARAM)CTSTRING(FILENAME));
+ ::SendMessage(GetDlgItem(IDC_SOURCE_TYPE), CB_ADDSTRING, 0, (LPARAM)CTSTRING(DIRECTORY));
+ ::SendMessage(GetDlgItem(IDC_SOURCE_TYPE), CB_ADDSTRING, 0, (LPARAM)CTSTRING(ADLS_FULL_PATH));
- ::SendMessage(GetDlgItem(IDC_SIZE_TYPE), CB_ADDSTRING, 0,
- (LPARAM)search->SizeTypeToDisplayString(ADLSearch::SizeBytes).c_str());
- ::SendMessage(GetDlgItem(IDC_SIZE_TYPE), CB_ADDSTRING, 0,
- (LPARAM)search->SizeTypeToDisplayString(ADLSearch::SizeKibiBytes).c_str());
- ::SendMessage(GetDlgItem(IDC_SIZE_TYPE), CB_ADDSTRING, 0,
- (LPARAM)search->SizeTypeToDisplayString(ADLSearch::SizeMebiBytes).c_str());
- ::SendMessage(GetDlgItem(IDC_SIZE_TYPE), CB_ADDSTRING, 0,
- (LPARAM)search->SizeTypeToDisplayString(ADLSearch::SizeGibiBytes).c_str());
+ ::SendMessage(GetDlgItem(IDC_SIZE_TYPE), CB_ADDSTRING, 0, (LPARAM)CTSTRING(B));
+ ::SendMessage(GetDlgItem(IDC_SIZE_TYPE), CB_ADDSTRING, 0, (LPARAM)CTSTRING(KiB));
+ ::SendMessage(GetDlgItem(IDC_SIZE_TYPE), CB_ADDSTRING, 0, (LPARAM)CTSTRING(MiB));
+ ::SendMessage(GetDlgItem(IDC_SIZE_TYPE), CB_ADDSTRING, 0, (LPARAM)CTSTRING(GiB));
// Load search data
SetDlgItemText(IDC_SEARCH_STRING, Text::toT(search->searchString).c_str());