From d3c505f0322ce53e761391d8552f1cd2c6fdabb2 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Sun, 5 Apr 2009 11:54:02 +0000 Subject: [PATCH] Remove unused constants and code. --- components/heidisql/include/const.inc | 11 +- source/helpers.pas | 156 -------------------------- source/main.pas | 16 --- 3 files changed, 2 insertions(+), 181 deletions(-) diff --git a/components/heidisql/include/const.inc b/components/heidisql/include/const.inc index 8c146d9f..7a3370fc 100644 --- a/components/heidisql/include/const.inc +++ b/components/heidisql/include/const.inc @@ -7,7 +7,6 @@ const // Names of the system tables and system databases PRIVTABLE_USERS = 'user'; PRIVTABLE_DB = 'db'; - PRIVTABLE_HOST = 'host'; PRIVTABLE_TABLES = 'tables_priv'; PRIVTABLE_COLUMNS = 'columns_priv'; DBNAME_INFORMATION_SCHEMA = 'information_schema'; @@ -42,7 +41,6 @@ const REGNAME_FILTER = 'Filter'; REGNAME_SORT = 'Sort'; REGNAME_SORTDISPLAYEDCOLUMNS = 'DisplayedColumnsSorted'; - REGNAME_LISTTABLESCOLUMNNAMES = 'ListTablesColumnNames'; REGNAME_LASTSESSION = 'lastcon'; REGNAME_AUTORECONNECT = 'AutoReconnect'; DEFAULT_AUTORECONNECT = False; @@ -58,10 +56,6 @@ const DEFAULT_DATAFONTNAME = 'Tahoma'; REGNAME_DATAFONTSIZE = 'DataFontSize'; DEFAULT_DATAFONTSIZE = 8; - REGNAME_DATALIMITSTART = 'DataLimitStart'; - DEFAULT_DATALIMITSTART = 0; - REGNAME_DATALIMITEND = 'DataLimitEnd'; - DEFAULT_DATALIMITEND = 5000; // how much memory we're aiming to use for the // data grid and it's automatic limit function REGNAME_LOGSQLNUM = 'logsqlnum'; @@ -101,7 +95,6 @@ const DEFAULT_EDITOR_WIDTH = 100; REGNAME_EDITOR_HEIGHT = 'MemoEditorHeight'; DEFAULT_EDITOR_HEIGHT = 100; - REGNAME_SQLWHEREFILE = 'SQLWhereFile'; REGNAME_DELIMITER = 'Delimiter'; DEFAULT_DELIMITER = ';'; REGNAME_SQLHELPWINLEFT = 'SQLHelp_WindowLeft'; @@ -112,6 +105,8 @@ const REGNAME_SQLHELPPRHEIGHT = 'SQLHelp_PnlRightTopHeight'; REGNAME_PROCEDITOR_WIDTH = 'ProcedureEditorWidth'; REGNAME_PROCEDITOR_HEIGHT = 'ProcedureEditorHeight'; + REGNAME_TABLEEDITOR_WIDTH = 'TableEditorWidth'; + REGNAME_TABLEEDITOR_HEIGHT = 'TableEditorHeight'; REGNAME_HOST = 'Host'; DEFAULT_HOST = '127.0.0.1'; REGNAME_USER = 'User'; @@ -196,12 +191,10 @@ const DEFAULT_FIELDCOLOR_SET = $00808000; // clTeal COLORSHIFT_NULLFIELDS = 45; // Percentage of brightness to add to normal field colors for NULL values - REGNAME_FIELDEDITOR_NUMERIC = 'FieldEditor_Numeric'; REGNAME_FIELDEDITOR_BINARY = 'FieldEditor_Binary'; REGNAME_FIELDEDITOR_DATETIME = 'FieldEditor_Datetime'; REGNAME_FIELDEDITOR_ENUM = 'FieldEditor_Enum'; REGNAME_FIELDEDITOR_SET = 'FieldEditor_Set'; - DEFAULT_FIELDEDITOR_NUMERIC = True; DEFAULT_FIELDEDITOR_BINARY = True; DEFAULT_FIELDEDITOR_DATETIME = True; DEFAULT_FIELDEDITOR_ENUM = True; diff --git a/source/helpers.pas b/source/helpers.pas index be91b506..f2441106 100644 --- a/source/helpers.pas +++ b/source/helpers.pas @@ -131,9 +131,6 @@ type function MakeFloat( Str: String ): Extended; function FloatStr(Val: String): String; function esc(Text: WideString; ProcessJokerChars: Boolean = false; sql_version: integer = 50000): WideString; - function hasNullChar(Text: string): boolean; - function hasIrregularChars(Text: string): boolean; - function hasIrregularNewlines(Text: string): boolean; procedure debug(txt: String); function fixNewlines(txt: string): string; function bool2str( boolval : Boolean ) : String; @@ -147,11 +144,8 @@ type function maskSql(sql_version: integer; str: WideString) : WideString; procedure ActivateWindow(Window : HWnd); function GetApplication(MainForm: HWnd): HWnd; - procedure ActivateMainForm(MainForm: HWnd); procedure ShellExec( cmd: String; path: String = '' ); function getFirstWord( text: String ): String; - function ConvertWindowsCodepageToMysqlCharacterSet(codepage: Cardinal): string; - function GetFieldValue( Field: TField ): WideString; function LastPos(needle: WideChar; haystack: WideString): Integer; function ConvertServerVersion( Version: Integer ): String; function FormatByteNumber( Bytes: Int64; Decimals: Byte = 1 ): String; Overload; @@ -1642,94 +1636,6 @@ end; -{*** - Detect NUL character in a text. -} -function hasNullChar(Text: string): boolean; -var - i: integer; -begin - result := false; - for i:=1 to length(Text) do - begin - if Ord(Text[i]) = 0 then - begin - result := true; - exit; - end; - end; -end; - - - -{*** - Detect non-latin1 characters in a text (except 9, 10 and 13) - - @param string Text to test - @return boolean Text has any non-latin1-characters? -} -function hasIrregularChars(Text: string): boolean; -var - i: integer; - b: byte; -begin - result := false; - for i:=1 to length(Text) do - begin - b := Ord(Text[i]); - // Latin1 characters is everything except 0..31 and 127..159. - // 9..13 is HTAB, LF, VTAB, FF, CR. We only allow 9, 10 and 13, - // because those are the ones that we can escape in esc(). - if b in [0..8, 11..12, 14..31, 127..159] then - begin - result := true; - exit; - end; - end; -end; - - - -{*** - The MEMO editor changes all single CRs or LFs to Windows CRLF - behind the user's back, so it's not useful for editing fields - where these kinds of line endings occur. At least not without - asking the user if it's ok to auto convert to windows format first. - For now, we just disallow editing so no-one gets surprised. - - @param string Text to test - @return boolean Text has some non-windows linebreaks? -} -function hasIrregularNewlines(Text: string): boolean; -var - i: integer; - b, b2: byte; -begin - result := false; - if length(Text) = 0 then exit; - result := true; - i := 1; - repeat - b := Ord(Text[i]); - if b = 13 then - begin - b2 := Ord(Text[i+1]); - if b2 = 10 then i := i + 1 - else exit; - end - else if b = 10 then exit; - i := i + 1; - until i >= length(Text); - if i = length(Text) then - begin - b := Ord(Text[length(Text)]); - if b in [10, 13] then exit; - end; - result := false; -end; - - - {*** Use DebugView from SysInternals or Delphi's Event Log to view. @@ -1977,21 +1883,6 @@ end; -{*** - Given a Delphi MainForm, activate the application it belongs to. - - @param HWnd The mainform's window handle -} -procedure ActivateMainForm(MainForm: HWnd); -var - delphiApp: HWnd; -begin - delphiApp := GetApplication(MainForm); - ActivateWindow(delphiApp); -end; - - - {*** Activate a specific form @@ -2095,53 +1986,6 @@ begin end; -{*** - HeidiSQL is currently a non-Unicode application, blindly - following the ANSI codepage in use by Windows. - - This function can help when determining which - MySQL character set matches the ANSI codepage. - - Delphi has excellent support for Unicode strings - (automatic conversion between single- and multi-byte, - etc.), so if Zeos could be coerced to regard MySQL - strings as UTF-8 (or even look at @character_set_results, - ho hum...), we could skip all this and just use - "SET NAMES utf8". -} -function ConvertWindowsCodepageToMysqlCharacterSet(codepage: Cardinal): string; -var - i: integer; -begin - result := ''; - for i := 0 to Length(charset_conv_table) - 1 do begin - if charset_conv_table[i].codepage = codepage then begin - result := charset_conv_table[i].charset; - exit; - end; - end; -end; - - -{*** - Retrieve the string value from a field - Zeos gives "True" or "False" for enum (boolean) fields which - gets corrected here to "Y" or "N" - @param TField Field object which holds a value - @return String Field value -} -function GetFieldValue( Field: TField ): WideString; -begin - Result := ''; - case Field.DataType of - ftBoolean: - Result := Bool2Str( Field.AsBoolean ); - else - Result := Field.AsWideString; - end; -end; - - {** Get last position of substr in str @param string Substring diff --git a/source/main.pas b/source/main.pas index a0e713ca..2f0904eb 100644 --- a/source/main.pas +++ b/source/main.pas @@ -881,7 +881,6 @@ type procedure SessionConnect(Sender: TObject); function InitConnection(parHost, parPort, parUser, parPass, parDatabase, parTimeout, parCompress, parSortDatabases: WideString): Boolean; //procedure HandleQueryNotification(ASender : TMysqlQuery; AEvent : Integer); - function GetVisualDataset: PGridResult; function ExecUpdateQuery(sql: WideString; HandleErrors: Boolean = false; DisplayErrors: Boolean = false): Int64; function ExecSelectQuery(sql: WideString; HandleErrors: Boolean = false; DisplayErrors: Boolean = false; ForceDialog: Boolean = false): TDataSet; @@ -5681,21 +5680,6 @@ begin FreeAndNil(ds); end; -{*** - This returns the GridResult object that is currently visible to the user, - depending on with tabsheet is active. - - @return PGridResult if data/query tab is active, nil otherwise. -} -function TMainForm.GetVisualDataset: PGridResult; -begin - Result := nil; - case PageControlMain.ActivePageIndex of - 3: Result := @FDataGridResult; - 4: Result := @FQueryGridResult; - end; -end; - {*** Execute a query and return column x as Stringlist