diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:33:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:33:07 -0600 |
commit | 805c2821ceaddada48b346c6d11bd0dc1351a539 (patch) | |
tree | f4f34d4fae6b86d1b1058f396da4729906edbadb /src/kvirc/ui | |
parent | 918c3ff07736f0c343cb190d3f0df99e4cb8dab8 (diff) | |
download | kvirc-805c2821ceaddada48b346c6d11bd0dc1351a539.tar.gz kvirc-805c2821ceaddada48b346c6d11bd0dc1351a539.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'src/kvirc/ui')
54 files changed, 386 insertions, 386 deletions
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index d4b02e0..c2f9b8b 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -30,7 +30,7 @@ #include "kvi_iconmanager.h" #include "kvi_locale.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> //#include <tqscrollview.h> #include <tqpainter.h> diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index b9e2f2b..0f39aec 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -74,7 +74,7 @@ #include <tqlabel.h> #include <tqevent.h> -#include <tqpalette.h> +#include <palette.h> #include "kvi_tal_popupmenu.h" #include "kvi_pointerhashtable.h" #include <tqmessagebox.h> @@ -112,7 +112,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // Register ourselves connection()->registerChannel(this); - // And create the widgets tqlayout + // And create the widgets layout // Button box m_pButtonBox = new KviTalHBox(this); @@ -220,7 +220,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name if(KVI_OPTION_BOOL(KviOption_boolAutoLogChannels))m_pIrcView->startLogging(); applyOptions(); - m_joinTime = TQDateTime::tqcurrentDateTime(); + m_joinTime = TQDateTime::currentDateTime(); m_tLastReceivedWhoReply = (kvi_time_t)m_joinTime.toTime_t(); @@ -287,7 +287,7 @@ void KviChannel::applyOptions() m_pModeWidget->applyOptions(); - // this applies options for IrcView and Input and forces the window to retqlayout + // this applies options for IrcView and Input and forces the window to relayout KviWindow::applyOptions(); } @@ -547,23 +547,23 @@ void KviChannel::resizeEvent(TQResizeEvent *e) { #ifdef COMPILE_USE_QT4 int hght = m_pInput->heightHint(); - int hght2 = m_pTopicWidget->tqsizeHint().height(); + int hght2 = m_pTopicWidget->sizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); #else int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->tqsizeHint().height(); + int hght2 = m_pButtonBox->sizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); #endif } -TQSize KviChannel::tqsizeHint() const +TQSize KviChannel::sizeHint() const { - TQSize ret(m_pSplitter->tqsizeHint().width(), - m_pIrcView->tqsizeHint().height() + m_pInput->heightHint() + m_pButtonBox->tqsizeHint().height()); + TQSize ret(m_pSplitter->sizeHint().width(), + m_pIrcView->sizeHint().height() + m_pInput->heightHint() + m_pButtonBox->sizeHint().height()); return ret; } @@ -655,7 +655,7 @@ void KviChannel::setAliveChan() m_iStateFlags = 0; setType(KVI_WINDOW_TYPE_CHANNEL); m_pUserListView->setUserDataBase(connection()->userDataBase()); - m_joinTime = TQDateTime::tqcurrentDateTime(); + m_joinTime = TQDateTime::currentDateTime(); context()->unregisterDeadChannel(this); connection()->registerChannel(this); // Update log file name @@ -704,7 +704,7 @@ void KviChannel::getTalkingUsersStats(TQString &buffer,TQStringList &l,bool bPas } else { // (l.count() - 1) is > 1 buffer += "</b> "; - buffer += __tr2qs("and other %1 users").tqarg(l.count() - 1); + buffer += __tr2qs("and other %1 users").arg(l.count() - 1); } buffer += " "; buffer += bPast ? __tr2qs("were talking recently") : __tr2qs("are talking"); @@ -1170,7 +1170,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue,unsigned int * puA if(m_pActionHistory->count() < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT) { - if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) + if(m_joinTime.secsTo(TQDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) { // we can't exactly estimate if(dSpan < 60.0)dSpan = 60.0; @@ -1281,7 +1281,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) if(s->uActionCount < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT) { - if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) + if(m_joinTime.secsTo(TQDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) { // we can't exactly estimate s->bStatsInaccurate = true; @@ -1607,14 +1607,14 @@ void KviChannel::preprocessMessage(TQString & szMessage) for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { if((*it).contains('\r')) continue; TQString tmp = KviMircCntrl::stripControlBytes(*it); - if( findEntry(*it) ) *it=TQString("\r!n\r%1\r").tqarg(*it); + if( findEntry(*it) ) *it=TQString("\r!n\r%1\r").arg(*it); if(m_pConsole) if(m_pConsole->connection()) if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) if((*it)==tmp) - *it=TQString("\r!c\r%1\r").tqarg(*it); + *it=TQString("\r!c\r%1\r").arg(*it); else - *it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it); + *it=TQString("\r!c%1\r%2\r").arg(tmp).arg(*it); } szMessage=strings.join(" "); } diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 45a4801..3c86b6a 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -233,7 +233,7 @@ public: void prependUserFlag(const TQString &nick,TQString &buffer){ m_pUserListView->prependUserFlag(nick,buffer); }; char getUserFlag(const TQString &nick){ return m_pUserListView->getUserFlag(nick); }; bool isDeadChan(){ return (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN); }; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void enableUserListUpdates(bool bEnable){ m_pUserListView->enableUpdates(bEnable); }; KviUserListEntry * join(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),int iFlags = 0) { return m_pUserListView->join(nick,user,host,iFlags); }; diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index fdce502..36369ae 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -100,7 +100,7 @@ #ifdef COMPILE_USE_QT4 #include <TQTextDocument> #else - #include <tqstylesheet.h> + #include <stylesheet.h> #endif extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; @@ -353,7 +353,7 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString #else TQMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); #endif - buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").tqarg(e->avatar()->pixmap()->width()); + buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").arg(e->avatar()->pixmap()->width()); } if(e->hasRealName()) @@ -404,12 +404,12 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString if(e->hasServer()) { buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Using server <b>%1</b>").tqarg(e->server()); + buffer += __tr2qs("Using server <b>%1</b>").arg(e->server()); if(e->hasHops()) { buffer += " ("; - buffer += __tr2qs("%1 hops").tqarg(e->hops()); + buffer += __tr2qs("%1 hops").arg(e->hops()); buffer += ")</nobr></td></tr>"; } else { buffer += "</nobr></td></tr></table>"; @@ -445,7 +445,7 @@ void KviConsole::saveProperties(KviConfig *cfg) void KviConsole::getBaseLogFileName(TQString &buffer) { - buffer=TQString("CONSOLE%1").tqarg(ircContextId()); + buffer=TQString("CONSOLE%1").arg(ircContextId()); } void KviConsole::showNotifyList(bool bShow) @@ -634,7 +634,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c TQChar* aux=(TQChar*)(szStripMsg.ucs2()); if(aux) { - while(aux->tqunicode()) + while(aux->unicode()) { if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 ) szSource.append(' '); @@ -649,7 +649,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c szSource.prepend(' '); if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection()) { - if(szSource.find(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1) + if(szSource.find(TQString(" %1 ").arg(connection()->userInfo()->nickName()),0,false) > -1) return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName()); } @@ -661,7 +661,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c if((*it).isEmpty()) continue; // FIXME : This is SLOOOOOOOOW (TQString -> ascii translation!!) !!!! - if(szSource.find(TQString(" %1 ").tqarg(*it),0,false) > -1) + if(szSource.find(TQString(" %1 ").arg(*it),0,false) > -1) { return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it); } @@ -794,11 +794,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const TQChar * aux = nick.tqunicode(); + const TQChar * aux = nick.unicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->tqunicode(); + sum += aux->unicode(); aux++; i--; } @@ -815,11 +815,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const TQChar * aux = nick.tqunicode(); + const TQChar * aux = nick.unicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->tqunicode(); + sum += aux->unicode(); aux++; i--; } @@ -835,7 +835,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, KVI_COLOR_EXT_USER_HALFOP : ((e->flags() & KVI_USERFLAG_VOICE) ? \ KVI_COLOR_EXT_USER_VOICE : KVI_COLOR_EXT_USER_USEROP)))); } - szNick.prepend(TQString("%1").tqarg(color)); + szNick.prepend(TQString("%1").arg(color)); szNick.prepend(KVI_TEXT_COLOR); szNick.append(KVI_TEXT_COLOR); } @@ -1087,15 +1087,15 @@ void KviConsole::applyOptions() void KviConsole::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->tqsizeHint().height(); + int hght2 = m_pButtonBox->sizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); } -TQSize KviConsole::tqsizeHint() const +TQSize KviConsole::sizeHint() const { - TQSize ret(m_pIrcView->tqsizeHint().height(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pIrcView->sizeHint().height(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); return ret; } diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index 18c02ee..a32ae7f 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -101,7 +101,7 @@ protected: virtual void getBaseLogFileName(TQString &buffer); virtual void getTaskBarTipText(TQString &buffer); virtual void fillContextPopup(KviTalPopupMenu * p); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void applyOptions(); virtual void triggerCreationEvents(); void fillStatusString(); @@ -181,7 +181,7 @@ public: void terminateConnectionRequest(bool bForce = false,const char * quitMsg = 0); - // tqStatus string (usermode + nick) (connection related too) + // Status string (usermode + nick) (connection related too) const TQString & statusString(){ return m_szStatusString; }; // forwarders from KviIrcConnection diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 83ac72e..14056f5 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -40,7 +40,7 @@ #include "kvi_memmove.h" #include "kvi_toolwindows_container.h" - #include <tqlayout.h> + #include <layout.h> #include "kvi_pointerhashtable.h" // kvi_app.cpp @@ -107,9 +107,9 @@ m_pDescriptionLabel = new TQLabel(this); m_pDescriptionLabel->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); #ifdef COMPILE_USE_QT4 - m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); + m_pDescriptionLabel->setAlignment(TQt::AlignTop | TQt::AlignLeft); #else - m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); + m_pDescriptionLabel->setAlignment(TQt::AlignTop | TQt::AlignLeft); #endif g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3); diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp index da82146..c3df244 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -30,7 +30,7 @@ #include "kvi_iconmanager.h" #include <tqdatetime.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpixmap.h> @@ -103,7 +103,7 @@ void KviCtcpPageDialog::addPage(const TQString &szNick,const TQString &szUser,co TQLabel * l = new TQLabel(this); l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); //l->setMaximumWidth(600); - TQString date = TQDateTime::tqcurrentDateTime().toString(); + TQString date = TQDateTime::currentDateTime().toString(); TQString tmp = "<center>"; tmp += __tr2qs("You have been paged by"); diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 828eb02..a47cd61 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -33,7 +33,7 @@ #include <tqcursor.h> #include "kvi_tal_popupmenu.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqcursor.h> #include <tqtoolbutton.h> @@ -62,17 +62,17 @@ KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,c m_pToolBar = pParent; setBackgroundMode(pParent->backgroundMode()); setBackgroundOrigin(ParentOrigin); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum)); } -TQSize KviCustomToolBarSeparator::tqsizeHint() const +TQSize KviCustomToolBarSeparator::sizeHint() const { #ifdef COMPILE_USE_QT4 TQStyleOption opt; opt.initFrom(this); - int extent = tqstyle()->tqpixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this); + int extent = tqstyle()->pixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this); #else - int extent = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this); + int extent = tqstyle().pixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this); #endif if(m_pToolBar->orientation() == Qt::Horizontal)return TQSize(extent,0); else return TQSize(0,extent); @@ -88,7 +88,7 @@ void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *) #else TQStyle::SFlags flags = TQStyle::Style_Default; if(m_pToolBar->orientation() == Qt::Horizontal)flags |= TQStyle::Style_Horizontal; - tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),tqcolorGroup(),flags); + tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags); #endif } @@ -169,9 +169,9 @@ void KviCustomToolBar::beginCustomize() if(m_pFilteredChildren)delete m_pFilteredChildren; m_pFilteredChildren = new KviPointerHashTable<void *,bool>; m_pFilteredChildren->setAutoDelete(true); - // filter the events for all the tqchildren + // filter the events for all the children #ifdef COMPILE_USE_QT4 - TQList<TQObject*> l = tqchildren(); + TQList<TQObject*> l = children(); for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) @@ -193,7 +193,7 @@ void KviCustomToolBar::endCustomize() { // stop filtering events #ifdef COMPILE_USE_QT4 - TQList<TQObject*> l = tqchildren(); + TQList<TQObject*> l = children(); for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) @@ -209,7 +209,7 @@ void KviCustomToolBar::endCustomize() ++it; } #endif - // FIXME: We SHOULD MAKE SURE that the tqchildren are re-enabled... + // FIXME: We SHOULD MAKE SURE that the children are re-enabled... // this could be done by calling setEnabled(isEnabled()) on each action ? if(m_pFilteredChildren) { @@ -238,7 +238,7 @@ void KviCustomToolBar::childEvent(TQChildEvent *e) { if(KviActionManager::customizingToolBars()) { - // this is useful for droppped and dragged-out tqchildren + // this is useful for droppped and dragged-out children if(e->type() == TQEvent::ChildInserted) { if(e->child()->isWidgetType()) @@ -293,7 +293,7 @@ void KviCustomToolBar::dragEnterEvent(TQDragEnterEvent *e) boxLayout()->insertWidget(idx,m_pDraggedChild); #ifdef COMPILE_KDE_SUPPORT // bleah :///// - insertWidget(-1,m_pDraggedChild->tqsizeHint().width(),m_pDraggedChild,idx); + insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx); #endif #endif TQEvent ev(TQEvent::LayoutHint); @@ -334,7 +334,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex // treating exclude as if it was going to be removed // find also the exclude index if needed #ifdef COMPILE_USE_QT4 - TQLayout * l = tqlayout(); + TQLayout * l = layout(); #else TQBoxLayout * l = boxLayout(); #endif @@ -345,7 +345,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex if(!l)return 0; TQLayoutIterator it = l->iterator(); - // find the tqchildren with minimum distance + // find the children with minimum distance int iMinDistIdx = -1; TQWidget * pMinDistW = 0; unsigned int uMinDist = 0xffffffff; @@ -453,7 +453,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex #ifdef COMPILE_USE_QT4 TQWidget * KviCustomToolBar::widgetAt(int index) { - TQLayout * l = tqlayout(); + TQLayout * l = layout(); if(!l) return NULL; TQLayoutItem * it = l->itemAt(index); @@ -527,11 +527,11 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) if(!KviActionManager::customizingToolBars())goto unhandled; // anything here is done when customizing only if(e->type() == TQEvent::Enter) { - if(m_pMovedChild)return true; // kill it while moving other tqchildren + if(m_pMovedChild)return true; // kill it while moving other children } if(e->type() == TQEvent::Leave) { - if(m_pMovedChild)return true; // kill it while moving other tqchildren + if(m_pMovedChild)return true; // kill it while moving other children } if(e->type() == TQEvent::MouseButtonPress) { @@ -550,7 +550,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) )) { m_pMovedChild = (TQWidget *)o; - // allow resizing of tqchildren + // allow resizing of children // FIXME: do it only if the child is really resizable if(m_pMovedChild->width() > 20) // might be an applet { diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h index ec6483b..d02ad59 100644 --- a/src/kvirc/ui/kvi_customtoolbar.h +++ b/src/kvirc/ui/kvi_customtoolbar.h @@ -41,7 +41,7 @@ class KviCustomToolBarSeparator : public TQWidget TQ_OBJECT public: KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name); - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: KviCustomToolBar * m_pToolBar; protected: diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index 8110967..dcbb49d 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -124,9 +124,9 @@ void KviDebugWindow::resizeEvent(TQResizeEvent *e) m_pInput->setGeometry(0,height() - hght,width(),hght); } -TQSize KviDebugWindow::tqsizeHint() const +TQSize KviDebugWindow::sizeHint() const { - TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); return ret; } diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/kvi_debugwindow.h index 616752a..1eab1ee 100644 --- a/src/kvirc/ui/kvi_debugwindow.h +++ b/src/kvirc/ui/kvi_debugwindow.h @@ -49,7 +49,7 @@ protected: virtual void loadProperties(KviConfig * cfg); virtual void saveProperties(KviConfig * cfg); virtual void getBaseLogFileName(TQString &buffer); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; }; #endif //_KVI_DEBUGWINDOW_H_ diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index db5efa8..0a219e2 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -67,10 +67,10 @@ #include <tqcheckbox.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #ifdef COMPILE_USE_QT4 #include <tq3dockarea.h> #define TQDockArea Q3DockArea @@ -173,7 +173,7 @@ KviFrame::KviFrame() installAccelerators(this); - tqlayout()->setResizeMode(TQLayout::FreeResize); + layout()->setResizeMode(TQLayout::FreeResize); } KviFrame::~KviFrame() @@ -879,7 +879,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd) if(wnd->isMaximized() && wnd->mdiParent())updateCaption(); m_pTaskBar->setActiveItem(wnd->taskBarItem()); - //wnd->gainedActiveWindowtqStatus(); // <-- atm unused + //wnd->gainedActiveWindowStatus(); // <-- atm unused if(g_pActiveWindow->view()) g_pActiveWindow->view()->clearUnreaded(); @@ -1085,7 +1085,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next()) { - TQString label = __tr2qs("Show %1").tqarg(d->visibleName()); + TQString label = __tr2qs("Show %1").arg(d->visibleName()); if(d->icon())id = p->insertItem(*(d->icon()),label); else id = p->insertItem(label); p->setItemChecked(id,moduleExtensionToolBar(d->id())); @@ -1101,7 +1101,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) if(cnt > 0)p->insertSeparator(); while(KviCustomToolBarDescriptor * d = it2.current()) { - TQString label = __tr2qs("Show %1").tqarg(d->label()); + TQString label = __tr2qs("Show %1").arg(d->label()); TQString ico = d->iconId(); // use the icon only if there is no check if(d->toolBar()) @@ -1165,7 +1165,7 @@ void KviFrame::toolbarsPopupSelected(int id) bool KviFrame::focusNextPrevChild(bool next) { //debug("FOCUS NEXT PREV CHILD"); - TQWidget * w = tqfocusWidget(); + TQWidget * w = focusWidget(); if(w) { #ifdef COMPILE_USE_QT4 diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index 5f18eb4..cf5c430 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -110,7 +110,7 @@ protected: KviDockExtension * m_pDockExtension; // the frame's dock extension: this should be prolly moved ? KviAccel * m_pAccel; // the global accelelrator public: - // the mdi manager: handles mdi tqchildren + // the mdi manager: handles mdi children KviMdiManager * mdiManager(){ return m_pMdi; }; // the splitter is the central widget for this frame TQSplitter * splitter(){ return m_pSplitter; }; diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index 7c16fe5..6f6aa8f 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -29,8 +29,8 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> -#include <tqtextbrowser.h> +#include <layout.h> +#include <textbrowser.h> KviHtmlDialog::KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData) : TQDialog(pParent) diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index a4c89ad..cac2eed 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -25,7 +25,7 @@ #include "kvi_locale.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqimage.h> @@ -67,7 +67,7 @@ void KviImageDialogItem::paint(TQPainter * p) p->drawRect(3,3,pm->width() + 4,pm->height() + 4); } - TQRect daRect(listBox()->tqitemRect(this)); + TQRect daRect(listBox()->itemRect(this)); p->setPen(TQt::black); p->drawRect(1,1,daRect.width() - 2,daRect.height() - 2); @@ -361,7 +361,7 @@ void KviImageDialog::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->itemAt(pnt); if(!it)return; - TQRect r = m_pListBox->tqitemRect(it); + TQRect r = m_pListBox->itemRect(it); KviImageDialogItem * i = (KviImageDialogItem *)it; m_pTip->tip(r,i->tipText()); } diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 5258577..b8dd492 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -61,14 +61,14 @@ #include <tqfiledialog.h> #include "kvi_tal_popupmenu.h" #include <tqpainter.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqstringlist.h> #include "kvi_pointerlist.h" #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqmessagebox.h> #include "kvi_tal_hbox.h" -#include <tqlayout.h> +#include <layout.h> #include <tqstyle.h> #include <tqevent.h> @@ -299,10 +299,10 @@ void KviInputEditor::dropEvent(TQDropEvent *e) int KviInputEditor::heightHint() const { - return tqsizeHint().height(); + return sizeHint().height(); } -TQSize KviInputEditor::tqsizeHint() const +TQSize KviInputEditor::sizeHint() const { //grabbed from qlineedit.cpp constPolish(); @@ -454,7 +454,7 @@ void KviInputEditor::drawContents(TQPainter *p) { pa.setPen(KVI_OPTION_COLOR(KviOption_colorInputControl)); - TQString s = getSubstituteChar(m_szTextBuffer[charIdx].tqunicode()); + TQString s = getSubstituteChar(m_szTextBuffer[charIdx].unicode()); // the block width is 4 pixels more than the actual character @@ -523,9 +523,9 @@ void KviInputEditor::drawContents(TQPainter *p) { TQChar c = m_szTextBuffer.at(m_iBlockLen); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition+= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c); + m_iLastCursorXPosition+= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c); #else - m_iLastCursorXPosition+= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + m_iLastCursorXPosition+= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif m_iBlockLen++; } @@ -626,7 +626,7 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int TQChar c = m_szTextBuffer[idx]; - if((c.tqunicode() > 32) || + if((c.unicode() > 32) || ((c != TQChar(KVI_TEXT_COLOR)) && (c != TQChar(KVI_TEXT_BOLD)) && (c != TQChar(KVI_TEXT_UNDERLINE)) && (c != TQChar(KVI_TEXT_RESET)) && (c != TQChar(KVI_TEXT_REVERSE)) && @@ -637,7 +637,7 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int while((idx < ((int)(m_szTextBuffer.length()))) && (curXPos < maxXPos)) { c = m_szTextBuffer[idx]; - if((c.tqunicode() > 32) || + if((c.unicode() > 32) || ((c != TQChar(KVI_TEXT_COLOR)) && (c != TQChar(KVI_TEXT_BOLD)) && (c != TQChar(KVI_TEXT_UNDERLINE)) && (c != TQChar(KVI_TEXT_RESET)) && (c != TQChar(KVI_TEXT_REVERSE)) && (c != TQChar(KVI_TEXT_CRYPTESCAPE)) && @@ -645,9 +645,9 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int { m_iBlockLen++; #ifdef COMPILE_USE_QT4 - int xxx = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + int xxx = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - int xxx = (c.tqunicode() < 256 ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c)); + int xxx = (c.unicode() < 256 ? g_iInputFontCharWidth[c.unicode()] : fm.width(c)); #endif m_iBlockWidth +=xxx; curXPos +=xxx; @@ -658,9 +658,9 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int } else { m_bControlBlock = true; m_iBlockLen = 1; - m_iBlockWidth = g_iInputFontCharWidth[c.tqunicode()]; + m_iBlockWidth = g_iInputFontCharWidth[c.unicode()]; //Control code - switch(c.tqunicode()) + switch(c.unicode()) { case KVI_TEXT_BOLD: m_bCurBold = ! m_bCurBold; @@ -716,7 +716,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar() register int idx = 0; while(idx < m_iFirstVisibleChar) { - unsigned short c = m_szTextBuffer[idx].tqunicode(); + unsigned short c = m_szTextBuffer[idx].unicode(); if(c < 32) { switch(c) @@ -789,7 +789,7 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e) TQString szClip; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(c) { szClip = c->text(TQClipboard::Clipboard); @@ -918,7 +918,7 @@ bool KviInputEditor::hasSelection() void KviInputEditor::copyToClipboard() { if(!hasSelection())return; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); c->setText(szTxt,TQClipboard::Clipboard); @@ -928,7 +928,7 @@ void KviInputEditor::copyToClipboard() void KviInputEditor::copyToSelection(bool bDonNotCopyToClipboard) { if(!hasSelection())return; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); if(c->supportsSelection()) @@ -969,7 +969,7 @@ void KviInputEditor::removeSelected() void KviInputEditor::cut() { if(!hasSelection())return; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; c->setText(m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1),TQClipboard::Clipboard); m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); @@ -1042,7 +1042,7 @@ int KviInputEditor::replaceSegment(int start, int length, const TQString &text) void KviInputEditor::pasteClipboardWithConfirmation() { - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; TQString szText = c->text(TQClipboard::Clipboard); @@ -1057,7 +1057,7 @@ void KviInputEditor::pasteClipboardWithConfirmation() void KviInputEditor::pasteSelectionWithConfirmation() { - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; TQString szText = c->text(c->supportsSelection() ? TQClipboard::Selection : TQClipboard::Clipboard); @@ -1325,7 +1325,7 @@ void KviInputEditor::imComposeEvent(TQIMEvent *e) #endif - // tqrepaint + // repaint m_bUpdatesEnabled = true; repaintWithCursorOn(); e->accept(); @@ -1347,7 +1347,7 @@ void KviInputEditor::imEndEvent(TQIMEvent *e) // move cursor to after the IM result text moveCursorTo(m_iIMStart + m_iIMLength); - // tqrepaint + // repaint m_bUpdatesEnabled = true; repaintWithCursorOn(); @@ -1819,7 +1819,7 @@ void KviInputEditor::completion(bool bShift) bool bIsDir = false; bool bIsNick = false; - unsigned short uc = word[0].tqunicode(); + unsigned short uc = word[0].unicode(); if(uc == '/') { @@ -1845,7 +1845,7 @@ void KviInputEditor::completion(bool bShift) { if(m_pKviWindow) { - if( (word.length()==1) && (m_pKviWindow->windowName()[0].tqunicode()==uc)) + if( (word.length()==1) && (m_pKviWindow->windowName()[0].unicode()==uc)) { match=m_pKviWindow->windowName(); match.append(" "); @@ -1911,8 +1911,8 @@ void KviInputEditor::completion(bool bShift) const TQChar * b2 = KviTQString::nullTerminatedArray(match) + wLen; const TQChar * c1 = b1; const TQChar * c2 = b2; - if(bIsDir)while(c1->tqunicode() && (c1->tqunicode() == c2->tqunicode()))c1++,c2++; - else while(c1->tqunicode() && (c1->lower().tqunicode() == c2->lower().tqunicode()))c1++,c2++; + if(bIsDir)while(c1->unicode() && (c1->unicode() == c2->unicode()))c1++,c2++; + else while(c1->unicode() && (c1->lower().unicode() == c2->lower().unicode()))c1++,c2++; int len = wLen + (c1 - b1); if(len < ((int)(match.length())))match.remove(len,match.length() - len); if(!all.isEmpty())all.append(", "); @@ -2084,17 +2084,17 @@ void KviInputEditor::moveRightFirstVisibleCharToShowCursor() TQChar c = m_szTextBuffer.at(m_iCursorPosition); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + m_iLastCursorXPosition += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - m_iLastCursorXPosition += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + m_iLastCursorXPosition += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif while(m_iLastCursorXPosition >= contentsRect().width()-2*KVI_INPUT_MARGIN) { c = m_szTextBuffer.at(m_iFirstVisibleChar); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition -= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + m_iLastCursorXPosition -= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - m_iLastCursorXPosition -= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + m_iLastCursorXPosition -= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif m_iFirstVisibleChar++; } @@ -2127,9 +2127,9 @@ int KviInputEditor::charIndexFromXPosition(int xPos) { TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - int widthCh = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + int widthCh = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - int widthCh = (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + int widthCh = (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif if(xPos < (curXPos+(widthCh/2)))return curChar; else if(xPos < (curXPos+widthCh))return (curChar+1); @@ -2150,9 +2150,9 @@ int KviInputEditor::xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bCo { TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - curXPos += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + curXPos += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif curChar++; } @@ -2170,9 +2170,9 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) { TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - curXPos += c.tqunicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.tqunicode())) + 3 : g_pLastFontMetrics->width(c); + curXPos += c.unicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.unicode())) + 3 : g_pLastFontMetrics->width(c); #else - curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : g_pLastFontMetrics->width(c); + curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : g_pLastFontMetrics->width(c); #endif curChar++; } @@ -2335,9 +2335,9 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pButtonContainer->setSpacing(0); #ifdef COMPILE_USE_QT4 - m_pButtonContainer->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred)); -// if(m_pButtonContainer->tqlayout()) -// m_pButtonContainer->tqlayout()->setSizeConstraint(TQLayout::SetMinimumSize); + m_pButtonContainer->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred)); +// if(m_pButtonContainer->layout()) +// m_pButtonContainer->layout()->setSizeConstraint(TQLayout::SetMinimumSize); #endif m_pHistoryButton = new KviStyledToolButton(m_pButtonContainer,"historybutton"); @@ -2396,9 +2396,9 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pInputEditor = new KviInputEditor(this,par,view); connect(m_pInputEditor,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(inputEditorEnterPressed())); #ifdef COMPILE_USE_QT4 - m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored)); + m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored)); #else - m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored)); + m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored)); #endif @@ -2497,7 +2497,7 @@ void KviInput::keyPressEvent(TQKeyEvent *e) "here to prevent you from accidentally sending<br>" \ "a really large message just because you didn't edit it<br>" \ "properly after pasting text from the clipboard.<br><br>" \ - "Do you want the message to be sent?").tqarg(nLines), + "Do you want the message to be sent?").arg(nLines), __tr2qs("Yes, always"), __tr2qs("Yes"), __tr2qs("No"), @@ -2543,7 +2543,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) KviScriptEditor::destroyInstance(m_pMultiLineEditor); m_pMultiLineEditor = 0; m_pInputEditor->show(); - m_pWindow->tqchildrenTreeChanged(0); + m_pWindow->childrenTreeChanged(0); m_pInputEditor->setFocus(); m_pMultiEditorButton->setOn(false); } else { @@ -2556,7 +2556,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) m_pMultiLineEditor->setFindLineeditReadOnly(true); m_pInputEditor->hide(); m_pMultiLineEditor->show(); - m_pWindow->tqchildrenTreeChanged(m_pMultiLineEditor); + m_pWindow->childrenTreeChanged(m_pMultiLineEditor); m_pMultiLineEditor->setFocus(); m_pMultiEditorButton->setOn(true); } @@ -2596,14 +2596,14 @@ void KviInput::historyButtonClicked() void KviInput::setFocus() { - // redirect setFocus() to the right tqchildren + // redirect setFocus() to the right children if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); else m_pInputEditor->setFocus(); } void KviInput::focusInEvent(TQFocusEvent * e) { - // if we get a focus in event , redirect the focus to the tqchildren + // if we get a focus in event , redirect the focus to the children if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); else m_pInputEditor->setFocus(); } diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 777fb41..6e2d5c9 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -144,7 +144,7 @@ protected: bool m_bReadOnly; public: int heightHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void setText(const TQString text); TQString text() { return m_szTextBuffer; }; void insertChar(TQChar c); diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 0e12d2d..df15e02 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -208,7 +208,7 @@ void KviIpEditor::recreateChildren() m_pEdit[i] = new TQLineEdit(this); m_pEdit[i]->installEventFilter(this); m_pEdit[i]->setFrame(false); - m_pEdit[i]->tqsetAlignment(TQt::AlignCenter); + m_pEdit[i]->setAlignment(TQt::AlignCenter); } //m_pEdit[i]->setMinimumWidth(minWidth); m_pEdit[i]->setMaxLength(bIpV4 ? 3 : 4); @@ -243,8 +243,8 @@ void KviIpEditor::recreateChildren() } } } - //setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->tqsizeHint().width())); - setMinimumHeight(m_pLabel[0]->tqsizeHint().height() + 4); + //setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->sizeHint().width())); + setMinimumHeight(m_pLabel[0]->sizeHint().height() + 4); resizeEvent(0); } @@ -395,7 +395,7 @@ void KviIpEditor::resizeEvent(TQResizeEvent *e) if(m_pEdit[0]) { int maxW = (m_addrType == IpV4) ? 4 : 8; - int labHint = m_pLabel[0]->tqsizeHint().width(); + int labHint = m_pLabel[0]->sizeHint().width(); int hghHint = height() - 4; int ediWdth = ((width() - 4) - ((maxW - 1) * labHint)) / maxW; int curX = 2; @@ -413,16 +413,16 @@ void KviIpEditor::resizeEvent(TQResizeEvent *e) if(e)TQFrame::resizeEvent(e); } -TQSize KviIpEditor::tqsizeHint() +TQSize KviIpEditor::sizeHint() { if(m_pEdit[0]) { - int labHint = m_pLabel[0]->tqsizeHint().width(); - int hghHint = m_pEdit[0]->tqsizeHint().height(); - int ediHint = m_pEdit[0]->tqsizeHint().width(); + int labHint = m_pLabel[0]->sizeHint().width(); + int hghHint = m_pEdit[0]->sizeHint().height(); + int ediHint = m_pEdit[0]->sizeHint().width(); if(m_addrType == IpV4)return TQSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4); else return TQSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4); - } else return TQFrame::tqsizeHint(); + } else return TQFrame::sizeHint(); } diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h index 19e2a3c..625f164 100644 --- a/src/kvirc/ui/kvi_ipeditor.h +++ b/src/kvirc/ui/kvi_ipeditor.h @@ -55,7 +55,7 @@ public: protected: virtual bool eventFilter(TQObject * o,TQEvent *e); virtual void resizeEvent(TQResizeEvent *e); - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); private: void recreateChildren(); }; diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index e551771..102a409 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -44,7 +44,7 @@ #include <tqstyle.h> #include <tqpainter.h> #include "kvi_tal_popupmenu.h" -#include <tqlayout.h> +#include <layout.h> #ifdef COMPILE_USE_QT4 #include <tqevent.h> @@ -77,7 +77,7 @@ KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(TQWidget * par,const char * setMouseTracking(true); m_bResizeMode = false; - m_tqsizeHint = TQSize(180,32); + m_sizeHint = TQSize(180,32); m_bSizeLoaded = false; } @@ -95,16 +95,16 @@ void KviToolBarGraphicalApplet::saveAppletWidth(unsigned int uWidth) void KviToolBarGraphicalApplet::setupSizeHint() { - m_tqsizeHint = TQSize(loadAppletWidth(),22); + m_sizeHint = TQSize(loadAppletWidth(),22); m_bSizeLoaded = true; } -TQSize KviToolBarGraphicalApplet::tqsizeHint() const +TQSize KviToolBarGraphicalApplet::sizeHint() const { // forget constness :( KviToolBarGraphicalApplet * that = (KviToolBarGraphicalApplet *)this; if(!m_bSizeLoaded)that->setupSizeHint(); - return m_tqsizeHint; + return m_sizeHint; } /* @@ -127,7 +127,7 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e) int w = e->pos().x(); if(w < 32)w = 32; if(w > 480)w = 480; - m_tqsizeHint = TQSize(w,22); + m_sizeHint = TQSize(w,22); resize(w,height()); g_pApp->postEvent(parentWidget(),new TQEvent(TQEvent::LayoutHint)); } @@ -155,7 +155,7 @@ void KviToolBarGraphicalApplet::mouseReleaseEvent(TQMouseEvent * e) KviToolBarGraphicalApplet::~KviToolBarGraphicalApplet() { - saveAppletWidth(m_tqsizeHint.width()); + saveAppletWidth(m_sizeHint.width()); g_pToolBarGraphicalAppletList->removeRef(this); if(g_pToolBarGraphicalAppletList->isEmpty()) { @@ -208,10 +208,10 @@ void KviToolBarGraphicalApplet::paintEvent(TQPaintEvent *e) drawContents(&pa); //Need to draw the sunken rect around the view now... - pa.setPen(tqcolorGroup().dark()); + pa.setPen(colorGroup().dark()); pa.drawLine(0,0,width(),0); pa.drawLine(0,0,0,width()); - pa.setPen(tqcolorGroup().light()); + pa.setPen(colorGroup().light()); pa.drawLine(1,height() - 1,width() - 1,height() - 1); pa.drawLine(width() - 1,1,width() - 1,height()); @@ -332,7 +332,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const TQPoint &) /* -TQSize KviIrcContextDisplay::tqsizeHint() const +TQSize KviIrcContextDisplay::sizeHint() const { return TQSize(160,22); } @@ -416,7 +416,7 @@ void KviIrcContextDisplay::drawContents(TQPainter * p) p->setClipping(false); - TQColor base = tqcolorGroup().background(); + TQColor base = colorGroup().background(); TQColor cntx = KVI_OPTION_ICCOLOR(c->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1, (base.blue() + cntx.blue()) >> 1); diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h index dd6c93e..1b1d94e 100644 --- a/src/kvirc/ui/kvi_irctoolbar.h +++ b/src/kvirc/ui/kvi_irctoolbar.h @@ -55,7 +55,7 @@ public: private: bool m_bResizeMode; bool m_bSizeLoaded; - TQSize m_tqsizeHint; + TQSize m_sizeHint; private: void resizeMemBuffer(); protected: @@ -63,7 +63,7 @@ protected: virtual unsigned int loadAppletWidth(); virtual void saveAppletWidth(unsigned int uWidth); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void mouseMoveEvent(TQMouseEvent *e); virtual void mousePressEvent(TQMouseEvent *e); virtual void mouseReleaseEvent(TQMouseEvent *e); diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index a500c46..1987790 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -117,7 +117,7 @@ #include <tqapplication.h> #include "kvi_tal_popupmenu.h" #include <tqmessagebox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqdatetime.h> #include <tqevent.h> @@ -134,7 +134,7 @@ #include <tqcursor.h> #endif -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdatetime.h> #include <tqmessagebox.h> #include <tqscrollbar.h> @@ -165,7 +165,7 @@ #define KVI_DEF_BACK 200 -// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (tqsizeHint() ?)" +// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (sizeHint() ?)" // // FIXME: PgUp and PgDn scrolls a fixed number of lines! @@ -243,12 +243,12 @@ void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t * kvi_wslen_t oldLen = qstrptr->length(); qstrptr->setLength(oldLen + len); #ifdef WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR - _WSTRING_WMEMCPY(qstrptr->tqunicode() + oldLen,ptr,len); + _WSTRING_WMEMCPY(qstrptr->unicode() + oldLen,ptr,len); #else // !WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR - TQChar * c = (qstrptr->tqunicode() + oldLen); + TQChar * c = (qstrptr->unicode() + oldLen); while(*ptr) { - c->tqunicode() = *ptr; + c->unicode() = *ptr; ptr++; c++; } @@ -290,7 +290,7 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd) #ifdef COMPILE_USE_QT4 setAttribute(TQt::WA_NoSystemBackground); // This disables automatic qt double buffering setAttribute(TQt::WA_OpaquePaintEvent); - //setAttribute(TQt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger tqrepaint() instead of the 10 times faster paintEvent(0)) + //setAttribute(TQt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger repaint() instead of the 10 times faster paintEvent(0)) #endif m_iFlushTimer = 0; @@ -346,7 +346,7 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pMessagesStoppedWhileSelecting = new KviPointerList<KviIrcViewLine>; m_pMessagesStoppedWhileSelecting->setAutoDelete(false); - // say qt to avoid erasing on tqrepaint + // say qt to avoid erasing on repaint #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else @@ -532,7 +532,7 @@ void KviIrcView::stopLogging() if(m_pLogFile) { TQString szLogEnd; - szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data()); + szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); add2Log(szLogEnd); m_pLogFile->close(); @@ -706,7 +706,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) } TQString szLogStart; - szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data()); + szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); add2Log(szLogStart); if(bPrependCurBuffer) { @@ -723,7 +723,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) void KviIrcView::add2Log(const TQString &szBuffer,int iMsgType) { - TQString szToWrite=TQString("%1 %2\n").tqarg(iMsgType).tqarg(szBuffer); + TQString szToWrite=TQString("%1 %2\n").arg(iMsgType).arg(szBuffer); KviTQCString szTmp = KviTQString::toUtf8(szToWrite); if(m_pLogFile->writeBlock(szTmp.data(),szTmp.length())==-1) debug("WARNING : Can not write to the log file."); } @@ -803,7 +803,7 @@ void KviIrcView::clearLineMark(bool bRepaint) void KviIrcView::checkLogDate() { - TQDate::tqcurrentDate(); + TQDate::currentDate(); } void KviIrcView::clearUnreaded() @@ -900,7 +900,7 @@ void KviIrcView::scrollBarPositionChanged(int newValue) } } if(!m_bSkipScrollBarRepaint) - tqrepaint(); + repaint(); //update(); // if(!m_bSkipScrollBarRepaint)postUpdateEvent(); } @@ -911,7 +911,7 @@ bool KviIrcView::event(TQEvent *e) { __range_valid(m_bPostedPaintEventPending); if(m_iUnprocessedPaintEventRequests) - tqrepaint(); + repaint(); // else we just had a pointEvent that did the job m_bPostedPaintEventPending = false; return true; @@ -935,12 +935,12 @@ void KviIrcView::wheelEvent(TQWheelEvent *e) void KviIrcView::postUpdateEvent() { - // This will post a TQEvent with a full tqrepaint request + // This will post a TQEvent with a full repaint request if(!m_bPostedPaintEventPending) { m_bPostedPaintEventPending = true; TQEvent *e = new TQEvent(TQEvent::User); - g_pApp->postEvent(this,e); // queue a tqrepaint + g_pApp->postEvent(this,e); // queue a repaint } m_iUnprocessedPaintEventRequests++; // paintEvent() will set it to 0 @@ -956,7 +956,7 @@ void KviIrcView::postUpdateEvent() fastScroll(3); #endif else - tqrepaint(); + repaint(); } } @@ -1093,7 +1093,7 @@ void KviIrcView::removeHeadLine(bool bRepaint) m_pLastLine = 0; } if(bRepaint) - tqrepaint(); + repaint(); } void KviIrcView::splitMessagesTo(KviIrcView *v) @@ -1150,12 +1150,12 @@ void KviIrcView::splitMessagesTo(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - tqrepaint(); + repaint(); v->m_iLastScrollBarValue = v->m_iNumLines; v->m_pScrollBar->setRange(0,v->m_iNumLines); v->m_pScrollBar->setValue(v->m_iNumLines); - v->tqrepaint(); + v->repaint(); } @@ -1183,7 +1183,7 @@ void KviIrcView::appendMessagesFrom(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - tqrepaint(); + repaint(); } void KviIrcView::joinMessagesFrom(KviIrcView *v) @@ -1243,7 +1243,7 @@ void KviIrcView::joinMessagesFrom(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - tqrepaint(); + repaint(); } void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) @@ -1264,7 +1264,7 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) { TQString szBuffer; kvi_appendWCharToTQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr)); - szBuffer.prepend(TQDateTime::tqcurrentDateTime().toString("[h:mm:ss] ")); + szBuffer.prepend(TQDateTime::currentDateTime().toString("[h:mm:ss] ")); if(m_pLogFile && KVI_OPTION_MSGTYPE(iMsgType).logEnabled()) { add2Log(szBuffer,iMsgType); @@ -1923,7 +1923,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, if(bEnableTimeStamp && KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)) { TQString szTimestamp; - szTimestamp=TQDateTime::tqcurrentDateTime ( + szTimestamp=TQDateTime::currentDateTime ( KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? Qt::UTC : Qt::LocalTime ).toString( KVI_OPTION_STRING(KviOption_stringIrcViewTimestampFormat) ); szTimestamp.append(' '); @@ -1964,8 +1964,8 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, iTextIdx = iTimeStampLength; // the rest of the string will begin 11 chars later // throw away const: we WANT to set the chars :D - register TQChar * data_ptr_aux = (TQChar *)line_ptr->szText.tqunicode(); - register TQChar * stamp_ptr_aux = (TQChar *)szTimestamp.tqunicode(); + register TQChar * data_ptr_aux = (TQChar *)line_ptr->szText.unicode(); + register TQChar * stamp_ptr_aux = (TQChar *)szTimestamp.unicode(); for(int i=0;i<iTimeStampLength;i++) *data_ptr_aux++ = *stamp_ptr_aux++; @@ -2713,8 +2713,8 @@ void KviIrcView::fastScroll(int lines) if(!m_pFm) { // We must get the metrics from a real paint event :/ - // must do a full tqrepaint to get them... - tqrepaint(); + // must do a full repaint to get them... + repaint(); return; } @@ -2788,7 +2788,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p) int widgetWidth = width() - scrollbarWidth; if(!isVisible() || (widgetWidth < 20)) { - m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown... + m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown... return; //can't show stuff here } @@ -2800,7 +2800,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p) (m_pKviWindow->mdiParent() != g_pFrame->mdiManager()->topChild()) && (m_pKviWindow->mdiParent())) { - m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown... + m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown... return; // totally hidden behind other windows } @@ -3428,10 +3428,10 @@ no_selection_paint: } //Need to draw the sunken rect around the view now... - pa.setPen(tqcolorGroup().dark()); + pa.setPen(colorGroup().dark()); pa.drawLine(0,0,widgetWidth,0); pa.drawLine(0,0,0,widgetHeight); - pa.setPen(tqcolorGroup().light()); + pa.setPen(colorGroup().light()); widgetWidth--; pa.drawLine(1,widgetHeight-1,widgetWidth,widgetHeight-1); pa.drawLine(widgetWidth,1,widgetWidth,widgetHeight); @@ -3449,7 +3449,7 @@ no_selection_paint: // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#define IRCVIEW_WCHARWIDTH(__c) (((__c).tqunicode() < 0xff) ? m_iFontCharacterWidth[(__c).tqunicode()] : m_pFm->width(__c)) +#define IRCVIEW_WCHARWIDTH(__c) (((__c).unicode() < 0xff) ? m_iFontCharacterWidth[(__c).unicode()] : m_pFm->width(__c)) void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) { @@ -3476,12 +3476,12 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) int maxBlockLen = ptr->pChunks->iTextLen; // ptr->pChunks[0].iTextLen - const TQChar * tqunicode = ptr->szText.tqunicode(); + const TQChar * unicode = ptr->szText.unicode(); for(;;) { //Calculate the block_width - register const TQChar * p = tqunicode + ptr->pBlocks[ptr->iBlockCount].block_start; + register const TQChar * p = unicode + ptr->pBlocks[ptr->iBlockCount].block_start; int curBlockLen = 0; int curBlockWidth = 0; @@ -3546,7 +3546,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->iBlockCount++; ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock)); - ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode; + ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode; ptr->pBlocks[ptr->iBlockCount].block_len = 0; ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->pBlocks[ptr->iBlockCount].pChunk = &(ptr->pChunks[curAttrBlock]); @@ -3579,7 +3579,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) maxBlockLen-=curBlockLen; ptr->iBlockCount++; ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock)); - ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode; + ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode; ptr->pBlocks[ptr->iBlockCount].block_len = 0; ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->pBlocks[ptr->iBlockCount].pChunk = 0; @@ -3632,8 +3632,8 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,i // // Yahoo!!!! // - const TQChar * tqunicode = line->szText.tqunicode(); - register const TQChar * p = tqunicode + line->pBlocks[bufIndex].block_start; + const TQChar * unicode = line->szText.unicode(); + register const TQChar * p = unicode + line->pBlocks[bufIndex].block_start; int top = bottom-m_iFontLineSpacing; int right = ((line->pBlocks[bufIndex].block_width >= 0) ? \ @@ -3858,7 +3858,7 @@ void KviIrcView::recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &f void KviIrcView::resizeEvent(TQResizeEvent *) { - int iScr = m_pScrollBar->tqsizeHint().width(); + int iScr = m_pScrollBar->sizeHint().width(); int iLeft = width()-iScr; m_pToolsButton->setGeometry(iLeft,0,iScr,iScr); m_pScrollBar->setGeometry(iLeft,iScr,iScr,height() - iScr); @@ -3873,7 +3873,7 @@ void KviIrcView::resizeEvent(TQResizeEvent *) } } -TQSize KviIrcView::tqsizeHint() const +TQSize KviIrcView::sizeHint() const { TQSize ret(KVI_IRCVIEW_SIZEHINT_WIDTH,KVI_IRCVIEW_SIZEHINT_HEIGHT); return ret; @@ -3900,7 +3900,7 @@ void KviIrcView::showToolsPopup() m_pToolsPopup->insertSeparator(); m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,TQT_SLOT(clearBuffer())); - TQSize s = m_pToolsPopup->tqsizeHint(); + TQSize s = m_pToolsPopup->sizeHint(); m_pToolsPopup->popup(m_pToolsButton->mapToGlobal(TQPoint(m_pToolsButton->width() - s.width(),m_pToolsButton->height()))); } @@ -3955,11 +3955,11 @@ void KviIrcView::toggleToolWidget() delete m_pToolWidget; m_pToolWidget = 0; m_pCursorLine = 0; - tqrepaint(); + repaint(); } else { m_pToolWidget = new KviIrcViewToolWidget(this); - int w = m_pToolWidget->tqsizeHint().width(); + int w = m_pToolWidget->sizeHint().width(); m_pToolWidget->move(width() - (w + 40),10); m_pToolWidget->show(); } @@ -3979,7 +3979,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) if(m_pCursorLine == m_pCurLine) { - tqrepaint(); + repaint(); return; } @@ -4000,7 +4000,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) m_iLastScrollBarValue = sc; m_pScrollBar->setValue(sc); } else { - tqrepaint(); + repaint(); } } else { // The cursor line is over the current line @@ -4034,7 +4034,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) m_iLastScrollBarValue = sc; m_pScrollBar->setValue(sc); } else { - tqrepaint(); + repaint(); } } } @@ -4086,7 +4086,7 @@ do_pNext: } while(l != start); } m_pCursorLine = 0; - tqrepaint(); + repaint(); if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found")); } @@ -4140,7 +4140,7 @@ do_pPrev: } m_pCursorLine = 0; - tqrepaint(); + repaint(); if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found")); } @@ -4302,12 +4302,12 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect szLink.append(TQChar(KVI_TEXT_COLOR)); if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KVI_NOCHANGE) { - szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); + szLink.append(TQString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); } if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KVI_NOCHANGE) { szLink.append(TQChar(',')); - szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back))); + szLink.append(TQString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back))); } break; } @@ -4479,7 +4479,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) pParams->append(szCmd); - switch(linkCmd[0].tqunicode()) + switch(linkCmd[0].unicode()) { case 'n': { @@ -4517,7 +4517,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) if(((KviChannel *)m_pKviWindow)->isMeOp()) { TQChar plmn = linkCmd[1]; - if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) + if((plmn.unicode() == '+') || (plmn.unicode() == '-')) { TQString target(m_pKviWindow->windowName()); target.replace("\\","\\\\"); @@ -4526,7 +4526,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) target.replace("$","\\$"); target.replace("%","\\%"); TQChar flag = linkCmd[2]; - switch(flag.tqunicode()) + switch(flag.unicode()) { case 'o': case 'v': @@ -4581,7 +4581,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) c->raise(); c->setFocus(); } else { - cmd = TQString("join %1").tqarg(szChan); + cmd = TQString("join %1").arg(szChan); } } } @@ -4619,7 +4619,7 @@ void KviIrcView::mousePressEvent(TQMouseEvent *e) if(m_pToolWidget) { m_pCursorLine = getVisibleLineAt(e->pos().x(),e->pos().y()); - tqrepaint(); + repaint(); } m_mousePressPos = e->pos(); @@ -4669,7 +4669,7 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) { if(!linkCmd.isEmpty()) { - switch(linkCmd[0].tqunicode()) + switch(linkCmd[0].unicode()) { case 'n': { @@ -4782,7 +4782,7 @@ void KviIrcView::mouseReleaseEvent(TQMouseEvent *) { killTimer(m_iSelectTimer); m_iSelectTimer = 0; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(c) { // copy to both! @@ -4802,7 +4802,7 @@ void KviIrcView::mouseReleaseEvent(TQMouseEvent *) m_pMessagesStoppedWhileSelecting->removeFirst(); appendLine(l,false); } - tqrepaint(); + repaint(); } } @@ -4858,11 +4858,11 @@ void KviIrcView::mouseMoveEvent(TQMouseEvent *e) int lastBottom = m_iLastLinkRectTop + m_iLastLinkRectHeight; int thisBottom = rectTop + rectHeight; TQRect r(0,top,width(),((lastBottom > thisBottom) ? lastBottom : thisBottom) - top); - tqrepaint(r); + repaint(r); } else { // no prev link TQRect r(0,rectTop,width(),rectHeight); - tqrepaint(r); + repaint(r); } m_iLastLinkRectTop = rectTop; m_iLastLinkRectHeight = rectHeight; @@ -4872,7 +4872,7 @@ void KviIrcView::mouseMoveEvent(TQMouseEvent *e) { // There was a previous bottom rect TQRect r(0,m_iLastLinkRectTop,width(),m_iLastLinkRectHeight); - tqrepaint(r); + repaint(r); m_iLastLinkRectTop = -1; m_iLastLinkRectHeight = -1; } @@ -4896,7 +4896,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin TQString tip; - switch(linkCmd[0].tqunicode()) + switch(linkCmd[0].unicode()) { case 'u': // url link { @@ -4972,11 +4972,11 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin if(((KviChannel *)m_pKviWindow)->isMeOp()) { TQChar plmn = linkCmd[1]; - if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) + if((plmn.unicode() == '+') || (plmn.unicode() == '-')) { tip = __tr2qs("Double-click to set<br>"); TQChar flag = linkCmd[2]; - switch(flag.tqunicode()) + switch(flag.unicode()) { case 'o': case 'v': @@ -5100,7 +5100,7 @@ void KviIrcView::timerEvent(TQTimerEvent *e) if(e->timerId() == m_iSelectTimer) { calculateSelectionBounds(); - tqrepaint(); + repaint(); } if(e->timerId() == m_iMouseTimer) { diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 092d5ed..84b485f 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -197,7 +197,7 @@ public: void nextLine(); void nextPage(); void prevPage(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; const TQString & lastLineOfText(); const TQString & lastMessageText(); virtual void setFont(const TQFont &f); diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/kvi_ircviewprivate.h index 790976b..34c70c4 100644 --- a/src/kvirc/ui/kvi_ircviewprivate.h +++ b/src/kvirc/ui/kvi_ircviewprivate.h @@ -148,7 +148,7 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag #endif //!COMPILE_ON_WINDOWS //========================================================================================================= -// Screen tqlayout +// Screen layout //========================================================================================================= //FIRST LINE (prev_line = 0) <---m_pFirstLine diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index c6f4138..6b076b0 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -38,7 +38,7 @@ #include <tqtoolbutton.h> #include <tqtabwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqpushbutton.h> @@ -278,7 +278,7 @@ void KviIrcViewToolWidget::filterSave() void KviIrcViewToolWidget::forceRepaint() { #if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) - m_pIrcView->tqrepaint(); + m_pIrcView->repaint(); #else m_pIrcView->paintEvent(0); #endif diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index c0dd4ba..168db46 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -190,7 +190,7 @@ void KviListView::resizeEvent(TQResizeEvent * e) { KviTalListView::resizeEvent(e); if(m_pBackgroundOverlayPixmap) - repaintContents(); // force a full tqrepaint (otherwise qt does not honor static background here) + repaintContents(); // force a full repaint (otherwise qt does not honor static background here) } #ifdef COMPILE_ON_WINDOWS diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index 21921b5..b5036b5 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -32,7 +32,7 @@ #include "kvi_toolwindows_container.h" #include "kvi_channel.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvalidator.h> diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index f1d47c9..7f57350 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -81,11 +81,11 @@ void KviMdiCaptionButton::drawButton(TQPainter *p) #ifdef COMPILE_USE_QT4 TQBrush b(parentWidget()->palette().window()); #else - TQBrush b(parentWidget()->tqcolorGroup().background()); + TQBrush b(parentWidget()->colorGroup().background()); #endif if(isDown()) - qDrawShadePanel(p,0,0,width(),height(),tqcolorGroup(),true,1,&b); + qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b); else p->fillRect(0,0,width(),height(),b); @@ -229,7 +229,7 @@ void KviMdiCaption::paintEvent(TQPaintEvent * e) TQPainter p(this); p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font()); - rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup()); + rt.draw(&p,height() + 2,-1,rect(),colorGroup()); } void KviMdiCaption::mouseReleaseEvent(TQMouseEvent *) @@ -278,7 +278,7 @@ KviMenuBarToolButton::~KviMenuBarToolButton() { } -TQSize KviMenuBarToolButton::tqsizeHint() const +TQSize KviMenuBarToolButton::sizeHint() const { return TQSize(20,20); } diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h index c46572a..d214d9a 100644 --- a/src/kvirc/ui/kvi_mdicaption.h +++ b/src/kvirc/ui/kvi_mdicaption.h @@ -57,7 +57,7 @@ public: KviMenuBarToolButton(TQWidget * par,const TQPixmap &img, const char * name); ~KviMenuBarToolButton(); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; }; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index 2bf0130..1a8dccc 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -112,7 +112,7 @@ TQRect KviMdiChild::restoredGeometry() { if(m_state == Maximized)return m_restoredGeometry; else return TQRect(x(),y(),width(),height()); -// else return tqgeometry(); +// else return geometry(); } @@ -172,7 +172,7 @@ void KviMdiChild::setCaption(const TQString & plain,const TQString & xmlActive,c void KviMdiChild::maximize() { if(m_state == Minimized)restore(); // restore first - if(m_state == Normal)m_restoredGeometry = tqgeometry(); + if(m_state == Normal)m_restoredGeometry = geometry(); m_state = Maximized; manager()->maximizeChild(this); } @@ -225,7 +225,7 @@ void KviMdiChild::minimize() m_pManager->childMinimized(this,true); break; case Normal: - m_restoredGeometry = tqgeometry(); + m_restoredGeometry = geometry(); hide(); m_state = Minimized; m_pManager->childMinimized(this,false); @@ -442,8 +442,8 @@ void KviMdiChild::calculateResizeRect(int resizeCorner,TQPoint mousePos,TQRect & void KviMdiChild::calculateMinimumSize(int &minWidth,int &minHeight) { if(m_pClient){ - minWidth = m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1); - minHeight = m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+ + minWidth = m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1); + minHeight = m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+ m_pCaption->heightHint() + KVI_MDICHILD_SPACING; } if(minWidth<KVI_MDICHILD_MIN_WIDTH)minWidth=KVI_MDICHILD_MIN_WIDTH; @@ -508,10 +508,10 @@ void KviMdiChild::setClient(TQWidget *w) */ //linkChildren(w); - if(m_pClient->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH && - m_pClient->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){ - setMinimumWidth(m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1)); - setMinimumHeight(m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1) + + if(m_pClient->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH && + m_pClient->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){ + setMinimumWidth(m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1)); + setMinimumHeight(m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1) + m_pCaption->heightHint() + KVI_MDICHILD_SPACING); } @@ -561,16 +561,16 @@ void KviMdiChild::focusInEvent(TQFocusEvent *) #endif } -TQSize KviMdiChild::tqsizeHint() +TQSize KviMdiChild::sizeHint() { if(m_pClient) { - TQSize s = m_pClient->tqsizeHint(); + TQSize s = m_pClient->sizeHint(); TQSize ret(s.width() + (KVI_MDICHILD_BORDER << 1), s.height() + (KVI_MDICHILD_BORDER << 1) + KVI_MDICHILD_SPACING + m_pCaption->heightHint()); return ret; } - return TQFrame::tqsizeHint(); + return TQFrame::sizeHint(); } diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h index feac48b..6d7b879 100644 --- a/src/kvirc/ui/kvi_mdichild.h +++ b/src/kvirc/ui/kvi_mdichild.h @@ -77,7 +77,7 @@ public: const TQString & xmlActiveCaption(){ return m_szXmlActiveCaption; }; const TQString & xmlInactiveCaption(){ return m_szXmlInactiveCaption; }; void setCaption(const TQString & plain,const TQString & xmlActive,const TQString & xmlInactive); - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); void setIcon(const TQPixmap &pix); const TQPixmap * icon(); void enableClose(bool bEnable); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 9163595..9d6fa18 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -38,7 +38,7 @@ #include "kvi_tal_popupmenu.h" #include <tqmenubar.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <math.h> #include <tqcursor.h> @@ -199,7 +199,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) return; // no such child ? } - // disable the labels of all the other tqchildren + // disable the labels of all the other children //for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) //{ // pC->captionLabel()->setActive(false); @@ -225,7 +225,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) { lpC->setFocus(); /* - if(tqtopLevelWidget()->isActiveWindow()) + if(topLevelWidget()->isActiveWindow()) { } @@ -284,8 +284,8 @@ TQPoint KviMdiManager::getCascadePoint(int indexOfWindow) if(indexOfWindow==0)return pnt; KviMdiChild *lpC=m_pZ->first(); int step=(lpC ? (lpC->captionLabel()->heightHint()+KVI_MDICHILD_BORDER) : 20); - int availableHeight=viewport()->height()-(lpC ? lpC->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT); - int availableWidth=viewport()->width()-(lpC ? lpC->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH); + int availableHeight=viewport()->height()-(lpC ? lpC->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT); + int availableWidth=viewport()->width()-(lpC ? lpC->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH); int ax=0; int ay=0; for(int i=0;i<indexOfWindow;i++) @@ -313,7 +313,7 @@ void KviMdiManager::childMoved(KviMdiChild *) void KviMdiManager::maximizeChild(KviMdiChild * lpC) { - // the tqchildren must be moved once by the means of TQScrollView::moveChild() + // the children must be moved once by the means of TQScrollView::moveChild() // so the TQScrollView internal structures get updated with the negative // position of the widget, otherwise, when restoring with moveChild() // it will refuse to move it back to the original position @@ -338,14 +338,14 @@ void KviMdiManager::maximizeChild(KviMdiChild * lpC) lpC->setFocus(); } - // fixme: we could hide all the other tqchildren now! + // fixme: we could hide all the other children now! } void KviMdiManager::resizeEvent(TQResizeEvent *e) { - //If we have a maximized tqchildren at the top , adjust its size + //If we have a maximized children at the top , adjust its size KviTalScrollView::resizeEvent(e); KviMdiChild *lpC=m_pZ->last(); if(lpC) @@ -431,7 +431,7 @@ void KviMdiManager::focusTopChild() if(!lpC->isVisible())return; // if(lpC->state()==KviMdiChild::Minimized)return; // debug("Focusing top child %s",lpC->name()); - //disable the labels of all the other tqchildren + //disable the labels of all the other children for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) { if(pC != lpC) @@ -591,7 +591,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) // This is an obscure, undocumented and internal function in QT4 TQMenuBar // I won't be surprised if this disappears.... b->setCornerWidget(m_pSdiControls,TQt::TopRightCorner); - // The show below SHOULD force a re-tqlayout of the menubar.. + // The show below SHOULD force a re-layout of the menubar.. // but it doesn't work when the KviFrame is still hidden (at startup) // We handle this BUG in showEvent() m_pSdiControls->show(); @@ -611,7 +611,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) void KviMdiManager::relayoutMenuButtons() { #ifdef COMPILE_USE_QT4 - // force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode()) + // force a re-layout of the menubar in TQt4 (see the note in enterSDIMode()) // by resetting the corner widget if(m_pSdiControls) { @@ -662,7 +662,7 @@ void KviMdiManager::leaveSDIMode() } if(m_pSdiIconButton) { - m_pSdiIconButton->hide(); // this will force a TQMenuBar retqlayout + m_pSdiIconButton->hide(); // this will force a TQMenuBar relayout delete m_pSdiIconButton; m_pSdiIconButton = 0; } @@ -814,7 +814,7 @@ void KviMdiManager::cascadeWindows() { TQPoint p = getCascadePoint(idx); moveChild(lpC,p.x(),p.y()); - lpC->resize(lpC->tqsizeHint()); + lpC->resize(lpC->sizeHint()); idx++; } list.removeFirst(); @@ -844,8 +844,8 @@ void KviMdiManager::cascadeMaximized() TQPoint pnt(getCascadePoint(idx)); moveChild(lpC,pnt.x(),pnt.y()); TQSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y()); - if((lpC->tqminimumSize().width() > curSize.width()) || - (lpC->tqminimumSize().height() > curSize.height()))lpC->resize(lpC->tqminimumSize()); + if((lpC->minimumSize().width() > curSize.width()) || + (lpC->minimumSize().height() > curSize.height()))lpC->resize(lpC->minimumSize()); else lpC->resize(curSize); idx++; } @@ -1007,13 +1007,13 @@ void KviMdiManager::tileAllInternal(int maxWnds,bool bHorizontal) int numToHandle=((numVisible > maxWnds) ? maxWnds : numVisible); int xQuantum=viewport()->width()/pColstable[numToHandle-1]; - if(xQuantum < ((lpTop->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ + if(xQuantum < ((lpTop->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ if(pColrecall[numToHandle-1]==0)debug("Tile : Not enouh space"); else tileAllInternal(pColrecall[numToHandle-1],bHorizontal); return; } int yQuantum=viewport()->height()/pRowstable[numToHandle-1]; - if(yQuantum < ((lpTop->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ + if(yQuantum < ((lpTop->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ if(pRowrecall[numToHandle-1]==0)debug("Tile : Not enough space"); else tileAllInternal(pRowrecall[numToHandle-1],bHorizontal); return; @@ -1073,7 +1073,7 @@ void KviMdiManager::tileAnodine() int numVisible=getVisibleChildCount(); // count visible windows if(numVisible<1)return; int numCols=int(sqrt((double)numVisible)); // set columns to square root of visible count - // create an array to form grid tqlayout + // create an array to form grid layout int *numRows=new int[numCols]; int numCurCol=0; while(numCurCol<numCols) diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index 1c43223..ad5531e 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -97,7 +97,7 @@ void KviMenuBar::showEvent(TQShowEvent *e) { #ifdef COMPILE_USE_QT4 debug("menubar show"); - // force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode()) + // force a re-layout of the menubar in TQt4 (see the note in enterSDIMode()) // by resetting the corner widget m_pFrm->mdiManager()->relayoutMenuButtons(); #endif diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 18ce661..c4b286e 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -33,7 +33,7 @@ #include "kvi_toolwindows_container.h" #include "kvi_tal_scrollview.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> @@ -121,11 +121,11 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons TQChar ccc = szModes[0]; szModes.remove(0,1); - KviTQString::sprintf(tmp,"%c: %Q",ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); + KviTQString::sprintf(tmp,"%c: %Q",ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains((char)ccc.tqunicode())); + cb->setChecked(m_szMode.contains((char)ccc.unicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } @@ -193,11 +193,11 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons TQChar ccc = szModes[0]; szModes.remove(0,1); - KviTQString::sprintf(tmp,"%c: %Q",(char)ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); + KviTQString::sprintf(tmp,"%c: %Q",(char)ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains((char)ccc.tqunicode())); + cb->setChecked(m_szMode.contains((char)ccc.unicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } @@ -317,9 +317,9 @@ void KviModeEditor::commit() TQChar ccc = sz[0]; if(cb->isChecked()) { - if(!m_szMode.contains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode()); + if(!m_szMode.contains((char)ccc.unicode()))szPlusModes.append((char)ccc.unicode()); } else { - if(m_szMode.contains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode()); + if(m_szMode.contains((char)ccc.unicode()))szMinusModes.append((char)ccc.unicode()); } } } diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 7c817dd..9f9aba0 100755 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -75,9 +75,9 @@ void KviModeWidget::refreshModes() { TQString szMode=m_pChannel->channelMode(); if(!m_pChannel->channelKey().isEmpty()) - szMode+=TQString(" k:%1").tqarg(m_pChannel->channelKey()); + szMode+=TQString(" k:%1").arg(m_pChannel->channelKey()); if(!m_pChannel->channelLimit().isEmpty()) - szMode+=TQString(" l:%1").tqarg(m_pChannel->channelLimit().ptr()); + szMode+=TQString(" l:%1").arg(m_pChannel->channelLimit().ptr()); if(m_pLabel) m_pLabel->setText(szMode); } diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 8b959a7..82c1a83 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -98,16 +98,16 @@ void KviOptionsWidget::createLayout(int rows,int cols) void KviOptionsWidget::createTabbedPage() { createLayout(1,1); - tqlayout()->setMargin(0); - tqlayout()->setSpacing(0); + layout()->setMargin(0); + layout()->setSpacing(0); m_pTabWidget = new TQTabWidget(this); addWidgetToLayout(m_pTabWidget,0,0,0,0); } void KviOptionsWidget::addOptionsWidget(const TQString &szText,const TQIconSet &iconSet,KviOptionsWidget * pWidget) { - if(pWidget->tqlayout()) - pWidget->tqlayout()->setMargin(10); + if(pWidget->layout()) + pWidget->layout()->setMargin(10); m_pTabWidget->addTab(pWidget,iconSet,szText); m_pSelectorInterfaceList->append(pWidget); } @@ -115,8 +115,8 @@ void KviOptionsWidget::addOptionsWidget(const TQString &szText,const TQIconSet & void KviOptionsWidget::addWidgetToLayout(TQWidget * w,int x1,int y1,int x2,int y2) { - if((x1 == x2) && (y1 == y2))tqlayout()->addWidget(w,y1,x1); - else tqlayout()->addMultiCellWidget(w,y1,y2,x1,x2); + if((x1 == x2) && (y1 == y2))layout()->addWidget(w,y1,x1); + else layout()->addMultiCellWidget(w,y1,y2,x1,x2); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -622,7 +622,7 @@ void KviOptionsWidget::addRowSpacer(int x1,int y1,int x2,int y2) { TQWidget * w = new TQWidget(this); addWidgetToLayout(w,x1,y1,x2,y2); - tqlayout()->setRowStretch(y1,1); + layout()->setRowStretch(y1,1); } TQLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const TQString & text,bool bEnabled) @@ -676,7 +676,7 @@ KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int n void KviOptionsWidget::addAdvancedButton(int x1,int y1,int x2,int y2) { - TQWidget * w = tqtopLevelWidget(); + TQWidget * w = topLevelWidget(); if(!w)return; if(!w->inherits("KviGeneralOptionsDialog"))return; diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index 5e397f1..8259a8c 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_pointerlist.h" #include <tqlineedit.h> #include <kvi_tal_groupbox.h> @@ -54,7 +54,7 @@ private: public: void mergeResetFlag(int flag){ m_iResetFlags |= flag; }; void createLayout(int rows,int columns); - TQGridLayout * tqlayout(){ return m_pLayout; }; + TQGridLayout * layout(){ return m_pLayout; }; protected: void commitSelectors(); void commitOptionsReset(); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index ce26661..0d133bd 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -167,9 +167,9 @@ TQString KviQuery::getInfoLabelTipText() txt += "<tr><td>"; if(e->hasRealName()) - tmp=__tr2qs("%1 is %2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName())); + tmp=__tr2qs("%1 is %2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); else - tmp=__tr2qs("%1 is %2").tqarg(m_szName).tqarg(szMask); + tmp=__tr2qs("%1 is %2").arg(m_szName).arg(szMask); tmp.replace('&',"&"); tmp.replace('<',"<"); @@ -183,21 +183,21 @@ TQString KviQuery::getInfoLabelTipText() { txt+="<tr><td>"; if(e->hasHops()) - txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").tqarg(m_szName).tqarg(e->server()).tqarg(e->hops()); + txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").arg(m_szName).arg(e->server()).arg(e->hops()); else - txt+=__tr2qs("%1 is using irc server: %2").tqarg(m_szName).tqarg(e->server()); + txt+=__tr2qs("%1 is using irc server: %2").arg(m_szName).arg(e->server()); txt+="</td></tr>"; } if(e->isAway()) { txt+="<tr><td>"; - txt+=__tr2qs("%1 is probably away").tqarg(m_szName); + txt+=__tr2qs("%1 is probably away").arg(m_szName); txt+="</td></tr>"; } txt+="<tr><td>"; - tmp=__tr2qs("Common channels with %1: %2").tqarg(m_szName).tqarg(szChans); + tmp=__tr2qs("Common channels with %1: %2").arg(m_szName).arg(szChans); tmp.replace('&',"&"); tmp.replace('<',"<"); @@ -237,19 +237,19 @@ TQString KviQuery::getInfoLabelText() else szMask+="*"; if(e->hasRealName()) - tmp=__tr2qs("Query with %1!%2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName())); + tmp=__tr2qs("Query with %1!%2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); else - tmp=__tr2qs("Query with %1!%2").tqarg(m_szName).tqarg(szMask); + tmp=__tr2qs("Query with %1!%2").arg(m_szName).arg(szMask); if(e->hasServer()) - tmp+=__tr2qs(", using server %1").tqarg(e->server()); + tmp+=__tr2qs(", using server %1").arg(e->server()); if(e->hasHops()) - tmp+=__tr2qs(" (%1 hops)").tqarg(e->hops()); + tmp+=__tr2qs(" (%1 hops)").arg(e->hops()); if(e->isAway()) tmp+=__tr2qs(", probably away"); tmp+="\n"; TQString szChans; connection()->getCommonChannels(m_szName,szChans,0); - tmp+=__tr2qs("Common channels: %2").tqarg(szChans); + tmp+=__tr2qs("Common channels: %2").arg(szChans); } else { tmp=__tr2qs("[Dead Query]"); } @@ -547,7 +547,7 @@ void KviQuery::applyOptions() { m_pUserListView->applyOptions(); updateLabelText(); - // this applies options for IrcView and Input and forces the window to retqlayout + // this applies options for IrcView and Input and forces the window to relayout KviWindow::applyOptions(); } @@ -559,15 +559,15 @@ TQPixmap * KviQuery::myIconPtr() void KviQuery::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->tqsizeHint().height(); + int hght2 = m_pButtonBox->sizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); } -TQSize KviQuery::tqsizeHint() const +TQSize KviQuery::sizeHint() const { - TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); return ret; } diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h index 3b1a81b..d0a12e5 100644 --- a/src/kvirc/ui/kvi_query.h +++ b/src/kvirc/ui/kvi_query.h @@ -66,7 +66,7 @@ public: void setDeadQuery(); void setAliveQuery(); bool isDeadQuery(){ return m_iFlags & KVI_TQUERY_FLAG_DEAD; }; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual const TQString & target(){ return windowName(); }; virtual void applyOptions(); KviUserListEntry * setTarget(const TQString &nick,const TQString &user,const TQString &host); diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index c3e5473..9eca884 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -35,9 +35,9 @@ #include <tqlabel.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcolordialog.h> -#include <tqpalette.h> +#include <palette.h> #include <tqfontdialog.h> #include "kvi_tal_popupmenu.h" @@ -513,7 +513,7 @@ KviColorSelector::KviColorSelector(TQWidget * par,const TQString & txt,TQColor * void KviColorSelector::setButtonPalette(TQColor * pOption) { - TQPalette pal(*pOption,tqcolorGroup().background()); + TQPalette pal(*pOption,colorGroup().background()); m_memColor = *pOption; m_pButton->setPalette(pal); diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index d91be01..405d50b 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -37,7 +37,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <stdio.h> @@ -160,7 +160,7 @@ void KviSplashScreen::setProgress(int progress) painter.end(); #endif //raise(); - tqrepaint(); + repaint(); g_pApp->processEvents(); //damn... } diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index 861facd..91c5fdb 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -43,7 +43,7 @@ #include <tqpainter.h> #include <tqstyle.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqcursor.h> #include "kvi_tal_popupmenu.h" @@ -106,9 +106,9 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_pMessageLabel = new TQLabel("<b>[x]</b> x",this,"msgstatuslabel"); m_pMessageLabel->setMargin(1); #ifdef COMPILE_USE_QT4 - m_pMessageLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft); + m_pMessageLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft); #else - m_pMessageLabel->tqsetAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft); + m_pMessageLabel->setAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft); #endif m_pMessageLabel->setMinimumWidth(350); @@ -210,7 +210,7 @@ void KviStatusBar::layoutChildren() int h = height() - (VMARGIN * 2); for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev()) { - int w = a->tqsizeHint().width(); + int w = a->sizeHint().width(); x -= w; a->setGeometry(x,VMARGIN,w,h); x -= SPACING; @@ -237,11 +237,11 @@ bool KviStatusBar::event(TQEvent * e) void KviStatusBar::recalcMinimumHeight() { int s = 18; - int h = m_pMessageLabel->tqsizeHint().height(); + int h = m_pMessageLabel->sizeHint().height(); if(h > s)s = h; for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev()) { - h = a->tqsizeHint().height(); + h = a->sizeHint().height(); if(h > s)s = h; } s += (VMARGIN * 2) + RICHTEXTLABELTRICK; @@ -249,7 +249,7 @@ void KviStatusBar::recalcMinimumHeight() { m_iLastMinimumHeight = s; setMinimumHeight(s); - TQLayout * l = tqlayout(); + TQLayout * l = layout(); if(l) if(l->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING)) ((TQBoxLayout *)l)->addStrut(s); @@ -467,9 +467,9 @@ void KviStatusBar::paintEvent(TQPaintEvent * e) { // avoid the ugly rectangle around the widgets painted by TQStatusBar // TQPainter p(this); -// style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),tqcolorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1)); +// style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),colorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1)); //TQStatusBar::paintEvent(e); - //qDrawWinPanel(&p,0,0,width(),height(),tqcolorGroup(),false,0); + //qDrawWinPanel(&p,0,0,width(),height(),colorGroup(),false,0); } void KviStatusBar::mousePressEvent(TQMouseEvent * e) diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index bc8fa02..0177623 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -42,7 +42,7 @@ #include <tqpainter.h> #include <tqstyle.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqcursor.h> #include "kvi_tal_popupmenu.h" diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index 629fae9..6f7e8e6 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -84,7 +84,7 @@ void KviStyledControlInternal::paintTimerShot () m_pControl->m_pTimer->stop(); } } - m_pControl->m_pWidget->tqrepaint( false ); + m_pControl->m_pWidget->repaint( false ); } KviStyledControl::KviStyledControl(TQWidget* w) @@ -118,7 +118,7 @@ void KviStyledControl::enterEvent ( TQEvent * ) } m_bMouseEnter=1; m_iStepNumber++; - m_pWidget->tqrepaint( false ); + m_pWidget->repaint( false ); } } @@ -137,7 +137,7 @@ void KviStyledControl::leaveEvent ( TQEvent * ) } m_bMouseEnter=0; m_iStepNumber--; - m_pWidget->tqrepaint( false ); + m_pWidget->repaint( false ); } } @@ -279,7 +279,7 @@ void KviStyledToolButton::paintEvent ( TQPaintEvent * event) pDoubleBufferPixmap->fill( bActive ? TQColor(206,215,223) : - tqcolorGroup().background() + colorGroup().background() ); diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index ad47661..171e411 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -290,7 +290,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter) if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator)) { iHeight -= KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT; - TQColor base = tqcolorGroup().background(); + TQColor base = colorGroup().background(); if(m_pWindow->console()) { TQColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); @@ -298,7 +298,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter) (base.blue() + cntx.blue()) >> 1); pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,base); } else { - pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,tqcolorGroup().brush(TQColorGroup::Background)); + pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,colorGroup().brush(TQColorGroup::Background)); } } @@ -394,7 +394,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter) { pPainter->setClipRect(cRect.right(),cRect.y(),10,cRect.height()); TQColor base = pPainter->pen().color(); - TQColor bg = tqcolorGroup().color(TQColorGroup::Background); + TQColor bg = colorGroup().color(TQColorGroup::Background); base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2); pPainter->setPen(base); cRect.setWidth(cRect.width() + 10); @@ -421,7 +421,7 @@ void KviTaskBarButton::setProgress(int progress) { if(progress == m_iProgress)return; m_iProgress = progress; - update(); // tqrepaint(false) ? + update(); // repaint(false) ? } void KviTaskBarButton::unhighlight() @@ -439,7 +439,7 @@ void KviTaskBarButton::highlight(int iLevel) m_iHighlightLevel = iLevel; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); if(m_bActive)return; - update(); // tqrepaint(false) ? + update(); // repaint(false) ? } @@ -833,7 +833,7 @@ void KviTreeTaskBarItem::applyOptions() void KviTreeTaskBarItem::captionChanged() { // FIXME: can we do better ? - tqrepaint(); + repaint(); } void KviTreeTaskBarItem::unhighlight() @@ -841,7 +841,7 @@ void KviTreeTaskBarItem::unhighlight() if(m_iHighlightLevel < 1)return; m_iHighlightLevel = 0; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); - tqrepaint(); + repaint(); } void KviTreeTaskBarItem::highlight(int iLevel) @@ -851,14 +851,14 @@ void KviTreeTaskBarItem::highlight(int iLevel) m_iHighlightLevel = iLevel; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); if(isSelected())return; - tqrepaint(); // tqrepaint(false) ? + repaint(); // repaint(false) ? } void KviTreeTaskBarItem::setProgress(int progress) { if(progress == m_iProgress)return; m_iProgress = progress; - tqrepaint(); // tqrepaint(false) ? + repaint(); // repaint(false) ? } void KviTreeTaskBarItem::setActive(bool bActive) @@ -868,7 +868,7 @@ void KviTreeTaskBarItem::setActive(bool bActive) // m_bHighlighted = false; // m_bAltColor = false; m_iHighlightLevel = 0; - // was not selected: the listView will tqrepaint it + // was not selected: the listView will repaint it } else { if(isSelected()) { @@ -876,7 +876,7 @@ void KviTreeTaskBarItem::setActive(bool bActive) // m_bHighlighted = false; // m_bAltColor = false; m_iHighlightLevel = 0; - // was selected: the list view will tqrepaint it + // was selected: the list view will repaint it } } } @@ -907,7 +907,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy()))); + TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); p.drawTiledPixmap(0,0,width,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif @@ -918,7 +918,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); if(pix) { - TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy()))); + TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); //p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y()); // debug("%i %i",pnt.x(),pnt.y()); p.translate(-pnt.x(),-pnt.y()); @@ -1081,7 +1081,7 @@ void KviTreeTaskBarItem::timerShot() m_pAnimTimer->stop(); m_iStepNumber=0; //make shure, that we cannot get out of range } - tqrepaint(); + repaint(); } void KviTreeTaskBarItem::mouseEnter() @@ -1192,7 +1192,7 @@ void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct) #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy()))); + TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif @@ -1204,7 +1204,7 @@ void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct) TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); if(pix) { - TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy()))); + TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); //p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*pix,pnt.x(),pnt.y()); KviPixmapUtils::drawPixmapWithPainter(p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y()); } @@ -1235,7 +1235,7 @@ KviTreeTaskBar::KviTreeTaskBar() // FIXME: this code is useless ? if(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) < 48) KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) = 48; - int iMin = m_pListView->tqminimumSize().width() + 4; + int iMin = m_pListView->minimumSize().width() + 4; if(((unsigned int)iMin) < KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)) iMin = KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth); setMinimumWidth(iMin); @@ -1305,7 +1305,7 @@ void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { TQString szText; ((KviTreeTaskBarItem *)it)->m_pWindow->getTaskBarTipText(szText); - m_pToolTip->tip(m_pListView->tqitemRect(it),szText); + m_pToolTip->tip(m_pListView->itemRect(it),szText); } } } @@ -1405,7 +1405,7 @@ KviTaskBarItem * KviTreeTaskBar::nextItem() { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->firstChild(); } else { - // this item has no tqchildren: try the next sibling + // this item has no children: try the next sibling if(m_pCurrentItem->nextSibling()) { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling(); diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h index 9e9ebe2..6c5794c 100644 --- a/src/kvirc/ui/kvi_taskbar.h +++ b/src/kvirc/ui/kvi_taskbar.h @@ -226,7 +226,7 @@ protected: int m_iBlueDiff; public: virtual TQString key(int column,bool) const; - virtual void paintCell(TQPainter *p,const TQColorGroup &cg,int column,int width,int tqalignment); + virtual void paintCell(TQPainter *p,const TQColorGroup &cg,int column,int width,int alignment); #ifdef COMPILE_USE_QT4 virtual void paintBranches(TQPainter *p,const TQColorGroup &cg,int w,int y,int h); #else diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp index 1f57db0..ef54460 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -44,9 +44,9 @@ KviThemedLabel::~KviThemedLabel() { } -/*TQSize KviThemedLabel::tqsizeHint() +/*TQSize KviThemedLabel::sizeHint() { - TQSize size=TQFrame::tqsizeHint(); + TQSize size=TQFrame::sizeHint(); int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; size.setHeight(iHeight); return size; diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/kvi_themedlabel.h index a307149..f704310 100644 --- a/src/kvirc/ui/kvi_themedlabel.h +++ b/src/kvirc/ui/kvi_themedlabel.h @@ -55,7 +55,7 @@ public: void setAutoHeight(bool value) { m_bAutoHeight=value; }; void applyOptions(); -// TQSize tqsizeHint(); +// TQSize sizeHint(); signals: void doubleClicked(); }; diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index 65c6dec..470957f 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -1,7 +1,7 @@ #define __KVIRC__ -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqobjectcleanuphandler.h> #include <tqpushbutton.h> @@ -94,7 +94,7 @@ KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const T setToggleButton(true); setOn(bOn); -// tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored)); +// setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored)); } KviWindowToolPageButton::~KviWindowToolPageButton() @@ -106,9 +106,9 @@ KviWindowToolPageButton::~KviWindowToolPageButton() { TQPixmap pixmap( height(), width() ); if(isOn()) - pixmap.fill(tqcolorGroup().mid()); + pixmap.fill(colorGroup().mid()); else - pixmap.fill(tqcolorGroup().button()); + pixmap.fill(colorGroup().button()); TQPainter painter( &pixmap ); TQPixmap icon; @@ -118,7 +118,7 @@ KviWindowToolPageButton::~KviWindowToolPageButton() icon=iconSet()->pixmap(TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); // Draw the frame - //painter.setPen( tqcolorGroup().mid() ); + //painter.setPen( colorGroup().mid() ); //if ( m_id != NUM_TABS - 1 ) painter.drawLine( 0, 0, 0, pixmap.height() - 1 ); //painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 ); @@ -127,7 +127,7 @@ KviWindowToolPageButton::~KviWindowToolPageButton() TQString str = text(); str.remove("&"); const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( str ) / 2; - painter.setPen( tqcolorGroup().buttonText() ); + painter.setPen( colorGroup().buttonText() ); const TQRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() ); painter.drawText( rect, TQt::AlignLeft | TQt::AlignVCenter, str ); diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index fe9011e..b9905ca 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -52,7 +52,7 @@ static int g_iInputFontCharWidth[256]; #include <tqlineedit.h> #include "kvi_tal_listbox.h" #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #include "kvi_tal_popupmenu.h" #include <tqevent.h> @@ -74,7 +74,7 @@ int KviListBoxTopicItem::width ( const KviTalListBox * lb ) const void KviListBoxTopicItem::paint ( TQPainter * p ) { - KviTopicWidget::paintColoredText(p,text(),listBox()->tqcolorGroup(),height(listBox())); + KviTopicWidget::paintColoredText(p,text(),listBox()->colorGroup(),height(listBox())); } @@ -153,7 +153,7 @@ TQString convertToHtml(const TQString &text) while(idx < text.length()) { - unsigned short c = text[(int)idx].tqunicode(); + unsigned short c = text[(int)idx].unicode(); unsigned int start = idx; @@ -168,7 +168,7 @@ TQString convertToHtml(const TQString &text) { idx++; if(idx >= text.length())break; - else c = text[(int)idx].tqunicode(); + else c = text[(int)idx].unicode(); } int len = idx - start; @@ -251,7 +251,7 @@ TQString convertToHtml(const TQString &text) ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++; + while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); @@ -291,7 +291,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG while((idx < text.length()) && (curX < width)) { - unsigned short c = text[(int)idx].tqunicode(); + unsigned short c = text[(int)idx].unicode(); unsigned int start = idx; @@ -305,7 +305,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG ) { idx++; - c = text[(int)idx].tqunicode(); + c = text[(int)idx].unicode(); } int len = idx - start; @@ -392,7 +392,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++; + while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); @@ -438,11 +438,11 @@ void KviTopicWidget::drawContents(TQPainter *p) #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - TQColorGroup tqcolorGroup; - //tqcolorGroup() - tqcolorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - tqcolorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground)); - paintColoredText(p,m_szTopic,tqcolorGroup); + TQColorGroup colorGroup; + //colorGroup() + colorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground)); + colorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground)); + paintColoredText(p,m_szTopic,colorGroup); } void KviTopicWidget::setTopic(const TQString & topic) @@ -541,7 +541,7 @@ void KviTopicWidget::updateToolTip() KviTalToolTip::add(this,txt); } -TQSize KviTopicWidget::tqsizeHint() const +TQSize KviTopicWidget::sizeHint() const { TQFontMetrics fm(font()); int hght = fm.lineSpacing() + (frameWidth() << 1) + 4; @@ -629,7 +629,7 @@ void KviTopicWidget::contextPopupAboutToShow() void KviTopicWidget::copy() { - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; if(c->supportsSelection())c->setText(m_szTopic,TQClipboard::Selection); c->setText(m_szTopic,TQClipboard::Clipboard); diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h index 5a59ced..89e4901 100644 --- a/src/kvirc/ui/kvi_topicw.h +++ b/src/kvirc/ui/kvi_topicw.h @@ -102,7 +102,7 @@ public: const TQString & topic(){ return m_szTopic; }; const TQString & topicSetBy(){ return m_szSetBy; }; const TQString & topicSetAt(){ return m_szSetAt; }; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void applyOptions(); static void paintColoredText(TQPainter *p, TQString text,const TQColorGroup& cg, int h=-1, int w=-1); diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index d504915..a66156c 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -305,7 +305,7 @@ void KviUserListView::applyOptions() m_pUsersLabel->setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); setMinimumWidth(100); resizeEvent(0); // this will call update() too - tqrepaint(); + repaint(); } void KviUserListView::updateArea() { @@ -838,7 +838,7 @@ int KviUserListView::getUserModeLevel(const TQString &szNick) char KviUserListView::getUserFlag(KviUserListEntry * e) { if(!e)return 0; - return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).tqunicode(); + return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).unicode(); } void KviUserListView::prependUserFlag(const TQString &nick,TQString &buffer) @@ -1141,7 +1141,7 @@ void KviUserListView::resizeEvent(TQResizeEvent *) int hght; if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel))//G&N 2005 { - hght = m_pUsersLabel->tqsizeHint().height(); + hght = m_pUsersLabel->sizeHint().height(); if(hght < 16)hght = 16; // at least m_pUsersLabel->setGeometry(0,0,width(),hght); } @@ -1281,7 +1281,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const TQPoint &pnt) TQDateTime dt; dt.setTime_t(it->m_joinTime); buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Joined on <b>%1</b>").tqarg(dt.toString()); + buffer += __tr2qs("Joined on <b>%1</b>").arg(dt.toString()); buffer += "</nobr></td></tr>"; } @@ -1293,7 +1293,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const TQPoint &pnt) int hors = mins / 60; mins = mins % 60; buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").tqarg(hors).tqarg(mins).tqarg(secs); + buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").arg(hors).arg(mins).arg(secs); buffer += "</nobr></td></tr>"; } buffer += "</table>"; @@ -1531,9 +1531,9 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) p.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0 /*,TQPen::DotLine*/)); if((bShowState || bShowIcons) && (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_3DGRID)) p.drawLine(iAvatarAndTextX,bottom - 1,iAvatarAndTextX,theY); - p.setPen(tqcolorGroup().shadow()); + p.setPen(colorGroup().shadow()); p.drawLine(0,bottom - 1,wdth,bottom - 1); - p.setPen(tqcolorGroup().light()); + p.setPen(colorGroup().light()); p.drawLine(0,theY,wdth,theY); theY--; } @@ -1725,10 +1725,10 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) //we really do not need any self-draw borders. //if we will need it, we will draw a better one with system style - //p.setPen(tqcolorGroup().dark()); + //p.setPen(colorGroup().dark()); //p.drawLine(0,0,wdth,0); //p.drawLine(0,0,0,height()); - //p.setPen(tqcolorGroup().light()); + //p.setPen(colorGroup().light()); //p.drawLine(1,height()-1,wdth,height()-1); //p.drawLine(wdth - 1,1,wdth - 1,height()); @@ -1742,7 +1742,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) void KviUserListViewArea::resizeEvent(TQResizeEvent *) { - int iScr = m_pScrollBar->tqsizeHint().width(); + int iScr = m_pScrollBar->sizeHint().width(); m_pScrollBar->setGeometry(width() - iScr,0,iScr,height()); m_pScrollBar->setPageStep(height()); m_pScrollBar->setLineStep(m_pListView->m_iFontHeight - 1); diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 6c959e7..435c915 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -60,7 +60,7 @@ #include <tqsplitter.h> #include <tqmetaobject.h> #include <tqdatetime.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqevent.h> // it looks they can't decide :D @@ -285,7 +285,7 @@ void KviWindow::demandAttention() bool KviWindow::focusNextPrevChild(bool next) { - TQWidget * w = tqfocusWidget(); + TQWidget * w = focusWidget(); if(w) { #ifdef COMPILE_USE_QT4 @@ -299,9 +299,9 @@ bool KviWindow::focusNextPrevChild(bool next) if(w->parent()) { #ifdef COMPILE_USE_QT4 - if(w->parent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) + if(w->parent()->metaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) #else - if(w->parent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) + if(w->parent()->metaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) #endif return false; // Do NOT change the focus widget! } @@ -586,7 +586,7 @@ void KviWindow::getDefaultLogFileName(TQString &buffer) { // FIXME: #warning "Make it configurable ?" TQString date; - TQDate dt(TQDate::tqcurrentDate()); + TQDate dt(TQDate::currentDate()); date=dt.toString("yyyy.MM.dd"); TQString base; getBaseLogFileName(base); @@ -1006,7 +1006,7 @@ void KviWindow::focusInEvent(TQFocusEvent *) if(m_pIrcView)m_pFocusHandler = m_pIrcView; else { #ifdef COMPILE_USE_QT4 - TQList<TQObject *> list = tqchildren(); + TQList<TQObject *> list = children(); for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; @@ -1042,7 +1042,7 @@ void KviWindow::focusInEvent(TQFocusEvent *) } // Setting the focus to the focus handler usually - // triggers our filter for the tqchildren's focusInEvent. + // triggers our filter for the children's focusInEvent. // This should call activateSelf() and thus // we should be already the active window at this point. // If we're not, then run activateSelf() to fix this. @@ -1124,7 +1124,7 @@ void KviWindow::childInserted(TQWidget * o) } #ifdef COMPILE_USE_QT4 - TQList<TQObject *> list = o->tqchildren(); + TQList<TQObject *> list = o->children(); for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; @@ -1162,7 +1162,7 @@ void KviWindow::childRemoved(TQWidget * o) m_pLastFocusedChild = 0; #ifdef COMPILE_USE_QT4 - TQList<TQObject *> list = o->tqchildren(); + TQList<TQObject *> list = o->children(); for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; @@ -1180,7 +1180,7 @@ void KviWindow::childRemoved(TQWidget * o) if(c->isWidgetType()) childRemoved((TQWidget *)c); } - } //else debug("The removed object has no tqchildren"); + } //else debug("The removed object has no children"); #endif } @@ -1202,7 +1202,7 @@ void KviWindow::wheelEvent(TQWheelEvent *e) } -void KviWindow::tqchildrenTreeChanged(TQWidget * widgetAdded) +void KviWindow::childrenTreeChanged(TQWidget * widgetAdded) { // if(widgetAdded && m_pFocusHandler)setFocusHandler(m_pFocusHandler,widgetAdded); // FIXME: This might be useless @@ -1217,14 +1217,14 @@ void KviWindow::updateBackgrounds(TQObject * obj) if(!obj) obj = TQT_TQOBJECT(this); #ifdef COMPILE_USE_QT4 - TQList<TQObject *> list = obj->tqchildren(); + TQList<TQObject *> list = obj->children(); if (list.count()) { for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { TQObject * child = *it; - if(child->tqmetaObject()->indexOfProperty("TransparencyCapable") != -1){ + if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){ // if (child->isWidgetType()) ((TQWidget *)child)->update(); } @@ -1239,7 +1239,7 @@ void KviWindow::updateBackgrounds(TQObject * obj) { TQObject * child = list.at(i); // FIXME: check if this code can work with qt < 3.0.0 too - if(child->tqmetaObject()->findProperty("TransparencyCapable",true) != -1) + if(child->metaObject()->findProperty("TransparencyCapable",true) != -1) ((TQWidget *)child)->update(); updateBackgrounds(child); @@ -1317,7 +1317,7 @@ TQRect KviWindow::externalGeometry() #ifndef Q_OS_MACX return mdiParent() ? mdiParent()->restoredGeometry() : frameGeometry(); #else - return mdiParent() ? mdiParent()->restoredGeometry() : tqgeometry(); + return mdiParent() ? mdiParent()->restoredGeometry() : geometry(); #endif } @@ -1327,7 +1327,7 @@ void KviWindow::applyOptions() if(m_pIrcView)m_pIrcView->applyOptions(); if(m_pInput)m_pInput->applyOptions(); - // trick: retqlayout + // trick: relayout resize(width() - 1,height() - 1); resize(width() + 1,height() + 1); } @@ -1490,10 +1490,10 @@ void KviWindow::preprocessMessage(TQString & szMessage) if(m_pConsole->connection()) if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) if((*it)==tmp) - *it=TQString("\r!c\r%1\r").tqarg(*it); + *it=TQString("\r!c\r%1\r").arg(*it); else { - *it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it); + *it=TQString("\r!c%1\r%2\r").arg(tmp).arg(*it); } } szMessage=strings.join(" "); diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index a044bae..913c63b 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -181,7 +181,7 @@ protected: // almost private: don't touch :D // KviToolWindowsContainer * m_pEditorsContainer; public: // The global ID of this window: unique in the application - TQString id(){ return TQString("%1").tqarg(m_uId); }; + TQString id(){ return TQString("%1").arg(m_uId); }; unsigned long int numericId(){ return m_uId; }; public: // THIS is the function that should be used @@ -262,7 +262,7 @@ public: bool isMaximized(); // Retrieves the default log file name: this is pre-build void getDefaultLogFileName(TQString &buffer); - // Well...the external tqgeometry :) + // Well...the external geometry :) TQRect externalGeometry(); void delayedClose(); // close that jumps out of the current event loop @@ -374,7 +374,7 @@ protected: BUTTON_CLASS * createToolButton(TQWidget * par,const char * nam,int pixon,int pixoff,const TQString & tooltip,bool bOn); // This is called by KviInput: actually it links the widgetAdded - virtual void tqchildrenTreeChanged(TQWidget * widgetAdded); + virtual void childrenTreeChanged(TQWidget * widgetAdded); virtual bool focusNextPrevChild(bool bNext); |