summaryrefslogtreecommitdiffstats
path: root/src/modules/dockwidget/libkvidockwidget_qt3.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/dockwidget/libkvidockwidget_qt3.cpp')
-rw-r--r--src/modules/dockwidget/libkvidockwidget_qt3.cpp90
1 files changed, 45 insertions, 45 deletions
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index bf7baaeb..c2f0a269 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -88,7 +88,7 @@
#endif
#endif
-extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict;
+extern KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict;
static KviPointerList<KviDockWidget> * g_pDockWidgetList = 0;
static TQPixmap * g_pDock1 = 0;
@@ -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()) );
@@ -380,7 +380,7 @@ void KviDockWidget::doAway(int id)
{
if(id<0)
{
- KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
+ KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict);
while(KviWindow * wnd = it.current())
{
if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
@@ -425,7 +425,7 @@ void KviDockWidget::fillContextPopup()
int iSeparator=m_pAwayPopup->insertSeparator();
- KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
+ KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict);
bool bAllAway=1;
bool bAllUnaway=1;
int iNetCount=0;
@@ -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<unsigned int>(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(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iConsoles=2;
- else if(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(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iChannels=2;
- else if(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(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iQueries=2;
- else if(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(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iOther=2;
- else if(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);
}
}