tvplanit: Inc version number to 1.0.9. Less hints and warnings.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6130 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2018-01-12 12:42:12 +00:00
parent 12ae2ed3c8
commit 37bb56a6cd
16 changed files with 41 additions and 49 deletions
--- a/components/tvplanit/source/addons/zeos/vpzeosds.pas
+++ b/components/tvplanit/source/addons/zeos/vpzeosds.pas
@@ -40,7 +40,7 @@ type
  public
    constructor Create(AOwner: TComponent); override;
    procedure CreateTables;
-    function GetNextID(TableName: string): integer; override;
+    function GetNextID({%H-}TableName: string): integer; override;

    property ResourceTable;
    property EventsTable;
--- a/components/tvplanit/source/vpalarmdlg.pas
+++ b/components/tvplanit/source/vpalarmdlg.pas
@@ -307,7 +307,6 @@ end;
 procedure TAlarmNotifyForm.PositionControls;
 var
  w, h: Integer;
-  b: TButton;
  i: Integer;
  cnv: TControlCanvas;
 begin
--- a/components/tvplanit/source/vpbase.pas
+++ b/components/tvplanit/source/vpbase.pas
@@ -370,7 +370,7 @@ type

  TVpHintWindow = class(THintWindow)
  public
-    function CalcHintRect(MaxWidth: Integer; const AHint: String;
+    function CalcHintRect({%H-}MaxWidth: Integer; const AHint: String;
      AData: pointer): TRect; override;
  end;

--- a/components/tvplanit/source/vpcontactgrid.pas
+++ b/components/tvplanit/source/vpcontactgrid.pas
@@ -195,11 +195,6 @@ type
    procedure EditContact;
    procedure EndEdit(Sender: TObject);
    procedure InitializeDefaultPopup;
-    {$IF VP_LCL_SCALING = 2}
-    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
-    {$ELSEIF VP_LCL_SCALING = 1}
-    procedure ScaleFontsPPI(const AProportion: Double); override;
-    {$ENDIF}

    { message handlers }
    {$IFNDEF LCL}
@@ -245,6 +240,12 @@ type
    { - Added to support the buttonbar component.                         }
    function SelectContactByName(const Name: String): Boolean;           

+    {$IF VP_LCL_SCALING = 2}
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
+    {$ELSEIF VP_LCL_SCALING = 1}
+    procedure ScaleFontsPPI(const AProportion: Double); override;
+    {$ENDIF}
+
    property ActiveContact: TVpContact read FActiveContact;
    property ContactIndex: Integer read FContactIndex write SetContactIndex;

--- a/components/tvplanit/source/vpdayview.pas
+++ b/components/tvplanit/source/vpdayview.pas
@@ -389,13 +389,6 @@ type
    procedure EndEdit(Sender: TObject);
    procedure KeyDown(var Key: Word; Shift: TShiftState); override;
    procedure SetTimeIntervals(UseGran: TVpGranularity);
-    {$IF VP_LCL_SCALING = 2}
-    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
-    {$ELSE}
-    {$IF VP_LCL_SCALING = 1}
-    procedure ScaleFontsPPI(const AProportion: Double); override;
-    {$ENDIF}
-    {$ENDIF}

    { message handlers }
    procedure VpDayViewInit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message Vp_DayViewInit;
@@ -441,6 +434,14 @@ type
      Angle: TVpRotationAngle; Scale: Extended; RenderDate: TDateTime;
      StartLine, StopLine: Integer; UseGran: TVpGranularity; DisplayOnly: Boolean); override;

+    {$IF VP_LCL_SCALING = 2}
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
+    {$ELSE}
+    {$IF VP_LCL_SCALING = 1}
+    procedure ScaleFontsPPI(const AProportion: Double); override;
+    {$ENDIF}
+    {$ENDIF}
+
    property ActiveEvent: TVpEvent read FActiveEvent write FActiveEvent;
    property TopHour: TVpHours read FTopHour write SetTopHour;
    property TopLine: Integer read FTopLine write SetTopLine;
--- a/components/tvplanit/source/vpedfmtlst.pas
+++ b/components/tvplanit/source/vpedfmtlst.pas
@@ -342,7 +342,6 @@ end;
 function TfrmPrnFormat.DirtyPrompt: Integer;
 var
  msg: String;
-  fn: String;
 begin
  if FormatFileName = '' then
    msg := RSSaveFormatChangesToFile
--- a/components/tvplanit/source/vpjsonds.pas
+++ b/components/tvplanit/source/vpjsonds.pas
@@ -7,7 +7,7 @@ unit VpJSONDs;
 interface

 uses
-  SysUtils, Classes, db, fpjson,
+  SysUtils, Classes, fpjson,
  VpData, VpBaseDS;

 type
@@ -67,7 +67,7 @@ implementation
 uses
  LazFileUtils,
  jsonparser,
-  VpConst, VpSR, VpMisc;
+  VpSR, VpMisc;

 constructor TVpJSONDatastore.Create(AOwner: TComponent);
 begin
@@ -646,7 +646,6 @@ var
  cont: TVpContact;
  task: TvpTask;
  i, j: Integer;
-  s: String;
  stream: TStream;
 begin
  if FFilename = '' then
--- a/components/tvplanit/source/vpmisc.pas
+++ b/components/tvplanit/source/vpmisc.pas
@@ -964,7 +964,6 @@ procedure LoadGlyphFromRCDATA(AGlyph: TBitmap; AResName: String);
 var
  stream: TResourceStream;
  pic: TPicture;
