diff options
Diffstat (limited to 'klipper')
| -rw-r--r-- | klipper/popupproxy.cpp | 4 | ||||
| -rw-r--r-- | klipper/urlgrabber.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index 38e6a1e16..cff763ff6 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -94,7 +94,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, // Squeeze text strings so that do not take up the entire screen (or more) TQString text( KStringHandler::cPixelSqueeze(item->text().simplifyWhiteSpace(), proxy_for_menu->fontMetrics(), - m_menu_width).tqreplace( "&", "&&" ) ); + m_menu_width).replace( "&", "&&" ) ); id = proxy_for_menu->insertItem( text, -1, index ); } else { const TQSize max_size( m_menu_width,m_menu_height/4 ); @@ -107,7 +107,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, // Determine height of a menu item. Q_ASSERT( id != -1 ); // Be sure that the item was inserted. - TQMenuItem* mi = proxy_for_menu->tqfindItem( id ); + TQMenuItem* mi = proxy_for_menu->findItem( id ); int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics() ).height(); int itemheight = proxy_for_menu->tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, proxy_for_menu, diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index 43640d691..de6561fe3 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -224,8 +224,8 @@ void URLGrabber::slotItemSelected( int id ) emit sigDisablePopup(); break; default: - ClipCommand *command = myCommandMapper.tqfind( id ); - TQStringList *backrefs = myGroupingMapper.tqfind( id ); + ClipCommand *command = myCommandMapper.find( id ); + TQStringList *backrefs = myGroupingMapper.find( id ); if ( !command || !backrefs ) qWarning("Klipper: can't find associated action"); else @@ -365,7 +365,7 @@ bool URLGrabber::isAvoidedWindow() const &unused, &data_ret ) == Success) { if ( type_ret == XA_STRING && format_ret == 8 && nitems_ret > 0 ) { wmClass = TQString::fromUtf8( (const char *) data_ret ); - ret = (myAvoidWindows.tqfind( wmClass ) != myAvoidWindows.end()); + ret = (myAvoidWindows.find( wmClass ) != myAvoidWindows.end()); } XFree( data_ret ); @@ -379,7 +379,7 @@ void URLGrabber::slotKillPopupMenu() { if ( myMenu && myMenu->isVisible() ) { - if ( myMenu->tqgeometry().tqcontains( TQCursor::pos() ) && + if ( myMenu->tqgeometry().contains( TQCursor::pos() ) && myPopupKillTimeout > 0 ) { myPopupKillTimer->start( 1000 * myPopupKillTimeout, true ); @@ -400,7 +400,7 @@ ClipCommand::ClipCommand(const TQString &_command, const TQString &_description, description(_description), isEnabled(_isEnabled) { - int len = command.tqfind(" "); + int len = command.find(" "); if (len == -1) len = command.length(); |