diff options
Diffstat (limited to 'src/modules/dockwidget/libkvidockwidget_qt3.cpp')
| -rw-r--r-- | src/modules/dockwidget/libkvidockwidget_qt3.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 08bae43f..78a1a28b 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -21,7 +21,6 @@ // #include "kvi_settings.h" -#ifndef COMPILE_USE_QT4 #include "kvi_app.h" #include "kvi_module.h" @@ -123,17 +122,12 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) createTaskbarIcon(); #else //!COMPILE_ON_WINDOWS setMinimumSize(22,22); - #ifndef COMPILE_USE_QT4 - setBackgroundMode(X11ParentRelative); - #endif + setBackgroundMode(X11ParentRelative); #ifdef COMPILE_TDE_SUPPORT KWin::setSystemTrayWindowFor(winId(),frm->winId()); #endif #endif //!COMPILE_ON_WINDOWS -#ifdef COMPILE_USE_QT4 - m_pSysTrayIcon = new TQSystemTrayIcon(m_pFrm); -#endif m_pTip = new KviDynamicToolTip(this,"dock_tooltip"); connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); @@ -145,12 +139,10 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) m_pContextPopup->insertTitle(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("KVIrc")); #else m_pContextPopup = new KviTalPopupMenu(this); -#ifndef COMPILE_USE_QT4 TQLabel * l = new TQLabel(__tr2qs("KVIrc"),m_pContextPopup); l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); m_pContextPopup->insertItem(l); #endif -#endif m_pContextPopup->setCaption(__tr2qs("Context")); m_iAwayMenuId = m_pContextPopup->insertItem ( __tr2qs("Away"), m_pAwayPopup); m_pContextPopup->changeItem(m_iAwayMenuId,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),__tr2qs("Away")); @@ -614,19 +606,6 @@ void KviDockWidget::grabActivityInfo() void KviDockWidget::paintEvent(TQPaintEvent * event) { -#ifdef COMPILE_USE_QT4 - TQPainter thisRestrictionOfTQt4IsNotNice(this); - if(m_bFlashed) - { - erase(); - thisRestrictionOfTQt4IsNotNice.drawPixmap(4,4,16,16,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),0,0,16,16); - } else { - thisRestrictionOfTQt4IsNotNice.drawPixmap(0,0,12,12,m_iOther ? ((m_iOther == 2) ? *g_pDock3 : *g_pDock2) : *g_pDock1,0,0,12,12); - thisRestrictionOfTQt4IsNotNice.drawPixmap(0,12,12,12,m_iConsoles ? ((m_iConsoles == 2) ? *g_pDock3 : *g_pDock2) : *g_pDock1,0,12,12,12); - thisRestrictionOfTQt4IsNotNice.drawPixmap(12,0,12,12,m_iQueries ? ((m_iQueries == 2) ? *g_pDock3 : *g_pDock2) : *g_pDock1,12,0,12,12); - thisRestrictionOfTQt4IsNotNice.drawPixmap(12,12,12,12,m_iChannels ? ((m_iChannels == 2) ? *g_pDock3 : *g_pDock2) : *g_pDock1,12,12,12,12); - } -#else if(m_bFlashed) { erase(); @@ -637,7 +616,6 @@ void KviDockWidget::paintEvent(TQPaintEvent * event) bitBlt(TQT_TQPAINTDEVICE(this),12,0,TQT_TQPAINTDEVICE(m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1),12,0,12,12,TQt::CopyROP,false); bitBlt(TQT_TQPAINTDEVICE(this),12,12,TQT_TQPAINTDEVICE(m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1),12,12,12,12,TQt::CopyROP,false); } -#endif } @@ -853,4 +831,3 @@ KVIRC_MODULE( #include "libkvidockwidget_qt3.moc" -#endif |