summaryrefslogtreecommitdiffstats
path: root/tdeui/kmenubar.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /tdeui/kmenubar.cpp
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'tdeui/kmenubar.cpp')
-rw-r--r--tdeui/kmenubar.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index 4aab91980..b8f0f3326 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -168,7 +168,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
d->wasTopLevel = top_level;
if( parentWidget()
- && parentWidget()->topLevelWidget()->isFullScreen())
+ && parentWidget()->tqtopLevelWidget()->isFullScreen())
top_level = false;
if ( isTopLevelMenu() == top_level )
@@ -193,7 +193,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
#ifdef Q_WS_X11
KWin::setType( winId(), NET::TopMenu );
if( parentWidget())
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
#endif
TQMenuBar::setFrameStyle( NoFrame );
TQMenuBar::setLineWidth( 0 );
@@ -244,13 +244,13 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
{
if ( d->topLevel )
{
- if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()) )
+ if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()) )
{
if( ev->type() == TQEvent::Resize )
return false; // ignore resizing of parent, TQMenuBar would try to adjust size
if ( ev->type() == TQEvent::Accel || ev->type() == TQEvent::AccelAvailable )
{
- if ( TQApplication::sendEvent( topLevelWidget(), ev ) )
+ if ( TQApplication::sendEvent( tqtopLevelWidget(), ev ) )
return true;
}
if(ev->type() == TQEvent::ShowFullScreen )
@@ -260,7 +260,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent )
{
#ifdef Q_WS_X11
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
#else
//TODO: WIN32?
#endif
@@ -271,7 +271,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
if( ev->type() == TQEvent::Show )
{
#ifdef Q_WS_X11
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
#else
//TODO: WIN32?
#endif
@@ -283,10 +283,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
}
else
{
- if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()))
+ if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()))
{
if( ev->type() == TQEvent::WindowStateChange
- && !parentWidget()->topLevelWidget()->isFullScreen() )
+ && !parentWidget()->tqtopLevelWidget()->isFullScreen() )
setTopLevelMenuInternal( d->wasTopLevel );
}
}
@@ -506,14 +506,14 @@ void KMenuBar::drawContents( TQPainter* p )
BackgroundMode bg_mode = backgroundMode();
BackgroundOrigin bg_origin = backgroundOrigin();
- setUpdatesEnabled(false);
+ tqsetUpdatesEnabled(false);
setBackgroundMode(X11ParentRelative);
setBackgroundOrigin(WindowOrigin);
p->eraseRect( rect() );
erase();
- TQColorGroup g = colorGroup();
+ TQColorGroup g = tqcolorGroup();
bool e;
for ( int i=0; i<(int)count(); i++ )
@@ -522,16 +522,16 @@ void KMenuBar::drawContents( TQPainter* p )
if ( !mi->text().isNull() || mi->pixmap() )
{
- TQRect r = itemRect(i);
+ TQRect r = tqitemRect(i);
if(r.isEmpty() || !mi->isVisible())
continue;
e = mi->isEnabledAndVisible();
if ( e )
- g = isEnabled() ? ( isActiveWindow() ? palette().active() :
- palette().inactive() ) : palette().disabled();
+ g = isEnabled() ? ( isActiveWindow() ? tqpalette().active() :
+ tqpalette().inactive() ) : tqpalette().disabled();
else
- g = palette().disabled();
+ g = tqpalette().disabled();
bool item_active = ( actItem == i );
@@ -548,7 +548,7 @@ void KMenuBar::drawContents( TQPainter* p )
flags |= TQStyle::Style_Down;
flags |= TQStyle::Style_HasFocus;
- tqstyle().drawControl(TQStyle::CE_MenuBarItem, p, this,
+ tqstyle().tqdrawControl(TQStyle::CE_MenuBarItem, p, this,
r, g, flags, TQStyleOption(mi));
}
else
@@ -561,7 +561,7 @@ void KMenuBar::drawContents( TQPainter* p )
setBackgroundOrigin(bg_origin);
setBackgroundMode(bg_mode);
- setUpdatesEnabled(up_enabled);
+ tqsetUpdatesEnabled(up_enabled);
}
}