diff options
75 files changed, 194 insertions, 194 deletions
diff --git a/src/kvilib/irc/kvi_mirccntrl.h b/src/kvilib/irc/kvi_mirccntrl.h index b02165d0..2961e34a 100644 --- a/src/kvilib/irc/kvi_mirccntrl.h +++ b/src/kvilib/irc/kvi_mirccntrl.h @@ -91,9 +91,9 @@ // 006 ACK Acknowledge (Not so good, but can be used as last resource) // 007 BEL Bell ( Recognized as bell by terminals and IRCII ) (Used also by some IRC servers) // 008 BS Backspace (Should not be assigned: terminal control) -// 009 HT Qt::Horizontal tabulation (Should not be assigned: terminal control) +// 009 HT Horizontal tabulation (Should not be assigned: terminal control) // 010 LF Line feed (Should not be assigned: terminal control) -// 011 VT Qt::Vertical tabulation (Should not be assigned: terminal control) +// 011 VT Vertical tabulation (Should not be assigned: terminal control) // 012 FF Form feed (Should not be assigned: terminal control) // 013 CR Carriage return (Should not be assigned: terminal control) // 014 SO Shift out (Should not be assigned: terminal control) diff --git a/src/kvilib/tal/kvi_tal_grid_qt3.h b/src/kvilib/tal/kvi_tal_grid_qt3.h index a6ca1126..842e5dfc 100644 --- a/src/kvilib/tal/kvi_tal_grid_qt3.h +++ b/src/kvilib/tal/kvi_tal_grid_qt3.h @@ -32,7 +32,7 @@ class KVILIB_API KviTalGrid : public TQGrid TQ_OBJECT public: - KviTalGrid(int n,Qt::Orientation orient,TQWidget * pParent = 0) + KviTalGrid(int n,TQt::Orientation orient,TQWidget * pParent = 0) : TQGrid(n,orient,pParent) {}; ~KviTalGrid() {}; }; diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt3.h b/src/kvilib/tal/kvi_tal_groupbox_qt3.h index 0644bd39..e2162d93 100644 --- a/src/kvilib/tal/kvi_tal_groupbox_qt3.h +++ b/src/kvilib/tal/kvi_tal_groupbox_qt3.h @@ -36,9 +36,9 @@ public: : TQGroupBox(parent) {}; KviTalGroupBox(const TQString & title,TQWidget * parent = 0) : TQGroupBox(title,parent) {}; - KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0) + KviTalGroupBox(int strips,TQt::Orientation orientation,TQWidget * parent = 0) : TQGroupBox(strips,orientation,parent) {}; - KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0) + KviTalGroupBox(int strips,TQt::Orientation orientation,const TQString & title,TQWidget * parent = 0) : TQGroupBox(strips,orientation,title,parent) {}; ~KviTalGroupBox() {}; }; 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)) diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 705233f3..c0b0e7bc 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -650,7 +650,7 @@ KviActionEditor::KviActionEditor(TQWidget * par) TQGridLayout * l = new TQGridLayout(this,1,1,2,2); - m_pSplitter = new TQSplitter(Qt::Horizontal,this); + m_pSplitter = new TQSplitter(TQt::Horizontal,this); l->addWidget(m_pSplitter,0,0); diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index 846f098f..e609fef9 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -210,7 +210,7 @@ KviAliasEditor::KviAliasEditor(TQWidget * par) TQGridLayout * l = new TQGridLayout(this,1,1,2,2); - m_pSplitter = new TQSplitter(Qt::Horizontal,this); + m_pSplitter = new TQSplitter(TQt::Horizontal,this); l->addWidget(m_pSplitter,0,0); diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 3dc26251..8c5e71e0 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -70,7 +70,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name) connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListViewItem *))); - m_pGroupBox = new KviTalGroupBox(2,Qt::Horizontal,__tr2qs("Channel" ),this); + m_pGroupBox = new KviTalGroupBox(2,TQt::Horizontal,__tr2qs("Channel" ),this); TQString szMsg = __tr2qs("Name"); szMsg.append(":"); TQLabel * l = new TQLabel(szMsg,m_pGroupBox); diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index cea1b918..8e51d943 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -58,7 +58,7 @@ extern KviDccBroker * g_pDccBroker; KviDccCanvas::KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) : KviDccWindow(KVI_WINDOW_TYPE_DCCCANVAS,pFrm,name,dcc) { - m_pSplitter = new TQSplitter(Qt::Vertical,this,"splitter"); + m_pSplitter = new TQSplitter(TQt::Vertical,this,"splitter"); m_pCanvas = new KviCanvasWidget(m_pSplitter); diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 89bbbbda..51f4dbdb 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1058,7 +1058,7 @@ void KviCanvasView::contentsMouseMoveEvent(TQMouseEvent *e) { // TQPoint p = inverseWorldMatrix().map(e->pos()); TQPoint p = e->pos(); - if(e->state() & Qt::LeftButton) + if(e->state() & TQt::LeftButton) { if((m_dragMode != None) && (m_pSelectedItem)) { @@ -1128,7 +1128,7 @@ void KviCanvasView::contentsMouseReleaseEvent(TQMouseEvent *e) void KviCanvasView::contentsMousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { // TQPoint p = inverseWorldMatrix().map(e->pos()); TQPoint p = e->pos(); @@ -1497,7 +1497,7 @@ KviCanvasWidget::KviCanvasWidget(TQWidget * par) //#warning "Make this size as parameter of Dcc ?" m_pCanvas->resize(648,480); m_pMenuBar = new TQMenuBar(this); - m_pSplitter = new TQSplitter(Qt::Horizontal,this); + m_pSplitter = new TQSplitter(TQt::Horizontal,this); m_pCanvasView = new KviCanvasView(m_pCanvas,this,m_pSplitter); m_pStatusLabel = new TQLabel(this); m_pPropertiesWidget = new KviCanvasItemPropertiesWidget(m_pSplitter); diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 78fd3986..59ee9c2c 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -89,7 +89,7 @@ extern KviDccBroker * g_pDccBroker; KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) : KviDccWindow(KVI_WINDOW_TYPE_DCCCHAT,pFrm,name,dcc) { - m_pTopSplitter = new TQSplitter(Qt::Horizontal,this,"top_splitter"); + m_pTopSplitter = new TQSplitter(TQt::Horizontal,this,"top_splitter"); KviThemedLabel * dummy; dummy = new KviThemedLabel(m_pTopSplitter,"dummy_label"); KviTalVBox * box = new KviTalVBox(m_pTopSplitter); @@ -98,7 +98,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) createCryptControllerButton(box); #endif - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this); connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); m_pInput = new KviInput(this); diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 54fd433a..95963e95 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -652,7 +652,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name m_pDescriptor = dcc; m_pSlaveThread = 0; - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this); m_pHBox = new KviTalHBox(this); @@ -680,7 +680,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name vbox2->setSpacing(1); //#warning "The volume slider should be enabled only when receiving data" - m_pVolumeSlider = new TQSlider(-100, 0, 10, 0, Qt::Vertical, m_pHBox, "dcc_voice_volume_slider"); + m_pVolumeSlider = new TQSlider(-100, 0, 10, 0, TQt::Vertical, m_pHBox, "dcc_voice_volume_slider"); m_pVolumeSlider->setValue(getMixerVolume()); /* Update the tooltip */ setMixerVolume(m_pVolumeSlider->value()); diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 78a1a28b..88a0eb8c 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -371,8 +371,8 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt) void KviDockWidget::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton)toggleParentFrame(); - else if(e->button() & Qt::RightButton) + if(e->button() & TQt::LeftButton)toggleParentFrame(); + else if(e->button() & TQt::RightButton) m_pContextPopup->popup(mapToGlobal(e->pos())); } diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 3dc017c6..46bba621 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -167,7 +167,7 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(TQWidget * KviFontSelector * f = new KviFontSelector(this,__tr2qs_ctx("Font:","editor"),&g_fntNormal,true); g->addMultiCellWidget(f,0,0,0,2); m_pSelectorInterfaceList->append(f); - KviTalGroupBox * gbox = new KviTalGroupBox(1,Qt::Horizontal,__tr2qs("Colors" ),this); + KviTalGroupBox * gbox = new KviTalGroupBox(1,TQt::Horizontal,__tr2qs("Colors" ),this); g->addMultiCellWidget(gbox,1,1,0,2); KviColorSelector * s = addColorSelector(gbox,__tr2qs_ctx("Background:","editor"),&g_clrBackground,true); s = addColorSelector(gbox,__tr2qs_ctx("Normal text:","editor"),&g_clrNormalText,true); @@ -380,7 +380,7 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e) void KviScriptEditorWidget::contentsMousePressEvent(TQMouseEvent *e) { completelistbox->hide(); - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { // bool bIsFirstWordInLine; TQString buffer; diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index ec9511b5..efa75538 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -70,7 +70,7 @@ KviEventEditor::KviEventEditor(TQWidget * par) { TQGridLayout * l = new TQGridLayout(this,1,1,2,2); - TQSplitter * spl = new TQSplitter(Qt::Horizontal,this); + TQSplitter * spl = new TQSplitter(TQt::Horizontal,this); spl->setOpaqueResize(false); l->addWidget(spl,0,0); diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index a1b8d505..8c2950c3 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -151,8 +151,8 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pInput = new KviInput(this,0); - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); - m_pVertSplitter = new TQSplitter(Qt::Vertical,m_pSplitter,"vsplitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); + m_pVertSplitter = new TQSplitter(TQt::Vertical,m_pSplitter,"vsplitter"); m_pListView = new KviTalListView(m_pVertSplitter); //m_pListView->header()->hide(); diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index fbeb1abf..3a815244 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -72,7 +72,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) } g_pHelpWindowList->append(this); - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"main_splitter"); m_pHelpWidget = new KviHelpWidget(m_pSplitter,lpFrm); m_pToolBar=new KviTalVBox(m_pSplitter); diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index f2f51dd7..2a991dee 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -45,7 +45,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole) { g_pLinksWindowList->append(this); - m_pTopSplitter = new TQSplitter(Qt::Horizontal,this,"top_splitter"); + m_pTopSplitter = new TQSplitter(TQt::Horizontal,this,"top_splitter"); // The button box on the left KviTalHBox * box = new KviTalHBox(m_pTopSplitter); @@ -63,8 +63,8 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole) connect(lpConsole->context(),TQT_SIGNAL(stateChanged()), this,TQT_SLOT(connectionStateChange())); - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); - m_pVertSplitter = new TQSplitter(Qt::Vertical,m_pSplitter,"vsplitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); + m_pVertSplitter = new TQSplitter(TQt::Vertical,m_pSplitter,"vsplitter"); m_pListView = new KviTalListView(m_pVertSplitter); m_pListView->addColumn(__tr2qs("Link")); diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index e9d3e74d..9b40b912 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -172,9 +172,9 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pItemList = new KviPointerList<KviChannelListViewItemData>; m_pItemList->setAutoDelete(false); - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); - m_pTopSplitter = new TQSplitter(Qt::Horizontal,this,"top_splitter"); - m_pVertSplitter = new TQSplitter(Qt::Vertical,m_pSplitter,"vsplitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); + m_pTopSplitter = new TQSplitter(TQt::Horizontal,this,"top_splitter"); + m_pVertSplitter = new TQSplitter(TQt::Vertical,m_pSplitter,"vsplitter"); KviTalHBox * box = new KviTalHBox(m_pTopSplitter); m_pOpenButton = new KviStyledToolButton(box); diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index ea92cfc7..a5845b8a 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -64,7 +64,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra { g_pLogViewWindow = this; // m_pLogViewWidget = new KviLogViewWidget(this); - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"main_splitter"); m_pTabWidget = new TQTabWidget(m_pSplitter); m_pIndexTab = new KviTalVBox(m_pTabWidget); diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index fa55316e..634af964 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -768,11 +768,11 @@ void KviNotifierWindow::mousePressEvent(TQMouseEvent * e) m_pntClick = e->pos(); - if(e->button() == Qt::RightButton) + if(e->button() == TQt::RightButton) { contextPopup(mapToGlobal(e->pos())); return; - } else if(e->button() == Qt::LeftButton) { + } else if(e->button() == TQt::LeftButton) { m_bLeftButtonIsPressed = true; } @@ -1104,7 +1104,7 @@ void KviNotifierWindow::redrawWindow() inline void KviNotifierWindow::setCursor(int cur) { if (m_cursor.shape() != cur) { if(TQApplication::overrideCursor()) TQApplication::restoreOverrideCursor(); - m_cursor.setShape((Qt::CursorShape)cur); + m_cursor.setShape((TQt::CursorShape)cur); TQApplication::setOverrideCursor(m_cursor); } else if (cur==-1) if(TQApplication::overrideCursor()) TQApplication::restoreOverrideCursor(); diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index bc491dcb..44723aa1 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -143,7 +143,7 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c) bool KviKvsObject_dockwindow::function_orientation(KviKvsObjectFunctionCall * c) { if(!widget())return true; // hum ? dead ? - c->returnValue()->setString(_pDockWindow->orientation() == Qt::Horizontal ? TQString("horizontal") : TQString("vertical")); + c->returnValue()->setString(_pDockWindow->orientation() == TQt::Horizontal ? TQString("horizontal") : TQString("vertical")); return true; } @@ -155,7 +155,7 @@ bool KviKvsObject_dockwindow::function_setOrientation(KviKvsObjectFunctionCall * KVSO_PARAMETERS_END(c) if(!widget())return true; // hum ? dead ? - _pDockWindow->setOrientation(KviTQString::equalCI(szOrientation,"vertical") ? Qt::Vertical : Qt::Horizontal); + _pDockWindow->setOrientation(KviTQString::equalCI(szOrientation,"vertical") ? TQt::Vertical : TQt::Horizontal); return true; } diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 6157b035..53f168bf 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -94,10 +94,10 @@ const int align_cod[] = { !fn: $setAlignment(<alignment:string>) Set the alignment of the groupbox; Valid values are Left,Right,HCenter. !fn: $setOrientation<orientation:string> - Sets the group box's orientation. Valid values are:Qt::Horizontal,Qt::Vertical. + Sets the group box's orientation. Valid values are Horizontal,Vertical. !fn: $setColumnLayout(<columns:integer>,<orientation:string>) Enables the automatic layout management. The children are arranged in n columns with the specified orientation.[br] - Valid values for <orientation> are:Qt::Horizontal,Qt::Vertical. + Valid values for <orientation> are Horizontal,Vertical. @examples: [example] |-Start:[br] @@ -342,10 +342,10 @@ bool KviKvsObject_groupbox::functionSetOrientation(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget())return true; if(KviTQString::equalCI(szMode, "Horizontal")) - ((KviTalGroupBox *)widget())->setOrientation(Qt::Horizontal); + ((KviTalGroupBox *)widget())->setOrientation(TQt::Horizontal); else if(KviTQString::equalCI(szMode, "Vertical")) - ((KviTalGroupBox *)widget())->setOrientation(Qt::Vertical); + ((KviTalGroupBox *)widget())->setOrientation(TQt::Vertical); else c->warning( __tr2qs("Unknown orientation: ")); return true; } @@ -360,10 +360,10 @@ bool KviKvsObject_groupbox::functionSetColumnLayout(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget())return true; if(szMode=="Horizontal") - ((KviTalGroupBox *)widget())->setColumnLayout(uCol,Qt::Horizontal); + ((KviTalGroupBox *)widget())->setColumnLayout(uCol,TQt::Horizontal); else if(szMode=="Vertical") - ((KviTalGroupBox *)widget())->setColumnLayout(uCol,Qt::Vertical); + ((KviTalGroupBox *)widget())->setColumnLayout(uCol,TQt::Vertical); else c->warning( __tr2qs("Unknown orientation: ")); return true; } diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index b7f78d23..bf407f4c 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -528,8 +528,8 @@ bool KviKvsObject_painter::functionsetBackGroundMode(KviKvsObjectFunctionCall *c KVSO_PARAMETER("background mode",KVS_PT_STRING,0,szMode) KVSO_PARAMETERS_END(c) if(!m_pPainter)return true; - if(KviTQString::equalCI(szMode,"Transparent")) m_pPainter->setBackgroundMode(Qt::TransparentMode); - else if(KviTQString::equalCI(szMode,"Opaque")) m_pPainter->setBackgroundMode(Qt::OpaqueMode); + if(KviTQString::equalCI(szMode,"Transparent")) m_pPainter->setBackgroundMode(TQt::TransparentMode); + else if(KviTQString::equalCI(szMode,"Opaque")) m_pPainter->setBackgroundMode(TQt::OpaqueMode); else c->warning( __tr2qs("Unknown orientation")); return true; diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index a8e3d938..462bc14d 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -49,7 +49,7 @@ @functions: !fn: $setOrientation(<orientation:string>) Sets the slider's orientation.[br] - Qt::Orientation value can be "Horizontal" or "Vertical". + Orientation value can be "Horizontal" or "Vertical". !fn: $setTracking(<bTracking:boolean>) Sets whether slider tracking is enabled to enable.[br] Value can be 1 or 0. @@ -265,9 +265,9 @@ bool KviKvsObject_slider::functionsetOrientation(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget())return true; if(KviTQString::equalCI(szOrientation,"Horizontal")) - ((TQSlider *)widget())->setOrientation(Qt::Horizontal); + ((TQSlider *)widget())->setOrientation(TQt::Horizontal); else if(KviTQString::equalCI(szOrientation,"Vertical")) - ((TQSlider *)widget())->setOrientation(Qt::Vertical); + ((TQSlider *)widget())->setOrientation(TQt::Vertical); else c->warning( __tr2qs("Unknown orientation '%Q'"),&szOrientation); return true; } diff --git a/src/modules/objects/class_urllabel.cpp b/src/modules/objects/class_urllabel.cpp index 1dce3643..635d05e1 100644 --- a/src/modules/objects/class_urllabel.cpp +++ b/src/modules/objects/class_urllabel.cpp @@ -31,7 +31,7 @@ #include "kvi_window.h" #include "kvi_kvs_script.h" -#define TQT_LEFT_BUTTON Qt::LeftButton +#define TQT_LEFT_BUTTON TQt::LeftButton //#warning "Functions to change colors for different states" //#warning "$setUnderline(), $underline()" diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 74e5dc1d..364e907c 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -725,27 +725,27 @@ bool KviKvsObject_widget::eventFilter(TQObject *o,TQEvent *e) } break; case TQEvent::MouseButtonPress: - if(((TQMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0; + if(((TQMouseEvent *)e)->button() & TQt::LeftButton)aparam = 0; else { - if(((TQMouseEvent *)e)->button() & Qt::RightButton)aparam = 1; + if(((TQMouseEvent *)e)->button() & TQt::RightButton)aparam = 1; else aparam = 2; } if(!callFunction(this,"mousePressEvent",retv,new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((TQMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((TQMouseEvent *)e)->pos().y()) ))) brokenhandler = true; // ignore results of a broken event handler break; case TQEvent::MouseButtonRelease: - if(((TQMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0; + if(((TQMouseEvent *)e)->button() & TQt::LeftButton)aparam = 0; else { - if(((TQMouseEvent *)e)->button() & Qt::RightButton)aparam = 1; + if(((TQMouseEvent *)e)->button() & TQt::RightButton)aparam = 1; else aparam = 2; } if(!callFunction(this,"mouseReleaseEvent",retv,new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((TQMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((TQMouseEvent *)e)->pos().y()) ))) brokenhandler = true; // ignore results of a broken event handler break; case TQEvent::MouseButtonDblClick: - if(( (TQMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0; + if(( (TQMouseEvent *)e)->button() & TQt::LeftButton)aparam = 0; else { - if(((TQMouseEvent *)e)->button() & Qt::RightButton)aparam = 1; + if(((TQMouseEvent *)e)->button() & TQt::RightButton)aparam = 1; else aparam = 2; } if(!callFunction(this,"mouseDoubleClickEvent",retv,new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((TQMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((TQMouseEvent *)e)->pos().y()) @@ -753,13 +753,13 @@ bool KviKvsObject_widget::eventFilter(TQObject *o,TQEvent *e) break; case TQEvent::MouseMove: - if( (((TQMouseEvent *)e)->state()) & Qt::LeftButton) aparam = 0; + if( (((TQMouseEvent *)e)->state()) & TQt::LeftButton) aparam = 0; else { - if(((TQMouseEvent *)e)->state() & Qt::RightButton)aparam = 1; + if(((TQMouseEvent *)e)->state() & TQt::RightButton)aparam = 1; else { - if(((TQMouseEvent *)e)->state() & Qt::MidButton)aparam = 2; + if(((TQMouseEvent *)e)->state() & TQt::MidButton)aparam = 2; else aparam = -1; } } diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 92cba9d1..f446277d 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -178,7 +178,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup) setCaption(szCaption); TQGridLayout * g1 = new TQGridLayout(this,2,5,8,8); - TQSplitter * spl = new TQSplitter(Qt::Horizontal,this); + TQSplitter * spl = new TQSplitter(TQt::Horizontal,this); g1->addMultiCellWidget(spl,0,0,0,4); diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index 770db332..026dcdd9 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -36,7 +36,7 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent) { createLayout(3,1); - KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options")); m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg); connect(m_b1,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(reenableStuff(bool))); m_b2 = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolUseAntiSpamOnNotice); diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index d01e4567..7b578bda 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -37,7 +37,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent // AVATAR // 1st Box - KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Scaling in userlist","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Scaling in userlist","options")); KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images in userlist (recommended)","options"),KviOption_boolScaleAvatars); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(b,__tr2qs_ctx("<center>This option will force KVIrc to scale avatars" \ @@ -53,7 +53,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); //2nd - g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Scaling on load (and in user tooltips)","options")); + g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Scaling on load (and in user tooltips)","options")); b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images on image load","options"),KviOption_boolScaleAvatarsOnLoad); u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintScaleAvatarsOnLoadWidth,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); @@ -62,7 +62,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); // 2st Box - KviTalGroupBox *gs = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Request CTCP","options")); + KviTalGroupBox *gs = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Request CTCP","options")); KviBoolSelector * bs = addBoolSelector(g,__tr2qs_ctx("Request missing avatars","options"),KviOption_boolRequestMissingAvatars); KviUIntSelector * us = addUIntSelector(g,__tr2qs_ctx("Maximum requested file size:","options"),KviOption_uintMaximumRequestedAvatarSize,0,1048576,102400,KVI_OPTION_BOOL(KviOption_boolRequestMissingAvatars)); diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index 0faf216e..2b6610ae 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -40,7 +40,7 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * parent) addBoolSelector(0,1,0,1, __tr2qs_ctx("User input exits away mode","options"), KviOption_boolExitAwayOnInput); - KviTalGroupBox *g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Away Nickname","options")); + KviTalGroupBox *g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Away Nickname","options")); m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway); connect(m_pEnableAwayNick,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCustomAwayText(bool))); diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 21c1192c..577529ac 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -36,7 +36,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent) { createLayout(2,1); - KviTalGroupBox *gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("On Disconnect","options")); + KviTalGroupBox *gbox = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("On Disconnect","options")); KviBoolSelector *b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnDisconnect,true); @@ -49,7 +49,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent) mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to keep queries open after disconnect.</center>","options")); #endif - gbox = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); + gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnUnexpectedDisconnect,true); @@ -71,7 +71,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent) mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to reopen query windows after a successful reconnect attempt.</center>","options")); #endif -// gbox = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); +// gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); KviBoolSelector * b = addBoolSelector(gbox,__tr2qs_ctx("Automatically reconnect","options"),KviOption_boolAutoReconnectOnUnexpectedDisconnect); #ifdef COMPILE_INFO_TIPS mergeTip(b,__tr2qs_ctx("<center>This option will enable auto-reconnecting after an unexpected disconnect. " \ @@ -120,7 +120,7 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * parent) #ifdef COMPILE_SSL_SUPPORT createLayout(3,1); - KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Certificate","options")); + KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Certificate","options")); KviBoolSelector * b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL certificate (PEM format only)","options"), &(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)),true); @@ -131,7 +131,7 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * parent) &(KVI_OPTION_STRING(KviOption_stringSSLCertificatePass)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)); connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool))); - gbox = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Private Key","options")); + gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Private Key","options")); b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL private key","options"), &(KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)),true); f = addFileSelector(gbox,__tr2qs_ctx("Private key location:","options"), @@ -162,7 +162,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * parent) createLayout(5,1); KviUIntSelector * u; - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Timeout Values","options"),this); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Timeout Values","options"),this); u = addUIntSelector(g,__tr2qs_ctx("Connect timeout:","options"),KviOption_uintIrcSocketTimeout,5,6000,60); u->setSuffix(__tr2qs_ctx(" sec","options")); u = addUIntSelector(g,__tr2qs_ctx("Outgoing data queue flush timeout:","options"),KviOption_uintSocketQueueFlushTimeout,100,2000,500); @@ -176,7 +176,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * parent) #endif connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); - g = addGroupBox(0,3,0,3,2,Qt::Horizontal,__tr2qs_ctx("Network Interfaces","options")); + g = addGroupBox(0,3,0,3,2,TQt::Horizontal,__tr2qs_ctx("Network Interfaces","options")); b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress); KviStringSelector * s = addStringSelector(g,"",KviOption_stringIpV4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress)); @@ -210,7 +210,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent) m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService); connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableIpv4InIpv6(bool))); - KviTalGroupBox * gbox = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Output verbosity","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + KviTalGroupBox * gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Output verbosity","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool))); addLabel(gbox,__tr2qs_ctx("Output identd messages to:","options")); @@ -232,7 +232,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent) break; } - gbox = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + gbox = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Enable ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect); connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool))); @@ -245,7 +245,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent) connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool))); - gbox = addGroupBox(0,3,0,3,1,Qt::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + gbox = addGroupBox(0,3,0,3,1,TQt::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"), KviOption_boolIdentdEnableIpV6, KVI_OPTION_BOOL(KviOption_boolUseIdentService)); diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp index c3c7c118..9ae7e8e4 100644 --- a/src/modules/options/optw_ctcp.cpp +++ b/src/modules/options/optw_ctcp.cpp @@ -44,7 +44,7 @@ KviCtcpOptionsWidget::KviCtcpOptionsWidget(TQWidget * parent) "<br><br></p>","options")); - KviTalGroupBox *gs = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("CTCP Replies","options")); + KviTalGroupBox *gs = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("CTCP Replies","options")); KviStringSelector * s = addStringSelector(gs, __tr2qs_ctx("Append to VERSION reply:","options"),KviOption_stringCtcpVersionPostfix); #ifdef COMPILE_INFO_TIPS diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index a0604d9b..99a47f47 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -93,7 +93,7 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidge #endif connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); - KviTalGroupBox * g = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Ignored Requests","options")); + KviTalGroupBox * g = addGroupBox(0,2,1,2,2,TQt::Horizontal,__tr2qs_ctx("Ignored Requests","options")); addBoolSelector(g,__tr2qs_ctx("PING","options"),KviOption_boolIgnoreCtcpPing); addBoolSelector(g,__tr2qs_ctx("FINGER","options"),KviOption_boolIgnoreCtcpFinger); addBoolSelector(g,__tr2qs_ctx("CLIENTINFO","options"),KviOption_boolIgnoreCtcpClientinfo); diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index a1911285..6e1e447f 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -70,7 +70,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent) { createLayout(5,1); - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Network Properties","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Network Properties","options")); KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Use user-defined address or network interface","options"),KviOption_boolDccListenOnSpecifiedInterfaceByDefault); @@ -195,18 +195,18 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * parent KviBoolSelector * b; - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("On Incoming File","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("On Incoming File","options")); KviBoolSelector * b2 = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccSend); KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Open transfer window as minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccSendWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend)); KviBoolSelector * b4 = addBoolSelector(g,__tr2qs_ctx("Automatically resume when auto-accepted","options"),KviOption_boolAutoResumeDccSendWhenAutoAccepted,KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend)); - g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Save Location","options")); + g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Save Location","options")); addDirectorySelector(g,__tr2qs_ctx("Download folder:","options"),KviOption_stringIncomingPath); addBoolSelector(g,__tr2qs_ctx("Sort saved files by nicknames (create subfolders)","options"),KviOption_boolSortReceivedByDccFilesByNicks); addBoolSelector(g,__tr2qs_ctx("Guess save path from media type","options"),KviOption_boolUseIncomingDccMediaTypeSavePath); - g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("On Download Completion","options")); + g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("On Download Completion","options")); addBoolSelector(g,__tr2qs_ctx("Notify completion in console","options"),KviOption_boolNotifyDccSendSuccessInConsole); addBoolSelector(g,__tr2qs_ctx("Notify completion in notifier","options"),KviOption_boolNotifyDccSendSuccessInNotifier); b = addBoolSelector(g,__tr2qs_ctx("Automatically clear transfer","options"),KviOption_boolAutoCloseDccSendOnSuccess); @@ -235,7 +235,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare { createLayout(4,1); - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Bug Compatibility","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Bug Compatibility","options")); KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Send ACK for byte 0","options"),KviOption_boolSendZeroAckInDccRecv); #ifdef COMPILE_INFO_TIPS mergeTip(b, @@ -259,7 +259,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare #endif //COMPILE_INFO_TIPS - g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Limits","options")); + g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Limits","options")); KviTalHBox * hb = new KviTalHBox(g); b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed); @@ -280,7 +280,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare "KVIrc will refuse the requests when this limit is reached.</center>","options")); #endif - g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Tweaks","options")); + g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Tweaks","options")); b = addBoolSelector(g,__tr2qs_ctx("Use fast send (send ahead)","options"),KviOption_boolUseFastDccSend); #ifdef COMPILE_INFO_TIPS @@ -346,7 +346,7 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * parent) { createLayout(3,1); - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("On Chat Request","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("On Chat Request","options")); KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat); b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat)); @@ -367,7 +367,7 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(TQWidget *p):KviOptionsWidget createLayout(8, 1); KviBoolSelector * b1 = addBoolSelector(0,0,0,0,__tr2qs_ctx("Open all minimized","options"),KviOption_boolCreateMinimizedDccVoice); - KviTalGroupBox * g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("On Voice Request","options")); + KviTalGroupBox * g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("On Voice Request","options")); KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccVoice); b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice)); diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index fdb8e908..52e5a64f 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -88,7 +88,7 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent) KviBoolSelector * b; - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Alert Restrictions","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Alert Restrictions","options")); KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Restrict alert","options"),KviOption_boolHighlightOnlyNormalMsg); #ifdef COMPILE_INFO_TIPS mergeTip(b3, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the taskbar only if a normal message is received in a channel.<br>Actions like joins, parts and mode changes will be ignored.<br> This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.</center>","options")); diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index e403daec..32540453 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -313,7 +313,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare createLayout(3,1); layout()->setMargin(10); - KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options")); + KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Basic Properties","options")); KviTalHBox * hb = new KviTalHBox(gbox); hb->setSpacing(3); @@ -353,7 +353,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare TQString szCenterEnd("</center>"); TQString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd; - gbox = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Profile","options")); + gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Profile","options")); hb = new KviTalHBox(gbox); hb->setSpacing(4); @@ -680,12 +680,12 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * pa createLayout(2,1); layout()->setMargin(10); - KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("User Mode","options")); + KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("User Mode","options")); m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI); m_pSSelector = addBoolSelector(gbox,__tr2qs_ctx("Server notices (+s)","options"),&m_bS); m_pWSelector = addBoolSelector(gbox,__tr2qs_ctx("Wallops (+w)","options"),&m_bW); - gbox = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Default Messages","options")); + gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Default Messages","options")); KviStringSelector * sel = addStringSelector(gbox, __tr2qs_ctx("Part message:","options"),KviOption_stringPartMessage); diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index 9d6b56a8..3dd923e3 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -35,7 +35,7 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * parent) { createLayout(3,1); - KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Enable Ignore For","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Enable Ignore For","options")); m_pIgnorePrivmsg = addBoolSelector(g,__tr2qs_ctx("Private/channel messages","options"),KviOption_boolEnableIgnoreOnPrivMsg); m_pIgnoreNotice = addBoolSelector(g,__tr2qs_ctx("Private/channel notices","options"),KviOption_boolEnableIgnoreOnNotice); diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index 1153365a..20284eae 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -141,7 +141,7 @@ KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(TQWidget * parent) addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd); addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable the input history window and it's log memory.","options"),KviOption_boolDisableInputHistory); //G&N 2005 addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input toolbuttons by default","options"),KviOption_boolHideInputToolButtons); - KviTalGroupBox * g = addGroupBox(0,3,0,3,1,Qt::Horizontal,__tr2qs_ctx("Nick completion","options")); + KviTalGroupBox * g = addGroupBox(0,3,0,3,1,TQt::Horizontal,__tr2qs_ctx("Nick completion","options")); addBoolSelector(g,__tr2qs_ctx("Use bash-like nick completion","options"),KviOption_boolBashLikeNickCompletion); addStringSelector(g,__tr2qs_ctx("Nick completion postfix string","options"),KviOption_stringNickCompletionPostfix); addBoolSelector(g,__tr2qs_ctx("Use the completion postfix string for the first word only","options"),KviOption_boolUseNickCompletionPostfixForFirstWordOnly); diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 780c493f..d3377267 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -54,7 +54,7 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(TQWidget * addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects); addBoolSelector(0,5,0,5,__tr2qs_ctx("Hide Channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons); - KviTalGroupBox * g = addGroupBox(0,6,0,6,1,Qt::Horizontal,__tr2qs_ctx("Open Dialog Window For","options")); + KviTalGroupBox * g = addGroupBox(0,6,0,6,1,TQt::Horizontal,__tr2qs_ctx("Open Dialog Window For","options")); addBoolSelector(g,__tr2qs_ctx("Preferences","options"),KviOption_boolShowGeneralOptionsDialogAsToplevel); addBoolSelector(g,__tr2qs_ctx("Registered Users","options"),KviOption_boolShowRegisteredUsersDialogAsToplevel); addBoolSelector(g,__tr2qs_ctx("Identity","options"),KviOption_boolShowIdentityDialogAsToplevel); diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 71b60956..22620045 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -107,7 +107,7 @@ KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(TQWidget * pParen { createLayout(5,1); - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("On Channel Kick","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("On Channel Kick","options")); KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Rejoin channel","options"),KviOption_boolRejoinChannelOnKick); #ifdef COMPILE_INFO_TIPS @@ -124,7 +124,7 @@ KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(TQWidget * pParen "\"Rejoin channel\" option.</center>","options")); #endif - g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("On Channel Part","options")); + g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("On Channel Part","options")); b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnPart); #ifdef COMPILE_INFO_TIPS @@ -185,7 +185,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pPar } m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType)); - KviTalGroupBox * g = addGroupBox(0,2,4,2,1,Qt::Horizontal,__tr2qs_ctx("On Channel Join","options")); + KviTalGroupBox * g = addGroupBox(0,2,4,2,1,TQt::Horizontal,__tr2qs_ctx("On Channel Join","options")); addBoolSelector(g,__tr2qs_ctx("Do not send /WHO request","options"),KviOption_boolDisableWhoRequestOnJoin); addBoolSelector(g,__tr2qs_ctx("Do not request ban list","options"),KviOption_boolDisableBanListRequestOnJoin); addBoolSelector(g,__tr2qs_ctx("Do not request ban exception list","options"),KviOption_boolDisableBanExceptionListRequestOnJoin); @@ -199,7 +199,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pPar "your IRC bandwidth.</center>","options")); #endif - g = addGroupBox(0,4,4,4,1,Qt::Horizontal,__tr2qs_ctx("On Channel Join","options")); + g = addGroupBox(0,4,4,4,1,TQt::Horizontal,__tr2qs_ctx("On Channel Join","options")); addBoolSelector(g,__tr2qs_ctx("Echo channel topic","options"),KviOption_boolEchoNumericTopic); addBoolSelector(g,__tr2qs_ctx("Show channel sync time","options"),KviOption_boolShowChannelSyncTime); diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index 6446fe72..47bc7610 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -56,7 +56,7 @@ KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(TQWidget * parent) KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL; m_pVerbosityCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel)); - KviTalGroupBox * g = addGroupBox(0,1,1,1,1,Qt::Horizontal,__tr2qs_ctx("Show in active window","options")); + KviTalGroupBox * g = addGroupBox(0,1,1,1,1,TQt::Horizontal,__tr2qs_ctx("Show in active window","options")); addBoolSelector(g,__tr2qs_ctx("External messages","options"),KviOption_boolExternalMessagesToActiveWindow); addBoolSelector(g,__tr2qs_ctx("External CTCP replies","options"),KviOption_boolCtcpRepliesToActiveWindow); addBoolSelector(g,__tr2qs_ctx("Whois replies","options"),KviOption_boolWhoisRepliesToActiveWindow); diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 8dce8615..3c21a659 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -41,7 +41,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent) #ifdef COMPILE_INFO_TIPS mergeTip(pUse,__tr2qs_ctx("<center>This enables the lag meter engine, which checks at regular intervals how much lag (latency) the server has.</center>","options")); #endif - KviTalGroupBox *g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); + KviTalGroupBox *g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); KviUIntSelector * pInterval = addUIntSelector(g, __tr2qs_ctx("Lag meter heartbeat:","options"),KviOption_uintLagMeterHeartbeat,2000,10000,5000,KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); pInterval->setSuffix(__tr2qs_ctx(" msec","options")); #ifdef COMPILE_INFO_TIPS diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index 378c1dd1..b1f25976 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -36,7 +36,7 @@ KviLoggingOptionsWidget::KviLoggingOptionsWidget(TQWidget * parent) { createLayout(4,1); - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Automatically Log","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Automatically Log","options")); addBoolSelector(g,__tr2qs_ctx("Query windows","options"),KviOption_boolAutoLogQueries); addBoolSelector(g,__tr2qs_ctx("Channel windows","options"),KviOption_boolAutoLogChannels); addBoolSelector(g,__tr2qs_ctx("DCC Chat windows","options"),KviOption_boolAutoLogDccChat); diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 946339f6..b7a7a5e0 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -76,7 +76,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent) KviBoolSelector * b1; KviBoolSelector * b2; - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("General","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("General","options")); addBoolSelector(g,__tr2qs_ctx("Show message icons","options"),KviOption_boolIrcViewShowImages); addBoolSelector(g,__tr2qs_ctx("Draw some emoticons (smileys) as pictures","options"),KviOption_boolDrawEmoticons); @@ -85,7 +85,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent) - g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Nicknames","options")); + g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Nicknames","options")); b1 = addBoolSelector(g,__tr2qs_ctx("\"Smart\" nickname colors","options"),KviOption_boolColorNicks); b2 = addBoolSelector(g,__tr2qs_ctx("Use same colors as in the userlist","options"),KviOption_boolUseUserListColorsAsNickColors,!KVI_OPTION_BOOL(KviOption_boolColorNicks)); diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index 8688cdc6..423be23a 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -37,7 +37,7 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * parent) createLayout(5,1); KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList); - KviTalGroupBox *g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options")); + KviTalGroupBox *g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options")); connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool))); connect(b, @@ -56,7 +56,7 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * parent) KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), TQT_SLOT(setEnabled(bool))); - g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Advanced configuration","options")); + g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Advanced configuration","options")); connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool))); connect(b, diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index aa9cedac..02c29e4f 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -103,7 +103,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) vbox->setStretchFactor(lll,100); - KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),this); + KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,TQt::Horizontal,__tr2qs_ctx("Configuration","options"),this); //TQGridLayout * gl = new TQGridLayout(gbox->layout()); //gl->setMargin(2); //gl->setSpacing(4); diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index 99403932..1efc3417 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -39,7 +39,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent) { createLayout(8,1); - KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Open Query For","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Open Query For","options")); KviBoolSelector *b = addBoolSelector(g, __tr2qs_ctx("Private messages","options"),KviOption_boolCreateQueryOnPrivmsg); #ifdef COMPILE_INFO_TIPS mergeTip(b, diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 3706f10c..1e465947 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -124,7 +124,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * TQWidget * tab = new TQWidget(tw); TQGridLayout * gl = new TQGridLayout(tab,4,2,10,4); - KviTalGroupBox *gbox = new KviTalGroupBox(2,Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab); + KviTalGroupBox *gbox = new KviTalGroupBox(2,TQt::Horizontal,__tr2qs_ctx("Properties","options"),tab); gl->addMultiCellWidget(gbox,0,0,0,1); l = new TQLabel(__tr2qs_ctx("Username:","options"),gbox); @@ -474,7 +474,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) TQWidget * tab = new TQWidget(tw); TQGridLayout * gl = new TQGridLayout(tab,3,1,10,4); - KviTalGroupBox *gbox = new KviTalGroupBox(2,Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab); + KviTalGroupBox *gbox = new KviTalGroupBox(2,TQt::Horizontal,__tr2qs_ctx("Properties","options"),tab); gl->addWidget(gbox,0,0); l = new TQLabel(__tr2qs_ctx("Username:","options"),gbox); @@ -514,7 +514,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) "If you leave this field empty (most common case), KVIrc will first look if a real name is specified " \ "for the network that this server belongs to, and if that is empty the default \"real name\" (specified in the \"Identity\" settings) will be used.</center>","options")); #endif - gbox = new KviTalGroupBox(1,Qt::Horizontal,__tr2qs_ctx("User Mode","options"),tab); + gbox = new KviTalGroupBox(1,TQt::Horizontal,__tr2qs_ctx("User Mode","options"),tab); gl->addWidget(gbox,1,0); m_pUseDefaultInitUMode = new KviStyledCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox); @@ -1122,7 +1122,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) TQFrame * lll = new TQFrame(vbox); vbox->setStretchFactor(lll,100); - KviTalGroupBox *gbox = addGroupBox(0,1,1,1,3,Qt::Horizontal,__tr2qs_ctx("Active Configuration","options")); + KviTalGroupBox *gbox = addGroupBox(0,1,1,1,3,TQt::Horizontal,__tr2qs_ctx("Active Configuration","options")); m_pSrvNetLabel = new TQLabel(__tr2qs_ctx("Server:","options"),gbox); m_pSrvNetEdit = new TQLineEdit(gbox); diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index d2d16598..72f527a7 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -61,7 +61,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent) #else createLayout(3,1); #endif - KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Sound System","options"),true); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Sound System","options"),true); KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.","options")); @@ -76,7 +76,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent) connect(m_pSoundTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundTest())); - g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Media Player","options"),true); + g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Media Player","options"),true); KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select the preferred media player to be used with " \ "the mediaplayer.* module commands and functions.","options")); @@ -99,7 +99,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent) m_pSoundTestButton->setEnabled(false); m_pMediaTestButton->setEnabled(false); - g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("ID3 tags' encoding","options"),true); + g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("ID3 tags' encoding","options"),true); KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options")); @@ -122,7 +122,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent) m_pTagsEncodingCombo->setCurrentItem(iMatch); #ifdef COMPILE_ON_WINDOWS - g = addGroupBox(0,3,0,3,1,Qt::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true); + g = addGroupBox(0,3,0,3,1,TQt::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true); KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of winamp messages.","options")); diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp index 0c85ea7e..394c8a10 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -77,7 +77,7 @@ KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(TQW { createLayout(3,1); - KviTalGroupBox *g = addGroupBox(0,0,0,0,2,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,2,TQt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarForeground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveForeground); @@ -107,7 +107,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQW { createLayout(4,2); - KviTalGroupBox * g = addGroupBox(0,0,1,0,2,Qt::Horizontal,__tr2qs_ctx("Background Colors","options")); + KviTalGroupBox * g = addGroupBox(0,0,1,0,2,TQt::Horizontal,__tr2qs_ctx("Background Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarBackground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveBackground); @@ -230,7 +230,7 @@ KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(TQWidget * parent { createLayout(8,1); addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar); - KviTalGroupBox *g = addGroupBox(0,1,0,1,2,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); + KviTalGroupBox *g = addGroupBox(0,1,0,1,2,TQt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTaskBarNormalText); addColorSelector(g,__tr2qs_ctx("Minimized:","options"), KviOption_colorTaskBarMinimizedText); addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTaskBarHighlight1Text); diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index df6fd0ba..6ddc3ede 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -44,7 +44,7 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * parent) m_pEnableFlashing = addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable tray icon flashing","options"),KviOption_boolEnableTrayIconFlashing); m_pLevelBasedNotify = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable level-based message notification (not a message-type based)","options"),KviOption_boolUseLevelBasedTrayNotification); - m_pLevelsGroup = addGroupBox(0,5,0,5,1,Qt::Horizontal,__tr2qs_ctx("Select message levels to notify","options")); + m_pLevelsGroup = addGroupBox(0,5,0,5,1,TQt::Horizontal,__tr2qs_ctx("Select message levels to notify","options")); addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages","options"), KviOption_uintMinTrayLowLevelMessage, diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index 595db91e..e5f68b48 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -50,7 +50,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(T addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontUserListView); - KviTalGroupBox * g = addGroupBox(0,1,1,1,1,Qt::Horizontal,__tr2qs_ctx("Nickname Colors","options")); + KviTalGroupBox * g = addGroupBox(0,1,1,1,1,TQt::Horizontal,__tr2qs_ctx("Nickname Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewNormalForeground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorUserListViewSelectionForeground); addColorSelector(g,__tr2qs_ctx("Channel owner:","options"),KviOption_colorUserListViewChanOwnerForeground); @@ -121,7 +121,7 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(T { createLayout(3,2); - KviTalGroupBox * g = addGroupBox(0,0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Background Colors","options")); + KviTalGroupBox * g = addGroupBox(0,0,1,0,1,TQt::Horizontal,__tr2qs_ctx("Background Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewBackground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorUserListViewSelectionBackground); diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index cd2d8ba6..7fe805c7 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -202,7 +202,7 @@ KviSinglePopupEditor::KviSinglePopupEditor(TQWidget * par) m_pMenuButton = new TQPushButton(__tr2qs("Test"),this); g->addWidget(m_pMenuButton,0,2); connect(m_pMenuButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(testPopup())); - TQSplitter * spl = new TQSplitter(Qt::Vertical,this); + TQSplitter * spl = new TQSplitter(TQt::Vertical,this); m_pListView = new KviTalListView(spl); m_pListView->addColumn(__tr2qs("Item")); @@ -1023,7 +1023,7 @@ KviPopupEditor::KviPopupEditor(TQWidget * par) : TQWidget(par) { TQGridLayout * l = new TQGridLayout(this,1,1,0,2); - TQSplitter * spl = new TQSplitter(Qt::Horizontal,this); + TQSplitter * spl = new TQSplitter(TQt::Horizontal,this); l->addWidget(spl,0,0); KviTalVBox * box = new KviTalVBox(spl); diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index e0e49011..b7786fee 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -74,7 +74,7 @@ KviRawEditor::KviRawEditor(TQWidget * par) : TQWidget(par,"raw_event_editor") { TQGridLayout * l = new TQGridLayout(this,1,1,2,2); - TQSplitter * spl = new TQSplitter(Qt::Horizontal,this); + TQSplitter * spl = new TQSplitter(TQt::Horizontal,this); l->addWidget(spl,0,0); KviTalVBox * boxi = new KviTalVBox(spl); diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index ee0230a7..23dea628 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -331,7 +331,7 @@ KviSetupWizard::KviSetupWizard() if(nick == "root")nick = "newbie"; //m_pIdentity->m_pVBox //__tr2qs("Basic Properties") - KviTalGroupBox * gbox = new KviTalGroupBox(1,Qt::Horizontal,TQString(),m_pIdentity->m_pVBox); + KviTalGroupBox * gbox = new KviTalGroupBox(1,TQt::Horizontal,TQString(),m_pIdentity->m_pVBox); m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true); m_pNickSelector->setMinimumLabelWidth(120); @@ -344,7 +344,7 @@ KviSetupWizard::KviSetupWizard() TQString szCenterEnd("</center>"); TQString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd; - gbox = new KviTalGroupBox(1,Qt::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox); + gbox = new KviTalGroupBox(1,TQt::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox); m_pRealNameSelector = new KviStringSelector(gbox,__tr2qs("Real name:"),&(KVI_OPTION_STRING(KviOption_stringRealname)),true); m_pRealNameSelector->setMinimumLabelWidth(120); diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 7f6bda29..6895f0c8 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -206,7 +206,7 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"shared files window",0) , KviModuleExtension(d) { g_pSharedFilesWindow = this; - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); KviTalVBox * vbox = new KviTalVBox(m_pSplitter); diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index 54394e7d..9f0d2ac9 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -37,7 +37,7 @@ KviSocketSpyWindow::KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole) : KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole) , KviIrcDataStreamMonitor(lpConsole->context()) { g_pSocketSpyWindowList->append(this); - m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); // Ensure proper focusing //setFocusHandler(m_pIrcView,this); |