diff options
| author | Timothy Pearson <[email protected]> | 2012-02-27 02:13:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-27 02:13:42 -0600 |
| commit | 520c05ef06ce203ad32470730f68402bc7719157 (patch) | |
| tree | 8d0bb18bbbecb4c837e232848905e5819db84b81 /src/styles | |
| parent | b82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff) | |
| download | tqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip | |
Automated update from qt3
Diffstat (limited to 'src/styles')
| -rw-r--r-- | src/styles/qstylefactory.cpp | 2 | ||||
| -rw-r--r-- | src/styles/qwindowsstyle.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/styles/qstylefactory.cpp b/src/styles/qstylefactory.cpp index 88f25642d..c8c797e48 100644 --- a/src/styles/qstylefactory.cpp +++ b/src/styles/qstylefactory.cpp @@ -83,7 +83,7 @@ static TQStyleFactoryPrivate *instance = 0; TQPluginManager<TQStyleFactoryInterface> *TQStyleFactoryPrivate::manager = 0; TQStyleFactoryPrivate::TQStyleFactoryPrivate() -: TQObject( qApp ) +: TQObject( tqApp ) { manager = new TQPluginManager<TQStyleFactoryInterface>( IID_QStyleFactory, TQApplication::libraryPaths(), "/styles", FALSE ); } diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp index 92c6de147..b58eb9d86 100644 --- a/src/styles/qwindowsstyle.cpp +++ b/src/styles/qwindowsstyle.cpp @@ -2096,8 +2096,8 @@ int TQWindowsStyle::styleHint( StyleHint hint, ret = 1; } else if (d->altDown()) { ret = 1; - } else if (qApp->focusWidget() && qApp->focusWidget()->isPopup()) { - popupMenu = ::qt_cast<TQPopupMenu*>(qApp->focusWidget()); + } else if (tqApp->focusWidget() && tqApp->focusWidget()->isPopup()) { + popupMenu = ::qt_cast<TQPopupMenu*>(tqApp->focusWidget()); TQMenuData *pm = popupMenu ? (TQMenuData*)popupMenu->qt_cast("TQMenuData") : 0; if (pm && ((FriendlyMenuData*)pm)->parentMenu == menuBar) { if (d->hasSeenAlt(menuBar)) |