From d65a880c1c2a9a151a9a7d3c42cccf1e253f8996 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:46:45 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro --- src/kvilib/tal/kvi_tal_listview.cpp | 6 +++--- src/kvirc/ui/kvi_customtoolbar.cpp | 2 +- src/kvirc/ui/kvi_input.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp index c41c909..1bb6bdc 100644 --- a/src/kvilib/tal/kvi_tal_listview.cpp +++ b/src/kvilib/tal/kvi_tal_listview.cpp @@ -691,7 +691,7 @@ if(!parentControl) x += 3; if ( !pixmap( 0 ) ) { - lv->style().tqdrawPrimitive(TQStyle::PE_CheckListController, p, + lv->style().drawPrimitive(TQStyle::PE_CheckListController, p, TQRect(x, 0, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); @@ -709,12 +709,12 @@ y = (fm.height() + 2 + marg - boxsize) / 2; if ( ( myType == CheckBox ) || ( myType == CheckBoxController ) ) { - lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); } else { //radio button look - lv->style().tqdrawPrimitive(TQStyle::PE_CheckListExclusiveIndicator, + lv->style().drawPrimitive(TQStyle::PE_CheckListExclusiveIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 2af3c95..5adb02d 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -66,7 +66,7 @@ void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *) TQPainter p(this); TQStyle::SFlags flags = TQStyle::Style_Default; if(m_pToolBar->orientation() == TQt::Horizontal)flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags); + style().drawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags); } diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index c9390f3..a34d9cc 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -292,7 +292,7 @@ TQSize KviInputEditor::sizeHint() const int h = TQMAX(fm.lineSpacing(), 14) + 2*2; /* innerMargin */ int w = fm.width( 'x' ) * 17; // "some" int m = frameWidth() * 2; - return (style().tqsizeFromContents(TQStyle::CT_LineEdit, this, + return (style().sizeFromContents(TQStyle::CT_LineEdit, this, TQSize( w + m, h + m ). expandedTo(TQApplication::globalStrut()))); }