instantobjects-cvscommit

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15222/Core

Modified Files:
	InstantClasses.pas InstantCommand.pas InstantPersistence.pas 
	InstantPresentation.pas InstantTextFiler.pas InstantUtils.pas 
Log Message:
changes to compile with the "typed @ operator" option set

Index: InstantPresentation.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPresentation.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** InstantPresentation.pas	10 Feb 2005 23:19:55 -0000	1.10
--- InstantPresentation.pas	22 Feb 2005 08:05:03 -0000	1.11
***************
*** 25,37 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Andrea Petrelli: porting Kylix
!  * Carlo Barazzetta:
!  * - Exposer Undo virtual and access to UndoBuffer (Removed!)
!  * - Exposer OnAddClassFieldDef event 
!  * - Added Currency and Graphic support to exposer
!  * Andrea Petrelli:
!  * - Added OnProgress event on TInstantSelector
!  * Nando Dessena:
!  * - Fixed Range Check Error in TInstantCustomExposer.LoadFieldValue
   * ***** END LICENSE BLOCK ***** *)
  
--- 25,29 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Andrea Petrelli, Nando Dessena
   * ***** END LICENSE BLOCK ***** *)
  
***************
*** 753,757 ****
    Result := InstantGetAccessorClass(ObjectClass);
    if not Assigned(Result) then
!     raise EInstantError.CreateResFmt(@SAccessorClassNotFoundFor,
        [ObjectClass.ClassName]);
  end;
--- 745,749 ----
    Result := InstantGetAccessorClass(ObjectClass);
    if not Assigned(Result) then
!     raise EInstantError.CreateFmt(SAccessorClassNotFoundFor,
        [ObjectClass.ClassName]);
  end;
***************
*** 1066,1070 ****
        FCachedClass := GetClass(ObjectClassName);
        if not Assigned(FCachedClass) then
!         raise EInstantError.CreateResFmt(@SClassNotRegistered, [ObjectClassName]);
      end;
      Result := FCachedClass;
--- 1058,1062 ----
        FCachedClass := GetClass(ObjectClassName);
        if not Assigned(FCachedClass) then
!         raise EInstantError.CreateFmt(SClassNotRegistered, [ObjectClassName]);
      end;
      Result := FCachedClass;
***************
*** 2409,2416 ****
      FOnFieldError(Self, E, Field, Value, Write, Result)
    else if Write then
!     raise EInstantError.CreateResFmt(@SFieldWriteError,
        [VarToStr(Value), Field.FieldName, E.Message], E)
    else
!     raise EInstantError.CreateResFmt(@SFieldReadError,
        [Field.FieldName, E.Message], E);
  end;
--- 2401,2408 ----
      FOnFieldError(Self, E, Field, Value, Write, Result)
    else if Write then
!     raise EInstantError.CreateFmt(SFieldWriteError,
        [VarToStr(Value), Field.FieldName, E.Message], E)
    else
!     raise EInstantError.CreateFmt(SFieldReadError,
        [Field.FieldName, E.Message], E);
  end;
***************
*** 3578,3582 ****
  begin
    if Assigned(DataSet) and not (DataSet is TInstantCustomExposer) then
!     raise EInstantError.CreateResFmt(@SInvalidMasterDataSetClass,
        [DataSet.ClassName, TInstantCustomExposer.ClassName]);
    Result := DataSet as TInstantCustomExposer;
--- 3570,3574 ----
  begin
    if Assigned(DataSet) and not (DataSet is TInstantCustomExposer) then
!     raise EInstantError.CreateFmt(SInvalidMasterDataSetClass,
        [DataSet.ClassName, TInstantCustomExposer.ClassName]);
    Result := DataSet as TInstantCustomExposer;
***************
*** 3946,3950 ****
    begin
      if not HasConnector then
!       raise EInstantError.CreateRes(@SUnassignedConnector);
      DestroyQuery;
    end;
--- 3938,3942 ----
    begin
      if not HasConnector then
!       raise EInstantError.Create(SUnassignedConnector);
      DestroyQuery;
    end;

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** InstantPersistence.pas	18 Feb 2005 14:27:04 -0000	1.24
--- InstantPersistence.pas	22 Feb 2005 08:05:03 -0000	1.25
***************
*** 2617,2621 ****
      dtBlob: Result := ftBlob;
    else
!     raise EInstantError.CreateResFmt(@SUnsupportedDataType,
        [GetEnumName(TypeInfo(TInstantDataType), Ord(InstantDataType))]);
    end;
--- 2617,2621 ----
      dtBlob: Result := ftBlob;
    else
!     raise EInstantError.CreateFmt(SUnsupportedDataType,
        [GetEnumName(TypeInfo(TInstantDataType), Ord(InstantDataType))]);
    end;
***************
*** 2630,2634 ****
  begin
    if not Assigned(Connection) then
!     raise EInstantError.CreateRes(@SUnassignedConnection);
  end;
  
--- 2630,2634 ----
  begin
    if not Assigned(Connection) then
!     raise EInstantError.Create(SUnassignedConnection);
  end;
  
***************
*** 2643,2647 ****
    Connector := DefaultConnector;
    if not Assigned(Connector) then
!     raise EInstantError.CreateRes(@SUnassignedConnector);
    Result := Connector;
  end;
--- 2643,2647 ----
    Connector := DefaultConnector;
    if not Assigned(Connector) then
!     raise EInstantError.Create(SUnassignedConnector);
    Result := Connector;
  end;
