From 3b66617d9d5f343c30a87381720db2fc835ce52b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:56:22 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro --- akregator/src/tabwidget.cpp | 2 +- certmanager/certificatewizardimpl.cpp | 2 +- kaddressbook/jumpbuttonbar.cpp | 2 +- kaddressbook/views/cardview.cpp | 2 +- kdgantt/KDGanttMinimizeSplitter.cpp | 4 ++-- kmail/kmfoldermaildir.cpp | 2 +- knotes/knotebutton.cpp | 2 +- korganizer/actionmanager.cpp | 2 +- korganizer/calendarview.cpp | 2 +- korganizer/datenavigatorcontainer.cpp | 2 +- korganizer/koagenda.cpp | 12 ++++++------ korganizer/kodaymatrix.cpp | 2 +- korganizer/kotodoview.cpp | 2 +- libkcal/calhelper.cpp | 2 +- libkmime/kmime_header_parsing.cpp | 8 ++++---- libtdepim/addresseelineedit.cpp | 2 +- libtdepim/distributionlist.cpp | 2 +- tderesources/kolab/kcal/resourcekolab.cpp | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index 76c8b198..eadab090 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength ) if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); + x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } return x; } diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index e1d47f99..38352db9 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -362,7 +362,7 @@ void CertificateWizardImpl::createPersonalDataPage() if ( config.entryIsImmutable( attr ) ) le->setEnabled( false ); - _attrPairList.append(tqMakePair(key, le)); + _attrPairList.append(qMakePair(key, le)); connect( le, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotEnablePersonalDataPageExit()) ); diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index def1896f..1a1d249c 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons() TQFontMetrics fm = fontMetrics(); TQPushButton *btn = new TQPushButton( "", this ); btn->hide(); - TQSize buttonSize = style().tqsizeFromContents( TQStyle::CT_PushButton, btn, + TQSize buttonSize = style().sizeFromContents( TQStyle::CT_PushButton, btn, fm.size( ShowPrefix, "X - X") ). expandedTo( TQApplication::globalStrut() ); delete btn; diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 47181557..e77d66e0 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg ) // if we are the current item and the view has focus, draw focus rect if ( mView->currentItem() == this && mView->hasFocus() ) { - mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, + mView->style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg, TQStyle::Style_FocusAtBorder, TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) ); diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 22eace45..2339d1ce 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -241,7 +241,7 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) p.setBrush( colorGroup().background() ); p.setPen( colorGroup().foreground() ); p.drawRect( rect() ); - parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), + parentWidget()->style().drawPrimitive( TQStyle::PE_Panel, &p, rect(), parentWidget()->colorGroup()); int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size @@ -601,7 +601,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { - style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), + style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), (orientation() == TQt::Horizontal ? TQStyle::Style_Horizontal : 0)); } diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 29f9aacc..9862bb47 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -1122,7 +1122,7 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const item = new KFileItem( S_IFDIR, -1, location() + "/tmp" ); list.append( item ); s_DirSizeJobQueue.append( - tqMakePair( TQGuardedPtr( this ), list ) ); + qMakePair( TQGuardedPtr( this ), list ) ); // if there's only one entry in the queue then we can start // a dirSizeJob right away diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index 5bee8384..47d64a3e 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -78,7 +78,7 @@ void KNoteButton::drawButton( TQPainter* p ) if ( !m_flat ) flags |= TQStyle::Style_MouseOver; - style().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags ); + style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags ); drawButtonLabel( p ); } diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index f8a4e4ad..128ebd68 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -1558,7 +1558,7 @@ TQPair ActionManager::viewSubResourceCalendar() cV = mCalendarView->viewManager()->multiAgendaView()->selectedAgendaView(); } if ( cV ) { - p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() ); + p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() ); } return p; } diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 28a128a0..8e2e1b70 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -357,7 +357,7 @@ TQPair CalendarView::viewSubResourceCalendar() cV = mViewManager->multiAgendaView()->selectedAgendaView(); } if ( cV ) { - p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() ); + p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() ); } return p; } diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index bb965ba2..b2b8e8a0 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -332,7 +332,7 @@ TQPair DateNavigatorContainer::dateLimits( int offset ) TQPair firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth ); TQPair lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth ); - return tqMakePair( firstMonthBoundary.first, lastMonthBoundary.second ); + return qMakePair( firstMonthBoundary.first, lastMonthBoundary.second ); } #include "datenavigatorcontainer.moc" diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 87239801..18a1c2ad 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -274,7 +274,7 @@ void KOAgenda::init() mClickedItem = 0; mActionItem = 0; - mResPair = tqMakePair( static_cast( 0 ), TQString() ); + mResPair = qMakePair( static_cast( 0 ), TQString() ); mActionType = NOP; mItemMoved = false; @@ -623,7 +623,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) Incidence *incidence = item->incidence(); if ( incidence->isReadOnly() ) { mActionItem = 0; - mResPair = tqMakePair( static_cast( 0 ), TQString() ); + mResPair = qMakePair( static_cast( 0 ), TQString() ); } else { mActionItem = item; mResPair = CalHelper::incSubResourceCalendar( mCalendar, incidence ); @@ -657,7 +657,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) if ( !ptInSelection( gpos ) ) { selectItem(0); mActionItem = 0; - mResPair = tqMakePair( static_cast( 0 ), TQString() ); + mResPair = qMakePair( static_cast( 0 ), TQString() ); setCursor(arrowCursor); startSelectAction(viewportPos); } @@ -918,7 +918,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos) emit startDragSignal( mActionItem->incidence() ); setCursor( arrowCursor ); mActionItem = 0; - mResPair = tqMakePair( static_cast( 0 ), TQString() ); + mResPair = qMakePair( static_cast( 0 ), TQString() ); mActionType = NOP; mItemMoved = false; return; @@ -952,7 +952,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos) placeSubCells( mActionItem ); setCursor( arrowCursor ); mActionItem = 0; - mResPair = tqMakePair( static_cast( 0 ), TQString() ); + mResPair = qMakePair( static_cast( 0 ), TQString() ); mActionType = NOP; mItemMoved = false; return; @@ -1192,7 +1192,7 @@ void KOAgenda::endItemAction() } mActionItem = 0; - mResPair = tqMakePair( static_cast( 0 ), TQString() ); + mResPair = qMakePair( static_cast( 0 ), TQString() ); mItemMoved = false; if ( multiModify ) { diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 5d95b81e..d78bb43e 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -725,5 +725,5 @@ TQPair KODayMatrix::matrixLimits( const TQDate &month ) d = d.addDays( -7 ); // Start on the second line } - return tqMakePair( d, d.addDays( NUMDAYS-1 ) ); + return qMakePair( d, d.addDays( NUMDAYS-1 ) ); } diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index dbae5ceb..b919602e 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -1065,7 +1065,7 @@ void KOTodoView::itemStateChanged( TQListViewItem *item ) void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage ) { - mPercentChangedMap.append( tqMakePair( item, percentage ) ); + mPercentChangedMap.append( qMakePair( item, percentage ) ); TQTimer::singleShot( 0, this, TQT_SLOT( processDelayedNewPercentage() ) ); } diff --git a/libkcal/calhelper.cpp b/libkcal/calhelper.cpp index 89a67fb3..b7816675 100644 --- a/libkcal/calhelper.cpp +++ b/libkcal/calhelper.cpp @@ -162,6 +162,6 @@ TQPair CalHelper::incSubResourceCalendar( Calendar if ( res && res->canHaveSubresources() ) { subRes = res->subresourceIdentifier( incidence ); } - p = tqMakePair( res, subRes ); + p = qMakePair( res, subRes ); return p; } diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 1e900702..aa3d29b7 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -1104,7 +1104,7 @@ bool parseParameter( const char* & scursor, const char * const send, "Chopping away \"*\"." << endl; maybeAttribute.truncate( maybeAttribute.length() - 1 ); } - result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); + result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); return true; } @@ -1128,19 +1128,19 @@ bool parseParameter( const char* & scursor, const char * const send, if ( !parseGenericQuotedString( scursor, send, maybeValue.qstring, isCRLF ) ) { scursor = oldscursor; - result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); + result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); return false; // this case needs further processing by upper layers!! } } else { // value is a token: if ( !parseToken( scursor, send, maybeValue.qpair, false /* no 8bit */ ) ) { scursor = oldscursor; - result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); + result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); return false; // this case needs further processing by upper layers!! } } - result = tqMakePair( maybeAttribute.lower(), maybeValue ); + result = qMakePair( maybeAttribute.lower(), maybeValue ); return true; } diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 68a16e11..d867768c 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -763,7 +763,7 @@ void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, i weight = TQMAX( ( *it ).first, weight ); ( *it ).first = weight; } else { - s_completionItemMap->insert( string, tqMakePair( weight, completionItemSource ) ); + s_completionItemMap->insert( string, qMakePair( weight, completionItemSource ) ); } if ( keyWords == 0 ) s_completion->addItem( string, weight ); diff --git a/libtdepim/distributionlist.cpp b/libtdepim/distributionlist.cpp index 2fd50f5a..74cb99ca 100644 --- a/libtdepim/distributionlist.cpp +++ b/libtdepim/distributionlist.cpp @@ -44,7 +44,7 @@ static ParseList parseCustom( const TQString& str ) Q_ASSERT( helpList.count() < 3 ); // 1 or 2 items, but not more const TQString uid = helpList.first(); const TQString email = helpList.last(); - res.append( tqMakePair( uid, email ) ); + res.append( qMakePair( uid, email ) ); } return res; } diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 869ddca8..e68321a8 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -711,7 +711,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s /* Will be needed when kmail triggers a delete, so we don't delete the inocent * incidence that's sharing the uid with this one */ - mOriginalUID2fakeUID[tqMakePair( incidence->schedulingID(), subResource )] = uid; + mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid; } } /* Add to the cache if the add didn't come from KOrganizer, in which case