summaryrefslogtreecommitdiffstats
path: root/src/gui/kdeext
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kdeext')
-rw-r--r--src/gui/kdeext/KLedButton.cpp4
-rw-r--r--src/gui/kdeext/KLedButton.h2
-rw-r--r--src/gui/kdeext/KStartupLogo.cpp2
-rw-r--r--src/gui/kdeext/KTmpStatusMsg.cpp2
-rw-r--r--src/gui/kdeext/QCanvasGroupableItem.cpp4
-rw-r--r--src/gui/kdeext/QCanvasGroupableItem.h2
-rw-r--r--src/gui/kdeext/RGLed.cpp34
-rw-r--r--src/gui/kdeext/klearlook.cpp188
-rw-r--r--src/gui/kdeext/klearlook.h12
9 files changed, 125 insertions, 125 deletions
diff --git a/src/gui/kdeext/KLedButton.cpp b/src/gui/kdeext/KLedButton.cpp
index 3e2f460..bc67cd7 100644
--- a/src/gui/kdeext/KLedButton.cpp
+++ b/src/gui/kdeext/KLedButton.cpp
@@ -41,8 +41,8 @@ KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
{}
KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
- KLed::Shape tqshape, TQWidget *parent, const char *name)
- : KLed( col, st, look, tqshape, parent, name )
+ KLed::Shape shape, TQWidget *parent, const char *name)
+ : KLed( col, st, look, shape, parent, name )
{}
KLedButton::~KLedButton()
diff --git a/src/gui/kdeext/KLedButton.h b/src/gui/kdeext/KLedButton.h
index 197f96b..d3fa1fb 100644
--- a/src/gui/kdeext/KLedButton.h
+++ b/src/gui/kdeext/KLedButton.h
@@ -52,7 +52,7 @@ class KLedButton : public KLed {
TQ_OBJECT
public:
KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
- KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
+ KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
TQWidget *parent=0, const char *name=0);
~KLedButton();
diff --git a/src/gui/kdeext/KStartupLogo.cpp b/src/gui/kdeext/KStartupLogo.cpp
index f368d96..d1b4870 100644
--- a/src/gui/kdeext/KStartupLogo.cpp
+++ b/src/gui/kdeext/KStartupLogo.cpp
@@ -92,7 +92,7 @@ void KStartupLogo::paintEvent(TQPaintEvent*)
//TQString version(VERSION);
//int sepIdx = version.find("-");
TQString versionLabel(VERSION);
- //TQString("R%1 v%2").tqarg(version.left(sepIdx)).tqarg(version.mid(sepIdx + 1));
+ //TQString("R%1 v%2").arg(version.left(sepIdx)).arg(version.mid(sepIdx + 1));
int versionWidth = metrics.width(versionLabel);
paint.drawText(m_pixmap.width() - versionWidth - 18,
diff --git a/src/gui/kdeext/KTmpStatusMsg.cpp b/src/gui/kdeext/KTmpStatusMsg.cpp
index 8977c74..620d7c5 100644
--- a/src/gui/kdeext/KTmpStatusMsg.cpp
+++ b/src/gui/kdeext/KTmpStatusMsg.cpp
@@ -33,7 +33,7 @@ KTmpStatusMsg::KTmpStatusMsg(const TQString& msg, KMainWindow* window, int id)
: m_mainWindow(window),
m_id(id)
{
- m_mainWindow->statusBar()->changeItem(TQString(" %1").tqarg(msg), m_id);
+ m_mainWindow->statusBar()->changeItem(TQString(" %1").arg(msg), m_id);
Rosegarden::rgapp->refreshGUI(50);
}
diff --git a/src/gui/kdeext/QCanvasGroupableItem.cpp b/src/gui/kdeext/QCanvasGroupableItem.cpp
index 818004b..3160606 100644
--- a/src/gui/kdeext/QCanvasGroupableItem.cpp
+++ b/src/gui/kdeext/QCanvasGroupableItem.cpp
@@ -131,7 +131,7 @@ TQCanvasItemGroup::setVisible(bool yes)
{
TQCanvasItemList::Iterator i;
for (i = m_items.begin(); i != m_items.end(); ++i)
- (*i)->tqsetVisible(yes);
+ (*i)->setVisible(yes);
}
void
@@ -141,7 +141,7 @@ TQCanvasItemGroup::setSelected(bool yes)
TQCanvasItemList::Iterator i;
for (i = m_items.begin(); i != m_items.end(); ++i)
- (*i)->tqsetVisible(yes);
+ (*i)->setVisible(yes);
}
void
diff --git a/src/gui/kdeext/QCanvasGroupableItem.h b/src/gui/kdeext/QCanvasGroupableItem.h
index b7d4fbb..d237524 100644
--- a/src/gui/kdeext/QCanvasGroupableItem.h
+++ b/src/gui/kdeext/QCanvasGroupableItem.h
@@ -27,7 +27,7 @@
class TQCanvasItemGroup;
/**
- * This class is meant to be inherited by TQCanvasItem tqchildren to make
+ * This class is meant to be inherited by TQCanvasItem children to make
* them groupable.
*
* On destruction, the item will remove itself from the group it's
diff --git a/src/gui/kdeext/RGLed.cpp b/src/gui/kdeext/RGLed.cpp
index fbadb95..a928ee5 100644
--- a/src/gui/kdeext/RGLed.cpp
+++ b/src/gui/kdeext/RGLed.cpp
@@ -59,7 +59,7 @@
*
* Revision 1.19 2001/08/08 14:35:12 hausmann
* - removed empty KActionCollection::childEvent
- * - added tqsizeHint() and tqminimumSizeHint() methods to KLed, as advised by
+ * - added sizeHint() and minimumSizeHint() methods to KLed, as advised by
* Rik in the comment in kled.h
* - removed unused mousePressEvent, mouseMoveEvent and mouseReleaseEvent
* handlers from KPassDlg
@@ -160,7 +160,7 @@ KLed::KLed(TQWidget *parent, const char *name)
: TQWidget( parent, name),
led_state(On),
led_look(Raised),
- led_tqshape(Circular)
+ led_shape(Circular)
{
TQColor col(green);
d = new KLed::KLedPrivate;
@@ -177,7 +177,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
: TQWidget( parent, name),
led_state(On),
led_look(Raised),
- led_tqshape(Circular)
+ led_shape(Circular)
{
d = new KLed::KLedPrivate;
d->dark_factor = 300;
@@ -190,11 +190,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
}
KLed::KLed(const TQColor& col, KLed::State state,
- KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
+ KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name )
: TQWidget(parent, name),
led_state(state),
led_look(look),
- led_tqshape(tqshape)
+ led_shape(shape)
{
d = new KLed::KLedPrivate;
d->dark_factor = 300;
@@ -202,7 +202,7 @@ KLed::KLed(const TQColor& col, KLed::State state,
d->off_map = 0;
d->on_map = 0;
- //setShape(tqshape);
+ //setShape(shape);
setColor(col);
}
@@ -223,7 +223,7 @@ KLed::paintEvent(TQPaintEvent *)
t.start();
for (int i = 0; i < rounds; i++) {
#endif
- switch (led_tqshape) {
+ switch (led_shape) {
case Rectangular:
switch (led_look) {
case Sunken :
@@ -298,7 +298,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp
brush.setColor( color );
pen.setWidth( 1 );
- color = tqcolorGroup().dark();
+ color = colorGroup().dark();
pen.setColor( color ); // Set the pen accordingly
paint.setPen( pen ); // Select pen for drawing
@@ -386,7 +386,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
// avoid that the border can be erased by the bright spot of the LED
pen.setWidth( 1 );
- color = tqcolorGroup().dark();
+ color = colorGroup().dark();
pen.setColor( color ); // Set the pen accordingly
paint.setPen( pen ); // Select pen for drawing
brush.setStyle( Qt::NoBrush ); // Switch off the brush
@@ -509,11 +509,11 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
brush.setStyle( Qt::NoBrush ); // Switch off the brush
paint.setBrush( brush ); // This avoids filling of the ellipse
- // Set the initial color value to tqcolorGroup().light() (bright) and start
+ // Set the initial color value to colorGroup().light() (bright) and start
// drawing the shadow border at 45� (45*16 = 720).
int angle = -720;
- color = tqcolorGroup().light();
+ color = colorGroup().light();
for ( int arc = 120; arc < 2880; arc += 240 )
{
@@ -612,9 +612,9 @@ KLed::state() const
}
KLed::Shape
-KLed::tqshape() const
+KLed::shape() const
{
- return led_tqshape;
+ return led_shape;
}
TQColor
@@ -649,8 +649,8 @@ KLed::toggleState()
void
KLed::setShape(KLed::Shape s)
{
- if (led_tqshape != s) {
- led_tqshape = s;
+ if (led_shape != s) {
+ led_shape = s;
update();
}
}
@@ -713,13 +713,13 @@ KLed::off()
}
TQSize
-KLed::tqsizeHint() const
+KLed::sizeHint() const
{
return TQSize(16, 16);
}
TQSize
-KLed::tqminimumSizeHint() const
+KLed::minimumSizeHint() const
{
return TQSize(16, 16 );
}
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 51e2909..b1a55a4 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -39,7 +39,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqmenubar.h>
#include <tqapplication.h>
#include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqframe.h>
#include <tqpushbutton.h>
#include <tqdrawutil.h>
@@ -47,7 +47,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqtabbar.h>
#include <tqtabwidget.h>
#include <tqguardedptr.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlistview.h>
#include <tqbitmap.h>
@@ -511,11 +511,11 @@ hoverSect( TQTC_NO_SECT ) {
#endif
if ( PROFILE_RAISED != pmProfile )
- shadeColors( tqApp->tqpalette().active().highlight(), menuPbar );
+ shadeColors( tqApp->palette().active().highlight(), menuPbar );
else
- shadeGradient( tqApp->tqpalette().active().highlight(), menuPbar );
- shadeColors( tqApp->tqpalette().active().background(), gray );
- shadeColors( tqApp->tqpalette().active().button(), button );
+ shadeGradient( tqApp->palette().active().highlight(), menuPbar );
+ shadeColors( tqApp->palette().active().background(), gray );
+ shadeColors( tqApp->palette().active().button(), button );
}
void KlearlookStyle::polish( TQApplication *app ) {
@@ -549,18 +549,18 @@ void KlearlookStyle::polish( TQPalette &pal ) {
newContrast = true;
}
- if ( newContrast || gray[ NUM_SHADES ] != tqApp->tqpalette().active().background() )
- shadeColors( tqApp->tqpalette().active().background(), gray );
+ if ( newContrast || gray[ NUM_SHADES ] != tqApp->palette().active().background() )
+ shadeColors( tqApp->palette().active().background(), gray );
- if ( newContrast || button[ NUM_SHADES ] != tqApp->tqpalette().active().button() )
- shadeColors( tqApp->tqpalette().active().button(), button );
+ if ( newContrast || button[ NUM_SHADES ] != tqApp->palette().active().button() )
+ shadeColors( tqApp->palette().active().button(), button );
if ( PROFILE_RAISED == pmProfile ) {
- if ( newContrast || menuPbar[ NUM_SHADES ] != tqApp->tqpalette().active().highlight() )
- shadeColors( tqApp->tqpalette().active().highlight(), menuPbar );
+ if ( newContrast || menuPbar[ NUM_SHADES ] != tqApp->palette().active().highlight() )
+ shadeColors( tqApp->palette().active().highlight(), menuPbar );
} else
- if ( tqApp->tqpalette().active().highlight() != menuPbar[ GRADIENT_BASE ] )
- shadeGradient( tqApp->tqpalette().active().highlight(), menuPbar );
+ if ( tqApp->palette().active().highlight() != menuPbar[ GRADIENT_BASE ] )
+ shadeGradient( tqApp->palette().active().highlight(), menuPbar );
const TQColorGroup &actGroup = pal.active(),
&inactGroup = pal.inactive();
@@ -690,12 +690,12 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
if ( toolbar )
horiz_grad = toolbar->orientation() == TQt::Vertical;
- drawBevelGradient( parent->tqcolorGroup().background(), true, 1, &TQPainter( widget ),
+ drawBevelGradient( parent->colorGroup().background(), true, 1, &TQPainter( widget ),
TQRect( x_offset, y_offset, pr.width(), pr.height() ),
horiz_grad, SHADE_BAR_LIGHT, SHADE_BAR_DARK );
#else
- TQPainter( widget ).fillRect( widget->rect(), parent->tqcolorGroup().background() );
+ TQPainter( widget ).fillRect( widget->rect(), parent->colorGroup().background() );
#endif
return false; // Now draw the contents
@@ -707,10 +707,10 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
TQPainter painter( frame );
if ( TQFrame::VLine == frame->frameShape() )
tqdrawPrimitive( PE_DockWindowSeparator, &painter,
- frame->rect(), frame->tqcolorGroup(), Style_Horizontal );
+ frame->rect(), frame->colorGroup(), Style_Horizontal );
else if ( TQFrame::HLine == frame->frameShape() )
tqdrawPrimitive( PE_DockWindowSeparator, &painter,
- frame->rect(), frame->tqcolorGroup() );
+ frame->rect(), frame->colorGroup() );
else
return false;
return true; // been drawn!
@@ -722,7 +722,7 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
hoverWidget = ( TQWidget * ) object;
if ( hoverWidget && hoverWidget->isEnabled() ) {
if ( redrawHoverWidget() ) {
- hoverWidget->tqrepaint( false );
+ hoverWidget->repaint( false );
if ( APP_KICKER == themedApp )
hover = HOVER_NONE;
}
@@ -736,13 +736,13 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
oldCursor.setX( -1 );
oldCursor.setY( -1 );
hoverWidget = NULL;
- ( ( TQWidget * ) object ) ->tqrepaint( false );
+ ( ( TQWidget * ) object ) ->repaint( false );
}
break;
case TQEvent::MouseMove:
if ( hoverWidget && object->isWidgetType() ) {
if ( redrawHoverWidget() ) {
- hoverWidget->tqrepaint( false );
+ hoverWidget->repaint( false );
if ( APP_KICKER == themedApp )
hover = HOVER_NONE;
}
@@ -1475,7 +1475,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
int x = r.x(), y = r.y(), w = r.width(), h = r.height(), marg = lv->itemMargin();
p->setPen( TQPen( flags & Style_Enabled ? cg.text()
- : lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ) ) );
+ : lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ) ) );
if ( flags & Style_Selected && !lv->rootIsDecorated() &&
!( ( item->parent() && 1 == item->parent() ->rtti() &&
@@ -1500,7 +1500,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
TQListView * lv = item->listView();
p->setPen( TQPen( flags & Style_Enabled ? cg.text()
- : lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ), 2 ) );
+ : lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ), 2 ) );
if ( flags & Style_Selected ) {
flags -= Style_Selected;
if ( !lv->rootIsDecorated() &&
@@ -2196,7 +2196,7 @@ void KlearlookStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter *p, con
}
}
-void KlearlookStyle::tqdrawControl(
+void KlearlookStyle::drawControl(
ControlElement control,
TQPainter *p,
const TQWidget *widget,
@@ -2225,7 +2225,7 @@ void KlearlookStyle::tqdrawControl(
fr( r );
int offset = rounded ? 2 : 0;
- switch ( tb->tqshape() ) {
+ switch ( tb->shape() ) {
case TQTabBar::TriangularAbove:
case TQTabBar::RoundedAbove:
if ( flags & Style_Selected ) {
@@ -2375,12 +2375,12 @@ void KlearlookStyle::tqdrawControl(
p->fillRect( fr, flags & Style_Selected ? cg.background() : gray[ 2 ] );
break;
default:
- KStyle::tqdrawControl( control, p, widget, r, cg, flags, data );
+ KStyle::drawControl( control, p, widget, r, cg, flags, data );
}
} else {
TQRect br( r );
- switch ( tb->tqshape() ) {
+ switch ( tb->shape() ) {
case TQTabBar::TriangularAbove:
case TQTabBar::RoundedAbove:
if ( flags & Style_Selected ) {
@@ -2465,11 +2465,11 @@ void KlearlookStyle::tqdrawControl(
TQRect tr = r;
if ( t->identifier() == tb->currentTab() ) {
- if ( TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape() )
- tr.setBottom( tr.bottom() - tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
+ if ( TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape() )
+ tr.setBottom( tr.bottom() - pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
} else
- if ( TQTabBar::RoundedBelow == tb->tqshape() || TQTabBar::TriangularBelow == tb->tqshape() )
- tr.setTop( tr.top() + tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
+ if ( TQTabBar::RoundedBelow == tb->shape() || TQTabBar::TriangularBelow == tb->shape() )
+ tr.setTop( tr.top() + pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
drawItem( p, tr, AlignCenter | ShowPrefix, cg, flags & Style_Enabled, 0, t->text() );
@@ -2489,15 +2489,15 @@ void KlearlookStyle::tqdrawControl(
// Shift button contents if pushed.
if ( active ) {
- x += tqpixelMetric( PM_ButtonShiftHorizontal, widget );
- y += tqpixelMetric( PM_ButtonShiftVertical, widget );
+ x += pixelMetric( PM_ButtonShiftHorizontal, widget );
+ y += pixelMetric( PM_ButtonShiftVertical, widget );
flags |= Style_Sunken;
}
// Does the button have a popup menu?
if ( button->isMenuButton() ) {
- int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ),
- margin = tqpixelMetric( PM_ButtonMargin, widget );
+ int dx = pixelMetric( PM_MenuButtonIndicator, widget ),
+ margin = pixelMetric( PM_ButtonMargin, widget );
if ( button->iconSet() && !button->iconSet() ->isNull() &&
( dx + button->iconSet() ->pixmap ( TQIconSet::Small, TQIconSet::Normal,
@@ -2505,7 +2505,7 @@ void KlearlookStyle::tqdrawControl(
cornArrow = true; //To little room. Draw the arrow in the corner, don't adjust the widget
else {
tqdrawPrimitive( PE_ArrowDown,
- p, tqvisualRect( TQRect(
+ p, visualRect( TQRect(
( x + w ) - ( dx + margin ), y, dx,
h ), r ), cg, flags, data );
@@ -2547,7 +2547,7 @@ void KlearlookStyle::tqdrawControl(
}
if ( cornArrow ) //Draw over the icon
- tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect( x + w - 6, x + h - 6, 7, 7 ), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect( x + w - 6, x + h - 6, 7, 7 ), r ),
cg, flags, data );
if ( xo && iw ) {
@@ -2566,16 +2566,16 @@ void KlearlookStyle::tqdrawControl(
for ( i = 0; i < j; i++ )
drawItem( p, TQRect( x + i, y, w, h ),
AlignCenter | ShowPrefix,
- button->tqcolorGroup(),
+ button->colorGroup(),
button->isEnabled(),
button->pixmap(),
button->text(), -1,
- &button->tqcolorGroup().buttonText() );
+ &button->colorGroup().buttonText() );
//Draw a focus rect if the button has focus
if ( flags & Style_HasFocus )
tqdrawPrimitive( PE_FocusRect, p,
- TQStyle::tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags );
+ TQStyle::visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags );
break;
}
@@ -2636,10 +2636,10 @@ void KlearlookStyle::tqdrawControl(
bool reverse = TQApplication::reverseLayout();
if ( reverse ) {
- cr = tqvisualRect( cr, r );
- sr = tqvisualRect( sr, r );
- tr = tqvisualRect( tr, r );
- ir = tqvisualRect( ir, r );
+ cr = visualRect( cr, r );
+ sr = visualRect( sr, r );
+ tr = visualRect( tr, r );
+ ir = visualRect( ir, r );
}
if ( mi->iconSet() && menuIcons ) {
@@ -2647,7 +2647,7 @@ void KlearlookStyle::tqdrawControl(
TQIconSet::Mode mode = flags & Style_Active
? ( mi->isEnabled() ? TQIconSet::Active : TQIconSet::Disabled )
: ( mi->isEnabled() ? TQIconSet::Normal : TQIconSet::Disabled );
- cr = tqvisualRect( TQRect( x, y, maxpmw, h ), r );
+ cr = visualRect( TQRect( x, y, maxpmw, h ), r );
// Do we have an icon and are checked at the same time?
// Then draw a "pressed" background behind the icon
@@ -2879,7 +2879,7 @@ void KlearlookStyle::tqdrawControl(
case CE_PushButton: {
const TQPushButton *button = static_cast<const TQPushButton *>( widget );
TQRect br( r );
- int dbi = tqpixelMetric( PM_ButtonDefaultIndicator, widget );
+ int dbi = pixelMetric( PM_ButtonDefaultIndicator, widget );
if ( rounded && isFormWidget( widget ) )
formMode = true;
@@ -2914,24 +2914,24 @@ void KlearlookStyle::tqdrawControl(
!isFormWidget( widget ) ) {
TQRect cr( checkbox->rect() );
TQRegion r( TQRect( cr.x(), cr.y(),
- tqvisualRect( subRect( SR_CheckBoxFocusRect, widget ), widget ).width() +
- tqpixelMetric( PM_IndicatorWidth ) + 4, cr.height() ) );
+ visualRect( subRect( SR_CheckBoxFocusRect, widget ), widget ).width() +
+ pixelMetric( PM_IndicatorWidth ) + 4, cr.height() ) );
- r -= tqvisualRect( subRect( SR_CheckBoxIndicator, widget ), widget );
+ r -= visualRect( subRect( SR_CheckBoxIndicator, widget ), widget );
p->setClipRegion( r );
p->fillRect( checkbox->rect(), cg.background().light( TQTC_HIGHLIGHT_FACTOR ) );
p->setClipping( false );
}
- int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+ int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
- drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+ drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
flags & Style_Enabled, checkbox->pixmap(), checkbox->text() );
if ( checkbox->hasFocus() )
tqdrawPrimitive( PE_FocusRect, p,
- tqvisualRect( subRect( SR_CheckBoxFocusRect, widget ), widget ), cg, flags );
+ visualRect( subRect( SR_CheckBoxFocusRect, widget ), widget ), cg, flags );
} else
- KStyle::tqdrawControl( control, p, widget, r, cg, flags, data );
+ KStyle::drawControl( control, p, widget, r, cg, flags, data );
break;
case CE_RadioButton:
formMode = isFormWidget( widget );
@@ -2947,31 +2947,31 @@ void KlearlookStyle::tqdrawControl(
!isFormWidget( widget ) ) {
TQRect rb( radiobutton->rect() );
TQRegion r( TQRect( rb.x(), rb.y(),
- tqvisualRect( subRect( SR_RadioButtonFocusRect, widget ), widget ).width() +
- tqpixelMetric( PM_ExclusiveIndicatorWidth ) + 4, rb.height() ) );
+ visualRect( subRect( SR_RadioButtonFocusRect, widget ), widget ).width() +
+ pixelMetric( PM_ExclusiveIndicatorWidth ) + 4, rb.height() ) );
- r -= tqvisualRect( subRect( SR_RadioButtonIndicator, widget ), widget );
+ r -= visualRect( subRect( SR_RadioButtonIndicator, widget ), widget );
p->setClipRegion( r );
p->fillRect( radiobutton->rect(), cg.background().light( TQTC_HIGHLIGHT_FACTOR ) );
p->setClipping( false );
}
- int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+ int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
- drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+ drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
flags & Style_Enabled, radiobutton->pixmap(), radiobutton->text() );
if ( radiobutton->hasFocus() )
tqdrawPrimitive( PE_FocusRect, p,
- tqvisualRect( subRect( SR_RadioButtonFocusRect, widget ), widget ), cg, flags );
+ visualRect( subRect( SR_RadioButtonFocusRect, widget ), widget ), cg, flags );
break;
}
default:
- KStyle::tqdrawControl( control, p, widget, r, cg, flags, data );
+ KStyle::drawControl( control, p, widget, r, cg, flags, data );
}
}
-void KlearlookStyle::tqdrawControlMask( ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r,
+void KlearlookStyle::drawControlMask( ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r,
const TQStyleOption &data ) const {
switch ( control ) {
case CE_PushButton:
@@ -2991,19 +2991,19 @@ void KlearlookStyle::tqdrawControlMask( ControlElement control, TQPainter *p, co
p->fillRect( r, color1 );
break;
default:
- KStyle::tqdrawControlMask( control, p, widget, r, data );
+ KStyle::drawControlMask( control, p, widget, r, data );
}
}
-void KlearlookStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
+void KlearlookStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
const TQStyleOption &data ) const {
switch ( control ) {
case CC_ToolButton:
case CC_ComboBox:
- tqdrawControlMask( CE_PushButton, p, widget, r, data );
+ drawControlMask( CE_PushButton, p, widget, r, data );
break;
default:
- KStyle::tqdrawComplexControlMask( control, p, widget, r, data );
+ KStyle::drawComplexControlMask( control, p, widget, r, data );
}
}
@@ -3019,7 +3019,7 @@ TQRect KlearlookStyle::subRect( SubRect subrect, const TQWidget *widget ) const
// if(button->isDefault() || button->autoDefault())
// {
- dbw1 = tqpixelMetric( PM_ButtonDefaultIndicator, widget );
+ dbw1 = pixelMetric( PM_ButtonDefaultIndicator, widget );
dbw2 = dbw1 * 2;
// }
@@ -3030,20 +3030,20 @@ TQRect KlearlookStyle::subRect( SubRect subrect, const TQWidget *widget ) const
break;
}
case SR_CheckBoxIndicator: {
- int h = tqpixelMetric( PM_IndicatorHeight );
+ int h = pixelMetric( PM_IndicatorHeight );
rect.setRect( ( widget->rect().height() - h ) >> 1,
( widget->rect().height() - h ) >> 1,
- tqpixelMetric( PM_IndicatorWidth ),
+ pixelMetric( PM_IndicatorWidth ),
h );
break;
}
case SR_RadioButtonIndicator: {
- int h = tqpixelMetric( PM_ExclusiveIndicatorHeight );
+ int h = pixelMetric( PM_ExclusiveIndicatorHeight );
rect.setRect( ( widget->rect().height() - h ) >> 1,
( widget->rect().height() - h ) >> 1,
- tqpixelMetric( PM_ExclusiveIndicatorWidth ), h );
+ pixelMetric( PM_ExclusiveIndicatorWidth ), h );
break;
}
case SR_ProgressBarContents:
@@ -3059,7 +3059,7 @@ TQRect KlearlookStyle::subRect( SubRect subrect, const TQWidget *widget ) const
return rect;
}
-void KlearlookStyle::tqdrawComplexControl(
+void KlearlookStyle::drawComplexControl(
ComplexControl control,
TQPainter *p,
const TQWidget *widget,
@@ -3173,13 +3173,13 @@ void KlearlookStyle::tqdrawComplexControl(
case CC_ComboBox: {
const TQComboBox *combobox = ( const TQComboBox * ) widget;
- TQRect frame( TQStyle::tqvisualRect( querySubControlMetrics( CC_ComboBox,
+ TQRect frame( TQStyle::visualRect( querySubControlMetrics( CC_ComboBox,
widget,SC_ComboBoxFrame,data ),widget ) ),
- arrow( TQStyle::tqvisualRect( querySubControlMetrics( CC_ComboBox,
+ arrow( TQStyle::visualRect( querySubControlMetrics( CC_ComboBox,
widget,SC_ComboBoxArrow,data),widget)),
- field( TQStyle::tqvisualRect( querySubControlMetrics(CC_ComboBox,
+ field( TQStyle::visualRect( querySubControlMetrics(CC_ComboBox,
widget,SC_ComboBoxEditField,data),widget));
const TQColor *use = buttonColors( cg );
@@ -3211,7 +3211,7 @@ void KlearlookStyle::tqdrawComplexControl(
if ( controls & SC_ComboBoxEditField && field.isValid() ) {
if ( ( flags & Style_HasFocus ) && ( ! combobox->editable() ) ) {
- TQRect fr = TQStyle::tqvisualRect( subRect( SR_ComboBoxFocusRect, widget ), widget );
+ TQRect fr = TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ), widget );
fr.addCoords( 0, 0, -2, 0 );
tqdrawPrimitive( PE_FocusRect,
@@ -3236,7 +3236,7 @@ void KlearlookStyle::tqdrawComplexControl(
qDrawShadePanel(
p, r, TQColorGroup( gray[ 5 ], gray[ NUM_SHADES ], gray[ 0 ],
gray[ 5 ], gray[ 2 ], cg.text(), gray[ NUM_SHADES ] ),
- true, tqpixelMetric( PM_SpinBoxFrameWidth )
+ true, pixelMetric( PM_SpinBoxFrameWidth )
);
if ( ( controls & SC_SpinWidgetUp ) && up.isValid() ) {
@@ -3342,13 +3342,13 @@ void KlearlookStyle::tqdrawComplexControl(
if ( ( controls & SC_SliderHandle ) && handle.isValid() )
drawSliderHandle( p, handle, cg, flags );
if ( controls & SC_SliderTickmarks )
- TQCommonStyle::tqdrawComplexControl(
+ TQCommonStyle::drawComplexControl(
control, p, widget, r, cg, flags, SC_SliderTickmarks, active, data
);
break;
}
default:
- KStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, data );
+ KStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, data );
}
}
@@ -3359,7 +3359,7 @@ TQRect KlearlookStyle::querySubControlMetrics( TQ_ComplexControl control, const
if ( !widget )
return TQRect();
- int fw = tqpixelMetric( PM_SpinBoxFrameWidth, 0 );
+ int fw = pixelMetric( PM_SpinBoxFrameWidth, 0 );
TQSize bs;
bs.setHeight( widget->height() >> 1 );
@@ -3395,7 +3395,7 @@ TQRect KlearlookStyle::querySubControlMetrics( TQ_ComplexControl control, const
}
}
-int KlearlookStyle::tqpixelMetric( PixelMetric metric, const TQWidget *widget ) const {
+int KlearlookStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) const {
switch ( metric ) {
case PM_MenuButtonIndicator:
return 7;
@@ -3408,7 +3408,7 @@ int KlearlookStyle::tqpixelMetric( PixelMetric metric, const TQWidget *widget )
case PM_TabBarTabShiftVertical: {
const TQTabBar *tb = ::tqqt_cast<const TQTabBar *>( widget );
- return TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape()
+ return TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape()
? 1
: -1;
}
@@ -3417,8 +3417,8 @@ int KlearlookStyle::tqpixelMetric( PixelMetric metric, const TQWidget *widget )
case PM_TabBarTabVSpace: {
const TQTabBar * tb = ( const TQTabBar * ) widget;
- if ( tb->tqshape() == TQTabBar::RoundedAbove ||
- tb->tqshape() == TQTabBar::RoundedBelow )
+ if ( tb->shape() == TQTabBar::RoundedAbove ||
+ tb->shape() == TQTabBar::RoundedBelow )
return 12;
else
return 4;
@@ -3467,7 +3467,7 @@ int KlearlookStyle::tqpixelMetric( PixelMetric metric, const TQWidget *widget )
case PM_MaximumDragDistance:
return -1;
default:
- return KStyle::tqpixelMetric( metric, widget );
+ return KStyle::pixelMetric( metric, widget );
}
}
@@ -3496,8 +3496,8 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
bool checkable = popup->isCheckable();
if ( mi->custom() ) {
- w = mi->custom() ->tqsizeHint().width();
- h = mi->custom() ->tqsizeHint().height();
+ w = mi->custom() ->sizeHint().width();
+ h = mi->custom() ->sizeHint().height();
if ( !mi->custom() ->fullSpan() )
h += 4;
} else if ( mi->widget() ) {
@@ -3546,8 +3546,8 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
case CT_PushButton: {
const TQPushButton* btn = static_cast<const TQPushButton*>( widget );
- int w = s.width() + 2 * tqpixelMetric( PM_ButtonMargin, widget );
- int h = s.height() + 2 * tqpixelMetric( PM_ButtonMargin, widget );
+ int w = s.width() + 2 * pixelMetric( PM_ButtonMargin, widget );
+ int h = s.height() + 2 * pixelMetric( PM_ButtonMargin, widget );
if ( btn->text().isEmpty() && s.width() < 32 )
return TQSize( w, h );
// return button size
@@ -3571,7 +3571,7 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
-int KlearlookStyle::tqstyleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, TQStyleHintReturn *returnData ) const {
+int KlearlookStyle::styleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, TQStyleHintReturn *returnData ) const {
switch ( stylehint ) {
case SH_EtchDisabledText:
case SH_Slider_SnapToValue:
@@ -3593,7 +3593,7 @@ int KlearlookStyle::tqstyleHint( StyleHint stylehint, const TQWidget *widget, co
case SH_PopupMenu_AllowActiveAndDisabled:
return 0;
default:
- return KStyle::tqstyleHint( stylehint, widget, option, returnData );
+ return KStyle::styleHint( stylehint, widget, option, returnData );
}
}
@@ -3895,8 +3895,8 @@ bool KlearlookStyle::redrawHoverWidget() {
if ( rb ) {
TQRect rect( widgetZero.x(), widgetZero.y(),
- tqvisualRect( subRect( SR_RadioButtonFocusRect, rb ), rb ).width() +
- tqpixelMetric( PM_ExclusiveIndicatorWidth ) + 4, hoverWidget->height() );
+ visualRect( subRect( SR_RadioButtonFocusRect, rb ), rb ).width() +
+ pixelMetric( PM_ExclusiveIndicatorWidth ) + 4, hoverWidget->height() );
hover = rect.contains( cursor ) ? HOVER_RADIO : HOVER_NONE;
return ( HOVER_NONE != hover && !rect.contains( oldCursor ) ) ||
@@ -3906,8 +3906,8 @@ bool KlearlookStyle::redrawHoverWidget() {
if ( cb ) {
TQRect rect( widgetZero.x(), widgetZero.y(),
- tqvisualRect( subRect( SR_CheckBoxFocusRect, cb ), cb ).width() +
- tqpixelMetric( PM_IndicatorWidth ) + 4, hoverWidget->height() );
+ visualRect( subRect( SR_CheckBoxFocusRect, cb ), cb ).width() +
+ pixelMetric( PM_IndicatorWidth ) + 4, hoverWidget->height() );
hover = rect.contains( cursor ) ? HOVER_CHECK : HOVER_NONE;
return ( HOVER_NONE != hover && !rect.contains( oldCursor ) ) ||
diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h
index 59480b2..b4c6c6f 100644
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@@ -260,23 +260,23 @@ class KlearlookStyle : public KStyle {
const TQStyleOption & = TQStyleOption::Default ) const;
void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r,
const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt ) const;
- void tqdrawControl( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
+ void drawControl( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
+ void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
const TQStyleOption &data ) const;
TQRect subRect( SubRect, const TQWidget * ) const;
- void tqdrawComplexControl( ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
+ void drawComplexControl( ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default ) const;
TQRect querySubControlMetrics( TQ_ComplexControl, const TQWidget *, SubControl,
const TQStyleOption & = TQStyleOption::Default ) const;
- int tqpixelMetric( PixelMetric, const TQWidget *widget = 0 ) const;
+ int pixelMetric( PixelMetric, const TQWidget *widget = 0 ) const;
int kPixelMetric( KStylePixelMetric kpm, const TQWidget *widget ) const;
TQSize tqsizeFromContents( ContentsType, const TQWidget *, const TQSize &,
const TQStyleOption & = TQStyleOption::Default ) const;
- int tqstyleHint( StyleHint, const TQWidget *widget = 0, const TQStyleOption & = TQStyleOption::Default,
+ int styleHint( StyleHint, const TQWidget *widget = 0, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn *returnData = 0 ) const;
protected:
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-20 11:50:55 +0000