diff options
Diffstat (limited to 'src/kvirc/ui/kvi_console.cpp')
| -rw-r--r-- | src/kvirc/ui/kvi_console.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
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; } |