diff options
Diffstat (limited to 'klipper/popupproxy.cpp')
| -rw-r--r-- | klipper/popupproxy.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index 1c427834a..20f8139a1 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*- /* This file is part of the KDE project Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk> @@ -40,7 +39,7 @@ PopupProxy::PopupProxy( KlipperPopup* parent, const char* name, int menu_height, m_menu_width( menu_width ), nextItemNumber( 0 ) { - connect( parent->history(), TQT_SIGNAL( changed() ), TQT_SLOT( slotHistoryChanged() ) ); + connect( parent->history(), TQ_SIGNAL( changed() ), TQ_SLOT( slotHistoryChanged() ) ); } void PopupProxy::slotHistoryChanged() { @@ -99,7 +98,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, } else { const TQSize max_size( m_menu_width,m_menu_height/4 ); if ( image.height() > max_size.height() || image.width() > max_size.width() ) { - image.convertFromImage( TQImage(image.convertToImage()).smoothScale( max_size, TQ_ScaleMin ) ); + image.convertFromImage( TQImage(image.convertToImage()).smoothScale( max_size, TQImage::ScaleMin ) ); } id = proxy_for_menu->insertItem( image, -1, index ); } @@ -109,7 +108,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, Q_ASSERT( id != -1 ); // Be sure that the item was inserted. TQMenuItem* mi = proxy_for_menu->findItem( id ); int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics() ).height(); - int itemheight = proxy_for_menu->style().tqsizeFromContents(TQStyle::CT_PopupMenuItem, + int itemheight = proxy_for_menu->style().sizeFromContents(TQStyle::CT_PopupMenuItem, proxy_for_menu, TQSize( 0, fontheight ), TQStyleOption(mi,10,0) ).height(); @@ -118,7 +117,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, History* history = parent()->history(); proxy_for_menu->connectItem( id, history, - TQT_SLOT( slotMoveToTop( int ) ) ); + TQ_SLOT( slotMoveToTop( int ) ) ); proxy_for_menu->setItemParameter( id, nextItemNumber ); } @@ -152,7 +151,7 @@ int PopupProxy::insertFromSpill( int index ) { if ( spillPointer.current() ) { TDEPopupMenu* moreMenu = new TDEPopupMenu( proxy_for_menu, "a more menu" ); proxy_for_menu->insertItem( i18n( "&More" ), moreMenu, -1, index ); - connect( moreMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); + connect( moreMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); proxy_for_menu = moreMenu; } |