***************
*** 2731,2735 ****
    Result := InstantGetClass(Classname);
    if not Assigned(Result) then
!     raise EInstantError.CreateResFmt(@SClassNotRegistered, [ClassName]);
  end;
  
--- 2731,2735 ----
    Result := InstantGetClass(Classname);
    if not Assigned(Result) then
!     raise EInstantError.CreateFmt(SClassNotRegistered, [ClassName]);
  end;
  
***************
*** 2739,2743 ****
    Result := InstantGetClassMetadata(ClassName);
    if not Assigned(Result) then
!     raise EInstantError.CreateResFmt(@SClassNotRegistered, [ClassName]);
  end;
  
--- 2739,2743 ----
    Result := InstantGetClassMetadata(ClassName);
    if not Assigned(Result) then
!     raise EInstantError.CreateFmt(SClassNotRegistered, [ClassName]);
  end;
  
***************
*** 2951,2955 ****
  begin
    if Assigned(AClass) and not IsAttributeClass(AClass) then
!     raise EInstantError.CreateResFmt(@SUnexpectedAttributeClass,
        [AttributeClassName, Name, ClassMetadataName, AClass.ClassName]);
  end;
--- 2951,2955 ----
  begin
    if Assigned(AClass) and not IsAttributeClass(AClass) then
!     raise EInstantError.CreateFmt(SUnexpectedAttributeClass,
        [AttributeClassName, Name, ClassMetadataName, AClass.ClassName]);
  end;
***************
*** 2965,2969 ****
  begin
    if Category <> ACategory then
!     raise EInstantError.CreateResFmt(@SUnexpectedAttributeCategory,
        [CategoryName(Category), AttributeClassName, Name,
        ClassMetadataName, CategoryName(ACategory)]);
--- 2965,2969 ----
  begin
    if Category <> ACategory then
!     raise EInstantError.CreateFmt(SUnexpectedAttributeCategory,
        [CategoryName(Category), AttributeClassName, Name,
        ClassMetadataName, CategoryName(ACategory)]);
***************
*** 2973,2977 ****
  begin
    if not IsIndexed then
!     raise EInstantError.CreateResFmt(@SAttributeNotIndexed,
        [AttributeClassName, Name, ClassMetadataName]);
  end;
--- 2973,2977 ----
  begin
    if not IsIndexed then
!     raise EInstantError.CreateFmt(SAttributeNotIndexed,
        [AttributeClassName, Name, ClassMetadataName]);
  end;
***************
*** 2984,2988 ****
    AClass := AttributeClass;
    if not Assigned(AClass) then
!     raise EInstantError.CreateResFmt(@SUnsupportedType, [AttributeTypeName]);
    Result := AClass.Create(AObject, Self);
  end;
--- 2984,2988 ----
    AClass := AttributeClass;
    if not Assigned(AClass) then
!     raise EInstantError.CreateFmt(SUnsupportedType, [AttributeTypeName]);
    Result := AClass.Create(AObject, Self);
  end;
***************
*** 3143,3147 ****
      AttributeType := TInstantAttributeType(I)
    else
!     raise EInstantError.CreateResFmt(@SUnsupportedType, [Value]);
  end;
  
--- 3143,3147 ----
      AttributeType := TInstantAttributeType(I)
    else
!     raise EInstantError.CreateFmt(SUnsupportedType, [Value]);
  end;
  
***************
*** 4222,4226 ****
    const TypeName: string): EInstantAccessError;
  begin
!   Result := EInstantAccessError.CreateResFmt(@SAccessError,
      [ClassName, Name, TypeName]);
  end;
--- 4222,4226 ----
    const TypeName: string): EInstantAccessError;
  begin
!   Result := EInstantAccessError.CreateFmt(SAccessError,
      [ClassName, Name, TypeName]);
  end;
***************
*** 4234,4238 ****
  begin
    if not Assigned(Metadata) then
!     raise EInstantError.CreateResFmt(@SUnassignedAttributeMetadata,
        [ClassName, Name]);
  end;
--- 4234,4238 ----
  begin
    if not Assigned(Metadata) then
!     raise EInstantError.CreateFmt(SUnassignedAttributeMetadata,
        [ClassName, Name]);
  end;
***************
*** 4241,4245 ****
    E: Exception): EInstantConversionError;
  begin
!   Result := EInstantConversionError.CreateResFmt(@SAttributeConversionError,
      [ClassName, Name, E.Message], E);
  end;
--- 4241,4245 ----
    E: Exception): EInstantConversionError;
  begin
!   Result := EInstantConversionError.CreateFmt(SAttributeConversionError,
      [ClassName, Name, E.Message], E);
  end;
***************
*** 4427,4431 ****
  begin
    if Assigned(Value) and (Value.AttributeType <> AttributeType) then
!     raise EInstantError.CreateResFmt(@SMetadataMismatch, [ClassName, Name]);
    FMetadata := Value;
    Initialize;
--- 4427,4431 ----
  begin
    if Assigned(Value) and (Value.AttributeType <> AttributeType) then
!     raise EInstantError.CreateFmt(SMetadataMismatch, [ClassName, Name]);
    FMetadata := Value;
    Initialize;
***************
*** 4444,4448 ****
  procedure TInstantAttribute.StringValidationError(InvalidChar: Char);
  begin
!   raise EInstantValidationError.CreateResFmt(@SInvalidChar,
      [InvalidChar, Ord(InvalidChar), ClassName, Name]);
  end;
