diff --git a/compiler/ncal.pas b/compiler/ncal.pas
index f676a82ffc..d40a26b4b4 100644
--- a/compiler/ncal.pas
+++ b/compiler/ncal.pas
@@ -185,7 +185,7 @@ implementation
                     pdl:=aprocsym.defs;
                     while assigned(pdl) do
                      begin
-                       if equal_paras(pdl^.def.para,srpdl^.def.para,cp_all) then
+                       if equal_paras(pdl^.def.para,srpdl^.def.para,cp_value_equal_const) then
                         begin
                           found:=true;
                           break;
@@ -1767,7 +1767,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.56  2001-11-18 18:43:13  peter
+  Revision 1.57  2001-11-18 20:18:54  peter
+    * use cp_value_equal_const instead of cp_all
+
+  Revision 1.56  2001/11/18 18:43:13  peter
     * overloading supported in child classes
     * fixed parsing of classes with private and virtual and overloaded
       so it is compatible with delphi
diff --git a/compiler/nobj.pas b/compiler/nobj.pas
index f1542e9b48..04fc23c8b3 100644
--- a/compiler/nobj.pas
+++ b/compiler/nobj.pas
@@ -599,7 +599,7 @@ implementation
                                      if not(po_virtualmethod in pd.procoptions) then
                                       begin
                                         if not pdoverload or
-                                           equal_paras(procdefcoll^.data.para,pd.para,cp_all) then
+                                           equal_paras(procdefcoll^.data.para,pd.para,cp_value_equal_const) then
                                          begin
                                            procdefcoll^.hidden:=true;
                                            if _class=pd._class then
@@ -616,7 +616,7 @@ implementation
                                          begin
                                            { we start a new virtual tree, hide the old }
                                            if not pdoverload or
-                                              equal_paras(procdefcoll^.data.para,pd.para,cp_all) then
+                                              equal_paras(procdefcoll^.data.para,pd.para,cp_value_equal_const) then
                                             begin
                                               procdefcoll^.hidden:=true;
                                               if _class=pd._class then
@@ -624,7 +624,7 @@ implementation
                                             end;
                                          end
                                         { same parameters }
-                                        else if (equal_paras(procdefcoll^.data.para,pd.para,cp_all)) then
+                                        else if (equal_paras(procdefcoll^.data.para,pd.para,cp_value_equal_const)) then
                                          begin
                                            { overload is inherited }
                                            if (po_overload in procdefcoll^.data.procoptions) then
@@ -676,7 +676,7 @@ implementation
                                         { the new definition is virtual and the old static, we hide the old one
                                           if the new defintion has not the overload directive }
                                         if not pdoverload or
-                                           equal_paras(procdefcoll^.data.para,pd.para,cp_all) then
+                                           equal_paras(procdefcoll^.data.para,pd.para,cp_value_equal_const) then
                                          procdefcoll^.hidden:=true;
                                       end;
                                    end
@@ -684,7 +684,7 @@ implementation
                                    begin
                                      { both are static, we hide the old one if the new defintion
                                        has not the overload directive }
-                                     if equal_paras(procdefcoll^.data.para,pd.para,cp_all) or
+                                     if equal_paras(procdefcoll^.data.para,pd.para,cp_value_equal_const) or
                                         not pdoverload then
                                       procdefcoll^.hidden:=true;
                                    end;
@@ -1276,7 +1276,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.9  2001-11-18 18:43:14  peter
+  Revision 1.10  2001-11-18 20:18:54  peter
+    * use cp_value_equal_const instead of cp_all
+
+  Revision 1.9  2001/11/18 18:43:14  peter
     * overloading supported in child classes
     * fixed parsing of classes with private and virtual and overloaded
       so it is compatible with delphi
diff --git a/ide/wutils.pas b/ide/wutils.pas
index 8f55d39a3c..e1c554a568 100644
--- a/ide/wutils.pas
+++ b/ide/wutils.pas
@@ -56,7 +56,7 @@ type
   TUnsortedStringCollection = object(TCollection)
     constructor CreateFrom(ALines: PUnsortedStringCollection);
     procedure   Assign(ALines: PUnsortedStringCollection);
-    function    At(Index: Integer): PString;
+    function    At(Index: Sw_Integer): PString;
     procedure   FreeItem(Item: Pointer); virtual;
     function    GetItem(var S: TStream): Pointer; virtual;
     procedure   PutItem(var S: TStream; Item: Pointer); virtual;
@@ -696,7 +696,7 @@ begin
   Insert(NewStr(S));
 end;
 
-function TUnsortedStringCollection.At(Index: Integer): PString;
+function TUnsortedStringCollection.At(Index: Sw_Integer): PString;
 begin
   At:=inherited At(Index);
 end;
@@ -1234,7 +1234,10 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.4  2001-09-18 15:36:58  pierre
+  Revision 1.5  2001-11-18 20:18:54  peter
+    * use cp_value_equal_const instead of cp_all
+
+  Revision 1.4  2001/09/18 15:36:58  pierre
    * avoid bug 1610
 
   Revision 1.3  2001/08/12 00:04:50  pierre