From e7c2992a48fdd1292571214f31e7f367dd61a1cc Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 21 Jan 2026 20:50:13 +0900 Subject: Improvements suggested on PR #58 Signed-off-by: Michele Calgaro --- src/kvilib/core/kvi_string.cpp | 4 +- .../kernel/kvi_ircconnectiontargetresolver.cpp | 2 +- src/kvirc/ui/kvi_taskbar.cpp | 2 +- src/modules/dockwidget/libkvidockwidget_qt3.cpp | 84 +++++++++++----------- src/modules/dockwidget/libkvidockwidget_qt3.h | 8 +-- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp index 4f5b50c5..0d0b1750 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 <= static_cast(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 <= static_cast(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(); \ diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index 0b6eeb5c..35da8700 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -493,8 +493,8 @@ void KviIrcConnectionTargetResolver::haveServerIp() m_pConsole->output(KVI_OUT_SYSTEMWARNING, __tr2qs("The system-wide IPv6 bind address (%s) is not valid"), KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).utf8().data()); - KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress) = false; } + KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress) = false; } else { // this is an interface address: might be down if(!_OUTPUT_MUTE) diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index ee23e6f8..e65c26c2 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -642,7 +642,7 @@ void KviClassicTaskBar::doLayout() if((btnInRow == btnsInRow) || (totCount == 1))theWidth = baseWidth - theX; } - if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (static_cast(theWidth) > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) && + if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > static_cast(KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth))) && (orientation() == TQt::Horizontal) ) theWidth = KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth); diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 6cb0dd99..6be987b1 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -104,10 +104,10 @@ static TQPixmap * g_pDock3 = 0; KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) : TQWidget(0,name) { - m_iConsoles = 0; - m_iChannels = 0; - m_iQueries = 0; - m_iOther = 0; + m_uConsoles = 0; + m_uChannels = 0; + m_uQueries = 0; + m_uOther = 0; m_pFlashingTimer = new TQTimer(this,"flashing_timer"); connect( m_pFlashingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flashingTimerShot()) ); @@ -491,13 +491,13 @@ void KviDockWidget::refresh() // how to copy transparency???? delete g_pCurrentPixmap; g_pCurrentPixmap=new TQPixmap(16,16); - bitBlt(g_pCurrentPixmap,0,0,m_iOther ? ((m_iOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,0,8,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,8,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,8,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,0,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,8,8,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,8,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,0,0,m_uOther ? ((m_uOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,0,8,m_uConsoles ? ((m_uConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,8,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,8,0,m_uQueries ? ((m_uQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,0,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,8,8,m_uChannels ? ((m_uChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,8,8,8,TQt::ClearROP); #endif - if( (m_iChannels == 2) || (m_iQueries == 2) ) + if( (m_uChannels == 2) || (m_uQueries == 2) ) { if(!m_pFlashingTimer->isActive() && KVI_OPTION_BOOL(KviOption_boolEnableTrayIconFlashing) ) m_pFlashingTimer->start(1000); } else { @@ -528,56 +528,56 @@ void KviDockWidget::grabActivityInfo() KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)=KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage); } - m_iConsoles = 0; - m_iChannels = 0; - m_iQueries = 0; - m_iOther = 0; + m_uConsoles = 0; + m_uChannels = 0; + m_uQueries = 0; + m_uOther = 0; for(KviTaskBarItem * b = t->firstItem();b;b = t->nextItem()) { if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification)) { - int iLevel = b->highlightLevel(); + unsigned int uLevel = static_cast(b->highlightLevel()); switch(b->kviWindow()->type()) { case KVI_WINDOW_TYPE_CONSOLE: - if(m_iConsoles < iLevel) m_iConsoles = iLevel; + if(m_uConsoles < uLevel) m_uConsoles = uLevel; break; case KVI_WINDOW_TYPE_CHANNEL: - if(m_iChannels < iLevel) m_iChannels = iLevel; + if(m_uChannels < uLevel) m_uChannels = uLevel; break; case KVI_WINDOW_TYPE_QUERY: - if(m_iQueries < iLevel) m_iQueries = iLevel; + if(m_uQueries < uLevel) m_uQueries = uLevel; break; default: - if(m_iOther < iLevel) m_iOther = iLevel; + if(m_uOther < uLevel) m_uOther = uLevel; break; } } else { - int iLevel=0; + int uLevel=0; if(b->kviWindow()->view()) { if(b->kviWindow()->view()->haveUnreadedHighlightedMessages()) { - iLevel=2; + uLevel=2; } else if(b->kviWindow()->view()->haveUnreadedMessages()) { - iLevel=1; + uLevel=1; } - if(iLevel>0) + if(uLevel>0) switch(b->kviWindow()->type()) { case KVI_WINDOW_TYPE_CONSOLE: - if(m_iConsoles < iLevel) m_iConsoles = iLevel; + if(m_uConsoles < uLevel) m_uConsoles = uLevel; break; case KVI_WINDOW_TYPE_CHANNEL: - if(m_iChannels < iLevel) m_iChannels = iLevel; + if(m_uChannels < uLevel) m_uChannels = uLevel; break; case KVI_WINDOW_TYPE_QUERY: - if(m_iQueries < iLevel) m_iQueries = iLevel; + if(m_uQueries < uLevel) m_uQueries = uLevel; break; default: - if(m_iOther < iLevel) m_iOther = iLevel; + if(m_uOther < uLevel) m_uOther = uLevel; break; } } @@ -586,21 +586,21 @@ void KviDockWidget::grabActivityInfo() if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification)) { - 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_uConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uConsoles=2; + else if(m_uConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uConsoles=1; + else m_uConsoles=0; - 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_uChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uChannels=2; + else if(m_uChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uChannels=1; + else m_uChannels=0; - 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_uQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uQueries=2; + else if(m_uQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uQueries=1; + else m_uQueries=0; - 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; + if(m_uOther >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uOther=2; + else if(m_uOther >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uOther=1; + else m_uOther=0; } } @@ -611,10 +611,10 @@ void KviDockWidget::paintEvent(TQPaintEvent * event) erase(); bitBlt(this,4,4,g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE),0,0,16,16); } else { - bitBlt(this,0,0,m_iOther ? ((m_iOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,12,12,TQt::CopyROP,false); - bitBlt(this,0,12,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,12,12,12,TQt::CopyROP,false); - bitBlt(this,12,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,0,12,12,TQt::CopyROP,false); - bitBlt(this,12,12,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,12,12,12,TQt::CopyROP,false); + bitBlt(this,0,0,m_uOther ? ((m_uOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,12,12,TQt::CopyROP,false); + bitBlt(this,0,12,m_uConsoles ? ((m_uConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,12,12,12,TQt::CopyROP,false); + bitBlt(this,12,0,m_uQueries ? ((m_uQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,0,12,12,TQt::CopyROP,false); + bitBlt(this,12,12,m_uChannels ? ((m_uChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,12,12,12,TQt::CopyROP,false); } } diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.h b/src/modules/dockwidget/libkvidockwidget_qt3.h index 2ec3c268..4259ce66 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.h +++ b/src/modules/dockwidget/libkvidockwidget_qt3.h @@ -60,10 +60,10 @@ protected: bool m_bFlashed; TQTimer* m_pFlashingTimer; - int m_iConsoles; - int m_iChannels; - int m_iQueries; - int m_iOther; + unsigned int m_uConsoles; + unsigned int m_uChannels; + unsigned int m_uQueries; + unsigned int m_uOther; public: KviFrame * frame(){ return m_pFrm; }; public: -- cgit v1.2.3