Consequently use full qualified unit name in uses.

Author: joachimmarder

Lib/UIRibbon.Register.pas

@@ -1,9 +1,10 @@
-unit UIRibbon.Register;
+unit UIRibbon.Register;
 
 interface
 
 uses
-  DesignIntf, DesignEditors;
+  DesignIntf,
+  DesignEditors;
 
 type
   // Adds ability to start RibbonDesigner to right click menu of TUIRibbon control in IDE desginer

Lib/UIRibbon.pas

@@ -1,4 +1,4 @@
-unit UIRibbon;
+unit UIRibbon;
 
 { Windows Ribbon Framework for Delphi
   ===================================
@@ -21,14 +21,14 @@
 interface
 
 uses
-  Messages,
-  Windows,
-  Graphics,
-  Generics.Collections,
-  Controls,
-  Classes,
-  ImgList,
-  ActnList,
+  WinApi.Messages,
+  WinApi.Windows,
+  System.Generics.Collections,
+  System.Classes,
+  Vcl.Graphics,
+  Vcl.Controls,
+  Vcl.ImgList,
+  Vcl.ActnList,
   UIRibbonApi,
   UIRibbonCommands;
 
@@ -572,21 +572,21 @@   TUIRibbon = class(TWinControl, IUIApplication)
 implementation
 
 uses
-  SysUtils,
-  Actions,
-  ActiveX,
-  ComObj,
-  Dialogs,
-  PropSys,
-  Forms,
-  Menus,
-  GraphUtil,
-  Math,
-  UITypes,
-  UIRibbonActions,
-  UIRibbonUtils,
+  System.SysUtils,
+  System.Actions,
   System.Win.Registry,
-  Vcl.ActnMan;
+  System.Win.ComObj,
+  System.Math,
+  System.UITypes,
+  WinApi.ActiveX,
+  WinApi.PropSys,
+  Vcl.Dialogs,
+  Vcl.Forms,
+  Vcl.Menus,
+  Vcl.GraphUtil,
+  Vcl.ActnMan,
+  UIRibbonActions,
+  UIRibbonUtils;
 
 type
   TUICommandAccess = class(TUICommand);
@@ -1025,7 +1025,7 @@ function TUIRibbon.HandleShortCut(const pMessage: TWMKey): Boolean;
   lShortCut: TShortCut;
 begin
   lShiftState := KeyDataToShiftState(pMessage.KeyData);
-  lShortCut := Menus.ShortCut(pMessage.CharCode, lShiftState);
+  lShortCut := ShortCut(pMessage.CharCode, lShiftState);
   Result := (lShortCut <> scNone) and Self.HandleShortCut(lShortCut);
 end;
 
@@ -1223,7 +1223,7 @@ procedure TUIRibbon.Load();
         // http://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/b38da1e9-34a0-440a-bdf0-bb293940dd0c/win8-ribbon-colors
         lForm.Color := RGB(254,254,254)
       else
-        lForm.Color := GraphUtil.GetHighLightColor(Self.BackgroundColor);//  TColorHelper.IncreaseRgbValues(FRibbon.BackgroundColor, 17, 12, 10)
+        lForm.Color := Vcl.GraphUtil.GetHighLightColor(Self.BackgroundColor);//  TColorHelper.IncreaseRgbValues(FRibbon.BackgroundColor, 17, 12, 10)
     end;//if clBtnFace
   end;
 end;

Lib/UIRibbonActions.pas

@@ -4,12 +4,12 @@ interface
 
 uses
   System.Classes,
+  System.Generics.Collections,
+  Winapi.ActiveX,
   Vcl.Menus,
-  ActnList,
-  ActnMan,
+  Vcl.ActnList,
+  Vcl.ActnMan,
   UIRibbonCommands,
-  System.Generics.Collections,
-  Winapi.ActiveX, 
   UIRibbonApi;
 
 type
@@ -252,13 +252,11 @@   TRecentItemAction = class(TRibbonAction<TUICommandRecentItems>)
 implementation
 
 uses
-  Controls,
-  UIRibbon,
-  {$if CompilerVersion >= 24}
   System.Actions,
-  {$endif}
   System.SysUtils,
-  System.Math;
+  System.Math,
+  Vcl.Controls,
+  UIRibbon;
 
 const
   cNoSelection = -1;

Lib/UIRibbonApi.pas

@@ -18,8 +18,8 @@
 interface
 
 uses
-  Windows,
-  ActiveX;
+  WinApi.Windows,
+  WinApi.ActiveX;
 
 {$HPPEMIT '#ifdef _WIN64'}
   {$HPPEMIT '#pragma link "UIRibbonPackage.a"'}
@@ -655,9 +655,9 @@ function UIPropertyToIUnknownArrayAlloc(const Key: TUIPropertyKey; const PropVar
 implementation
 
 uses
-  ComObj,
-  ShLwApi,
-  SysUtils,
+  System.Win.ComObj,
+  WinApi.ShLwApi,
+  System.SysUtils,
   WinApiEx;
 
 

Lib/UIRibbonCommands.pas

@@ -3,20 +3,20 @@
 interface
 
 uses
-  Generics.Collections,
-  Windows,
-  Messages,
-  Graphics,
-  Classes,
-  ActiveX,
-  Rtti,
-  ComCtrls,
-  RichEdit,
-  PropSys,
-  ActnList,
-  UIRibbonApi,
-  PNGImage,
+  System.Generics.Collections,
+  System.Rtti,
+  System.Classes,
+  WinApi.Windows,
+  WinApi.Messages,
+  WinApi.ActiveX,
+  WinApi.RichEdit,
+  WinApi.PropSys,
+  Vcl.Graphics,
+  Vcl.ComCtrls,
+  Vcl.ActnList,
+  Vcl.Imaging.PNGImage,
   Vcl.ImgList,
+  UIRibbonApi,
   System.UITypes;
 
 const
@@ -1301,12 +1301,12 @@ function GetProperty(const Key: TUIPropertyKey): TUIProperty;
 implementation
 
 uses
-  Menus,
-  Forms,
-  SysUtils,
-  CommCtrl,
+  System.SysUtils,
+  Vcl.Menus,
+  Vcl.Forms,
+  Vcl.Controls,
+  WinApi.CommCtrl,
   WinApiEx,
-  Controls,
   UIRibbon,
   UIRibbonActions;
 
@@ -2176,12 +2176,12 @@ procedure TUICommand.SetPropertyValue(const Key: TUIPropertyKey;
 
 procedure TUICommand.SetShortCut(const Shift: TShiftState; const Key: Word);
 begin
-  FShortCut := Menus.ShortCut(Key, Shift);
+  FShortCut := Vcl.Menus.ShortCut(Key, Shift);
 end;
 
 procedure TUICommand.SetShortCut(const Shift: TShiftState; const Key: Char);
 begin
-  FShortCut := Menus.ShortCut(Ord(Key), Shift);
+  FShortCut := Vcl.Menus.ShortCut(Ord(Key), Shift);
 end;
 
 procedure TUICommand.SetSmallImage(const Value: TUIImage);
@@ -4268,7 +4268,7 @@ function TUIImage.GetBitmap: HBITMAP;
 
 procedure TUIImage.GetBitmapProperties;
 var
-  Props: Windows.TBitmap;
+  Props: WinApi.Windows.TBitmap;
 begin
   if (GetObject(FBitmap, SizeOf(Props), @Props) <> 0) then
   begin

Lib/UIRibbonUtils.pas

@@ -3,8 +3,8 @@
 interface
 
 uses
-  Graphics,
-  GraphUtil,
+  Vcl.Graphics,
+  Vcl.GraphUtil,
   UIRibbonApi;
 
 function HsbToColor(const Hsb: TUIHsbColor): TColor; overload;
@@ -26,8 +26,8 @@ function CreateStringFromResource(const ResourceId: Integer): String;
 implementation
 
 uses
-  Windows,
-  ActiveX;
+  WinApi.Windows,
+  WinApi.ActiveX;
 
 function HsbToColor(const Hsb: TUIHsbColor): TColor;
 var

Lib/WinApiEx.pas

@@ -7,9 +7,9 @@ interface
 {$WARN SYMBOL_PLATFORM OFF}
 
 uses
-  Windows,
-  ActiveX,
-  ShlObj;
+  WinApi.Windows,
+  WinApi.ActiveX,
+  WinApi.ShlObj;
 
 type
   PSHORT = ^SHORT;
@@ -217,7 +217,7 @@ function VarUI2FromDec(const Input: TDecimal; out Output: UInt16): HRESULT; stdc
 implementation
 
 uses
-  ShLwApi;
+  WinApi.ShLwApi;
 
 {$REGION 'PropIdl.h'}
 const