Port to g-i generated glib2 bindings

Includes switch to FPC -Mobjfpc and related pointer style fixes.

1 files changed, 28 insertions, 28 deletions

diff --git a/UEngines.pas b/UEngines.pas
index 7a0ccad..4373910 100644
--- a/UEngines.pas
+++ b/UEngines.pas
@@ -21,7 +21,7 @@ unit UEngines;
 
 interface
 
-uses glib2, gdk2, Classes, ULibc;
+uses lazglib2, gdk2, Classes, ULibc;
 
 
 const omRead = 0;
@@ -182,7 +182,7 @@ function DuplicateDataItem(DataItem: PDataItemSL): PDataItemSL; overload;
 
 implementation
 
-uses SysUtils, UCoreUtils, UGnome, UError;
+uses SysUtils, UCoreUtils, UError;
 
 (********************************************************************************************************************************)
 constructor TPanelEngine.Create;
@@ -244,13 +244,13 @@ begin
   Result := False;
   try
     if libc_chdir(PChar(APath)) <> 0 then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CHDIR), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CHDIR), '%m', []);
       DebugMsg(['*** TLocalTreeEngine.GetListing(APath=', APath, '): chdir error: ', strerror(errno)]);
       Exit;
     end;
     Handle := opendir(PChar(APath));
     if Handle = nil then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPENDIR), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPENDIR), '%m', []);
       DebugMsg(['*** TLocalTreeEngine.GetListing(APath=', APath, '): opendir() handle == NULL: ', strerror(errno)]);
       Exit;
     end;
@@ -291,7 +291,7 @@ begin
   StatBuf := malloc(sizeof(Tstat64));
   memset(StatBuf, 0, sizeof(Tstat64));
   if lstat64(PChar(APath), StatBuf) <> 0 then begin
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_STAT), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_STAT), '%m', []);
     DebugMsg(['*** TLocalTreeEngine.GetFileInfo(APath=', APath, '): Error reading file via lstat64: ', strerror(errno)]);
     libc_free(StatBuf);
     Result := nil;
@@ -390,12 +390,12 @@ begin
   try
     APath := IncludeTrailingPathDelimiter(NewPath);
     if libc_chdir(PChar(APath)) <> 0 then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CHDIR), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CHDIR), '%m', []);
       Exit;
     end;
     Handle := opendir(PChar(APath));
     if Handle = nil then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPENDIR), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPENDIR), '%m', []);
       Exit;
     end;
 {    if not Assigned(readdir(Handle)) then begin
@@ -403,7 +403,7 @@ begin
       Exit;
     end; }
     if closedir(Handle) <> 0 then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPENDIR), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPENDIR), '%m', []);
       Exit;
     end;
     Result := True;
@@ -473,7 +473,7 @@ begin
   Result := False;
   if __mkdir(PChar(NewDir), OctalToAttr(ConfDefaultDirCreationMask)) <> 0 then begin
     if Self.DirectoryExists(NewDir, False) or (@g_mkdir_with_parents = nil) or (g_mkdir_with_parents(PChar(NewDir), OctalToAttr(ConfDefaultDirCreationMask)) <> 0)
-      then g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_MKDIR), '%m')
+      then g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_MKDIR), '%m', [])
       else Result := True;
   end else Result := True;
 end;
@@ -483,7 +483,7 @@ function TLocalTreeEngine.Remove(const APath: string; Error: PPGError): boolean;
 begin
   Result := False;
   if libc_remove(PChar(ExcludeTrailingPathDelimiter(APath))) <> 0 then begin
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_REMOVE), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_REMOVE), '%m', []);
   end else Result := True;
 end;
 
@@ -492,7 +492,7 @@ function TLocalTreeEngine.MakeSymLink(const NewFileName, PointTo: string; Error:
 begin
   Result := False;
   if symlink(PChar(PointTo), PChar(NewFileName)) <> 0 then begin
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SYMLINK), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SYMLINK), '%m', []);
   end else Result := True;
 end;
 
@@ -501,7 +501,7 @@ function TLocalTreeEngine.Chmod(const FileName: string; Mode: cuLong; Error: PPG
 begin
   Result := False;
   if libc_chmod(PChar(FileName), Mode) <> 0 then begin
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CHMOD), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CHMOD), '%m', []);
   end else Result := True;
 end;
 
@@ -510,7 +510,7 @@ function TLocalTreeEngine.Chown(const FileName: string; UID, GID: cuLong; Error:
 begin
   Result := False;
   if libc_chown(PChar(FileName), UID, GID) <> 0 then begin
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CHOWN), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CHOWN), '%m', []);
   end else Result := True;
 end;
 
@@ -519,7 +519,7 @@ function TLocalTreeEngine.RenameFile(const SourceFile, DestFile: string; Error:
 begin
   Result := False;
   if libc_rename(PChar(SourceFile), PChar(DestFile)) <> 0 then begin
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_RENAME), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_RENAME), '%m', []);
   end else Result := True;
 end;
 