--- 4444,4448 ----
  procedure TInstantAttribute.StringValidationError(InvalidChar: Char);
  begin
!   raise EInstantValidationError.CreateFmt(SInvalidChar,
      [InvalidChar, Ord(InvalidChar), ClassName, Name]);
  end;
***************
*** 4463,4467 ****
    E: Exception): EInstantError;
  begin
!   Result := EInstantError.CreateResFmt(@SInvalidAttributeValue,
      [VarToStr(AValue), ClassName, Name], E);
  end;
--- 4463,4467 ----
    E: Exception): EInstantError;
  begin
!   Result := EInstantError.CreateFmt(SInvalidAttributeValue,
      [VarToStr(AValue), ClassName, Name], E);
  end;
***************
*** 5500,5507 ****
      InstantGraphicFileFormat := InstantResolveGraphicFileType(Stream);
      if InstantGraphicFileFormat = gffUnknow then
!       raise EInstantError.CreateRes(@SUnsupportedGraphicStream);
      GraphicClass := InstantGraphicFileFormatToGraphicClass(InstantGraphicFileFormat);
      if not Assigned(GraphicClass) then
!       raise EInstantError.CreateRes(@SUnsupportedGraphicClass);
      Image := GraphicClass.Create;
      Try
--- 5500,5507 ----
      InstantGraphicFileFormat := InstantResolveGraphicFileType(Stream);
      if InstantGraphicFileFormat = gffUnknow then
!       raise EInstantError.Create(SUnsupportedGraphicStream);
      GraphicClass := InstantGraphicFileFormatToGraphicClass(InstantGraphicFileFormat);
      if not Assigned(GraphicClass) then
!       raise EInstantError.Create(SUnsupportedGraphicClass);
      Image := GraphicClass.Create;
      Try
***************
*** 5583,5591 ****
      ValidateObjectClassType(AObject.ClassType);
      if (AObject.Connector <> Connector) then
!       raise EInstantValidationError.CreateResFmt(@SInvalidConnector,
          [AObject.ClassName, AObject.Id, ClassName, Name]);
-     {if not AllowOwned and AObject.IsOwned then
-       raise EInstantError.CreateResFmt(@SObjectIsOwned,
-         [AObject.ClassName, AObject.Id]);}
    end;
  end;
--- 5583,5588 ----
      ValidateObjectClassType(AObject.ClassType);
      if (AObject.Connector <> Connector) then
!       raise EInstantValidationError.CreateFmt(SInvalidConnector,
          [AObject.ClassName, AObject.Id, ClassName, Name]);
    end;
  end;
***************
*** 5595,5599 ****
  begin
    if not (AClass.InheritsFrom(RequiredClass)) then
!     raise EInstantValidationError.CreateResFmt(@SInvalidObjectClass,
        [AClass.ClassName, ClassName, Name, RequiredClass.ClassName]);
  end;
--- 5592,5596 ----
  begin
    if not (AClass.InheritsFrom(RequiredClass)) then
!     raise EInstantValidationError.CreateFmt(SInvalidObjectClass,
        [AClass.ClassName, ClassName, Name, RequiredClass.ClassName]);
  end;
***************
*** 5818,5825 ****
      if Metadata.StorageKind = skEmbedded then
        if AObject.IsPersistent then
!         raise EInstantValidationError.CreateResFmt(@SPersistentObjectNotAllowed,
            [AObject.ClassName, AObject.Id]);
      if Assigned(Owner) and (AObject = Owner) then
!       raise EInstantValidationError.CreateResFmt(@SOwnershipRecursion,
          [AObject.ClassName, AObject.Id]);
    end;
--- 5815,5822 ----
      if Metadata.StorageKind = skEmbedded then
        if AObject.IsPersistent then
!         raise EInstantValidationError.CreateFmt(SPersistentObjectNotAllowed,
            [AObject.ClassName, AObject.Id]);
      if Assigned(Owner) and (AObject = Owner) then
!       raise EInstantValidationError.CreateFmt(SOwnershipRecursion,
          [AObject.ClassName, AObject.Id]);
    end;
***************
*** 6125,6129 ****
  begin
    if (Index < 0) or (Index >= Count) then
!     raise EInstantRangeError.CreateResFmt(@SIndexOutOfBounds, [Index]);
  end;
  
--- 6122,6126 ----
  begin
    if (Index < 0) or (Index >= Count) then
!     raise EInstantRangeError.CreateFmt(SIndexOutOfBounds, [Index]);
  end;
  
***************
*** 6376,6380 ****
    inherited;
    if not Assigned(AObject) then
!     raise EInstantError.CreateResFmt(@SUnassignedObjectInAttribute,
        [ClassName, Name]);
  end;
--- 6373,6377 ----
    inherited;
    if not Assigned(AObject) then
!     raise EInstantError.CreateFmt(SUnassignedObjectInAttribute,
        [ClassName, Name]);
  end;
***************
*** 6740,6747 ****
    if Metadata.StorageKind = skEmbedded then
      if AObject.IsPersistent then
!       raise EInstantValidationError.CreateResFmt(@SPersistentObjectNotAllowed,
          [AObject.ClassName, AObject.Id]);
    if Assigned(Owner) and (AObject = Owner) then
!     raise EInstantError.CreateResFmt(@SOwnershipRecursion,
        [AObject.ClassName, AObject.Id]);
  end;
--- 6737,6744 ----
    if Metadata.StorageKind = skEmbedded then
      if AObject.IsPersistent then
