From 8487ec272eaadcb60b778d440eba9e108282bf63 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 17 Nov 2009 16:37:34 +0100 Subject: Fix some compiler warnings and hints --- UMain.pas | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'UMain.pas') diff --git a/UMain.pas b/UMain.pas index d80bafd..6bba15b 100644 --- a/UMain.pas +++ b/UMain.pas @@ -1130,8 +1130,9 @@ procedure TFMain.FormClose(Sender: TObject; var Action: TCloseAction); end; var i: integer; - b, DontShowAgain: boolean; - res: TMessageButton; + b: boolean; +(* DontShowAgain: boolean; + res: TMessageButton; *) s: string; begin // Find all opened connections and warn user @@ -1732,7 +1733,7 @@ end; procedure TFMain.ChangingDir(LeftPanel: boolean; NewPath: string; HiliString1: string = ''; HiliString2: string = ''; const PreserveSelection: boolean = False; const AutoFallback: boolean = False; Plugin: TVFSPlugin = nil); var ListView: TGTKListView; Engine: TPanelEngine; - s, ss: string; + s: string; i, Sel: integer; b: boolean; tt: TDateTime; @@ -2610,7 +2611,7 @@ var i: integer; NewPath, NewPathx, SelSingle, NextItem1, NextItem2: string; AWorkingThread: TWorkerThread; AFProgress: TFProgress; - CurrentEngine, OppositeEngine: TPanelEngine; + OppositeEngine: TPanelEngine; p: PChar; BypassSelAll: boolean; begin @@ -2635,10 +2636,8 @@ begin end; if LeftPanel then begin - CurrentEngine := LeftPanelEngine; OppositeEngine := RightPanelEngine; end else begin - CurrentEngine := RightPanelEngine; OppositeEngine := LeftPanelEngine; end; @@ -4051,6 +4050,7 @@ var LeftPanel: boolean; begin try InternalLock; + Stat := nil; if LeftListView.Focused then LeftPanel := True else if RightListView.Focused then LeftPanel := False else LeftPanel := LeftLastFocused; @@ -4148,6 +4148,7 @@ var LeftPanel: boolean; begin try InternalLock; + Stat := nil; if LeftListView.Focused then LeftPanel := True else if RightListView.Focused then LeftPanel := False else LeftPanel := LeftLastFocused; @@ -5931,16 +5932,16 @@ function TFMain.NotebookMoveTabToAnotherNotebook(Sender: TObject; Destination: T var LeftPanel: boolean; ATargetEngine, ASrcEngine: TPanelEngine; ATargetTabList, ASrcTabList: TStringList; - ATargetPathsHighlight, ASrcPathsHighlight: TStringList; - ATargetTabEngines, ASrcTabEngines: TList; - ATargetTabSortIDs, ASrcTabSortIDs: TList; +(* ATargetPathsHighlight, ASrcPathsHighlight: TStringList; + ATargetTabEngines, *) ASrcTabEngines: TList; +(* ATargetTabSortIDs, ASrcTabSortIDs: TList; ATargetTabSortTypes, ASrcTabSortTypes: TList; + DontShowAgain: boolean; *) APath: string; - DontShowAgain: boolean; dst_no: integer; begin Result := False; - DontShowAgain := False; +(* DontShowAgain := False; *) DebugMsg([' *** NotebookMoveTabToAnotherNotebook(SourceTabNo = ', SourceTabNo, ', DestTabNo = ', DestTabNo, ')']); LeftPanel := Sender = LeftPanelNotebook; if LeftPanel then begin @@ -5948,27 +5949,27 @@ begin ATargetTabList := RightPanelTabs; ASrcEngine := LeftPanelEngine; ASrcTabList := LeftPanelTabs; - ATargetPathsHighlight := RightPathsHighlight; + ASrcTabEngines := LeftTabEngines; +(* ATargetPathsHighlight := RightPathsHighlight; ATargetTabEngines := RightTabEngines; ATargetTabSortIDs := RightTabSortIDs; ATargetTabSortTypes := RightTabSortTypes; ASrcPathsHighlight := LeftPathsHighlight; - ASrcTabEngines := LeftTabEngines; ASrcTabSortIDs := LeftTabSortIDs; - ASrcTabSortTypes := LeftTabSortTypes; + ASrcTabSortTypes := LeftTabSortTypes; *) end else begin ATargetEngine := LeftPanelEngine; ATargetTabList := LeftPanelTabs; ASrcEngine := RightPanelEngine; ASrcTabList := RightPanelTabs; - ATargetPathsHighlight := LeftPathsHighlight; + ASrcTabEngines := RightTabEngines; +(* ATargetPathsHighlight := LeftPathsHighlight; ATargetTabEngines := LeftTabEngines; ATargetTabSortIDs := LeftTabSortIDs; ATargetTabSortTypes := LeftTabSortTypes; ASrcPathsHighlight := RightPathsHighlight; - ASrcTabEngines := RightTabEngines; ASrcTabSortIDs := RightTabSortIDs; - ASrcTabSortTypes := RightTabSortTypes; + ASrcTabSortTypes := RightTabSortTypes; *) end; if (SourceTabNo < 0) or (SourceTabNo > ASrcTabList.Count - 1) then begin @@ -6333,6 +6334,7 @@ var LeftPanel: boolean; begin try InternalLock; + Stat := nil; if LeftListView.Focused then LeftPanel := True else if RightListView.Focused then LeftPanel := False else LeftPanel := LeftLastFocused; @@ -6562,7 +6564,6 @@ var s: string; DataList: TList; err: integer; begin - Result := False; s := IncludeTrailingPathDelimiter(ConfTempPath) + 'tuxcmd-XXXXXX'; tmp := strdup(PChar(s)); tmp := mkdtemp(tmp); -- cgit v1.2.3