diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 72aaee9802d447ee21340b011856b9b355a58f1a (patch) | |
tree | f97a68e4f75e6c25c8492e03fdfe6983fb0aa199 /src/kvirc/ui | |
parent | 5d03948cd3558c613fae1fad109635f860babcbb (diff) | |
download | kvirc-72aaee9802d447ee21340b011856b9b355a58f1a.tar.gz kvirc-72aaee9802d447ee21340b011856b9b355a58f1a.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/kvirc/ui')
-rw-r--r-- | src/kvirc/ui/kvi_actiondrawer.cpp | 6 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_channel.cpp | 26 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_channel.h | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_console.cpp | 14 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_cryptcontroller.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_customtoolbar.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_frame.cpp | 8 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_frame.h | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_imagedialog.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_input.cpp | 32 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_ircview.cpp | 32 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_maskeditor.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_mdimanager.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_menubar.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_modeeditor.cpp | 32 | ||||
-rwxr-xr-x | src/kvirc/ui/kvi_modew.cpp | 6 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_query.cpp | 16 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_statusbar.cpp | 10 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_taskbar.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_texticonwin.h | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_topicw.cpp | 12 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_userlistview.cpp | 36 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_userlistview.h | 4 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_window.cpp | 10 |
24 files changed, 133 insertions, 133 deletions
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index bfa7eb5..d4b02e0 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -204,11 +204,11 @@ void KviActionDrawer::fill() { KviActionCategory * c = a->category(); if(!c)c = KviActionManager::categoryGeneric(); - KviActionDrawerPage * p = pages.tqfind(c->visibleName()); + KviActionDrawerPage * p = pages.find(c->visibleName()); if(!p) { p = new KviActionDrawerPage(this,c->description()); - pages.tqreplace(c->visibleName(),p); + pages.replace(c->visibleName(),p); addTab(p,c->visibleName()); //p->show(); } @@ -216,7 +216,7 @@ void KviActionDrawer::fill() ++it; } - KviActionDrawerPage * p = pages.tqfind(KviActionManager::categoryIrc()->visibleName()); + KviActionDrawerPage * p = pages.find(KviActionManager::categoryIrc()->visibleName()); if(p) { int iii = indexOf(p); diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index 206cadb..1c01b23 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -167,14 +167,14 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name m_pBanEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_UNBAN,KVI_SMALLICON_BAN,__tr2qs("Ban Editor"),buttonContainer(),false,"ban_editor_button"); connect(m_pBanEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanEditor())); - if(m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains('e')) + if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('e')) { m_pBanExceptionEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_BANUNEXCEPT,KVI_SMALLICON_BANEXCEPT,__tr2qs("Ban Exception Editor"),buttonContainer(),false,"ban_exception_editor_button"); connect(m_pBanExceptionEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanExceptionEditor())); } else { m_pBanExceptionEditorButton=0; } - if(m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains('I')) + if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('I')) { m_pInviteEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_INVITEUNEXCEPT,KVI_SMALLICON_INVITEEXCEPT,__tr2qs("Invite Exception Editor"),buttonContainer(),false,"invite_exception_editor_button"); connect(m_pInviteEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleInviteEditor())); @@ -265,7 +265,7 @@ void KviChannel::textViewRightClicked() void KviChannel::getBaseLogFileName(TQString &buffer) { TQString szChan(windowName()); - szChan.tqreplace(".","%2e"); + szChan.replace(".","%2e"); if (console()->connection()) { buffer=szChan; @@ -569,14 +569,14 @@ TQSize KviChannel::tqsizeHint() const void KviChannel::setChannelMode(char mode,bool bAdd) { - if(!m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains(mode)){ + if(!m_pConsole->connection()->serverInfo()->supportedListModes().contains(mode)){ if(bAdd) { - if(!(m_szChannelMode.tqcontains(mode)))m_szChannelMode.append(mode); + if(!(m_szChannelMode.contains(mode)))m_szChannelMode.append(mode); } else { - if(m_szChannelMode.tqcontains(mode)) + if(m_szChannelMode.contains(mode)) { - m_szChannelMode.tqreplace(mode,""); + m_szChannelMode.replace(mode,""); } } updateModeLabel(); @@ -602,7 +602,7 @@ void KviChannel::addHighlightedUser(const char * nick) { if(!m_pUserListView->findEntry(nick))return; else - m_pTmpHighLighted->tqreplace(nick,new TQString()); + m_pTmpHighLighted->replace(nick,new TQString()); } void KviChannel::removeHighlightedUser(const char * nick) @@ -1319,7 +1319,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) (a->uActionType == KVI_USERACTION_NOTICE) || (a->uActionType == KVI_USERACTION_ACTION)) { - if(!userDict.tqfind(a->szNick)) + if(!userDict.find(a->szNick)) { if(isOn(a->szNick.ascii())) { @@ -1379,8 +1379,8 @@ void KviChannel::closeEvent(TQCloseEvent *e) if(connection()) { TQString tmp = KVI_OPTION_STRING(KviOption_stringPartMessage); - tmp.tqreplace(";","\\;"); - tmp.tqreplace("\n"," "); + tmp.replace(";","\\;"); + tmp.replace("\n"," "); KviKvsVariant vRet; if(KviKvsScript::evaluate(tmp,this,0,&vRet))vRet.asString(tmp); @@ -1605,12 +1605,12 @@ void KviChannel::preprocessMessage(TQString & szMessage) { TQStringList strings = TQStringList::split(" ",szMessage, TRUE); for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { - if((*it).tqcontains('\r')) continue; + if((*it).contains('\r')) continue; TQString tmp = KviMircCntrl::stripControlBytes(*it); if( findEntry(*it) ) *it=TQString("\r!n\r%1\r").tqarg(*it); if(m_pConsole) if(m_pConsole->connection()) - if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().tqcontains(tmp[0])) + if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) if((*it)==tmp) *it=TQString("\r!c\r%1\r").tqarg(*it); else diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 0a82449..f1d1732 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -285,7 +285,7 @@ public: void addHighlightedUser(const char * nick); void removeHighlightedUser(const char * nick); - bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->tqfind(nick); }; + bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); }; KviIrcView * messageView() const { return m_pMessageView; }; virtual void lostUserFocus(); virtual void getTaskBarTipText(TQString &buffer); diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index a843ae1..0b08447 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -636,7 +636,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c { while(aux->tqunicode()) { - if( KVI_OPTION_STRING(KviOption_stringWordSplitters).tqfind(*aux) > -1 ) + if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 ) szSource.append(' '); else szSource.append(*aux); @@ -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.tqfind(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1) + if(szSource.find(TQString(" %1 ").tqarg(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.tqfind(TQString(" %1 ").tqarg(*it),0,false) > -1) + if(szSource.find(TQString(" %1 ").tqarg(*it),0,false) > -1) { return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it); } @@ -926,7 +926,7 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const TQString &nick,const TQS { // cache it if(avatar) - KviAvatarCache::instance()->tqreplace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); + KviAvatarCache::instance()->replace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); else KviAvatarCache::instance()->remove(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); } @@ -1001,7 +1001,7 @@ void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u) 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()->tqfind(nick); + KviIrcUserEntry * e = connection()->userDataBase()->find(nick); if(e) { // User and host must match @@ -1043,7 +1043,7 @@ KviAvatar * KviConsole::defaultAvatarFromOptions() KviAvatar * KviConsole::currentAvatar() { if(!connection())return 0; - KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName()); + KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName()); if(!e)return 0; KviAvatar * a = e->avatar(); if(!a) @@ -1061,7 +1061,7 @@ KviAvatar * KviConsole::currentAvatar() void KviConsole::setAvatarFromOptions() { if(!connection())return; - KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName()); + KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName()); if(!e)return; KviAvatar * a = defaultAvatarFromOptions(); if(a) diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index f9a7a13..83ac72e 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -155,7 +155,7 @@ if(cur) { - KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->tqfindItem(cur->szEngineName.ptr()); + KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->findItem(cur->szEngineName.ptr()); if(it) { m_pEnableCheck->setChecked(true); diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index b4e0630..828eb02 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -154,7 +154,7 @@ void KviCustomToolBar::unfilterChild(TQObject * o) { if(m_pFilteredChildren) { - bool * b = m_pFilteredChildren->tqfind(o); + bool * b = m_pFilteredChildren->find(o); if(b) { if(!*b)((TQWidget *)o)->setEnabled(false); diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index cf7d5a7..dfae586 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -247,7 +247,7 @@ void KviFrame::restoreModuleExtensionToolBars() for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it) { TQString szEntry = *it; - int idx = szEntry.tqfind(':'); + int idx = szEntry.find(':'); if(idx != -1) { TQString szMod = szEntry.left(idx); @@ -509,7 +509,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection) unsigned int minVal = time(0); while(it.current() && minVal) { - TQString * pVal = it.current()->tqfind("EntryTimestamp"); + TQString * pVal = it.current()->find("EntryTimestamp"); if(pVal) { bool bOk; @@ -805,7 +805,7 @@ void KviFrame::unhighlightWindowsOfContext(KviIrcContext * c) void KviFrame::setActiveWindow(KviWindow *wnd) { - // ASSERT(m_pWinList->tqfindRef(wnd)) + // ASSERT(m_pWinList->findRef(wnd)) if(wnd->isMinimized())wnd->restore(); if(wnd->mdiParent())wnd->setFocus(); else wnd->delayedAutoRaise(); @@ -867,7 +867,7 @@ void KviFrame::childConnectionUserModeChange(KviIrcConnection * c) void KviFrame::childWindowActivated(KviWindow *wnd) { - // ASSERT(m_pWinList->tqfindRef(wnd)) + // ASSERT(m_pWinList->findRef(wnd)) if(g_pActiveWindow == wnd)return; if(g_pActiveWindow)g_pActiveWindow->lostUserFocus(); // YES: it's HERE! diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index ebc7e67..5f18eb4 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -138,7 +138,7 @@ public: // window list. This is useful for asynchronous functions // that keep a window pointer and need to ensure that it is still // valid after an uncontrolled delay. (Think of a /timer implementation) - bool windowExists(KviWindow * wnd){ return (m_pWinList->tqfindRef(wnd) != -1); }; + bool windowExists(KviWindow * wnd){ return (m_pWinList->findRef(wnd) != -1); }; // The number of consoles in this frame unsigned int consoleCount(); // Creates a new console window. DON'T use the KviConsole constructor directly. diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index 8ddb9b1..a4c89ad 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -139,7 +139,7 @@ KviImageDialog::KviImageDialog(TQWidget * par, m_pTypeList->append(KID_TYPE_FULL_PATH); } - int idx = m_pTypeList->tqfindIndex(initialType); + int idx = m_pTypeList->findIndex(initialType); if(idx < 0)idx = 0; TQWidget * l = new TQWidget(this); diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index eafce46..1a255fc 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -797,7 +797,7 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e) #ifdef COMPILE_USE_QT4 int occ = szClip.count(TQChar('\n')); #else - int occ = szClip.tqcontains(TQChar('\n')); + int occ = szClip.contains(TQChar('\n')); #endif if(!szClip.isEmpty()) @@ -807,10 +807,10 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e) szClip.truncate(60); szClip.append("..."); } - szClip.tqreplace(TQChar('&'),"&"); - szClip.tqreplace(TQChar('<'),"<"); - szClip.tqreplace(TQChar('>'),">"); - szClip.tqreplace(TQChar('\n'),"<br>"); + szClip.replace(TQChar('&'),"&"); + szClip.replace(TQChar('<'),"<"); + szClip.replace(TQChar('>'),">"); + szClip.replace(TQChar('\n'),"<br>"); TQString label = "<center><b>"; label += __tr2qs("Clipboard"); @@ -985,13 +985,13 @@ void KviInputEditor::insertText(const TQString &text) //szText.replaceAll('\t'," "); //Do not paste tabs - //szText.tqreplace(TQRegExp("\t")," "); // do not paste tabs + //szText.replace(TQRegExp("\t")," "); // do not paste tabs m_bUpdatesEnabled = false; removeSelected(); m_bUpdatesEnabled = true; - if(szText.tqfind('\n') == -1) + if(szText.find('\n') == -1) { m_szTextBuffer.insert(m_iCursorPosition,szText); m_szTextBuffer.truncate(m_iMaxBufferSize); @@ -1001,7 +1001,7 @@ void KviInputEditor::insertText(const TQString &text) TQString szBlock; while(!szText.isEmpty()) { - int idx = szText.tqfind('\n'); + int idx = szText.find('\n'); if(idx != -1) { szBlock = szText.left(idx); @@ -1046,7 +1046,7 @@ void KviInputEditor::pasteClipboardWithConfirmation() if(!c)return; TQString szText = c->text(TQClipboard::Clipboard); - if(szText.tqcontains(TQChar('\n')) > 0) + if(szText.contains(TQChar('\n')) > 0) { if(m_pInputParent->inherits("KviInput")) ((KviInput*)(m_pInputParent))->multiLinePaste(szText); @@ -1061,7 +1061,7 @@ void KviInputEditor::pasteSelectionWithConfirmation() if(!c)return; TQString szText = c->text(c->supportsSelection() ? TQClipboard::Selection : TQClipboard::Clipboard); - if(szText.tqcontains(TQChar('\n')) > 0) + if(szText.contains(TQChar('\n')) > 0) { if(m_pInputParent->inherits("KviInput")) ((KviInput*)(m_pInputParent))->multiLinePaste(szText); @@ -1779,10 +1779,10 @@ void KviInputEditor::getWordBeforeCursor(TQString &buffer,bool * bIsFirstWordInL buffer = m_szTextBuffer.left(m_iCursorPosition); - int idx = buffer.tqfindRev(' '); - int idx2 = buffer.tqfindRev(','); // This is for comma separated lists... - int idx3 = buffer.tqfindRev('('); - int idx4 = buffer.tqfindRev('"'); + int idx = buffer.findRev(' '); + int idx2 = buffer.findRev(','); // This is for comma separated lists... + int idx3 = buffer.findRev('('); + int idx4 = buffer.findRev('"'); if(idx2 > idx)idx = idx2; if(idx3 > idx)idx = idx3; if(idx4 > idx)idx = idx4; @@ -2485,7 +2485,7 @@ void KviInput::keyPressEvent(TQKeyEvent *e) #ifdef COMPILE_USE_QT4 int nLines = szText.count('\n') + 1; #else - int nLines = szText.tqcontains('\n') + 1; + int nLines = szText.contains('\n') + 1; #endif if(nLines > 15) { @@ -2551,7 +2551,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) m_pMultiLineEditor = KviScriptEditor::createInstance(this); TQString szText = __tr2qs("<Ctrl+Return>; submits, <Alt+Backspace>; hides this editor"); // compatibility entry to avoid breaking translation just before a release... :) - szText.tqreplace("Alt+Backspace","Ctrl+Backspace"); + szText.replace("Alt+Backspace","Ctrl+Backspace"); m_pMultiLineEditor->setFindText(szText); m_pMultiLineEditor->setFindLineeditReadOnly(true); m_pInputEditor->hide(); diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index b8b7903..25be1cc 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -1303,11 +1303,11 @@ void KviIrcView::getLinkEscapeCommand(TQString &buffer,const TQString &szPayload { if(szPayload.isEmpty())return; - int idx = szPayload.tqfind(escape_label); + int idx = szPayload.find(escape_label); if(idx == -1)return; idx += escape_label.length(); - int idx2 = szPayload.tqfind("[!",idx); + int idx2 = szPayload.find("[!",idx); int len = idx2 == -1 ? szPayload.length() - idx : idx2 - idx; buffer = szPayload.mid(idx,len); @@ -2128,7 +2128,7 @@ highlighting_check_loop: // yet more optimized if(*((unsigned short *)p) < 0xff) if(void * jmp_address = char_to_check_jump_table[*((unsigned short *)p)])goto *jmp_address; - // goto *(char_to_check_jump_table[*((unsigned char *)p)]); <--- tqreplace 0 with ¬hing_found + // goto *(char_to_check_jump_table[*((unsigned char *)p)]); <--- replace 0 with ¬hing_found //nothing_found: p++; goto highlighting_check_loop; @@ -3968,7 +3968,7 @@ void KviIrcView::toggleToolWidget() /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // -// The IrcView : tqfind +// The IrcView : find // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -4063,7 +4063,7 @@ void KviIrcView::findNext(const TQString& szText,bool bCaseS,bool bRegExp,bool b idx = re.search(l->szText,0); } else { TQString tmp = l->szText; - idx = tmp.tqfind(szText,0,bCaseS); + idx = tmp.find(szText,0,bCaseS); } if(idx != -1) @@ -4116,7 +4116,7 @@ void KviIrcView::findPrev(const TQString& szText,bool bCaseS,bool bRegExp,bool b idx = re.search(l->szText,0); } else { TQString tmp = l->szText; - idx = tmp.tqfind(szText,0,bCaseS);; + idx = tmp.find(szText,0,bCaseS);; } if(idx != -1) @@ -4520,11 +4520,11 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) { TQString target(m_pKviWindow->windowName()); - target.tqreplace("\\","\\\\"); - target.tqreplace("\"","\\\""); - target.tqreplace(";","\\;"); - target.tqreplace("$","\\$"); - target.tqreplace("%","\\%"); + target.replace("\\","\\\\"); + target.replace("\"","\\\""); + target.replace(";","\\;"); + target.replace("$","\\$"); + target.replace("%","\\%"); TQChar flag = linkCmd[2]; switch(flag.tqunicode()) { @@ -4929,7 +4929,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin tip+="</nowrap></font></u></td></tr><tr><td>"; TQMimeSourceFactory::defaultFactory()->setPixmap("host_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER))); - if(linkText.tqfind('*') != -1) + if(linkText.find('*') != -1) { if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be masked"); else tip += __tr2qs("Unable to look it up hostname: Unknown host"); @@ -4955,7 +4955,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin } tip+="</nowrap></font></u></td></tr><tr><td>"; - if(linkText.tqfind('*') != -1) + if(linkText.find('*') != -1) { if(linkText.length() > 1)tip += __tr2qs("Server appears to be a network hub<br>"); else tip += __tr2qs("Unknown server<br>"); // might happen... @@ -5007,7 +5007,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin { if(console()->connection()) { - KviIrcUserEntry * e = console()->connection()->userDataBase()->tqfind(linkText); + KviIrcUserEntry * e = console()->connection()->userDataBase()->find(linkText); if(e) { TQString buffer; @@ -5035,8 +5035,8 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin TQString chanMode; c->getChannelModeString(chanMode); TQString topic = KviMircCntrl::stripControlBytes(c->topicWidget()->topic()); - topic.tqreplace("<","<"); - topic.tqreplace(">",">"); + topic.replace("<","<"); + topic.replace(">",">"); KviIrcUrl::join(szUrl,console()->connection()->target()->server()); szUrl.append(szChan); KviTQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index f00100a..f0040a1 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -254,7 +254,7 @@ void KviMaskEditor::searchTextChanged ( const TQString & text) { pMaskItem->setVisible(true); } else { - if(pMaskItem->tqmask()->szMask.tqcontains(text)) + if(pMaskItem->tqmask()->szMask.contains(text)) pMaskItem->setVisible(true); else pMaskItem->setVisible(false); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 398d49e..7d4a9b6 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -378,7 +378,7 @@ void KviMdiManager::childMaximized(KviMdiChild * lpC) void KviMdiManager::childMinimized(KviMdiChild * lpC,bool bWasMaximized) { __range_valid(lpC); - if(m_pZ->tqfindRef(lpC) == -1)return; + if(m_pZ->findRef(lpC) == -1)return; if(m_pZ->count() > 1) { m_pZ->setAutoDelete(false); @@ -930,7 +930,7 @@ void KviMdiManager::restoreAll() while(!list.isEmpty()) { KviMdiChild *lpC=list.first(); - if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).tqcontains("CONSOLE") )) + if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).contains("CONSOLE") )) lpC->restore(); list.removeFirst(); } diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index 585b75b..1c43223 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -266,7 +266,7 @@ void KviMenuBar::newConnectionToServer(int id) { KviKvsScript::run("options.edit KviServerOptionsWidget",m_pFrm->firstConsole()); } else { - text.tqreplace(TQString("&"),TQString("")); + text.replace(TQString("&"),TQString("")); KviStr szCommand; if(KviIrcUrl::parse(text.utf8().data(),szCommand,KVI_IRCURL_CONTEXT_NEW)) KviKvsScript::run(szCommand.ptr(),m_pFrm->firstConsole()); diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 11f781b..9407131 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -125,7 +125,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.tqcontains((char)ccc.tqunicode())); + cb->setChecked(m_szMode.contains((char)ccc.tqunicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } @@ -174,19 +174,19 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons szModes = c->connection()->serverInfo()->supportedChannelModes(); } - int idx = szModes.tqfindRev(','); + int idx = szModes.findRev(','); if(idx != -1)szModes.remove(0,idx+1); - szModes.tqreplace("p",""); - szModes.tqreplace("s",""); - szModes.tqreplace("t",""); - szModes.tqreplace("n",""); - szModes.tqreplace("m",""); - szModes.tqreplace("i",""); - szModes.tqreplace(",",""); - szModes.tqreplace("b",""); - szModes.tqreplace("k",""); - szModes.tqreplace("l",""); + szModes.replace("p",""); + szModes.replace("s",""); + szModes.replace("t",""); + szModes.replace("n",""); + szModes.replace("m",""); + szModes.replace("i",""); + szModes.replace(",",""); + szModes.replace("b",""); + szModes.replace("k",""); + szModes.replace("l",""); while(!szModes.isEmpty()) { @@ -197,7 +197,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.tqcontains((char)ccc.tqunicode())); + cb->setChecked(m_szMode.contains((char)ccc.tqunicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } @@ -311,15 +311,15 @@ void KviModeEditor::commit() for(KviStyledCheckBox * cb = m_pCheckBoxes->first();cb;cb = m_pCheckBoxes->next()) { TQString sz = cb->text(); - sz.tqreplace("&",""); + sz.replace("&",""); if(sz.length() > 0) { TQChar ccc = sz[0]; if(cb->isChecked()) { - if(!m_szMode.tqcontains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode()); + if(!m_szMode.contains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode()); } else { - if(m_szMode.tqcontains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode()); + if(m_szMode.contains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode()); } } } diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 8725933..7c817dd 100755 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -143,7 +143,7 @@ void KviModeWidget::editorReturnPressed() TQString szMinusModes; for(int i=0; i<szCurModes.length(); i++) { - if(szNewModes.tqcontains(szCurModes[i])) + if(szNewModes.contains(szCurModes[i])) szNewModes.remove(szCurModes[i]); else szMinusModes+=szCurModes[i]; @@ -165,8 +165,8 @@ void KviModeWidget::editorTextChanged( const TQString & text) TQString szText=text; for(i=0;i<szText.length();i++) { - if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().tqcontains(szText[i]) || - szText.tqfind(szText[i])<i ) + if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().contains(szText[i]) || + szText.find(szText[i])<i ) szText.remove(i,1); } m_pLineEdit->setText(szText); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index ed1801f..ce26661 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -137,7 +137,7 @@ void KviQuery::updateLabelText() TQString KviQuery::getInfoLabelTipText() { TQString txt; - KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName); + KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName); if(e) { TQString tmp; @@ -171,9 +171,9 @@ TQString KviQuery::getInfoLabelTipText() else tmp=__tr2qs("%1 is %2").tqarg(m_szName).tqarg(szMask); - tmp.tqreplace('&',"&"); - tmp.tqreplace('<',"<"); - tmp.tqreplace('>',">"); + tmp.replace('&',"&"); + tmp.replace('<',"<"); + tmp.replace('>',">"); txt += tmp; @@ -199,9 +199,9 @@ TQString KviQuery::getInfoLabelTipText() txt+="<tr><td>"; tmp=__tr2qs("Common channels with %1: %2").tqarg(m_szName).tqarg(szChans); - tmp.tqreplace('&',"&"); - tmp.tqreplace('<',"<"); - tmp.tqreplace('>',">"); + tmp.replace('&',"&"); + tmp.replace('<',"<"); + tmp.replace('>',">"); txt+=tmp; txt +="</td></tr>"; @@ -221,7 +221,7 @@ TQString KviQuery::getInfoLabelText() TQString tmp; if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel)) { - KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName); + KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName); if(e) { TQString szMask; diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index c7d8bba..861facd 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -259,7 +259,7 @@ void KviStatusBar::recalcMinimumHeight() bool KviStatusBar::appletExists(KviStatusBarApplet * pApplet) { - return (m_pAppletList->tqfindRef(pApplet) != -1); + return (m_pAppletList->findRef(pApplet) != -1); } KviStatusBarApplet * KviStatusBar::appletAt(const TQPoint &pnt,bool bBestMatch) @@ -394,7 +394,7 @@ void KviStatusBar::appletsPopupAboutToShow() KviStatusBarApplet * KviStatusBar::createApplet(const TQString &szInternalName) { - KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->tqfind(szInternalName); + KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->find(szInternalName); if(!d)return 0; return d->create(this); } @@ -419,7 +419,7 @@ void KviStatusBar::appletsPopupActivated(int id) { if(m_pClickedApplet) { - int idx = m_pAppletList->tqfindRef(m_pClickedApplet); + int idx = m_pAppletList->findRef(m_pClickedApplet); if(idx != -1) { // try to put the new applet just after the clicked one @@ -444,7 +444,7 @@ void KviStatusBar::appletsPopupActivated(int id) void KviStatusBar::registerAppletDescriptor(KviStatusBarAppletDescriptor * d) { - m_pAppletDescriptors->tqreplace(d->internalName(),d); + m_pAppletDescriptors->replace(d->internalName(),d); } void KviStatusBar::registerApplet(KviStatusBarApplet * a) @@ -518,7 +518,7 @@ void KviStatusBar::mouseMoveEvent(TQMouseEvent * e) } m_pAppletList->removeRef(m_pClickedApplet); - int idx = m_pAppletList->tqfindRef(a); + int idx = m_pAppletList->findRef(a); if(idx == -1)m_pAppletList->append(m_pClickedApplet); // uhg ? else { TQPoint p = a->mapFromGlobal(g); diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 9a0c0b9..37bb7a8 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -777,7 +777,7 @@ inline KviTaskBarItem * KviClassicTaskBar::prevItem(void) inline bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it) { - return (m_pButtonList->tqfindRef((const KviTaskBarButton *)it) != -1); + return (m_pButtonList->findRef((const KviTaskBarButton *)it) != -1); } diff --git a/src/kvirc/ui/kvi_texticonwin.h b/src/kvirc/ui/kvi_texticonwin.h index 83c9c3d..af98cd3 100644 --- a/src/kvirc/ui/kvi_texticonwin.h +++ b/src/kvirc/ui/kvi_texticonwin.h @@ -44,7 +44,7 @@ private: TQWidget * m_pOwner; TQString m_szTypedSeq; TQString m_szCurFullSeq; - bool m_bAltMode; // in alt mode the itemSelected() string tqcontains + bool m_bAltMode; // in alt mode the itemSelected() string contains // also the CTRL+I escape code int m_iTimerId; public: diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 8ae1962..d4a3ecd 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -499,9 +499,9 @@ void KviTopicWidget::updateToolTip() TQString tmp = m_szTopic; - tmp.tqreplace('&',"&"); - tmp.tqreplace('<',"<"); - tmp.tqreplace('>',">"); + tmp.replace('&',"&"); + tmp.replace('<',"<"); + tmp.replace('>',">"); tmp = convertToHtml(tmp); txt += tmp; @@ -563,7 +563,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) KviChannel *chan = ((KviChannel *)w); maxlen=chan->connection()->serverInfo()->maxTopicLen(); chan->getChannelModeString(szModes); - if(szModes.tqcontains('t') && !( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O')) ) { + if(szModes.contains('t') && !( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O')) ) { bCanEdit=false; } break; @@ -643,13 +643,13 @@ bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e) { switch( e->type() ) { case TQEvent::MouseButtonPress: - if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).tqcontains( ((TQMouseEvent*)e)->pos() ) ) { + if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).contains( ((TQMouseEvent*)e)->pos() ) ) { complete(m_pCompletionBox->index(m_pCompletionBox->itemAt(((TQMouseEvent*)e)->pos()))); return TRUE; } break; case TQEvent::MouseButtonRelease: - if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).tqcontains( ((TQMouseEvent*)e)->pos() ) ) { + if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).contains( ((TQMouseEvent*)e)->pos() ) ) { TQMouseEvent tmp( TQEvent::MouseButtonDblClick, ((TQMouseEvent*)e)->pos(), ((TQMouseEvent*)e)->button(), ((TQMouseEvent*)e)->state() ) ; // will hide popup diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index d96aa53..1b55386 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -605,7 +605,7 @@ KviUserListEntry * KviUserListView::join(const TQString &nick,const TQString &us const TQString &host,int iFlags) { // Ok..an user joins the channel - KviUserListEntry * it = m_pEntryDict->tqfind(nick); + KviUserListEntry * it = m_pEntryDict->find(nick); if(it == 0) { // add an entry to the global dict @@ -648,7 +648,7 @@ void KviUserListView::triggerUpdate() bool KviUserListView::avatarChanged(const TQString &nick) { - KviUserListEntry * it = m_pEntryDict->tqfind(nick); + KviUserListEntry * it = m_pEntryDict->find(nick); if(it) { int oldH = it->m_iHeight; @@ -704,7 +704,7 @@ bool KviUserListView::userActionVerifyMask(const TQString &nick,const TQString & // change (unless they were not known at all) // This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->tqfind(TQString(nick)); + KviUserListEntry * it = m_pEntryDict->find(TQString(nick)); if(it) { it->m_lastActionTime = kvi_unixTime(); @@ -750,7 +750,7 @@ void KviUserListView::userAction(const TQString &nick,const TQString &user,const // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->tqfind(TQString(nick)); + KviUserListEntry * it = m_pEntryDict->find(TQString(nick)); if(it) { it->m_lastActionTime = kvi_unixTime(); @@ -773,7 +773,7 @@ void KviUserListView::userAction(KviIrcMask *user,int actionTemperature) // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->tqfind(TQString(user->nick())); + KviUserListEntry * it = m_pEntryDict->find(TQString(user->nick())); if(it) { it->m_lastActionTime = kvi_unixTime(); @@ -793,7 +793,7 @@ void KviUserListView::userAction(const TQString &nick,int actionTemperature) // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->tqfind(nick); + KviUserListEntry * it = m_pEntryDict->find(nick); if(it) { it->m_lastActionTime = kvi_unixTime(); @@ -806,14 +806,14 @@ void KviUserListView::userAction(const TQString &nick,int actionTemperature) kvi_time_t KviUserListView::getUserJoinTime(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->tqfind(szNick); + KviUserListEntry * e = m_pEntryDict->find(szNick); if(!e)return (kvi_time_t)0; return e->m_joinTime; } kvi_time_t KviUserListView::getUserLastActionTime(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->tqfind(szNick); + KviUserListEntry * e = m_pEntryDict->find(szNick); if(!e)return (kvi_time_t)0; return e->m_lastActionTime; } @@ -821,7 +821,7 @@ kvi_time_t KviUserListView::getUserLastActionTime(const TQString &szNick) int KviUserListView::getUserModeLevel(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->tqfind(szNick); + KviUserListEntry * e = m_pEntryDict->find(szNick); if(!e)return 0; if(e->m_iFlags & KVI_USERFLAG_MODEMASK) { @@ -849,14 +849,14 @@ void KviUserListView::prependUserFlag(const TQString &nick,TQString &buffer) int KviUserListView::flags(const TQString &nick) { - KviUserListEntry * it = m_pEntryDict->tqfind(nick); + KviUserListEntry * it = m_pEntryDict->find(nick); return it ? it->m_iFlags : 0; } #define SET_FLAG_FUNC(__funcname,__flag) \ bool KviUserListView::__funcname(const TQString &nick,bool bYes) \ { \ - KviUserListEntry * it = m_pEntryDict->tqfind(nick); \ + KviUserListEntry * it = m_pEntryDict->find(nick); \ if(!it)return false; \ m_pEntryDict->setAutoDelete(false); \ partInternal(nick,false); \ @@ -883,7 +883,7 @@ SET_FLAG_FUNC(voice,KVI_USERFLAG_VOICE) #define GET_FLAG_FUNC(__funcname,__flag) \ bool KviUserListView::__funcname(const TQString &nick,bool bAtLeast) \ { \ - KviUserListEntry * it = m_pEntryDict->tqfind(nick); \ + KviUserListEntry * it = m_pEntryDict->find(nick); \ return it ? (bAtLeast ? (it->m_iFlags >= __flag) : (it->m_iFlags & __flag)) : false; \ } @@ -950,7 +950,7 @@ void KviUserListView::select(const TQString& nick){ ++it; } - KviUserListEntry * entry = m_pEntryDict->tqfind(nick); + KviUserListEntry * entry = m_pEntryDict->find(nick); if(entry) { entry->m_bSelected = true; @@ -964,7 +964,7 @@ void KviUserListView::select(const TQString& nick){ bool KviUserListView::partInternal(const TQString &nick,bool bRemove) { - KviUserListEntry * it = m_pEntryDict->tqfind(nick); + KviUserListEntry * it = m_pEntryDict->find(nick); if(it) { // so, first of all..check if this item is over, or below the top item @@ -1030,7 +1030,7 @@ bool KviUserListView::partInternal(const TQString &nick,bool bRemove) bool KviUserListView::nickChange(const TQString &oldNick,const TQString &newNick) { - KviUserListEntry * it = m_pEntryDict->tqfind(oldNick); + KviUserListEntry * it = m_pEntryDict->find(oldNick); if(it) { TQString user = it->m_pGlobalData->user(); @@ -1042,7 +1042,7 @@ bool KviUserListView::nickChange(const TQString &oldNick,const TQString &newNick KviIrcUserEntry::Gender gender = it->m_pGlobalData->gender(); bool bBot = it->m_pGlobalData->isBot(); part(oldNick); - __range_invalid(m_pEntryDict->tqfind(oldNick)); + __range_invalid(m_pEntryDict->find(oldNick)); it = join(newNick,user,host,iFlags); it->m_pGlobalData->setGender(gender); it->m_pGlobalData->setBot(bBot); @@ -1829,8 +1829,8 @@ void KviUserListViewArea::keyPressEvent( TQKeyEvent * e ) KviUserListEntry * aux = m_pListView->m_pHeadItem; while(aux) { - //debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().tqfind(szKey,0,0)); - if(aux->nick().tqfind(szKey,0,0)==0) + //debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().find(szKey,0,0)); + if(aux->nick().find(szKey,0,0)==0) { nick=aux; break; diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h index 2098a94..a666d33 100644 --- a/src/kvirc/ui/kvi_userlistview.h +++ b/src/kvirc/ui/kvi_userlistview.h @@ -182,7 +182,7 @@ public: int halfOpCount(){ return m_iHalfOpCount; }; int userOpCount(){ return m_iUserOpCount; }; - KviUserListEntry * findEntry(const TQString &nick){ return nick.isEmpty() ? 0 : m_pEntryDict->tqfind(nick); }; + KviUserListEntry * findEntry(const TQString &nick){ return nick.isEmpty() ? 0 : m_pEntryDict->find(nick); }; void appendSelectedNicknames(TQString &buffer); TQString * firstSelectedNickname(); TQString * nextSelectedNickname(); @@ -193,7 +193,7 @@ public: kvi_time_t getUserJoinTime(const TQString &nick); kvi_time_t getUserLastActionTime(const TQString &nick); char getUserFlag(KviUserListEntry * e); - char getUserFlag(const TQString &nick){ return getUserFlag(m_pEntryDict->tqfind(nick)); }; + char getUserFlag(const TQString &nick){ return getUserFlag(m_pEntryDict->find(nick)); }; bool part(const TQString &nick){ return partInternal(nick,true); }; bool op(const TQString &nick,bool bOp); void prependUserFlag(const TQString &nick,TQString &buffer); diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 763df17..d7f141a 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -301,7 +301,7 @@ bool KviWindow::focusNextPrevChild(bool next) #ifdef COMPILE_USE_QT4 if(w->tqparent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) #else - if(w->tqparent()->tqmetaObject()->tqfindProperty("KviProperty_ChildFocusOwner") == -1) + if(w->tqparent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) #endif return false; // Do NOT change the focus widget! } @@ -591,7 +591,7 @@ void KviWindow::getDefaultLogFileName(TQString &buffer) TQString base; getBaseLogFileName(base); kvi_encodeFileName(base); - base.tqreplace("%%2e","%2e"); + base.replace("%%2e","%2e"); base=base.lower(); TQString tmp; if(KVI_OPTION_BOOL(KviOption_boolGzipLogs)) @@ -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()->tqfindProperty("TransparencyCapable",true) != -1) + if(child->tqmetaObject()->findProperty("TransparencyCapable",true) != -1) ((TQWidget *)child)->update(); updateBackgrounds(child); @@ -1483,12 +1483,12 @@ void KviWindow::preprocessMessage(TQString & szMessage) #endif for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { TQString tmp(*it); - if(tmp.tqcontains('\r')) continue; + if(tmp.contains('\r')) continue; tmp = KviMircCntrl::stripControlBytes(tmp); tmp.stripWhiteSpace(); if(m_pConsole) if(m_pConsole->connection()) - if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().tqcontains(tmp[0])) + if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) if((*it)==tmp) *it=TQString("\r!c\r%1\r").tqarg(*it); else |