!       raise EInstantValidationError.CreateFmt(SPersistentObjectNotAllowed,
          [AObject.ClassName, AObject.Id]);
    if Assigned(Owner) and (AObject = Owner) then
!     raise EInstantError.CreateFmt(SOwnershipRecursion,
        [AObject.ClassName, AObject.Id]);
  end;
***************
*** 7153,7158 ****
      except
        on E: Exception do
!         raise EInstantError.CreateResFmt(@SFatalError, [ClassName, Id,
!           E.Message]);
      end;
    Dec(FSaveStateLevel);
--- 7150,7154 ----
      except
        on E: Exception do
!         raise EInstantError.CreateFmt(SFatalError, [ClassName, Id, E.Message]);
      end;
    Dec(FSaveStateLevel);
***************
*** 7200,7204 ****
    Result := FindAttribute(AttributeName);
    if not Assigned(Result) then
!     raise EInstantError.CreateResFmt(@SAttributeNotFound, [AttributeName,
        ClassName]);
  end;
--- 7196,7200 ----
    Result := FindAttribute(AttributeName);
    if not Assigned(Result) then
!     raise EInstantError.CreateFmt(SAttributeNotFound, [AttributeName,
        ClassName]);
  end;
***************
*** 7268,7272 ****
        FId := GenerateId;
      if not InstantIsValidObjectId(Id) then
!       raise EInstantError.CreateResFmt(@SInvalidObjectId, [Id, ClassName]);
    end;
  end;
--- 7264,7268 ----
        FId := GenerateId;
      if not InstantIsValidObjectId(Id) then
!       raise EInstantError.CreateFmt(SInvalidObjectId, [Id, ClassName]);
    end;
  end;
***************
*** 7313,7320 ****
    if not Assigned(Result) then
      if ContainerName = '' then
!       raise EInstantError.CreateResFmt(@SDefaultContainerNotFound,
          [ClassName])
      else
!       raise EInstantError.CreateResFmt(@SContainerNotFound, [ContainerName,
          ClassName]);
  end;
--- 7309,7316 ----
    if not Assigned(Result) then
      if ContainerName = '' then
!       raise EInstantError.CreateFmt(SDefaultContainerNotFound,
          [ClassName])
      else
!       raise EInstantError.CreateFmt(SContainerNotFound, [ContainerName,
          ClassName]);
  end;
***************
*** 7478,7482 ****
            end;
        else
!         raise EInstantStreamError.CreateRes(@SInvalidValueType);
        end;
      end;
--- 7474,7478 ----
            end;
        else
!         raise EInstantStreamError.Create(SInvalidValueType);
        end;
      end;
***************
*** 7553,7557 ****
  begin
    if Assigned(Arg) and not (TObject(Arg) is TInstantConnector) then
!     raise EInstantError.CreateResFmt(@SInvalidArgument, [ClassName,
        TInstantConnector.ClassName]);
    Result := Create(Arg)
--- 7549,7553 ----
  begin
    if Assigned(Arg) and not (TObject(Arg) is TInstantConnector) then
!     raise EInstantError.CreateFmt(SInvalidArgument, [ClassName,
        TInstantConnector.ClassName]);
    Result := Create(Arg)
***************
*** 7706,7710 ****
        Abort;
      vrError:
!       raise EInstantError.CreateResFmt(@SDeniedDispose, [ClassName, Id]);
    end;
    DoBeforeDispose;
--- 7702,7706 ----
        Abort;
      vrError:
!       raise EInstantError.CreateFmt(SDeniedDispose, [ClassName, Id]);
    end;
    DoBeforeDispose;
***************
*** 7756,7760 ****
        Abort;
      vrError:
!       raise EInstantError.CreateResFmt(@SDeniedRefresh, [ClassName, Id]);
    end;
    DoBeforeRefresh;
--- 7752,7756 ----
        Abort;
      vrError:
!       raise EInstantError.CreateFmt(SDeniedRefresh, [ClassName, Id]);
    end;
    DoBeforeRefresh;
***************
*** 7789,7793 ****
         Abort;
       vrError:
!        raise EInstantError.CreateResFmt(@SDeniedStore, [ClassName, Id]);
     end;
    DoBeforeStore;
--- 7785,7789 ----
         Abort;
       vrError:
!        raise EInstantError.CreateFmt(SDeniedStore, [ClassName, Id]);
     end;
    DoBeforeStore;
***************
*** 7899,7903 ****
          raise
        else
!         raise EInstantError.CreateResFmt(@SFinalizationFailed,
            [ClassName, Id, E.Message], E);
    end;
--- 7895,7899 ----
          raise
        else
!         raise EInstantError.CreateFmt(SFinalizationFailed,
            [ClassName, Id, E.Message], E);
    end;
***************
*** 7948,7952 ****
    Result := FDefaultContainer;
    if not Assigned(Result) then
!     raise EInstantError.CreateResFmt(@SDefaultContainerNotSpecified, [ClassName])
  end;
  
--- 7944,7948 ----
    Result := FDefaultContainer;
    if not Assigned(Result) then
!     raise EInstantError.CreateFmt(SDefaultContainerNotSpecified, [ClassName])
  end;
  
***************
*** 8087,8091 ****
            raise
          else
!           raise EInstantError.CreateResFmt(@SInitializationFailed,
              [ClassName, E.Message], E);
      end;
--- 8083,8087 ----
            raise
          else
!           raise EInstantError.CreateFmt(SInitializationFailed,
              [ClassName, E.Message], E);
      end;
