From 1180237ab336226ad932d767a6cb56208314988f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:22:15 -0600 Subject: Rename obsolete tq methods to standard names --- tdeui/kmenubar.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tdeui/kmenubar.cpp') diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp index 2e98f85cc..7c13b6911 100644 --- a/tdeui/kmenubar.cpp +++ b/tdeui/kmenubar.cpp @@ -528,10 +528,10 @@ void KMenuBar::drawContents( TQPainter* p ) e = mi->isEnabledAndVisible(); if ( e ) - g = isEnabled() ? ( isActiveWindow() ? tqpalette().active() : - tqpalette().inactive() ) : tqpalette().disabled(); + g = isEnabled() ? ( isActiveWindow() ? palette().active() : + palette().inactive() ) : palette().disabled(); else - g = tqpalette().disabled(); + g = palette().disabled(); bool item_active = ( actItem == i ); @@ -548,12 +548,12 @@ void KMenuBar::drawContents( TQPainter* p ) flags |= TQStyle::Style_Down; flags |= TQStyle::Style_HasFocus; - tqstyle().drawControl(TQStyle::CE_MenuBarItem, p, this, + style().drawControl(TQStyle::CE_MenuBarItem, p, this, r, g, flags, TQStyleOption(mi)); } else { - tqstyle().drawItem(p, r, AlignCenter | AlignVCenter | ShowPrefix, + style().drawItem(p, r, AlignCenter | AlignVCenter | ShowPrefix, g, e, mi->pixmap(), mi->text()); } } -- cgit v1.2.1