From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:34:45 -0600 Subject: Rename old tq methods that no longer need a unique name --- kmail/kmheaders.cpp | 56 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'kmail/kmheaders.cpp') diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 987f9aa0..1e9e5d13 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -329,7 +329,7 @@ void KMHeaders::slotToggleColumn(int id, int mode) } case KPaintInfo::COL_STATUS: { - show = &mPaintInfo.showtqStatus; + show = &mPaintInfo.showStatus; col = &mPaintInfo.statusCol; width = pixNew->width() + 8; if ( *col == header()->mapToIndex( *col ) ) @@ -409,7 +409,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect ) rect.left() + contentsX(), rect.top() + contentsY() ); else - p->fillRect( rect, tqcolorGroup().base() ); + p->fillRect( rect, colorGroup().base() ); } bool KMHeaders::event(TQEvent *e) @@ -669,7 +669,7 @@ void KMHeaders::writeConfig (void) config->writeEntry("showTodoColumn" , mPaintInfo.showTodo); config->writeEntry("showSpamHamColumn" , mPaintInfo.showSpamHam); config->writeEntry("showWatchedIgnoredColumn", mPaintInfo.showWatchedIgnored); - config->writeEntry("showStatusColumn" , mPaintInfo.showtqStatus); + config->writeEntry("showStatusColumn" , mPaintInfo.showStatus); config->writeEntry("showSignedColumn" , mPaintInfo.showSigned); config->writeEntry("showCryptoColumn" , mPaintInfo.showCrypto); config->writeEntry("showReceiverColumn" , mPaintInfo.showReceiver); @@ -700,7 +700,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) highlightMessage(0, false); disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfotqStatus())); + this, TQT_SLOT(setFolderInfoStatus())); mFolder->markNewAsUnread(); writeFolderConfig(); @@ -754,7 +754,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)), BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfotqStatus())); + this, TQT_SLOT(setFolderInfoStatus())); connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); // Not very nice, but if we go from nested to non-nested @@ -789,7 +789,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) END_TIMER(updateMsg); SHOW_TIMER(updateMsg); makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); TQString colText = i18n( "Sender" ); if (mFolder && (mFolder->whoField().lower() == "to") && !mPaintInfo.showReceiver) @@ -831,7 +831,7 @@ void KMHeaders::msgChanged() const bool scrollbarAtBottom = verticalScrollBar() && verticalScrollBar()->value() == verticalScrollBar()->maxValue(); const HeaderItem * const oldFirstVisibleItem = dynamic_cast( itemAt( TQPoint( 0, 0 ) ) ); - const int oldOffsetOfFirstVisibleItem = tqitemRect( oldFirstVisibleItem ).y(); + const int oldOffsetOfFirstVisibleItem = itemRect( oldFirstVisibleItem ).y(); const uint oldSerNumOfFirstVisibleItem = oldFirstVisibleItem ? oldFirstVisibleItem->msgSerNum() : 0; TQString msgIdMD5; @@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id) } if (parent && mFolder->getMsgBase(parent->id())->isWatched()) - mFolder->getMsgBase(id)->setqStatus( KMMsgStatusWatched ); + mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched ); else if (parent && mFolder->getMsgBase(parent->id())->isIgnored()) - mFolder->getMsgBase(id)->setqStatus( KMMsgStatusIgnored ); + mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored ); if (parent) hi = new HeaderItem( parent->item(), id ); else @@ -1220,7 +1220,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId) //----------------------------------------------------------------------------- -void KMHeaders::setMsgtqStatus (KMMsgtqStatus status, bool toggle) +void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle) { // kdDebug() << k_funcinfo << endl; SerNumList serNums = selectedVisibleSernums(); @@ -1254,7 +1254,7 @@ TQPtrList KMHeaders::currentThread() const return list; } -void KMHeaders::setThreadtqStatus(KMMsgtqStatus status, bool toggle) +void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle) { TQPtrList curThread; @@ -1372,9 +1372,9 @@ void KMHeaders::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -1389,7 +1389,7 @@ void KMHeaders::styleChange( TQStyle& oldStyle ) } //----------------------------------------------------------------------------- -void KMHeaders::setFolderInfotqStatus () +void KMHeaders::setFolderInfoStatus () { if ( !mFolder ) return; TQString str; @@ -1701,7 +1701,7 @@ void KMHeaders::setCurrentMsg(int cur) setSelectionAnchor( currentItem() ); } makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } //----------------------------------------------------------------------------- @@ -1833,7 +1833,7 @@ void KMHeaders::selectNextMessage() (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true)); setCurrentItem(below); makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } } } @@ -1871,7 +1871,7 @@ void KMHeaders::selectPrevMessage() (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true)); setCurrentItem(above); makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } } } @@ -2140,7 +2140,7 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread) mItems[idx]->irefresh(); mItems[idx]->tqrepaint(); emit selected( msg ); - setFolderInfotqStatus(); + setFolderInfoStatus(); } void KMHeaders::highlightCurrentThread() @@ -2344,21 +2344,21 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) HeaderItem *item = static_cast( lvi ); KMMsgBase *msg = mFolder->getMsgBase(item->msgId()); if ( section == mPaintInfo.flagCol && flagsToggleable ) { - setMsgtqStatus( KMMsgStatusFlag, true ); + setMsgStatus( KMMsgStatusFlag, true ); } else if ( section == mPaintInfo.importantCol && flagsToggleable ) { - setMsgtqStatus( KMMsgStatusFlag, true ); + setMsgStatus( KMMsgStatusFlag, true ); } else if ( section == mPaintInfo.todoCol && flagsToggleable ) { - setMsgtqStatus( KMMsgStatusTodo, true ); + setMsgStatus( KMMsgStatusTodo, true ); } else if ( section == mPaintInfo.watchedIgnoredCol && flagsToggleable ) { if ( msg->isWatched() || msg->isIgnored() ) - setMsgtqStatus( KMMsgStatusIgnored, true ); + setMsgStatus( KMMsgStatusIgnored, true ); else - setMsgtqStatus( KMMsgStatusWatched, true ); + setMsgStatus( KMMsgStatusWatched, true ); } else if ( section == mPaintInfo.statusCol ) { if ( msg->isUnread() || msg->isNew() ) - setMsgtqStatus( KMMsgStatusRead ); + setMsgStatus( KMMsgStatusRead ); else - setMsgtqStatus( KMMsgStatusUnread ); + setMsgStatus( KMMsgStatusUnread ); } } } @@ -2424,7 +2424,7 @@ void KMHeaders::highlightMessage(TQListViewItem* i) //----------------------------------------------------------------------------- void KMHeaders::slotRMB() { - if (!tqtopLevelWidget()) return; // safe bet + if (!topLevelWidget()) return; // safe bet mOwner->updateMessageActions(); // check if the user clicked into a status column and only show the respective menues @@ -3355,9 +3355,9 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) // If the parent is watched or ignored, propagate that to it's // tqchildren if (mFolder->getMsgBase(i->id())->isWatched()) - mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusWatched); + mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched); if (mFolder->getMsgBase(i->id())->isIgnored()) - mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusIgnored); + mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored); khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key()); } else { khi = new HeaderItem(this, new_kci->id(), new_kci->key()); -- cgit v1.2.3