From 6809e8585430deb6b3f8ce9c6db3edd12fabf155 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Sat, 8 Aug 2015 14:50:16 +0000
Subject: [PATCH] Fix two errors due to changed function declarations in recent
 VirtualTree update.

---
 source/main.pas | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index 60f1b310..16d871cb 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -1,4 +1,4 @@
-unit Main;
+unit Main;
 
 
 // -------------------------------------
@@ -1567,7 +1567,7 @@ begin
         miFunction.Caption := '&-';
       miFunction.Hint := MySqlFunctions[j].Name + MySqlFunctions[j].Declaration + ' - ' + sstr(MySqlFunctions[j].Description, 200);
       // Prevent generating a seperator for ShortHint and LongHint
-      miFunction.Hint := StringReplace( miFunction.Hint, '|', '¦', [rfReplaceAll] );
+      miFunction.Hint := StringReplace( miFunction.Hint, '|', '¦', [rfReplaceAll] );
       miFunction.Tag := j;
       // Place menuitem on menu
       miFunction.OnClick := insertFunction;
@@ -1954,7 +1954,7 @@ begin
   Connection := ActiveConnection;
   // Find and remove connection node from tree
   Node := GetRootNode(DBtree, Connection);
-  DBTree.DeleteNode(Node, True);
+  DBTree.DeleteNode(Node);
   FConnections.Remove(Connection);
   // TODO: focus last session?
   SelectNode(DBtree, GetNextNode(DBtree, nil));
@@ -2570,7 +2570,7 @@ begin
     except on E:EDatabaseError do
       TabCaption := _('Result')+' #'+IntToStr(Tab.ResultTabs.Count);
     end;
-    TabCaption := TabCaption + ' (' + FormatNumber(Results.ColumnCount) + '×' + FormatNumber(Results.RecordCount) + ')';
+    TabCaption := TabCaption + ' (' + FormatNumber(Results.ColumnCount) + '×' + FormatNumber(Results.RecordCount) + ')';
     Tab.tabsetQuery.Tabs.Add(TabCaption);
 
     NewTab.Grid.BeginUpdate;
@@ -6609,7 +6609,7 @@ begin
     HintSQL[i] := sstr(HintSQL[i], 100);
     HintSQL[i] := StringReplace(HintSQL[i], #9, '    ', [rfReplaceAll]);
   end;
-  BalloonHint1.Description := FormatNumber(ResultTab.Results.ColumnCount) + ' columns × ' +
+  BalloonHint1.Description := FormatNumber(ResultTab.Results.ColumnCount) + ' columns × ' +
     FormatNumber(ResultTab.Results.RecordCount) + ' rows' + CRLF + CRLF +
     Trim(sstr(HintSQL.Text, SIZE_KB));
   Rect := Tabs.ItemRect(idx);
@@ -10310,7 +10310,7 @@ var
   Cap: String;
 begin
   // Set window caption and taskbar text
-  Cap := DBtree.Path(DBtree.FocusedNode, 0, ttNormal, '\') + ' - ' + APPNAME;
+  Cap := DBtree.Path(DBtree.FocusedNode, 0, '\') + ' - ' + APPNAME;
   if AppSettings.PortableMode then
     Cap := Cap + ' Portable';
   Cap := Cap + ' ' + FAppVersion;