Cosmetic: remove unused variables, units

TurboBird.lpi

@@ -18,7 +18,7 @@
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="1"/>
       <RevisionNr Value="1"/>
-      <BuildNr Value="1097"/>
+      <BuildNr Value="1098"/>
       <StringTable ProductVersion="0.9"/>
     </VersionInfo>
     <BuildModes Count="2">
@@ -100,7 +100,7 @@
         <PackageName Value="LCL"/>
       </Item6>
     </RequiredPackages>
-    <Units Count="38">
+    <Units Count="39">
       <Unit0>
         <Filename Value="TurboBird.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -389,6 +389,11 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="topologicalsort"/>
       </Unit37>
+      <Unit38>
+        <Filename Value="unitfirebirdservices.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UnitFirebirdServices"/>
+      </Unit38>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

TurboBird.lpr

@@ -22,7 +22,7 @@ uses
   NewDomain, SysTables, NewConstraint, NewEditField, Calen, Scriptdb,
   UserPermissions, TableManage, BackupRestore, CreateUser, ChangePass,
   PermissionManage, SQLHistory, CopyTable, dynlibs, ibase60dyn, dbInfo,
-  sysutils, Comparison, Update, topologicalsort;
+  sysutils, Comparison, Update, topologicalsort, UnitFirebirdServices;
 
 const
   Major = 1;

about.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ExtCtrls, StdCtrls, Buttons, URIParser, LCLIntf;
+  ExtCtrls, StdCtrls, Buttons, LCLIntf;
 
 const
   {$IFDEF LINUX}

backuprestore.pas

@@ -93,7 +93,6 @@ procedure TfmBackupRestore.bbStartClick(Sender: TObject);
 var
   FireBirdServices: TFirebirdServices;
   Res: Ansistring;
-  ADatabase: string;
 begin
   FireBirdServices:= TFirebirdServices.Create;
   try

comparison.pas

@@ -540,7 +540,7 @@ procedure TfmComparison.CheckMissingDBObjects;
 var
   List, ComparedList: TStringList;
   Count: Integer;
-  x, i, j: Integer;
+  x, i: Integer;
 begin
   List:= TStringList.Create;
   ComparedList:= TStringList.Create;
@@ -677,7 +677,7 @@ var
   FieldSize: Integer;
   FieldType, DefaultValue, Description: string;
   CFieldType, CDefaultValue, CDescription: string;
-  CFieldSize, CIsNull: Integer;
+  CFieldSize: Integer;
   NotNull, CNotNull: Boolean;
 begin
   meLog.Lines.Add('');
@@ -703,16 +703,14 @@ begin
 
     // Compare
     if (FieldType <> CFieldType) or ((FieldSize <> CFieldSize) and (not cxIgnoreLength.Checked)) or
-       (NotNull <> CNotNull) or (DefaultValue <> CDefaultValue)
-       or (Description <> CDescription) then
-       begin
-         meLog.Lines.Add(' ' + ExistFieldsList[i]);
-         ModifiedFieldsList.Add(ExistFieldsList[i]);
-         Inc(DiffCount);
-       end;
-
+      (NotNull <> CNotNull) or (DefaultValue <> CDefaultValue)
+      or (Description <> CDescription) then
+      begin
+        meLog.Lines.Add(' ' + ExistFieldsList[i]);
+        ModifiedFieldsList.Add(ExistFieldsList[i]);
+        Inc(DiffCount);
+      end;
   end;
-
 end;
 
 procedure TfmComparison.CheckModifiedIndices;
@@ -1833,8 +1831,6 @@ var
   i, j: Integer;
   List, ComparedList: TStringList;
   TablesList: TStringList;
-  PrimaryIndexName: string;
-  ConstraintName: string;
   Count: Integer;
 begin
   List:= TStringList.Create;
@@ -1879,7 +1875,6 @@ begin
           meLog.Lines.Add(' ' + List[j]);
           Inc(DiffCount);
         end;
-
       end;
     except
       on e: exception do

dbinfo.pas

@@ -54,7 +54,7 @@ implementation
 
 { TfmDBInfo }
 
-uses Main, SysTables;
+uses SysTables;
 
 procedure TfmDBInfo.bbCloseClick(Sender: TObject);
 begin

main.pas

@@ -510,7 +510,6 @@ procedure TfmMain.lmDisconnectClick(Sender: TObject);
 var
   dbIndex: Integer;
   i: Integer;
-  Form: TForm;
   j: Integer;
   TabSheet: TTabSheet;
 begin