***************
*** 8339,8343 ****
      except
        on E: Exception do
!         raise EInstantError.CreateResFmt(@SFatalError, [ClassName, Id, E.Message]);
      end;
    Dec(FSaveStateLevel);
--- 8335,8339 ----
      except
        on E: Exception do
!         raise EInstantError.CreateFmt(SFatalError, [ClassName, Id, E.Message]);
      end;
    Dec(FSaveStateLevel);
***************
*** 8350,8354 ****
    procedure RetrieveDenied;
    begin
!     raise EInstantError.CreateResFmt(@SDeniedRetrieve, [ClassName, AObjectId]);
    end;
  
--- 8346,8350 ----
    procedure RetrieveDenied;
    begin
!     raise EInstantError.CreateFmt(SDeniedRetrieve, [ClassName, AObjectId]);
    end;
  
***************
*** 8413,8417 ****
      except
        on E: Exception do
!         raise EInstantError.CreateResFmt(@SFatalError, [ClassName, Id, E.Message]);
      end;
    Inc(FSaveStateLevel);
--- 8409,8413 ----
      except
        on E: Exception do
!         raise EInstantError.CreateFmt(SFatalError, [ClassName, Id, E.Message]);
      end;
    Inc(FSaveStateLevel);
***************
*** 8704,8708 ****
    Result := InternalCreateQuery;
    if not Assigned(Result) then
!     raise EInstantError.CreateRes(@SCapabilityNotSuppported);
  end;
  
--- 8700,8704 ----
    Result := InternalCreateQuery;
    if not Assigned(Result) then
!     raise EInstantError.Create(SCapabilityNotSuppported);
  end;
  
***************
*** 8863,8867 ****
      end;
    end;
!   raise EInstantError.CreateResFmt(@SIndexOutOfBounds, [Index]);
  end;
  
--- 8859,8863 ----
      end;
    end;
!   raise EInstantError.CreateFmt(SIndexOutOfBounds, [Index]);
  end;
  
***************
*** 9258,9262 ****
  begin
    if Index >= Count then
!     raise EInstantError.CreateResFmt(@SIndexOutOfBounds, [Index]);
    Enumerator := TInstantCacheEnumerator.Create(Self);
    try
--- 9254,9258 ----
  begin
    if Index >= Count then
!     raise EInstantError.CreateFmt(SIndexOutOfBounds, [Index]);
    Enumerator := TInstantCacheEnumerator.Create(Self);
    try
***************
*** 9510,9514 ****
  begin
    if not Assigned(ABroker) then
!     raise EInstantError.CreateRes(@SUnassignedBroker);
  end;
  
--- 9506,9510 ----
  begin
    if not Assigned(ABroker) then
!     raise EInstantError.Create(SUnassignedBroker);
  end;
  
***************
*** 9541,9545 ****
          raise
        else
!         raise EInstantError.CreateResFmt(@SErrorDisposingObject,
            [AObject.ClassName, AObject.Id, E.Message], E);
    end;
--- 9537,9541 ----
          raise
        else
!         raise EInstantError.CreateFmt(SErrorDisposingObject,
            [AObject.ClassName, AObject.Id, E.Message], E);
    end;
***************
*** 9602,9606 ****
          raise
        else
!         raise EInstantError.CreateResFmt(@SErrorRefreshingObject,
            [AObject.ClassName, AObject.Id, E.Message], E);
    end;
--- 9598,9602 ----
          raise
        else
!         raise EInstantError.CreateFmt(SErrorRefreshingObject,
            [AObject.ClassName, AObject.Id, E.Message], E);
    end;
***************
*** 9641,9645 ****
          raise
        else
!         raise EInstantError.CreateResFmt(@SErrorRetrievingObject,
            [AObject.ClassName, AObjectId, E.Message], E);
    end;
--- 9637,9641 ----
          raise
        else
!         raise EInstantError.CreateFmt(SErrorRetrievingObject,
            [AObject.ClassName, AObjectId, E.Message], E);
    end;
***************
*** 9673,9677 ****
          raise
        else
!         raise EInstantError.CreateResFmt(@SErrorStoringObject,
            [AObject.ClassName, AObject.Id, E.Message], E);
    end;
--- 9669,9673 ----
          raise
        else
!         raise EInstantError.CreateFmt(SErrorStoringObject,
            [AObject.ClassName, AObject.Id, E.Message], E);
    end;
***************
*** 9735,9739 ****
        Result := AClassMetadata.MemberMap.Find(AttribName);
        if not Assigned(Result) then
!         raise EInstantError.CreateResFmt(@SAttributeNotFound,
            [AttribName, AClassMetadata.Name]);
        if Result.Category = acElement then
--- 9731,9735 ----
        Result := AClassMetadata.MemberMap.Find(AttribName);
        if not Assigned(Result) then
!         raise EInstantError.CreateFmt(SAttributeNotFound,
            [AttribName, AClassMetadata.Name]);
        if Result.Category = acElement then
***************
*** 9783,9787 ****
    Result := FQuery;
    if not Assigned(Result) then
!     raise EInstantError.CreateRes(@SUnassignedQuery);
  end;
  
--- 9779,9783 ----
    Result := FQuery;
    if not Assigned(Result) then
!     raise EInstantError.Create(SUnassignedQuery);
  end;
  
***************
*** 9824,9828 ****
    Result := FConnector;
    if not Assigned(Result) then
!     raise EInstantError.CreateRes(@SUnassignedConnector);
  end;
  
