diff options
Diffstat (limited to 'src/kvirc')
-rw-r--r-- | src/kvirc/ui/kvi_channel.cpp | 6 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_colorwin.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_console.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_customtoolbar.cpp | 12 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_debugwindow.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_frame.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_input.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_irctoolbar.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_ircview.cpp | 46 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_mdichild.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_mdimanager.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_query.cpp | 6 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_statusbar.cpp | 6 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_statusbarapplet.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_taskbar.cpp | 20 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_taskbar.h | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_toolbar.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_topicw.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_userlistview.cpp | 8 |
19 files changed, 68 insertions, 68 deletions
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index b9971038..a927e362 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -116,7 +116,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // Button box m_pButtonBox = new KviTalHBox(this); - m_pTopSplitter = new TQSplitter(Qt::Horizontal,m_pButtonBox); + m_pTopSplitter = new TQSplitter(TQt::Horizontal,m_pButtonBox); m_pButtonBox->setStretchFactor(m_pTopSplitter,1); @@ -134,11 +134,11 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name createTextEncodingButton(m_pButtonContainer); // Central splitter - m_pSplitter = new TQSplitter(Qt::Horizontal,this); + m_pSplitter = new TQSplitter(TQt::Horizontal,this); m_pSplitter->setName(name); m_pSplitter->setOpaqueResize(false); // Spitted vertially on the left - m_pVertSplitter = new TQSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter = new TQSplitter(TQt::Vertical,m_pSplitter); m_pVertSplitter->setOpaqueResize(false); // With the IRC view over m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp index 23f5136c..c4cef8ae 100644 --- a/src/kvirc/ui/kvi_colorwin.cpp +++ b/src/kvirc/ui/kvi_colorwin.cpp @@ -95,8 +95,8 @@ void KviColorWindow::mousePressEvent(TQMouseEvent *e) int ascii=key+48; str.setNum(key); if (e->x()>36 && e->y()>18) - if(m_pOwner) g_pApp->sendEvent(m_pOwner,new TQKeyEvent(TQEvent::KeyPress,TQt::Key_1,49,Qt::NoButton,"1")); - if(m_pOwner) g_pApp->sendEvent(m_pOwner,new TQKeyEvent(TQEvent::KeyPress,key,ascii,Qt::NoButton,str)); + if(m_pOwner) g_pApp->sendEvent(m_pOwner,new TQKeyEvent(TQEvent::KeyPress,TQt::Key_1,49,TQt::NoButton,"1")); + if(m_pOwner) g_pApp->sendEvent(m_pOwner,new TQKeyEvent(TQEvent::KeyPress,key,ascii,TQt::NoButton,str)); if(m_iTimerId != -1) killTimer(m_iTimerId); hide(); diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index ba7f5606..f8cae843 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -137,7 +137,7 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags) connect(g_pApp,TQT_SIGNAL(recentUrlsChanged()),this,TQT_SLOT(recentUrlsChanged())); - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index f398bd40..2af3c95f 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -57,7 +57,7 @@ KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,c TQSize KviCustomToolBarSeparator::sizeHint() const { int extent = style().pixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this); - if(m_pToolBar->orientation() == Qt::Horizontal)return TQSize(extent,0); + if(m_pToolBar->orientation() == TQt::Horizontal)return TQSize(extent,0); else return TQSize(0,extent); } @@ -65,7 +65,7 @@ void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *) { TQPainter p(this); TQStyle::SFlags flags = TQStyle::Style_Default; - if(m_pToolBar->orientation() == Qt::Horizontal)flags |= TQStyle::Style_Horizontal; + if(m_pToolBar->orientation() == TQt::Horizontal)flags |= TQStyle::Style_Horizontal; style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags); } @@ -337,7 +337,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex if(!pMinDistW) { // ops.. not found at all (empty toolbar or really far from any button) - if(orientation() == Qt::Horizontal) + if(orientation() == TQt::Horizontal) { if(pnt.x() < (width() / 2))iMinDistIdx = 0; // insert at position 0 else iMinDistIdx = idx; @@ -353,7 +353,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex { // would not put it over exclude idx // check if we have to stay on right or left of the widget found - if(orientation() == Qt::Horizontal) + if(orientation() == TQt::Horizontal) { if(pnt.x() > (pMinDistW->x() + (pMinDistW->width() / 2))) iMinDistIdx++; // need to put it on the right @@ -369,7 +369,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex // got the exclude idx by the way and wouldn't put exactly over it // check if exclude idx is "before" the current possible insert position // if it is , then lower down the index by one - if(orientation() == Qt::Horizontal) + if(orientation() == TQt::Horizontal) { if(pnt.x() > pntExclude.x()) iMinDistIdx--; // removing exclude will move everything one step back @@ -427,7 +427,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) { KviActionManager::instance()->setCurrentToolBar(this); TQMouseEvent * ev = (TQMouseEvent *)e; - if(ev->button() & Qt::LeftButton) + if(ev->button() & TQt::LeftButton) { if(o->isWidgetType()) { diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index dcbb49dd..70651796 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -47,7 +47,7 @@ KviDebugWindow::KviDebugWindow() : KviWindow(KVI_WINDOW_TYPE_DEBUG,g_pFrame,__tr2qs("Debug Messages"),0) { m_pInstance = this; - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"main_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); m_pInput = new KviInput(this,0); updateCaption(); diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 4288263d..f8e3a60d 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -107,7 +107,7 @@ KviFrame::KviFrame() m_pDockExtension = 0; - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"main_splitter"); // m_pSplitter->setFrameShape(TQFrame::NoFrame); setCentralWidget(m_pSplitter); diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 46ffcf52..c9390f32 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -719,7 +719,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar() void KviInputEditor::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { m_iCursorPosition = charIndexFromXPosition(e->pos().x()); //move the cursor to @@ -732,7 +732,7 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e) killDragTimer(); m_iDragTimer = startTimer(KVI_INPUT_DRAG_TIMEOUT); - } else if(e->button() & Qt::RightButton) + } else if(e->button() & TQt::RightButton) { int type = g_pActiveWindow->type(); diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index 5820a5f2..821f3ab8 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -113,7 +113,7 @@ toolbar.define(default) void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e) { - if(e->state() & Qt::LeftButton) + if(e->state() & TQt::LeftButton) { if(m_bResizeMode) { @@ -134,7 +134,7 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e) void KviToolBarGraphicalApplet::mousePressEvent(TQMouseEvent * e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { m_bResizeMode = (e->pos().x() > (width() - 4)); } diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index af2da64f..5df9132f 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -338,7 +338,7 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pToolTip = new KviIrcViewToolTip(this); // Create the scroll bar - m_pScrollBar = new TQScrollBar(0,0,1,10,0,Qt::Vertical,this,"irc_view_scrollbar"); + m_pScrollBar = new TQScrollBar(0,0,1,10,0,TQt::Vertical,this,"irc_view_scrollbar"); m_pScrollBar->setTracking(true); m_pScrollBar->show(); @@ -1887,7 +1887,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, { TQString szTimestamp; szTimestamp=TQDateTime::currentDateTime ( - KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? Qt::UTC : Qt::LocalTime ).toString( + KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? TQt::UTC : TQt::LocalTime ).toString( KVI_OPTION_STRING(KviOption_stringIrcViewTimestampFormat) ); szTimestamp.append(' '); int iTimeStampLength=szTimestamp.length(); @@ -4546,7 +4546,7 @@ void KviIrcView::mousePressEvent(TQMouseEvent *e) { if(m_pKviWindow->input()) m_pKviWindow->input()->setFocus(); - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { // This is the beginning of a selection... // We just set the mouse to be "down" and @@ -4568,7 +4568,7 @@ void KviIrcView::mousePressEvent(TQMouseEvent *e) calculateSelectionBounds(); } - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { if(m_iMouseTimer) { @@ -4601,7 +4601,7 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) pParams->append(szCmd); - if(!(e->state() & TQt::ControlButton))//(e->button() & Qt::RightButton) && ( + if(!(e->state() & TQt::ControlButton))//(e->button() & TQt::RightButton) && ( { if(!linkCmd.isEmpty()) { @@ -4615,9 +4615,9 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) case KVI_WINDOW_TYPE_CHANNEL: if(((KviChannel *)m_pKviWindow)->isOn(linkText)) { - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnChannelNickPopupRequest,m_pKviWindow,pParams); - if(e->button() & Qt::LeftButton) { + if(e->button() & TQt::LeftButton) { KVS_TRIGGER_EVENT(KviEvent_OnChannelNickLinkClick,m_pKviWindow,pParams); if(m_pKviWindow) { @@ -4634,9 +4634,9 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) case KVI_WINDOW_TYPE_QUERY: if(KviTQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) { - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnQueryNickPopupRequest,m_pKviWindow,pParams); - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnQueryNickLinkClick,m_pKviWindow,pParams); } else bTrigger = true; break; @@ -4648,41 +4648,41 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) { if(console()) { - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnNickLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnConsoleNickLinkClick,m_pKviWindow,pParams); } else emit rightClicked(); } } break; case 'h': - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnHostLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnHostLinkClick,m_pKviWindow,pParams); break; case 'u': - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnUrlLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnUrlLinkClick,m_pKviWindow,pParams); break; case 'c': - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnChannelLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnChannelLinkClick,m_pKviWindow,pParams); break; case 's': - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnServerLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnServerLinkClick,m_pKviWindow,pParams); break; default: { - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) { TQString tmp; getLinkEscapeCommand(tmp,linkCmd,"[!rbt]"); @@ -4694,9 +4694,9 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) } break; } - } else if(e->button() & Qt::RightButton) emit rightClicked(); + } else if(e->button() & TQt::RightButton) emit rightClicked(); - } else if((e->button() & Qt::MidButton) || ((e->button() & Qt::RightButton) && (e->state() & TQt::ControlButton))) + } else if((e->button() & TQt::MidButton) || ((e->button() & TQt::RightButton) && (e->state() & TQt::ControlButton))) { TQString tmp; getLinkEscapeCommand(tmp,linkCmd,TQString("[!mbt]")); @@ -4747,7 +4747,7 @@ void KviIrcView::mouseReleaseEvent(TQMouseEvent *) void KviIrcView::mouseMoveEvent(TQMouseEvent *e) { // tqDebug("Pos : %d,%d",e->pos().x(),e->pos().y()); - if(m_bMouseIsDown && (e->state() & Qt::LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?) + if(m_bMouseIsDown && (e->state() & TQt::LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?) { if(m_iSelectTimer == 0)m_iSelectTimer = startTimer(KVI_IRCVIEW_SELECT_REPAINT_INTERVAL); diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index 1ca11846..fd16ffaf 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -332,7 +332,7 @@ TQCursor KviMdiChild::getResizeCursor(int resizeCorner) void KviMdiChild::mouseMoveEvent(TQMouseEvent *e) { - if(e->state() & Qt::LeftButton) + if(e->state() & TQt::LeftButton) { if(m_iResizeCorner && (m_state != Maximized))resizeWindowOpaque(m_iResizeCorner); } else { diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index d1e25dc6..89d858a6 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -288,7 +288,7 @@ TQPoint KviMdiManager::getCascadePoint(int indexOfWindow) void KviMdiManager::mousePressEvent(TQMouseEvent *e) { //Popup the window menu - if(e->button() & Qt::RightButton)m_pWindowPopup->popup(mapToGlobal(e->pos())); + if(e->button() & TQt::RightButton)m_pWindowPopup->popup(mapToGlobal(e->pos())); } void KviMdiManager::childMoved(KviMdiChild *) diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 338a66c5..3387fedd 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -79,13 +79,13 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick) // The button box on the right //KviTalHBox * box = new KviTalHBox(m_pTopSplitter,"button_box"); if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel)) - m_pButtonGrid= (TQFrame*) new KviTalGrid(2,Qt::Horizontal,m_pButtonBox); + m_pButtonGrid= (TQFrame*) new KviTalGrid(2,TQt::Horizontal,m_pButtonBox); else - m_pButtonGrid= (TQFrame*) new KviTalGrid(4,Qt::Horizontal,m_pButtonBox); + m_pButtonGrid= (TQFrame*) new KviTalGrid(4,TQt::Horizontal,m_pButtonBox); createTextEncodingButton(m_pButtonGrid); - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"main_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index 2ddb64a6..6570a52a 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -465,12 +465,12 @@ void KviStatusBar::paintEvent(TQPaintEvent * e) void KviStatusBar::mousePressEvent(TQMouseEvent * e) { m_pClickedApplet = 0; - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) { contextPopup()->popup(TQCursor::pos()); return; } - if((e->button() & Qt::LeftButton) && (e->state() & (TQt::ShiftButton | TQt::ControlButton))) + if((e->button() & TQt::LeftButton) && (e->state() & (TQt::ShiftButton | TQt::ControlButton))) { // move! m_pClickedApplet = appletAt(mapToGlobal(e->pos())); @@ -516,7 +516,7 @@ void KviStatusBar::mouseMoveEvent(TQMouseEvent * e) void KviStatusBar::mouseReleaseEvent(TQMouseEvent * e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { if(m_pClickedApplet && appletExists(m_pClickedApplet)) { diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index 87cf49fe..2f4413b9 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -222,7 +222,7 @@ void KviStatusBarAwayIndicator::selfRegister(KviStatusBar * pBar) // FIXME: Away on all context should know where user is not away/back before toggling status void KviStatusBarAwayIndicator::mouseDoubleClickEvent(TQMouseEvent * e) { - if(!(e->button() & Qt::LeftButton))return; + if(!(e->button() & TQt::LeftButton))return; KviIrcConnection * c = statusBar()->frame()->activeConnection(); if(!c)return; if(c->state() != KviIrcConnection::Connected)return; @@ -286,7 +286,7 @@ KviStatusBarLagIndicator::~KviStatusBarLagIndicator() void KviStatusBarLagIndicator::mouseDoubleClickEvent(TQMouseEvent *e) { - if(!(e->button() & Qt::LeftButton))return; + if(!(e->button() & TQt::LeftButton))return; KviIrcConnection * c = statusBar()->frame()->activeConnection(); if(!c)return; diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index d2bac667..604868b7 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -207,7 +207,7 @@ void KviTaskBarButton::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) void KviTaskBarButton::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { if(e->state() & TQt::ShiftButton) { @@ -457,7 +457,7 @@ KviClassicTaskBar::KviClassicTaskBar() setMinimumHeight(m_iButtonHeight+5); setResizeEnabled( true ); - connect(this,TQT_SIGNAL(orientationChanged(Qt::Orientation)),this,TQT_SLOT(orientationChangedSlot(Qt::Orientation))); + connect(this,TQT_SIGNAL(orientationChanged(TQt::Orientation)),this,TQT_SLOT(orientationChangedSlot(TQt::Orientation))); } KviClassicTaskBar::~KviClassicTaskBar() @@ -466,9 +466,9 @@ KviClassicTaskBar::~KviClassicTaskBar() m_pButtonList = 0; } -void KviClassicTaskBar::orientationChangedSlot(Qt::Orientation o) +void KviClassicTaskBar::orientationChangedSlot(TQt::Orientation o) { - if (orientation() == Qt::Horizontal) m_pBase->setMinimumHeight(m_iButtonHeight); + if (orientation() == TQt::Horizontal) m_pBase->setMinimumHeight(m_iButtonHeight); doLayout(); } @@ -612,7 +612,7 @@ void KviClassicTaskBar::doLayout() } - if ((orientation() == Qt::Horizontal) && + if ((orientation() == TQt::Horizontal) && (((unsigned int)rows) > m_pBase->height() / m_iButtonHeight )) { rows = m_pBase->height() / m_iButtonHeight; @@ -643,7 +643,7 @@ void KviClassicTaskBar::doLayout() } if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) && - (orientation() == Qt::Horizontal) + (orientation() == TQt::Horizontal) ) theWidth = KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth); @@ -1068,10 +1068,10 @@ void KviTreeTaskBarListView::contentsMousePressEvent(TQMouseEvent *e) KviTalListViewItem * it = (KviTalListViewItem *)itemAt(contentsToViewport(e->pos())); if(it) { - if(e->button() & Qt::LeftButton)emit leftMousePress(it); - else if(e->button() & Qt::RightButton)emit rightMousePress(it); + if(e->button() & TQt::LeftButton)emit leftMousePress(it); + else if(e->button() & TQt::RightButton)emit rightMousePress(it); } else { - if(e->button() & Qt::RightButton) + if(e->button() & TQt::RightButton) { KviTalPopupMenu* pPopup=new KviTalPopupMenu(); pPopup->insertItem(__tr2qs("Sort"),this,TQT_SLOT(sort())); @@ -1222,7 +1222,7 @@ bool KviTreeTaskBar::eventFilter(TQObject * o,TQEvent *e) KviWindow * wnd = it->kviWindow(); if(wnd) { - if(ev->button() & Qt::LeftButton) + if(ev->button() & TQt::LeftButton) { if(ev->state() & TQt::ShiftButton) { diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h index 65041ea4..8822d6c2 100644 --- a/src/kvirc/ui/kvi_taskbar.h +++ b/src/kvirc/ui/kvi_taskbar.h @@ -170,7 +170,7 @@ public: virtual void updateActivityMeter(); virtual void applyOptions(); protected slots: - void orientationChangedSlot(Qt::Orientation o); + void orientationChangedSlot(TQt::Orientation o); }; class KviTreeTaskBar; diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index 914d91b0..f37c0f63 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -59,7 +59,7 @@ KviToolBar::~KviToolBar() void KviToolBar::mousePressEvent(TQMouseEvent *e) { - if(!(e->button() & Qt::RightButton)) + if(!(e->button() & TQt::RightButton)) { KviTalToolBar::mousePressEvent(e); return; diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 6d46221a..54e4572d 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -595,7 +595,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) void KviTopicWidget::mousePressEvent(TQMouseEvent * e) { - if(!(e->button() & Qt::RightButton))return; + if(!(e->button() & TQt::RightButton))return; if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index d18a2f0f..d799b365 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -1310,7 +1310,7 @@ KviUserListViewArea::KviUserListViewArea(KviUserListView * par) { m_pListView = par; setBackgroundMode(TQWidget::NoBackground); - m_pScrollBar = new TQScrollBar(Qt::Vertical,this,"scrollbar"); + m_pScrollBar = new TQScrollBar(TQt::Vertical,this,"scrollbar"); m_pScrollBar->setRange(0,0); m_pScrollBar->setValue(0); connect(m_pScrollBar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(scrollBarMoved(int))); @@ -1715,7 +1715,7 @@ void KviUserListViewArea::resizeEvent(TQResizeEvent *) void KviUserListViewArea::mousePressEvent(TQMouseEvent *e) { setFocus(); - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry) @@ -1756,7 +1756,7 @@ void KviUserListViewArea::mousePressEvent(TQMouseEvent *e) } } m_pLastEntryUnderMouse = entry; - } else if(e->button() & Qt::RightButton) + } else if(e->button() & TQt::RightButton) { KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry) @@ -1830,7 +1830,7 @@ void KviUserListViewArea::mouseDoubleClickEvent(TQMouseEvent *e) void KviUserListViewArea::mouseMoveEvent(TQMouseEvent *e) { - if(e->state() & Qt::LeftButton) + if(e->state() & TQt::LeftButton) { KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry && (entry != m_pLastEntryUnderMouse)) |