Index: src/ch/CfgProperties.h
===================================================================
diff -u -N -rb6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5 -rf6c4389122d92e5f84a509e9be0facebac429151
--- src/ch/CfgProperties.h	(.../CfgProperties.h)	(revision b6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5)
+++ src/ch/CfgProperties.h	(.../CfgProperties.h)	(revision f6c4389122d92e5f84a509e9be0facebac429151)
@@ -24,85 +24,88 @@
 #include "../libicpf/cfg.h"
 
 // properties definitions
-#define PP_PCLIPBOARDMONITORING		0
-#define PP_PMONITORSCANINTERVAL		1
-#define PP_PRELOADAFTERRESTART		2
-#define PP_PSHUTDOWNAFTREFINISHED	3
-#define PP_PTIMEBEFORESHUTDOWN		4
-#define PP_PFORCESHUTDOWN			5
-#define PP_PAUTOSAVEINTERVAL		6
-#define PP_PPROCESSPRIORITYCLASS	7
-#define PP_PAUTOSAVEDIRECTORY		8
-#define PP_PLANGUAGE				9
+enum CHProperties
+{
+	PP_PCLIPBOARDMONITORING = 0,
+	PP_PMONITORSCANINTERVAL,
+	PP_PRELOADAFTERRESTART,
+	PP_PSHUTDOWNAFTREFINISHED,
+	PP_PTIMEBEFORESHUTDOWN,
+	PP_PFORCESHUTDOWN,
+	PP_PAUTOSAVEINTERVAL,
+	PP_PPROCESSPRIORITYCLASS,
+//	PP_PAUTOSAVEDIRECTORY,
+	PP_PLANGUAGE,
 
-#define PP_STATUSREFRESHINTERVAL	10
-#define PP_STATUSSHOWDETAILS		11
-#define PP_STATUSAUTOREMOVEFINISHED	12
+	PP_STATUSREFRESHINTERVAL,
+	PP_STATUSSHOWDETAILS,
+	PP_STATUSAUTOREMOVEFINISHED,
 
-#define PP_FDWIDTH					13
-#define PP_FDHEIGHT					14
-#define PP_FDSHORTCUTLISTSTYLE		15
-#define PP_FDEXTENDEDVIEW			16
-#define PP_FDIGNORESHELLDIALOGS		17
+	PP_FDWIDTH,
+	PP_FDHEIGHT,
+	PP_FDSHORTCUTLISTSTYLE,
+	PP_FDEXTENDEDVIEW,
+	PP_FDIGNORESHELLDIALOGS,
 
-#define PP_MVSHOWFILENAMES			18
-#define PP_MVSHOWSINGLETASKS		19
-#define PP_MVREFRESHINTERVAL		20
-#define PP_MVAUTOSHOWWHENRUN		21
-#define PP_MVAUTOHIDEWHENEMPTY		22
-#define PP_MVUSESMOOTHPROGRESS		23
+	PP_MVSHOWFILENAMES,
+	PP_MVSHOWSINGLETASKS,
+	PP_MVREFRESHINTERVAL,
+	PP_MVAUTOSHOWWHENRUN,
+	PP_MVAUTOHIDEWHENEMPTY,
+	PP_MVUSESMOOTHPROGRESS,
 
-#define PP_CMUSEAUTOCOMPLETEFILES	24
-#define PP_CMSETDESTATTRIBUTES		25
-#define PP_CMSETDESTDATE			26
-#define PP_CMPROTECTROFILES			27
-#define PP_CMLIMITMAXOPERATIONS		28
-#define PP_CMREADSIZEBEFOREBLOCKING	29
-#define PP_CMSHOWVISUALFEEDBACK		30
-#define PP_CMUSETIMEDFEEDBACK		31
-#define PP_CMFEEDBACKTIME			32
-#define PP_CMAUTORETRYONERROR		33
-#define PP_CMAUTORETRYINTERVAL		34
-#define PP_CMDEFAULTPRIORITY		35
-#define PP_CMDISABLEPRIORITYBOOST	36
-#define PP_CMDELETEAFTERFINISHED	37
-#define PP_CMCREATELOG				38
+	PP_CMUSEAUTOCOMPLETEFILES,
+	PP_CMSETDESTATTRIBUTES,
+	PP_CMSETDESTDATE,
+	PP_CMPROTECTROFILES,
+	PP_CMLIMITMAXOPERATIONS,
+	PP_CMREADSIZEBEFOREBLOCKING,
+	PP_CMSHOWVISUALFEEDBACK,
+	PP_CMUSETIMEDFEEDBACK,
+	PP_CMFEEDBACKTIME,
+	PP_CMAUTORETRYONERROR,
+	PP_CMAUTORETRYINTERVAL,
+	PP_CMDEFAULTPRIORITY,
+	PP_CMDISABLEPRIORITYBOOST,
+	PP_CMDELETEAFTERFINISHED,
+	PP_CMCREATELOG,
 
-#define PP_SHSHOWCOPY				39
-#define PP_SHSHOWMOVE				40
-#define PP_SHSHOWCOPYMOVE			41
-#define PP_SHSHOWPASTE				42
-#define PP_SHSHOWPASTESPECIAL		43
-#define PP_SHSHOWCOPYTO				44
-#define PP_SHSHOWMOVETO				45
-#define PP_SHSHOWCOPYMOVETO			46
-#define PP_SHSHOWFREESPACE			47
-#define PP_SHSHOWSHELLICONS			48
-#define PP_SHUSEDRAGDROP			49
-#define PP_SHDEFAULTACTION			50
+	PP_SHSHOWCOPY,
+	PP_SHSHOWMOVE,
+	PP_SHSHOWCOPYMOVE,
+	PP_SHSHOWPASTE,
+	PP_SHSHOWPASTESPECIAL,
+	PP_SHSHOWCOPYTO,
+	PP_SHSHOWMOVETO,
+	PP_SHSHOWCOPYMOVETO,
+	PP_SHSHOWFREESPACE,
+	PP_SHSHOWSHELLICONS,
+	PP_SHUSEDRAGDROP,
+	PP_SHDEFAULTACTION,
 
-#define PP_BFUSEONLYDEFAULT			51
-#define PP_BFDEFAULT				52
-#define PP_BFONEDISK				53
-#define PP_BFTWODISKS				54
-#define PP_BFCD						55
-#define PP_BFLAN					56
-#define PP_BFUSENOBUFFERING			57
-#define PP_BFBOUNDARYLIMIT			58
+	PP_BFUSEONLYDEFAULT,
+	PP_BFDEFAULT,
+	PP_BFONEDISK,
+	PP_BFTWODISKS,
+	PP_BFCD,
+	PP_BFLAN,
+	PP_BFUSENOBUFFERING,
+	PP_BFBOUNDARYLIMIT,
 
-#define PP_LOGPATH					59
-#define PP_LOGENABLELOGGING			60
-#define PP_LOGLIMITATION			61
-#define PP_LOGMAXLIMIT				62
-#define PP_LOGPRECISELIMITING		63
-#define PP_LOGTRUNCBUFFERSIZE		64
+	PP_LOGPATH,
+	PP_LOGENABLELOGGING,
+	PP_LOGLIMITATION,
+	PP_LOGMAXLIMIT,
+	PP_LOGPRECISELIMITING,
+	PP_LOGTRUNCBUFFERSIZE,
 
-#define PP_SNDPLAYSOUNDS			65
-#define PP_SNDERRORSOUNDPATH		66
-#define PP_SNDFINISHEDSOUNDPATH		67
+	PP_SNDPLAYSOUNDS,
+	PP_SNDERRORSOUNDPATH,
+	PP_SNDFINISHEDSOUNDPATH,
 
-#define PP_SHORTCUTS				68
-#define PP_RECENTPATHS				69
+	PP_SHORTCUTS,
+	PP_RECENTPATHS
+};
 
 // register function
 bool RegisterProperties(icpf::config* pManager);