DEL: remove uMyDarwin

(cherry picked from commit 32c962239f)
2026-06-21 09:58:13 +00:00 · 2025-12-11 18:12:56 +08:00 · 2025-12-11 18:12:56 +08:00 · 73a39fe186
commit 73a39fe186
parent 10e79ae4d2
17 changed files with 14 additions and 61 deletions
--- a/src/doublecmd.lpr
+++ b/src/doublecmd.lpr
@ -52,7 +52,6 @@ uses
  {$ENDIF}
  {$IFDEF darwin}
  uAppleMagnifiedModeFix,
-  uMyDarwin,
  uDarwinApplication,
  uiCloudDriveConfig,
  {$ENDIF}
--- a/src/filesources/filesystem/ufilesystemfilesource.pas
+++ b/src/filesources/filesystem/ufilesystemfilesource.pas
@ -148,7 +148,7 @@ uses
 {$IFDEF UNIX}
  BaseUnix, uUsersGroups, LazUTF8, DCUnix, uMyUnix,
  {$IFDEF DARWIN}
-  uMyDarwin, uDarwinFileUtil,
+  uDarwinFileUtil,
  {$ENDIF}
  {$IFDEF LINUX}
  statx,
--- a/src/fmain.pas
+++ b/src/fmain.pas
@ -57,7 +57,6 @@ uses
  , Glib2, Gtk2
  {$ELSEIF DEFINED(DARWIN)}
  , CocoaConfig
-  , uMyDarwin
  , uDarwinApplication
  , uDarwinFileView
  {$ENDIF}
--- a/src/platform/uOSUtils.pas
+++ b/src/platform/uOSUtils.pas
@ -197,7 +197,7 @@ uses
  {$IF DEFINED(UNIX)}
  , BaseUnix, Unix, uMyUnix, dl
    {$IF DEFINED(DARWIN)}
-  , CocoaAll, uMyDarwin
+  , CocoaAll
    {$ELSEIF NOT DEFINED(HAIKU)}
  , uGio, uClipboard, uXdg, uKde
    {$ENDIF}
--- a/src/platform/udrivewatcher.pas
+++ b/src/platform/udrivewatcher.pas
@ -65,7 +65,7 @@ uses
   , uUDisks, uUDev, uMountWatcher, DCStrUtils, uOSUtils, FileUtil, uGVolume, DCOSUtils
   {$ENDIF}
   {$IFDEF DARWIN}
-   , StrUtils, uMyDarwin, uDarwinFSWatch, uDarwinIO, ExtCtrls
+   , StrUtils, uDarwinFSWatch, uDarwinIO, ExtCtrls
   {$ENDIF}
   {$IFDEF HAIKU}
   , BaseUnix, DCHaiku
--- a/src/platform/unix/darwin/ucocoamodernformconfig.inc
+++ b/src/platform/unix/darwin/ucocoamodernformconfig.inc
@ -10,7 +10,7 @@ uses
  LCLType, Forms, Menus,
  fMain, uDCUtils, uLng,
  uFileView, uBriefFileView, uColumnsFileView, uThumbFileView,
-  uMyDarwin, uDarwinUtil, uDarwinApplication, uDarwinFileUtil,
+  uDarwinUtil, uDarwinApplication, uDarwinFileUtil,
  uDarwinFinder, uDarwinFinderModel, uDarwinFileView, uDarwinPanel,
  CocoaAll, CocoaConfig, CocoaToolBar, Cocoa_Extra;

--- a/src/platform/unix/darwin/uiclouddrive.pas
+++ b/src/platform/unix/darwin/uiclouddrive.pas
@ -13,7 +13,7 @@ uses
  uFileSource, uFileSourceOperationTypes, uFileSourceManager,
  uFileSourceWatcher, uMountedFileSource, uVfsModule,
  uDCUtils, uLng, uGlobs,
-  uMyDarwin, uDarwinApplication, uDarwinFSWatch, uDarwinSimpleFSWatch,
+  uDarwinApplication, uDarwinFSWatch, uDarwinSimpleFSWatch,
  uDarwinFileUtil, uDarwinImageUtil,
  CocoaAll, CocoaUtils;

--- a/src/platform/unix/darwin/uiclouddriveutil.pas
+++ b/src/platform/unix/darwin/uiclouddriveutil.pas
@ -8,8 +8,7 @@ interface
 uses
  Classes, SysUtils, fgl, Graphics,
  CocoaAll, CocoaUtils,
-  uDCUtils, uMyDarwin, uDarwinFileUtil,
-  uiCloudDriveConfig;
+  uDCUtils, uDarwinFileUtil, uiCloudDriveConfig;

 type

