Commit 657a6ac6 authored by mse1's avatar mse1

* Fixed compiler warnings.

git-svn-id: https://mseide-msegui.svn.sourceforge.net/svnroot/mseide-msegui/trunk@4599 56ecf5fe-6917-0410-8ac6-ca8e178bccbf
parent a1801ea3
......@@ -162,7 +162,7 @@ var
int1: integer;
lineinfo: bkptlineinfoty;
info1: breakpointinfoty;
bo1: boolean;
// bo1: boolean;
begin
if gdb.execloaded and not gdb.running then begin
gdb.infobreakpoint(info,info.addressbreakpoint);
......
......@@ -25,21 +25,18 @@ type
tcdesignparser = class(tcparser,idesignparser)
private
funitinfopo: punitinfoty;
fimplementation: boolean;
finterface: boolean;
// fimplementation: boolean;
// finterface: boolean;
finterfaceonly: boolean;
fnoautoparse: boolean;
ffunctionlevel: integer;
protected
procedure initidents; override;
function parsefunction: boolean;
function parsefunctionparams: boolean;
function parseblock: boolean;
function parsetypedef: boolean;
function parsevardef: boolean;
function parsestatement: boolean;
function dogetincludefile(const afilename: filenamety;
const astatementstart,astatementend: sourceposty): tscanner; override;
public
constructor create(unitinfopo: punitinfoty;
const afilelist: tmseindexednamelist;
......@@ -47,6 +44,9 @@ type
const ainterfaceonly: boolean); overload;
constructor create(const afilelist: tmseindexednamelist;
const atext: string); overload;
procedure initidents; override;
function dogetincludefile(const afilename: filenamety;
const astatementstart,astatementend: sourceposty): tscanner; override;
procedure parse; override;
procedure clear; override;
end;
......@@ -81,6 +81,7 @@ type
procedure checkfindname(var stop: boolean);
protected
procedure add(const alist: tcrootdeflist; const aid: integer);
// procedure checkexact(const aitemdata; var accept: boolean); override;
function hashkey(const akey): hashvaluety; override;
function checkkey(const akey; const aitemdata): boolean; override;
procedure delete(const alist: tcrootdeflist; const aid: integer);
......@@ -286,11 +287,11 @@ end;
function tcdesignparser.parsefunction: boolean; //todo: optimize
var
lstr1,lstr2: lstringty;
{lstr1,}lstr2: lstringty;
str1: string;
ch1: char;
// ch1: char;
pos1: sourceposty;
po1: pfunctioninfoty;
// po1: pfunctioninfoty;
po2: pfunctionheaderinfoty;
static: boolean;
bo1: boolean;
......@@ -374,7 +375,7 @@ end;
function tcdesignparser.parsestatement: boolean;
var
lstr1,lstr2: lstringty;
lstr1{,lstr2}: lstringty;
ch1: char;
bo1: boolean;
pos1: sourceposty;
......@@ -435,9 +436,9 @@ begin
end;
procedure tcdesignparser.parse;
var
po1: pfunctioninfoty;
int1: integer;
//var
// po1: pfunctioninfoty;
// int1: integer;
begin
inherited;
if fnoautoparse then begin
......@@ -488,9 +489,9 @@ begin
end;
destructor tcunitinfo.destroy;
var
int1: integer;
po1: pfunctioninfoty;
//var
// int1: integer;
// po1: pfunctioninfoty;
begin
with info do begin
c.functionheaders.free;
......
......@@ -9,6 +9,8 @@ object componentstorefo: tcomponentstorefo
bounds_cx = 445
bounds_cy = 354
container.optionswidget = [ow_mousefocus, ow_tabfocus, ow_arrowfocus, ow_subfocus, ow_mousetransparent, ow_destroywidgets, ow_autoscale]
container.frame.zoomwidthstep = 1
container.frame.zoomheightstep = 1
container.bounds = (
0
0
......@@ -85,7 +87,7 @@ object componentstorefo: tcomponentstorefo
DDDDDD01DBDBDB01DADADA01D8D8D801D7D7D701D5D5D501D3D3D301D2D2D201
D1D1D101D4D4D402D3D3D301D2D2D201D0D0D001
}
oncreate = docreate
oncreate = createex
moduleclassname = 'tdockform'
object grid: twidgetgrid
popupmenu = tpopupmenu1
......@@ -190,8 +192,8 @@ object componentstorefo: tcomponentstorefo
item
fade_pos.count = 2
fade_pos.items = (
0.0000000000000000E+0000
1.0000000000000000E+0000
0
1
)
fade_color.count = 2
fade_color.items = (
......@@ -365,8 +367,8 @@ object componentstorefo: tcomponentstorefo
end
object storefile: tstatfile
filename = 'store.sta'
onstatread = dostatread
onstatwrite = dostatwrite
onstatread = statreadexe
onstatwrite = statwriteexe
left = 296
top = 88
end
......
......@@ -83,10 +83,10 @@ type
addfileact: taction;
compfiledialog: tfiledialog;
sel: tdatabutton;
procedure docreate(const sender: TObject);
procedure createex(const sender: TObject);
procedure dopastecomponent(const sender: TObject);
procedure dostatread(const sender: TObject; const reader: tstatreader);
procedure dostatwrite(const sender: TObject; const writer: tstatwriter);
procedure statreadexe(const sender: TObject; const reader: tstatreader);
procedure statwriteexe(const sender: TObject; const writer: tstatwriter);
procedure dostatreaditem(const sender: TObject; const reader: tstatreader;
var aitem: ttreelistitem);
procedure doupdaterowvalues(const sender: TObject; const aindex: Integer;
......@@ -283,7 +283,7 @@ end;
{ tcomponentstorefo }
procedure tcomponentstorefo.docreate(const sender: TObject);
procedure tcomponentstorefo.createex(const sender: TObject);
begin
{
frootnode:= tstoredcomponent.create(true);
......@@ -309,7 +309,7 @@ var
info: storedcomponentinfoty;
flags: tfilerflags;
int1: integer;
compname1: string;
// compname1: string;
node1: tstoredcomponent;
statwriter1: tstatwriter;
dialogfo: tstoredcomponentinfodialogfo;
......@@ -454,13 +454,13 @@ begin
copytoclipboard(copycomponent);
end;
procedure tcomponentstorefo.dostatread(const sender: TObject;
procedure tcomponentstorefo.statreadexe(const sender: TObject;
const reader: tstatreader);
begin
// frootnode.dostatread(reader);
end;
procedure tcomponentstorefo.dostatwrite(const sender: TObject;
procedure tcomponentstorefo.statwriteexe(const sender: TObject;
const writer: tstatwriter);
begin
// frootnode.dostatwrite(writer);
......@@ -579,7 +579,7 @@ end;
function tcomponentstorefo.readstoregroup(const afilename: filenamety): boolean;
var
int1: integer;
reader1,reader2: tstatreader;
{reader1,}reader2: tstatreader;
item1: tstoredcomponent;
storedir1: filenamety;
begin
......@@ -773,7 +773,7 @@ end;
//todo: check duplicates
procedure tcomponentstorefo.addstoreex(const sender: TObject);
var
stream1: ttextstream;
// stream1: ttextstream;
node1: tstoredcomponent;
begin
with storefiledialog do begin
......@@ -882,8 +882,8 @@ end;
procedure tcomponentstorefo.beforedrag(const sender: TObject;
const apos: pointty; var dragobject: tdragobject;
var processed: Boolean);
var
widget1: twidget;
//var
// widget1: twidget;
begin
end;
......
This diff is collapsed.
......@@ -95,8 +95,8 @@ end;
procedure tcpuavr32fo.regsetvalue(const sender: TObject; var avalue: Integer;
var accept: Boolean);
var
str1: string;
//var
// str1: string;
begin
if mainfo.gdb.cancommand then begin
with tintegeredit(sender) do begin
......
......@@ -177,16 +177,16 @@ end;
procedure tdisassfo.addpreviouslines(const asetrow: boolean);
var
rowcountbefore,rowbefore,activerowbefore,firstvisiblerowbefore: integer;
int1: integer;
rowcountbefore,rowbefore,activerowbefore{,firstvisiblerowbefore}: integer;
// int1: integer;
begin
with grid do begin
rowcountbefore:= rowcount;
firstvisiblerowbefore:= firstvisiblerow;
// firstvisiblerowbefore:= firstvisiblerow;
rowbefore:= row;
activerowbefore:= factiverow;
clear;
addlines((ffirstaddress and not $7)-$40,rowcountbefore+$48);
addlines((ffirstaddress and not qword($7))-$40,rowcountbefore+$48);
if asetrow then begin
row:= rowbefore + factiverow - activerowbefore;
end
......
......@@ -119,7 +119,7 @@ type
fmodule: tmsecomponent;
fmoduleintf: pdesignmoduleintfty;
fmodulesetting: integer;
fformsizesetting: integer;
// fformsizesetting: integer;
procedure setmodule(const Value: tmsecomponent);
function getselections: tformdesignerselections;
protected
......@@ -1216,9 +1216,9 @@ procedure tdesignwindow.doafterpaint(const canvas: tcanvas);
end;
end;
var
int1: integer;
rect1: rectty;
//var
// int1: integer;
// rect1: rectty;
begin
if tformdesignerfo(fowner).fmodule <> nil then begin
canvas.intersectcliprect(tformdesignerfo(fowner).gridrect);
......@@ -2998,7 +2998,9 @@ end;
procedure tformdesignerfo.setcomponentscrollsize(const avalue: sizety);
begin
if fform is tcustommseform then begin
{$warnings off}
with tscrollingwidget1(tcustommseform(fform).container) do begin
{$warnings on}
fminminclientsize:= avalue;
clientsize:= clientsize;
end;
......@@ -3023,7 +3025,9 @@ end;
procedure tformdesignerfo.recalcclientsize;
begin
if fform = nil then begin
{$warnings off}
with twidget1(container) do begin
{$warnings on}
exclude(fwidgetstate,ws_minclientsizevalid);
tframe1(frame).updatestate;
end;
......
......@@ -13,22 +13,22 @@ type
env_filename);
const
sysenvvalues: array[envvarty] of argumentdefty =
((kind: ak_pararg; name: '-macrodef'; anames: nil; flags: []),
(kind: ak_pararg; name: '-macrogroup'; anames: nil; flags: []),
(kind: ak_par; name: 'np'; anames: nil; flags: []), //no project
(kind: ak_par; name: 'ns'; anames: nil; flags: []), //no skin
(kind: ak_envvar; name: 'FPCDIR'; anames: nil; flags: []),
(kind: ak_envvar; name: 'FPCLIBDIR'; anames: nil; flags: []),
(kind: ak_envvar; name: 'MSEDIR'; anames: nil; flags: []),
(kind: ak_envvar; name: 'MSELIBDIR'; anames: nil; flags: []),
(kind: ak_envvar; name: 'SYNTAXDEFDIR'; anames: nil; flags: []),
(kind: ak_envvar; name: 'TEMPLATEDIR'; anames: nil; flags: []),
(kind: ak_envvar; name: 'COMPSTOREDIR'; anames: nil; flags: []),
(kind: ak_envvar; name: 'COMPILER'; anames: nil; flags: []),
(kind: ak_envvar; name: 'DEBUGGER'; anames: nil; flags: []),
(kind: ak_envvar; name: 'EXEEXT'; anames: nil; flags: []),
(kind: ak_envvar; name: 'TARGET'; anames: nil; flags: []),
(kind: ak_arg; name: ''; anames: nil; flags: []));
((kind: ak_pararg; name: '-macrodef'; anames: nil; flags: []; initvalue: ''),
(kind: ak_pararg; name: '-macrogroup'; anames: nil; flags: []; initvalue: ''),
(kind: ak_par; name: 'np'; anames: nil; flags: []; initvalue: ''), //no project
(kind: ak_par; name: 'ns'; anames: nil; flags: []; initvalue: ''), //no skin
(kind: ak_envvar; name: 'FPCDIR'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'FPCLIBDIR'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'MSEDIR'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'MSELIBDIR'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'SYNTAXDEFDIR'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'TEMPLATEDIR'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'COMPSTOREDIR'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'COMPILER'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'DEBUGGER'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'EXEEXT'; anames: nil; flags: []; initvalue: ''),
(kind: ak_envvar; name: 'TARGET'; anames: nil; flags: []; initvalue: ''),
(kind: ak_arg; name: ''; anames: nil; flags: []; initvalue: ''));
firstenvvarmacro = env_fpcdir;
lastenvvarmacro = env_target;
......
......@@ -153,9 +153,9 @@ type
fexecstamp: integer;
fprojectname: filenamety;
fcheckmodulelevel: integer;
fcheckmodulerecursion: boolean;
fuploadprocid: integer;
fuploadexitcode: integer;
// fcheckmodulerecursion: boolean;
// fuploadprocid: integer;
// fuploadexitcode: integer;
fgdbserverprocid: integer;
fgdbserverexitcode: integer;
fgdbservertimeout: longword;
......@@ -2034,8 +2034,8 @@ begin
end;
}
procedure tmainfo.mainfoonterminate(var terminate: Boolean);
var
modres: modalresultty;
//var
// modres: modalresultty;
begin
if checksave = mr_cancel then begin
terminate:= false;
......@@ -2683,7 +2683,7 @@ var
str1: ansistring;
mstr1: msestring;
macrolist: tmacrolist;
gridcoord1: gridcoordty;
// gridcoord1: gridcoordty;
cursourcefile,curmodulefile,
cursselection,cursword,cursdefinition: msestring;
curcomponentclass,curproperty: msestring;
......
......@@ -177,7 +177,7 @@ function buildmakecommandline(const atag: integer): string;
var
int1,int2: integer;
str1,str2,str3: msestring;
wstr1: filenamety;
// wstr1: filenamety;
begin
with projectoptions,texp do begin
str3:= quotefilename(tosysfilepath(makecommand));
......
object memoryfo: tmemoryfo
optionswidget = [ow_arrowfocus, ow_subfocus, ow_destroywidgets, ow_hinton, ow_autoscale]
bounds_x = 100
bounds_y = 100
bounds_cx = 453
bounds_cy = 354
frame.grip_size = 10
frame.grip_options = [go_closebutton, go_fixsizebutton, go_topbutton, go_backgroundbutton]
frame.dummy = 0
taborder = 1
visible = False
bounds_x = 100
bounds_y = 100
bounds_cx = 453
bounds_cy = 354
container.optionswidget = [ow_mousefocus, ow_tabfocus, ow_arrowfocus, ow_subfocus, ow_mousetransparent, ow_destroywidgets, ow_autoscale]
container.bounds_x = 0
container.bounds_y = 0
container.bounds_cx = 443
container.bounds_cy = 354
container.frame.dummy = 0
container.frame.zoomwidthstep = 1
container.frame.zoomheightstep = 1
container.bounds = (
0
0
443
354
)
dragdock.optionsdock = [od_savepos, od_savezorder, od_canmove, od_cansize, od_canfloat, od_candock, od_propsize]
options = [fo_savepos, fo_savezorder, fo_savestate]
statfile = mainfo.projectstatfile
......@@ -66,23 +68,21 @@ object memoryfo: tmemoryfo
BCBCBC01B2B2B20169696901A3A3A301FFFFFF017C7C7C01C0C0C0019D9D9D01
7F7F7F01BEBEBE01A9A9A901E7E7E7018D8D8D01C7C7C701ABABAB01FFFFFF01
A9A9A901FFFFFF01ABABAB01FFFFFF01ABABAB01FFFFFF01A9A9A901FFFFFF01
DADADA01C1C1C101A0A0A001ABABAB01FFFFFF017C7C7C01FFFFFF17FFFFFF08
FFFFFF08FFFFFFBFFFFFFF08FFFFFF00FFFFFF08FFFFFF02FFFFFFC0FFFFFF00
FFFFFF08FFFFFF00FFFFFF08FFFFFF08FFFFFF08FFFFFFBFFFFFFF08FFFFFF00
FFFFFF02FFFFFF08FFFFFF00FFFFFF00FFFFFFBFFFFFFF00FFFFFF08
DADADA01C1C1C101A0A0A001ABABAB01FFFFFF017C7C7C01FFFFFF17FFFFFF00
FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
}
onshow = formshow
moduleclassname = 'tdockform'
object grid: tstringgrid
optionswidget = [ow_mousefocus, ow_tabfocus, ow_arrowfocus, ow_focusbackonesc, ow_mousewheel, ow_destroywidgets, ow_fontglyphheight, ow_autoscale]
bounds_x = 0
bounds_y = 36
bounds_cx = 443
bounds_cy = 318
frame.dummy = 0
anchors = [an_top, an_bottom]
font.name = 'stf_fixed'
font.xscale = 1.0000000000000000E+0000
font.xscale = 1
font.dummy = 0
datacols.count = 16
datacols.width = 20
......@@ -100,6 +100,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
onsetvalue = cellsetvalue
ondataentered = adent
end
......@@ -114,6 +116,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -126,6 +130,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -138,6 +144,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -150,6 +158,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -162,6 +172,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -174,6 +186,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -186,6 +200,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -198,6 +214,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -210,6 +228,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -222,6 +242,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -234,6 +256,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -246,6 +270,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -258,6 +284,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -270,6 +298,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end
item
width = 20
......@@ -282,6 +312,8 @@ object memoryfo: tmemoryfo
''
''
)
valuefalse = '0'
valuetrue = '1'
end>
fixcols.count = 1
fixcols.items = <
......@@ -292,7 +324,7 @@ object memoryfo: tmemoryfo
fixrows.count = 1
fixrows.items = <
item
height = 16
height = 17
captions.count = 16
captions.items = <
item
......@@ -345,18 +377,18 @@ object memoryfo: tmemoryfo
end>
end>
rowcount = 5
datarowheight = 16
reffontheight = 14
datarowheight = 17
reffontheight = 15
end
object tlayouter1: tlayouter
bounds_x = 0
bounds_y = 0
bounds_cx = 396
bounds_cy = 29
frame.framei_left = 5
frame.localprops = [frl_fileft]
frame.dummy = 0
taborder = 1
bounds_x = 0
bounds_y = 0
bounds_cx = 396
bounds_cy = 29
optionsscale = [osc_expandx, osc_shrinkx, osc_expandy, osc_shrinky]
linkbottom = grid
dist_bottom = 7
......@@ -364,10 +396,6 @@ object memoryfo: tmemoryfo
place_mindist = 5
place_maxdist = 5
object add: tintegeredit
bounds_x = 5
bounds_y = 9
bounds_cx = 108
bounds_cy = 20
frame.caption = 'Add'
frame.captionpos = cp_right
frame.dummy = 0
......@@ -378,6 +406,9 @@ object memoryfo: tmemoryfo
0
)
taborder = 3
bounds_x = 5
bounds_y = 9
bounds_cx = 108
statfile = mainfo.projectstatfile
ondataentered = adent
base = nb_hex
......@@ -385,10 +416,6 @@ object memoryfo: tmemoryfo
reffontheight = 14
end
object memon: tbooleanedit
bounds_x = 320
bounds_y = 12
bounds_cx = 76
bounds_cy = 16
frame.caption = 'Memory on'
frame.dummy = 0
frame.outerframe = (
......@@ -397,18 +424,17 @@ object memoryfo: tmemoryfo
63
2
)
bounds_x = 320
bounds_y = 12
bounds_cx = 76
bounds_cy = 16
statfile = mainfo.projectstatfile
ondataentered = adent
end
object bitwidth: tenumedit
bounds_x = 229
bounds_y = 9
bounds_cx = 86
bounds_cy = 20
frame.caption = 'Width'
frame.captionpos = cp_right
frame.button.color = -2147483646
frame.dummy = 0
frame.outerframe = (
0
0
......@@ -416,9 +442,12 @@ object memoryfo: tmemoryfo
0
)
taborder = 1
bounds_x = 229
bounds_y = 9
bounds_cx = 86
statfile = mainfo.projectstatfile
textflags = [tf_xcentered, tf_ycentered, tf_noselect]
ondataentered = updatelayout
ondataentered = updatelayoutexe
value = 0
dropdown.cols.count = 1
dropdown.cols.items = <
......@@ -433,10 +462,6 @@ object memoryfo: tmemoryfo
reffontheight = 14
end
object cnt: tintegeredit
bounds_x = 118
bounds_y = 9
bounds_cx = 106
bounds_cy = 20
frame.caption = 'Cnt'
frame.captionpos = cp_right
frame.dummy = 0
......@@ -447,6 +472,9 @@ object memoryfo: tmemoryfo
0
)
taborder = 2
bounds_x = 118
bounds_y = 9
bounds_cx = 106
statfile = mainfo.projectstatfile
ondataentered = a