aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Fabio Bas2008-11-08 17:17:14 +0000
committerGravatar Fabio Bas2008-11-08 17:17:14 +0000
commit2850c46e4cadcffb55e346c386137f2757b54af2 (patch)
tree9bc18c9a9456c6f732e0e7138236edda16798a12 /src/modules
parentapplied patch to fix kvirc4.desktop, thanks to Arfrever (diff)
downloadKVIrc-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')
-rw-r--r--src/modules/addon/libkviaddon.cpp18
-rw-r--r--src/modules/objects/CMakeLists.txt1
-rw-r--r--src/modules/objects/class_multilineedit.cpp34
-rw-r--r--src/modules/objects/class_painter.cpp396
-rw-r--r--src/modules/objects/class_pixmap.cpp42
-rw-r--r--src/modules/objects/class_popupmenu.cpp12
-rw-r--r--src/modules/objects/class_progressbar.cpp14
-rw-r--r--src/modules/objects/class_radiobutton.cpp6
-rw-r--r--src/modules/objects/class_slider.cpp2
-rw-r--r--src/modules/objects/class_socket.cpp20
-rw-r--r--src/modules/objects/class_spinbox.cpp10
-rw-r--r--src/modules/objects/class_tabwidget.cpp34
-rw-r--r--src/modules/objects/class_tbrowser.cpp2
-rw-r--r--src/modules/objects/class_toolbar.cpp8
-rw-r--r--src/modules/objects/class_toolbutton.cpp4
-rw-r--r--src/modules/objects/class_treewidget.cpp32
-rw-r--r--src/modules/objects/class_treewidgetitem.cpp6
-rw-r--r--src/modules/objects/class_widget.cpp52
-rw-r--r--src/modules/objects/class_window.cpp6
-rw-r--r--src/modules/objects/class_wizard.cpp6
-rw-r--r--src/modules/objects/class_workspace.cpp21
-rw-r--r--src/modules/objects/class_wrapper.cpp6
-rw-r--r--src/modules/objects/class_xmlreader.cpp28
-rw-r--r--src/modules/objects/libkviobjects.cpp2
-rw-r--r--src/modules/options/dialog.cpp8
-rw-r--r--src/modules/options/instances.cpp2
-rw-r--r--src/modules/options/libkvioptions.cpp6
-rwxr-xr-xsrc/modules/options/mkcreateinstanceproc.sh2
-rw-r--r--src/modules/options/optw_channel.cpp10
-rw-r--r--src/modules/options/optw_mediatypes.cpp22
-rw-r--r--src/modules/options/optw_mediatypes.h2
-rw-r--r--src/modules/options/optw_proxy.cpp2
-rw-r--r--src/modules/options/optw_servers.cpp2
-rw-r--r--src/modules/options/optw_texticons.cpp2
-rw-r--r--src/modules/options/optw_tray.cpp16
-rw-r--r--src/modules/popupeditor/libkvipopupeditor.cpp4
-rw-r--r--src/modules/popupeditor/popupeditor.cpp18
-rw-r--r--src/modules/popupeditor/popupeditor.h2
-rw-r--r--src/modules/proxydb/libkviproxydb.cpp63
-rw-r--r--src/modules/raweditor/libkviraweditor.cpp4
-rw-r--r--src/modules/raweditor/raweditor.cpp40
-rw-r--r--src/modules/raweditor/raweditor.h14
-rw-r--r--src/modules/regchan/libkviregchan.cpp12
-rw-r--r--src/modules/reguser/libkvireguser.cpp119
-rw-r--r--src/modules/rijndael/libkvirijndael.h4
-rw-r--r--src/modules/serverdb/libkviserverdb.cpp3
-rw-r--r--src/modules/setup/libkvisetup.cpp14
-rw-r--r--src/modules/sharedfile/libkvisharedfile.cpp8
-rw-r--r--src/modules/sharedfileswindow/libkvisharedfileswindow.cpp4
-rw-r--r--src/modules/sharedfileswindow/sharedfileswindow.cpp14
-rw-r--r--src/modules/sharedfileswindow/sharedfileswindow.h4
-rw-r--r--src/modules/snd/libkvisnd.cpp10
-rw-r--r--src/modules/socketspy/libkvisocketspy.cpp6
-rw-r--r--src/modules/socketspy/socketspywindow.cpp4
-rw-r--r--src/modules/socketspy/socketspywindow.h2
-rw-r--r--src/modules/spaste/libkvispaste.cpp30
-rw-r--r--src/modules/str/libkvistr.cpp43
-rw-r--r--src/modules/system/libkvisystem.cpp8
-rw-r--r--src/modules/term/libkviterm.cpp2
-rw-r--r--src/modules/texticons/libkvitexticons.cpp10
-rw-r--r--src/modules/theme/libkvitheme.cpp4
-rw-r--r--src/modules/theme/managementdialog.cpp3
-rw-r--r--src/modules/tip/libkvitip.cpp8
-rw-r--r--src/modules/tmphighlight/libkvitmphighlight.cpp36
-rw-r--r--src/modules/toolbar/libkvitoolbar.cpp12
-rw-r--r--src/modules/toolbareditor/libkvitoolbareditor.cpp4
-rw-r--r--src/modules/torrent/libkvitorrent.cpp9
-rw-r--r--src/modules/trayicon/libkvitrayicon.cpp8
-rw-r--r--src/modules/trayicon/libkvitrayicon.h8
-rw-r--r--src/modules/upnp/libkviupnp.cpp10
-rw-r--r--src/modules/upnp/rootservice.cpp2
-rw-r--r--src/modules/upnp/service.cpp10
-rw-r--r--src/modules/upnp/xmlfunctions.cpp4
-rw-r--r--src/modules/url/libkviurl.cpp14
-rw-r--r--src/modules/window/libkviwindow.cpp4
-rw-r--r--src/modules/window/userwindow.cpp2
76 files changed, 685 insertions, 731 deletions
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 9b868fe98..b2f93d676 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -57,7 +57,7 @@ QRect g_rectManagementDialogGeometry(0,0,0,0);
<boolean> $addon.exists(<id:string>[,<version:string>])
@description:
Returns 1 if the addon with the specified <id> is currently installed
- and 0 otherwise. If <version> is specified then any addon with
+ and 0 otherwise. If <version> is specified then any addon with
a version lower than <version> is ignored (so you can effectively
check if a greater or equal version is present).
*/
@@ -146,7 +146,7 @@ static bool addon_kvs_cmd_list(KviKvsModuleCommandCall * c)
c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("%cAddon id %Q, version %Q%c"),KVI_TEXT_BOLD,&(a->name()),&(a->version()),KVI_TEXT_BOLD);
c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Name: %Q"),&(a->visibleName()));
c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Description: %Q"),&(a->description()));
-
+
++it;
cnt++;
}
@@ -338,7 +338,7 @@ static bool addon_kvs_cmd_setconfigurecallback(KviKvsModuleCallbackCommandCall *
if(!c->switches()->find('q',"quiet"))
c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName));
}
-
+
return true;
}
@@ -385,7 +385,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
if(!c->switches()->find('q',"quiet"))
c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName));
}
-
+
return true;
}
@@ -505,7 +505,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
[cmd]addon.sethelpcallback[/cmd], [cmd]addon.help[/cmd]
@examples:
[example]
-
+
[/example]
*/
@@ -602,7 +602,7 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c)
Shows the addon addon management editor
*/
-static bool addon_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
+static bool addon_kvs_cmd_dialog(KviKvsModuleCommandCall *)
{
KviScriptManagementDialog::display();
return true;
@@ -625,7 +625,7 @@ static bool addon_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
static bool addon_kvs_cmd_install(KviKvsModuleCommandCall * c)
{
QString szAddonPackFile;
-
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("package_path",KVS_PT_STRING,0,szAddonPackFile)
KVSM_PARAMETERS_END(c)
@@ -651,7 +651,7 @@ static bool addon_module_init(KviModule *m)
KVSM_REGISTER_SIMPLE_COMMAND(m,"uninstall",addon_kvs_cmd_uninstall);
KVSM_REGISTER_SIMPLE_COMMAND(m,"configure",addon_kvs_cmd_configure);
KVSM_REGISTER_SIMPLE_COMMAND(m,"help",addon_kvs_cmd_help);
-
+
KVSM_REGISTER_CALLBACK_COMMAND(m,"setconfigurecallback",addon_kvs_cmd_setconfigurecallback);
KVSM_REGISTER_CALLBACK_COMMAND(m,"sethelpcallback",addon_kvs_cmd_sethelpcallback);
KVSM_REGISTER_CALLBACK_COMMAND(m,"register",addon_kvs_cmd_register);
@@ -676,7 +676,7 @@ static bool addon_module_cleanup(KviModule *m)
return true;
}
-static bool addon_module_can_unload(KviModule * m)
+static bool addon_module_can_unload(KviModule *)
{
return (!KviScriptManagementDialog::instance());
}
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,&params);
}
@@ -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,&params);
}
-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!
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 116b554da..9c483c805 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -282,7 +282,7 @@ KviOptionsDialog::~KviOptionsDialog()
void KviOptionsDialog::showEvent(QShowEvent *e)
{
QRect r = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
-
+
int w = r.width();
int h = r.height();
@@ -296,7 +296,7 @@ void KviOptionsDialog::showEvent(QShowEvent *e)
} else {
if(ww < 770)ww = 770;
}
-
+
setGeometry((w - ww) / 2,(h - wh) / 2,ww,wh);
QDialog::showEvent(e);
@@ -533,7 +533,7 @@ void KviOptionsDialog::fillTreeWidget(KviTalTreeWidgetItem * p,KviPointerList<Kv
}
}
-void KviOptionsDialog::treeWidgetItemSelectionChanged(KviTalTreeWidgetItem* it, KviTalTreeWidgetItem *prev)
+void KviOptionsDialog::treeWidgetItemSelectionChanged(KviTalTreeWidgetItem* it, KviTalTreeWidgetItem *)
{
if(it)
{
@@ -597,7 +597,7 @@ KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidget
return 0;
}
*/
-void KviOptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget * pPage)
+void KviOptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget *)
{
// unused
}
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index f030a4a53..d7a40420f 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -3562,7 +3562,7 @@ KviOptionsInstanceManager::~KviOptionsInstanceManager()
if(m_pInstanceTree)debug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
}
-void KviOptionsInstanceManager::cleanup(KviModule * m)
+void KviOptionsInstanceManager::cleanup(KviModule *)
{
deleteInstanceTree(m_pInstanceTree);
m_pInstanceTree = 0;
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index ae08bcba1..59d64f60b 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -60,7 +60,7 @@ extern int g_iOptionWidgetInstances;
events and user preferences.
*/
-static bool options_kvs_cmd_save(KviKvsModuleCommandCall * c)
+static bool options_kvs_cmd_save(KviKvsModuleCommandCall *)
{
g_pApp->saveOptions();
return true;
@@ -291,7 +291,7 @@ static bool options_module_cleanup(KviModule *m)
KviPointerList<KviOptionsDialog> l;
l.setAutoDelete(false);
KviOptionsDialog * d;
- while(d = it.current())
+ while( (d = it.current()) )
{
l.append(d);
++it;
@@ -307,7 +307,7 @@ static bool options_module_cleanup(KviModule *m)
return true;
}
-static bool options_module_can_unload(KviModule *m)
+static bool options_module_can_unload(KviModule *)
{
return ((g_pOptionsDialogDict->isEmpty()) && (g_iOptionWidgetInstances == 0));
}
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index c1c09ad75..65e31491b 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -333,7 +333,7 @@ KviOptionsInstanceManager::~KviOptionsInstanceManager()
if(m_pInstanceTree)debug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
}
-void KviOptionsInstanceManager::cleanup(KviModule * m)
+void KviOptionsInstanceManager::cleanup(KviModule *)
{
deleteInstanceTree(m_pInstanceTree);
m_pInstanceTree = 0;
diff --git a/src/modules/options/optw_channel.cpp b/src/modules/options/optw_channel.cpp
index f7a752350..8351f6ccf 100644
--- a/src/modules/options/optw_channel.cpp
+++ b/src/modules/options/optw_channel.cpp
@@ -97,19 +97,19 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare
createLayout();
KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory);
-
+
addLabel(0,1,0,1,__tr2qs_ctx("Default ban mask:","options"));
-
+
m_pBanTypeCombo = new QComboBox(this);
addWidgetToLayout(m_pBanTypeCombo,1,1,4,1);
-
+
KviIrcMask hostmask("nick!user@machine.host.top");
KviIrcMask ipmask("nick!user@192.168.1.2");
QString tmp1;
QString tmp2;
for(int i=0;i<=26;i++)
{
-
+
hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1).arg(tmp2));
@@ -152,7 +152,7 @@ KviChannelAdvancedOptionsWidget::~KviChannelAdvancedOptionsWidget()
void KviChannelAdvancedOptionsWidget::commit()
{
KVI_OPTION_UINT(KviOption_uintDefaultBanType)=m_pBanTypeCombo->currentIndex();
- if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)<0 )|| (KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7;
+ if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7;
KviOptionsWidget::commit();
}
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index c85d1c823..7903020c1 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -61,7 +61,7 @@ void KviMediaTypeTreeWidgetItem::copyData(KviMediaType * t)
copyMediaType(&m_data,t);
setText(0,m_data.szFileMask.ptr());
setText(1,m_data.szIanaType.ptr());
- setText(2,m_data.szDescription.ptr());
+ setText(2,m_data.szDescription.ptr());
}
KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
@@ -212,17 +212,17 @@ void KviMediaTypesOptionsWidget::enableOrDisable()
void KviMediaTypesOptionsWidget::setLineEdits()
{
- m_pDescription->setText(m_pLastItem ? m_pLastItem->data()->szDescription.ptr() : "");
- m_pIanaType->setText(m_pLastItem ? m_pLastItem->data()->szIanaType.ptr() : "");
- m_pFileMask->setText(m_pLastItem ? m_pLastItem->data()->szFileMask.ptr() : "");
- m_pSavePath->setText(m_pLastItem ? m_pLastItem->data()->szSavePath.ptr() : "");
- m_pCommandline->setText(m_pLastItem ? m_pLastItem->data()->szCommandline.ptr() : "");
- m_pMagicBytes->setText(m_pLastItem ? m_pLastItem->data()->szMagicBytes.ptr() : "");
- m_pRemoteExecCommandline->setText(m_pLastItem ? m_pLastItem->data()->szRemoteExecCommandline.ptr() : "");
- m_pIcon->setText(m_pLastItem ? m_pLastItem->data()->szIcon.ptr() : "");
+ m_pDescription->setText(m_pLastItem ? m_pLastItem->mydata()->szDescription.ptr() : "");
+ m_pIanaType->setText(m_pLastItem ? m_pLastItem->mydata()->szIanaType.ptr() : "");
+ m_pFileMask->setText(m_pLastItem ? m_pLastItem->mydata()->szFileMask.ptr() : "");
+ m_pSavePath->setText(m_pLastItem ? m_pLastItem->mydata()->szSavePath.ptr() : "");
+ m_pCommandline->setText(m_pLastItem ? m_pLastItem->mydata()->szCommandline.ptr() : "");
+ m_pMagicBytes->setText(m_pLastItem ? m_pLastItem->mydata()->szMagicBytes.ptr() : "");
+ m_pRemoteExecCommandline->setText(m_pLastItem ? m_pLastItem->mydata()->szRemoteExecCommandline.ptr() : "");
+ m_pIcon->setText(m_pLastItem ? m_pLastItem->mydata()->szIcon.ptr() : "");
}
-void KviMediaTypesOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev)
+void KviMediaTypesOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
{
saveLastItem();
m_pLastItem = (KviMediaTypeTreeWidgetItem *)it;
@@ -264,7 +264,7 @@ void KviMediaTypesOptionsWidget::commit()
{
it=(KviMediaTypeTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
KviMediaType * t = new KviMediaType;
- copyMediaType(t,it->data());
+ copyMediaType(t,it->mydata());
g_pMediaManager->insertMediaType(t);
// it = (KviMediaTypeTreeWidgetItem *)it->nextSibling();
}
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index ae1d43b66..0ba1e43a0 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -41,7 +41,7 @@ private:
KviMediaType m_data;
public:
void copyData(KviMediaType * t);
- const KviMediaType * data(){ return &m_data; };
+ const KviMediaType * mydata(){ return &m_data; };
};
#define KVI_OPTIONS_WIDGET_ICON_KviMediaTypesOptionsWidget KVI_SMALLICON_FILE
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 22d5ac885..930b47ac4 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -170,7 +170,7 @@ void KviProxyOptionsWidget::fillProxyList()
if(!(g_pProxyDataBase->currentProxy()))currentItemChanged(0,0);
}
-void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev)
+void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
{
if(m_pLastEditedItem)saveLastItem();
m_pLastEditedItem = (KviProxyOptionsTreeWidgetItem *)it;
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index bd2df9341..2d6ba1147 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1325,7 +1325,7 @@ void KviServerOptionsWidget::itemDoubleClicked(QTreeWidgetItem*, int )
detailsClicked();
}
-void KviServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev)
+void KviServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
{
saveLastItem();
m_pLastEditedItem = (KviServerOptionsTreeWidgetItem *)it;
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 25edc239f..e30805990 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -35,7 +35,7 @@
#include <QCursor>
#include <QHeaderView>
-KviTextIconTableItem::KviTextIconTableItem(QTableWidget * t,KviTextIcon * icon)
+KviTextIconTableItem::KviTextIconTableItem(QTableWidget *,KviTextIcon * icon)
: QTableWidgetItem(QString(),Qt::ItemIsEditable)
{
if(icon)
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index c9cfe17d3..301c02de3 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -37,26 +37,26 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
setObjectName("tray_options_widget");
createLayout();
-
+
m_pEnable = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable tray icon","options"), KviOption_boolShowDockExtension);
m_pCloseInTray = addBoolSelector(0,1,0,1,__tr2qs_ctx("Close in tray","options"),KviOption_boolCloseInTray);
m_pMinimizeInTray = addBoolSelector(0,2,0,2,__tr2qs_ctx("Minimize in tray","options"),KviOption_boolMinimizeInTray);
m_pEnableFlashing = addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable tray icon flashing","options"),KviOption_boolEnableTrayIconFlashing);
m_pLevelBasedNotify = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable level-based message notification (not a message-type based)","options"),KviOption_boolUseLevelBasedTrayNotification);
-
+
m_pLevelsGroup = addGroupBox(0,5,0,5,Qt::Horizontal,__tr2qs_ctx("Select message levels to notify","options"));
-
+
addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages","options"),
KviOption_uintMinTrayLowLevelMessage,
1,5,1,true);
-
+
addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for high-priority message","options"),
KviOption_uintMinTrayHighLevelMessage,
1,5,4,true);
-
+
addRowSpacer(0,6,0,6);
-
+
connect(m_pEnable,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool)));
connect(m_pLevelBasedNotify,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool)));
setEnabled(true);
@@ -66,7 +66,7 @@ KviTrayOptionsWidget::~KviTrayOptionsWidget()
{
}
-void KviTrayOptionsWidget::setEnabled(bool bEnabled)
+void KviTrayOptionsWidget::setEnabled(bool)
{
if(m_pEnable->isChecked())
{
@@ -78,7 +78,7 @@ void KviTrayOptionsWidget::setEnabled(bool bEnabled)
m_pLevelsGroup->setEnabled(true);
else
m_pLevelsGroup->setEnabled(false);
-
+
} else {
m_pCloseInTray->setEnabled(false);
m_pMinimizeInTray->setEnabled(false);
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 25aad115d..5b4105aae 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -65,12 +65,12 @@ static bool popupeditor_module_init(KviModule * m)
return true;
}
-static bool popupeditor_module_can_unload(KviModule * m)
+static bool popupeditor_module_can_unload(KviModule *)
{
return (g_pPopupEditorWindow == 0);
}
-static bool popupeditor_module_cleanup(KviModule *m)
+static bool popupeditor_module_cleanup(KviModule *)
{
if(g_pPopupEditorWindow)delete g_pPopupEditorWindow;
g_pPopupEditorWindow = 0;
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index c048dd0c9..adfebf408 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -219,10 +219,10 @@ KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
connect(m_pTreeWidget,SIGNAL(itemPressed(QTreeWidgetItem *, int)),
this,SLOT(itemPressed(QTreeWidgetItem *, int)));
-
+
m_pEditor = KviScriptEditor::createInstance(spl);
-
+
g->addWidget(spl,1,0,1,3);
QLabel * l = new QLabel(__tr2qs("Text:"),this);
@@ -1045,7 +1045,7 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
m_pLastEditedItem = 0;
m_pContextPopup = new KviTalPopupMenu(this);
-
+
spl->setStretchFactor (0,20);
spl->setStretchFactor (1,80);
@@ -1220,7 +1220,7 @@ void KviPopupEditor::saveLastEditedItem()
m_pLastEditedItem->setText(0,m->popupName());
}
-void KviPopupEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev)
+void KviPopupEditor::currentItemChanged(QTreeWidgetItem *it, QTreeWidgetItem *)
{
saveLastEditedItem();
@@ -1243,7 +1243,7 @@ void KviPopupEditor::commit()
//KviKvsPopupManager::instance()->clear();
- int count=0, topcount=m_pTreeWidget->topLevelItemCount();
+ int topcount=m_pTreeWidget->topLevelItemCount();
// Copy the original popup dict
KviPointerHashTable<QString,KviKvsPopupMenu> copy(*(KviKvsPopupManager::instance()->popupDict()));
@@ -1361,7 +1361,7 @@ QPixmap * KviPopupEditorWindow::myIconPtr()
return g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP);
}
-void KviPopupEditorWindow::resizeEvent(QResizeEvent *e)
+void KviPopupEditorWindow::resizeEvent(QResizeEvent *)
{
int hght = m_pBase->sizeHint().height();
m_pEditor->setGeometry(0,0,width(),height()- hght);
@@ -1390,12 +1390,12 @@ void KviPopupEditorWindow::fillCaptionBuffers()
}
-void KviPopupEditorWindow::getConfigGroupName(KviStr &szName)
+void KviPopupEditorWindow::getConfigGroupName(QString &szName)
{
szName = "popupeditor";
}
-void KviPopupEditorWindow::saveProperties(KviConfig *cfg)
+void KviPopupEditorWindow::saveProperties(KviConfig *) //cfg
{
/*
#ifdef COMPILE_SCRIPTTOOLBAR
@@ -1406,7 +1406,7 @@ void KviPopupEditorWindow::saveProperties(KviConfig *cfg)
*/
}
-void KviPopupEditorWindow::loadProperties(KviConfig *cfg)
+void KviPopupEditorWindow::loadProperties(KviConfig *) // cfg
{
/*
#ifdef COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 6116ba526..319ef9820 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -192,7 +192,7 @@ protected:
virtual QPixmap * myIconPtr();
virtual void fillCaptionBuffers();
virtual void resizeEvent(QResizeEvent *e);
- virtual void getConfigGroupName(KviStr &szName);
+ virtual void getConfigGroupName(QString &szName);
virtual void saveProperties(KviConfig *);
virtual void loadProperties(KviConfig *);
protected slots:
diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp
index 3a4c8130b..2c8008a28 100644
--- a/src/modules/proxydb/libkviproxydb.cpp
+++ b/src/modules/proxydb/libkviproxydb.cpp
@@ -50,27 +50,27 @@ extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
static bool proxydb_kvs_fnc_protocol(KviKvsModuleFunctionCall * c)
{
QString szProxy, szProtocol;
-
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("proxy",KVS_PT_STRING,0,szProxy)
KVSM_PARAMETERS_END(c)
-
+
if(szProxy.isEmpty())
{
c->error(__tr2qs_ctx("You must provide the proxy hostname as parameter","proxydb"));
return false;
}
-
+
KviProxy * pProxy = new KviProxy();
pProxy->setHostname(szProxy);
-
+
KviProxy * pRecord = g_pProxyDataBase->findProxy(pProxy,true);
if(!pRecord)
{
c->error(__tr2qs_ctx("The specified proxy does not exist","proxydb"));
return false;
}
-
+
switch(pProxy->protocol())
{
case KviProxy::Socks4:
@@ -85,7 +85,7 @@ static bool proxydb_kvs_fnc_protocol(KviKvsModuleFunctionCall * c)
}
c->returnValue()->setString(szProtocol);
-
+
return true;
}
@@ -346,27 +346,27 @@ static bool proxydb_kvs_cmd_setPort(KviKvsModuleCommandCall * c)
QString szProxy, szPort;
unsigned int uPort;
bool bOk;
-
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("proxy",KVS_PT_STRING,0,szProxy)
KVSM_PARAMETER("port",KVS_PT_STRING,0,szPort)
KVSM_PARAMETERS_END(c)
-
+
if(szProxy.isEmpty())
{
c->error(__tr2qs_ctx("You must provide the proxy hostname as parameter","proxydb"));
return false;
}
-
+
if(szPort.isEmpty())
{
c->error(__tr2qs_ctx("You must provide the port number as parameter","proxydb"));
return false;
}
-
+
KviProxy * pProxy = new KviProxy();
pProxy->setHostname(szProxy);
-
+
KviProxy * pRecord = g_pProxyDataBase->findProxy(pProxy,true);
if(!pRecord)
{
@@ -374,12 +374,12 @@ static bool proxydb_kvs_cmd_setPort(KviKvsModuleCommandCall * c)
c->error(__tr2qs_ctx("The specified proxy does not exist","proxydb"));
return false;
}
-
+
uPort = szPort.toInt(&bOk);
if(!bOk) uPort = 1080;
pProxy->setPort(uPort);
debug("PROXYDB Port: %d",uPort);
-
+
return true;
}
@@ -417,28 +417,27 @@ static bool proxydb_kvs_cmd_setPort(KviKvsModuleCommandCall * c)
static bool proxydb_kvs_cmd_setIp(KviKvsModuleCommandCall * c)
{
QString szProxy, szIp;
- bool bOk;
-
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("proxy",KVS_PT_STRING,0,szProxy)
KVSM_PARAMETER("ip",KVS_PT_STRING,0,szIp)
KVSM_PARAMETERS_END(c)
-
+
if(szProxy.isEmpty())
{
c->error(__tr2qs_ctx("You must provide the proxy hostname as parameter","proxydb"));
return false;
}
-
+
if(szIp.isEmpty())
{
c->error(__tr2qs_ctx("You must provide the IP as parameter","proxydb"));
return false;
}
-
+
KviProxy * pProxy = new KviProxy();
pProxy->setHostname(szProxy);
-
+
KviProxy * pRecord = g_pProxyDataBase->findProxy(pProxy,true);
if(!pRecord)
{
@@ -456,7 +455,7 @@ static bool proxydb_kvs_cmd_setIp(KviKvsModuleCommandCall * c)
}
pProxy->setIp(szIp);
-
+
return true;
}
@@ -487,21 +486,21 @@ static bool proxydb_kvs_cmd_setIPv6(KviKvsModuleCommandCall * c)
{
QString szProxy;
bool bIPv6;
-
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("proxy",KVS_PT_STRING,0,szProxy)
KVSM_PARAMETER("ipv6",KVS_PT_BOOLEAN,0,bIPv6)
KVSM_PARAMETERS_END(c)
-
+
if(szProxy.isEmpty())
{
c->error(__tr2qs_ctx("You must provide the proxy hostname as parameter","proxydb"));
return false;
}
-
+
KviProxy * pProxy = new KviProxy();
pProxy->setHostname(szProxy);
-
+
KviProxy * pRecord = g_pProxyDataBase->findProxy(pProxy,true);
if(!pRecord)
{
@@ -509,9 +508,9 @@ static bool proxydb_kvs_cmd_setIPv6(KviKvsModuleCommandCall * c)
c->error(__tr2qs_ctx("The specified proxy does not exist","proxydb"));
return false;
}
-
+
pProxy->setIPv6(bIPv6);
-
+
return true;
}
@@ -542,27 +541,27 @@ static bool proxydb_kvs_cmd_setIPv6(KviKvsModuleCommandCall * c)
static bool proxydb_kvs_cmd_setProtocol(KviKvsModuleCommandCall * c)
{
QString szProxy, szProtocol;
-
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("proxy",KVS_PT_STRING,0,szProxy)
KVSM_PARAMETER("protocol",KVS_PT_STRING,0,szProtocol)
KVSM_PARAMETERS_END(c)
-
+
if(szProxy.isEmpty())
{
c->error(__tr2qs_ctx("You must provide the proxy hostname as parameter","proxydb"));
return false;
}
-
+
if(szProtocol.isEmpty())
{
c->error(__tr2qs_ctx("You must provide the protocol as parameter","proxydb"));
return false;
}
-
+
KviProxy * pProxy = new KviProxy();
pProxy->setHostname(szProxy);
-
+
KviProxy * pRecord = g_pProxyDataBase->findProxy(pProxy,true);
if(!pRecord)
{
@@ -718,7 +717,7 @@ static bool proxydb_module_init(KviModule * m)
return true;
}
-static bool proxydb_module_cleanup(KviModule *m)
+static bool proxydb_module_cleanup(KviModule *)
{
return true;
}
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index 2c9307c91..633bb9458 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -64,12 +64,12 @@ static bool raweditor_module_init(KviModule * m)
return true;
}
-static bool raweditor_module_can_unload(KviModule * m)
+static bool raweditor_module_can_unload(KviModule *)
{
return (g_pRawEditorWindow == 0);
}
-static bool raweditor_module_cleanup(KviModule *m)
+static bool raweditor_module_cleanup(KviModule *)
{
if(g_pRawEditorWindow)delete g_pRawEditorWindow;
g_pRawEditorWindow = 0;
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 1a6d3171f..e3804e13e 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -88,11 +88,11 @@ KviRawEditor::KviRawEditor(QWidget * par)
boxi->setMaximumWidth(200);
m_pTreeWidget = new KviRawTreeWidget(boxi);
-
+
m_pTreeWidget->setColumnCount(1);
m_pTreeWidget->setHeaderLabel(__tr2qs("Raw Event"));
-
+
// m_pTreeWidget->setMultiSelection(false);
m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
// m_pTreeWidget->setShowSortIndicator(true);
@@ -100,12 +100,12 @@ KviRawEditor::KviRawEditor(QWidget * par)
m_pContextPopup = new KviTalPopupMenu(this);
m_pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
-
+
connect(m_pTreeWidget,SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(customContextMenuRequested(const QPoint &)));
QPushButton * pb = new QPushButton(__tr2qs("&Export All To..."),boxi);
connect(pb,SIGNAL(clicked()),this,SLOT(exportAllEvents()));
-
+
KviTalVBox * box = new KviTalVBox(spl);
m_pNameEditor = new QLineEdit(box);
m_pNameEditor->setToolTip(__tr2qs("Edit the raw event handler name."));
@@ -133,7 +133,7 @@ void KviRawEditor::oneTimeSetup()
KviPointerList<KviKvsEventHandler> * l = KviKvsEventManager::instance()->rawHandlers(i);
if(l)
{
- it = new KviRawTreeWidgetItem(m_pTreeWidget,i,true);
+ it = new KviRawTreeWidgetItem(m_pTreeWidget,i,true);
for(KviKvsEventHandler * s = l->first();s;s = l->next())
{
if(s->type() == KviKvsEventHandler::Script)
@@ -151,7 +151,7 @@ void KviRawEditor::oneTimeSetup()
void KviRawEditor::customContextMenuRequested(const QPoint &pos)
-{
+{
KviTalTreeWidgetItem *it;
it=(KviTalTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
__range_valid(m_bOneTimeSetupDone);
@@ -168,7 +168,7 @@ void KviRawEditor::customContextMenuRequested(const QPoint &pos)
m_pContextPopup->insertItem(
*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)),
__tr2qs("&Disable Handler"),this,SLOT(toggleCurrentHandlerEnabled()));
-
+
m_pContextPopup->insertItem(
*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
__tr2qs("Re&move Handler"),
@@ -313,7 +313,7 @@ void KviRawEditor::commit()
for (int j=0;j<it->childCount();j++)
{
ch=(KviTalTreeWidgetItem *)it->child(j);
- debug("Commit handler %s",((KviRawHandlerTreeWidgetItem *)ch)->m_szBuffer.toUtf8().data());
+ debug("Commit handler %s",((KviRawHandlerTreeWidgetItem *)ch)->m_szBuffer.toUtf8().data());
//int a=(KviRawTreeWidgetItem *)it)->m_iIdx;
KviQString::sprintf(szContext,"RawEvent%d::%Q",&(((KviRawTreeWidgetItem *)it)->m_iIdx),&(((KviRawHandlerTreeWidgetItem *)ch)->m_szName));
KviKvsScriptEventHandler * s = new KviKvsScriptEventHandler(
@@ -322,7 +322,7 @@ void KviRawEditor::commit()
((KviRawHandlerTreeWidgetItem *)ch)->m_szBuffer,
((KviRawHandlerTreeWidgetItem *)ch)->m_bEnabled
);
-
+
KviKvsEventManager::instance()->addRawHandler(((KviRawTreeWidgetItem *)it)->m_iIdx,s);
}
}
@@ -340,7 +340,7 @@ void KviRawEditor::saveLastEditedItem()
debug("Check lineedit name %s and internal %s",buffer.toUtf8().data(),m_pLastEditedItem->m_szName.toUtf8().data());
if(!KviQString::equalCI(buffer,m_pLastEditedItem->m_szName))
{
-
+
getUniqueHandlerName((KviRawTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
debug("Change name %s",buffer.toUtf8().data());
}
@@ -384,7 +384,7 @@ void KviRawEditor::getExportEventBuffer(QString &buffer,KviRawHandlerTreeWidgetI
QString szBuf = it->m_szBuffer;
KviCommandFormatter::blockFromBuffer(szBuf);
-
+
buffer = "event(";
buffer += ((KviRawTreeWidgetItem *)(it->parent()))->m_szName;
buffer += ",";
@@ -416,14 +416,14 @@ void KviRawEditor::exportCurrentHandler()
szName += ".";
szName += m_pLastEditedItem->m_szName;
szName += ".kvs";
-
+
QString szFile;
-
+
if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,"*.kvs",true,true,true))return;
QString szOut;
getExportEventBuffer(szOut,m_pLastEditedItem);
-
+
if(!KviFileUtils::writeFile(szFile,szOut))
{
QMessageBox::warning(this,__tr2qs("Write Failed - KVIrc"),__tr2qs("Unable to write to the raw event file."),__tr2qs("&OK"));
@@ -459,9 +459,9 @@ void KviRawEditor::exportAllEvents()
QString szName = QDir::homePath();
if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
szName += "rawevents.kvs";
-
+
QString szFile;
-
+
if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,"*.kvs",true,true,true))return;
if(!KviFileUtils::writeFile(szFile,out))
@@ -525,7 +525,7 @@ QPixmap * KviRawEditorWindow::myIconPtr()
return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT);
}
-void KviRawEditorWindow::resizeEvent(QResizeEvent *e)
+void KviRawEditorWindow::resizeEvent(QResizeEvent *)
{
int hght = m_pBase->sizeHint().height();
m_pEditor->setGeometry(0,0,width(),height()- hght);
@@ -554,12 +554,12 @@ void KviRawEditorWindow::fillCaptionBuffers()
}
-void KviRawEditorWindow::getConfigGroupName(KviStr &szName)
+void KviRawEditorWindow::getConfigGroupName(QString &szName)
{
szName = "raweditor";
}
-void KviRawEditorWindow::saveProperties(KviConfig *cfg)
+void KviRawEditorWindow::saveProperties(KviConfig *)
{
/*
#ifdef COMPILE_SCRIPTTOOLBAR
@@ -570,7 +570,7 @@ void KviRawEditorWindow::saveProperties(KviConfig *cfg)
*/
}
-void KviRawEditorWindow::loadProperties(KviConfig *cfg)
+void KviRawEditorWindow::loadProperties(KviConfig *)
{
/*
#ifdef COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/raweditor.h
index 2f3deee9e..6fbb24d3f 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/raweditor.h
@@ -58,18 +58,18 @@ public:
public:
void setEnabled(bool bEnabled)
{
- if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT)));
- else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENTNOHANDLERS)));
+ if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT)));
+ else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENTNOHANDLERS)));
((KviRawTreeWidget*)treeWidget())->updateItem(this);
};
- virtual QString text(int col) const { return m_szName; };
+ virtual QString text(int) const { return m_szName; };
};
class KviRawHandlerTreeWidgetItem : public KviTalTreeWidgetItem
{
public:
KviRawHandlerTreeWidgetItem(KviTalTreeWidgetItem * par,const QString & name,const QString & buffer,bool bEnabled)
- : KviTalTreeWidgetItem(par), m_szName(name) , m_szBuffer(buffer) , m_bEnabled(bEnabled)
+ : KviTalTreeWidgetItem(par), m_szName(name) , m_szBuffer(buffer) , m_bEnabled(bEnabled)
{
setText(0,name);
setEnabled(bEnabled);
@@ -78,8 +78,8 @@ public:
public:
void setEnabled(bool bEnabled)
{
- if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)));
- else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)));
+ if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)));
+ else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)));
((KviRawTreeWidget*)treeWidget())->updateItem(this);
};
QString m_szName;
@@ -133,7 +133,7 @@ protected:
virtual QPixmap * myIconPtr();
virtual void fillCaptionBuffers();
virtual void resizeEvent(QResizeEvent *e);
- virtual void getConfigGroupName(KviStr &szName);
+ virtual void getConfigGroupName(QString &szName);
virtual void saveProperties(KviConfig *);
virtual void loadProperties(KviConfig *);
protected slots:
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index a9cae2e8e..6b6ca7e2f 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -54,7 +54,7 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
you can use regchan.add #kvirc IRCNet.
If you want to handle #kvirc on all the IRC networks then
you can use regchan.add #kvirc *[br]
- Obviously if you register both #kvirc/IRCNet and #kvirc/*
+ Obviously if you register both #kvirc/IRCNet and #kvirc/ *
then #kvirc/IRCNet will be looked first.
If netmask is not passed a netmask of * is assumed.[br]
@examples:
@@ -138,13 +138,13 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
If <value> is an empty string the <property> is removed.[br]
If no match for <channel>/<network> is found in the database then
a warning is printed unless -q is used.[br]
- @switches:
+ @switches:
!fn: -q|--quiet
No warning on screen.
!fn: -e|--exactly
If -e is specified then <network> is not matched against the
netmasks in the database but is compared directly. This means
- that <network> must be exactly the netmask used to register a channel.
+ that <network> must be exactly the netmask used to register a channel.
@examples:
[example]
regchan.setproperty #kvirc openprojects autojoin true
@@ -231,7 +231,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
@syntax:
<array> $regchan.list([<channel_mask:string>],[<network_mask:string>])
@description:
- Returns an array of the channel@netmask entries in the registered
+ Returns an array of the channel@netmask entries in the registered
channels database.[br]
Please note that <network_mask> is a wildcard string that will match
wildcard strings.[br]
@@ -399,11 +399,11 @@ static bool regchan_module_init(KviModule * m)
KVSM_REGISTER_FUNCTION(m,"match",regchan_kvs_fnc_match);
KVSM_REGISTER_FUNCTION(m,"find",regchan_kvs_fnc_find);
KVSM_REGISTER_FUNCTION(m,"list",regchan_kvs_fnc_list);
-
+
return true;
}
-static bool regchan_module_cleanup(KviModule *m)
+static bool regchan_module_cleanup(KviModule *)
{
return true;
}
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 4fbddd774..da0b64630 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -177,12 +177,12 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
{
- QString szName;
+ QString szName;
QString szMask;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
- KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
- KVSM_PARAMETERS_END(c)
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
+ KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
+ KVSM_PARAMETERS_END(c)
if(szName.isEmpty())
{
if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No name specified"));
@@ -258,11 +258,11 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
{
- QString szName;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
- KVSM_PARAMETERS_END(c)
-
+ QString szName;
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
+ KVSM_PARAMETERS_END(c)
+
if(szName.isEmpty())
{
if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No name specified"));
@@ -319,13 +319,13 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c)
{
- QString szName;
+ QString szName;
QString szMask;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
- KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
- KVSM_PARAMETERS_END(c)
-
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
+ KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
+ KVSM_PARAMETERS_END(c)
+
if(szName.isEmpty())
{
c->warning(__tr2qs("No name specified"));
@@ -393,10 +393,10 @@ static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c)
static bool reguser_kvs_cmd_delmask(KviKvsModuleCommandCall * c)
{
QString szMask;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
- KVSM_PARAMETERS_END(c)
-
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
+ KVSM_PARAMETERS_END(c)
+
if(szMask.isEmpty())
{
c->warning(__tr2qs("No mask specified"));
@@ -425,7 +425,7 @@ static bool reguser_kvs_cmd_delmask(KviKvsModuleCommandCall * c)
@syntax:
reguser.setIgnoreEnabled [-q] <name:string> <isEnabled:bool>
@description:
-
+
@examples:
[example]
reguser.setproperty "Alexey" $true
@@ -441,11 +441,11 @@ static bool reguser_kvs_cmd_setIgnoreEnabled(KviKvsModuleCommandCall * c)
{
QString szName;
bool bEnabled;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
- KVSM_PARAMETER("isEnabled",KVS_PT_BOOL,0,bEnabled)
- KVSM_PARAMETERS_END(c)
-
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
+ KVSM_PARAMETER("isEnabled",KVS_PT_BOOL,0,bEnabled)
+ KVSM_PARAMETERS_END(c)
+
if(szName.isEmpty())
{
if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No name specified"));
@@ -507,10 +507,10 @@ static bool reguser_kvs_cmd_setIgnoreEnabled(KviKvsModuleCommandCall * c)
static bool reguser_kvs_cmd_setIgnoreFlags(KviKvsModuleCommandCall * c)
{
QString szName;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
- KVSM_PARAMETERS_END(c)
-
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
+ KVSM_PARAMETERS_END(c)
+
if(szName.isEmpty())
{
if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No name specified"));
@@ -577,9 +577,7 @@ static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c)
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
KVSM_PARAMETERS_END(c)
-
- KviKvsArray* pArray = new KviKvsArray();
- int aid=0;
+
KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName);
if(u)
{
@@ -596,7 +594,7 @@ static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c)
if(u->ignoreFlags() & KviRegisteredUser::Dcc)
szFlags+='d';
c->returnValue()->setString(szFlags);
-
+
}
return true;
}
@@ -631,14 +629,12 @@ static bool reguser_kvs_fnc_isIgnoreEnabled(KviKvsModuleFunctionCall * c)
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
KVSM_PARAMETERS_END(c)
-
- KviKvsArray* pArray = new KviKvsArray();
- int aid=0;
+
KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName);
if(u)
{
c->returnValue()->setBoolean(u->ignoreEnagled());
-
+
}
return true;
}
@@ -683,12 +679,12 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
QString szName;
QString szProperty;
QString szValue;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("mask",KVS_PT_STRING,0,szName)
- KVSM_PARAMETER("property",KVS_PT_STRING,0,szProperty)
- KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
- KVSM_PARAMETERS_END(c)
-
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("mask",KVS_PT_STRING,0,szName)
+ KVSM_PARAMETER("property",KVS_PT_STRING,0,szProperty)
+ KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
+ KVSM_PARAMETERS_END(c)
+
if(szName.isEmpty())
{
if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No name specified"));
@@ -740,17 +736,15 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
{
- QString szMask;
-
+ QString szMask;
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("user_mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
KVSM_PARAMETERS_END(c)
-
+
KviIrcMask mask(szMask);
KviKvsArray* pArray = new KviKvsArray();
int aid=0;
-
- int cnt = 0;
KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
@@ -799,9 +793,9 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
{
QString szMask;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
- KVSM_PARAMETERS_END(c)
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
+ KVSM_PARAMETERS_END(c)
KviIrcMask mask(szMask);
c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Registered users database dump:"));
@@ -875,7 +869,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
{
QString szMask;
-
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETERS_END(c)
@@ -913,7 +907,7 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
{
QString szMask;
-
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETERS_END(c)
@@ -1018,7 +1012,7 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
KVSM_PARAMETER("N",KVS_PT_STRING,KVS_PF_OPTIONAL,szN)
KVSM_PARAMETERS_END(c)
-
+
KviKvsArray* pArray = new KviKvsArray();
int aid=0;
KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName);
@@ -1030,7 +1024,6 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
KviIrcMask * m = u->maskList()->at(n.toInt());
if(m) c->returnValue()->setString(m->nick()+"!"+m->user()+"@"+m->host());
} else {
- int id=0;
for(KviIrcMask * m = u->maskList()->first();m;m = u->maskList()->next())
{
pArray->set(aid,new KviKvsVariant(QString(m->nick()+"!"+m->user()+"@"+m->host())));
@@ -1081,7 +1074,7 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("user_name",KVS_PT_STRING,0,szName)
KVSM_PARAMETER("property_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szProperty)
KVSM_PARAMETERS_END(c)
-
+
KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName);
if(u)
{
@@ -1134,7 +1127,7 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETER("property_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szProperty)
KVSM_PARAMETERS_END(c)
-
+
KviIrcMask mask(szMask);
//FIXME: it crashes kvirc
//KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
@@ -1172,9 +1165,9 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
{
QString szMask;
- KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
- KVSM_PARAMETERS_END(c)
+ KVSM_PARAMETERS_BEGIN(c)
+ KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
+ KVSM_PARAMETERS_END(c)
KviRegistrationWizard * w = new KviRegistrationWizard(szMask);
w->show();
@@ -1197,7 +1190,7 @@ static bool reguser_module_init(KviModule * m)
KVSM_REGISTER_SIMPLE_COMMAND(m,"wizard",reguser_kvs_cmd_wizard);
KVSM_REGISTER_SIMPLE_COMMAND(m,"setIgnoreEnabled",reguser_kvs_cmd_setIgnoreEnabled);
KVSM_REGISTER_SIMPLE_COMMAND(m,"setIgnoreFlags",reguser_kvs_cmd_setIgnoreFlags);
-
+
KVSM_REGISTER_FUNCTION(m,"match",reguser_kvs_fnc_match);
KVSM_REGISTER_FUNCTION(m,"list",reguser_kvs_fnc_list);
KVSM_REGISTER_FUNCTION(m,"exactMatch",reguser_kvs_fnc_exactMatch);
@@ -1210,7 +1203,7 @@ static bool reguser_module_init(KviModule * m)
return true;
}
-static bool reguser_module_cleanup(KviModule *m)
+static bool reguser_module_cleanup(KviModule *)
{
if(g_pRegisteredUsersDialog)delete g_pRegisteredUsersDialog;
g_pRegisteredUsersDialog = 0;
diff --git a/src/modules/rijndael/libkvirijndael.h b/src/modules/rijndael/libkvirijndael.h
index d3c351714..6a6d9f14c 100644
--- a/src/modules/rijndael/libkvirijndael.h
+++ b/src/modules/rijndael/libkvirijndael.h
@@ -46,8 +46,8 @@
virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviStr &outBuffer);
virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviStr &plainText);
protected:
- virtual bool binaryToAscii(const char * inBuffer,int len,KviStr &outBuffer){ return false; };
- virtual bool asciiToBinary(const char * inBuffer,int * len,char ** outBuffer){ return false; };
+ virtual bool binaryToAscii(const char *,int ,KviStr &){ return false; };
+ virtual bool asciiToBinary(const char *,int *,char **){ return false; };
virtual int getKeyLen(){ return 32; };
virtual Rijndael::KeyLength getKeyLenId(){ return Rijndael::Key32Bytes; };
private:
diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp
index dce03d682..3f2bba73f 100644
--- a/src/modules/serverdb/libkviserverdb.cpp
+++ b/src/modules/serverdb/libkviserverdb.cpp
@@ -93,7 +93,6 @@ static bool serverdb_kvs_fnc_networkExists(KviKvsModuleFunctionCall * c)
static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c)
{
QString szServer, szNetwork;
- bool bCheckAllNets = true;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("server_name",KVS_PT_STRING,0,szServer)
@@ -1341,7 +1340,7 @@ static bool serverdb_module_init(KviModule * m)
return true;
}
-static bool serverdb_module_cleanup(KviModule *m)
+static bool serverdb_module_cleanup(KviModule *)
{
return true;
}
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index f5a4d084a..a19edf450 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -80,11 +80,11 @@ KVIMODULEEXPORTFUNC void setup_finish()
KVI_OPTION_STRING(KviOption_stringQuitMessage) = KVI_DEFAULT_QUIT_MESSAGE;
// We deserve to change the user's part message in something nice :)
KVI_OPTION_STRING(KviOption_stringPartMessage) = KVI_DEFAULT_PART_MESSAGE;
-
+
// FIXME: Should we also change these ?
// #define KVI_DEFAULT_CTCP_USERINFO_REPLY "I'm too lazy to edit this field."
// #define KVI_DEFAULT_AWAY_MESSAGE "I'm off to see the wizard."
-
+
// Apply the choosen default theme
QString szDir;
/* switch(g_iThemeToApply)
@@ -99,11 +99,11 @@ KVIMODULEEXPORTFUNC void setup_finish()
break;
// default: no theme
}*/
-
+
g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"silverirc");
KviThemeInfo out;
KviTheme::load(szDir,out);
-
+
if(!szMircServers.isEmpty())
{
g_pServerDataBase->importFromMircIni(szMircServers,szMircIni,
@@ -130,18 +130,18 @@ KVIMODULEEXPORTFUNC void setup_finish()
}
}
-static bool setup_module_init(KviModule *m)
+static bool setup_module_init(KviModule *)
{
bNeedToApplyDefaults=true;
return true;
}
-static bool setup_module_cleanup(KviModule *m)
+static bool setup_module_cleanup(KviModule *)
{
return true;
}
-static bool setup_module_can_unload(KviModule *m)
+static bool setup_module_can_unload(KviModule *)
{
return true; // can be always unloaded...this module does basically nothing
}
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 7365d3c75..59b9af3c7 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -88,7 +88,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
if(szUserMask.isEmpty())szUserMask="*!*@*";
KviIrcMask u(szUserMask);
-
+
QString szm;
u.mask(szm);
@@ -181,7 +181,7 @@ static bool sharedfile_kvs_cmd_remove(KviKvsModuleCommandCall * c)
[cmd]sharedfile.add[/cmd], [cmd]sharedfile.list[/cmd], [cmd]sharedfile.remove[/cmd]
*/
-static bool sharedfile_kvs_cmd_clear(KviKvsModuleCommandCall * c)
+static bool sharedfile_kvs_cmd_clear(KviKvsModuleCommandCall *)
{
g_pSharedFilesManager->clear();
return true;
@@ -256,12 +256,12 @@ static bool sharedfile_module_init(KviModule * m)
return true;
}
-static bool sharedfile_module_can_unload(KviModule *m)
+static bool sharedfile_module_can_unload(KviModule *)
{
return true;
}
-static bool sharedfile_module_cleanup(KviModule *m)
+static bool sharedfile_module_cleanup(KviModule *)
{
return true;
}
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index 0f5fc44cb..2319ba758 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -129,7 +129,7 @@ static bool sharedfileswindow_module_init(KviModule * m)
return true;
}
-static bool sharedfileswindow_module_cleanup(KviModule *m)
+static bool sharedfileswindow_module_cleanup(KviModule *)
{
if(g_pSharedFilesWindow)
{
@@ -139,7 +139,7 @@ static bool sharedfileswindow_module_cleanup(KviModule *m)
return true;
}
-static bool sharedfileswindow_module_can_unload(KviModule *m)
+static bool sharedfileswindow_module_can_unload(KviModule *)
{
return (!g_pSharedFilesWindow);
}
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 6772dec9b..921c4a88a 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -107,7 +107,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f
g->setRowStretch(4,1);
g->setColumnStretch(0,1);
-
+
if(f)
{
m_pShareNameEdit->setText(f->name());
@@ -123,7 +123,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f
m_pExpireDateTimeEdit->setDateTime(QDateTime::currentDateTime());
m_pExpireDateTimeEdit->setEnabled(false);
}
-
+
}
KviSharedFileEditDialog::~KviSharedFileEditDialog()
@@ -164,7 +164,7 @@ void KviSharedFileEditDialog::okClicked()
__tr2qs_ctx("OK","sharedfileswindow"));
return;
}
-
+
if(szName.isEmpty())
{
QMessageBox::warning(this,__tr2qs_ctx("Invalid share name","sharedfileswindow"),
@@ -172,7 +172,7 @@ void KviSharedFileEditDialog::okClicked()
__tr2qs_ctx("OK","sharedfileswindow"));
return;
}
-
+
QFileInfo f(szPath);
if(!(f.exists() && f.isFile() && f.isReadable()))
{
@@ -494,7 +494,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalTreeWidgetItem *it,const QPo
id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear terminated","filetransferwindow"),this,SLOT(clearTerminated()));
m_pContextPopup->setItemEnabled(id,bHaveTerminated);
-
+
id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear all","filetransferwindow"),this,SLOT(clearAll()));
m_pContextPopup->setItemEnabled(id,it);
@@ -676,7 +676,7 @@ void KviSharedFilesWindow::clearTerminated()
KviSharedFilesManager::instance()->killTerminatedTransfers();
}
*/
-void KviSharedFilesWindow::getBaseLogFileName(KviStr &buffer)
+void KviSharedFilesWindow::getBaseLogFileName(QString &buffer)
{
buffer.sprintf("SHAREDFILES");
}
@@ -686,7 +686,7 @@ QPixmap * KviSharedFilesWindow::myIconPtr()
return g_pIconManager->getSmallIcon(KVI_SMALLICON_SHAREDFILES);
}
-void KviSharedFilesWindow::resizeEvent(QResizeEvent *e)
+void KviSharedFilesWindow::resizeEvent(QResizeEvent *)
{
//int h = m_pInput->heightHint();
m_pSplitter->setGeometry(0,0,width(),height());
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/sharedfileswindow.h
index e436436ec..055da780e 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.h
+++ b/src/modules/sharedfileswindow/sharedfileswindow.h
@@ -35,7 +35,7 @@
#include <QDialog>
#include <QCheckBox>
-class QGridLayout;
+class QGridLayout;
class QDateTimeEdit;
class QLabel;
class QLineEdit;
@@ -95,7 +95,7 @@ protected:
virtual QPixmap * myIconPtr();
virtual void fillCaptionBuffers();
virtual void resizeEvent(QResizeEvent *e);
- virtual void getBaseLogFileName(KviStr &buffer);
+ virtual void getBaseLogFileName(QString &buffer);
public:
virtual QSize sizeHint() const;
protected slots:
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index ee535f8c2..17c950d70 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -317,7 +317,7 @@ bool KviSoundPlayer::playQt(const QString &szFileName)
return true;
}
-bool KviSoundPlayer::playNull(const QString &szFileName)
+bool KviSoundPlayer::playNull(const QString &)
{
// null sound system
return true;
@@ -402,7 +402,7 @@ void KviSoundThread::run()
sampleFormat = -1;
afGetVirtualSampleFormat(file, AF_DEFAULT_TRACK, &sampleFormat, &sampleWidth);
-
+
if(sampleFormat == -1)
{
debug("libaudiofile couldn't find the sample format for file %s",m_szFileName.utf8().data());
@@ -765,19 +765,19 @@ static bool snd_module_init(KviModule * m)
return true;
}
-static bool snd_module_cleanup(KviModule *m)
+static bool snd_module_cleanup(KviModule *)
{
delete g_pSoundPlayer;
g_pSoundPlayer = 0;
return true;
}
-static bool snd_module_can_unload(KviModule *m)
+static bool snd_module_can_unload(KviModule *)
{
return !(g_pSoundPlayer->havePlayingSounds());
}
-static bool snd_module_ctrl(KviModule * m,const char * operation,void * param)
+static bool snd_module_ctrl(KviModule *,const char * operation,void * param)
{
if(kvi_strEqualCI(operation,"getAvailableSoundSystems"))
{
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index c85faea1b..a16639916 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -51,7 +51,7 @@ KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList = 0;
static bool socketspy_kvs_cmd_open(KviKvsModuleCommandCall * c)
{
- if(!c->window()->console())return c->context()->errorNoIrcContext();
+ if(!c->window()->console())return c->context()->errorNoIrcContext();
KviSocketSpyWindow *w = new KviSocketSpyWindow(c->window()->frame(),c->window()->console());
c->window()->frame()->addWindow(w);
return true;
@@ -66,7 +66,7 @@ static bool socketspy_module_init(KviModule * m)
return true;
}
-static bool socketspy_module_cleanup(KviModule *m)
+static bool socketspy_module_cleanup(KviModule *)
{
while(g_pSocketSpyWindowList->first())g_pSocketSpyWindowList->first()->die();
delete g_pSocketSpyWindowList;
@@ -74,7 +74,7 @@ static bool socketspy_module_cleanup(KviModule *m)
return true;
}
-static bool socketspy_module_can_unload(KviModule *m)
+static bool socketspy_module_can_unload(KviModule *)
{
return (g_pSocketSpyWindowList->isEmpty());
}
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index 60cf4dee3..b6a114eaf 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -63,7 +63,7 @@ QPixmap * KviSocketSpyWindow::myIconPtr()
return g_pIconManager->getSmallIcon(KVI_SMALLICON_SPY);
}
-void KviSocketSpyWindow::resizeEvent(QResizeEvent *e)
+void KviSocketSpyWindow::resizeEvent(QResizeEvent *)
{
m_pSplitter->setGeometry(0,0,width(),height());
}
@@ -73,7 +73,7 @@ QSize KviSocketSpyWindow::sizeHint() const
return m_pIrcView->sizeHint();
}
-void KviSocketSpyWindow::getBaseLogFileName(KviStr &buffer)
+void KviSocketSpyWindow::getBaseLogFileName(QString &buffer)
{
buffer.sprintf("SOCKETSPY_%d",context()->id());
}
diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/socketspywindow.h
index 483ace2ce..13242379f 100644
--- a/src/modules/socketspy/socketspywindow.h
+++ b/src/modules/socketspy/socketspywindow.h
@@ -40,7 +40,7 @@ protected:
virtual QPixmap * myIconPtr();
virtual void fillCaptionBuffers();
virtual void resizeEvent(QResizeEvent *e);
- virtual void getBaseLogFileName(KviStr &buffer);
+ virtual void getBaseLogFileName(QString &buffer);
virtual void applyOptions();
public:
virtual QSize sizeHint() const;
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index b41ad9fd4..81f55d4fd 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -1,10 +1,10 @@
//=============================================================================
//
// File : libkvispaste.cpp
-// Creation date : Thu Dec 27 2002 17:13:12 GMT by Juanjo Álvarez
+// Creation date : Thu Dec 27 2002 17:13:12 GMT by Juanjo �lvarez
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2002 Juanjo Álvarez (juanjux@yahoo.es)
+// Copyright (C) 2002 Juanjo �lvarez (juanjux@yahoo.es)
// Copyright (C) 2002-2008 Szymon Stefanek (kvirc@tin.it)
//
// This program is FREE software. You can redistribute it and/or
@@ -68,7 +68,7 @@ static KviWindow * spaste_kvs_find_window(QString &win, KviKvsModuleCommandCall
c->warning(__tr2qs("The specified window (%Q) is not a channel/query/DCC chat"),&win);
return 0;
}
-//-------------------------------------------------
+
/*
@doc: spaste.file
@type:
@@ -89,9 +89,6 @@ static KviWindow * spaste_kvs_find_window(QString &win, KviKvsModuleCommandCall
[cmd]spaste.list[/cmd],
[cmd]spaste.setdelay[/cmd]
*/
-//-------------------------------------------
-// spaste.file
-//-------------------------------------------
static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c)
{
@@ -258,9 +255,6 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
[cmd]spaste.stop[/cmd],
[cmd]spaste.setdelay[/cmd]
*/
-//--------------------------------------------------
-// spaste.list
-//--------------------------------------------------
static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c)
{
@@ -294,11 +288,6 @@ static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c)
[cmd]spaste.stop[/cmd],
[cmd]spaste.list[/cmd]
*/
-//-------------------------------------------------
-// spaste.setdelay
-//-------------------------------------------------
-
-
static bool spaste_kvs_cmd_setdelay(KviKvsModuleCommandCall * c)
{
kvs_int_t delay;
@@ -309,7 +298,6 @@ static bool spaste_kvs_cmd_setdelay(KviKvsModuleCommandCall * c)
return true;
}
-//-------------------------------------------------
static bool spaste_module_init(KviModule * m)
{
g_pControllerList = new KviPointerList<SPasteController>;
@@ -322,8 +310,8 @@ static bool spaste_module_init(KviModule * m)
KVSM_REGISTER_SIMPLE_COMMAND(m,"list",spaste_kvs_cmd_list);
return true;
}
-//-------------------------------------------------
-static bool spaste_module_cleanup(KviModule *m)
+
+static bool spaste_module_cleanup(KviModule *)
{
while(g_pControllerList->first()) delete g_pControllerList->first();
delete g_pControllerList;
@@ -331,16 +319,16 @@ static bool spaste_module_cleanup(KviModule *m)
return true;
}
-//-------------------------------------------------
-static bool spaste_module_can_unload(KviModule *m)
+
+static bool spaste_module_can_unload(KviModule *)
{
return (g_pControllerList->isEmpty());
}
-//-------------------------------------------------
+
KVIRC_MODULE(
"SPaste", // module name
"4.0.0", // module version
- " (C) 2002 Juanjo Alvarez (juanjux@yahoo.es)", // author & (C)
+ "(C) 2002 Juanjo Alvarez (juanjux@yahoo.es)", // author & (C)
"Delayed paste commands",
spaste_module_init,
spaste_module_can_unload,
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 56f6c31bb..a51528906 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -1075,11 +1075,11 @@ static bool str_kvs_fnc_replacenocase(KviKvsModuleFunctionCall * c)
static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c)
{
QString szString,szNewString;
- int idx=0;
+ unsigned int idx=0;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
KVSM_PARAMETERS_END(c)
-
+
const char * const toReplace[]={
" ", "#", "$", "/", ":",
"<", "=", ">", "?", "@",
@@ -1094,7 +1094,7 @@ static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c)
"%7B", "%7C", "%7D"
};
- while(idx<sizeof(toReplace))
+ while(idx < sizeof(toReplace))
{
szNewString=szString.replace(toReplace[idx],newStr[idx],Qt::CaseInsensitive);
idx++;
@@ -1429,13 +1429,12 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c)
}
int idx = 0;
- int cnt = 0;
+ unsigned int cnt = 0;
int begin;
int len = szString.length();
while (idx<len)
{
QChar szTmp = szString[idx].unicode();
-// while (szTmp==sep)
while (sep.contains(szTmp))
{
idx++;
@@ -1452,7 +1451,7 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c)
c->returnValue()->setString(szString.mid(begin,idx-begin));
return true;
}
- cnt ++;
+ cnt++;
}
return true;
}
@@ -1965,7 +1964,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
{
QChar * buffer = (QChar *)kvi_malloc(sizeof(QChar) * allocsize);
//QChar * p = (QChar *)s.unicode();
-
+
//9999999999999999999999999999999\0
char numberBuffer[1024];
char *pNumBuf;
@@ -1973,31 +1972,31 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
kvs_int_t argValue;
kvs_uint_t argUValue;
kvs_real_t argRValue;
-
+
QChar * p = buffer;
-
+
#define INCREMENT_MEM \
{ \
allocsize += MEMINCREMENT; \
buffer = (QChar *)kvi_realloc(buffer,sizeof(QChar) * allocsize); \
p = buffer + reallen; \
}
-
+
#define INCREMENT_MEM_BY(numchars) \
{ \
allocsize += numchars + MEMINCREMENT; \
buffer = (QChar *)kvi_realloc(buffer,sizeof(QChar) * allocsize); \
p = buffer + reallen; \
}
-
+
KviKvsVariant * pVar;
-
+
pVar = vArgs.first();
for(; fmt->unicode() ; ++fmt)
{
if(reallen == allocsize)INCREMENT_MEM
-
+
//copy up to a '?'
if(fmt->unicode() != '?')
{
@@ -2005,7 +2004,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
reallen++;
continue;
}
-
+
++fmt; //skip this '?'
switch(fmt->unicode())
{
@@ -2090,7 +2089,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
case 'x': // hexadecimal unsigned integer
{
static char hexsmalldigits[]="0123456789abcdef";
-
+
if(pVar)
{
if(!pVar->asInteger(argValue))
@@ -2103,7 +2102,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
argValue = 0;
}
argUValue = (kvs_uint_t)argValue;
-
+
//write the number in a temporary buffer
pNumBuf = numberBuffer;
do {
@@ -2165,13 +2164,13 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
const QChar * save = fmt;
fmt++;
unsigned int uPrecision = 0;
-
+
char fmtbuffer[8];
fmtbuffer[0] = '%';
fmtbuffer[1] = '.';
-
+
int idx = 2;
-
+
while((fmt->unicode() >= '0') && (fmt->unicode() <= '9') && (idx < 6))
{
uPrecision *= 10;
@@ -2182,7 +2181,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
}
fmtbuffer[idx] = fmt->unicode();
fmtbuffer[idx+1] = 0;
-
+
if(pVar)
{
if(!pVar->asReal(argRValue))
@@ -2239,7 +2238,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
}
}
}
-
+
s.setUnicode(buffer,reallen);
kvi_free(buffer);
}
@@ -2311,7 +2310,7 @@ static bool str_module_init(KviModule * m)
return true;
}
-static bool str_module_cleanup(KviModule *m)
+static bool str_module_cleanup(KviModule *)
{
return true;
}
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 051017420..964922cec 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -708,14 +708,14 @@ static bool system_module_init(KviModule * m)
return true;
}
-static bool system_module_cleanup(KviModule *m)
+static bool system_module_cleanup(KviModule *)
{
g_pPluginManager->unloadAll();
delete g_pPluginManager;
return true;
}
-static bool system_module_can_unload(KviModule *m)
+static bool system_module_can_unload(KviModule *)
{
if(!g_pPluginManager->checkUnload()) return false;
return true;
@@ -725,8 +725,8 @@ KVIRC_MODULE(
"System", // module name
"4.0.0", // module version
"Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)" \
- " (C) 2005 Tonino Imbesi (grifisx at barmes dot org)"\
- " (C) 2005 Alessandro Carbone (elfonol at gmail dot com)",// author & (C)
+ " (C) 2005 Tonino Imbesi (grifisx at barmes dot org)"\
+ " (C) 2005 Alessandro Carbone (elfonol at gmail dot com)",// author & (C)
"System informations module",
system_module_init,
system_module_can_unload,
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 346f57f61..3f7b8abe5 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -136,7 +136,7 @@ static bool term_module_init(KviModule * m)
return true;
}
-static bool term_module_cleanup(KviModule *m)
+static bool term_module_cleanup(KviModule *)
{
#ifdef COMPILE_KDE3_SUPPORT
while(g_pTermWidgetList->first())delete g_pTermWidgetList->first();
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index 3bf54b995..99dd0be4a 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -65,9 +65,9 @@ static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c)
}
} else {
KviKvsHash* hash = new KviKvsHash();
-
+
KviPointerHashTableIterator<QString,KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
-
+
while(KviTextIcon * i = it.current())
{
if(i->id()!=-1)
@@ -122,7 +122,7 @@ static bool texticons_kvs_cmd_set(KviKvsModuleCommandCall * c)
pIcon=g_pTextIconManager->lookupTextIcon(szName);
if(!pIcon) return false;
}
-
+
bool bOk;
unsigned int iResult=szIcon.toUInt(&bOk);
if(bOk)
@@ -138,12 +138,12 @@ static bool texticons_kvs_cmd_set(KviKvsModuleCommandCall * c)
static bool texticons_module_init(KviModule * m)
{
KVSM_REGISTER_SIMPLE_COMMAND(m,"set",texticons_kvs_cmd_set);
-
+
KVSM_REGISTER_FUNCTION(m,"get",texticons_kvs_fnc_get);
return true;
}
-static bool texticons_module_cleanup(KviModule *m)
+static bool texticons_module_cleanup(KviModule *)
{
return true;
}
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index ef8e4cd9a..f3313aac2 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -142,7 +142,7 @@ static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
Shows the theme theme management editor
*/
-static bool theme_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
+static bool theme_kvs_cmd_dialog(KviKvsModuleCommandCall *)
{
KviThemeManagementDialog::display();
return true;
@@ -174,7 +174,7 @@ static bool theme_module_cleanup(KviModule *m)
return true;
}
-static bool theme_module_can_unload(KviModule * m)
+static bool theme_module_can_unload(KviModule *)
{
return (!KviThemeManagementDialog::instance());
}
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index f1ef68a82..c803e8453 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -313,7 +313,6 @@ jump_out:
void KviThemeManagementDialog::installFromFile()
{
- int iThemeCount=0;
QString szFileName;
QString szError;
@@ -401,7 +400,7 @@ void KviThemeManagementDialog::closeEvent(QCloseEvent * e)
delete this;
}
-void KviThemeManagementDialog::tipRequest(QListWidgetItem *it,const QPoint &pnt)
+void KviThemeManagementDialog::tipRequest(QListWidgetItem *,const QPoint &)
{
// FIXME
/*
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 4aea04fd3..8d26002b8 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -82,7 +82,7 @@ void KviTipFrame::setText(const QString &text)
update();
}
-void KviTipFrame::paintEvent(QPaintEvent *e)
+void KviTipFrame::paintEvent(QPaintEvent *)
{
QPainter p(this);
SET_ANTI_ALIASING(p);
@@ -169,7 +169,7 @@ bool KviTipWindow::openConfig(QString filename,bool bEnsureExists)
}
m_pConfig = new KviConfig(buffer,KviConfig::Read);
-
+
return true;
}
@@ -282,13 +282,13 @@ static bool tip_module_init(KviModule *m)
return true;
}
-static bool tip_module_cleanup(KviModule *m)
+static bool tip_module_cleanup(KviModule *)
{
if(g_pTipWindow)g_pTipWindow->close();
return true;
}
-static bool tip_module_can_unload(KviModule *m)
+static bool tip_module_can_unload(KviModule *)
{
return (g_pTipWindow == 0);
}
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index 0b8bb5816..e673e5e5a 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -28,7 +28,6 @@
#include "kvi_locale.h"
#include "kvi_channel.h"
-//-------------------------------------------------
/*
@doc: tmphighlight.add
@type:
@@ -47,12 +46,10 @@
[fnc]$tmphighlight.remove[/fnc]
[fnc]$tmphighlight.ishighlighted[/fnc]
*/
-//-------------------------------------------
-// tmphighlight.add
-//-------------------------------------------
+
static bool tmphighlight_kvs_cmd_add(KviKvsModuleCommandCall * c)
{
-
+
QString szNick;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick)
@@ -63,12 +60,12 @@ static bool tmphighlight_kvs_cmd_add(KviKvsModuleCommandCall * c)
c->warning(__tr2qs("Current window is not a channel"));
return false;
}
-
+
((KviChannel *)c->window())->addHighlightedUser(szNick);
return true;
}
-//-------------------------------------------------
+
/*
@doc: tmphighlight.remove
@type:
@@ -86,9 +83,6 @@ static bool tmphighlight_kvs_cmd_add(KviKvsModuleCommandCall * c)
[fnc]$tmphighlight.add[/fnc]
[fnc]$tmphighlight.ishighlighted[/fnc]
*/
-//-------------------------------------------
-// tmphighlight.remove
-//-------------------------------------------
static bool tmphighlight_kvs_cmd_remove(KviKvsModuleCommandCall * c)
{
@@ -106,7 +100,7 @@ static bool tmphighlight_kvs_cmd_remove(KviKvsModuleCommandCall * c)
((KviChannel *)c->window())->removeHighlightedUser(szNick);
return true;
}
-//-------------------------------------------------
+
/*
@doc: tmphighlight.ishighlighted
@type:
@@ -124,9 +118,6 @@ static bool tmphighlight_kvs_cmd_remove(KviKvsModuleCommandCall * c)
[fnc]$tmphighlight.remove[/fnc]
*/
-//-------------------------------------------
-// tmphighlight.ishighlighted
-//-------------------------------------------
static bool tmphighlight_kvs_fnc_ishighlighted(KviKvsModuleFunctionCall * c)
{
@@ -144,7 +135,6 @@ static bool tmphighlight_kvs_fnc_ishighlighted(KviKvsModuleFunctionCall * c)
return true;
}
-//-------------------------------------------------
static bool tmphighlight_module_init(KviModule * m)
{
KVSM_REGISTER_SIMPLE_COMMAND(m,"add",tmphighlight_kvs_cmd_add);
@@ -153,21 +143,21 @@ static bool tmphighlight_module_init(KviModule * m)
KVSM_REGISTER_FUNCTION(m,"isHighLighted",tmphighlight_kvs_fnc_ishighlighted);
return true;
}
-//-------------------------------------------------
-static bool tmphighlight_module_cleanup(KviModule *m)
+
+static bool tmphighlight_module_cleanup(KviModule *)
{
return true;
}
-//-------------------------------------------------
-static bool tmphighlight_module_can_unload(KviModule *m)
+
+static bool tmphighlight_module_can_unload(KviModule *)
{
return true;
}
-//-------------------------------------------------
+
KVIRC_MODULE(
- "TmpHighlight", // module name
- "4.0.0", // module version
- " (C) 2002 Juanjo Alvarez (juanjux@yahoo.es)", // author & (C)
+ "TmpHighlight", // module name
+ "4.0.0", // module version
+ "(C) 2002 Juanjo Alvarez (juanjux@yahoo.es)", // author & (C)
"Temporal Highlightining of channel users",
tmphighlight_module_init,
tmphighlight_module_can_unload,
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index 3243e8b16..b105c62d4 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -82,7 +82,7 @@ static bool toolbar_kvs_cmd_create(KviKvsModuleCommandCall * c)
c->error(__tr2qs("Internal error: call a head-shrinker"));
return false;
}
-*/
+*/
if(szLabel.isEmpty())szLabel = "$tr(Unnamed)";
KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
@@ -93,10 +93,10 @@ static bool toolbar_kvs_cmd_create(KviKvsModuleCommandCall * c)
} else {
d = KviCustomToolBarManager::instance()->create(szId,szLabel);
}
-
+
if(!szIconId.isEmpty())
d->setIconId(szIconId);
-
+
return true;
}
@@ -572,16 +572,16 @@ static bool toolbar_module_init(KviModule * m)
KVSM_REGISTER_SIMPLE_COMMAND(m,"remove",toolbar_kvs_cmd_removeitem)
KVSM_REGISTER_SIMPLE_COMMAND(m,"show",toolbar_kvs_cmd_show)
KVSM_REGISTER_SIMPLE_COMMAND(m,"hide",toolbar_kvs_cmd_hide)
-
+
KVSM_REGISTER_FUNCTION(m,"exists",toolbar_kvs_fnc_exists)
KVSM_REGISTER_FUNCTION(m,"isVisible",toolbar_kvs_fnc_isVisible)
KVSM_REGISTER_FUNCTION(m,"list",toolbar_kvs_fnc_list)
KVSM_REGISTER_FUNCTION(m,"items",toolbar_kvs_fnc_items)
-
+
return true;
}
-static bool toolbar_module_cleanup(KviModule *m)
+static bool toolbar_module_cleanup(KviModule *)
{
return true;
}
diff --git a/src/modules/toolbareditor/libkvitoolbareditor.cpp b/src/modules/toolbareditor/libkvitoolbareditor.cpp
index 7eeae47dc..02209b418 100644
--- a/src/modules/toolbareditor/libkvitoolbareditor.cpp
+++ b/src/modules/toolbareditor/libkvitoolbareditor.cpp
@@ -48,7 +48,7 @@ QRect g_rectToolBarEditorDialogGeometry(0,0,0,0);
*/
-static bool toolbareditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
+static bool toolbareditor_kvs_cmd_open(KviKvsModuleCommandCall *)
{
KviCustomizeToolBarsDialog::display();
return true;
@@ -66,7 +66,7 @@ static bool toolbareditor_module_init(KviModule * m)
return true;
}
-static bool toolbareditor_module_can_unload(KviModule * m)
+static bool toolbareditor_module_can_unload(KviModule *)
{
return (!KviCustomizeToolBarsDialog::instance());
}
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index ca2e89430..4841e0c7c 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -838,7 +838,7 @@ static bool torrent_module_init(KviModule *m)
if (g_pFrame->mainStatusBar())
KviTorrentStatusBarApplet::selfRegister(g_pFrame->mainStatusBar());
-
+
if(KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) == "auto")
{
@@ -856,20 +856,19 @@ static bool torrent_module_init(KviModule *m)
return true;
}
-static bool torrent_module_cleanup( KviModule * m )
+static bool torrent_module_cleanup(KviModule * )
{
delete g_pDescriptorList;
return true;
}
-static bool torrent_module_can_unload( KviModule * m )
+static bool torrent_module_can_unload(KviModule * )
{
return true;
}
-static bool torrent_module_ctrl(KviModule * m,const char * operation,void * param)
+static bool torrent_module_ctrl(KviModule *,const char *,void *) // KviModule * m,const char * operation,void * param)
{
- qDebug("torrent module ctrl");
/* if(kvi_strEqualCI(operation,"getAvailableMediaPlayers"))
{
// we expect param to be a pointer to QStringList
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 151001999..1e27a3800 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -172,7 +172,7 @@ static const char * idlemsgs[NIDLEMSGS]=
__tr("idle idle idle idle!")
};
-void KviTrayIcon::tipRequest(KviDynamicToolTip *tip,const QPoint &pnt)
+void KviTrayIcon::tipRequest(KviDynamicToolTip *,const QPoint &)
{
QString tmp;
@@ -430,7 +430,7 @@ void KviTrayIcon::grabActivityInfo()
{
if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification))
{
- int iLevel = b->highlightLevel();
+ unsigned int iLevel = b->highlightLevel();
switch(b->kviWindow()->type())
{
case KVI_WINDOW_TYPE_CONSOLE:
@@ -447,7 +447,7 @@ void KviTrayIcon::grabActivityInfo()
break;
}
} else {
- int iLevel=0;
+ unsigned int iLevel=0;
if(b->kviWindow()->view())
{
if(b->kviWindow()->view()->haveUnreadedHighlightedMessages())
@@ -671,7 +671,7 @@ static bool trayicon_module_init(KviModule * m)
return true;
}
-static bool trayicon_module_cleanup(KviModule *m)
+static bool trayicon_module_cleanup(KviModule *)
{
while(g_pTrayIconList->first())delete g_pTrayIconList->first();
delete g_pTrayIconList;
diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h
index a68266536..2880d20aa 100644
--- a/src/modules/trayicon/libkvitrayicon.h
+++ b/src/modules/trayicon/libkvitrayicon.h
@@ -56,10 +56,10 @@ protected:
QPixmap m_CurrentPixmap;
QTimer* m_pFlashingTimer;
- int m_iConsoles;
- int m_iChannels;
- int m_iQueries;
- int m_iOther;
+ unsigned int m_iConsoles;
+ unsigned int m_iChannels;
+ unsigned int m_iQueries;
+ unsigned int m_iOther;
public:
KviFrame * frame(){ return m_pFrm; };
public:
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index 3c3974b54..3396c5a5c 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -117,7 +117,7 @@ static bool upnp_kvs_cmd_addPortMapping(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("port",KVS_PT_INT,0,iPort)
KVSM_PARAMETERS_END(c)
- if(pSw = c->switches()->find('a',"fake-address"))
+ if( (pSw = c->switches()->find('a',"fake-address")) )
{
pSw->asString(szLocalIp);
} else {
@@ -174,7 +174,7 @@ static bool upnp_kvs_cmd_delPortMapping(KviKvsModuleCommandCall * c)
@seealso:
[fnc]$upnp.isGatewayAvailable[/fnc]
*/
-static bool upnp_kvs_cmd_refresh(KviKvsModuleCommandCall * c)
+static bool upnp_kvs_cmd_refresh(KviKvsModuleCommandCall *)
{
if(g_pManager)
delete g_pManager;
@@ -185,7 +185,7 @@ static bool upnp_kvs_cmd_refresh(KviKvsModuleCommandCall * c)
return true;
}
-static bool upnp_module_init(KviModule * m)
+static bool upnp_module_init(KviModule *m)
{
if(g_pManager)
delete g_pManager;
@@ -202,14 +202,14 @@ static bool upnp_module_init(KviModule * m)
return true;
}
-static bool upnp_module_cleanup(KviModule *m)
+static bool upnp_module_cleanup(KviModule *)
{
delete g_pManager;
g_pManager = 0;
return true;
}
-static bool upnp_module_can_unload(KviModule *m)
+static bool upnp_module_can_unload(KviModule *)
{
// if a gateway is available, don't unload me
return !g_pManager->isGatewayAvailable();
diff --git a/src/modules/upnp/rootservice.cpp b/src/modules/upnp/rootservice.cpp
index def377458..9aacb6457 100644
--- a/src/modules/upnp/rootservice.cpp
+++ b/src/modules/upnp/rootservice.cpp
@@ -184,7 +184,7 @@ void RootService::addDeviceServices(const QDomNode &device)
// Find all embedded device nodes
QDomNodeList embeddedDevices = device.namedItem("deviceList").childNodes();
- for(uint i = 0; i < embeddedDevices.count(); i++)
+ for(int i = 0; i < embeddedDevices.count(); i++)
{
if(embeddedDevices.item(i).nodeName() != "device") continue;
addDeviceServices(embeddedDevices.item(i));
diff --git a/src/modules/upnp/service.cpp b/src/modules/upnp/service.cpp
index 9806086a2..f5c2d91e6 100644
--- a/src/modules/upnp/service.cpp
+++ b/src/modules/upnp/service.cpp
@@ -51,12 +51,12 @@ namespace UPnP
// The constructor for information services
Service::Service(const QString &hostname, int port, const QString &informationUrl)
-: m_szInformationUrl(informationUrl)
+: m_iPendingRequests(0)
+, m_szBaseXmlPrefix("s")
, m_szHostname(hostname)
, m_iPort(port)
-, m_iPendingRequests(0)
-, m_szBaseXmlPrefix("s")
{
+ m_szInformationUrl = informationUrl;
m_pHttp = new QHttp(hostname, port);
connect(m_pHttp, SIGNAL( requestFinished(int,bool) ) , this, SLOT( slotRequestFinished(int,bool) ) );
@@ -71,9 +71,9 @@ Service::Service(const ServiceParameters &params)
, m_iPendingRequests(0)
, m_szServiceId(params.serviceId)
, m_szServiceType(params.serviceType)
+, m_szBaseXmlPrefix("s")
, m_szHostname(params.hostname)
, m_iPort(params.port)
-, m_szBaseXmlPrefix("s")
{
m_pHttp = new QHttp(params.hostname, params.port);
connect(m_pHttp, SIGNAL( requestFinished(int,bool) ) , this, SLOT( slotRequestFinished(int,bool) ) );
@@ -292,7 +292,7 @@ void Service::slotRequestFinished(int id, bool error)
// It's possible to pass the entire QDomNode object to the gotActionResponse()
// function, but this is somewhat nicer, and reduces code boat in the subclasses
QDomNodeList children = resultNode.childNodes();
- for(uint i = 0; i < children.count(); i++)
+ for(int i = 0; i < children.count(); i++)
{
QString key = children.item(i).nodeName();
resultValues[ key ] = children.item(i).toElement().text();
diff --git a/src/modules/upnp/xmlfunctions.cpp b/src/modules/upnp/xmlfunctions.cpp
index 5d8f168cc..b5ee206b9 100644
--- a/src/modules/upnp/xmlfunctions.cpp
+++ b/src/modules/upnp/xmlfunctions.cpp
@@ -43,7 +43,7 @@ QDomNode XmlFunctions::getNode( const QDomNode &rootNode, const QString &path )
QStringList pathItems = path.split( "/", QString::SkipEmptyParts );
QDomNode childNode = rootNode.namedItem( pathItems[0] ); // can be a null node
- uint i = 1;
+ int i = 1;
while( i < pathItems.count() )
{
if( childNode.isNull() )
@@ -80,7 +80,7 @@ QString XmlFunctions::getNodeAttribute( const QDomNode &node, const QString &att
QDomNode XmlFunctions::getNodeChildByKey( const QDomNodeList &childNodes, const QString &keyTagName, const QString &keyValue )
{
- for( uint i = 0; i < childNodes.count(); i++ )
+ for( int i = 0; i < childNodes.count(); i++ )
{
// kdDebug() << "node " << childNodes.item(i).nodeName() << "/" << keyTagName
// << "=" << childNodes.item(i).namedItem(keyTagName).toElement().text() << " == " << keyValue << "?" << endl;
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index f4772e007..86eee5803 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -77,7 +77,7 @@ void url_module_help();
#define KVI_URL_EXTENSION_NAME "URL module extenstion"
-static KviModuleExtension * url_extension_alloc(KviModuleExtensionAllocStruct * s)
+static KviModuleExtension * url_extension_alloc(KviModuleExtensionAllocStruct *)
{
urllist();
return 0;
@@ -128,7 +128,7 @@ QPixmap * KviUrlAction::smallIcon()
// ---------------------------- CLASS URLDIALOG ------------------------begin //
-UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList)
+UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
:KviWindow(KVI_WINDOW_TYPE_TOOL,g_pFrame,"URL List")
{
m_pMenuBar = new KviTalMenuBar(this,"url menu");
@@ -286,7 +286,7 @@ void UrlDialog::popup(KviTalTreeWidgetItem *item, const QPoint &point)
// p.insertItem(__tr2qs("&Find Text"),this,SLOT(findtext()));
p.insertSeparator();
m_pListPopup = new KviTalPopupMenu(0,"list");
- int i=0;
+
for(KviWindow *w=g_pFrame->windowList()->first();w;w=g_pFrame->windowList()->next())
{
if ((w->type() == KVI_WINDOW_TYPE_CHANNEL) ||
@@ -661,7 +661,7 @@ void loadBanList()
*/
-static bool url_kvs_cmd_list(KviKvsModuleCommandCall * c)
+static bool url_kvs_cmd_list(KviKvsModuleCommandCall *)
{
urllist();
return true;
@@ -721,7 +721,7 @@ bool urllist()
<HR>
*/
-static bool url_kvs_cmd_config(KviKvsModuleCommandCall * c)
+static bool url_kvs_cmd_config(KviKvsModuleCommandCall *)
{
if (!g_pConfigDialog) g_pConfigDialog = new ConfigDialog();
return true;
@@ -853,7 +853,7 @@ static bool url_module_init(KviModule *m)
return true;
}
-static bool url_module_cleanup(KviModule *m)
+static bool url_module_cleanup(KviModule *)
{
KviConfig cfg(szConfigPath,KviConfig::Read);
cfg.setGroup("ConfigDialog");
@@ -879,7 +879,7 @@ static bool url_module_cleanup(KviModule *m)
return true;
}
-static bool url_module_can_unload(KviModule *m)
+static bool url_module_can_unload(KviModule *)
{
// FIXME: really ugly :/
return false;
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index ac4345329..572ac8f00 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -1615,7 +1615,7 @@ static bool window_module_init(KviModule *m)
return true;
}
-static bool window_module_cleanup(KviModule *m)
+static bool window_module_cleanup(KviModule *)
{
while(KviUserWindow * w = g_pUserWindowList->first())
w->close();
@@ -1623,7 +1623,7 @@ static bool window_module_cleanup(KviModule *m)
return true;
}
-static bool window_module_can_unload(KviModule *m)
+static bool window_module_can_unload(KviModule *)
{
return g_pUserWindowList->isEmpty();
}
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index 9b2dcdb98..b48ac238e 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -77,7 +77,7 @@ QPixmap * KviUserWindow::myIconPtr()
return g_pIconManager->getSmallIcon(m_iIcon);
}
-void KviUserWindow::resizeEvent(QResizeEvent *e)
+void KviUserWindow::resizeEvent(QResizeEvent *)
{
if(m_pInput)
{