From 99e44ac443d2590ecdeb0da46608a0a537177fd7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 7 Jul 2011 21:14:06 +0000 Subject: [PATCH] Rename incorrect instances of tqrepaint[...] to repaint[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kvirc/ui/kvi_input.cpp | 58 +++++++++---------- src/kvirc/ui/kvi_input.h | 2 +- src/kvirc/ui/kvi_ircview.cpp | 6 +- src/kvirc/ui/kvi_listview.cpp | 8 +-- src/modules/eventeditor/eventeditor.cpp | 2 +- .../filetransferwindow/filetransferwindow.cpp | 2 +- src/modules/options/optw_messages.cpp | 6 +- src/modules/raweditor/raweditor.cpp | 2 +- .../sharedfileswindow/sharedfileswindow.cpp | 2 +- src/modules/toolbareditor/toolbareditor.cpp | 2 +- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 28ac74f..eafce46 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -776,7 +776,7 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e) m_iSelectionAnchorChar = m_iCursorPosition; selectOneChar(-1); //grabMouse(TQCursor(crossCursor)); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); killDragTimer(); m_iDragTimer = startTimer(KVI_INPUT_DRAG_TIMEOUT); @@ -922,7 +922,7 @@ void KviInputEditor::copyToClipboard() if(!c)return; TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); c->setText(szTxt,TQClipboard::Clipboard); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } void KviInputEditor::copyToSelection(bool bDonNotCopyToClipboard) @@ -935,7 +935,7 @@ void KviInputEditor::copyToSelection(bool bDonNotCopyToClipboard) c->setText(szTxt,TQClipboard::Selection); else if(!bDonNotCopyToClipboard) c->setText(szTxt,TQClipboard::Clipboard); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } @@ -954,7 +954,7 @@ void KviInputEditor::moveCursorTo(int idx,bool bRepaint) m_iCursorPosition = idx; if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar = m_iCursorPosition; } - if(bRepaint)tqrepaintWithCursorOn(); + if(bRepaint)repaintWithCursorOn(); } void KviInputEditor::removeSelected() @@ -963,7 +963,7 @@ void KviInputEditor::removeSelected() m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); moveCursorTo(m_iSelectionBegin,false); selectOneChar(-1); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } void KviInputEditor::cut() @@ -975,7 +975,7 @@ void KviInputEditor::cut() m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); moveCursorTo(m_iSelectionBegin,false); selectOneChar(-1); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } void KviInputEditor::insertText(const TQString &text) @@ -1032,7 +1032,7 @@ int KviInputEditor::replaceSegment(int start, int length, const TQString &text) m_szTextBuffer.remove(start, length); m_szTextBuffer.insert(start, text); m_szTextBuffer.truncate(m_iMaxBufferSize); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); int iInsertedLength = text.length(); int iMaxInsertedLength = m_iMaxBufferSize - start; @@ -1191,7 +1191,7 @@ void KviInputEditor::handleDragSelection() m_iSelectionEnd = m_iSelectionAnchorChar-1; } } - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } void KviInputEditor::returnPressed(bool bRepaint) @@ -1218,7 +1218,7 @@ void KviInputEditor::returnPressed(bool bRepaint) selectOneChar(-1); m_iCursorPosition = 0; m_iFirstVisibleChar = 0; - if(bRepaint)tqrepaintWithCursorOn(); + if(bRepaint)repaintWithCursorOn(); KviUserInput::parse(szBuffer,m_pKviWindow); } else { */ @@ -1327,7 +1327,7 @@ void KviInputEditor::imComposeEvent(TQIMEvent *e) // tqrepaint m_bUpdatesEnabled = true; - tqrepaintWithCursorOn(); + repaintWithCursorOn(); e->accept(); } @@ -1349,7 +1349,7 @@ void KviInputEditor::imEndEvent(TQIMEvent *e) // tqrepaint m_bUpdatesEnabled = true; - tqrepaintWithCursorOn(); + repaintWithCursorOn(); // reset data m_bIMComposing = false; @@ -1427,7 +1427,7 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e) if(m_szTextBuffer.at(m_iCursorPosition).isSpace())break; internalCursorRight(e->state() & TQt::ShiftButton); } - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } break; case TQt::Key_Left: @@ -1445,7 +1445,7 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e) if(m_szTextBuffer.at(m_iCursorPosition - 1).isSpace())break; internalCursorLeft(e->state() & TQt::ShiftButton); } - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } break; case TQt::Key_K: @@ -1520,7 +1520,7 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e) m_iCursorPosition--; if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar--; } - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } break; case TQt::Key_PageUp: @@ -1536,7 +1536,7 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e) m_iSelectionBegin=0; m_iSelectionEnd=m_szTextBuffer.length()-1; m_iCursorPosition=m_szTextBuffer.length(); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); break; case TQt::Key_Return: case TQt::Key_Enter: @@ -1547,7 +1547,7 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e) selectOneChar(-1); m_iCursorPosition = 0; m_iFirstVisibleChar = 0; - tqrepaintWithCursorOn(); + repaintWithCursorOn(); KviUserInput::parseNonCommand(szBuffer,m_pKviWindow); if (!szBuffer.isEmpty()) { @@ -1615,14 +1615,14 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e) if(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { internalCursorRight(e->state() & TQt::ShiftButton); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } break; case TQt::Key_Left: if(m_iCursorPosition > 0) { internalCursorLeft(e->state() & TQt::ShiftButton); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } break; case TQt::Key_Backspace: @@ -1640,7 +1640,7 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e) if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar--; } selectOneChar(-1); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } break; case TQt::Key_Delete: @@ -1651,7 +1651,7 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e) { m_szTextBuffer.remove(m_iCursorPosition,1); selectOneChar(-1); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } } break; @@ -1808,7 +1808,7 @@ void KviInputEditor::completion(bool bShift) else { // this is standard nick completion continued standardNickCompletion(bShift,word,bFirstWordInLine); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); return; } } @@ -1850,7 +1850,7 @@ void KviInputEditor::completion(bool bShift) match=m_pKviWindow->windowName(); match.append(" "); replaceWordBeforeCursor(word,match,false); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); return; } else { if(m_pKviWindow->console()) @@ -1875,7 +1875,7 @@ void KviInputEditor::completion(bool bShift) bIsNick = true; } else { standardNickCompletion(bShift,word,bFirstWordInLine); - tqrepaintWithCursorOn(); + repaintWithCursorOn(); return; } } @@ -1933,7 +1933,7 @@ void KviInputEditor::completion(bool bShift) replaceWordBeforeCursor(word,match,false); } - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } void KviInputEditor::replaceWordBeforeCursor(const TQString &word,const TQString &replacement,bool bRepaint) @@ -1944,7 +1944,7 @@ void KviInputEditor::replaceWordBeforeCursor(const TQString &word,const TQString m_szTextBuffer.insert(m_iCursorPosition,replacement); m_szTextBuffer.truncate(m_iMaxBufferSize); moveCursorTo(m_iCursorPosition + replacement.length()); - if(bRepaint)tqrepaintWithCursorOn(); + if(bRepaint)repaintWithCursorOn(); } void KviInputEditor::standardNickCompletion(bool bAddMask,TQString &word,bool bFirstWordInLine) @@ -2045,14 +2045,14 @@ void KviInputEditor::end() moveRightFirstVisibleCharToShowCursor(); m_iCursorPosition++; } - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } void KviInputEditor::home() { m_iFirstVisibleChar = 0; m_iCursorPosition = 0; - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } void KviInputEditor::insertChar(TQChar c) @@ -2073,7 +2073,7 @@ void KviInputEditor::insertChar(TQChar c) m_szTextBuffer.insert(m_iCursorPosition,c); moveRightFirstVisibleCharToShowCursor(); m_iCursorPosition++; - tqrepaintWithCursorOn(); + repaintWithCursorOn(); } void KviInputEditor::moveRightFirstVisibleCharToShowCursor() @@ -2100,7 +2100,7 @@ void KviInputEditor::moveRightFirstVisibleCharToShowCursor() } } -void KviInputEditor::tqrepaintWithCursorOn() +void KviInputEditor::repaintWithCursorOn() { // :) if(m_bUpdatesEnabled) diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index cc6e3e6..777fb41 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -162,7 +162,7 @@ private: void drawTextBlock(TQPainter *pa,TQFontMetrics & fm,int curXPos,int textBaseline,int idx,int len,bool bSelected=FALSE); TQChar getSubstituteChar(unsigned short control_code); void moveRightFirstVisibleCharToShowCursor(); - void tqrepaintWithCursorOn(); + void repaintWithCursorOn(); void selectOneChar(int pos); int charIndexFromXPosition(int xPos); int xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bContentsCoords=FALSE); diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 330ae09..9d1ce47 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -2719,7 +2719,7 @@ void KviIrcView::fastScroll(int lines) } // Ok...the current line is the last one here - // It is the only one that needs to be tqrepainted + // It is the only one that needs to be repainted int widgetWidth = width()-m_pScrollBar->width(); if(widgetWidth < KVI_IRCVIEW_PIXMAP_SEPARATOR_AND_DOUBLEBORDER_WIDTH+10)return; //can't show stuff here int widgetHeight = height(); @@ -2812,10 +2812,10 @@ void KviIrcView::paintEvent(TQPaintEvent *p) { r=p->rect(); // app triggered , or self triggered from fastScroll (in that case m_iUnprocessedPaintEventRequests is set to 0 there) if(r == rect()) - m_iUnprocessedPaintEventRequests = 0; // only full tqrepaints reset + m_iUnprocessedPaintEventRequests = 0; // only full repaints reset } else { // A self triggered event - m_iUnprocessedPaintEventRequests = 0; // only full tqrepaints reset + m_iUnprocessedPaintEventRequests = 0; // only full repaints reset r = rect(); } diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index 7665287..d1605e9 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -55,7 +55,7 @@ void KviListView::setBackgroundOverlayPixmap(TQPixmap * pix,int iAlignmentFlags) #endif m_pBackgroundOverlayPixmap=new TQPixmap(*pix); m_iBackgroundOverlayAlignment= TQt::AlignRight | TQt::AlignBottom; - tqrepaintContents(); + repaintContents(); } @@ -190,7 +190,7 @@ void KviListView::resizeEvent(TQResizeEvent * e) { KviTalListView::resizeEvent(e); if(m_pBackgroundOverlayPixmap) - tqrepaintContents(); // force a full tqrepaint (otherwise qt does not honor static background here) + repaintContents(); // force a full tqrepaint (otherwise qt does not honor static background here) } #ifdef COMPILE_ON_WINDOWS @@ -199,14 +199,14 @@ void KviListView::focusInEvent(TQFocusEvent * e) { KviTalListView::focusInEvent(e); if(m_pBackgroundOverlayPixmap) - tqrepaintContents(); + repaintContents(); } void KviListView::focusOutEvent(TQFocusEvent * e) { KviTalListView::focusOutEvent(e); if(m_pBackgroundOverlayPixmap) - tqrepaintContents(); + repaintContents(); } #endif diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index b425319..d967bb7 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -240,7 +240,7 @@ void KviEventEditor::toggleCurrentHandlerEnabled() if(m_pLastEditedItem) { m_pLastEditedItem->m_bEnabled = !(m_pLastEditedItem->m_bEnabled); - m_pListView->tqrepaintItem(m_pLastEditedItem); + m_pListView->repaintItem(m_pLastEditedItem); selectionChanged(m_pLastEditedItem); } } diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index e26cc60..b34b843 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -647,7 +647,7 @@ void KviFileTransferWindow::heartbeat() { if(((KviFileTransferItem *)i1)->transfer()->active()) { - m_pListView->tqrepaintItem(i1); + m_pListView->repaintItem(i1); } i1 = i1->nextSibling(); } diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 9e79daa..058afb6 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -484,7 +484,7 @@ void KviMessageColorsOptionsWidget::newIconSelected(int iconId) if(iconId >= KVI_NUM_SMALL_ICONS)return; m_pLastItem->msgType()->setPixId(iconId); m_pIconButton->setIconSet(*(g_pIconManager->getSmallIcon(iconId))); - m_pListView->tqrepaintItem(m_pLastItem); + m_pListView->repaintItem(m_pLastItem); } void KviMessageColorsOptionsWidget::saveLastItem() @@ -510,7 +510,7 @@ void KviMessageColorsOptionsWidget::saveLastItem() curIt = m_pLevelListBox->currentItem(); if(curIt < 0 || curIt > 5)curIt = 1; m_pLastItem->msgType()->setLevel(curIt); - m_pListView->tqrepaintItem(m_pLastItem); + m_pListView->repaintItem(m_pLastItem); } void KviMessageColorsOptionsWidget::itemChanged(KviTalListViewItem * it) @@ -678,7 +678,7 @@ void KviMessageColorsOptionsWidget::load() int iLevel = cfg.readIntEntry(tmp,it->msgType()->level()); it->msgType()->setLevel(iLevel); - m_pListView->tqrepaintItem(it); + m_pListView->repaintItem(it); it = (KviMessageListViewItem *)(it->nextSibling()); } diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index 662dc37..521c994 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -275,7 +275,7 @@ void KviRawEditor::toggleCurrentHandlerEnabled() if(m_pLastEditedItem) { m_pLastEditedItem->m_bEnabled = !(m_pLastEditedItem->m_bEnabled); - m_pListView->tqrepaintItem(m_pLastEditedItem); + m_pListView->repaintItem(m_pLastEditedItem); selectionChanged(m_pLastEditedItem); } } diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 3f486dd..7e2364f 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -642,7 +642,7 @@ void KviSharedFilesWindow::heartbeat() { if(((KviSharedFilesItem *)i1)->transfer()->active()) { - m_pListView->tqrepaintItem(i1); + m_pListView->repaintItem(i1); } i1 = i1->nextSibling(); } diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index d80d884..3f3d9d1 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -357,7 +357,7 @@ void KviCustomizeToolBarsDialog::currentToolBarChanged() void KviCustomizeToolBarsDialog::showEvent(TQShowEvent * e) { -// tqrepaintContents(); +// repaintContents(); // TQRect r = tqparentWidget() ? tqparentWidget()->rect() : TQApplication::desktop()->rect(); // int x = (r.width() - width()) / 2; // int y = (r.height() - height()) / 2;