@@ -534,7 +534,7 @@ begin
     timebuf^.actime := atime;
     timebuf^.modtime := mtime;
     if utime(PChar(APath), timebuf) <> 0 then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_TIMESTAMPS), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_TIMESTAMPS), '%m', []);
     end else Result := True;
     libc_free(timebuf);
   except
@@ -565,7 +565,7 @@ begin
     //  Open source file for reading
     fsrc := open64(PChar(SourceFile), ConfDefaultOpenFlagsRead, 0);
     if fsrc < 0 then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SOURCE_OPEN), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SOURCE_OPEN), '%m', []);
       if @ProgressFunc <> nil then
         ProgressFunc(Sender, 0, Error^);
       Exit;
@@ -574,7 +574,7 @@ begin
     if Append then fdest := open64(PChar(DestFile), ConfDefaultOpenFlagsAppend, 0)
               else fdest := open64(PChar(DestFile), ConfDefaultOpenFlagsWrite, ConfDefaultFileCreationMask);
     if fdest < 0 then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_TARGET_OPEN), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_TARGET_OPEN), '%m', []);
       libc_close(fsrc);
       if @ProgressFunc <> nil then
         ProgressFunc(Sender, 0, Error^);
@@ -583,7 +583,7 @@ begin
 
     Buffer := malloc(FBlockSize);
     if Buffer = nil then begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_ALLOC_FAILED), '%m');
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_ALLOC_FAILED), '%m', []);
       libc_close(fdest);
       libc_close(fsrc);
       if @ProgressFunc <> nil then
@@ -596,7 +596,7 @@ begin
       //  Read block
       BytesRead := libc_read(fsrc, Buffer, FBlockSize);
       if BytesRead < 0 then begin
-        g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SOURCE_READ), '%m');
+        g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SOURCE_READ), '%m', []);
         Result := False;
         if @ProgressFunc <> nil then
           Result := ProgressFunc(Sender, BytesDone + BytesRead, Error^);
@@ -617,7 +617,7 @@ begin
             BytesRemaining := BytesRemaining - BytesWritten;
         until (BytesRemaining = 0) or (BytesWritten <= 0);
         if BytesWritten < 0 then begin
-          g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_TARGET_WRITE), '%m');
+          g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_TARGET_WRITE), '%m', []);
           Result := False;
           if @ProgressFunc <> nil then
             ProgressFunc(Sender, BytesDone + BytesRead, Error^);
@@ -635,7 +635,7 @@ begin
 
     if libc_close(fdest) <> 0 then
       if Result then begin
-        g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_TARGET_CLOSE), '%m');
+        g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_TARGET_CLOSE), '%m', []);
         Result := False;
         if @ProgressFunc <> nil then
           ProgressFunc(Sender, BytesDone, Error^);
@@ -644,7 +644,7 @@ begin
       end;
     if libc_close(fsrc) <> 0 then
       if Result then begin
-        g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SOURCE_CLOSE), '%m');
+        g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SOURCE_CLOSE), '%m', []);
         Result := False;
         if @ProgressFunc <> nil then
           Result := ProgressFunc(Sender, BytesDone, Error^);
@@ -813,13 +813,13 @@ begin
              end;
     omAppend: flags := ConfDefaultOpenFlagsAppend;
     else begin
-      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPEN_FILE), 'Invalid file mode %d', Mode);
+      g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPEN_FILE), 'Invalid file mode %d', [Mode]);
       Exit;
     end;
   end;
 
   r := open64(PChar(APath), flags, m);
-  if r < 0 then g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPEN_FILE), '%m')
+  if r < 0 then g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_OPEN_FILE), '%m', [])
            else Result := Pointer(r);
 end;
 
@@ -828,7 +828,7 @@ function TLocalTreeEngine.ReadFile(const FileDescriptor: TEngineFileDes; Buffer:
 begin
   Result := libc_read(LongInt(FileDescriptor), Buffer, ABlockSize);
   if Result < 0 then
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_READ_FILE), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_READ_FILE), '%m', []);
 end;
 
 (********************************************************************************************************************************)
@@ -836,7 +836,7 @@ function TLocalTreeEngine.WriteFile(const FileDescriptor: TEngineFileDes; Buffer
 begin
   Result := libc_write(LongInt(FileDescriptor), Buffer, BytesCount);
   if Result < 0 then
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_WRITE_FILE), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_WRITE_FILE), '%m', []);
 end;
 
 (********************************************************************************************************************************)
@@ -844,7 +844,7 @@ function TLocalTreeEngine.CloseFile(const FileDescriptor: TEngineFileDes; Error:
 begin
   Result := libc_close(LongInt(FileDescriptor)) = 0;
   if not Result then
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CLOSE_FILE), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CLOSE_FILE), '%m', []);
 end;
 
 (********************************************************************************************************************************)
@@ -852,7 +852,7 @@ function TLocalTreeEngine.FileSeek(const FileDescriptor: TEngineFileDes; const A
 begin
   Result := lseek64(LongInt(FileDescriptor), AbsoluteOffset, SEEK_SET);
   if Result = -1 then
-    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SEEK), '%m');
+    g_set_error(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_SEEK), '%m', []);
 end;
 
 (********************************************************************************************************************************)