diff options
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/class_button.cpp | 8 | ||||
| -rw-r--r-- | src/modules/objects/class_checkbox.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_combobox.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_dialog.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_dockwindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_file.cpp | 20 | ||||
| -rw-r--r-- | src/modules/objects/class_ftp.cpp | 26 | ||||
| -rw-r--r-- | src/modules/objects/class_groupbox.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/class_hbox.cpp | 14 | ||||
| -rw-r--r-- | src/modules/objects/class_http.cpp | 50 | ||||
| -rw-r--r-- | src/modules/objects/class_label.cpp | 52 | ||||
| -rw-r--r-- | src/modules/objects/class_layout.cpp | 30 | ||||
| -rw-r--r-- | src/modules/objects/class_lcd.cpp | 22 | ||||
| -rw-r--r-- | src/modules/objects/class_lineedit.cpp | 42 | ||||
| -rw-r--r-- | src/modules/objects/class_listwidget.cpp | 11 | ||||
| -rw-r--r-- | src/modules/objects/class_mainwindow.cpp | 6 | ||||
| -rw-r--r-- | src/modules/objects/class_menubar.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/libkviobjects.cpp | 15 |
18 files changed, 153 insertions, 159 deletions
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index 68326c1bd..7ea183ad4 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -47,7 +47,7 @@ [class]object[/class] [class]button[/class] @description: - This widget provides a push button + This widget provides a push button @functions: !fn: $setText([<text:string>]) Set the button text.[br] @@ -83,7 +83,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_button) KVSO_END_DESTRUCTOR(KviKvsObject_button) -bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_button::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QPushButton); connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked())); @@ -118,7 +118,7 @@ KVSO_CLASS_FUNCTION(button,setImage) if(icon.isHObject()) { kvs_hobject_t hObj; - icon.asHObject(hObj); + icon.asHObject(hObj); KviKvsObject *pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObj); if (!pObject) { @@ -127,7 +127,7 @@ KVSO_CLASS_FUNCTION(button,setImage) } if(pObject->inheritsClass("pixmap")) ((QPushButton *)widget())->setIcon(QIcon(*((KviKvsObject_pixmap *)pObject)->getPixmap())); - else{ + else{ c->warning(__tr2qs_ctx("Object Pixmap required!","object")); } return true; diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 66fbba5ff..0cd0fa9e0 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -77,7 +77,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_checkbox) KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox) -bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_checkbox::init(KviKvsRunTimeContext *,KviKvsVariantList *) { QCheckBox * cb = new QCheckBox(parentScriptWidget()); cb->setObjectName(getName().toUtf8().data()); diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 2dddebe7b..80305a347 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -133,7 +133,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_combobox) KVSO_END_CONSTRUCTOR(KviKvsObject_combobox) -bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_combobox::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QComboBox); connect (((QComboBox *)widget()),SIGNAL(activated( int )),this,SLOT(slotActivated( int ))); diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp index 590186227..b52cb80eb 100644 --- a/src/modules/objects/class_dialog.cpp +++ b/src/modules/objects/class_dialog.cpp @@ -66,7 +66,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_dialog) KVSO_END_CONSTRUCTOR(KviKvsObject_dialog) -bool KviKvsObject_dialog::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_dialog::init(KviKvsRunTimeContext *,KviKvsVariantList *) { QWidget * w = g_pApp->activeModalWidget(); if(!w)w = g_pFrame; diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index 40d83927a..e40fc1c28 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -81,7 +81,7 @@ KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow) #define _pDockWindow ((QT_DOCK_WINDOW *)widget()) -bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) +bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext *,KviKvsVariantList *) { QDockWidget * pWidget = new QDockWidget(g_pFrame); pWidget->setObjectName(getName()); diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index eee0b6f27..7ecf96d90 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -159,17 +159,17 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_file,"file","object") KVSO_REGISTER_HANDLER(KviKvsObject_file,"isOpen",isOpen) KVSO_REGISTER_HANDLER(KviKvsObject_file,"close",close) KVSO_REGISTER_HANDLER(KviKvsObject_file,"flush",flush) - + KVSO_REGISTER_HANDLER(KviKvsObject_file,"size",size) KVSO_REGISTER_HANDLER(KviKvsObject_file,"atEnd",atEnd) KVSO_REGISTER_HANDLER(KviKvsObject_file,"where",where) KVSO_REGISTER_HANDLER(KviKvsObject_file,"seek",seek) - + KVSO_REGISTER_HANDLER(KviKvsObject_file,"putch",putch) KVSO_REGISTER_HANDLER(KviKvsObject_file,"getch",getch) KVSO_REGISTER_HANDLER(KviKvsObject_file,"ungetch",unGetch) - + KVSO_REGISTER_HANDLER(KviKvsObject_file,"readBlock",readBlock) KVSO_REGISTER_HANDLER(KviKvsObject_file,"writeBlock", writeBlock) @@ -182,7 +182,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_file,"file","object") KVSO_REGISTER_HANDLER(KviKvsObject_file,"write",write) KVSO_REGISTER_HANDLER(KviKvsObject_file,"read",read) - + KVSO_END_REGISTERCLASS(KviKvsObject_file) @@ -222,7 +222,7 @@ KVSO_CLASS_FUNCTION(file,open) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("file_mode",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,modes) KVSO_PARAMETERS_END(c) - + if(m_pFile->fileName().isEmpty()) { c->warning(__tr2qs_ctx("Empty filename string","objects")); @@ -451,7 +451,7 @@ KVSO_CLASS_FUNCTION(file,write) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("variant_data",KVS_PT_VARIANT,0,pVariantData) KVSO_PARAMETERS_END(c) - if (pVariantData->isInteger()) + if (pVariantData->isInteger()) { kvs_int_t num; pVariantData->asInteger(num); @@ -508,7 +508,7 @@ KVSO_CLASS_FUNCTION(file,writeBlock) c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object","objects")); return true; } - + } else { @@ -597,14 +597,14 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock) c->warning(__tr2qs_ctx("Lenght of hex string is not multiple of 2","objects")); return true; } - if (uLen>(szBlock.length()/2)|| !uLen) uLen=szBlock.length(); + if (uLen>((uint)szBlock.length()/2)|| !uLen) uLen=szBlock.length(); else uLen*=2; unsigned char byte,lsb,msb; - for(int i=0;i<uLen;i+=2) + for(unsigned int i=0;i<uLen;i+=2) { msb=szBlock.at(i).toAscii(); lsb=szBlock.at(i+1).toAscii(); - + if (((msb>='A' && msb<='F')||(msb>='0' && msb<='9')) && ((lsb>='A' && lsb<='F')|| (lsb>='0' && lsb<='9'))) { msb>='A'?msb-='7':msb-='0'; diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp index c7adb10cf..76d6b6fc9 100644 --- a/src/modules/objects/class_ftp.cpp +++ b/src/modules/objects/class_ftp.cpp @@ -51,14 +51,14 @@ You can use one of the $read* functions to obtain the data. !fn: $connect(<host:string>,<remote_port:integer>) - Connects to the FTP server host using port port.The command is scheduled, and its execution is performed asynchronously. + Connects to the FTP server host using port port.The command is scheduled, and its execution is performed asynchronously. The function returns a unique identifier which is passed by commandStarted() and commandFinished().[br] !fn: $abort() !fn: $login !fn: $get !fn: $cd !fn: $list - !fn: + !fn: */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_ftp,"ftp","object") @@ -166,7 +166,7 @@ KVSO_CLASS_FUNCTION(ftp,abort) m_pFtp->abort(); return true; } -//signals & slots +//signals & slots KVSO_CLASS_FUNCTION(ftp,commandFinishedEvent) { emitSignal("commandFinished",c,c->params()); @@ -175,21 +175,21 @@ KVSO_CLASS_FUNCTION(ftp,commandFinishedEvent) void KviKvsObject_ftp::slotCommandFinished ( int id, bool error ) { - QString status=""; + QString status=""; if (m_pFtp->currentCommand()==QFtp::Get){ - status="Finished to load"; + status="Finished to load"; m_pFile->close(); delete m_pFile; } - else if (m_pFtp->currentCommand()==QFtp:: ConnectToHost) status="connected"; - else if (m_pFtp->currentCommand()==QFtp:: Login) status="logged"; - else if (m_pFtp->currentCommand()==QFtp:: Cd) status="entered"; - else if (m_pFtp->currentCommand()==QFtp:: List) status="listCompleted"; + else if (m_pFtp->currentCommand()==QFtp:: ConnectToHost) status="connected"; + else if (m_pFtp->currentCommand()==QFtp:: Login) status="logged"; + else if (m_pFtp->currentCommand()==QFtp:: Cd) status="entered"; + else if (m_pFtp->currentCommand()==QFtp:: List) status="listCompleted"; callFunction(this,"commandFinishedEvent",0,new KviKvsVariantList(new KviKvsVariant((kvs_int_t) id), new KviKvsVariant(status),new KviKvsVariant(error))); } -void KviKvsObject_ftp::slotCommandStarted ( int id ) +void KviKvsObject_ftp::slotCommandStarted ( int ) { } @@ -204,21 +204,21 @@ KVSO_CLASS_FUNCTION(ftp,dataTransferProgressEvent) emitSignal("dataTransferProgress",c,c->params()); return true; } -void KviKvsObject_ftp::slotDone ( bool error ) +void KviKvsObject_ftp::slotDone ( bool ) { } void KviKvsObject_ftp::slotListInfo ( const QUrlInfo & i ) { callFunction(this,"listInfoEvent",0,new KviKvsVariantList(new KviKvsVariant(i.name()))); - + } KVSO_CLASS_FUNCTION(ftp,listInfoEvent) { emitSignal("listInfo",c,c->params()); return true; } -void KviKvsObject_ftp::slotRawCommandReply ( int replyCode, const QString & detail ) +void KviKvsObject_ftp::slotRawCommandReply ( int, const QString &) { } diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 7c5105e37..359c67c59 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -179,10 +179,10 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_groupbox) KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox) -bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_groupbox::init(KviKvsRunTimeContext *,KviKvsVariantList *) { KviTalGroupBox *groupbox=new KviTalGroupBox(getName(),parentScriptWidget()); - + groupbox->setOrientation(Qt::Horizontal); groupbox->setObjectName(getName()); setObject(groupbox,true); diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp index bba750723..db16a2bfb 100644 --- a/src/modules/objects/class_hbox.cpp +++ b/src/modules/objects/class_hbox.cpp @@ -29,7 +29,7 @@ #include "kvi_tal_hbox.h" const char * const align_tbl[] = { - "Left", + "Left", "Right", "HCenter", "VCenter", @@ -78,8 +78,8 @@ const int align_cod[] = { !fn: $addStretch(<stretch:integer>) Adds a stretchable space with zero minimum size and stretch factor stretch to the end of this box layout. !fn: $setAlignment(<flag1:string>, <flag2:string>, ...) - Sets the alignment for widget w to flags, given as parameters. - Valid flags are:Right,Left,Top,Bottom,HCenter,VCenter,Center + Sets the alignment for widget w to flags, given as parameters. + Valid flags are:Right,Left,Top,Bottom,HCenter,VCenter,Center */ @@ -100,9 +100,9 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_hbox) KVSO_END_CONSTRUCTOR(KviKvsObject_hbox) -bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_hbox::init(KviKvsRunTimeContext *,KviKvsVariantList *) { - + setObject(new KviTalHBox(parentScriptWidget()), true); return true; } @@ -179,7 +179,7 @@ KVSO_CLASS_FUNCTION(hbox,setAlignment) int align,sum=0; for ( QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it ) { - + align = 0; for(unsigned int j = 0; j < align_num; j++) { @@ -193,7 +193,7 @@ KVSO_CLASS_FUNCTION(hbox,setAlignment) sum = sum | align; else c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it)); - + } if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum); return true; diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp index 299f8baea..88c16e7dd 100644 --- a/src/modules/objects/class_http.cpp +++ b/src/modules/objects/class_http.cpp @@ -33,7 +33,7 @@ #include <QSslError> const char * const ssl_errors_tbl[] = { - "NoError", + "NoError", "UnableToGetIssuerCertificate", "UnableToDecryptCertificateSignature", "UnableToDecodeIssuerPublicKey", @@ -43,19 +43,19 @@ const char * const ssl_errors_tbl[] = { "InvalidNotBeforeField", "InvalidNotAfterField", "SelfSignedCertificate", - "SelfSignedCertificateInChain", - "UnableToGetLocalIssuerCertificate", + "SelfSignedCertificateInChain", + "UnableToGetLocalIssuerCertificate", "UnableToVerifyFirstCertificate", "CertificateRevoked", - "InvalidCaCertificate", + "InvalidCaCertificate", "PathLengthExceeded", - "InvalidPurpose", - "CertificateUntrusted", - "CertificateRejected", - "SubjectIssuerMismatch", + "InvalidPurpose", + "CertificateUntrusted", + "CertificateRejected", + "SubjectIssuerMismatch", "AuthorityIssuerSerialNumberMismatch", - "NoPeerCertificate", - "HostNameMismatch", + "NoPeerCertificate", + "HostNameMismatch", "UnspecifiedError", "NoSslSupport" }; @@ -106,7 +106,7 @@ const char * const ssl_errors_tbl[] = { !sg: $sslErrors( !sg: $stateChanged( !sg: $responseHeaderReceived( - + */ @@ -121,7 +121,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_http,"http","object") KVSO_REGISTER_HANDLER(KviKvsObject_http,"readAll",functionReadAll) KVSO_REGISTER_HANDLER(KviKvsObject_http,"errorString",functionErrorString) KVSO_REGISTER_HANDLER(KviKvsObject_http,"setFollowRedirect",functionFollowRedirect) - + // events KVSO_REGISTER_HANDLER(KviKvsObject_http,"doneEvent",functionDoneEvent) KVSO_REGISTER_HANDLER(KviKvsObject_http,"requestFinishedEvent",functionRequestFinishedEvent) @@ -144,7 +144,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_http,KviKvsObject) m_bEnableForceRedirect=false; connect(m_pHttp,SIGNAL(requestFinished(int,bool)),this,SLOT(slotRequestFinished(int,bool))); connect(m_pHttp,SIGNAL(done(bool)),this,SLOT(slotDone(bool))); - + connect(m_pHttp,SIGNAL(requestStarted(int)),this,SLOT(slotRequestStarted(int))); connect(m_pHttp,SIGNAL(dataSendProgress(int,int)),this,SLOT(slotDataSendProgress(int,int))); connect(m_pHttp,SIGNAL(dataReadProgress(int,int)),this,SLOT(slotDataReadProgress(int,int))); @@ -258,7 +258,7 @@ bool KviKvsObject_http::functionGet(KviKvsObjectFunctionCall *c) } bool KviKvsObject_http::functionPost(KviKvsObjectFunctionCall *c) { - CHECK_INTERNAL_POINTER(m_pHttp) + CHECK_INTERNAL_POINTER(m_pHttp) QString szPath,szDest,szData; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("remote_path",KVS_PT_STRING,0,szPath) @@ -280,20 +280,20 @@ bool KviKvsObject_http::functionPost(KviKvsObjectFunctionCall *c) } bool KviKvsObject_http::functionAbort(KviKvsObjectFunctionCall *c) { - CHECK_INTERNAL_POINTER(m_pHttp) + CHECK_INTERNAL_POINTER(m_pHttp) m_bAbort=true; m_pHttp->abort(); return true; } bool KviKvsObject_http::functionReadAll(KviKvsObjectFunctionCall *c) { - CHECK_INTERNAL_POINTER(m_pHttp) + CHECK_INTERNAL_POINTER(m_pHttp) c->returnValue()->setString(m_pHttp->readAll()); return true; } bool KviKvsObject_http::functionErrorString(KviKvsObjectFunctionCall *c) { - CHECK_INTERNAL_POINTER(m_pHttp) + CHECK_INTERNAL_POINTER(m_pHttp) c->returnValue()->setString(m_pHttp->errorString()); return true; } @@ -306,7 +306,7 @@ bool KviKvsObject_http::functionFollowRedirect(KviKvsObjectFunctionCall *c) m_bEnableForceRedirect=bEnabled; return true; } -//signals & slots +//signals & slots bool KviKvsObject_http::functionRequestFinishedEvent(KviKvsObjectFunctionCall *c) { @@ -316,12 +316,12 @@ bool KviKvsObject_http::functionRequestFinishedEvent(KviKvsObjectFunctionCall *c void KviKvsObject_http::slotRequestFinished ( int id, bool error ) { - - if (m_bAbort) + + if (m_bAbort) { m_bAbort=false; QHashIterator<int,QFile *> t(getDict); - while (t.hasNext()) + while (t.hasNext()) { t.next(); int key=t.key(); @@ -339,7 +339,7 @@ void KviKvsObject_http::slotRequestFinished ( int id, bool error ) pFile->close(); getDict.remove(id); int res=m_pHttp->lastResponse().statusCode(); - if ((m_pHttp->lastResponse().statusCode()==301 || m_pHttp->lastResponse().statusCode()==302 || m_pHttp->lastResponse().statusCode()==307) && m_bEnableForceRedirect) + if ((res==301 || res==302 || res==307) && m_bEnableForceRedirect) redirect(name,m_pHttp->lastResponse()); delete pFile; } @@ -420,10 +420,10 @@ void KviKvsObject_http::slotResponseHeaderReceived(const QHttpResponseHeader &r) default: szResponse=r.reasonPhrase(); m_bAbort=true; } - + callFunction(this,"responseHeaderReceivedEvent",0,new KviKvsVariantList( new KviKvsVariant(szResponse))); - + } void KviKvsObject_http::slotReadyRead(const QHttpResponseHeader &r) { @@ -466,7 +466,7 @@ bool KviKvsObject_http::functionStateChangedEvent(KviKvsObjectFunctionCall *c) #ifndef QT_NO_OPENSSL -bool KviKvsObject_http::functionIgnoreSslErrors(KviKvsObjectFunctionCall *c) +bool KviKvsObject_http::functionIgnoreSslErrors(KviKvsObjectFunctionCall *) { if (m_pHttp) m_pHttp->ignoreSslErrors(); return true; diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index 555631fd4..8cbc97a0d 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -60,7 +60,7 @@ const int align_cod[] = { }; #define align_num (sizeof(align_tbl) / sizeof(align_tbl[0])) - + // used in $frameStyle & $setFrameStyle const char * const frame_tbl[] = { "NoFrame", @@ -110,7 +110,7 @@ const int frame_cod[] = { The text can contain limited html tags. See also [classfnc]$text[/classfnc](). !fn: <string> $text() - Returns the text currently displayed by the label. + Returns the text currently displayed by the label. See also [classfnc]$setText[/classfnc](). !fn: <integer> $margin() Returns current value of margin for this label (default is 0). @@ -119,14 +119,14 @@ const int frame_cod[] = { Sets margin width / height to <margin>. See also [classfnc]$margin[/classfnc](). !fn: <string> $alignment() - Returns a string containing alignment flags that are set for + Returns a string containing alignment flags that are set for this label. The flags are separated by commas. An example output could look like this:[br] [pre]Bottom, Right[/pre][br] See [classfnc]$setAlignment[/classfnc]() for explanation of all alignment flags. !fn: $setAlignment(<flag1:string>, <flag2:string>, ...) - This function sets alignment flags, given as parameters, for + This function sets alignment flags, given as parameters, for this label. Valid flags are: [pre] Right - Text is aligned to right border[br] @@ -138,11 +138,11 @@ const int frame_cod[] = { Center - Equals HCenter + VCenter[br] WordBreak - Enables automatic word breaking[br] [/pre] - It is obvious that you can not set for example [i]Right[/i] - and [i]Left[/i] simoultaneously - this will [b]NOT[/b] + It is obvious that you can not set for example [i]Right[/i] + and [i]Left[/i] simoultaneously - this will [b]NOT[/b] result in an error message - this will simply not work :) !fn: $clear() - Clears the label. Equal to calling + Clears the label. Equal to calling [classfnc]$setText[/classfnc]("") !fn: $frameStyle() Returns a string containing this label's frame-style flags, @@ -158,13 +158,13 @@ const int frame_cod[] = { [pre] NoFrame - draw no frame. You shouldn't specify a shadow when using this.[br] - Box - draws a rectangular box. Its borders can be + Box - draws a rectangular box. Its borders can be [i]Raised[/i] or [i]Sunken[/i][br] - Panel - draws a rectangular panel which can be + Panel - draws a rectangular panel which can be [i]Raised[/i] or [i]Sunken[/i][br] WinPanel - similar to [i]Panel[/i], but is more in Win95 style[br] - Hline - draws a horizontal line that frames nothing (useful as separator) + Hline - draws a horizontal line that frames nothing (useful as separator) [/pre] Valid shadow flags are:[br] [pre] @@ -175,7 +175,7 @@ const int frame_cod[] = { the parent widget[br] [/pre] !fn: $setImage(<image_id>) - Sets the image to be displayed on this label. + Sets the image to be displayed on this label. Giving empty argument clears the pixmap[br] See the [doc:image_id]image identifier[/doc] documentation for the explaination of the <image_id> parameter. @@ -205,7 +205,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_label) KVSO_END_CONSTRUCTOR(KviKvsObject_label) -bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_label::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QLabel) return true; @@ -213,7 +213,7 @@ bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList KVSO_CLASS_FUNCTION(label,setText) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) @@ -224,14 +224,14 @@ KVSO_CLASS_FUNCTION(label,setText) KVSO_CLASS_FUNCTION(label,text) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) c->returnValue()->setString(((QLabel *)widget())->text()); return true; } KVSO_CLASS_FUNCTION(label,setMargin) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iMargin; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,iMargin) @@ -241,7 +241,7 @@ KVSO_CLASS_FUNCTION(label,setMargin) } KVSO_CLASS_FUNCTION(label,margin) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) c->returnValue()->setInteger(((QLabel *)widget())->margin()); return true; } @@ -254,7 +254,7 @@ bool KviKvsObject_label::functionSetAutoResize(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) return true; - + } // FIX ME @@ -267,7 +267,7 @@ bool KviKvsObject_label::functionAutoResize(KviKvsObjectFunctionCall *c) KVSO_CLASS_FUNCTION(label,setAlignment) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QStringList alignment; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,alignment) @@ -275,7 +275,7 @@ KVSO_CLASS_FUNCTION(label,setAlignment) int align,sum=0; for ( QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it ) { - + align = 0; for(unsigned int j = 0; j < align_num; j++) { @@ -289,7 +289,7 @@ KVSO_CLASS_FUNCTION(label,setAlignment) sum = sum | align; else c->warning(__tr2qs_ctx("Unknown alignment '%Q'","objects"),&(*it)); - + } ((QLabel *)widget())->setAlignment((Qt::Alignment)sum); return true; @@ -297,7 +297,7 @@ KVSO_CLASS_FUNCTION(label,setAlignment) KVSO_CLASS_FUNCTION(label,alignment) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) int mode = ((QLabel *)widget())->alignment(); QString szAlignment=""; for(unsigned int i = 0; i < align_num; i++) @@ -314,14 +314,14 @@ KVSO_CLASS_FUNCTION(label,alignment) KVSO_CLASS_FUNCTION(label,clear) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) ((QLabel *)widget())->clear(); return true; } KVSO_CLASS_FUNCTION(label,setFrameStyle) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QStringList style; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("style",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,style) @@ -343,7 +343,7 @@ KVSO_CLASS_FUNCTION(label,setFrameStyle) sum = sum | framestyle; else c->warning(__tr2qs_ctx("Unknown style '%Q'","objects"),&(*it)); - + } ((QLabel *)widget())->setFrameStyle(sum); return true; @@ -351,7 +351,7 @@ KVSO_CLASS_FUNCTION(label,setFrameStyle) KVSO_CLASS_FUNCTION(label,frameStyle) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) int mode = ((QLabel *)widget())->frameStyle(); QString szStyle=""; for(unsigned int i = 0; i < frame_num; i++) @@ -368,7 +368,7 @@ KVSO_CLASS_FUNCTION(label,frameStyle) KVSO_CLASS_FUNCTION(label,setImage) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString icon; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("icon",KVS_PT_STRING,0,icon) diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index 39c342830..9423cdf7a 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -33,7 +33,7 @@ // Tables used in $setAlignment & $alignment const char * const align_tbl[] = { - "Left", + "Left", "Right", "HCenter", "VCenter", @@ -95,8 +95,8 @@ const int align_cod[] = { !fn: $setMargin(<margin:uint>) Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges. !fn: $setAlignment(<flag1:string>, <flag2:string>, ...) - Sets the alignment for widget w to flags, given as parameters. - Valid flags are:Right,Left,Top,Bottom,HCenter,VCenter,Center + Sets the alignment for widget w to flags, given as parameters. + Valid flags are:Right,Left,Top,Bottom,HCenter,VCenter,Center !fn: $setResizeMode(<resize_mode:string>) Sets the resize mode of the parent widget in relation to this layout. <mode> can be one of:[br] @@ -130,7 +130,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_layout) KVSO_END_CONSTRUCTOR(KviKvsObject_layout) -bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *) { QWidget * w = parentScriptWidget(); @@ -163,7 +163,7 @@ KVSO_CLASS_FUNCTION(layout,addWidget) KVSO_CLASS_FUNCTION(layout,addMultiCellWidget) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) KviKvsObject * pObject; kvs_hobject_t hObject; kvs_uint_t uStartCol,uStartRow,uEndCol,uEndRow; @@ -177,13 +177,13 @@ KVSO_CLASS_FUNCTION(layout,addMultiCellWidget) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); CHECK_HOBJECT_IS_WIDGET(pObject) // { addWidget(w, fromRow, fromCol, (toRow < 0) ? -1 : toRow - fromRow + 1, (toCol < 0) ? -1 : toCol - fromCol + 1, _align); } - ((QGridLayout *)object())->addWidget(((QWidget *)(pObject->object())),uStartRow, uStartCol,(uEndRow < 0) ? -1 : uEndRow - uStartRow + 1, (uEndCol < 0) ? -1 : uEndCol - uStartCol + 1); + ((QGridLayout *)object())->addWidget(((QWidget *)(pObject->object())),uStartRow, uStartCol, uEndRow - uStartRow + 1, uEndCol - uStartCol + 1); return true; } KVSO_CLASS_FUNCTION(layout,setRowStretch) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uRow,uStretch; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow) @@ -195,7 +195,7 @@ KVSO_CLASS_FUNCTION(layout,setRowStretch) KVSO_CLASS_FUNCTION(layout,setColumnStretch) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uCol,uStretch; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol) @@ -207,7 +207,7 @@ KVSO_CLASS_FUNCTION(layout,setColumnStretch) KVSO_CLASS_FUNCTION(layout,setMargin) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uMargin; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin) @@ -218,7 +218,7 @@ KVSO_CLASS_FUNCTION(layout,setMargin) KVSO_CLASS_FUNCTION(layout,setSpacing) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uSpacing; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing) @@ -229,7 +229,7 @@ KVSO_CLASS_FUNCTION(layout,setSpacing) KVSO_CLASS_FUNCTION(layout,addRowSpacing) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uSpacing,uRow; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow) @@ -242,7 +242,7 @@ KVSO_CLASS_FUNCTION(layout,addRowSpacing) KVSO_CLASS_FUNCTION(layout,addColSpacing) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uSpacing,uCol; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol) @@ -254,7 +254,7 @@ KVSO_CLASS_FUNCTION(layout,addColSpacing) KVSO_CLASS_FUNCTION(layout,setResizeMode) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szMode; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("resize_mode",KVS_PT_STRING,0,szMode) @@ -271,7 +271,7 @@ KVSO_CLASS_FUNCTION(layout,setResizeMode) KVSO_CLASS_FUNCTION(layout,setAlignment) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QStringList alignment; KviKvsObject * pObject; kvs_hobject_t hObject; @@ -304,7 +304,7 @@ KVSO_CLASS_FUNCTION(layout,setAlignment) sum = sum | align; else c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&(*it)); - + } if (widget()) ((QGridLayout *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum); return true; diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index 831508f5c..29dc29e7e 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -61,7 +61,7 @@ Sets the lcd number value. !fn: <boolean> $checkOverflow() Returns TRUE if num is too big to be displayed in its entirety; - otherwise returns FALSE. + otherwise returns FALSE. !fn: $setSmallDecimalPoint(<bflag:boolean>) Sets the the decimal point style, valid bool values are 1 or 0. !fn: <boolean> $checkOverflow(<number:integer>) @@ -69,7 +69,7 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_lcd,"lcdnumber","widget") - + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,displayStr) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,displayInt) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,displayDouble) @@ -89,7 +89,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_lcd) KVSO_END_CONSTRUCTOR(KviKvsObject_lcd) -bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_lcd::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QLCDNumber) return true; @@ -97,7 +97,7 @@ bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *p KVSO_CLASS_FUNCTION(lcd,displayInt) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_int_t iDigit; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("number",KVS_PT_INT,0,iDigit) @@ -108,7 +108,7 @@ KVSO_CLASS_FUNCTION(lcd,displayInt) KVSO_CLASS_FUNCTION(lcd,displayStr) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("number",KVS_PT_STRING,0,szText) @@ -119,7 +119,7 @@ KVSO_CLASS_FUNCTION(lcd,displayStr) KVSO_CLASS_FUNCTION(lcd,displayDouble) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_real_t dDigit; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("number",KVS_PT_DOUBLE,0,dDigit) @@ -130,7 +130,7 @@ KVSO_CLASS_FUNCTION(lcd,displayDouble) KVSO_CLASS_FUNCTION(lcd,setMode) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szMode; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("mode",KVS_PT_STRING,0,szMode) @@ -145,7 +145,7 @@ KVSO_CLASS_FUNCTION(lcd,setMode) KVSO_CLASS_FUNCTION(lcd,setSegmentStyle) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szStyle; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("style",KVS_PT_STRING,0,szStyle) @@ -159,7 +159,7 @@ KVSO_CLASS_FUNCTION(lcd,setSegmentStyle) KVSO_CLASS_FUNCTION(lcd,setNumDigits) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_real_t digit; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,digit) @@ -170,7 +170,7 @@ KVSO_CLASS_FUNCTION(lcd,setNumDigits) KVSO_CLASS_FUNCTION(lcd,setSmallDecimalPoint) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) bool bFlag; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bflag",KVS_PT_BOOLEAN,0,bFlag) @@ -181,7 +181,7 @@ KVSO_CLASS_FUNCTION(lcd,setSmallDecimalPoint) KVSO_CLASS_FUNCTION(lcd,checkOverflow) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_real_t iDigit; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,iDigit) diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index 607e7b9ae..74c6e2599 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -217,7 +217,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_lineedit) KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit) -bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) +bool KviKvsObject_lineedit::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QLineEdit) connect(widget(),SIGNAL(returnPressed()),this,SLOT(slotreturnPressed())); @@ -228,14 +228,14 @@ bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantLi KVSO_CLASS_FUNCTION(lineedit,text) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) c->returnValue()->setString(((QLineEdit *)widget())->text()); return true; } KVSO_CLASS_FUNCTION(lineedit,setText) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) @@ -245,7 +245,7 @@ KVSO_CLASS_FUNCTION(lineedit,setText) } KVSO_CLASS_FUNCTION(lineedit,setInputValidator) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szReg; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("reg_expression",KVS_PT_STRING,0,szReg) @@ -255,14 +255,14 @@ KVSO_CLASS_FUNCTION(lineedit,setInputValidator) } KVSO_CLASS_FUNCTION(lineedit,maxLength) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) c->returnValue()->setInteger(((QLineEdit *)widget())->maxLength()); return true; } KVSO_CLASS_FUNCTION(lineedit,setMaxLength) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iMaxlen; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("maxlen",KVS_PT_UNSIGNEDINTEGER,0,iMaxlen) @@ -273,14 +273,14 @@ KVSO_CLASS_FUNCTION(lineedit,setMaxLength) KVSO_CLASS_FUNCTION(lineedit,frame) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) c->returnValue()->setBoolean(((QLineEdit *)widget())->hasFrame()); return true; } KVSO_CLASS_FUNCTION(lineedit,setFrame) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) bool bFrame; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bframe",KVS_PT_BOOL,0,bFrame) @@ -291,14 +291,14 @@ KVSO_CLASS_FUNCTION(lineedit,setFrame) KVSO_CLASS_FUNCTION(lineedit,cursorPosition) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) c->returnValue()->setInteger(((QLineEdit *)widget())->cursorPosition()); return true; } KVSO_CLASS_FUNCTION(lineedit,setCursorPosition) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iPos; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("position",KVS_PT_UNSIGNEDINTEGER,0,iPos) @@ -309,14 +309,14 @@ KVSO_CLASS_FUNCTION(lineedit,setCursorPosition) KVSO_CLASS_FUNCTION(lineedit,selectAll) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) ((QLineEdit *)widget())->selectAll(); return true; } KVSO_CLASS_FUNCTION(lineedit,setSelection) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uStart,uLen; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("start",KVS_PT_UNSIGNEDINTEGER,0,uStart) @@ -328,28 +328,28 @@ KVSO_CLASS_FUNCTION(lineedit,setSelection) KVSO_CLASS_FUNCTION(lineedit,copy) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) ((QLineEdit *)widget())->copy(); return true; } KVSO_CLASS_FUNCTION(lineedit,cut) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) ((QLineEdit *)widget())->cut(); return true; } KVSO_CLASS_FUNCTION(lineedit,paste) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) ((QLineEdit *)widget())->paste(); return true; } KVSO_CLASS_FUNCTION(lineedit,echoMode) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) int mode = ((QLineEdit *)widget())->echoMode(); QString szEchomode=""; for(unsigned int i = 0; i < mode_num; i++) @@ -366,7 +366,7 @@ KVSO_CLASS_FUNCTION(lineedit,echoMode) KVSO_CLASS_FUNCTION(lineedit,setEchoMode) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szMode; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("mode",KVS_PT_STRING,0,szMode) @@ -386,7 +386,7 @@ KVSO_CLASS_FUNCTION(lineedit,setEchoMode) KVSO_CLASS_FUNCTION(lineedit,clear) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) ((QLineEdit *)widget())->clear(); return true; } @@ -394,7 +394,7 @@ KVSO_CLASS_FUNCTION(lineedit,clear) //-| Grifisx & Noldor |-Start: KVSO_CLASS_FUNCTION(lineedit,dragAndDrop) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) @@ -405,7 +405,7 @@ KVSO_CLASS_FUNCTION(lineedit,dragAndDrop) KVSO_CLASS_FUNCTION(lineedit,setReadOnly) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bReadonly",KVS_PT_BOOL,0,bEnabled) @@ -416,7 +416,7 @@ KVSO_CLASS_FUNCTION(lineedit,setReadOnly) KVSO_CLASS_FUNCTION(lineedit,setInputMask) { - CHECK_INTERNAL_POINTER(widget()) + CHECK_INTERNAL_POINTER(widget()) QString szMask; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("mask",KVS_PT_STRING,0,szMask) diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp index 3a877722d..89519d441 100644 --- a/src/modules/objects/class_listwidget.cpp +++ b/src/modules/objects/class_listwidget.cpp @@ -95,7 +95,7 @@ !fn: <index:integer> $onItemEvent()
This function is called by KVIrc when the current item pointed by the mouse changes and gives in $0 the item index.
!fn: <array:x,y,width,height> $itemRect(<item:index>)
- Returns the rectangle on the screen that item occupies, or an invalid rectangle if item is 0 or is not currently visible.
+ Returns the rectangle on the screen that item occupies, or an invalid rectangle if item is 0 or is not currently visible.
@signals:
!sg: <string> $currentItemChanged()
@@ -145,7 +145,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_listwidget) KVSO_END_CONSTRUCTOR(KviKvsObject_listwidget)
-bool KviKvsObject_listwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
+bool KviKvsObject_listwidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
{
SET_OBJECT(QListWidget)
obj->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -188,7 +188,7 @@ KVSO_CLASS_FUNCTION(listwidget,changeItem) if (szText.isEmpty()) c->warning(__tr2qs_ctx("No string parameter given - using empty string","objects"));
if(iIndex >= (cnt = ((QListWidget *)widget())->count()))
{
- c->warning(__tr2qs("Item index [%d] is too big - defaulting to "
+ c->warning(__tr2qs("Item index [%d] is too big - defaulting to "
"$count() - 1 [%d]"), iIndex, cnt);
iIndex = cnt - 1;
}
@@ -298,7 +298,7 @@ KVSO_CLASS_FUNCTION(listwidget,insertWidgetItem) KVSO_PARAMETER("index",KVS_PT_INT,0,iIndex)
KVSO_PARAMETERS_END(c)
pObject=KviKvsKernel::instance()->objectController()->lookupObject(hWid);
- if(pObject==this)
+ if(pObject==this)
{
c->warning(__tr2qs_ctx("Can't insert the listwidget itself!","objects"));
return true;
@@ -391,7 +391,7 @@ KVSO_CLASS_FUNCTION(listwidget,itemEnteredEvent) }
//slots
-void KviKvsObject_listwidget::currentItemChanged(QListWidgetItem *currentItem,QListWidgetItem *previousItem)
+void KviKvsObject_listwidget::currentItemChanged(QListWidgetItem *currentItem,QListWidgetItem *)
{
if (!currentItem) callFunction(this,"currentItemChangeEvent",0,0);
else
@@ -403,7 +403,6 @@ void KviKvsObject_listwidget::currentItemChanged(QListWidgetItem *currentItem,QL }
void KviKvsObject_listwidget::selectionChanged()
{
- KviKvsVariantList *params=0;
callFunction(this,"selectionChangeEvent",0,0);
}
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index 01fe8421c..903909b8e 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -67,7 +67,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_mainwindow) KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow) -bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext *,KviKvsVariantList *) { setObject(new KviTalMainWindow(parentScriptWidget(), getName().toUtf8().data()), true); return true; @@ -98,7 +98,7 @@ KVSO_CLASS_FUNCTION(mainwindow,setCentralWidget) return TRUE; } ((KviTalMainWindow *)widget())->setCentralWidget(((QWidget *)(pObject->object()))); - return true; + return true; } //FIX ME KVSO_CLASS_FUNCTION(mainwindow,setDockEnabled) @@ -129,6 +129,6 @@ KVSO_CLASS_FUNCTION(mainwindow,isDockEnabled) KVSO_PARAMETER("dock_area",KVS_PT_STRING,0,szDockarea) KVSO_PARAMETERS_END(c) c->returnValue()->setBoolean(bFlag); - return true; + return true; } diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp index d731af67e..93b79fdb9 100644 --- a/src/modules/objects/class_menubar.cpp +++ b/src/modules/objects/class_menubar.cpp @@ -40,7 +40,7 @@ [class]object[/class] [class]widget[/class] @description: - + @functions: !fn: <integer> $insertItem(<text:string>) Returns an integer that identifies the inserted item. @@ -59,7 +59,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_menubar) KVSO_END_CONSTRUCTOR(KviKvsObject_menubar) -bool KviKvsObject_menubar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) +bool KviKvsObject_menubar::init(KviKvsRunTimeContext *,KviKvsVariantList *) { SET_OBJECT(QMenuBar) return true; diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 7e6c5a3fb..8a0e6db75 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -85,13 +85,13 @@ static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx); -static bool objects_module_cleanup(KviModule *m) +static bool objects_module_cleanup(KviModule *) { // Don't attempt to change the order of these calls. // Derived classes must be unregistered before the base ones. - + KviKvsObject_memorybuffer::unregisterSelf(); - + KviKvsObject_process::unregisterSelf(); KviKvsObject_ftp::unregisterSelf(); KviKvsObject_http::unregisterSelf(); @@ -487,7 +487,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c) KviKvsArray * pArry = new KviKvsArray(); c->returnValue()->setArray(pArry); - int uIdx=0; + KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict()); KviPointerHashTable<QString,bool> *classdict=new KviPointerHashTable<QString,bool>; classdict->setAutoDelete(false); @@ -654,7 +654,6 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c) return true; } - QImage * imgSource=0; QPaintDevice * pdSource = 0; if(obSrc->inheritsClass("pixmap")) pdSource =((KviKvsObject_pixmap *)obSrc)->getPixmap(); @@ -795,11 +794,9 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c) QRgb * fgn = (QRgb *)img_fore->scanLine(y+iFoY); fgn += iFoX; double dRemaining = 1.0 - dBlend; - int a=0; + while(dst < end) { - - *dst = qRgba( (int)((qRed(*bkg) * dRemaining) + (qRed(*fgn) * dBlend)), (int)((qGreen(*bkg) * dRemaining) + (qGreen(*fgn) * dBlend)), @@ -811,8 +808,6 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c) bkg++; fgn++; } - - } QPainter p(pdDest); QRect rect(iDesX,iDesY,buffer.width(),buffer.height()); |
