--- oup/current/Tools/RawEdit.pas	2007/02/21 03:12:33	109
+++ oup/current/Tools/RawEdit.pas	2007/02/25 17:20:22	113
@@ -38,10 +38,10 @@ type
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
 
-    function GetValue(datatype: Word; offset: LongWord): String;
+    function GetValue(datatype: Word; offset: Integer): String;
     procedure ClearValues;
     procedure WriteValues;
-    procedure SetNewValue(datatype: Word; offset: LongWord; Value: String);
+    procedure SetNewValue(datatype: Word; offset: Integer; Value: String);
 
     procedure value_viewerDblClick(Sender: TObject);
     procedure value_viewer_context_copyClick(Sender: TObject);
@@ -53,7 +53,7 @@ type
     procedure hexSelectionChanged(Sender: TObject);
     procedure hexChange(Sender: TObject);
   private
-    ConID, fileid, datoffset: Integer;
+    fileid, datoffset: Integer;
   public
   end;
 
@@ -100,7 +100,7 @@ end;
 
 procedure TForm_RawEdit.LoadRaw(raw_info: TRawDataInfo);
 var
-  i:    LongWord;
+  i:    Integer;
   mem: TMemoryStream;
 begin
   if hex.Modified then
@@ -114,7 +114,7 @@ begin
   begin
     for i := 0 to filelist.Count - 1 do
     begin
-      if ConManager.Connection[ConID].ExtractFileIDOfName(filelist.Items.Strings[i]) = Raw_Info.SrcID then
+      if ConManager.Connection[ConnectionID].ExtractFileIDOfName(filelist.Items.Strings[i]) = Raw_Info.SrcID then
       begin
         filelist.ItemIndex := i;
         listClick(Self);
@@ -131,7 +131,7 @@ begin
     end;
   end;
   mem := nil;
-  ConManager.Connection[ConID].LoadRawFile(raw_info.SrcID, raw_info.SrcOffset, TStream(mem));
+  ConManager.Connection[ConnectionID].LoadRawFile(raw_info.SrcID, raw_info.SrcOffset, TStream(mem));
   hex.LoadFromStream(mem);
   ClearValues;
   hexSelectionChanged(Self);
@@ -147,13 +147,13 @@ begin
   ClearValues;
   datoffset := StrToInt('$' + MidStr(
     list_offset.Items.Strings[list_offset.ItemIndex], 3, 8));
-  LoadRaw(ConManager.Connection[ConID].GetRawInfo(fileid, datoffset));
+  LoadRaw(ConManager.Connection[ConnectionID].GetRawInfo(fileid, datoffset));
 end;
 
 
 
 
-function TForm_RawEdit.GetValue(datatype: Word; offset: LongWord): String;
+function TForm_RawEdit.GetValue(datatype: Word; offset: Integer): String;
 var
   Data: TByteData;
   i:    Word;
@@ -227,7 +227,7 @@ var
   i, j:  Integer;
   Data:  TByteData;
   str:   String;
-  Value: LongWord;
+  Value: Integer;
   floatformat: TFormatSettings;
 begin
   floatformat.DecimalSeparator := '.';
@@ -339,7 +339,7 @@ end;
 
 procedure TForm_RawEdit.FormCreate(Sender: TObject);
 var
-  i:     LongWord;
+  i:     Integer;
   exts: String;
 begin
   inherited;
@@ -387,17 +387,17 @@ end;
 function TForm_RawEdit.Save: Boolean;
 var
   mem:  TMemoryStream;
-  i:    LongWord;
+  i:    Integer;
 begin
   case MessageBox(Self.Handle, PChar('Save changes to .raw-part of file ' +
-      ConManager.Connection[ConID].GetFileInfo(fileid).Name + '?'), PChar('Data changed...'),
+      ConManager.Connection[ConnectionID].GetFileInfo(fileid).Name + '?'), PChar('Data changed...'),
       MB_YESNOCANCEL) of
     idYes:
     begin
       mem := TMemoryStream.Create;
       hex.SaveToStream(mem);
       mem.Seek(0, soFromBeginning);
-      ConManager.Connection[ConID].UpdateRawFile(fileid, datoffset, mem);
+      ConManager.Connection[ConnectionID].UpdateRawFile(fileid, datoffset, mem);
       mem.Free;
       hex.Modified := False;
       for i := 0 to hex.Datasize - 1 do
@@ -505,10 +505,10 @@ var
   fs: TFileStream;
 begin
   saved.Filter     := 'Files of matching extension (*.' +
