diff options
Diffstat (limited to 'src/widgets/qmenubar.cpp')
| -rw-r--r-- | src/widgets/qmenubar.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp index 8ee3cad20..b9acce9ca 100644 --- a/src/widgets/qmenubar.cpp +++ b/src/widgets/qmenubar.cpp @@ -42,7 +42,7 @@ // ### could be reorganised by discarding INCLUDE_MENUITEM_DEF and put // the relevant declarations in a private header? #include "ntqmainwindow.h" -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR #include "ntqmenubar.h" #include "ntqpopupmenu.h" #include "ntqaccel.h" @@ -271,7 +271,7 @@ TQMenuBar::TQMenuBar( TQWidget *parent, const char *name ) macCreateNativeMenubar(); #endif isMenuBar = TRUE; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL autoaccel = 0; #endif irects = 0; @@ -331,7 +331,7 @@ void TQMenuBar::styleChange( TQStyle& old ) TQMenuBar::~TQMenuBar() { -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL delete autoaccel; #endif #if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE) @@ -382,7 +382,7 @@ void TQMenuBar::performDelayedContentsChanged() { pendingDelayedContentsChanges = 0; // here the part the can be delayed -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL // if performDelayedStateChanged() will be called too, // it will call setupAccelerators() too, no need to do it twice if( !pendingDelayedStateChanges ) @@ -391,14 +391,14 @@ void TQMenuBar::performDelayedContentsChanged() calculateRects(); if ( isVisible() ) { update(); -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW TQMainWindow *mw = ::tqt_cast<TQMainWindow*>(parent()); if ( mw ) { mw->triggerLayout(); mw->update(); } #endif -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT if ( parentWidget() && parentWidget()->layout() ) parentWidget()->layout()->activate(); #endif @@ -425,7 +425,7 @@ void TQMenuBar::performDelayedStateChanged() { pendingDelayedStateChanges = 0; // here the part that can be delayed -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL setupAccelerators(); // ### when we have a good solution for the accel vs. focus // widget problem, remove that. That is only a workaround // if you remove this, see performDelayedContentsChanged() @@ -514,7 +514,7 @@ void TQMenuBar::languageChange() bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) { if ( object == parent() && object -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR && !::tqt_cast<TQToolBar*>(object) #endif && event->type() == TQEvent::Resize ) { @@ -558,7 +558,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) } TQKeyEvent * ke = (TQKeyEvent *) event; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL // look for Alt press and Alt-anything press if ( event->type() == TQEvent::Accel ) { TQWidget * f = ((TQWidget *)object)->focusWidget(); @@ -661,7 +661,7 @@ void TQMenuBar::subHighlighted( int id ) \internal Receives signals from menu accelerator. */ -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQMenuBar::accelActivated( int id ) { #if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE) @@ -680,7 +680,7 @@ void TQMenuBar::accelActivated( int id ) This slot receives signals from menu accelerator when it is about to be destroyed. */ -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQMenuBar::accelDestroyed() { autoaccel = 0; // don't delete it twice! @@ -812,7 +812,7 @@ void TQMenuBar::hidePopups() void TQMenuBar::show() { -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL setupAccelerators(); #endif @@ -842,7 +842,7 @@ void TQMenuBar::show() TQWidget::show(); #endif -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW TQMainWindow *mw = ::tqt_cast<TQMainWindow*>(parent()); if ( mw ) //### ugly workaround mw->triggerLayout(); @@ -860,7 +860,7 @@ void TQMenuBar::hide() TQWidget::hide(); setAltMode( FALSE ); hidePopups(); -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW TQMainWindow *mw = ::tqt_cast<TQMainWindow*>(parent()); if ( mw ) //### ugly workaround mw->triggerLayout(); @@ -1526,7 +1526,7 @@ void TQMenuBar::setAltMode( bool enable ) /*! Sets up keyboard accelerators for the menu bar. */ -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQMenuBar::setupAccelerators() { @@ -1629,7 +1629,7 @@ TQSize TQMenuBar::sizeHint() const TQSize TQMenuBar::minimumSize() const { -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolBar *tb = ::tqt_cast<TQToolBar*>(parent()); if ( tb ) return sizeHint(); @@ -1680,4 +1680,4 @@ void TQMenuBar::activateItemAt( int index ) goodbye( FALSE ); } -#endif // QT_NO_MENUBAR +#endif // TQT_NO_MENUBAR |