-  bmp: TBitmap;
 begin
  stream := TResourceStream.Create(HINSTANCE, AResName, RT_RCDATA);
  try
@@ -983,8 +982,6 @@ end;
 procedure LoadGlyphFromRCDATA(AGlyph: TBitmap; ABaseResName: String;
  ALowRes, AMedRes, AHighRes: Integer);
 var
-  stream: TResourceStream;
-  pic: TPicture;
  ppiFactor: Integer;
  resName: String;
 begin
--- a/components/tvplanit/source/vpmonthview.pas
+++ b/components/tvplanit/source/vpmonthview.pas
@@ -233,11 +233,6 @@ type
    procedure MouseMove(Shift: TShiftState; X,Y: Integer); override;
    procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
    procedure Paint; override;
-    {$IF VP_LCL_SCALING = 2}
-    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
-    {$ELSEIF VP_LCL_SCALING = 1}
-    procedure ScaleFontsPPI(const AProportion: Double); override;
-    {$ENDIF}

    { drag and drop }
    procedure DoEndDrag(Target: TObject; X, Y: Integer); override;
@@ -294,6 +289,12 @@ type
      StartLine, StopLine: Integer; UseGran: TVpGranularity;
      DisplayOnly: Boolean); override;

+    {$IF VP_LCL_SCALING = 2}
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
+    {$ELSEIF VP_LCL_SCALING = 1}
+    procedure ScaleFontsPPI(const AProportion: Double); override;
+    {$ENDIF}
+
    property Date: TDateTime read FDate write SetDate;

  published
@@ -1117,14 +1118,11 @@ end;
 {=====}

 procedure TVpMonthView.ShowHintWindow(APoint: TPoint; ADate: TDateTime);
-const
-  MaxWidth = 400;
 var
  txt, s: String;
  i: Integer;
  event: TVpEvent;
  list: TList;
-  R: TRect;
  holiday: String = '';
  todayDate: TDate;
 begin
@@ -1413,9 +1411,6 @@ end;

 procedure TVpMonthView.MouseDown(Button: TMouseButton; Shift: TShiftState;
  X,Y: Integer);
-var
-  oldDate: TDate;
-  i: Integer;
 begin
  inherited;

--- a/components/tvplanit/source/vptasklist.pas
+++ b/components/tvplanit/source/vptasklist.pas
@@ -189,11 +189,6 @@ type
    procedure EditTask;
    procedure EndEdit(Sender: TObject);
    procedure KeyDown(var Key: Word; Shift: TShiftState); override;
-    {$IF VP_LCL_SCALING = 2}
-    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
-    {$ELSEIF VP_LCL_SCALING = 1}
-    procedure ScaleFontsPPI(const AProportion: Double); override;
-    {$ENDIF}

    { message handlers }
    {$IFNDEF LCL}
@@ -224,6 +219,12 @@ type
      Angle: TVpRotationAngle; Scale: Extended; RenderDate: TDateTime;
      StartLine, StopLine: Integer; UseGran: TVpGranularity; DisplayOnly: Boolean); override;

+    {$IF VP_LCL_SCALING = 2}
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
+    {$ELSEIF VP_LCL_SCALING = 1}
+    procedure ScaleFontsPPI(const AProportion: Double); override;
+    {$ENDIF}
+
    property ActiveTask: TVpTask read FActiveTask;
    property TaskIndex: Integer read GetTaskIndex write SetTaskIndex;

--- a/components/tvplanit/source/vptasklistpainter.pas
+++ b/components/tvplanit/source/vptasklistpainter.pas
@@ -90,7 +90,7 @@ var
  dx, dy: Integer;
  tm: Integer;   // Scaled text margin;
  d2: Integer;   // 2*Scale
-  d1px, d2px, d3px: Integer;
+  {%H-}d1px, {%H-}d2px, d3px: Integer;
 begin
  if Scale > 1 then
    tm := Round(TextMargin * Scale) else
--- a/components/tvplanit/source/vpweekview.pas
+++ b/components/tvplanit/source/vpweekview.pas
@@ -223,11 +223,6 @@ type
    procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
    procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
    procedure Paint; override;
-    {$IF VP_LCL_SCALING = 2}
-    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
-    {$ELSEIF VP_LCL_SCALING = 1}
-    procedure ScaleFontsPPI(const AProportion: Double); override;
-    {$ENDIF}

    { drag and drop }
    procedure DoEndDrag(Target: TObject; X, Y: Integer); override;
@@ -273,6 +268,12 @@ type
      StartLine: Integer; StopLine: Integer; UseGran: TVpGranularity;
      DisplayOnly: Boolean); override;

+    {$IF VP_LCL_SCALING = 2}
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
+    {$ELSEIF VP_LCL_SCALING = 1}
+    procedure ScaleFontsPPI(const AProportion: Double); override;
+    {$ENDIF}
+
    property ActiveEvent: TVpEvent read FActiveEvent write SetActiveEvent;
    property Date: TDateTime read FActiveDate write SetActiveDate;
    property VisibleLines: Integer read FVisibleLines;
@@ -1048,7 +1049,6 @@ end;
 procedure TVpWeekView.ShowHintWindow(APoint: TPoint; AEvent: TVpEvent);
 var
  txt: String;
-  R, eventR: TRect;
 begin
  HideHintWindow;
  case FHintMode of