diff options
| author | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
| commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
| tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/widgets/qpopupmenu.cpp | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip | |
Undo prior accidental commit
Diffstat (limited to 'src/widgets/qpopupmenu.cpp')
| -rw-r--r-- | src/widgets/qpopupmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index a2d7446..9e1e01c 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -112,7 +112,7 @@ static void cleanup() static void popupSubMenuLater( int msec, QPopupMenu * receiver ) { if ( !singleSingleShot ) { singleSingleShot = new QTimer( qApp, "popup submenu timer" ); - tqAddPostRoutine( cleanup ); + qAddPostRoutine( cleanup ); } singleSingleShot->disconnect( SIGNAL(timeout()) ); @@ -1163,7 +1163,7 @@ QSize QPopupMenu::updateSize(bool force_update, bool do_resize) #if defined(QT_CHECK_NULL) if ( mi->text().isNull() && !mi->pixmap() && !mi->iconSet() && !mi->isSeparator() && !mi->widget() && !mi->custom() ) - tqWarning( "QPopupMenu: (%s) Popup has invalid menu item", + qWarning( "QPopupMenu: (%s) Popup has invalid menu item", name( "unnamed" ) ); #endif } |