diff options
Diffstat (limited to 'kcontrol')
-rw-r--r-- | kcontrol/colors/colorscm.cpp | 2 | ||||
-rw-r--r-- | kcontrol/input/xcursor/themepage.cpp | 2 | ||||
-rw-r--r-- | kcontrol/kthememanager/kthememanager.cpp | 2 | ||||
-rw-r--r-- | kcontrol/samba/kcmsambalog.cpp | 2 | ||||
-rw-r--r-- | kcontrol/samba/kcmsambastatistics.cpp | 2 | ||||
-rw-r--r-- | kcontrol/screensaver/testwin.cpp | 2 | ||||
-rw-r--r-- | kcontrol/style/menupreview.cpp | 2 | ||||
-rw-r--r-- | kcontrol/style/stylepreview.ui.h | 2 | ||||
-rw-r--r-- | kcontrol/tdefontinst/viewpart/FontViewPart.cpp | 2 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 2 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-users.cpp | 4 |
11 files changed, 12 insertions, 12 deletions
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, |