diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
| commit | eaa7ee2e0bbca40ba3173c4304f81957e8964291 (patch) | |
| tree | 4f793aa48a5080aedc94ce6e519c3b86708f2b88 /tqtinterface/qt4/src/widgets/tqmenubar.cpp | |
| parent | 79a9d7a46a20d4a0923bc06fc471fdc2176ef865 (diff) | |
| download | experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.tar.gz experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
Diffstat (limited to 'tqtinterface/qt4/src/widgets/tqmenubar.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/widgets/tqmenubar.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/tqtinterface/qt4/src/widgets/tqmenubar.cpp index 0a1feba..e932f18 100644 --- a/tqtinterface/qt4/src/widgets/tqmenubar.cpp +++ b/tqtinterface/qt4/src/widgets/tqmenubar.cpp @@ -695,7 +695,7 @@ void TQMenuBar::popupDestroyed( TQObject *o ) bool TQMenuBar::tryMouseEvent( TQPopupMenu *, TQMouseEvent *e ) { TQPoint pos = mapFromGlobal( e->globalPos() ); - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( pos ) ) // outside + if ( !TQT_TQRECT_OBJECT(rect()).contains( pos ) ) // outside return FALSE; int item = itemAtPos( pos ); if ( item == -1 && (e->type() == TQEvent::MouseButtonPress || @@ -965,8 +965,8 @@ int TQMenuBar::calculateRects( int max_width ) } else { w = fm.boundingRect( s ).width() + 2*motifItemHMargin; } - w -= s.tqcontains('&')*fm.width('&'); - w += s.tqcontains("&&")*fm.width('&'); + w -= s.contains('&')*fm.width('&'); + w += s.contains("&&")*fm.width('&'); w = TQMAX( w, TQApplication::globalStrut().width() ); if (gs == GtkStyle ) { h = TQMAX( fm.height() + gtkItemVMargin, TQApplication::globalStrut().height() ); @@ -1106,7 +1106,7 @@ int TQMenuBar::itemAtPos( const TQPoint &pos_ ) pos.setX( TQMAX( margin, TQMIN( width() - margin, pos.x()))); pos.setY( TQMAX( margin, TQMIN( height() - margin, pos.y()))); while ( i < (int)mitems->count() ) { - if ( !irects[i].isEmpty() && irects[i].tqcontains( pos ) ) { + if ( !irects[i].isEmpty() && irects[i].contains( pos ) ) { TQMenuItem *mi = mitems->at(i); return mi->isSeparator() ? -1 : i; } @@ -1219,7 +1219,7 @@ void TQMenuBar::mousePressEvent( TQMouseEvent *e ) #ifndef USE_QT4 TQFocusEvent::Reason oldReason = TQFocusEvent::reason(); #endif // USE_QT4 - TQMenuItem *mi = tqfindItem( idAt( item ) ); + TQMenuItem *mi = findItem( idAt( item ) ); // we know that a popup will open, so set the reason to avoid // itemviews to redraw their selections if ( mi && mi->popup() ) @@ -1377,7 +1377,7 @@ void TQMenuBar::keyPressEvent( TQKeyEvent *e ) ++it; TQString s = m->text(); if ( !s.isEmpty() ) { - int i = s.tqfind( '&' ); + int i = s.find( '&' ); if ( i >= 0 ) { if ( s[i+1].upper() == c ) { |