linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2672
committer: cologic <ne5@xxxxxxxxxxx>
branch nick: dcplusplus
timestamp: Wed 2011-11-09 07:07:26 -0500
message:
  silence four more warnings (and that enum was never really used as an enum anyway)
modified:
  dwt/include/dwt/util/check.h
  win32/CommandDlg.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 'dwt/include/dwt/util/check.h'
--- dwt/include/dwt/util/check.h	2011-01-02 17:12:02 +0000
+++ dwt/include/dwt/util/check.h	2011-11-09 12:07:26 +0000
@@ -40,7 +40,7 @@
 
 #else
 
-#define dwtDebugFail(m)
+#define dwtDebugFail(m) do {} while(false)
 
 #endif
 

=== modified file 'win32/CommandDlg.cpp'
--- win32/CommandDlg.cpp	2011-10-10 20:18:18 +0000
+++ win32/CommandDlg.cpp	2011-11-09 12:07:26 +0000
@@ -175,7 +175,7 @@
 		WinUtil::help(this, IDH_USER_COMMAND);
 	}
 
-	int newType;
+	int newType = -1;
 	if(type == UserCommand::TYPE_SEPARATOR) {
 		separator->setChecked(true);
 		newType = 0;

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