diff options
34 files changed, 46 insertions, 46 deletions
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 9dd958a5d..dda4310ca 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -94,7 +94,7 @@ KateFileList::KateFileList (KateMainWindow *main, m_editShade = TQColor( 255, 102, 153 ); m_enableBgShading = false; - setFocusPolicy ( TQ_NoFocus ); + setFocusPolicy ( TQWidget::NoFocus ); viewManager = _viewManager; diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index b1cc2616a..214462046 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -256,7 +256,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis sb = new TQSlider( Qt::Horizontal,group,"Slider" ); sb->setRange( 0, 10 ); - sb->setFocusPolicy( TQ_StrongFocus ); + sb->setFocusPolicy( TQWidget::StrongFocus ); connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level" diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index c4c73396a..b323b44da 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -621,7 +621,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) // Scale down the image if we need to if ( image.width() > iconSize || image.height() > iconSize ) - image = image.smoothScale( iconSize, iconSize, TQ_ScaleMin ); + image = image.smoothScale( iconSize, iconSize, TQImage::ScaleMin ); pix.convertFromImage( image ); XcursorImageDestroy( xcur ); diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 5972efa2b..6a4132745 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -405,7 +405,7 @@ void kthememanager::updatePreview( const TQString & pixFile ) TQImage preview( pixFile, "PNG" ); if (preview.width()>dlg->lbPreview->contentsRect().width() || preview.height()>dlg->lbPreview->contentsRect().height() ) - preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQ_ScaleMin ); + preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin ); TQPixmap pix; pix.convertFromImage( preview ); dlg->lbPreview->setPixmap( pix ); diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index c25a01113..fb7eea1b7 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -91,7 +91,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name) logFileName.setURL("/var/log/samba.log"); viewHistory.setAllColumnsShowFocus(TRUE); - viewHistory.setFocusPolicy(TQ_ClickFocus); + viewHistory.setFocusPolicy(TQWidget::ClickFocus); viewHistory.setShowSortIndicator(true); viewHistory.addColumn(i18n("Date & Time"),130); diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index 3b77dbc9f..f86891ec6 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -60,7 +60,7 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this ); viewStatistics->setAllColumnsShowFocus(TRUE); - viewStatistics->setFocusPolicy(TQ_ClickFocus); + viewStatistics->setFocusPolicy(TQWidget::ClickFocus); viewStatistics->setShowSortIndicator(true); viewStatistics->addColumn(i18n("Nr"),30); diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp index dd250e084..1055701f1 100644 --- a/kcontrol/screensaver/testwin.cpp +++ b/kcontrol/screensaver/testwin.cpp @@ -6,7 +6,7 @@ class QXEmbed; TestWin::TestWin() : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); KWin::setState( winId(), NET::StaysOnTop ); } diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 145ec465f..6d8514fc1 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -34,7 +34,7 @@ MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm ) pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL) { setFixedSize(150, 150); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); mode = pvm; if (opacity < 0) opacity = 0; diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h index 66bc6ade5..38f47ecee 100644 --- a/kcontrol/style/stylepreview.ui.h +++ b/kcontrol/style/stylepreview.ui.h @@ -40,7 +40,7 @@ void StylePreview::init() { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus); } delete l; } diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index e31510ad3..3dc0f62b6 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -81,7 +81,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); itsFrame->setFrameShape(TQFrame::NoFrame); - itsFrame->setFocusPolicy(TQ_ClickFocus); + itsFrame->setFocusPolicy(TQWidget::ClickFocus); itsToolsFrame->setFrameShape(TQFrame::NoFrame); previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); previewFrame->setFrameShape(TQFrame::Panel); diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 8e49087d1..a1ee6bda4 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -370,7 +370,7 @@ bool TDMAppearanceWidget::setLogo(TQString logo) if (p.isNull()) return false; if (p.width() > 100 || p.height() > 100) - p = p.smoothScale(100, 100, TQ_ScaleMin); + p = p.smoothScale(100, 100, TQImage::ScaleMin); logobutton->setPixmap(p); uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; logobutton->setFixedSize(p.width() + bd, p.height() + bd); diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index d8fbd6bcd..c7e155565 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -272,7 +272,7 @@ void TDMUsersWidget::slotUserSelected() rstuserbutton->setEnabled( false ); } if (!p.isNull()) { - userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) ); + userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) ); } } @@ -296,7 +296,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix) return; } - p = p.smoothScale( 48, 48, TQ_ScaleMin ); + p = p.smoothScale( 48, 48, TQImage::ScaleMin ); TQString userpix = m_userPixDir + user + ".face.icon"; if (!p.save( userpix, "PNG" )) KMessageBox::sorry(this, diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp index 2732bff08..9539d8a1e 100644 --- a/kdesktop/desktop.cpp +++ b/kdesktop/desktop.cpp @@ -165,7 +165,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) : m_bInit = true; // It's the child widget that gets the focus, not us - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); if ( x_root_hack ) { @@ -279,8 +279,8 @@ KDesktop::initRoot() m_pIconView->setDragAutoScroll( false ); m_pIconView->setFrameStyle( TQFrame::NoFrame ); m_pIconView->viewport()->setBackgroundMode( X11ParentRelative ); - m_pIconView->setFocusPolicy( TQ_StrongFocus ); - m_pIconView->viewport()->setFocusPolicy( TQ_StrongFocus ); + m_pIconView->setFocusPolicy( TQWidget::StrongFocus ); + m_pIconView->viewport()->setFocusPolicy( TQWidget::StrongFocus ); m_pIconView->setGeometry( geometry() ); m_pIconView->show(); diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 19377c1b4..e85732431 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -138,7 +138,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group, pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); } // Resize to fit button - pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin)); + pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin)); return pxmap; } diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 0db6bc352..cf63bd697 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) m_odd(odd), m_selected(false) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSelected(m_selected); itemTitle->setText("<h3>" + info.name() + "</h3>"); diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 62ff12675..77bccbb0a 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -54,7 +54,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, m_moveTimer(0, "m_moveTimer"), m_dirty(false) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(NoBackground); connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 971679359..031aed93e 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -138,7 +138,7 @@ void HideButton::generateIcons() } TQImage image = pixmap()->convertToImage(); - image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin); + image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin); TDEIconEffect effect; diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 4ca9acb81..58be287bb 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -635,7 +635,7 @@ ItemView::ItemView(TQWidget* parent, const char* name) setItemMargin(0); setSorting(-1); setTreeStepSize(38); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); m_lastOne = 0; m_old_contentY = -1; diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index e9329e225..2ef17f3ea 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -283,7 +283,7 @@ void PanelKMenu::initialize() } searchEdit = new KPIM::ClickLineEdit( hbox, placeholder ); - hbox->setFocusPolicy(TQ_StrongFocus); + hbox->setFocusPolicy(TQWidget::StrongFocus); hbox->setFocusProxy(searchEdit); hbox->setSpacing( 3 ); connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 500a1c5a2..ca2fc065e 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -331,7 +331,7 @@ KMenu::KMenu() m_searchResultsWidget->setItemMargin(4); // m_searchResultsWidget->setIconSize(16); m_searchActions = new ItemView (m_searchWidget, "m_searchActions"); - m_searchActions->setFocusPolicy(TQ_NoFocus); + m_searchActions->setFocusPolicy(TQWidget::NoFocus); m_searchActions->setItemMargin(4); m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet")); m_searchInternet->setPixmap(0,icon); @@ -450,9 +450,9 @@ void KMenu::setupUi() m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); - // m_stacker->setFocusPolicy( TQ_StrongFocus ); + // m_stacker->setFocusPolicy( TQWidget::StrongFocus ); m_stacker->setLineWidth( 0 ); - m_stacker->setFocusPolicy(TQ_NoFocus); + m_stacker->setFocusPolicy(TQWidget::NoFocus); connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*))); m_kcommand->setName("m_kcommand"); @@ -528,19 +528,19 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) } if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) { - m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus); + m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus); m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ? - TQ_StrongFocus : TQ_NoFocus); + TQWidget::StrongFocus : TQWidget::NoFocus); setTabOrder(raiseWidget, m_searchResultsWidget); if (raiseWidget != m_stacker->visibleWidget() - && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus + && TQT_TQWIDGET(receiver)->focusPolicy() == TQWidget::NoFocus && m_stacker->id(raiseWidget) >= 0) { m_stacker->raiseWidget(raiseWidget); return true; } - if (raiseWidget->focusPolicy() != TQ_NoFocus) + if (raiseWidget->focusPolicy() != TQWidget::NoFocus) return false; } @@ -2283,7 +2283,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width, void KMenu::clearSearchResults(bool showHelp) { m_searchResultsWidget->clear(); - m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus); + m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus); setTabOrder(m_kcommand, m_searchResultsWidget); if (showHelp) { diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 0a6000f37..99c81ce6d 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -76,7 +76,7 @@ KickerTip::KickerTip(TQWidget * parent) m_timer(0, "KickerTip::m_timer"), m_frameTimer(0, "KickerTip::m_frameTimer") { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(NoBackground); resize(0, 0); hide(); diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index c3881a7a6..5b43fb8f5 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -145,7 +145,7 @@ void KlipperPopup::buildFromScratch() { m_filterWidget = new KLineEditBlackKey( this, "Klipper filter widget" ); insertTitle( SmallIcon( "klipper" ), i18n("Klipper - Clipboard Tool")); m_filterWidgetId = insertItem( m_filterWidget, m_filterWidgetId, 1 ); - m_filterWidget->setFocusPolicy( TQ_NoFocus ); + m_filterWidget->setFocusPolicy( TQWidget::NoFocus ); setItemVisible( m_filterWidgetId, false ); m_filterWidget->hide(); TQString lastGroup; diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index 71adba63d..f4264cf56 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -98,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 ); } diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp index d5e5d0ef5..63f33aff1 100644 --- a/konqueror/konq_frame.cpp +++ b/konqueror/konq_frame.cpp @@ -80,7 +80,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" ); - m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus); + m_pLinkedViewCheckBox->setFocusPolicy(TQWidget::NoFocus); m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); TQWhatsThis::add( m_pLinkedViewCheckBox, i18n("Checking this box on at least two views sets those views as 'linked'. " diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index 2b48b6718..8c27c740b 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -174,8 +174,8 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) ); viewport()->setMouseTracking( true ); - viewport()->setFocusPolicy( TQ_WheelFocus ); - setFocusPolicy( TQ_WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); setAcceptDrops( true ); //looks better with the statusbar diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 0d0b11994..8054f98e9 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -432,7 +432,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) setAcceptDrops(true); // attempt dragInfo.state = diNone; - setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); // im setInputMethodEnabled(true); diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index 9eef57954..56d21882e 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -72,7 +72,7 @@ KWrited::KWrited() : TQTextEdit() setMinimumWidth(pref_width); setMinimumHeight(pref_height); setReadOnly(true); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setWordWrap(TQTextEdit::WidgetWidth); setTextFormat(TQt::PlainText); diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h index e16ec4085..b4c626221 100644 --- a/kpersonalizer/stylepreview.ui.h +++ b/kpersonalizer/stylepreview.ui.h @@ -48,7 +48,7 @@ void StylePreview::init() { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus); } delete l; } diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 97287ede0..98dddcf18 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -1436,7 +1436,7 @@ void FlatButton::init() setUsesBigPixmap(true); setAutoRaise(true); setTextPosition( TQToolButton::Under ); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 99cbc780f..93f4cac7d 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -228,7 +228,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject // create a canvas to insert our widget _canvas = new PluginCanvasWidget( parentWidget, widgetName ); //_canvas->setFocusPolicy( TQWidget::ClickFocus ); - _canvas->setFocusPolicy( TQ_WheelFocus ); + _canvas->setFocusPolicy( TQWidget::WheelFocus ); _canvas->setBackgroundMode( TQWidget::NoBackground ); setWidget(_canvas); _canvas->show(); diff --git a/tdepasswd/kcm/chfacedlg.cpp b/tdepasswd/kcm/chfacedlg.cpp index 0a3dbfb78..dd37bba9d 100644 --- a/tdepasswd/kcm/chfacedlg.cpp +++ b/tdepasswd/kcm/chfacedlg.cpp @@ -128,7 +128,7 @@ void ChFaceDlg::addCustomPixmap( TQString imPath, bool saveCopy ) } if ( (pix.width() > KCFGUserAccount::faceSize()) || (pix.height() > KCFGUserAccount::faceSize()) ) - pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQ_ScaleMin );// Should be no bigger than certain size. + pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQImage::ScaleMin );// Should be no bigger than certain size. if ( saveCopy ) { diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 3ae57e7ab..3c9b0e9f1 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -43,7 +43,7 @@ PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ , m_extension = new PrintPartExtension(this); m_view = new KMMainView(parentWidget, "MainView", actionCollection()); - m_view->setFocusPolicy(TQ_ClickFocus); + m_view->setFocusPolicy(TQWidget::ClickFocus); m_view->enableToolbar(false); setWidget(m_view); diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 9b8a4ab3a..61c3f84ef 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -401,7 +401,7 @@ KGreeter::insertUser( const TQImage &default_pix, p = ir.image(); TQSize ns( 48, 48 ); if (p.size() != ns) { - p = p.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin ); + p = p.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin ); } break; } while (--nd >= 0); @@ -490,7 +490,7 @@ KGreeter::insertUsers(int limit_users) TQSize ns( 48, 48 ); if (default_pix.size() != ns) default_pix = - default_pix.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin ); + default_pix.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin ); } if (_showUsers == SHOW_ALL) { KGreeterUserList noUsers( _noUsers ); diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index 0cba5e82d..094e2a8c8 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -753,7 +753,7 @@ void FlatButton::init() setUsesBigPixmap(true); setAutoRaise(true); setTextPosition( TQToolButton::Under ); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } |