From dcc4dc7a89e5f5f7fb4217815b892f4b0106d5a0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:47:46 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro --- chalk/core/kis_boundary.cpp | 4 ++-- .../viewplugins/screenshot/regiongrabber.cpp | 2 +- chalk/ui/kis_color_cup.cpp | 4 ++-- chalk/ui/squeezedcombobox.cpp | 2 +- filters/kspread/gnumeric/gnumericimport.cpp | 4 ++-- filters/kword/oowriter/conversion.cpp | 10 +++++----- filters/kword/pdf/dialog.cpp | 4 ++-- kchart/kchartBackgroundPixmapConfigPage.cpp | 4 ++-- kdgantt/KDGanttMinimizeSplitter.cpp | 4 ++-- kexi/kexiutils/styleproxy.h | 12 ++++++------ kexi/main/startup/KexiStartupFileDialog_win.cpp | 4 ++-- kexi/plugins/forms/widgets/kexidbcombobox.cpp | 4 ++-- kexi/plugins/forms/widgets/kexidbimagebox.cpp | 2 +- kexi/widget/kexismalltoolbutton.cpp | 2 +- kexi/widget/pixmapcollection.cpp | 6 +++--- kexi/widget/relations/kexirelationviewtable.cpp | 2 +- kexi/widget/utils/kexicomboboxdropdownbutton.cpp | 2 +- kexi/widget/utils/kexidropdownbutton.cpp | 2 +- kexi/widget/utils/kexirecordmarker.cpp | 2 +- kplato/kptcalendarpanel.cpp | 4 ++-- kplato/kptwbsdefinition.cpp | 10 +++++----- kspread/dialogs/kspread_dlg_paperlayout.cpp | 8 ++++---- kspread/kspread_sheet.cpp | 4 ++-- kspread/kspread_sheetprint.cpp | 8 ++++---- kword/TODO | 2 +- lib/kofficeui/KoTooluButton.cpp | 6 +++--- lib/kofficeui/tkcombobox.cpp | 2 +- lib/koproperty/editoritem.cpp | 2 +- lib/kotext/KoTextFormatter.cpp | 4 ++-- lib/kotext/KoTextIterator.cpp | 14 +++++++------- 30 files changed, 70 insertions(+), 70 deletions(-) diff --git a/chalk/core/kis_boundary.cpp b/chalk/core/kis_boundary.cpp index a15697a7f..b56795b69 100644 --- a/chalk/core/kis_boundary.cpp +++ b/chalk/core/kis_boundary.cpp @@ -52,7 +52,7 @@ void KisBoundary::generateBoundary(int w, int h) { darkBot = cs->getAlpha(botIt.rawData()); if (darkTop != darkBot) { // detected a change - m_horSegments.back().append(tqMakePair(KisPoint(botIt.x(), botIt.y()), 1)); + m_horSegments.back().append(qMakePair(KisPoint(botIt.x(), botIt.y()), 1)); } ++topIt; ++botIt; @@ -73,7 +73,7 @@ void KisBoundary::generateBoundary(int w, int h) { darkRight = cs->getAlpha(rightIt.rawData()); if (darkLeft != darkRight) { // detected a change - m_vertSegments.back().append(tqMakePair(KisPoint(rightIt.x(), rightIt.y()), 1)); + m_vertSegments.back().append(qMakePair(KisPoint(rightIt.x(), rightIt.y()), 1)); } ++leftIt; ++rightIt; diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index 268a24d81..a05ce3e2d 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -161,7 +161,7 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + style().drawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); diff --git a/chalk/ui/kis_color_cup.cpp b/chalk/ui/kis_color_cup.cpp index 198cb01fc..751cfdda6 100644 --- a/chalk/ui/kis_color_cup.cpp +++ b/chalk/ui/kis_color_cup.cpp @@ -83,7 +83,7 @@ void KisColorCup::slotClicked() TQSize KisColorCup::sizeHint() const { - return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). + return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). expandedTo(TQApplication::globalStrut()); } @@ -110,7 +110,7 @@ void KisColorCup::drawButtonLabel( TQPainter *painter ) if ( hasFocus() ) { TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); } } diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index d0cd8825b..6656e35da 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -98,7 +98,7 @@ TQSize SqueezedComboBox::sizeHint() const int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18; int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; - return style().tqsizeFromContents(TQStyle::CT_ComboBox, this, + return style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)). expandedTo(TQApplication::globalStrut()); } diff --git a/filters/kspread/gnumeric/gnumericimport.cpp b/filters/kspread/gnumeric/gnumericimport.cpp index 4b037ad15..d763fdef4 100644 --- a/filters/kspread/gnumeric/gnumericimport.cpp +++ b/filters/kspread/gnumeric/gnumericimport.cpp @@ -915,7 +915,7 @@ void GNUMERICFilter::ParsePrintInfo( TQDomNode const & printInfo, Sheet * table { Range range(repeate); //kdDebug()<<" repeate :"<print()->setPrintRepeatRows( tqMakePair( range.startRow (),range.endRow ()) ); + table->print()->setPrintRepeatRows( qMakePair( range.startRow (),range.endRow ()) ); } } @@ -929,7 +929,7 @@ void GNUMERICFilter::ParsePrintInfo( TQDomNode const & printInfo, Sheet * table repeate = repeate.replace( "65536", "32500" ); Range range(repeate); //kdDebug()<<" repeate :"<print()->setPrintRepeatColumns( tqMakePair( range.startCol (),range.endCol ()) ); + table->print()->setPrintRepeatColumns( qMakePair( range.startCol (),range.endCol ()) ); } } diff --git a/filters/kword/oowriter/conversion.cpp b/filters/kword/oowriter/conversion.cpp index 259d97b5b..871489a1b 100644 --- a/filters/kword/oowriter/conversion.cpp +++ b/filters/kword/oowriter/conversion.cpp @@ -30,20 +30,20 @@ TQPair Conversion::importWrapping( const TQString& oowrap ) { if ( oowrap == "none" ) // 'no wrap' means 'avoid horizontal space' - return tqMakePair( 2, TQString() ); + return qMakePair( 2, TQString() ); if ( oowrap == "left" || oowrap == "right" ) // Left and right, no problem - return tqMakePair( 1, oowrap ); + return qMakePair( 1, oowrap ); if ( oowrap == "run-through" ) - return tqMakePair( 0, TQString() ); + return qMakePair( 0, TQString() ); if ( oowrap == "biggest" ) // OASIS extension - return tqMakePair( 1, TQString::fromLatin1( "biggest" ) ); + return qMakePair( 1, TQString::fromLatin1( "biggest" ) ); ////if ( oowrap == "parallel" || oowrap == "dynamic" ) // dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel. // Those are not supported in KWord, let's use biggest instead - return tqMakePair( 1, TQString::fromLatin1( "biggest" ) ); + return qMakePair( 1, TQString::fromLatin1( "biggest" ) ); } TQString Conversion::exportWrapping( const TQPair& runAroundAttribs ) diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp index 1513208d9..032549392 100644 --- a/filters/kword/pdf/dialog.cpp +++ b/filters/kword/pdf/dialog.cpp @@ -48,12 +48,12 @@ SelectionRange::SelectionRange(const TQString &s) for (TQStringList::iterator it = list.begin(); it!=list.end(); ++it) { if ( one.exactMatch(*it) ) { uint p = (*it).toUInt(); - r.push_back( tqMakePair(p, p) ); + r.push_back( qMakePair(p, p) ); } else if ( range.exactMatch(*it) ) { uint p1 = range.cap(1).toUInt(); uint p2 = range.cap(2).toUInt(); if ( p1>p2 ) continue; - r.push_back( tqMakePair(p1, p2) ); + r.push_back( qMakePair(p1, p2) ); } } diff --git a/kchart/kchartBackgroundPixmapConfigPage.cpp b/kchart/kchartBackgroundPixmapConfigPage.cpp index c92131166..01e7a67fb 100644 --- a/kchart/kchartBackgroundPixmapConfigPage.cpp +++ b/kchart/kchartBackgroundPixmapConfigPage.cpp @@ -213,7 +213,7 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList() canLoadScaleable = true; #endif if ( fileConfig.readEntry("ImageType") == "pixmap" || canLoadScaleable ) { - papers[lrs] = tqMakePair(rs, directory + fileName); + papers[lrs] = qMakePair(rs, directory + fileName); files.append(directory + fileName); } } @@ -254,7 +254,7 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList() rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); } - papers[lrs] = tqMakePair(rs, *it); + papers[lrs] = qMakePair(rs, *it); } } diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 1f772e69f..82d6b0e81 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -243,7 +243,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 @@ -603,7 +603,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/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h index a0d6792d5..72ae565d5 100644 --- a/kexi/kexiutils/styleproxy.h +++ b/kexi/kexiutils/styleproxy.h @@ -87,14 +87,14 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle m_style->drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, option ); } - virtual void drawControl( TQ_ControlElement element, + virtual void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const { m_style->drawControl( element, p, ceData, elementFlags, r, cg, how, option, widget ); } - virtual void drawControlMask( TQ_ControlElement element, + virtual void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const { @@ -106,7 +106,7 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle return m_style->subRect( r, ceData, elementFlags, widget ); } - virtual void drawComplexControl( TQ_ComplexControl control, + virtual void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags how = Style_Default, #ifdef TQ_TQDOC @@ -119,21 +119,21 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle drawComplexControl( control, p, ceData, elementFlags, r, cg, how, sub, subActive, option, widget ); } - virtual void drawComplexControlMask( TQ_ComplexControl control, + virtual void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const { m_style->drawComplexControlMask( control, p, ceData, elementFlags, r, option, widget ); } - virtual TQRect querySubControlMetrics( TQ_ComplexControl control, + virtual TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const { return m_style->querySubControlMetrics( control, ceData, elementFlags, sc, option, widget ); } - virtual SubControl querySubControl( TQ_ComplexControl control, + virtual SubControl querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const { diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index aac7b271c..9708b0371 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -105,11 +105,11 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f //TODO true ); //TODO d->completionLock = false; -//TODO TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); +//TODO TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar ); //TODO toolbar = 0; //(js) //(js) toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true); //(js) toolbar->setFlat(true); -//TODO tqInstallMsgHandler( oldHandler ); +//TODO qInstallMsgHandler( oldHandler ); //(js) d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, //(js) toolbar, "path combo" ); diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index d9e33b9bc..088d0a48a 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -161,7 +161,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) ); TQRect r( TQStyle::visualRect( style().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, + style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight())); } //todo @@ -508,7 +508,7 @@ TQSize KexiDBComboBox::sizeHint() const const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18; const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2; - d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, + d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut())); return d->sizeHint; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index f205de05f..4c23fead9 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -685,7 +685,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) // if the widget is focused, draw focus indicator rect _if_ there is no chooser button if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) { - style().tqdrawPrimitive( + style().drawPrimitive( TQStyle::PE_FocusRect, &p, style().subRect(TQStyle::SR_PushButtonContents, this), palette().active() ); } diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index bb3b0ec8f..e7d5c6b9c 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -124,7 +124,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter ) arrowFlags |= TQStyle::Style_Down; if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; - style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, + style().drawPrimitive(TQStyle::PE_ArrowDown, _painter, TQRect(width()-7, height()-7, 5, 5), colorGroup(), arrowFlags, TQStyleOption() ); } diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index 3ad9e5568..9248916c0 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -60,7 +60,7 @@ PixmapCollection::addPixmapPath(const KURL &url) name += "2"; } - m_pixmaps.insert(name, tqMakePair(url.path(), 0)); + m_pixmaps.insert(name, qMakePair(url.path(), 0)); return name; } @@ -78,7 +78,7 @@ PixmapCollection::addPixmapName(const TQString &icon, int size) name += "2"; } - m_pixmaps.insert(name, tqMakePair(icon, size)); + m_pixmaps.insert(name, qMakePair(icon, size)); return name; } @@ -144,7 +144,7 @@ PixmapCollection::load(TQDomNode node) for(TQDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { TQDomElement el = n.toElement(); - TQPair pair = tqMakePair(el.text(), el.attribute("size").toInt()); + TQPair pair = qMakePair(el.text(), el.attribute("size").toInt()); m_pixmaps[el.attribute("name")] = pair; } } diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 2e18e00a2..347805be8 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -420,7 +420,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) { if (painter) { - style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(), TQStyle::Style_FocusAtBorder); } return itemRect(item); diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index 319bf3052..dd55920c3 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -64,7 +64,7 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p) } else { r.setWidth(r.width()+2); - style().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags); + style().drawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags); } } diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index 68ba7deb6..17501673f 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -54,7 +54,7 @@ void KexiDropDownButton::drawButton( TQPainter *p ) arrowFlags |= TQStyle::Style_Down; if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; - style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, + style().drawPrimitive(TQStyle::PE_ArrowDown, p, TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp index ff97d21aa..4309cd7fa 100644 --- a/kexi/widget/utils/kexirecordmarker.cpp +++ b/kexi/widget/utils/kexirecordmarker.cpp @@ -205,7 +205,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e) int y = ((d->rowHeight * i)-d->offset); TQRect r(0, y, width(), d->rowHeight); p.drawRect(r); - style().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r, + style().drawPrimitive( TQStyle::PE_HeaderSection, &p, r, (d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0)); } diff --git a/kplato/kptcalendarpanel.cpp b/kplato/kptcalendarpanel.cpp index 8717f187b..4c98fac09 100644 --- a/kplato/kptcalendarpanel.cpp +++ b/kplato/kptcalendarpanel.cpp @@ -174,7 +174,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) // ----- calculate size of the month button: for(count=0; countsetPrintRepeatColumns( tqMakePair( 0, 0 ) ); + print->setPrintRepeatColumns( qMakePair( 0, 0 ) ); } else { @@ -369,7 +369,7 @@ void PaperLayout::slotOk() if ( col2 > 0 && col2 <= KS_colMax ) { error = false; - print->setPrintRepeatColumns ( tqMakePair( col1, col2 ) ); + print->setPrintRepeatColumns ( qMakePair( col1, col2 ) ); } } } @@ -380,7 +380,7 @@ void PaperLayout::slotOk() if ( tmpRepeatRows.isEmpty() ) { - print->setPrintRepeatRows ( tqMakePair( 0, 0 ) ); + print->setPrintRepeatRows ( qMakePair( 0, 0 ) ); } else { @@ -395,7 +395,7 @@ void PaperLayout::slotOk() if ( row2 > 0 && row2 <= KS_rowMax ) { error = false; - print->setPrintRepeatRows ( tqMakePair( row1, row2 ) ); + print->setPrintRepeatRows ( qMakePair( row1, row2 ) ); } } } diff --git a/kspread/kspread_sheet.cpp b/kspread/kspread_sheet.cpp index 85e8f15f7..8e20757e0 100644 --- a/kspread/kspread_sheet.cpp +++ b/kspread/kspread_sheet.cpp @@ -7941,7 +7941,7 @@ bool Sheet::loadXML( const TQDomElement& sheet ) { int left = printrepeatcolumns.attribute( "left" ).toInt(); int right = printrepeatcolumns.attribute( "right" ).toInt(); - d->print->setPrintRepeatColumns( tqMakePair( left, right ) ); + d->print->setPrintRepeatColumns( qMakePair( left, right ) ); } // load print repeat rows @@ -7950,7 +7950,7 @@ bool Sheet::loadXML( const TQDomElement& sheet ) { int top = printrepeatrows.attribute( "top" ).toInt(); int bottom = printrepeatrows.attribute( "bottom" ).toInt(); - d->print->setPrintRepeatRows( tqMakePair( top, bottom ) ); + d->print->setPrintRepeatRows( qMakePair( top, bottom ) ); } if( !sheet.hasAttribute( "borders1.2" ) ) diff --git a/kspread/kspread_sheetprint.cpp b/kspread/kspread_sheetprint.cpp index b8a3a919d..5520c5ad4 100644 --- a/kspread/kspread_sheetprint.cpp +++ b/kspread/kspread_sheetprint.cpp @@ -76,8 +76,8 @@ SheetPrint::SheetPrint( Sheet* sheet ) m_maxCheckedNewPageY = 1; m_dPrintRepeatColumnsWidth = 0.0; m_dPrintRepeatRowsHeight = 0.0; - m_printRepeatColumns = tqMakePair( 0, 0 ); - m_printRepeatRows = tqMakePair( 0, 0 ); + m_printRepeatColumns = qMakePair( 0, 0 ); + m_printRepeatRows = qMakePair( 0, 0 ); m_dZoom = 1.0; m_iPageLimitX = 0; m_iPageLimitY = 0; @@ -1734,7 +1734,7 @@ void SheetPrint::removeColumn( int col, int nbCol ) //Validity checks if ( left < 1 ) left = 1; if ( right < 1 ) right = 1; - setPrintRepeatColumns ( tqMakePair( left, right ) ); + setPrintRepeatColumns ( qMakePair( left, right ) ); } } @@ -1772,7 +1772,7 @@ void SheetPrint::removeRow( int row, int nbRow ) //Validity checks if ( top < 1 ) top = 1; if ( bottom < 1 ) bottom = 1; - setPrintRepeatRows( tqMakePair( top, bottom ) ); + setPrintRepeatRows( qMakePair( top, bottom ) ); } } diff --git a/kword/TODO b/kword/TODO index 680b5429e..59acc2699 100644 --- a/kword/TODO +++ b/kword/TODO @@ -14,7 +14,7 @@ and then kotextformatter needs to move down by that height if .... hmm done. Differences with OO that ought to be fixed: ------------------------------------------- -- space above and below paragraphs is QMAX()ed indeed, like QRichText originally did. +- space above and below paragraphs is TQMAX()ed indeed, like QRichText originally did. - offsetFromBaseline should be a % (of the font size) instead of an absolute pt value, even in the GUI (which currently limits to +/- 9pt). diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index f2c64a32c..1c5f5f1ff 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -368,7 +368,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e ) // The "active" element (if there is one) if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 && mapFromPosition( m_focusPosition ).intersects( e->rect() ) ) - style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), + style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); --lns; // Attention: We just avoid some lns - 1 statements @@ -579,7 +579,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition ) TQMap::ConstIterator it = m_colorMap.find( m_focusPosition ); if ( it != m_colorMap.end() ) { // draw at the new focus position - style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), + style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() ); } @@ -720,7 +720,7 @@ void KoToolButton::drawButton(TQPainter *_painter) _painter->setClipping( false ); // ...and the arrow indicating the popup - style().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ), + style().drawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ), cg, flags, opt ); if ( TDEToolBarButton::isRaised() || m_arrowPressed ) diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp index 592e3856a..588ffeb5a 100644 --- a/lib/kofficeui/tkcombobox.cpp +++ b/lib/kofficeui/tkcombobox.cpp @@ -91,7 +91,7 @@ void TKComboBox::paintEvent(TQPaintEvent*) style().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() ); if ( hasFocus()) { - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); + style().drawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); } if (!editable()) { diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 7c0d7c24f..2d2b99de5 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -133,7 +133,7 @@ class GroupWidgetBase : public TQWidget TQRect r(rect()); TQPainter p(this); TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default; - kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags); + kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags); paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen()); if (!m_miniicon.isNull()) { diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp index 60e6528f5..5fb9cdc28 100644 --- a/lib/kotext/KoTextFormatter.cpp +++ b/lib/kotext/KoTextFormatter.cpp @@ -118,7 +118,7 @@ TQPair KoTextFormatterCore::determineCharWidth() } Q_ASSERT( ww >= 0 ); c->width = ww; - return tqMakePair(ww, pixelww); + return qMakePair(ww, pixelww); } @@ -257,7 +257,7 @@ bool KoTextFormatterCore::format() int col = 0; - maxAvailableWidth = tqMakePair( 0, 0 ); + maxAvailableWidth = qMakePair( 0, 0 ); KoTextZoomHandler *zh = doc->formattingZoomHandler(); int pixelx = zh->layoutUnitToPixelX( x ); diff --git a/lib/kotext/KoTextIterator.cpp b/lib/kotext/KoTextIterator.cpp index 73468f7e1..8ac76173d 100644 --- a/lib/kotext/KoTextIterator.cpp +++ b/lib/kotext/KoTextIterator.cpp @@ -306,19 +306,19 @@ TQPair KoTextIterator::currentTextAndIndex() const if ( m_currentParag == m_firstParag ) { if ( m_firstParag == m_lastParag ) // special case, needs truncating at both ends - return forw ? tqMakePair( m_firstIndex, str.mid( m_firstIndex, m_lastIndex - m_firstIndex ) ) - : tqMakePair( m_lastIndex, str.mid( m_lastIndex, m_firstIndex - m_lastIndex ) ); + return forw ? qMakePair( m_firstIndex, str.mid( m_firstIndex, m_lastIndex - m_firstIndex ) ) + : qMakePair( m_lastIndex, str.mid( m_lastIndex, m_firstIndex - m_lastIndex ) ); else - return forw ? tqMakePair( m_firstIndex, str.mid( m_firstIndex ) ) - : tqMakePair( 0, str.left( m_firstIndex ) ); + return forw ? qMakePair( m_firstIndex, str.mid( m_firstIndex ) ) + : qMakePair( 0, str.left( m_firstIndex ) ); } if ( m_currentParag == m_lastParag ) { - return forw ? tqMakePair( 0, str.left( m_lastIndex ) ) - : tqMakePair( m_lastIndex, str.mid( m_lastIndex ) ); + return forw ? qMakePair( 0, str.left( m_lastIndex ) ) + : qMakePair( m_lastIndex, str.mid( m_lastIndex ) ); } // Not the first parag, nor the last, so we return it all - return tqMakePair( 0, str ); + return qMakePair( 0, str ); } bool KoTextIterator::hasText() const