--- 9820,9824 ----
    Result := FConnector;
    if not Assigned(Result) then
!     raise EInstantError.Create(SUnassignedConnector);
  end;
  
***************
*** 9902,9906 ****
    Result := FConnector;
    if not Assigned(Result) then
!     raise EInstantError.CreateRes(@SUnassignedConnector);
  end;
  
--- 9898,9902 ----
    Result := FConnector;
    if not Assigned(Result) then
!     raise EInstantError.Create(SUnassignedConnector);
  end;
  
***************
*** 10423,10427 ****
    Result := InternalGetObjectClassMetadata;
    if not Assigned(Result) then
!     raise EInstantError.CreateResFmt(@SUnassignedClassMetadata,
       [Command.ObjectClassName]);
  end;
--- 10419,10423 ----
    Result := InternalGetObjectClassMetadata;
    if not Assigned(Result) then
!     raise EInstantError.CreateFmt(SUnassignedClassMetadata,
       [Command.ObjectClassName]);
  end;
***************
*** 10620,10624 ****
            if Assigned(Result) and
              not Result.IsAttributeClass(TInstantReference) then
!             raise EInstantError.CreateResFmt(@SUnableToQueryAttribute,
                [Result.ClassMetadataName, Result.Name]);
            FieldName := FieldName + RootAttribToFieldName(AttribName);
--- 10616,10620 ----
            if Assigned(Result) and
              not Result.IsAttributeClass(TInstantReference) then
!             raise EInstantError.CreateFmt(SUnableToQueryAttribute,
                [Result.ClassMetadataName, Result.Name]);
            FieldName := FieldName + RootAttribToFieldName(AttribName);
***************
*** 10641,10651 ****
                  ClassMeta := Result.ObjectClassMetadata;
                end else
!                 raise EInstantError.CreateResFmt(@SAttributeNotQueryable,
                    [Result.ClassName, Result.Name, Result.ClassMetadataName]);
              end else
!               raise EInstantError.CreateResFmt(@SClassNotQueryable,
                  [Result.ClassMetadataName]);
            end else
!             raise EInstantError.CreateResFmt(@SAttributeNotFound,
                [AttribName, ClassMeta.Name]);
          end;
--- 10637,10647 ----
                  ClassMeta := Result.ObjectClassMetadata;
                end else
!                 raise EInstantError.CreateFmt(SAttributeNotQueryable,
                    [Result.ClassName, Result.Name, Result.ClassMetadataName]);
              end else
!               raise EInstantError.CreateFmt(SClassNotQueryable,
                  [Result.ClassMetadataName]);
            end else
!             raise EInstantError.CreateFmt(SAttributeNotFound,
                [AttribName, ClassMeta.Name]);
          end;
***************
*** 11129,11133 ****
  begin
    if not Assigned(ABroker) then
!     raise EInstantError.CreateRes(@SUnassignedBroker);
    inherited Create;
    FBroker := ABroker;
--- 11125,11129 ----
  begin
    if not Assigned(ABroker) then
!     raise EInstantError.Create(SUnassignedBroker);
    inherited Create;
    FBroker := ABroker;
***************
*** 11169,11173 ****
    else
      ObjectClassName := '';
!   Result := EInstantKeyViolation.CreateResFmt(@SKeyViolation,
      [ObjectClassName, AObjectId], E);
  end;
--- 11165,11169 ----
    else
      ObjectClassName := '';
!   Result := EInstantKeyViolation.CreateFmt(SKeyViolation,
      [ObjectClassName, AObjectId], E);
  end;
***************
*** 11428,11432 ****
    Result := Field.AsInteger <> AObject.UpdateCount;
    if Result and (ConflictAction = caFail) then
!     raise EInstantConflict.CreateResFmt(@SUpdateConflict,
        [AObject.ClassName, AObjectId]);
  end;
--- 11424,11428 ----
    Result := Field.AsInteger <> AObject.UpdateCount;
    if Result and (ConflictAction = caFail) then
!     raise EInstantConflict.CreateFmt(SUpdateConflict,
        [AObject.ClassName, AObjectId]);
  end;
***************
*** 11625,11629 ****
      end;
    end else if Map.IsRootMap and (ConflictAction = caFail) then
!     raise EInstantConflict.CreateResFmt(@SDisposeConflict,
        [AObject.ClassName, AObject.PersistentId])
  end;
--- 11621,11625 ----
      end;
    end else if Map.IsRootMap and (ConflictAction = caFail) then
!     raise EInstantConflict.CreateFmt(SDisposeConflict,
        [AObject.ClassName, AObject.PersistentId])
  end;
***************
*** 12886,12890 ****
  begin
    // must be implemented in derived broker
!   raise EInstantError.CreateResFmt(@SUnsupportedUsePreparedQuery, [ClassName]);
  end;
  
--- 12882,12886 ----
  begin
    // must be implemented in derived broker
!   raise EInstantError.CreateFmt(SUnsupportedUsePreparedQuery, [ClassName]);
  end;
  
***************
*** 12910,12914 ****
  begin
    // must be implemented in derived broker
!   raise EInstantError.CreateResFmt(@SUnsupportedUsePreparedQuery, [ClassName]);
  end;
  
--- 12906,12910 ----
  begin
    // must be implemented in derived broker
!   raise EInstantError.CreateFmt(SUnsupportedUsePreparedQuery, [ClassName]);
  end;
  
***************
*** 13276,13280 ****
  begin
    if Info.Conflict then