@@ -573,8 +572,6 @@ begin
     ShowCompleteQueryWindow(dbIndex, 'get increment generator SQL for:' + AGenName,
       'select GEN_ID(' + AGenName + ', 1) from RDB$Database;');
   end;
-
-
 end;
 
 procedure TfmMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -886,10 +883,7 @@ end;
 function TfmMain.CreateNewTrigger(dbIndex: Integer; ATableName: string; OnCommitProcedure: TNotifyEvent = nil): Boolean;
 var
   QWindow: TfmQueryWindow;
-  AViewName: string;
-  TableNames: string;
   TrigType: string;
-  Count: Integer;
 begin
   Result:= False;
   if ATableName <> '' then
@@ -943,10 +937,7 @@ procedure TfmMain.lmCreateTriggerClick(Sender: TObject);
 var
   SelNode: TTreeNode;
   DBIndex: Integer;
-  QWindow: TfmQueryWindow;
-  AViewName: string;
   TableNames: string;
-  TrigType: string;
   Count: Integer;
 begin
   SelNode:= tvMain.Selected;
@@ -1032,9 +1023,6 @@ var
   Rec: TDatabaseRec;
   EditForm: TfmEditDataFullRec;
   ATableName: string;
-  i: Integer;
-  PKFieldsList: TStringList;
-  FieldLine: string;
   dbIndex: Integer;
 begin
   SelNode:= tvMain.Selected;
@@ -1094,9 +1082,6 @@ var
   Rec: TDatabaseRec;
   EditWindow: TfmEditTable;
   ATableName: string;
-  i: Integer;
-  PKFieldsList: TStringList;
-  FieldLine: string;
   dbIndex: Integer;
 begin
   SelNode:= tvMain.Selected;
@@ -1125,12 +1110,6 @@ var
   SelNode: TTreeNode;
   QWindow: TfmQueryWindow;
   ATriggerName: string;
-  Body: string;
-  AfterBefore: string;
-  Event: string;
-  OnTable: string;
-  TriggerEnabled: Boolean;
-  TriggerPosition: Integer;
 begin
   SelNode:= tvMain.Selected;
   if (SelNode <> nil) and (SelNode.Parent <> nil) then
@@ -1180,7 +1159,6 @@ var
   AQuery: TSQLQuery;
   i: Integer;
   IndexFields: string;
-  ATitle: string;
   Rec: TDatabaseRec;
   CurrentRow: Integer;
   FieldsList: TStringList;
@@ -1340,8 +1318,6 @@ end;
 procedure TfmMain.InitNewGen(DatabaseIndex: Integer);
 var
   Rec: TDatabaseRec;
-  TableNames: string;
-  Count: integer;
 begin
   Rec:= RegisteredDatabases[DatabaseIndex];
 
@@ -1363,7 +1339,6 @@ end;
 
 function TfmMain.GetServerNameNode(ServerName: string): TTreeNode;
 var
-  i: Integer;
   Node: TTreeNode;
 begin
   Node:= nil;
@@ -1932,7 +1907,6 @@ var
   SelNode: TTreeNode;
   QWindow: TfmQueryWindow;
   ATableName: string;
-  PKFieldsList: TStringList;
   FieldLine: string;
   FieldNames: string;
   ParamNames: string;
@@ -2295,8 +2269,6 @@ end;
 procedure TfmMain.lmSweepClick(Sender: TObject);
 var
   FireBirdServices: TFirebirdServices;
-  Res: Ansistring;
-  ADatabase: string;
   dbIndex: Integer;
   AdbName: string;
   Lines: string;
@@ -3087,8 +3059,6 @@ end;
 procedure TfmMain.ViewTableFields(ATableName: string; dbIndex: Integer;
   AStringGrid: TStringGrid);
 var
-  Rec: TDatabaseRec;
-  QWindow: TfmQueryWindow;
   i: Integer;
   PKFieldsList: TStringList;
   DefaultValue: string;
@@ -3186,7 +3156,6 @@ procedure TfmMain.lmDisplayViewClick(Sender: TObject);
 var
   SelNode: TTreeNode;
   Rec: TDatabaseRec;
-  QWindow: TfmQueryWindow;
   AViewName: string;
   ViewBody, Columns: string;
   dbIndex: Integer;
@@ -3900,7 +3869,6 @@ end;
 procedure TfmMain.tvMainExpanded(Sender: TObject; Node: TTreeNode);
 var
   Rec: TRegisteredDatabase;
-  Count: Integer;
 begin
   if (Node <> nil) then
   if (Node.Parent <> nil) and (Node.Parent.Parent = nil) then   // Expand database

permissionmanage.pas

@@ -526,7 +526,7 @@ end;
 
 procedure TfmPermissionManage.cxProcGrantChange(Sender: TObject);
 var