--- a/src/platform/unix/darwin/umydarwin.pas
+++ b/src/platform/unix/darwin/umydarwin.pas
@ -1,44 +0,0 @@
-{
-   Double Commander
-   -------------------------------------------------------------------------
-   This unit contains specific DARWIN functions.
-
-   Copyright (C) 2016-2024 Alexander Koblov (alexx2000@mail.ru)
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
-}
-
-unit uMyDarwin;
-
-{$mode delphi}
-{$modeswitch objectivec2}
-
-interface
-
-uses
-  Classes, SysUtils, UnixType,
-  InterfaceBase, Menus, Controls, Forms,
-  uFileProperty, uDisplayFile, uFileView, uColumnsFileView,
-  uLng,
-  MacOSAll, CocoaAll, QuickLookUI,
-  CocoaUtils, CocoaInt, CocoaPrivate, CocoaConst, CocoaMenus, Cocoa_Extra,
-  uDarwinApplication, uDarwinFSWatch, uDarwinFinder, uDarwinFinderModel, uDarwinUtil;
-
-implementation
-
-uses
-  DynLibs;
-
-end.
--- a/src/platform/unix/udefaultterminal.pas
+++ b/src/platform/unix/udefaultterminal.pas
@ -32,7 +32,7 @@ implementation

 {$IF DEFINED(DARWIN)}
 uses
-  uOSUtils, uMyDarwin, uDarwinFileUtil;
+  uOSUtils, uDarwinFileUtil;

 procedure Initialize;
 var
--- a/src/platform/unix/umyunix.pas
+++ b/src/platform/unix/umyunix.pas
@ -174,7 +174,7 @@ uses
  , uFontConfig, uMimeActions, uMimeType, uGVolume
 {$ENDIF}
 {$IFDEF DARWIN}
-  , uMyDarwin, uDarwinFileUtil
+  , uDarwinFileUtil
 {$ENDIF}
 {$IFDEF LINUX}
  , uUDisks2
--- a/src/platform/unix/upipeserver.pas
+++ b/src/platform/unix/upipeserver.pas
@ -33,7 +33,7 @@ implementation
 uses
  SimpleIPC, BaseUnix, uPollThread
 {$IF DEFINED(DARWIN)}
-  , uMyDarwin, uDarwinFileUtil
+  , uDarwinFileUtil
 {$ELSE}
  , uXdg
 {$ENDIF}
--- a/src/platform/unix/ushellcontextmenu.pas
+++ b/src/platform/unix/ushellcontextmenu.pas
@ -78,7 +78,7 @@ uses
  uOSUtils, uFileProcs, uShellExecute, uLng, uPixMapManager, uMyUnix, uOSForms,
  fMain, fFileProperties, DCOSUtils, DCStrUtils, uExts, uArchiveFileSourceUtil, uSysFolders
  {$IF DEFINED(DARWIN)}
-  , LCLStrConsts, MacOSAll, CocoaAll, uMyDarwin, uDarwinApplication, uDarwinPanel, uDarwinUtil
+  , LCLStrConsts, MacOSAll, CocoaAll, uDarwinApplication, uDarwinPanel, uDarwinUtil
  {$ELSEIF NOT DEFINED(HAIKU)}
  , uKeyFile, uMimeActions
    {$IF DEFINED(LINUX)}
--- a/src/platform/uosforms.pas
+++ b/src/platform/uosforms.pas
@ -147,7 +147,7 @@ uses
  {$IF DEFINED(DARWIN)}
  , LCLStrConsts
  , BaseUnix, Errors, fFileProperties
-  , uQuickLook, uOpenDocThumb, uMyDarwin, uDarwinApplication, uDarwinFileUtil, uDefaultTerminal
+  , uQuickLook, uOpenDocThumb, uDarwinApplication, uDarwinFileUtil, uDefaultTerminal
  {$ELSEIF DEFINED(UNIX)}
  , BaseUnix, Errors, fFileProperties, uJpegThumb, uOpenDocThumb
    {$IF NOT DEFINED(HAIKU)}
--- a/src/platform/upixmapmanager.pas
+++ b/src/platform/upixmapmanager.pas
@ -56,7 +56,7 @@ uses
  {$ELSEIF DEFINED(UNIX)}
  , DCFileAttributes
    {$IF DEFINED(DARWIN)}
-    , CocoaAll, MacOSAll, CocoaUtils, uDarwinUtil, uDarwinFileUtil, uMyDarwin
+    , CocoaAll, MacOSAll, CocoaUtils, uDarwinUtil, uDarwinFileUtil
    {$ELSEIF NOT DEFINED(HAIKU)}
    , Math, Contnrs, uGio, uXdg
      {$IFDEF GTK2_FIX}
--- a/src/platform/usysfolders.pas
+++ b/src/platform/usysfolders.pas
@ -62,7 +62,7 @@ uses
 {$IF DEFINED(UNIX)}
  , BaseUnix, Unix, DCUnix
  {$IF DEFINED(DARWIN)}
-  , CocoaAll, uMyDarwin, uDarwinFileUtil
+  , CocoaAll, uDarwinFileUtil
  {$ELSEIF DEFINED(HAIKU)}
  , DCHaiku
  {$ELSE}
--- a/src/umaincommands.pas
+++ b/src/umaincommands.pas
@ -30,7 +30,7 @@ uses
  Classes, SysUtils, ActnList, uFileView, uFileViewNotebook, uFileSourceOperation,
  uGlobs, uFileFunctions, uFormCommands, uFileSorting, uShellContextMenu, Menus, ufavoritetabs,ufile
 {$IFDEF DARWIN}
-  , uMyDarwin, uDarwinFileView
+  , uDarwinFileView
 {$ENDIF}
  ;