!     raise EInstantConflict.CreateResFmt(@SUpdateConflict,
        [AObject.ClassName, AObject.Id]);
  end;
--- 13272,13276 ----
  begin
    if Info.Conflict then
!     raise EInstantConflict.CreateFmt(SUpdateConflict,
        [AObject.ClassName, AObject.Id]);
  end;
***************
*** 13284,13288 ****
  begin
    if not Assigned(AMap) then
!     raise EInstantError.CreateRes(@SUnassignedMap);
    inherited Create(ABroker);
    FMap := AMap;
--- 13280,13284 ----
  begin
    if not Assigned(AMap) then
!     raise EInstantError.Create(SUnassignedMap);
    inherited Create(ABroker);
    FMap := AMap;
***************
*** 13690,13694 ****
  var
    Params: TParams;
!   AInfo: PInstantOperationInfo;
    NewUpdateCount, RowsAffected: Integer;
  
--- 13686,13690 ----
  var
    Params: TParams;
!   AInfo: TInstantOperationInfo;
    NewUpdateCount, RowsAffected: Integer;
  

Index: InstantTextFiler.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantTextFiler.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstantTextFiler.pas	20 Jul 2004 11:07:49 -0000	1.2
--- InstantTextFiler.pas	22 Feb 2005 08:05:04 -0000	1.3
***************
*** 25,29 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli: porting Kylix
   *
   * ***** END LICENSE BLOCK ***** *)
--- 25,29 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli, Nando Dessena
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 194,198 ****
  begin
    if not Assigned(AStream) then
!     raise EInstantError.CreateRes(@SUnassignedStream);
    FStream := AStream;
    FFreeStream := FreeStream;
--- 194,198 ----
  begin
    if not Assigned(AStream) then
!     raise EInstantError.Create(SUnassignedStream);
    FStream := AStream;
    FFreeStream := FreeStream;

Index: InstantUtils.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantUtils.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstantUtils.pas	20 Jul 2004 11:07:49 -0000	1.2
--- InstantUtils.pas	22 Feb 2005 08:05:04 -0000	1.3
***************
*** 25,29 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli: porting Kylix
   *
   * ***** END LICENSE BLOCK ***** *)
--- 25,29 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli, Nando Dessena
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 523,527 ****
          Length(InstantTimeFormat)));
    else
!     raise EInstantConversionError.CreateResFmt(@SInvalidDateTime, [Str]);
    end;
  end;
--- 523,527 ----
          Length(InstantTimeFormat)));
    else
!     raise EInstantConversionError.CreateFmt(SInvalidDateTime, [Str]);
    end;
  end;

Index: InstantCommand.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantCommand.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstantCommand.pas	2 Feb 2004 20:52:15 -0000	1.1
--- InstantCommand.pas	22 Feb 2005 08:05:03 -0000	1.2
***************
*** 24,28 ****
   * the Initial Developer. All Rights Reserved.
   *
!  * Contributor(s):
   *
   * ***** END LICENSE BLOCK ***** *)
--- 24,28 ----
   * the Initial Developer. All Rights Reserved.
   *
!  * Contributor(s): Nando Dessena
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 660,664 ****
  procedure TInstantIQLObject.InvalidTokenError(const Token: string);
  begin
!   raise EInstantError.CreateResFmt(@SInvalidToken, [Token]);
  end;
  
--- 660,664 ----
  procedure TInstantIQLObject.InvalidTokenError(const Token: string);
  begin
!   raise EInstantError.CreateFmt(SInvalidToken, [Token]);
  end;
  
***************
*** 709,713 ****
    ExpectedToken: string);
  begin
!   raise EInstantError.CreateResFmt(@SUnexpectedToken,
      [ActualToken, ExpectedToken]);
  end;
--- 709,713 ----
    ExpectedToken: string);
  begin
!   raise EInstantError.CreateFmt(SUnexpectedToken,
      [ActualToken, ExpectedToken]);
  end;
***************
*** 1487,1496 ****
        UnreadToken;
      if not ReadChild(@FSpecifier, Reader, [TInstantIQLSpecifier]) then
!       raise EInstantIQLError.CreateRes(@SSpecifierMissing);
      Token := ReadToken;
      if not SameText(Token, 'FROM') then
        UnexpectedTokenError(Token, 'FROM');
      if not ReadChild(@FClassRef, Reader, [TInstantIQLClassRef]) then
!       raise EInstantIQLError.CreateRes(@SClassReferenceMissing);
      Token := ReadToken;
      if SameText(Token, 'WHERE') then
--- 1487,1496 ----
        UnreadToken;
      if not ReadChild(@FSpecifier, Reader, [TInstantIQLSpecifier]) then
!       raise EInstantIQLError.Create(SSpecifierMissing);
      Token := ReadToken;
      if not SameText(Token, 'FROM') then
        UnexpectedTokenError(Token, 'FROM');
      if not ReadChild(@FClassRef, Reader, [TInstantIQLClassRef]) then
!       raise EInstantIQLError.Create(SClassReferenceMissing);
      Token := ReadToken;
      if SameText(Token, 'WHERE') then
***************
*** 1563,1567 ****
    Result := FCommand;
    if not Assigned(Result) then
!     raise EInstantError.CreateRes(@SUnassignedCommandObject);
  end;
  
--- 1563,1567 ----
    Result := FCommand;
    if not Assigned(Result) then
!     raise EInstantError.Create(SUnassignedCommandObject);
  end;
  
