浏览代码

fcl-db: base: consistent usage of AsInteger and AsLongint. Bug #24456

git-svn-id: trunk@24558 -
lacak 12 年之前
父节点
当前提交
371deafcdc
共有 2 个文件被更改,包括 9 次插入9 次删除
  1. 5 5
      packages/fcl-db/src/base/db.pas
  2. 4 4
      packages/fcl-db/src/base/fields.inc

+ 5 - 5
packages/fcl-db/src/base/db.pas

@@ -330,7 +330,7 @@ type
     function GetAsDateTime: TDateTime; virtual;
     function GetAsFloat: Double; virtual;
     function GetAsLongint: Longint; virtual;
-    function GetAsInteger: Longint; virtual;
+    function GetAsInteger: Integer; virtual;
     function GetAsVariant: variant; virtual;
     function GetOldValue: variant; virtual;
     function GetAsString: string; virtual;
@@ -677,12 +677,12 @@ type
     function GetAsBoolean: Boolean; override;
     function GetAsString: string; override;
     function GetAsVariant: variant; override;
-    function GetAsInteger: Longint; override;
+    function GetAsLongint: Longint; override;
     function GetDataSize: Integer; override;
     function GetDefaultWidth: Longint; override;
     procedure SetAsBoolean(AValue: Boolean); override;
     procedure SetAsString(const AValue: string); override;
-    procedure SetAsInteger(AValue: Integer); override;
+    procedure SetAsLongint(AValue: Longint); override;
     procedure SetVarValue(const AValue: Variant); override;
   public
     constructor Create(AOwner: TComponent); override;
@@ -942,8 +942,8 @@ type
     function GetAsFloat: Double; override;
     procedure SetAsFloat(aValue: Double); override;
 
-    function GetAsInteger: Longint; override;
-    procedure SetAsInteger(aValue: Longint); override;
+    function GetAsLongint: Longint; override;
+    procedure SetAsLongint(aValue: Longint); override;
 
     function GetAsString: string; override;
     procedure SetAsString(const aValue: string); override;

+ 4 - 4
packages/fcl-db/src/base/fields.inc

@@ -1978,12 +1978,12 @@ begin
     Result:=Length(FDisplays[false,True]);
 end;
 
-function TBooleanField.GetAsInteger: integer;
+function TBooleanField.GetAsLongint: Longint;
 begin
   Result := ord(GetAsBoolean);
 end;
 
-procedure TBooleanField.SetAsInteger(AValue: Integer);
+procedure TBooleanField.SetAsLongint(AValue: Longint);
 begin
   SetAsBoolean(AValue<>0);
 end;
@@ -3102,7 +3102,7 @@ begin
   Result := GetAsVariant;
 end;
 
-function TVariantField.GetAsInteger: Longint;
+function TVariantField.GetAsLongint: Longint;
 begin
   Result := GetAsVariant;
 end;
@@ -3138,7 +3138,7 @@ begin
   SetVarValue(aValue);
 end;
 
-procedure TVariantField.SetAsInteger(aValue: Longint);
+procedure TVariantField.SetAsLongint(aValue: Longint);
 begin
   SetVarValue(aValue);
 end;