linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2673
committer: cologic <ne5@xxxxxxxxxxx>
branch nick: dcplusplus
timestamp: Thu 2011-11-10 05:23:08 -0500
message:
  revert WinUtils enum change and signedness-convert constant at callsite
modified:
  win32/SearchFrame.cpp
  win32/WinUtil.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/SearchFrame.cpp'
--- win32/SearchFrame.cpp	2011-10-30 14:24:14 +0000
+++ win32/SearchFrame.cpp	2011-11-10 10:23:08 +0000
@@ -68,7 +68,7 @@
 	}
 
 	const SearchResultPtr& sr = srs[0];
-	return sr->getType() == SearchResult::TYPE_FILE ? WinUtil::getFileIcon(sr->getFile()) : WinUtil::DIR_ICON;
+	return sr->getType() == SearchResult::TYPE_FILE ? WinUtil::getFileIcon(sr->getFile()) : static_cast<int>(WinUtil::DIR_ICON);
 }
 
 int SearchFrame::SearchInfo::compareItems(SearchInfo* a, SearchInfo* b, int col) {

=== modified file 'win32/WinUtil.h'
--- win32/WinUtil.h	2011-11-09 12:07:26 +0000
+++ win32/WinUtil.h	2011-11-10 10:23:08 +0000
@@ -74,9 +74,12 @@
 class WinUtil {
 public:
 	// pre-defined icon indexes used by the "fileImages" image list - see also getFileIcon.
-	static const int DIR_ICON = 0;
-	static const int DIR_ICON_INCOMPLETE = 1;
-	static const int FILE_ICON_GENERIC = 2;
+	enum {
+		DIR_ICON,
+		DIR_ICON_INCOMPLETE,
+
+		FILE_ICON_GENERIC
+	};
 
 	// icon indexes to use with the "userImages" image list.
 	enum {