From 562f8a766971f1065711dd14c0d22a785c20ed21 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 18 Jan 2026 14:19:51 +0900 Subject: Fix invalid comparison warnings Signed-off-by: Michele Calgaro --- src/kvilib/core/kvi_qstring.cpp | 8 ++++---- src/kvilib/core/kvi_string.cpp | 6 +++--- src/kvilib/ext/kvi_doublebuffer.cpp | 10 ++++++---- src/kvilib/file/kvi_fileutils.cpp | 2 +- src/kvilib/irc/kvi_avatar.cpp | 4 ++-- src/kvilib/net/kvi_http.cpp | 7 ++++--- src/kvirc/kernel/kvi_app.cpp | 2 +- src/kvirc/kernel/kvi_coreactions.cpp | 2 +- src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp | 14 +++++++------- src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp | 2 +- src/kvirc/ui/kvi_channel.cpp | 2 +- src/kvirc/ui/kvi_input.cpp | 2 +- src/kvirc/ui/kvi_modew.cpp | 6 +++--- src/kvirc/ui/kvi_taskbar.cpp | 4 ++-- src/kvirc/ui/kvi_userlistview.cpp | 8 ++++---- src/modules/dockwidget/libkvidockwidget_qt3.cpp | 16 ++++++++-------- src/modules/notifier/notifierwindowtabs.cpp | 2 +- src/modules/objects/class_multilineedit.cpp | 2 +- src/modules/objects/class_pixmap.cpp | 6 +++--- src/modules/objects/class_wrapper.cpp | 2 +- src/modules/options/dialog.cpp | 2 +- src/modules/str/libkvistr.cpp | 2 +- src/modules/tmphighlight/libkvitmphighlight.cpp | 6 +++--- 23 files changed, 60 insertions(+), 57 deletions(-) diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp index b3b22e7..829b673 100644 --- a/src/kvilib/core/kvi_qstring.cpp +++ b/src/kvilib/core/kvi_qstring.cpp @@ -363,7 +363,7 @@ namespace KviTQString TQString getToken(TQString &szString,const TQChar &sep) { - int i=0; + unsigned int i=0; while(i < szString.length()) { if(szString[i] == sep)break; @@ -389,7 +389,7 @@ namespace KviTQString void stripRightWhiteSpace(TQString &s) { - int iRemove = 0; + unsigned int iRemove = 0; while(iRemove < s.length()) { if(s.at(s.length() - (iRemove + 1)).isSpace())iRemove++; @@ -400,7 +400,7 @@ namespace KviTQString void stripRight(TQString &s,const TQChar &c) { - int iRemove = 0; + unsigned int iRemove = 0; while(iRemove < s.length()) { if(s.at(s.length() - (iRemove + 1)) == c)iRemove++; @@ -411,7 +411,7 @@ namespace KviTQString void stripLeft(TQString &s,const TQChar &c) { - int iRemove = 0; + unsigned int iRemove = 0; while(iRemove < s.length()) { if(s[iRemove] == c) diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp index 72d6951..4f5b50c 100644 --- a/src/kvilib/core/kvi_string.cpp +++ b/src/kvilib/core/kvi_string.cpp @@ -98,7 +98,7 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str) { \ KviStr * pString = kvi_va_arg(list,KviStr *); \ char * argString = pString->ptr(); \ - if(len <= ((int)(pString->len())))return (-1); \ + if(len <= static_cast(pString->len()))return (-1); \ while(*argString)*p++ = *argString++; \ len -= pString->len(); \ } \ @@ -108,7 +108,7 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str) TQString * pString = kvi_va_arg(list,TQString *); \ if(pString->length() > 0) \ { \ - if(len <= ((int)(pString->length())))return (-1); \ + if(len <= static_cast(pString->length()))return (-1); \ _WSTRING_WMEMCPY(p,pString->unicode(),pString->length()); \ p += pString->length(); \ len -= pString->length(); \ @@ -711,7 +711,7 @@ int kvi_vsnprintf(char *buffer,int len,const char *fmt,kvi_va_list list) } while((argValue = tmp)); //copy now.... argUValue = pNumBuf - numberBuffer; //length of the number string - if(((uint)len) <= argUValue)return (-1); //not enough space for number and terminator + if(((unsigned int)len) <= argUValue)return (-1); //not enough space for number and terminator do { *p++ = *--pNumBuf; } while(pNumBuf != numberBuffer); len -= argUValue; continue; diff --git a/src/kvilib/ext/kvi_doublebuffer.cpp b/src/kvilib/ext/kvi_doublebuffer.cpp index 0f15dca..cea8268 100644 --- a/src/kvilib/ext/kvi_doublebuffer.cpp +++ b/src/kvilib/ext/kvi_doublebuffer.cpp @@ -32,12 +32,14 @@ static unsigned int g_uMaxRequestedHeight = 0; KviDoubleBuffer::KviDoubleBuffer(unsigned int uWidth,unsigned int uHeight) { - if((g_pMemoryPixmap->width() < uWidth) || (g_pMemoryPixmap->height() < uHeight)) + unsigned int uPixmapWidth = static_cast(g_pMemoryPixmap->width()); + unsigned int uPixmapHeight = static_cast(g_pMemoryPixmap->height()); + if(uPixmapWidth < uWidth || uPixmapHeight < uHeight) { // The memory buffer is too small // There is either no such user requirement or it has grown by the meantime - unsigned int uMaxW = uWidth > g_pMemoryPixmap->width() ? uWidth : g_pMemoryPixmap->width(); - unsigned int uMaxH = uHeight > g_pMemoryPixmap->height() ? uHeight : g_pMemoryPixmap->height(); + unsigned int uMaxW = uWidth > uPixmapWidth ? uWidth : uPixmapWidth; + unsigned int uMaxH = uHeight > uPixmapHeight ? uHeight : uPixmapHeight; g_pMemoryPixmap->resize(uMaxW,uMaxH); } @@ -70,7 +72,7 @@ void KviDoubleBuffer::done() void KviDoubleBuffer::heartbeat() { - if(((g_uMaxRequestedHeight + 64) < g_pMemoryPixmap->height()) || ((g_uMaxRequestedWidth + 64) < g_pMemoryPixmap->width())) + if((g_uMaxRequestedHeight + 64) < static_cast(g_pMemoryPixmap->height()) || (g_uMaxRequestedWidth + 64) < static_cast(g_pMemoryPixmap->width())) { // do shrink :) g_pMemoryPixmap->resize(g_uMaxRequestedWidth,g_uMaxRequestedHeight); diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp index 9bea5c9..d97f398 100644 --- a/src/kvilib/file/kvi_fileutils.cpp +++ b/src/kvilib/file/kvi_fileutils.cpp @@ -441,7 +441,7 @@ void kvi_encodeFileName(TQString & path) { TQString src(path); path=""; - for(int i=0;i m_pBuffer->size())uProcessSize = m_pBuffer->size(); + unsigned int uBufferSize = static_cast(m_pBuffer->size()); + if(uProcessSize > uBufferSize)uProcessSize = uBufferSize; m_uRemainingChunkSize -= uProcessSize; switch(m_eProcessingType) { case Blocks: - if(m_pBuffer->size() == uProcessSize) + if(uBufferSize == uProcessSize) { // avoid copying to a new buffer emit binaryData(*m_pBuffer); @@ -748,7 +749,7 @@ void KviHttpRequest::processData(KviDataBuffer * data) } break; case Lines: - if(m_pBuffer->size() == uProcessSize) + if(uBufferSize == uProcessSize) { // avoid copying to a new buffer emitLines(m_pBuffer); diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 7071482..09f94c4 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -1730,7 +1730,7 @@ KviWindow * KviApp::findWindowByCaption(const TQString &windowCaption,int iConte while(it.current()) { if(KviTQString::equalCI(windowCaption,it.current()->plainTextCaption()) && - (iContextId==-1 || it.current()->context()->id() == iContextId)) + (iContextId==-1 || it.current()->context()->id() == static_cast(iContextId))) return it.current(); ++it; } diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index e37fb3a..240c1da 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -959,7 +959,7 @@ void KviChangeUserModeAction::popupActivated(int id) if(idx != -1) { idx++; - if(idx < text.length()) + if(static_cast(idx) < text.length()) { TQChar m = text[idx]; TQString command = "mode "; diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp index 0040b53..b73bd48 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp @@ -97,7 +97,7 @@ void KviIrcConnectionServerInfo::buildModePrefixTable() // Pragma: FIXME: The whole mode handling needs rethinking! // Alexey: FIXED: rethinked:) // Pragma: LOL :DDDD - int i=0; + unsigned int i=0; while( (uPrefix = cPrefix->unicode()) && (uFlag = cFlag->unicode()) && i *l) { KviStr masks; KviStr flags; - unsigned int count = 0; + int count = 0; for(KviMaskEntry * e = l->first();e;e = l->next()) { if(masks.hasData())masks.append(' '); diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index eab2323..5b3101e 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -1982,7 +1982,7 @@ void KviInputEditor::home() void KviInputEditor::insertChar(TQChar c) { - if(m_szTextBuffer.length() >= m_iMaxBufferSize)return; + if(m_szTextBuffer.length() >= static_cast(m_iMaxBufferSize))return; // Kill the selection if((m_iSelectionBegin > -1) || (m_iSelectionEnd > -1)) diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 7f8df43..9e0519f 100644 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -137,7 +137,7 @@ void KviModeWidget::editorReturnPressed() TQString szCurModes=m_pChannel->channelMode(); TQString szNewModes=m_pLineEdit->text(); TQString szMinusModes; - for(int i=0; iconnection()->serverInfo()->supportedPlainModes().contains(szText[i]) || - szText.find(szText[i])(i) ) szText.remove(i,1); } m_pLineEdit->setText(szText); diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 64a857a..ee23e6f 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -613,7 +613,7 @@ void KviClassicTaskBar::doLayout() if ((orientation() == TQt::Horizontal) && - (((unsigned int)rows) > m_pBase->height() / m_iButtonHeight )) + (rows > m_pBase->height() / m_iButtonHeight )) { rows = m_pBase->height() / m_iButtonHeight; } @@ -642,7 +642,7 @@ void KviClassicTaskBar::doLayout() if((btnInRow == btnsInRow) || (totCount == 1))theWidth = baseWidth - theX; } - if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) && + if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (static_cast(theWidth) > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) && (orientation() == TQt::Horizontal) ) theWidth = KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth); diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index 7fb4b49..e3df658 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -162,8 +162,8 @@ void KviUserListEntry::recalcSize() if( KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || - (av->pixmap()->width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || - (av->pixmap()->height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) + (static_cast(av->pixmap()->width()) > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || + (static_cast(av->pixmap()->height()) > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) ) ) { @@ -1549,8 +1549,8 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) if( KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || - (av->pixmap()->width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || - (av->pixmap()->height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) + (static_cast(av->pixmap()->width()) > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || + (static_cast(av->pixmap()->height()) > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) ) ) pix=av->scaledPixmap(KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth),KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)); diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index bf7baae..6cb0dd9 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -586,20 +586,20 @@ void KviDockWidget::grabActivityInfo() if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification)) { - if(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iConsoles=2; - else if(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iConsoles=1; + if(static_cast(m_iConsoles) >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iConsoles=2; + else if(static_cast(m_iConsoles) >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iConsoles=1; else m_iConsoles=0; - if(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iChannels=2; - else if(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iChannels=1; + if(static_cast(m_iChannels) >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iChannels=2; + else if(static_cast(m_iChannels) >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iChannels=1; else m_iChannels=0; - if(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iQueries=2; - else if(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iQueries=1; + if(static_cast(m_iQueries) >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iQueries=2; + else if(static_cast(m_iQueries) >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iQueries=1; else m_iQueries=0; - if(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iOther=2; - else if(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iOther=1; + if(static_cast(m_iOther) >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iOther=2; + else if(static_cast(m_iOther) >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iOther=1; else m_iOther=0; } } diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index faf10ba..dd178cc 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -85,7 +85,7 @@ void KviNotifierWindowTab::setNextMessageAsCurrent() void KviNotifierWindowTab::setPrevMessageAsCurrent() { if(!m_pCurrentMessage)return; - if(!m_pMessageList->findRef(m_pCurrentMessage) == -1)return; + if(m_pMessageList->findRef(m_pCurrentMessage) == -1)return; m_pCurrentMessage = m_pMessageList->prev(); if(!m_pCurrentMessage)m_pCurrentMessage = m_pMessageList->first(); } diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 75cbc55..7348fa6 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -410,7 +410,7 @@ bool KviKvsObject_mledit::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 > ((KviTalMultiLineEdit *)widget())->numLines()) + if(iLine < 0 || iCol < 0 || iLine > static_cast(((KviTalMultiLineEdit *)widget())->numLines())) c->warning("No such line number"); else ((KviTalMultiLineEdit *)widget())->insertAt(szInsert,iLine,iCol); diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index e5c7223..f9891f0 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -223,7 +223,7 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) if (bPixmapModified) { *m_pImage=m_pPixmap->convertToImage(); } - if (uWidth>buffer->width() || uHeight>buffer->height()) + if (uWidth>static_cast(buffer->width()) || uHeight>static_cast(buffer->height())) { c->warning(__tr2qs("Area dimensions are out of destination size ")); return true; @@ -246,12 +246,12 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) } -if(uXoffset+uWidth>m_pImage->width()) +if(uXoffset+uWidth>static_cast(m_pImage->width())) { c->warning(__tr2qs("Offset width area is out of pixmap size ")); return true; } - if( uYoffset+uHeight>m_pImage->height()) + if( uYoffset+uHeight>static_cast(m_pImage->height())) { c->warning(__tr2qs("Offset height area is out of pixmap size ")); return true; diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 74dcc8f..53bcb26 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -121,7 +121,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis tqDebug ("ci sono i parametri"); TQWidget *pWidget = 0; - int i=0; + unsigned int i=0; while(i!=pParams->count()) { TQString szClass; diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 4dd1750..f19138e 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -333,7 +333,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt if(!szText.isEmpty()) { bool bOk = true; - for(int j=0;jwindow()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; @@ -95,7 +95,7 @@ static bool tmphighlight_kvs_cmd_remove(KviKvsModuleCommandCall * c) KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSM_PARAMETERS_END(c) if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; @@ -133,7 +133,7 @@ static bool tmphighlight_kvs_fnc_ishighlighted(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSM_PARAMETERS_END(c) if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; -- cgit v1.2.3