-  Index, ProcIndex: Integer;
+  Index: Integer;
 begin
   Index:= clbProcedures.ItemIndex;
   if Index <> -1 then
@@ -535,7 +535,7 @@ end;
 
 procedure TfmPermissionManage.cxRoleGrantChange(Sender: TObject);
 var
-  Index, RoleIndex: Integer;
+  Index: Integer;
 begin
   Index:= clbRoles.ItemIndex;
   if Index <> -1 then
@@ -546,7 +546,6 @@ procedure TfmPermissionManage.Init(dbIndex: integer; ATableName, AUserName: stri
   OnCommitProcedure: TNotifyEvent = nil);
 var
   Count: integer;
-  StoredProcs: string;
 begin
   fOnCommitProcedure:= OnCommitProcedure;
   ProcList:= TStringList.Create;

querywindow.pas

@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, IBConnection, sqldb, db, FileUtil, LResources, Forms,
   Controls, Graphics, Dialogs, ExtCtrls, PairSplitter, StdCtrls, Buttons,
-  DBGrids, Menus, ComCtrls, SynEdit, SynHighlighterSQL, Reg, sqlscript,
+  DBGrids, Menus, ComCtrls, SynEdit, SynHighlighterSQL, Reg,
   SynEditTypes, SynCompletion, Clipbrd, grids, DbCtrls, types, LCLType;
 
 type

scriptdb.pas

@@ -327,7 +327,6 @@ var
   ProceduresList: TStringList;
   ProcedureScript: TStringList;
   SPOwner: string;
-  SPBody: string;
 begin
   ProceduresList:= TStringList.Create;
   ProcedureScript:= TStringList.Create;
@@ -480,10 +479,9 @@ var
   CompositeCounter: integer;
   TableCounter: integer;
   TablesList: TStringList;
-  Line: string;
 
   procedure WriteResult(
-    const TableName, ConstraintName, CurrentFieldName, CurrentTableName,
+    const TableName, ConstraintName, CurrentFieldName,
     OtherFieldName, OtherTableName, DeleteRule, UpdateRule: string;
     var List: TStringList);
   const
@@ -565,7 +563,6 @@ begin
               WriteResult(TablesList[TableCounter],
                 ConstraintName,
                 CompositeClauseFK,
-                Trim(sqQuery.FieldByName('CurrentTableName').AsString),
                 CompositeClauseRef,
                 Trim(sqQuery.FieldByName('OtherTableName').AsString),
                 Trim(sqQuery.FieldByName('DeleteRule').AsString),
@@ -589,7 +586,6 @@ begin
           WriteResult(TablesList[TableCounter],
             ConstraintName,
             Trim(sqQuery.FieldByName('CurrentFieldName').AsString),
-            Trim(sqQuery.FieldByName('CurrentTableName').AsString),
             Trim(sqQuery.FieldByName('OtherFieldName').AsString),
             Trim(sqQuery.FieldByName('OtherTableName').AsString),
             Trim(sqQuery.FieldByName('DeleteRule').AsString),
@@ -669,15 +665,11 @@ end;
 
 function ScriptAllPermissions(dbIndex: Integer; var List: TStringList): Boolean;
 var
-  Count: Integer;
   i, j: Integer;
   UsersList: TStringList;
   ObjectsList: TStringList;
   PermissionList: TStringList;
-  ObjName: string;
-  Permissions: string;
   UserName: string;
-  Line: string;
   ObjType: Integer;
 begin
   UsersList:= TStringList.Create;

systables.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, sqldb, IBConnection, FileUtil, LResources, Forms, Controls,
-  Dialogs, db;
+  Dialogs;
 
 type
 
@@ -252,7 +252,6 @@ end;
 function TdmSysTables.GetTriggerInfo(DatabaseIndex: Integer; ATriggername: string;
   var AfterBefor, OnTable, Event, Body: string; var TriggerEnabled: Boolean; var TriggerPosition: Integer): Boolean;
 var
-  Rec: TDatabaseRec;
   Encode: string;
 begin
   try

unitfirebirdservices.pas

@@ -1,4 +1,4 @@
-{ Wirtten by Zoran }
+{ Written by Zoran }
 
 unit UnitFirebirdServices;
 
@@ -7,7 +7,7 @@ unit UnitFirebirdServices;
 interface
 
 uses
-  Classes, SysUtils, ibase60dyn, LCLProc, strutils;
+  Classes, SysUtils, ibase60dyn, LCLProc;
 
 type
 
@@ -366,4 +366,4 @@ initialization
 finalization
 
 end.
-
+