***************
*** 1600,1604 ****
  begin
    if not Assigned(ATranslator) then
!     raise EInstantIQLError.CreateRes(@SUnassignedTranslator);
    FTranslator := ATranslator;
    inherited Create(AStream, FreeStream);
--- 1600,1604 ----
  begin
    if not Assigned(ATranslator) then
!     raise EInstantIQLError.Create(SUnassignedTranslator);
    FTranslator := ATranslator;
    inherited Create(AStream, FreeStream);

Index: InstantClasses.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantClasses.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantClasses.pas	10 Feb 2005 23:06:28 -0000	1.4
--- InstantClasses.pas	22 Feb 2005 08:05:02 -0000	1.5
***************
*** 25,31 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli: porting Kylix
!  * Marco Cantù (WriteEscapedData fixed for correct XML encodings)
!  * Carlo Barazzetta: blob streaming in XML format (Part, Parts, References)
   *
   * ***** END LICENSE BLOCK ***** *)
--- 25,29 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli, Marco Cantù, Nando Dessena
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 65,68 ****
--- 63,69 ----
      constructor CreateResFmt(ResStringRec: PResStringRec;
        const Args: array of const; E: TObject = nil);
+     constructor Create(const Msg: string; E: TObject = nil);
+     constructor CreateFmt(const Msg: string;
+       const Args: array of const; E: TObject = nil);
      destructor Destroy; override;
      property OriginalException: TObject read FOriginalException;
***************
*** 438,442 ****
    if Assigned(AClass) and Assigned(MinimumClass) then
      if not AClass.InheritsFrom(MinimumClass) then
!       raise EInstantError.CreateResFmt(@SInvalidClass,
          [AClass.ClassName, MinimumClass.ClassName]);
  end;
--- 439,443 ----
    if Assigned(AClass) and Assigned(MinimumClass) then
      if not AClass.InheritsFrom(MinimumClass) then
!       raise EInstantError.CreateFmt(SInvalidClass,
          [AClass.ClassName, MinimumClass.ClassName]);
  end;
***************
*** 557,560 ****
--- 558,574 ----
  { EInstantError }
  
+ constructor EInstantError.Create(const Msg: string; E: TObject);
+ begin
+   inherited Create(Msg);
+   Initialize(E);
+ end;
+ 
+ constructor EInstantError.CreateFmt(const Msg: string;
+   const Args: array of const; E: TObject);
+ begin
+   inherited CreateFmt(Msg, Args);
+   Initialize(E);
+ end;
+ 
  constructor EInstantError.CreateRes(ResStringRec: PResStringRec;
    E: TObject);
***************
*** 873,877 ****
      Position := Position - 1;
      SkipValue;
!     raise EReadError.CreateRes(@SInvalidPropertyValue);
    end;
    Stream := TMemoryStream.Create;
--- 887,891 ----
      Position := Position - 1;
      SkipValue;
!     raise EReadError.Create(SInvalidPropertyValue);
    end;
    Stream := TMemoryStream.Create;
***************
*** 903,907 ****
        Result := TInstantCollectionItemClass(ObjectClass).CreateInstance(Arg)
      else
!       raise EInstantStreamError.CreateResFmt(@SClassNotStreamable,
          [ObjectClass.ClassName]);
    end;
--- 917,921 ----
        Result := TInstantCollectionItemClass(ObjectClass).CreateInstance(Arg)
      else
!       raise EInstantStreamError.CreateFmt(SClassNotStreamable,
          [ObjectClass.ClassName]);
    end;
***************
*** 917,921 ****
        Result := AObject
      else
!       raise EInstantStreamError.CreateResFmt(@SUnexpectedClass,
          [ObjectClassName, AObject.ClassName])
    else
--- 931,935 ----
        Result := AObject
      else
!       raise EInstantStreamError.CreateFmt(SUnexpectedClass,
          [ObjectClassName, AObject.ClassName])
    else
***************
*** 993,997 ****
      TInstantCollectionItem(AObject).WriteObject(Self)
    else
!     raise EInstantStreamError.CreateResFmt(@SClassNotStreamable,
        [AObject.ClassName]);
    WriteListEnd;
--- 1007,1011 ----
      TInstantCollectionItem(AObject).WriteObject(Self)
    else
!     raise EInstantStreamError.CreateFmt(SClassNotStreamable,
        [AObject.ClassName]);
    WriteListEnd;
***************
*** 1367,1371 ****
  begin
    if not (Token = AToken) then
!     raise EInstantError.CreateResFmt(@SInvalidToken,
        [GetEnumName(TypeInfo(TInstantXMLToken), Ord(Token))]);
  end;
--- 1381,1385 ----
  begin
    if not (Token = AToken) then
!     raise EInstantError.CreateFmt(SInvalidToken,
        [GetEnumName(TypeInfo(TInstantXMLToken), Ord(Token))]);
  end;
***************
*** 1713,1717 ****
          end;
        else
!         raise EInstantStreamError.CreateRes(@SInvalidValueType);
        end;
    end;
--- 1727,1731 ----
          end;
        else
!         raise EInstantStreamError.Create(SInvalidValueType);
        end;
    end;
***************
*** 1801,1805 ****
         end;
      else
!       raise EInstantStreamError.CreateRes(@SInvalidValueType);
      end;
      Processor.ReadTag;
--- 1815,1819 ----
         end;
      else
!       raise EInstantStreamError.Create(SInvalidValueType);
      end;
      Processor.ReadTag;