-    ConManager.Connection[ConID].GetFileInfo(fileid).Extension + ')|*.' +
-    ConManager.Connection[ConID].GetFileInfo(fileid).Extension +
+    ConManager.Connection[ConnectionID].GetFileInfo(fileid).Extension + ')|*.' +
+    ConManager.Connection[ConnectionID].GetFileInfo(fileid).Extension +
     '|All files|*.*';
-  saved.DefaultExt := ConManager.Connection[ConID].GetFileInfo(fileid).Extension;
+  saved.DefaultExt := ConManager.Connection[ConnectionID].GetFileInfo(fileid).Extension;
   if saved.Execute then
   begin
     fs := TFileStream.Create(saved.FileName, fmCreate);
@@ -524,20 +524,19 @@ procedure TForm_RawEdit.btn_importClick(
 var
 //  Data: Tdata;
   fs:   TFileStream;
-  data: TByteData;
   i: Integer;
   rawinfo: TRawDataInfo;
 begin
   opend.Filter := 'Files of matching extension (*.' +
-    ConManager.Connection[ConID].GetFileInfo(fileid).Extension + ')|*.' +
-    ConManager.Connection[ConID].GetFileInfo(fileid).Extension +
+    ConManager.Connection[ConnectionID].GetFileInfo(fileid).Extension + ')|*.' +
+    ConManager.Connection[ConnectionID].GetFileInfo(fileid).Extension +
     '|All files|*.*';
   if opend.Execute then
   begin
     fs := TFileStream.Create(opend.FileName, fmOpenRead);
     if fs.Size <> hex.DataSize then
     begin
-      if (not (CR_ResizeRaw in ConManager.Connection[ConID].ChangeRights)) and (not (CR_AppendRaw in ConManager.Connection[ConnectionID].ChangeRights)) then
+      if (not (CR_ResizeRaw in ConManager.Connection[ConnectionID].ChangeRights)) and (not (CR_AppendRaw in ConManager.Connection[ConnectionID].ChangeRights)) then
       begin
         ShowMessage('Can''t import ' + ExtractFilename(importd.FileName) +
             ', file has to have same size as file in .raw with this backend.' + CrLf +
@@ -557,14 +556,14 @@ begin
           Exit;
         end;
       end;
-      rawinfo := ConManager.Connection[ConID].GetRawInfo(fileid, datoffset);
-      if CR_ResizeRaw in ConManager.Connection[ConID].ChangeRights then
-        ConManager.Connection[ConID].UpdateRawFile(fileid, datoffset, fs)
-      else if CR_AppendRaw in ConManager.Connection[ConID].ChangeRights then
-        i := ConManager.Connection[ConID].AppendRawFile(rawinfo.LocSep, fs);
-        ConManager.Connection[ConID].UpdateDatFilePart(fileid, datoffset, 4, @i);
+      rawinfo := ConManager.Connection[ConnectionID].GetRawInfo(fileid, datoffset);
+      if CR_ResizeRaw in ConManager.Connection[ConnectionID].ChangeRights then
+        ConManager.Connection[ConnectionID].UpdateRawFile(fileid, datoffset, fs)
+      else if CR_AppendRaw in ConManager.Connection[ConnectionID].ChangeRights then
+        i := ConManager.Connection[ConnectionID].AppendRawFile(rawinfo.LocSep, fs);
+        ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, datoffset, 4, @i);
     end else begin
-      ConManager.Connection[ConID].UpdateRawFile(fileid, datoffset, fs);
+      ConManager.Connection[ConnectionID].UpdateRawFile(fileid, datoffset, fs);
     end;
     fs.Seek(0, soFromBeginning);
     hex.LoadFromStream(fs);
@@ -634,7 +633,7 @@ procedure TForm_RawEdit.value_viewer_con
 var
 //  i:     Byte;
   Name:  String;
-  Value: LongWord;
+  Value: Integer;
 begin
   Name := TMenuItem(Sender).Name;
   if Pos('asstring', Name) > 0 then
@@ -693,7 +692,7 @@ end;
 
 
 
-procedure TForm_RawEdit.SetNewValue(datatype: Word; offset: LongWord; Value: String);
+procedure TForm_RawEdit.SetNewValue(datatype: Word; offset: Integer; Value: String);
 var
   Data: TByteData;
   value_int: LongWord;
@@ -760,7 +759,7 @@ end;
 
 procedure TForm_RawEdit.value_viewerDblClick(Sender: TObject);
 var
-  offset:     LongWord;
+  offset:     Integer;
   datatype:   Word;
   objectname: String;
   Value:      String;