diff options
Diffstat (limited to 'src/kvirc/ui/kvi_console.cpp')
| -rw-r--r-- | src/kvirc/ui/kvi_console.cpp | 318 |
1 files changed, 159 insertions, 159 deletions
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index df0bd707..a843ae19 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -81,26 +81,26 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include <qsplitter.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> -#include <qtimer.h> +#include <tqsplitter.h> +#include <tqtoolbar.h> +#include <tqtoolbutton.h> +#include <tqtimer.h> #include "kvi_tal_hbox.h" #include "kvi_tal_popupmenu.h" -#include <qmessagebox.h> -#include <qstringlist.h> +#include <tqmessagebox.h> +#include <tqstringlist.h> #ifdef COMPILE_USE_QT4 - #include <q3mimefactory.h> + #include <tq3mimefactory.h> #endif #define __KVI_DEBUG__ #include "kvi_debug.h" #ifdef COMPILE_USE_QT4 - #include <QTextDocument> + #include <TQTextDocument> #else - #include <qstylesheet.h> + #include <tqstylesheet.h> #endif extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; @@ -128,35 +128,35 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags) m_pButtonBox = new KviTalHBox(this); m_pButtonBox->setSpacing(0); m_pButtonBox->setMargin(0); - new QLabel(__tr2qs("Address:"),m_pButtonBox,"url_label"); - m_pAddressEdit = new QComboBox(m_pButtonBox,"url_editor"); + new TQLabel(__tr2qs("Address:"),m_pButtonBox,"url_label"); + m_pAddressEdit = new TQComboBox(m_pButtonBox,"url_editor"); m_pAddressEdit->setAutoCompletion(true); m_pAddressEdit->setDuplicatesEnabled(false); m_pAddressEdit->setEditable(true); m_pAddressEdit->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))); recentUrlsChanged(); m_pAddressEdit->setCurrentText(""); - m_pAddressEdit->setInsertionPolicy(QComboBox::NoInsertion); + m_pAddressEdit->setInsertionPolicy(TQComboBox::NoInsertion); m_pAddressEdit->setMinimumHeight(24); //icon is 16px, + margins m_pButtonBox->setStretchFactor(m_pAddressEdit,1); #ifdef COMPILE_USE_QT4 - m_pButtonBox->setObjectName( QLatin1String( "kvi_window_button_box" ) ); + m_pButtonBox->setObjectName( TQLatin1String( "kvi_window_button_box" ) ); #endif KviTalToolTip::add(m_pAddressEdit,__tr2qs("Current IRC URI")); - connect(m_pAddressEdit,SIGNAL(activated(const QString & )),this,SLOT(ircUriChanged(const QString & ))); - connect(g_pApp,SIGNAL(recentUrlsChanged()),this,SLOT(recentUrlsChanged())); + connect(m_pAddressEdit,TQT_SIGNAL(activated(const TQString & )),this,TQT_SLOT(ircUriChanged(const TQString & ))); + connect(g_pApp,TQT_SIGNAL(recentUrlsChanged()),this,TQT_SLOT(recentUrlsChanged())); - m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); - connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); // FIXME: #warning "If notify list is disabled avoid to show this" // FIXME: #warning "Button to show/hide the notifyListView (NOT DELETE RE_CREATE!)" // The userlist on the right //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); m_pNotifyViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Notify List"),buttonContainer(),true,"list_view_button"); - connect(m_pNotifyViewButton,SIGNAL(clicked()),this,SLOT(toggleNotifyView())); + connect(m_pNotifyViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleNotifyView())); m_pNotifyListView = new KviUserListView(m_pSplitter,m_pNotifyViewButton,0,this,19,__tr2qs("Notify List"),"notify_list_view"); @@ -173,10 +173,10 @@ int KviConsole::selectedCount() } void KviConsole::recentUrlsChanged(){ - QString cur = m_pAddressEdit->currentText(); + TQString cur = m_pAddressEdit->currentText(); m_pAddressEdit->clear(); for ( - QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin(); + TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).end(); ++it ) { @@ -200,7 +200,7 @@ bool KviConsole::connectionInProgress() KviConsole::~KviConsole() { - // FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /QUIT $option() so the idents are parsed!" + // FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /TQUIT $option() so the idents are parsed!" // Force connection close: it will just return if no connection is present context()->terminateConnectionRequest(true); @@ -229,9 +229,9 @@ unsigned int KviConsole::ircContextId() return m_pContext->id(); } -QString KviConsole::currentNetworkName() +TQString KviConsole::currentNetworkName() { - return (connection() ? connection()->networkName() : QString::null); + return (connection() ? connection()->networkName() : TQString()); } @@ -265,24 +265,24 @@ void KviConsole::fillContextPopup(KviTalPopupMenu * p) cc = channelCount(); qc = queryCount(); p->insertSeparator(); - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),SLOT(partAllChannels())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),TQT_SLOT(partAllChannels())); if(!cc)p->setItemEnabled(id,false); - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY)),__tr2qs("Close All Queries"),connection(),SLOT(closeAllQueries())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUERY)),__tr2qs("Close All Queries"),connection(),TQT_SLOT(closeAllQueries())); if(!qc)p->setItemEnabled(id,false); } p->insertSeparator(); - p->insertItem(__tr2qs("Unhighlight All Windows"),context(),SLOT(unhighlightAllWindows())); + p->insertItem(__tr2qs("Unhighlight All Windows"),context(),TQT_SLOT(unhighlightAllWindows())); if(connection()) { - id = p->insertItem(__tr2qs("Unhighlight All Channels"),connection(),SLOT(unhighlightAllChannels())); + id = p->insertItem(__tr2qs("Unhighlight All Channels"),connection(),TQT_SLOT(unhighlightAllChannels())); if(!cc)p->setItemEnabled(id,false); - id = p->insertItem(__tr2qs("Unhighlight All Queries"),connection(),SLOT(unhighlightAllQueries())); + id = p->insertItem(__tr2qs("Unhighlight All Queries"),connection(),TQT_SLOT(unhighlightAllQueries())); if(!qc)p->setItemEnabled(id,false); } } -void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * matches) +void KviConsole::completeChannel(const TQString &word,KviPointerList<TQString> * matches) { // FIXME: first look in our context ? /* @@ -292,35 +292,35 @@ void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * m if(kvi_strEqualCIN(c->windowName(),word.ptr(),word.len()))matches->append(new KviStr((*it) } */ - QStringList *pList = g_pApp->getRecentChannels(currentNetworkName()); + TQStringList *pList = g_pApp->getRecentChannels(currentNetworkName()); if(pList) { - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(TQStringList::Iterator it = pList->begin(); it != pList->end(); ++it) { - if(KviQString::equalCIN((*it),word,word.length()))matches->append(new QString(*it)); + if(KviTQString::equalCIN((*it),word,word.length()))matches->append(new TQString(*it)); } } } -void KviConsole::completeServer(const QString &word, KviPointerList<QString> * matches) +void KviConsole::completeServer(const TQString &word, KviPointerList<TQString> * matches) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) { - QString srv((*it)); + TQString srv((*it)); - KviQString::cutToFirst(srv,'/'); + KviTQString::cutToFirst(srv,'/'); while(srv.startsWith("/"))srv.remove(0,1); - KviQString::cutFromLast(srv,':'); + KviTQString::cutFromLast(srv,':'); //We should have a full server name here, without the irc:// and without the port - if(KviQString::equalCIN(srv,word,word.length())) + if(KviTQString::equalCIN(srv,word,word.length())) { - matches->append(new QString(srv)); + matches->append(new TQString(srv)); } } } -void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &buffer) +void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString &buffer) { KviRegisteredMask *u = g_pRegisteredUserDataBase->findMatchingMask(nick,e->user(),e->host()); @@ -330,15 +330,15 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & buffer += nick; buffer += "!"; - buffer += e->user().isEmpty() ? QString("*") : e->user(); + buffer += e->user().isEmpty() ? TQString("*") : e->user(); buffer += "@"; - buffer += e->host().isEmpty() ? QString("*") : e->host(); + buffer += e->host().isEmpty() ? TQString("*") : e->host(); buffer += "</b></font></center></td></tr>"; if(u) { - QString szComment=u->user()->getProperty("comment"); + TQString szComment=u->user()->getProperty("comment"); if(!szComment.isEmpty()) { buffer += "<tr bgcolor=\"#F0F0F0\"><td><center><font size=\"-1\">("; @@ -351,9 +351,9 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & #ifdef COMPILE_USE_QT4 Q3MimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); #else - QMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); + TQMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); #endif - buffer += QString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").arg(e->avatar()->pixmap()->width()); + buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").tqarg(e->avatar()->pixmap()->width()); } if(e->hasRealName()) @@ -374,8 +374,8 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & if(u) { - QString mask; - u->mask()->mask(mask); + TQString tqmask; + u->tqmask()->tqmask(tqmask); buffer += "<tr bgcolor=\"#F0F0F0\"><td>"; buffer += __tr2qs("Registered as"); buffer += " <b>"; @@ -385,13 +385,13 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & buffer += "</td></tr><tr bgcolor=\"#F0F0F0\"><td><font size=\"-1\">"; buffer += __tr2qs("(Matched by"); buffer += " "; - buffer += mask; + buffer += tqmask; buffer += ")</td></tr>"; } if(connection()) { - QString chans; + TQString chans; if(connection()->getCommonChannels(nick,chans,false)) { buffer += "<tr><td bgcolor=\"#F0F0F0\">"; @@ -404,12 +404,12 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & if(e->hasServer()) { buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Using server <b>%1</b>").arg(e->server()); + buffer += __tr2qs("Using server <b>%1</b>").tqarg(e->server()); if(e->hasHops()) { buffer += " ("; - buffer += __tr2qs("%1 hops").arg(e->hops()); + buffer += __tr2qs("%1 hops").tqarg(e->hops()); buffer += ")</nobr></td></tr>"; } else { buffer += "</nobr></td></tr></table>"; @@ -443,9 +443,9 @@ void KviConsole::saveProperties(KviConfig *cfg) } -void KviConsole::getBaseLogFileName(QString &buffer) +void KviConsole::getBaseLogFileName(TQString &buffer) { - buffer=QString("CONSOLE%1").arg(ircContextId()); + buffer=TQString("CONSOLE%1").tqarg(ircContextId()); } void KviConsole::showNotifyList(bool bShow) @@ -492,7 +492,7 @@ KviWindow * KviConsole::activeWindow() return this; } -void KviConsole::ircUriChanged(const QString & text){ +void KviConsole::ircUriChanged(const TQString & text){ if(KviIrcUrl::run(text,KviIrcUrl::CurrentContext,this) & KviIrcUrl::InvalidProtocol) { KviMessageBox::warning(__tr2qs("KVIrc can accept only irc://, irc6://, ircs:// or irc6s:// URL's\n" @@ -502,7 +502,7 @@ void KviConsole::ircUriChanged(const QString & text){ void KviConsole::updateUri() { - QString uri; + TQString uri; if(connection()) { KviIrcServer* server = connection()->target()->server(); @@ -527,7 +527,7 @@ void KviConsole::updateUri() void KviConsole::connectionAttached() { //need to update URI - connect(m_pContext->connection(),SIGNAL(chanListChanged()),this,SLOT(updateUri())); + connect(m_pContext->connection(),TQT_SIGNAL(chanListChanged()),this,TQT_SLOT(updateUri())); updateUri(); m_pNotifyListView->setUserDataBase(connection()->userDataBase()); } @@ -545,7 +545,7 @@ bool KviConsole::isIpV6Connection() return connection()->server()->isIpV6(); } -void KviConsole::closeEvent(QCloseEvent *e) +void KviConsole::closeEvent(TQCloseEvent *e) { if(g_pFrame->consoleCount() > 1) { @@ -554,7 +554,7 @@ void KviConsole::closeEvent(QCloseEvent *e) { if(!KVI_OPTION_BOOL(KviOption_boolAlwaysDisconnectClosingConnectedConsole)) { - switch(QMessageBox::warning(this, + switch(TQMessageBox::warning(this, __tr2qs("Confirmation - KVIrc"), __tr2qs("You have just attempted to close a console window with an active connection inside.\n" \ "Are you sure you wish to terminate the connection?"), @@ -588,7 +588,7 @@ void KviConsole::closeEvent(QCloseEvent *e) // this is the only console... ask if the user really wants to quit KVirc if(!KVI_OPTION_BOOL(KviOption_boolAlwaysQuitKVIrcClosingLastConsole)) { - switch(QMessageBox::warning(this, + switch(TQMessageBox::warning(this, __tr2qs("Confirmation - KVIrc"), __tr2qs("You have just attempted to close the last console window.\nAre you sure you wish to quit KVIrc?"), __tr2qs("&Always"), @@ -612,11 +612,11 @@ void KviConsole::closeEvent(QCloseEvent *e) } // internal helper for applyHighlighting -int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg,const QString &trigger) +int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg,const TQString &trigger) { if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && wnd!=g_pActiveWindow) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound)))); - QString szMessageType; - KviQString::sprintf(szMessageType,"%d",type); + TQString szMessageType; + KviTQString::sprintf(szMessageType,"%d",type); if(KVS_TRIGGER_EVENT_7_HALTED(KviEvent_OnHighlight, wnd,nick,user,host, szMsg,trigger, @@ -626,17 +626,17 @@ int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,c } // if it returns -1 you should just return and not display the message -int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg) +int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg) { - QString szPattern=KVI_OPTION_STRING(KviOption_stringWordSplitters); - QString szSource; - QString szStripMsg=KviMircCntrl::stripControlBytes(szMsg); - QChar* aux=(QChar*)(szStripMsg.ucs2()); + TQString szPattern=KVI_OPTION_STRING(KviOption_stringWordSplitters); + TQString szSource; + TQString szStripMsg=KviMircCntrl::stripControlBytes(szMsg); + TQChar* aux=(TQChar*)(szStripMsg.ucs2()); if(aux) { - while(aux->unicode()) + while(aux->tqunicode()) { - if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 ) + if( KVI_OPTION_STRING(KviOption_stringWordSplitters).tqfind(*aux) > -1 ) szSource.append(' '); else szSource.append(*aux); @@ -649,19 +649,19 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co szSource.prepend(' '); if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection()) { - if(szSource.find(QString(" %1 ").arg(connection()->userInfo()->nickName()),0,false) > -1) + if(szSource.tqfind(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1) return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName()); } if(KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin(); + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).end() ; ++it) { if((*it).isEmpty()) continue; - // FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!) !!!! - if(szSource.find(QString(" %1 ").arg(*it),0,false) > -1) + // FIXME : This is SLOOOOOOOOW (TQString -> ascii translation!!) !!!! + if(szSource.tqfind(TQString(" %1 ").tqarg(*it),0,false) > -1) { return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it); } @@ -714,13 +714,13 @@ static const char * g_nickColors[KVI_NUM_NICK_COLORS]= void KviConsole::outputPrivmsg(KviWindow *wnd, int type, - const QString &daNick, - const QString &daUser, - const QString &daHost, - const QString &msg, + const TQString &daNick, + const TQString &daUser, + const TQString &daHost, + const TQString &msg, int iFlags, - const QString &prefix, - const QString &suffix) + const TQString &prefix, + const TQString &suffix) { // FIXME: #warning "THIS IS USED BY WINDOWS THAT ARE NOT BOUND TO THIS IRC CONTEXT" // FIXME: #warning "REMEMBER IT IN ESCAPE COMMANDS" @@ -728,11 +728,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, bool bIsChan = (wnd->type() == KVI_WINDOW_TYPE_CHANNEL); bool bIsNotice = ((type == KVI_OUT_CHANNELNOTICE)||(type == KVI_OUT_CHANNELNOTICECRYPTED) \ - ||(type == KVI_OUT_QUERYNOTICE)||(type == KVI_OUT_QUERYNOTICECRYPTED)); + ||(type == KVI_OUT_TQUERYNOTICE)||(type == KVI_OUT_TQUERYNOTICECRYPTED)); - QString nick = daNick; // not that beautiful.. :/ - QString user = daUser; - QString host = daHost; + TQString nick = daNick; // not that beautiful.. :/ + TQString user = daUser; + TQString host = daHost; if(connection()) { @@ -741,7 +741,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, if(host.isEmpty())host = connection()->userInfo()->hostName(); } - QString szDecodedMessage = msg; // shallow copy + TQString szDecodedMessage = msg; // shallow copy if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages)) szDecodedMessage = KviMircCntrl::stripControlBytes(szDecodedMessage); @@ -764,13 +764,13 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnHighlightedMessages) && (!(iFlags & NoNotifier))) { - QString szMsg = "<b><"; + TQString szMsg = "<b><"; szMsg += nick; szMsg += "></b> "; #ifdef COMPILE_USE_QT4 - szMsg += Qt::escape(szDecodedMessage); + szMsg += TQt::escape(szDecodedMessage); #else - szMsg += QStyleSheet::escape(szDecodedMessage); + szMsg += TQStyleSheet::escape(szDecodedMessage); #endif //debug("kvi_console.cpp:629 debug: %s",szMsg.data()); g_pApp->notifierMessage(wnd,KVI_OPTION_MSGTYPE(iSaveType).pixId(),szMsg,90); @@ -781,11 +781,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, // <PREFIX>nick[!user@host]<POSTFIX>This is a test message - QString szNick; - KviQString::sprintf(szNick,"\r!nc\r%Q\r",&nick); + TQString szNick; + KviTQString::sprintf(szNick,"\r!nc\r%Q\r",&nick); if(KVI_OPTION_BOOL(KviOption_boolShowUserAndHostInPrivmsgView)) - KviQString::appendFormatted(szNick,"!%Q@\r!h\r%Q\r",&user,&host); + KviTQString::appendFormatted(szNick,"!%Q@\r!h\r%Q\r",&user,&host); if(bIsChan && KVI_OPTION_BOOL(KviOption_boolShowChannelUserFlagInPrivmsgView)) ((KviChannel *)wnd)->prependUserFlag(nick,szNick); @@ -794,11 +794,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const QChar * aux = nick.unicode(); + const TQChar * aux = nick.tqunicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->unicode(); + sum += aux->tqunicode(); aux++; i--; } @@ -815,11 +815,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const QChar * aux = nick.unicode(); + const TQChar * aux = nick.tqunicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->unicode(); + sum += aux->tqunicode(); 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(QString("%1").arg(color)); + szNick.prepend(TQString("%1").tqarg(color)); szNick.prepend(KVI_TEXT_COLOR); szNick.append(KVI_TEXT_COLOR); } @@ -847,7 +847,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, szNick.append(KVI_TEXT_BOLD); } - QString szMessage; + TQString szMessage; if(KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)) { @@ -857,14 +857,14 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, } else { if(bIsNotice) { - static QString pre1("*"); - static QString suf1("* "); + static TQString pre1("*"); + static TQString suf1("* "); szMessage = prefix.isEmpty() ? pre1 : prefix; szMessage += szNick; szMessage += suffix.isEmpty() ? suf1 : suffix; } else { - static QString pre2("<"); - static QString suf2("> "); + static TQString pre2("<"); + static TQString suf2("> "); szMessage = prefix.isEmpty() ? pre2 : prefix; szMessage += szNick; szMessage += suffix.isEmpty() ? suf2 : suffix; @@ -877,12 +877,12 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, else wnd->outputNoFmt(type,szMessage); } -void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &textLine) +void KviConsole::avatarChangedUpdateWindows(const TQString &nick,const TQString &textLine) { if(!connection())return; //ops... // in quiet mode avoid bugging the user about avatar changes - bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_QUIET))); + bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_TQUIET))); for(KviChannel * c = connection()->channelList()->first();c;c = connection()->channelList()->next()) { @@ -901,7 +901,7 @@ void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &t m_pNotifyListView->avatarChanged(nick); // recalc the item height here too! } -void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QString &user,const QString &host,const QString &textLine) +void KviConsole::avatarChanged(KviAvatar * avatar,const TQString &nick,const TQString &user,const TQString &host,const TQString &textLine) { if(!connection())return; //ops... @@ -910,13 +910,13 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr if(KVI_OPTION_BOOL(KviOption_boolSetLastAvatarAsDefaultForRegisteredUsers)) { // Don't even try to do it for myself - if(!KviQString::equalCI(nick,connection()->userInfo()->nickName())) + if(!KviTQString::equalCI(nick,connection()->userInfo()->nickName())) { KviRegisteredUser * u = connection()->userDataBase()->registeredUser(nick,user,host); if(u) { if(avatar)u->setProperty("avatar",avatar->identificationString()); - else u->setProperty("avatar",QString::null); + else u->setProperty("avatar",TQString()); bRegisteredStuff = true; } } @@ -926,7 +926,7 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr { // cache it if(avatar) - KviAvatarCache::instance()->replace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); + KviAvatarCache::instance()->tqreplace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); else KviAvatarCache::instance()->remove(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); } @@ -934,19 +934,19 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr avatarChangedUpdateWindows(nick,textLine); } -void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const QString &user,const QString &host) +void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const TQString &nick,const TQString &user,const TQString &host) { // look it up in the cache - QString szAvatar = KviAvatarCache::instance()->lookup(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); + TQString szAvatar = KviAvatarCache::instance()->lookup(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); if(!szAvatar.isEmpty()) { // got a cache hit... is it on disk ? - KviAvatar * avatar = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * avatar = g_pIconManager->getAvatar(TQString(),szAvatar); if(avatar) { // cached image on disk e->setAvatar(avatar); - avatarChangedUpdateWindows(nick,QString::null); + avatarChangedUpdateWindows(nick,TQString()); return; } else { // no cached image on disk.. will need to requery it anyway @@ -960,15 +960,15 @@ void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const if(u) { // the user is registered... - QString szAvatar; + TQString szAvatar; if(u->getProperty("avatar",szAvatar)) { // the user has a default avatar... - KviAvatar * avatar = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * avatar = g_pIconManager->getAvatar(TQString(),szAvatar); if(avatar) { e->setAvatar(avatar); - avatarChangedUpdateWindows(nick,QString::null); + avatarChangedUpdateWindows(nick,TQString()); return; } } @@ -979,40 +979,40 @@ void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u) { if(!connection())return; - QString szAvatar; + TQString szAvatar; if(!u->getProperty("avatar",szAvatar))return; - KviPointerHashTableIterator<QString,KviIrcUserEntry> it(*(connection()->userDataBase()->dict())); + KviPointerHashTableIterator<TQString,KviIrcUserEntry> it(*(connection()->userDataBase()->dict())); while(KviIrcUserEntry * e = it.current()) { if(e->hasHost()) { if(u->matchesFixed(it.currentKey(),e->user(),e->host())) { - KviAvatar * a = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * a = g_pIconManager->getAvatar(TQString(),szAvatar); e->setAvatar(a); - avatarChangedUpdateWindows(it.currentKey(),QString::null); + avatarChangedUpdateWindows(it.currentKey(),TQString()); } } ++it; } } -KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const QString &host,const QString &szLocalPath,const QString &szName) +KviAvatar * KviConsole::setAvatar(const TQString &nick,const TQString &user,const TQString &host,const TQString &szLocalPath,const TQString &szName) { if(!connection())return 0; - KviIrcUserEntry * e = connection()->userDataBase()->find(nick); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(nick); if(e) { // User and host must match if((!user.isEmpty()) && e->hasUser()) { - if(!KviQString::equalCI(user,e->user()))return 0; + if(!KviTQString::equalCI(user,e->user()))return 0; } if((!host.isEmpty()) && e->hasHost()) { - if(!KviQString::equalCI(host,e->host()))return 0; + if(!KviTQString::equalCI(host,e->host()))return 0; } // Ok...got it @@ -1021,7 +1021,7 @@ KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const if(avatar) { e->setAvatar(avatar); - avatarChanged(avatar,nick,user,host,QString::null); + avatarChanged(avatar,nick,user,host,TQString()); return avatar; } else { if(_OUTPUT_PARANOIC) @@ -1033,17 +1033,17 @@ KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const KviAvatar * KviConsole::defaultAvatarFromOptions() { - QPixmap * avatar = KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).pixmap(); + TQPixmap * avatar = KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).pixmap(); if(!avatar)return 0; if(avatar->isNull())return 0; if(KVI_OPTION_STRING(KviOption_stringMyAvatar).isEmpty())return 0; - return new KviAvatar(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).path(),KVI_OPTION_STRING(KviOption_stringMyAvatar),new QPixmap(*avatar)); + return new KviAvatar(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).path(),KVI_OPTION_STRING(KviOption_stringMyAvatar),new TQPixmap(*avatar)); } KviAvatar * KviConsole::currentAvatar() { if(!connection())return 0; - KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName()); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName()); if(!e)return 0; KviAvatar * a = e->avatar(); if(!a) @@ -1052,7 +1052,7 @@ KviAvatar * KviConsole::currentAvatar() if(a) { e->setAvatar(a); - avatarChanged(a,connection()->userInfo()->nickName(),QString::null,QString::null,QString::null); + avatarChanged(a,connection()->userInfo()->nickName(),TQString(),TQString(),TQString()); } } return a; @@ -1061,13 +1061,13 @@ KviAvatar * KviConsole::currentAvatar() void KviConsole::setAvatarFromOptions() { if(!connection())return; - KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName()); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName()); if(!e)return; KviAvatar * a = defaultAvatarFromOptions(); if(a) { e->setAvatar(a); - avatarChanged(a,connection()->userInfo()->nickName(),QString::null,QString::null,QString::null); + avatarChanged(a,connection()->userInfo()->nickName(),TQString(),TQString(),TQString()); } } @@ -1084,18 +1084,18 @@ void KviConsole::applyOptions() resize(width() + 1,height() + 1); } -void KviConsole::resizeEvent(QResizeEvent *e) +void KviConsole::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->sizeHint().height(); + int hght2 = m_pButtonBox->tqsizeHint().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); } -QSize KviConsole::sizeHint() const +TQSize KviConsole::tqsizeHint() const { - QSize ret(m_pIrcView->sizeHint().height(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pIrcView->tqsizeHint().height(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); return ret; } @@ -1115,16 +1115,16 @@ void KviConsole::fillStatusString() if(connection()->userInfo()->isAway()) { - m_szStatusString += QChar(' '); + m_szStatusString += TQChar(' '); m_szStatusString += __tr2qs("away"); } - m_szStatusString += QChar(')'); + m_szStatusString += TQChar(')'); } else { if(connection()->userInfo()->isAway()) { m_szStatusString += " ("; m_szStatusString += __tr2qs("away"); - m_szStatusString += QChar(')'); + m_szStatusString += TQChar(')'); } } @@ -1138,16 +1138,16 @@ void KviConsole::fillCaptionBuffers() { fillStatusString(); - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString endofbold("</b></font> <font color=\""); - static QString endoffont("\">"); - static QString end("</font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString endofbold("</b></font> <font color=\""); + static TQString endoffont("\">"); + static TQString end("</font></nobr>"); m_szPlainTextCaption = windowName(); m_szPlainTextCaption += " ["; m_szPlainTextCaption += m_szStatusString; - m_szPlainTextCaption += QChar(']'); + m_szPlainTextCaption += TQChar(']'); m_szHtmlActiveCaption = begin; m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); @@ -1171,29 +1171,29 @@ void KviConsole::fillCaptionBuffers() } -QPixmap * KviConsole::myIconPtr() +TQPixmap * KviConsole::myIconPtr() { return g_pIconManager->getSmallIcon(isConnected() ? KVI_SMALLICON_LINKS : KVI_SMALLICON_CONSOLE); } -void KviConsole::getTaskBarTipText(QString &buffer) +void KviConsole::getTaskBarTipText(TQString &buffer) { fillStatusString(); - static QString html_bold("<b>"); - static QString html_tab(" "); - static QString html_eofbold("</b>"); - static QString html_hrbr("<br><hr>"); - static QString html_channel(__tr2qs("channel")); - static QString html_channels(__tr2qs("channels")); - static QString html_query(__tr2qs("query")); - static QString html_queries(__tr2qs("queries")); - static QString html_space(" "); - static QString html_commaspace(", "); - static QString html_br("<br>"); - static QString html_spaceparopen(" ("); - static QString html_spaceparclosed(")"); + static TQString html_bold("<b>"); + static TQString html_tab(" "); + static TQString html_eofbold("</b>"); + static TQString html_hrbr("<br><hr>"); + static TQString html_channel(__tr2qs("channel")); + static TQString html_channels(__tr2qs("channels")); + static TQString html_query(__tr2qs("query")); + static TQString html_queries(__tr2qs("queries")); + static TQString html_space(" "); + static TQString html_commaspace(", "); + static TQString html_br("<br>"); + static TQString html_spaceparopen(" ("); + static TQString html_spaceparclosed(")"); buffer = "<table width=\"100%\">" \ START_TABLE_BOLD_ROW; @@ -1201,7 +1201,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) buffer += END_TABLE_BOLD_ROW; if((context()->state() == KviIrcContext::Connected) && connection()) { - QString num; + TQString num; unsigned int uD; unsigned int uH; @@ -1239,7 +1239,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) buffer += "</td></tr>"; } - QDateTime dt; + TQDateTime dt; dt.setTime_t(connection()->statistics()->connectionStartTime()); buffer += START_TABLE_NORMAL_ROW; @@ -1255,7 +1255,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) //buffer += html_spaceparopen; - QString tspan = KviTimeUtils::formatTimeInterval((unsigned int)(kvi_secondsSince(connection()->statistics()->connectionStartTime())), + TQString tspan = KviTimeUtils::formatTimeInterval((unsigned int)(kvi_secondsSince(connection()->statistics()->connectionStartTime())), KviTimeUtils::NoLeadingEmptyIntervals | KviTimeUtils::NoLeadingZeroes); buffer += __tr2qs("Online for"); |