From 9e8724c91829282bd7e909c73a927ccd1501b86e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:56:55 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro (cherry picked from commit 321ebe827573752d348520ade483c684febde021) --- kommander/editor/actiondnd.cpp | 2 +- kommander/editor/propertyeditor.cpp | 2 +- kommander/editor/styledbutton.cpp | 4 ++-- lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp | 4 ++-- lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp | 2 +- lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp | 2 +- quanta/messages/annotationoutput.cpp | 2 +- quanta/src/document.cpp | 4 ++-- quanta/src/quanta.cpp | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 333ffc8f..7864b883 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -112,7 +112,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) if ( orientation() ==TQt::Horizontal ) flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), + style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), colorGroup(), flags ); } diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 3877b8c8..c1501abb 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -282,7 +282,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg, void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r ) { p->save(); - TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg, + TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg, TQStyle::Style_Sunken, TQStyleOption(1,1) ); p->restore(); } diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index 55c8945f..4b96ee49 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -145,12 +145,12 @@ void StyledButton::resizeEvent( TQResizeEvent* e ) void StyledButton::drawButton( TQPainter *paint ) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), + style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised); drawButtonLabel(paint); if (hasFocus()) - style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint, + style().drawPrimitive(TQStyle::PE_FocusRect, paint, style().subRect(TQStyle::SR_PushButtonFocusRect, this), colorGroup(), TQStyle::Style_Default); } diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index dc6215ec..344adc57 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -206,7 +206,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -580,7 +580,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe) TQWidget::paintEvent(pe); TQPainter paint; paint.begin( this ); - style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp index 139bdd76..00156067 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp @@ -174,7 +174,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) int iw = 0; if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, + x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp index b33fc27f..a6e6e6a0 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp @@ -492,7 +492,7 @@ TQSize KMultiTabBarButton::sizeHint() const h = TQMAX(h, sz.height()); } - return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 418f7f17..58b3044e 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -324,7 +324,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) } else pos++; int pos2 = line.find(rx); - annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); + annotations.insert(i, qMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); } ++i; } diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index c5530dae..a659d9cf 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -3115,7 +3115,7 @@ void Document::setAnnotationText(uint line, const TQString& text) markIf->removeMark(line, KTextEditor::MarkInterface::markType08); } else { - m_annotations.insert(line, tqMakePair(text, TQString(""))); + m_annotations.insert(line, qMakePair(text, TQString(""))); if (markIf) markIf->setMark(line, KTextEditor::MarkInterface::markType08); uint line, column; @@ -3147,7 +3147,7 @@ void Document::setAnnotationText(uint line, const TQString& text) s.prepend(commentBegin + " "); s.append(" " + commentEnd + "\n"); insertText(s, true, true); - emit showAnnotation(line, "", tqMakePair(text, TQString(""))); + emit showAnnotation(line, "", qMakePair(text, TQString(""))); } } diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index c3e3713f..f0df2bb7 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -1794,7 +1794,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl if ( element.tagName().lower() == "toolbar" && !tabname.isEmpty()) { //avoid TQToolBar warning in the log - TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); + TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar ); ToolbarTabWidget *toolbarTab = ToolbarTabWidget::ref(); TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii()); QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true); @@ -1817,7 +1817,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl kdDebug(24000) << "toolbarTab->tabHeight() " << toolbarTab->tabHeight() << endl; */ toolbarTab->insertTab(tb, tabname, idStr); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); connect(tb, TQT_SIGNAL(removeAction(const TQString&, const TQString&)), TQT_SLOT(slotRemoveAction(const TQString&, const TQString&))); @@ -4047,7 +4047,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly) n->next->tag->beginPos(l, c); else n->tag->endPos(l, c); - commentTag->write()->addAnnotation(l, tqMakePair(text, receiver)); + commentTag->write()->addAnnotation(l, qMakePair(text, receiver)); } } node = node->nextSibling();