diff options
| author | 2008-11-08 17:17:14 +0000 | |
|---|---|---|
| committer | 2008-11-08 17:17:14 +0000 | |
| commit | 2850c46e4cadcffb55e346c386137f2757b54af2 (patch) | |
| tree | 9bc18c9a9456c6f732e0e7138236edda16798a12 /src/modules/objects | |
| parent | applied patch to fix kvirc4.desktop, thanks to Arfrever (diff) | |
| download | KVIrc-2850c46e4cadcffb55e346c386137f2757b54af2.tar.gz KVIrc-2850c46e4cadcffb55e346c386137f2757b54af2.tar.bz2 KVIrc-2850c46e4cadcffb55e346c386137f2757b54af2.zip | |
hopefully removed all the remaining noisy messages from gcc
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2841 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
23 files changed, 366 insertions, 378 deletions
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt index 3d09ec482..29ce6626e 100644 --- a/src/modules/objects/CMakeLists.txt +++ b/src/modules/objects/CMakeLists.txt @@ -32,7 +32,6 @@ SET(kviobjects_MOC_HDRS class_widget.h class_window.h class_wizard.h - class_xmlreader.h ) SET(kviobjects_SRCS diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index a1c793a62..c6ccc1785 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -45,14 +45,14 @@ static const char * const mod_tbl[] = { "AutoText", "LogText" }; - +/* static int mod_cod[] = { Qt::PlainText, Qt::RichText, Qt::AutoText, Qt::LogText }; - +*/ #define mod_num (sizeof(mod_tbl) / sizeof(mod_tbl[0])) @@ -344,7 +344,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_textedit) KVSO_END_CONSTRUCTOR(KviKvsObject_textedit) -bool KviKvsObject_textedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) +bool KviKvsObject_textedit::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QTextEdit); return true; @@ -363,7 +363,7 @@ bool KviKvsObject_textedit::functionAddWidget(KviKvsObjectFunctionCall * c) ((QTextEdit *)object())->addScrollBarWidget(((QWidget *)(pObject->object())),Qt::AlignLeft); return true; } -bool KviKvsObject_textedit::functionInsertTable(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionInsertTable(KviKvsObjectFunctionCall *) { if(widget()){ QTextCursor cur= ((QTextEdit *)widget())->textCursor(); @@ -439,8 +439,8 @@ bool KviKvsObject_textedit::functionInsertAt(KviKvsObjectFunctionCall * c) KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol) KVSO_PARAMETERS_END(c) if(!widget())return true; - if(iLine < 0 || iCol < 0 || iLine > ((QTextEdit *)widget())->document()->blockCount()) - c->warning("No such line number"); + if(iLine > (uint) ((QTextEdit *)widget())->document()->blockCount()) + c->warning("No such line number"); //else // ((QTextEdit *)widget())->insertAt(szInsert,iLine,iCol); return true; @@ -533,7 +533,7 @@ bool KviKvsObject_textedit::functionsetWrapPolicy(KviKvsObjectFunctionCall * c) return true; } -bool KviKvsObject_textedit::functionWordWrap(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionWordWrap(KviKvsObjectFunctionCall *) { /* if(widget()) @@ -592,21 +592,21 @@ bool KviKvsObject_textedit::functionAppend(KviKvsObjectFunctionCall * c) return true; } -bool KviKvsObject_textedit::functionCopy(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionCopy(KviKvsObjectFunctionCall *) { if(widget()) ((QTextEdit *)widget())->copy(); return true; } -bool KviKvsObject_textedit::functionCut(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionCut(KviKvsObjectFunctionCall *) { if(widget()) ((QTextEdit *)widget())->cut(); return true; } -bool KviKvsObject_textedit::functionPaste(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionPaste(KviKvsObjectFunctionCall *) { if(widget()) ((QTextEdit *)widget())->paste(); @@ -712,21 +712,21 @@ bool KviKvsObject_textedit::functionzoomTo(KviKvsObjectFunctionCall * c) */ //-> Undo & Redo functions -bool KviKvsObject_textedit::functionundo(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionundo(KviKvsObjectFunctionCall *) { if(widget()) ((QTextEdit *)widget())->undo(); return true; } -bool KviKvsObject_textedit::functionredo(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionredo(KviKvsObjectFunctionCall *) { if(widget()) ((QTextEdit *)widget())->redo(); return true; } -bool KviKvsObject_textedit::functionclear(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionclear(KviKvsObjectFunctionCall *) { if(widget()) ((QTextEdit *)widget())->clear(); @@ -873,7 +873,6 @@ bool KviKvsObject_textedit::functionsetColor(KviKvsObjectFunctionCall * c) bool bOk,bOk1,bOk2; QString value; pColArray->asString(value); - int i=0; if (value.length()!=6) { c->warning(__tr2qs("A string of 6 hex digits is required")); @@ -996,7 +995,7 @@ bool KviKvsObject_textedit::functionsetOverwriteMode(KviKvsObjectFunctionCall * return true; } -bool KviKvsObject_textedit::functiontextFormat(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functiontextFormat(KviKvsObjectFunctionCall *) { if(!widget())return true; /* @@ -1074,7 +1073,6 @@ bool KviKvsObject_textedit::functionsetParagraphBackgroundColor(KviKvsObjectFunc bool bOk,bOk1,bOk2; QString value; pColArray->asString(value); - int i=0; if (value.length()!=6) { c->warning(__tr2qs("A string of 6 hex digits is required")); @@ -1205,7 +1203,7 @@ bool KviKvsObject_textedit::functionsetVerticalAlignment(KviKvsObjectFunctionCal return true; } -bool KviKvsObject_textedit::functionparagraphs(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionparagraphs(KviKvsObjectFunctionCall *) { //if(widget()) // c->returnValue()->setInteger(((QTextEdit *)widget())->paragraphs()); @@ -1253,7 +1251,7 @@ bool KviKvsObject_textedit::functionparagraphLength(KviKvsObjectFunctionCall * c return true; } -bool KviKvsObject_textedit::functionselectAll(KviKvsObjectFunctionCall * c) +bool KviKvsObject_textedit::functionselectAll(KviKvsObjectFunctionCall *) { if (widget()) ((QTextEdit *)widget())->selectAll(); diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index e91b267fb..d3323f7a6 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -238,190 +238,190 @@ const char * const brushstyles_tbl[] = { Sets the background mode of the painter to <bgMode>: valid values are:[br] - Transparent (that is the default value);[br] - Opaque.[br] - !fn: $setOpacity(<opacity_factor:real>) [QT4 ONLY] + !fn: $setOpacity(<opacity_factor:real>) [QT4 ONLY] Sets the painter opacity that affects all painter operations (drawpixmap, drawtext...). Valid values range are from 0 (total transparency) to 1 (total opacity)[br] You must invoke the [classfnc]$begin[/classfnc] before using it. - !fn: $setTextAntialiasing(<boolean>) [QT4 ONLY] + !fn: $setTextAntialiasing(<boolean>) [QT4 ONLY] Enable/disable antialias in text if possible. You must call the [classfnc]$begin[/classfnc] before using it. - !fn: $setAntialiasing(<boolean>) [QT4 ONLY] + !fn: $setAntialiasing(<boolean>) [QT4 ONLY] Enable/disable antialias in edges of primitives if possible. You must call the [classfnc]$begin[/classfnc] before using it. - !fn: $setSmoothPixmapTransform(<boolean>) [QT4 ONLY] + !fn: $setSmoothPixmapTransform(<boolean>) [QT4 ONLY] Enable/disable smooth bilinear pixmap transformation algorithm (such as bilinear). You must call the [classfnc]$begin[/classfnc] before using it. Example:[br] [br] - class (hello,widget)[br] - {[br] + class (hello,widget)[br] + {[br] constructor()[br] - {[br] - $$->%sintbl[]= $array( 0, 38, 71, 92, 100, 92, 71, 38,0, -38, -71, -92, -100, -92, -71, -38);[br] - $$->%index=0[br] - $$->$starttimer( 30 );[br] - $$->$resize(800,600 );[br] - $$->%string=$0[br] - $$->%waitfor=1;[br] - $$->%nextanim=0[br] + {[br] + $$->%sintbl[]= $array( 0, 38, 71, 92, 100, 92, 71, 38,0, -38, -71, -92, -100, -92, -71, -38);[br] + $$->%index=0[br] + $$->$starttimer( 30 );[br] + $$->$resize(800,600 );[br] + $$->%string=$0[br] + $$->%waitfor=1;[br] + $$->%nextanim=0[br] [br] - #zoom and rotation anim[br] - $$->%Zoomindex=11[br] - $$->%degree=0[br] - $$->%Noanim=0[br] - $$->%scrollright=-450[br] + #zoom and rotation anim[br] + $$->%Zoomindex=11[br] + $$->%degree=0[br] + $$->%Noanim=0[br] + $$->%scrollright=-450[br] [br] - #anim effect init[br] - $$->%xoffset=4[br] - $$->%yoffset=3[br] - $$->%xstart=270[br] - $$->%ystart=200[br] - $$->%b=0[br] - $$->%yoffs=400[br] + #anim effect init[br] + $$->%xoffset=4[br] + $$->%yoffset=3[br] + $$->%xstart=270[br] + $$->%ystart=200[br] + $$->%b=0[br] + $$->%yoffs=400[br] [br] - #parallax parameter[br] - $$->%Off=400[br] - $$->%roll=1[br] + #parallax parameter[br] + $$->%Off=400[br] + $$->%roll=1[br] + }[br] + timerevent()[br] + {[br] + $$->%b = $(($$->%b + 1) & 15);[br] + if ($$->%nextanim == 1) $$->$repaint(1);[br] + $$->$repaint(0);[br] }[br] - timerevent()[br] + drawAnim()[br] {[br] - $$->%b = $(($$->%b + 1) & 15);[br] - if ($$->%nextanim == 1) $$->$repaint(1);[br] - $$->$repaint(0);[br] - }[br] - drawAnim()[br] - {[br] - %P->$setFont(32,"times",bold);[br] - %w=$(%P->$fontMetricsWidth($$->%string[$$->%index]) + 20);[br] - %h=$(%P->$fontMetricsHeight * 2);[br] - %pmx = $(($$->$width/2) -%w/2);[br] - %pmy = $(($$->$height()/2) - %h/2);[br] - %x = 10;[br] - %y= $((%h/2) + $$->$fontDescent());[br] - %i=0[br] - while ( $str.mid("Grifisx/Noldor",%i,1) != "") [br] - {[br] - %i16 = $(($$->%b+%i) & 15);[br] + %P->$setFont(32,"times",bold);[br] + %w=$(%P->$fontMetricsWidth($$->%string[$$->%index]) + 20);[br] + %h=$(%P->$fontMetricsHeight * 2);[br] + %pmx = $(($$->$width/2) -%w/2);[br] + %pmy = $(($$->$height()/2) - %h/2);[br] + %x = 10;[br] + %y= $((%h/2) + $$->$fontDescent());[br] + %i=0[br] + while ( $str.mid("Grifisx/Noldor",%i,1) != "") [br] + {[br] + %i16 = $(($$->%b+%i) & 15);[br] %char=$str.mid("Grifisx/Noldor",%i,1)[br] %P->$setPen($((15-%i16)*16),$((15-%i16)*16),$((15-%i16)*16) );[br] %P->$drawText( $(%x+$$->%xstart),$($$->%ystart+%y-$$->%sintbl[%i16]*%h/800),%char,1,Auto);[br] - %x += %P->$fontMetricsWidth(%char);[br] - %i++;[br] - }[br] - }[br] - matrixeffect()[br] - {[br] - if (($$->%Zoomindex == 99) && ($$->%degree==360)) return %P->$drawPixmap($(400-32),$(300-32),"kvirc.png",0,0,-1,-1)[br] - %P->$scale(0.$$->%Zoomindex,0.$$->%Zoomindex)[br] - if ($$->%Zoomindex != 99) $$->%Zoomindex++;[br] - %P->$rotate($$->%degree)[br] - %P->$translate(400,300)[br] - %P->$drawPixmap(-32,-32,"kvirc.png",0,0,-1,-1)[br] - %P->$setFont(28,"times",bold);[br] - %P->$reset()[br] - if ($$->%scrollright >= 550) return[br] - %P->$scale(0.$$->%Zoomindex,0.$$->%Zoomindex)[br] - %P->$translate(400,350)[br] - %P->$drawText($$->%scrollright,10,"Another cool class brought to you by...",-1,Auto) [br] - $$->%scrollright += 3;[br] - %P->$reset()[br] - }[br] - nextanim()[br] - {[br] - %p=$new(painter)[br] - %p->$setBackgroundMode(Opaque)[br] - %p->$setBrush($rand(255),$rand(255),$rand(255))[br] - %p->$begin($$)[br] - %rand=$rand(5)[br] - %p->$drawrect($rand(800),$rand(400),120,200)[br] - %p->$drawArc($rand(800),$rand(400),120,200,20,$(16*20))[br] - %p->$drawPie($rand(800),$rand(400),120,200,20,$(16*20))[br] - %p->$drawChord($rand(800),$rand(400),120,200,20,$(16*20))[br] - %p->$drawEllipse($rand(800),$rand(400),100,30)[br] - %p->$end()[br] - delete %p[br] - }[br] - paintEvent()[br] - {[br] - if ($$->%nextanim ==1) return $$->$nextanim()[br] - # pixmap creation: every effect will be painted on it then copied on widget[br] - %pixmap=$new(pixmap)[br] + %x += %P->$fontMetricsWidth(%char);[br] + %i++;[br] + }[br] + }[br] + matrixeffect()[br] + {[br] + if (($$->%Zoomindex == 99) && ($$->%degree==360)) return %P->$drawPixmap($(400-32),$(300-32),"kvirc.png",0,0,-1,-1)[br] + %P->$scale(0.$$->%Zoomindex,0.$$->%Zoomindex)[br] + if ($$->%Zoomindex != 99) $$->%Zoomindex++;[br] + %P->$rotate($$->%degree)[br] + %P->$translate(400,300)[br] + %P->$drawPixmap(-32,-32,"kvirc.png",0,0,-1,-1)[br] + %P->$setFont(28,"times",bold);[br] + %P->$reset()[br] + if ($$->%scrollright >= 550) return[br] + %P->$scale(0.$$->%Zoomindex,0.$$->%Zoomindex)[br] + %P->$translate(400,350)[br] + %P->$drawText($$->%scrollright,10,"Another cool class brought to you by...",-1,Auto) [br] + $$->%scrollright += 3;[br] + %P->$reset()[br] + }[br] + nextanim()[br] + {[br] + %p=$new(painter)[br] + %p->$setBackgroundMode(Opaque)[br] + %p->$setBrush($rand(255),$rand(255),$rand(255))[br] + %p->$begin($$)[br] + %rand=$rand(5)[br] + %p->$drawrect($rand(800),$rand(400),120,200)[br] + %p->$drawArc($rand(800),$rand(400),120,200,20,$(16*20))[br] + %p->$drawPie($rand(800),$rand(400),120,200,20,$(16*20))[br] + %p->$drawChord($rand(800),$rand(400),120,200,20,$(16*20))[br] + %p->$drawEllipse($rand(800),$rand(400),100,30)[br] + %p->$end()[br] + delete %p[br] + }[br] + paintEvent()[br] + {[br] + if ($$->%nextanim ==1) return $$->$nextanim()[br] + # pixmap creation: every effect will be painted on it then copied on widget[br] + %pixmap=$new(pixmap)[br] %pixmap->$resize($$->$width(),$$->$height())[br] [br] - # painter creation [br] - %P=$new(painter);[br] - %P->$begin(%pixmap);[br] - $$->$drawanim[br] - $$->$matrixeffect[br] - %i=0[br] - while (%i != 100)[br] - {[br] - %i16 = $(($$->%b+%i) & 15);[br] - %P->$setPen($((15-%i16)*16),$((15-%i16)*16),$((15-%i16)*16) );[br] - %P->$drawpoint($rand(800),$rand(600))[br] - %i++[br] + # painter creation [br] + %P=$new(painter);[br] + %P->$begin(%pixmap);[br] + $$->$drawanim[br] + $$->$matrixeffect[br] + %i=0[br] + while (%i != 100)[br] + {[br] + %i16 = $(($$->%b+%i) & 15);[br] + %P->$setPen($((15-%i16)*16),$((15-%i16)*16),$((15-%i16)*16) );[br] + %P->$drawpoint($rand(800),$rand(600))[br] + %i++[br] }[br] [br] - # sets the animations order to manage the parallax effect[br] - %P->$end[br] - objects.bitBlt $$ 0 0 %pixmap[br] - delete %pixmap[br] + # sets the animations order to manage the parallax effect[br] + %P->$end[br] + objects.bitBlt $$ 0 0 %pixmap[br] + delete %pixmap[br] delete %P[br] if (%Pauseflag == 1) return[br] [br] - # manage the animations parameters[br] - if (($$->%Off<=60) && ($$->%roll<182)) $$->%roll += 2;[br] - if ($$->%roll>182) $$->%waitfor=0[br] - if ($$->%Noanim != 1) $$->%degree += 16;[br] - if ($$->%degree >= 360)[br] - {[br] - $$->%degree=0;[br] - if ($$->%Zoomindex == 99) $$->%Noanim=1[br] - } [br] + # manage the animations parameters[br] + if (($$->%Off<=60) && ($$->%roll<182)) $$->%roll += 2;[br] + if ($$->%roll>182) $$->%waitfor=0[br] + if ($$->%Noanim != 1) $$->%degree += 16;[br] + if ($$->%degree >= 360)[br] + {[br] + $$->%degree=0;[br] + if ($$->%Zoomindex == 99) $$->%Noanim=1[br] + } [br] if ($$->%Noanim != 1) return[br] [br] - #sinusoid animation[br] - if (($$->%xstart <1) && ($$->%xoffset == -4)) $$->%xoffset=4;[br] - if (($$->%xstart >$($$->$width()-%P->$fontMetricsWidth("Grifisx/Noldor"))) && ($$->%xoffset == 4)) $$->%xoffset=-4;[br] - if (($$->%ystart <1) && ($$->%yoffset == -3)) $$->%yoffset=3;[br] - if (($$->%ystart >$($$->$height()-60)) && ($$->%yoffset == 3)) $$->%yoffset=-3;[br] - $$->%xstart += $$->%xoffset;[br] - $$->%ystart += $$->%yoffset;[br] - }[br] - }[br] + #sinusoid animation[br] + if (($$->%xstart <1) && ($$->%xoffset == -4)) $$->%xoffset=4;[br] + if (($$->%xstart >$($$->$width()-%P->$fontMetricsWidth("Grifisx/Noldor"))) && ($$->%xoffset == 4)) $$->%xoffset=-4;[br] + if (($$->%ystart <1) && ($$->%yoffset == -3)) $$->%yoffset=3;[br] + if (($$->%ystart >$($$->$height()-60)) && ($$->%yoffset == 3)) $$->%yoffset=-3;[br] + $$->%xstart += $$->%xoffset;[br] + $$->%ystart += $$->%yoffset;[br] + }[br] + }[br] [br] - %Hello=$new(hello)[br] - %Hello->$setWindowTitle("Painter effects" );[br] - %Hello->$setFont(28,"times",bold);[br] - %Btn=$new(button,%Hello)[br] - %Btn->$setmaximumwidth(80)[br] - %Btn->$setmaximumheight(30)[br] - %Btn->$setFont(8,"times",bold);[br] - %Btn->$settext(Next)[br] + %Hello=$new(hello)[br] + %Hello->$setWindowTitle("Painter effects" );[br] + %Hello->$setFont(28,"times",bold);[br] + %Btn=$new(button,%Hello)[br] + %Btn->$setmaximumwidth(80)[br] + %Btn->$setmaximumheight(30)[br] + %Btn->$setFont(8,"times",bold);[br] + %Btn->$settext(Next)[br] [br] - privateimpl(%Btn,mousepressevent)[br] - {[br] - if ($$->$parent->%nextanim==0) [br] - {[br] - $$->$parent->%nextanim=1[br] - $$->$settext(Prev)[br] - } [br] - else[br] - {[br] - $$->$parent->%nextanim=0[br] - $$->$settext(Next)[br] + privateimpl(%Btn,mousepressevent)[br] + {[br] + if ($$->$parent->%nextanim==0) [br] + {[br] + $$->$parent->%nextanim=1[br] + $$->$settext(Prev)[br] + } [br] + else[br] + {[br] + $$->$parent->%nextanim=0[br] + $$->$settext(Next)[br] }[br] - }[br] + }[br] [br] - %lay=$new(layout,%Hello)[br] - %lay->$addwidget(%Btn,4,0)[br] - %Hello->$setBackgroundColor("000000");[br] - %Hello->$setmaximumwidth(800)[br] - %Hello->$setminimumwidth(780)[br] - %Hello->$setmaximumheight(600)[br] - %Hello->$setminimumheight(600)[br] - %Hello->$move(10,10)[br] - %Hello->$show();[br] [br] - + %lay=$new(layout,%Hello)[br] + %lay->$addwidget(%Btn,4,0)[br] + %Hello->$setBackgroundColor("000000");[br] + %Hello->$setmaximumwidth(800)[br] + %Hello->$setminimumwidth(780)[br] + %Hello->$setmaximumheight(600)[br] + %Hello->$setminimumheight(600)[br] + %Hello->$move(10,10)[br] + %Hello->$show();[br] [br] + */ // ======================================================================== @@ -439,7 +439,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER(KviKvsObject_painter,"setPenStyle",functionsetPenStyle) KVSO_REGISTER_HANDLER(KviKvsObject_painter,"setBrushStyle",functionsetBrushStyle) - + KVSO_REGISTER_HANDLER(KviKvsObject_painter,"fontAscent",functionfontAscent) KVSO_REGISTER_HANDLER(KviKvsObject_painter,"fontDescent",functionfontDescent) KVSO_REGISTER_HANDLER(KviKvsObject_painter,"fontMetricsHeight",functionfontMetricsHeight) @@ -468,7 +468,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER(KviKvsObject_painter,"scale",functionscaleMatrix) KVSO_REGISTER_HANDLER(KviKvsObject_painter,"translate",functiontranslateMatrix) KVSO_REGISTER_HANDLER(KviKvsObject_painter,"reset",functionresetMatrix) - + // painter state KVSO_REGISTER_HANDLER(KviKvsObject_painter,"save",functionsave) KVSO_REGISTER_HANDLER(KviKvsObject_painter,"restore",functionrestore) @@ -510,7 +510,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER(KviKvsObject_painter,"begin",functionbegin) KVSO_REGISTER_HANDLER(KviKvsObject_painter,"end",functionend) - + KVSO_END_REGISTERCLASS(KviKvsObject_painter) @@ -521,7 +521,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_painter,KviKvsObject) m_pDeviceObject=0; m_pPainterPath=0; m_pGradient=0; - + KVSO_END_CONSTRUCTOR(KviKvsObject_painter) KVSO_BEGIN_DESTRUCTOR(KviKvsObject_painter) @@ -824,7 +824,7 @@ bool KviKvsObject_painter::functiondrawChord(KviKvsObjectFunctionCall *c) bool KviKvsObject_painter::functionsetBrush(KviKvsObjectFunctionCall *c) { kvs_int_t iCol1,iCol2,iCol3,iOpacity; - + KviKvsVariant *var1,*var2,*var3; QString szColorMode,szColor; KVSO_PARAMETERS_BEGIN(c) @@ -835,11 +835,11 @@ bool KviKvsObject_painter::functionsetBrush(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("opacity",KVS_PT_INT,KVS_PF_OPTIONAL,iOpacity) KVSO_PARAMETERS_END(c) if(!m_pPainter) return true; - + if(var1->isHObject()) { kvs_hobject_t hObj; - var1->asHObject(hObj); + var1->asHObject(hObj); KviKvsObject *pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObj); if (!pObject) { @@ -855,7 +855,7 @@ bool KviKvsObject_painter::functionsetBrush(KviKvsObjectFunctionCall *c) { var1->asString(szColor); if (c->paramCount()<2) iOpacity=255; - else + else { if (!var2->asInteger(iOpacity)) { @@ -886,7 +886,7 @@ bool KviKvsObject_painter::functionsetBrush(KviKvsObjectFunctionCall *c) else col.setRgb(iCol1,iCol2,iCol3,iOpacity); m_pPainter->setBrush(col); - + } return true; } @@ -894,8 +894,8 @@ bool KviKvsObject_painter::functionsetBrush(KviKvsObjectFunctionCall *c) bool KviKvsObject_painter::functionsetPen(KviKvsObjectFunctionCall *c) { kvs_int_t iCol1,iCol2,iCol3,iOpacity; - - + + QString szColorMode,szColor; KviKvsVariant *var1,*var2,*var3; KVSO_PARAMETERS_BEGIN(c) @@ -911,7 +911,7 @@ bool KviKvsObject_painter::functionsetPen(KviKvsObjectFunctionCall *c) { var1->asString(szColor); if (c->paramCount()<2) iOpacity=255; - else + else { if (!var2->asInteger(iOpacity)) { @@ -942,7 +942,7 @@ bool KviKvsObject_painter::functionsetPen(KviKvsObjectFunctionCall *c) else col.setRgb(iCol1,iCol2,iCol3,iOpacity); m_pPainter->setPen(col); - + } return true; @@ -984,17 +984,17 @@ bool KviKvsObject_painter::functiondrawPoint(KviKvsObjectFunctionCall *c) bool KviKvsObject_painter::functionfontDescent(KviKvsObjectFunctionCall * c) { - if(m_pPainter) + if(m_pPainter) c->returnValue()->setInteger(m_pPainter->fontMetrics().descent()); return true; } bool KviKvsObject_painter::functionfontAscent(KviKvsObjectFunctionCall * c) { - if(m_pPainter) + if(m_pPainter) c->returnValue()->setInteger(m_pPainter->fontMetrics().ascent()); return true; - + } bool KviKvsObject_painter::functionfontMetricsWidth(KviKvsObjectFunctionCall * c) @@ -1039,7 +1039,7 @@ bool KviKvsObject_painter::functionbegin(KviKvsObjectFunctionCall *c) } QPaintDevice * pd; if(pObject->inheritsClass("pixmap"))pd=((KviKvsObject_pixmap *)pObject)->getPixmap(); - + else if (pObject->inheritsClass("widget")) pd=((KviKvsObject_widget *)pObject)->widget(); else{ c->warning(__tr2qs("Widget or Pixmap required ")); @@ -1072,7 +1072,7 @@ void KviKvsObject_painter::detachDevice() m_pDeviceObject = 0; } -bool KviKvsObject_painter::functionend(KviKvsObjectFunctionCall *c) +bool KviKvsObject_painter::functionend(KviKvsObjectFunctionCall *) { detachDevice(); return true; @@ -1089,7 +1089,7 @@ bool KviKvsObject_painter::functionBeginPdf(KviKvsObjectFunctionCall *c) m_pPrinter->setOutputFileName(szFileName); m_pPainter->begin(m_pPrinter); return true; -} +} bool KviKvsObject_painter::functiondrawText(KviKvsObjectFunctionCall *c) { QString szText,szMode; @@ -1143,9 +1143,7 @@ bool KviKvsObject_painter::functiondrawPixmap(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Pixmap object required")); return true; } - QPixmap * pm=((KviKvsObject_pixmap *)obj)->getPixmap(); - //if (bTiled) m_pPainter->drawTiledPixmap(iX,iY,iEndx,iEndy,*((KviKvsObject_pixmap *)obj)->getPixmap(),iStartx,iStarty); - //else + m_pPainter->drawPixmap(QPointF(iX,iY),*((KviKvsObject_pixmap *)obj)->getPixmap(),QRect(iStartx,iStarty,iEndx,iEndy)); return true; } @@ -1203,14 +1201,14 @@ bool KviKvsObject_painter::functionscaleMatrix(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!m_pPainter)return true; PAINTER_SCALE(dScalex,dScaley); - + //m_pMatrix.scale(dScalex,dScaley); //m_pPainter->setWorldMatrix(m_pMatrix); //m_pPainter->scale(dScalex,dScaley); return true; } -bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c) +bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *) { if(!m_pPainter)return true; //m_pMatrix.reset(); @@ -1263,7 +1261,7 @@ bool KviKvsObject_painter::functiondrawIcon(KviKvsObjectFunctionCall *c) { QString szIcon,szState; kvs_int_t iX,iY,iW,iH; - + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("x",KVS_PT_INT,0,iX) KVSO_PARAMETER("y",KVS_PT_INT,0,iY) @@ -1283,7 +1281,7 @@ bool KviKvsObject_painter::functiondrawIcon(KviKvsObjectFunctionCall *c) return true; } QSize pixsize(pix->width(),pix->height()); - + QIcon ico(*pix); QIcon::Mode mode=QIcon::Normal; if(!ico.isNull()) @@ -1291,7 +1289,7 @@ bool KviKvsObject_painter::functiondrawIcon(KviKvsObjectFunctionCall *c) if (KviQString::equalCI(szState,"Disabled"))mode=QIcon::Disabled; else if (KviQString::equalCI(szState,"Active"))mode=QIcon::Active; else if (KviQString::equalCI(szState,"Selected"))mode=QIcon::Selected; - if (c->parameterCount()<5) + if (c->parameterCount()<5) m_pPainter->drawPixmap(iX,iY,ico.pixmap(pixsize,mode)); else m_pPainter->drawPixmap(iX,iY,ico.pixmap(QSize(iW,iH),mode)); @@ -1301,9 +1299,9 @@ bool KviKvsObject_painter::functiondrawIcon(KviKvsObjectFunctionCall *c) bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; + if(!m_pPainter)return true; kvs_real_t dOpacity; - + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) KVSO_PARAMETERS_END(c) @@ -1313,8 +1311,8 @@ bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c) bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; - + if(!m_pPainter)return true; + bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) @@ -1325,8 +1323,8 @@ bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; - + if(!m_pPainter)return true; + bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) @@ -1337,8 +1335,8 @@ bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c) bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; - + if(!m_pPainter)return true; + bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) @@ -1379,14 +1377,14 @@ bool KviKvsObject_painter::functionsetPenCapStyle(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_painter::functionsave(KviKvsObjectFunctionCall * c) +bool KviKvsObject_painter::functionsave(KviKvsObjectFunctionCall *) { if(m_pPainter) m_pPainter->save(); return true; } -bool KviKvsObject_painter::functionrestore(KviKvsObjectFunctionCall * c) +bool KviKvsObject_painter::functionrestore(KviKvsObjectFunctionCall *) { if(m_pPainter) m_pPainter->restore(); @@ -1522,13 +1520,13 @@ bool KviKvsObject_painter::functionsetGradientColor(KviKvsObjectFunctionCall *c) col.setRgb(iCol1,iCol2,iCol3,iOpacity); if (!m_pGradient) m_pGradient=new(QLinearGradient); m_pGradient->setColorAt(dAt,col); - + } - + return true; } -bool KviKvsObject_painter::functionsetGradientAsBrush(KviKvsObjectFunctionCall *c) +bool KviKvsObject_painter::functionsetGradientAsBrush(KviKvsObjectFunctionCall *) { if (!m_pPainter) return true; if (!m_pGradient) m_pGradient=new(QLinearGradient); @@ -1536,7 +1534,7 @@ bool KviKvsObject_painter::functionsetGradientAsBrush(KviKvsObjectFunctionCall * return true; } -bool KviKvsObject_painter::functionclearGradient(KviKvsObjectFunctionCall *c) +bool KviKvsObject_painter::functionclearGradient(KviKvsObjectFunctionCall *) { if (!m_pGradient) delete m_pGradient; m_pGradient=0; @@ -1575,7 +1573,7 @@ bool KviKvsObject_painter::functionfillRect(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!m_pPainter) return true; if (c->paramCount()<8) iOpacity=255; - + QColor col; if(KviQString::equalCI(szColorMode, "HSV")) col.setHsv(iCol1,iCol2,iCol3,iOpacity); @@ -1612,7 +1610,7 @@ bool KviKvsObject_painter::functionheight(KviKvsObjectFunctionCall *c) bool KviKvsObject_painter::functionpathMoveTo(KviKvsObjectFunctionCall *c) { kvs_real_t dX,dY; - + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("x",KVS_PT_REAL,0,dX) KVSO_PARAMETER("y",KVS_PT_REAL,0,dY) @@ -1625,7 +1623,7 @@ bool KviKvsObject_painter::functionpathMoveTo(KviKvsObjectFunctionCall *c) bool KviKvsObject_painter::functionpathLineTo(KviKvsObjectFunctionCall *c) { kvs_real_t dX,dY; - + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("x",KVS_PT_REAL,0,dX) KVSO_PARAMETER("y",KVS_PT_REAL,0,dY) @@ -1639,7 +1637,7 @@ bool KviKvsObject_painter::functionpathAddText(KviKvsObjectFunctionCall *c) { kvs_real_t dX,dY; QString szText; - + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("x",KVS_PT_REAL,0,dX) KVSO_PARAMETER("y",KVS_PT_REAL,0,dY) @@ -1650,7 +1648,7 @@ bool KviKvsObject_painter::functionpathAddText(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_painter::functiondrawPath(KviKvsObjectFunctionCall *c) +bool KviKvsObject_painter::functiondrawPath(KviKvsObjectFunctionCall *) { if (m_pPainter) m_pPainter->drawPath(*m_pPainterPath); //delete m_pPainterPath; @@ -1658,7 +1656,7 @@ bool KviKvsObject_painter::functiondrawPath(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_painter::functionresetPath(KviKvsObjectFunctionCall *c) +bool KviKvsObject_painter::functionresetPath(KviKvsObjectFunctionCall *) { if (m_pPainterPath){ delete m_pPainterPath; diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 6b1336058..d7a38fcec 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -45,7 +45,7 @@ [class]object[/class] [class]widget[/class] @description: - The pixmap class is an off-screen, pixel-based paint device. + The pixmap class is an off-screen, pixel-based paint device. @functions: !fn: $fill(<widget:object>,<x_offset:integer>,<y:offset>) Fills the pixmap with the widget's background color or pixmap.[br] @@ -61,7 +61,7 @@ Transformation type values: - Fast: fast transformation but less quality. - Smooth: more quality using bilinear filtering. - !fn: $rotate(<a:real>) + !fn: $rotate(<a:real>) Rotates the pixmap by a degrees. !fn: $load(<file_name:string>) Load a pixmap from the <file>. @@ -90,7 +90,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_pixmap,"pixmap","object") KVSO_END_REGISTERCLASS(KviKvsObject_pixmap) -KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_pixmap,KviKvsObject) +KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_pixmap,KviKvsObject) m_pPixmap=new QPixmap(); m_pImage=new QImage(); bPixmapModified=false; @@ -99,11 +99,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_pixmap) KVSO_BEGIN_DESTRUCTOR(KviKvsObject_pixmap) - + emit aboutToDie(); delete m_pPixmap; if (m_pImage) delete m_pImage; - + KVSO_END_CONSTRUCTOR(KviKvsObject_pixmap) @@ -118,7 +118,7 @@ KVSO_CLASS_FUNCTION(pixmap,fill) KVSO_PARAMETER("x_offset",KVS_PT_INT,0,iXoffset) KVSO_PARAMETER("y_offset",KVS_PT_INT,0,iYoffset) KVSO_PARAMETERS_END(c) - + pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); CHECK_HOBJECT_IS_WIDGET(pObject) bPixmapModified=true; @@ -151,7 +151,7 @@ KVSO_CLASS_FUNCTION(pixmap,scale) bPixmapModified=true; return true; } - + KVSO_CLASS_FUNCTION(pixmap,rotate) { CHECK_INTERNAL_POINTER(m_pPixmap) @@ -227,13 +227,13 @@ KVSO_CLASS_FUNCTION(pixmap,loadFromMemoryBuffer) KVSO_CLASS_FUNCTION(pixmap,height) { CHECK_INTERNAL_POINTER(m_pPixmap) - c->returnValue()->setInteger(m_pPixmap->height()); + c->returnValue()->setInteger(m_pPixmap->height()); return true; } KVSO_CLASS_FUNCTION(pixmap,width) { CHECK_INTERNAL_POINTER(m_pPixmap) - c->returnValue()->setInteger(m_pPixmap->width()); + c->returnValue()->setInteger(m_pPixmap->width()); return true; } // maybe DEPRECATED? @@ -246,9 +246,9 @@ KVSO_CLASS_FUNCTION(pixmap,setOpacity) KviKvsObject * pObDest; kvs_hobject_t hObject; - + KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) + KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) KVSO_PARAMETER("destination",KVS_PT_HOBJECT,0,hObject) KVSO_PARAMETER("x_offset",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uXoffset) KVSO_PARAMETER("y_offset",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uYoffset) @@ -273,12 +273,13 @@ KVSO_CLASS_FUNCTION(pixmap,setOpacity) if (bPixmapModified) { *m_pImage=m_pPixmap->toImage(); } - if (uWidth>buffer->width() || uHeight>buffer->height()) + if (uWidth > (uint) buffer->width() || uHeight > (uint) buffer->height()) { c->warning(__tr2qs_ctx("Area dimensions are out of destination size ","objects")); return true; } - if (!uWidth){ + if (!uWidth) + { if(m_pImage->width()>buffer->width()) { c->warning(__tr2qs_ctx("Pixmap dimensions are out of destination size ","objects")); @@ -295,13 +296,12 @@ KVSO_CLASS_FUNCTION(pixmap,setOpacity) } } - -if(uXoffset+uWidth>m_pImage->width()) + if(uXoffset + uWidth > (uint) m_pImage->width()) { c->warning(__tr2qs_ctx("Offset width area is out of pixmap size ","objects")); return true; } - if( uYoffset+uHeight>m_pImage->height()) + if(uYoffset + uHeight > (uint) m_pImage->height()) { c->warning(__tr2qs_ctx("Offset height area is out of pixmap size ","objects")); return true; @@ -310,7 +310,7 @@ if(uXoffset+uWidth>m_pImage->width()) // buffer->setAlphaBuffer(true); int iHedge=uHeight?uHeight:m_pImage->height(); int iWedge=uWidth?uWidth:m_pImage->width(); - + for(int y = uYoffset;y<iHedge;y++) { QRgb * dst = (QRgb *)buffer->scanLine(y); @@ -334,9 +334,9 @@ if(uXoffset+uWidth>m_pImage->width()) } -QPixmap * KviKvsObject_pixmap::getPixmap() +QPixmap * KviKvsObject_pixmap::getPixmap() { - if (bImageModified) + if (bImageModified) { m_pPixmap->fromImage(*m_pImage); bImageModified=false; @@ -345,12 +345,12 @@ QPixmap * KviKvsObject_pixmap::getPixmap() } QImage * KviKvsObject_pixmap::getImage() { - if (bPixmapModified) + if (bPixmapModified) { *m_pImage=m_pPixmap->toImage(); bPixmapModified=false; } - + return m_pImage; } diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index b54fd03a7..b99c6ae42 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -188,7 +188,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_popupmenu) KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu) -bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext *,KviKvsVariantList *) { identifier=0; SET_OBJECT(QMenu) @@ -206,8 +206,7 @@ KVSO_CLASS_FUNCTION(popupmenu,insertItem) KVSO_PARAMETER("icon_id",KVS_PT_STRING,KVS_PF_OPTIONAL,szIcon) KVSO_PARAMETERS_END(c) QPixmap *pix = 0; - int id=0; - QAction * action; + QAction * action = 0; if(!szIcon.isEmpty()) { pix = g_pIconManager->getImage(szIcon); @@ -230,10 +229,10 @@ KVSO_CLASS_FUNCTION(popupmenu,setTitle) KVSO_PARAMETERS_END(c) if(!widget())return true; ((QMenu *)widget())->setTitle(szTitle); - + return true; } -/* + KVSO_CLASS_FUNCTION(popupmenu,insertWidget) { KviKvsObject *pObject; @@ -362,8 +361,7 @@ void KviKvsObject_popupmenu::slottriggered(QAction *a) { QHashIterator<int, QAction *> i(actionsDict); kvs_int_t count=0; - bool found=false; - while (i.hasNext()) + while (i.hasNext()) { i.next(); if (i.value()!= a) count++; diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp index 8ad81c559..ed1851fbc 100644 --- a/src/modules/objects/class_progressbar.cpp +++ b/src/modules/objects/class_progressbar.cpp @@ -55,16 +55,16 @@ See also [classfnc]$settotalSteps[/classfnc]() !fn: $settotalSteps(<total_steps:uinteger>) The progress bar uses the concept of steps; you give it the total number of steps - and the number of steps completed so far and it will display the percentage of steps that have been completed. - See also [classfnc]$setProgress[/classfnc]() + and the number of steps completed so far and it will display the percentage of steps that have been completed. + See also [classfnc]$setProgress[/classfnc]() !fn: $reset() - Reset the progress bar. + Reset the progress bar. !fn: $setPercentageVisible(<bVisible,boolean>) Sets whether the current progress value is displayed. - See also [classfnc]$isPercentageVisible[/classfnc]() + See also [classfnc]$isPercentageVisible[/classfnc]() !fn: <boolean> $ispercentageVisible() This property holds whether the current progress value is displayed. - See also [classfnc]$setPercentageVisible[/classfnc]() + See also [classfnc]$setPercentageVisible[/classfnc]() */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_progressbar,"progressbar","widget") @@ -85,8 +85,8 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_progressbar) KVSO_END_CONSTRUCTOR(KviKvsObject_progressbar) -bool KviKvsObject_progressbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) -{ +bool KviKvsObject_progressbar::init(KviKvsRunTimeContext *,KviKvsVariantList *) +{ SET_OBJECT (QProgressBar) return true; } diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 9131bd4f0..a36450af7 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -48,7 +48,7 @@ !fn: $settext(<text:string>) Sets the text that will appear in the radiobutton. !fn: <boolean> $isChecked() - Returns 1 (TRUE) if the radio button is checked; otherwise returns 0 (FALSE). + Returns 1 (TRUE) if the radio button is checked; otherwise returns 0 (FALSE). !fn: $setChecked(<bChecked:boolean>) Sets whether the radio button is checked to check. !fn: $setPixmap(<image_id>) @@ -59,7 +59,7 @@ The default implementation emits the toggled(<bool>) signal. !sg: $toggled() This signal is emitted by the default implementation of [classfnc]$toggleEvent[/classfnc]().[br] - + */ @@ -83,7 +83,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_radiobutton) KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton) -bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QRadioButton) connect(widget(),SIGNAL(toggled(bool)),this,SLOT(toggled(bool))); diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index bfad2424e..df858dda5 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -131,7 +131,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_slider) KVSO_END_CONSTRUCTOR(KviKvsObject_slider) -bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_slider::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QSlider) connect(widget(),SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 323ee6da1..4ced37506 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -333,7 +333,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_socket) m_pOutBuffer=0; m_pFlushTimer=0; - + if(m_pInBuffer)kvi_free(m_pInBuffer); if(m_pDelayTimer)delete m_pDelayTimer; if(m_pDns)delete m_pDns; @@ -463,14 +463,14 @@ KVSO_CLASS_FUNCTION(socket,readHex) char * str = new char[(uLen*2) + 1]; int index=0; unsigned char byte,msb,lsb=0; - for (int i=0;i<uLen;i++) + for (unsigned int i=0;i<uLen;i++) { byte=(unsigned char)m_pInBuffer[i]; lsb=byte & 0x0f; msb=byte>>4; - msb>9?msb+='7':msb+='0'; - lsb>9?lsb+='7':lsb+='0'; - str[index++]=msb; + msb>9?msb+='7':msb+='0'; + lsb>9?lsb+='7':lsb+='0'; + str[index++]=msb; str[index++]=lsb; } str[index]='\0'; @@ -507,7 +507,7 @@ KVSO_CLASS_FUNCTION(socket,write) else if (pObject->inheritsClass("file")) { KviFile *pFile=((KviKvsObject_file *)pObject)->pFile(); - if (!pFile->isOpen()) + if (!pFile->isOpen()) { c->warning(__tr2qs_ctx("File is not open!","objects")); return true; @@ -523,7 +523,7 @@ KVSO_CLASS_FUNCTION(socket,write) c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer or file object","objects")); return true; } - + } else { @@ -605,7 +605,7 @@ KVSO_CLASS_FUNCTION(socket,writeHex) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("hex_string",KVS_PT_STRING,0,m_szHex) KVSO_PARAMETERS_END(c) - if (m_szHex.length()%2) + if (m_szHex.length()%2) { c->warning(__tr2qs_ctx("The hex string lenght is not a multiple of 2","objects")); return true; @@ -672,7 +672,7 @@ KVSO_CLASS_FUNCTION(socket,functionConnect) m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; delayedConnect(); } else { - debug ("connectinhg on ip %s port %d",m_szRemoteIp.toUtf8().data(),m_uRemotePort); + debug ("connectinhg on ip %s port %d",m_szRemoteIp.toUtf8().data(),(int) m_uRemotePort); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS; delayedLookupRemoteIp(); } @@ -1187,7 +1187,7 @@ void KviKvsObject_socket::readNotifierFired(int) // readLength > 0 m_uInDataLen += readLength; - + unsigned int uOldConnectionId = m_uConnectionId; callFunction(this,"dataAvailableEvent",new KviKvsVariantList(new KviKvsVariant((kvs_int_t)readLength))); if(m_uConnectionId == uOldConnectionId) diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 80cdc01d7..0258e7a63 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -55,7 +55,7 @@ See also [classfnc]$MinValue[/classfnc]() !fn: $setMaxValue(<max_value:integer>) Sets the maximum value of the spin box.[br] - See also [classfnc]$maxValue[/classfnc]() + See also [classfnc]$maxValue[/classfnc]() !fn: $setLineStep(<line_step:integer>) Sets the line step: when the user uses the arrows to change the spin box's value the value will be incremented/decremented by the amount of the line step. @@ -118,7 +118,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_spinbox,"spinbox","widget") KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setPrefix); KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setSuffix); - + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,valueChangedEvent); KVSO_END_REGISTERCLASS(KviKvsObject_spinbox) @@ -131,7 +131,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_spinbox) KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox) -bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_spinbox::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QSpinBox) connect(widget(),SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); @@ -230,7 +230,7 @@ KVSO_CLASS_FUNCTION(spinbox,setSpecialValueText) } KVSO_CLASS_FUNCTION(spinbox,setPrefix) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szPrefix; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szPrefix) @@ -240,7 +240,7 @@ KVSO_CLASS_FUNCTION(spinbox,setPrefix) } KVSO_CLASS_FUNCTION(spinbox,setSuffix) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szSuffix; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szSuffix) diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 1d0081626..454cb3677 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -73,7 +73,7 @@ !fn: <string> $currentTabLabel() Returns the label of the current tab. !fn: $removePage(<tab_widget:object>) - Remove the page <tab_widget>. + Remove the page <tab_widget>. !fn: $setTabPosition(<tab_position:string>) Sets TabPosition. Valid parameters are : Top, Bottom. !fn: <integer> $count() @@ -88,11 +88,11 @@ %Tabwidget->$setToolTip("Example of TabWidget class") %Tabwidget->$setMargin(30) %Tabwidget->$setTabPosition(Top) - + # Now we'll create the new widgets and put they in to the main tabwidget. %firsttab=$new(widget,%Tabwidget) %secondtab=$new(widget,%Tabwidget) - + # Now we'll create the item to put in to tab's pages. %layoutfirsttab=$new(layout,%firsttab) %labelbt=$new(label,%firsttab) @@ -103,17 +103,17 @@ %buttontb->$settext("To &Botton") %buttontt=$new(button,%firsttab) %buttontt->$settext("To &Top") - + # Now we'll give a layout to all items. # This also allows to use privateimpl without making buttons global variables %layoutfirsttab->$addwidget(%labelbt,0,0) %layoutfirsttab->$addwidget(%labeltt,0,1) %layoutfirsttab->$addwidget(%buttontb,1,0) %layoutfirsttab->$addwidget(%buttontt,1,1) - + # Add the page to the main tab. %Tabwidget->$addTab(%firsttab,Top&Button,33) - + # Implementing the action to do when the user click the buttons. privateimpl(%buttontb,mousepressevent) { @@ -123,7 +123,7 @@ { %Tabwidget->$setTabPosition(Top) } - + # We do the same work with the second tab's page. %layoutsecondtab=$new(layout,%secondtab) %labelwp=$new(label,%secondtab) @@ -135,8 +135,8 @@ %labelgen->$setalignment("Center") %layoutsecondtab->$addwidget(%labelgen,1,0) %Tabwidget->$addTab(%secondtab,&About,50) - - # Let's show our example. + + # Let's show our example. %Tabwidget->$show() [/example] @signals: @@ -146,7 +146,7 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_tabwidget,"tabwidget","widget") - + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,addTab) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,insertTab) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,setTabToolTip) @@ -178,7 +178,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_tabwidget) KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget) -bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QTabWidget) connect(widget(),SIGNAL(currentChanged(int)),this,SLOT(slotCurrentChanged(int))); @@ -202,7 +202,7 @@ KVSO_CLASS_FUNCTION(tabwidget,addTab) if(pix){ ((QTabWidget *)widget())->addTab(((QWidget *)(pObject->object())),QIcon(*pix),szLabel); } - else((QTabWidget *)widget())->addTab(((QWidget *)(pObject->object())),szLabel); + else((QTabWidget *)widget())->addTab(((QWidget *)(pObject->object())),szLabel); return true; } @@ -225,7 +225,7 @@ KVSO_CLASS_FUNCTION(tabwidget,insertTab) if(pix){ ((QTabWidget *)widget())->insertTab(iIndex,(QWidget *)(pObject->object()),QIcon(*pix),szLabel); } - else ((QTabWidget *)widget())->insertTab(iIndex,((QWidget *)(pObject->object())),szLabel); + else ((QTabWidget *)widget())->insertTab(iIndex,((QWidget *)(pObject->object())),szLabel); return true; } @@ -252,7 +252,7 @@ KVSO_CLASS_FUNCTION(tabwidget,setTabToolTip) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); CHECK_HOBJECT_IS_WIDGET(pObject) int ctrl = ((QTabWidget *)widget())->indexOf (((QWidget *)(pObject->object()))); - if (ctrl == -1) + if (ctrl == -1) { c->warning(__tr2qs_ctx("Can't find the tab ","objects")); return true; @@ -293,7 +293,7 @@ KVSO_CLASS_FUNCTION(tabwidget,setTabLabel) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); CHECK_HOBJECT_IS_WIDGET(pObject) int ctrl = ((QTabWidget *)widget())->indexOf (((QWidget *)(pObject->object()))); - if (ctrl == -1) + if (ctrl == -1) { c->warning(__tr2qs_ctx("Can't find the tab ","objects")); return true; @@ -348,7 +348,7 @@ KVSO_CLASS_FUNCTION(tabwidget,removePage) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); CHECK_HOBJECT_IS_WIDGET(pObject) int ctrl = ((QTabWidget *)widget())->indexOf (((QWidget *)(pObject->object()))); - if (ctrl == -1) + if (ctrl == -1) { c->warning(__tr2qs_ctx("Can't find the tab ","objects")); return true; @@ -371,7 +371,7 @@ KVSO_CLASS_FUNCTION(tabwidget,changeTab) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); CHECK_HOBJECT_IS_WIDGET(pObject) int ctrl = ((QTabWidget *)widget())->indexOf (((QWidget *)(pObject->object()))); - if (ctrl == -1) + if (ctrl == -1) { c->warning(__tr2qs_ctx("Can't find the tab","objects")); return true; diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index 9393e799b..4459244e1 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -84,7 +84,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_textbrowser) KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser) -bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QTextBrowser); connect(obj,SIGNAL(anchorClicked(const QUrl &)),this,SLOT(anchorClicked(const QUrl &))); diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index cf76e4e9a..4ad6f6e0e 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -76,22 +76,22 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_toolbar) KVSO_END_CONSTRUCTOR(KviKvsObject_toolbar) -bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *) { if (!parentObject()) - { + { pContext->warning(__tr2qs_ctx("The toolbar cannot be a parent-widget!","objects")); return true; } if(parentObject()->inheritsClass("mainwindow")) - { + { setObject(new KviTalToolBar(getName(), ((KviTalMainWindow *)parentScriptWidget())), true); } else { pContext->warning(__tr2qs_ctx("The parent-widget isn't a MainWindow.","objects")); } - + return true; } diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index bcc1a28ef..eb16fa8d5 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -97,7 +97,7 @@ A good value is 100. !fn:<integer> $pupupDelay() Returns the time delay between pressing the button and the appearance of the associated popup menu in milliseconds. -*/ +*/ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_toolbutton,"toolbutton","widget") KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setImage) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setUsesBigPixmap) @@ -134,7 +134,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_toolbutton) KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton) -bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QToolButton); connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked())); diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp index e07dd33d0..5935e7709 100644 --- a/src/modules/objects/class_treewidget.cpp +++ b/src/modules/objects/class_treewidget.cpp @@ -191,7 +191,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidget,"listview","widget") KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setRootIsDecorated) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setAllColumnsShowFocus) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,clear) - //FIXME + //FIXME KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"selectedItem",selectedItems)//<--- remove this KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,selectedItems) @@ -205,23 +205,23 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidget,"listview","widget") KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,firstChild) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,selectionChangedEvent); KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,currentChangedEvent); - + // FIX-ME KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"returnPressedEvent",itemActivatedEvent);//<- remove me KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemActivatedEvent); // - + // KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,"spacePressedEvent",function_spacePressedEvent); KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,onItemEvent); KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemClickedEvent); KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemExpandedEvent); KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemCollapsedEvent); - + //FIXME KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemRenamedEvent",itemChangedEvent);//<- remove me KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemChangedEvent); // - + KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"rightButtonClickedEvent",customContextMenuRequestedEvent); KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,customContextMenuRequestedEvent); @@ -238,13 +238,13 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_treewidget) KVSO_END_CONSTRUCTOR(KviKvsObject_treewidget) -bool KviKvsObject_treewidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_treewidget::init(KviKvsRunTimeContext *,KviKvsVariantList *) { setObject(new KviKvsTreeWidget(parentScriptWidget(),getName().toUtf8().data(),this),true); - + // hack for compatibility with "old" addColumn method; ((KviTalTreeWidget*) widget())->setColumnCount(0); - + connect(widget(),SIGNAL(itemClicked(QTreeWidgetItem *,int)),this,SLOT(slotClicked(QTreeWidgetItem *,int))); connect(widget(),SIGNAL(itemSelectionChanged()),this,SLOT(slotSelectionChanged())); connect(widget(),SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(slotCurrentChanged(QTreeWidgetItem *,QTreeWidgetItem *))); @@ -254,10 +254,10 @@ bool KviKvsObject_treewidget::init(KviKvsRunTimeContext * pContext,KviKvsVariant connect(widget(),SIGNAL(itemCollapsed(QTreeWidgetItem *)),this,SLOT(slotItemCollapsed(QTreeWidgetItem *))); //connect(widget(),SIGNAL(rightButtonClicked(QTreeWidgetItem *,const QPoint &,int)),this,SLOT(slotRightButtonClicked(QTreeWidgetItem *,const QPoint &,int))); connect(widget(),SIGNAL(itemChanged(QTreeWidgetItem *,int)),this,SLOT(slotItemChanged(QTreeWidgetItem *,int))); - + widget()->setContextMenuPolicy(Qt::CustomContextMenu); connect(widget(),SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(slotCustomContextMenuRequested(const QPoint &))); - + return true; } @@ -407,7 +407,7 @@ KVSO_CLASS_FUNCTION(treewidget,setSorting) KVSO_PARAMETER("sorting",KVS_PT_BOOLEAN,0,bEnables) KVSO_PARAMETERS_END(c) if (!widget())return true; - if (iCol<0) + if (iCol<0) ((KviTalTreeWidget *)widget())->setSortingEnabled(false); else if(!bEnables) ((KviTalTreeWidget *)widget())->sortItems(iCol,Qt::DescendingOrder); @@ -443,7 +443,7 @@ KVSO_CLASS_FUNCTION(treewidget,hideListViewHeader) KVSO_CLASS_FUNCTION(treewidget,showListViewHeader) { - ((KviTalTreeWidget *)widget())->header()->show(); + ((KviTalTreeWidget *)widget())->header()->show(); return true; } @@ -462,7 +462,7 @@ KVSO_CLASS_FUNCTION(treewidget,itemClickedEvent) void KviKvsObject_treewidget::slotClicked(KviTalTreeWidgetItem * i,int col) { KviKvsVariant *column=new KviKvsVariant((kvs_int_t)col); - + KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(i)),column); callFunction(this,"itemClickedEvent",0,¶ms); } @@ -502,7 +502,7 @@ void KviKvsObject_treewidget::slotCurrentChanged(KviTalTreeWidgetItem * i,KviTal KVSO_CLASS_FUNCTION(treewidget,itemActivatedEvent) { //FIXME: compatibility - emitSignal("returnPressed",c,c->params());//<----remove me + emitSignal("returnPressed",c,c->params());//<----remove me // emitSignal("itemActivated",c,c->params()); @@ -518,7 +518,7 @@ void KviKvsObject_treewidget::slotItemActivated(KviTalTreeWidgetItem * i,int col KVSO_CLASS_FUNCTION(treewidget,onItemEvent) { - + emitSignal("onItem",c,c->params()); return true; } @@ -594,7 +594,7 @@ void KviKvsObject_treewidget::fileDropped(QString &szFile,KviTalTreeWidgetItem * callFunction(this,"fileDroppedEvent",0,¶ms); } -KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par,const char * name,KviKvsObject_treewidget *parent) +KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par,const char *,KviKvsObject_treewidget *parent) :KviTalTreeWidget(par) { m_pParentScript=parent; diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp index d0bee53c5..bfc3cc2bc 100644 --- a/src/modules/objects/class_treewidgetitem.cpp +++ b/src/modules/objects/class_treewidgetitem.cpp @@ -162,7 +162,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_treewidgetitem) KVSO_END_CONSTRUCTOR(KviKvsObject_treewidgetitem) -bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *) { if (!parentObject()) { @@ -277,7 +277,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setFlags) } } if(flag){ - if (flag==Qt::ItemIsUserCheckable) + if (flag==Qt::ItemIsUserCheckable) m_pTreeWidgetItem->setCheckState(0,Qt::Unchecked); sum = sum | flag; } @@ -286,7 +286,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setFlags) } if(m_pTreeWidgetItem) m_pTreeWidgetItem->setFlags((Qt::ItemFlags)sum); - + return true; } /* diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 9ff5879a8..2e9583911 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -720,14 +720,12 @@ KVSO_END_REGISTERCLASS(KviKvsObject_widget) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_widget,KviKvsObject) KVSO_END_CONSTRUCTOR(KviKvsObject_widget) KVSO_BEGIN_DESTRUCTOR(KviKvsObject_widget) -debug("destr"); -int tt=0; emit aboutToDie(); // if (webview) delete webview; KVSO_END_CONSTRUCTOR(KviKvsObject_widget) -bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) +bool KviKvsObject_widget::init(KviKvsRunTimeContext *,KviKvsVariantList *) { setObject(new KviKvsWidget(this,parentScriptWidget())); widget()->setObjectName(getName()); @@ -971,7 +969,7 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e) } -bool KviKvsObject_widget::function_show(KviKvsObjectFunctionCall *c) +bool KviKvsObject_widget::function_show(KviKvsObjectFunctionCall *) { if(!widget())return true; // should we warn here ? QWidget *wid=widget(); @@ -1032,7 +1030,7 @@ bool KviKvsObject_widget::function_fontAscent(KviKvsObjectFunctionCall * c) } -bool KviKvsObject_widget::function_repaint(KviKvsObjectFunctionCall * c) +bool KviKvsObject_widget::function_repaint(KviKvsObjectFunctionCall *) { if(!widget()) return true; widget()->repaint(); @@ -1187,7 +1185,7 @@ bool KviKvsObject_widget::function_mapFromGlobal(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_widget::function_centerToScreen(KviKvsObjectFunctionCall *c) +bool KviKvsObject_widget::function_centerToScreen(KviKvsObjectFunctionCall *) { if(widget()) { @@ -1209,16 +1207,16 @@ bool KviKvsObject_widget::function_setPaletteForeground(KviKvsObjectFunctionCall KVSO_PARAMETER("green",KVS_PT_INT,KVS_PF_OPTIONAL,iColG) KVSO_PARAMETER("blue",KVS_PT_INT,KVS_PF_OPTIONAL,iColB) KVSO_PARAMETERS_END(c) - + if(pColArray->isString()) { QString szColor; pColArray->asString(szColor); if (widget()) { - QPalette p = widget()->palette(); - p.setColor(widget()->foregroundRole(), QColor(szColor)); - widget()->setPalette(p); + QPalette p = widget()->palette(); + p.setColor(widget()->foregroundRole(), QColor(szColor)); + widget()->setPalette(p); } return true; } @@ -1252,7 +1250,6 @@ bool KviKvsObject_widget::function_setPaletteForeground(KviKvsObjectFunctionCall bool bOk,bOk1,bOk2; QString value; pColArray->asString(value); - int i=0; if (value.length()!=6) { c->warning(__tr2qs("A string of 6 hex digits is required")); @@ -1271,9 +1268,9 @@ bool KviKvsObject_widget::function_setPaletteForeground(KviKvsObjectFunctionCall } if (widget()) { - QPalette p = widget()->palette(); - p.setColor(widget()->foregroundRole(), QColor(iColR,iColG,iColB)); - widget()->setPalette(p); + QPalette p = widget()->palette(); + p.setColor(widget()->foregroundRole(), QColor(iColR,iColG,iColB)); + widget()->setPalette(p); return true; } } @@ -1293,9 +1290,9 @@ bool KviKvsObject_widget::function_setPaletteForeground(KviKvsObjectFunctionCall if (widget()) { - QPalette p = widget()->palette(); - p.setColor(widget()->foregroundRole(), QColor(iColR,iColG,iColB)); - widget()->setPalette(p); + QPalette p = widget()->palette(); + p.setColor(widget()->foregroundRole(), QColor(iColR,iColG,iColB)); + widget()->setPalette(p); } return true; } @@ -1339,7 +1336,6 @@ bool KviKvsObject_widget::function_setBackgroundColor(KviKvsObjectFunctionCall * bool bOk,bOk1,bOk2; QString value; pColArray->asString(value); - int i=0; if (value.length()!=6) { c->warning(__tr2qs("A string of 6 hex digits is required")); @@ -1358,9 +1354,9 @@ bool KviKvsObject_widget::function_setBackgroundColor(KviKvsObjectFunctionCall * } if (widget()) { - QPalette p = widget()->palette(); + QPalette p = widget()->palette(); p.setColor(widget()->backgroundRole(), QColor(iColR,iColG,iColB)); - widget()->setPalette(p); + widget()->setPalette(p); } return true; } @@ -1379,9 +1375,9 @@ bool KviKvsObject_widget::function_setBackgroundColor(KviKvsObjectFunctionCall * } if (widget()) { - QPalette p = widget()->palette(); + QPalette p = widget()->palette(); p.setColor(widget()->backgroundRole(), QColor(iColR,iColG,iColB)); - widget()->setPalette(p); + widget()->setPalette(p); } return true; } @@ -1476,7 +1472,7 @@ bool KviKvsObject_widget::function_hasFocus(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_widget::function_setFocus(KviKvsObjectFunctionCall *c) +bool KviKvsObject_widget::function_setFocus(KviKvsObjectFunctionCall *) { if (widget())widget()->setFocus(); return true; @@ -1791,7 +1787,7 @@ bool KviKvsObject_widget::function_reparent(KviKvsObjectFunctionCall *c) if(!widget()) return true; if(!ob) { - setParent(0); + setParent(0); return true; } else @@ -1800,8 +1796,8 @@ bool KviKvsObject_widget::function_reparent(KviKvsObjectFunctionCall *c) c->warning(__tr("Parent must be a widget object")); return true; } - setParent(((QWidget *)(ob->object()))); - + setParent(((QWidget *)(ob->object()))); + // widget()->reparent(((QWidget *)(ob->object())),QPoint(((QWidget *)(ob->object()))->x(),((QWidget *)(ob->object()))->y())); return true; } @@ -1975,9 +1971,9 @@ bool KviKvsObject_widget::function_insertIntoStatusBar(KviKvsObjectFunctionCall return true; } -bool KviKvsObject_widget::function_removeFromStatusBar(KviKvsObjectFunctionCall *c) +bool KviKvsObject_widget::function_removeFromStatusBar(KviKvsObjectFunctionCall *) { - + if (widget()) g_pFrame->statusBar()->removeWidget(widget()); return true; } diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index e82d0f179..6ed2133ad 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -37,7 +37,7 @@ KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(KviFrame * pParent,const QStr : KviWindow(KVI_WINDOW_TYPE_SCRIPTOBJECT,pParent,szName) { m_pCentralWidget = 0; - + } KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow() @@ -50,7 +50,7 @@ void KviKvsScriptWindowWindow::setCentralWidget(KviKvsObject_widget *o,QWidget * m_pCentralWidget = w; } -void KviKvsScriptWindowWindow::resizeEvent(QResizeEvent *e) +void KviKvsScriptWindowWindow::resizeEvent(QResizeEvent *) { if(m_pCentralWidget) m_pCentralWidget->setGeometry(0,0,width(),height()); @@ -109,7 +109,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_window) KVSO_END_CONSTRUCTOR(KviKvsObject_window) -bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *) { KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),getName()); setObject(w); diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index adea7a8ad..05ccaca52 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -124,7 +124,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_wizard) KVSO_END_CONSTRUCTOR(KviKvsObject_wizard) -bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_wizard::init(KviKvsRunTimeContext *,KviKvsVariantList *) { setObject(new KviKvsMdmWizard(parentScriptWidget(), getName().toUtf8().data(),this), true); @@ -150,7 +150,7 @@ KVSO_CLASS_FUNCTION(wizard,addPage) return true; } KVSO_CLASS_FUNCTION(wizard,insertPage) -{ +{ CHECK_INTERNAL_POINTER(widget()) KviKvsObject *ob; @@ -174,7 +174,7 @@ KVSO_CLASS_FUNCTION(wizard,insertPage) KVSO_CLASS_FUNCTION(wizard,setTitle) -{ +{ CHECK_INTERNAL_POINTER(widget()) KviKvsObject *ob; QString szTitle; diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp index 3011563ca..7113ba5a4 100644 --- a/src/modules/objects/class_workspace.cpp +++ b/src/modules/objects/class_workspace.cpp @@ -182,7 +182,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_workspace) KVSO_END_CONSTRUCTOR(KviKvsObject_workspace) -bool KviKvsObject_workspace::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_workspace::init(KviKvsRunTimeContext * ,KviKvsVariantList *) { SET_OBJECT(QWorkspace); return true; @@ -214,45 +214,44 @@ bool KviKvsObject_workspace::functionsetscrollBarsEnabled(KviKvsObjectFunctionCa return true; } -bool KviKvsObject_workspace::functioncascade(KviKvsObjectFunctionCall *c) +bool KviKvsObject_workspace::functioncascade(KviKvsObjectFunctionCall *) { if(widget()) ((QWorkspace *)widget())->cascade(); return true; } -bool KviKvsObject_workspace::functiontile(KviKvsObjectFunctionCall *c) +bool KviKvsObject_workspace::functiontile(KviKvsObjectFunctionCall *) { if(widget()) ((QWorkspace *)widget())->tile(); return true; } -bool KviKvsObject_workspace::functioncloseActiveWindow(KviKvsObjectFunctionCall *c) +bool KviKvsObject_workspace::functioncloseActiveWindow(KviKvsObjectFunctionCall *) { if(widget()) ((QWorkspace *)widget())->closeActiveWindow(); return true; } -bool KviKvsObject_workspace::functioncloseAllWindows(KviKvsObjectFunctionCall *c) +bool KviKvsObject_workspace::functioncloseAllWindows(KviKvsObjectFunctionCall *) { if(widget()) ((QWorkspace *)widget())->closeAllWindows(); return true; } -bool KviKvsObject_workspace::functionactivateNextWindow(KviKvsObjectFunctionCall *c) +bool KviKvsObject_workspace::functionactivateNextWindow(KviKvsObjectFunctionCall *) { if(widget()) ((QWorkspace *)widget())->activateNextWindow(); return true; } -bool KviKvsObject_workspace::functionactivatePrevWindow(KviKvsObjectFunctionCall *c) +bool KviKvsObject_workspace::functionactivatePrevWindow(KviKvsObjectFunctionCall *) { - if(widget()){ - ((QWorkspace *)widget())->activatePreviousWindow(); - } - return true; + if(widget()) + ((QWorkspace *)widget())->activatePreviousWindow(); + return true; } diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index a78780bea..75e466523 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -120,7 +120,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis if( !pParams ) return false; QWidget *pWidget = 0; - int i=0; + unsigned int i=0; while(i!=pParams->count()) { QString szClass; @@ -139,7 +139,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis } debug ("szClass %s",szClass.toUtf8().data()); debug ("szName %s",szName.toUtf8().data()); - debug ("s %s",s.data()); + debug ("s %s",s.toUtf8().data()); if(KviQString::equalCI(szClass,"WinId")) { @@ -207,7 +207,7 @@ QWidget *KviKvsObject_wrapper::findWidgetToWrap(const QString szClass, const QSt if( !list.count() ) return 0; for(int idx=0;idx<list.count();idx++) { - if( list.at(idx)->isWidgetType() ) + if( list.at(idx)->isWidgetType() ) { QWidget *w = (QWidget *)list.at(idx); if (KviQString::equalCI(w->metaObject()->className(),szClass) &&KviQString::equalCI(w->objectName(),szName))return w; diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index eef236418..defac7b3b 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -67,11 +67,11 @@ in the document, user abort etc...). If this function return $false then you can call $lastError() to obtain a descriptive error message. - + !fn: <string> $lastError() Returns the last error occured inside the parser. You will typically call this function when $parse() above returns $false. - + !fn: <boolean> $onDocumentStart() This function is called when the document parsing starts. You can reimplement it in order to handle this notification. @@ -85,18 +85,18 @@ You should return $true if you want document parsing to continue and $false if you want it to be aborted. The default implementation does nothing besides returning $true. - + !fn: <boolean> $onElementStart(<qualified_name:string>,<attributes:hash>,<namespace:string>,<local_name:string>) This function is called when an element opening tag is encountered. The <qualified_name> of the tag is passed as the first parameter. The <attributes> are passed in the form of a hash with attribute - values indexed by their names. + values indexed by their names. When the <qualified_name> contains a namespace then it is also reported in the splitted <namespace> <local_name> pair. You should return $true if you want document parsing to continue and $false if you want it to be aborted. The default implementation does nothing besides returning $true. - + !fn: <boolean> $onElementEnd(<qualified_name:string>,<namespace:string>,<local_name:string>) This function is called when an element closing tag is encountered. The <qualified_name> of the tag is passed as the first parameter. @@ -112,14 +112,14 @@ You should return $true if you want document parsing to continue and $false if you want it to be aborted. The default implementation does nothing besides returning $true. - + !fn: <boolean> $onWarning(<message:string>) This function is called when the parser generates a recoverable error. The error <message> is passed as the first parameter. You should return $true if you want document parsing to continue and $false if you want it to be aborted. The default implementation does nothing besides returning $true. - + !fn: <boolean> $onError(<message:string>) This function is called when the parser generates an unrecoverable error. The error <message> is passed as the first parameter. @@ -178,7 +178,7 @@ public: return kvsCodeFailure(); return handleKvsCallReturnValue(&ret); } - + virtual bool endDocument() { KviKvsVariant ret; @@ -186,7 +186,7 @@ public: return kvsCodeFailure(); return handleKvsCallReturnValue(&ret); } - + virtual bool startElement(const QString &szNamespaceUri,const QString &szLocalName,const QString &szQualifiedName,const QXmlAttributes &attrs) { KviKvsVariant ret; @@ -204,7 +204,7 @@ public: return kvsCodeFailure(); return handleKvsCallReturnValue(&ret); } - + virtual bool endElement(const QString &szNamespaceUri,const QString &szLocalName,const QString &szQualifiedName) { KviKvsVariant ret; @@ -217,7 +217,7 @@ public: return kvsCodeFailure(); return handleKvsCallReturnValue(&ret); } - + virtual bool characters(const QString &szChars) { KviKvsVariant ret; @@ -266,8 +266,8 @@ public: m_pReader->fatalError(szMsg); return true; } - - virtual QString errorString() + + virtual QString errorString() const { return m_szErrorString; } @@ -318,7 +318,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse) m_szLastError = ""; KviXmlHandler handler(this); QXmlInputSource source; - + if (pVariantData->isHObject()) { KviKvsObject * pObject; diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 8a0e6db75..6b0ea11e9 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -925,7 +925,7 @@ static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spaci } -static bool objects_module_can_unload(KviModule *m) +static bool objects_module_can_unload(KviModule *) { // Actually this object remains locked in memory // FIXME: unlock when no more instances & derived classes! |
