diff options
92 files changed, 157 insertions, 157 deletions
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cpp b/chalk/plugins/filters/levelfilter/kgradientslider.cpp index b36e5ce9..ca5725bd 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.cpp +++ b/chalk/plugins/filters/levelfilter/kgradientslider.cpp @@ -47,7 +47,7 @@ KGradientSlider::KGradientSlider(TQWidget *parent, const char *name, WFlags f) m_whitecursor = 255; m_gamma = 1.0; m_gammaEnabled = false; - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } KGradientSlider::~KGradientSlider() diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp index 82748f4c..b6b52860 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp @@ -239,7 +239,7 @@ void DlgColorRange::updatePreview() TQ_INT32 x, y, w, h; m_dev->exactBounds(x, y, w, h); - TQPixmap pix = TQPixmap(m_selection->maskImage().smoothScale(350, 350, TQ_ScaleMin)); + TQPixmap pix = TQPixmap(m_selection->maskImage().smoothScale(350, 350, TQImage::ScaleMin)); m_subject->canvasController()->updateCanvas(); m_page->pixSelection->setPixmap(pix); } diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 7fb3668f..783e2a1d 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -236,7 +236,7 @@ void KSnapshot::slotPrint() neww = newh/h*w; } - img = img.smoothScale( int(neww), int(newh), TQ_ScaleMin ); + img = img.smoothScale( int(neww), int(newh), TQImage::ScaleMin ); tqApp->processEvents(); int x = (metrics.width()-img.width())/2; diff --git a/chalk/ui/kcurve.cpp b/chalk/ui/kcurve.cpp index b6bd5162..086bcb55 100644 --- a/chalk/ui/kcurve.cpp +++ b/chalk/ui/kcurve.cpp @@ -61,7 +61,7 @@ KCurve::KCurve(TQWidget *parent, const char *name, WFlags f) p->first = 1.0; p->second=1.0; m_points.append(p); m_points.setAutoDelete(true); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } KCurve::~KCurve() diff --git a/chalk/ui/kis_canvas.cpp b/chalk/ui/kis_canvas.cpp index 63ae4ab0..f001c5bd 100644 --- a/chalk/ui/kis_canvas.cpp +++ b/chalk/ui/kis_canvas.cpp @@ -1284,7 +1284,7 @@ void KisCanvas::updateGeometry() dynamic_cast<TQWidget *>(m_canvasWidget)->updateGeometry(); } -void KisCanvas::setFocusPolicy(TQ_FocusPolicy focusPolicy) +void KisCanvas::setFocusPolicy(TQWidget::FocusPolicy focusPolicy) { Q_ASSERT(m_canvasWidget); dynamic_cast<TQWidget *>(m_canvasWidget)->setFocusPolicy(focusPolicy); diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index 6ab2c680..737ca5d8 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -362,7 +362,7 @@ protected: void setUpdatesEnabled(bool updatesEnabled); bool isUpdatesEnabled() const; - void setFocusPolicy(TQ_FocusPolicy focusPolicy); + void setFocusPolicy(TQWidget::FocusPolicy focusPolicy); const TQCursor& cursor() const; void setCursor(const TQCursor& cursor); diff --git a/chalk/ui/kis_color_cup.cpp b/chalk/ui/kis_color_cup.cpp index ae0ddfac..198cb01f 100644 --- a/chalk/ui/kis_color_cup.cpp +++ b/chalk/ui/kis_color_cup.cpp @@ -48,7 +48,7 @@ KisColorPopup::KisColorPopup(TQColor c, TQWidget * parent, const char * name) { m_color = c; setMargin(4); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); TQHBoxLayout * l = new TQHBoxLayout(this); l->add(m_khsSelector = new KHSSelector(this)); m_khsSelector->setMinimumSize(140, 7); diff --git a/chalk/ui/kis_controlframe.cpp b/chalk/ui/kis_controlframe.cpp index e5a8ce1b..85f30454 100644 --- a/chalk/ui/kis_controlframe.cpp +++ b/chalk/ui/kis_controlframe.cpp @@ -63,7 +63,7 @@ KisPopupFrame::KisPopupFrame(TQWidget * parent, const char* name) : TQPopupMenu(parent, name) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } void KisPopupFrame::keyPressEvent(TQKeyEvent * e) @@ -222,7 +222,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab"); m_brushesTab->setTabShape(TQTabWidget::Triangular); - m_brushesTab->setFocusPolicy(TQ_NoFocus); + m_brushesTab->setFocusPolicy(TQWidget::NoFocus); m_brushesTab->setFont(m_font); m_brushesTab->setMargin(1); @@ -274,7 +274,7 @@ void KisControlFrame::createPatternsChooser(KisView * view) TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab"); m_patternsTab->setTabShape(TQTabWidget::Triangular); - m_patternsTab->setFocusPolicy(TQ_NoFocus); + m_patternsTab->setFocusPolicy(TQWidget::NoFocus); m_patternsTab->setFont(m_font); m_patternsTab->setMargin(1); l2->add( m_patternsTab ); @@ -315,7 +315,7 @@ void KisControlFrame::createGradientsChooser(KisView * view) TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab"); m_gradientTab->setTabShape(TQTabWidget::Triangular); - m_gradientTab->setFocusPolicy(TQ_NoFocus); + m_gradientTab->setFocusPolicy(TQWidget::NoFocus); m_gradientTab->setFont(m_font); m_gradientTab->setMargin(1); diff --git a/chalk/ui/kis_layerlist.cpp b/chalk/ui/kis_layerlist.cpp index bfae8282..5839634d 100644 --- a/chalk/ui/kis_layerlist.cpp +++ b/chalk/ui/kis_layerlist.cpp @@ -212,7 +212,7 @@ TQImage KisLayerItem::tooltipPreview() const return img; //so TQt doesn't complain img.setAlphaBuffer( true ); const int size = kMin( 200, kMax( img.width(), img.height() ) ); - return img.smoothScale( size, size, TQ_ScaleMin ); + return img.smoothScale( size, size, TQImage::ScaleMin ); } //void KisLayerItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); diff --git a/chalk/ui/kis_palette_widget.cpp b/chalk/ui/kis_palette_widget.cpp index e04b0494..4fe899e2 100644 --- a/chalk/ui/kis_palette_widget.cpp +++ b/chalk/ui/kis_palette_widget.cpp @@ -70,7 +70,7 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) TQVBoxLayout *layout = new TQVBoxLayout( this ); combo = new TQComboBox( false, this ); - combo->setFocusPolicy( TQ_ClickFocus ); + combo->setFocusPolicy( TQWidget::ClickFocus ); layout->addWidget(combo); m_view = new KisPaletteView(this, 0, minWidth, cols); diff --git a/chalk/ui/kis_previewwidget.cpp b/chalk/ui/kis_previewwidget.cpp index f60755a1..a95c4920 100644 --- a/chalk/ui/kis_previewwidget.cpp +++ b/chalk/ui/kis_previewwidget.cpp @@ -169,7 +169,7 @@ void KisPreviewWidget::updateZoom() int sh = int(ceil(m_zoom * h / m_filterZoom)); m_dirtyPreview = false; m_scaledPreview = m_previewDevice->convertToTQImage(m_profile, 0, 0, w, h); - m_scaledPreview = m_scaledPreview.scale(sw,sh, TQ_ScaleMax); // Use scale instead of smoothScale for speed up + m_scaledPreview = m_scaledPreview.scale(sw,sh, TQImage::ScaleMax); // Use scale instead of smoothScale for speed up } m_preview->setImage(m_scaledPreview); } else @@ -182,7 +182,7 @@ void KisPreviewWidget::updateZoom() int sh = int(ceil(m_zoom * h)); m_dirtyOriginal = false; m_scaledOriginal = m_origDevice->convertToTQImage(m_profile, 0, 0, w, h); - m_scaledOriginal = m_scaledOriginal.scale(sw,sh, TQ_ScaleMax); // Use scale instead of smoothScale for speed up + m_scaledOriginal = m_scaledOriginal.scale(sw,sh, TQImage::ScaleMax); // Use scale instead of smoothScale for speed up } m_preview->setImage(m_scaledOriginal); } diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp index bf029fb1..439423c7 100644 --- a/chalk/ui/kis_view.cpp +++ b/chalk/ui/kis_view.cpp @@ -244,7 +244,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c KisConfig cfg; m_currentColorChooserDisplay = KisID("BLA"); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); // Must come before input devices are referenced as this detects them. #ifdef Q_WS_X11 @@ -3161,7 +3161,7 @@ void KisView::scrollV(int value) void KisView::setupCanvas() { m_canvas = new KisCanvas(this, "kis_canvas"); - m_canvas->setFocusPolicy( TQ_StrongFocus ); + m_canvas->setFocusPolicy( TQWidget::StrongFocus ); TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*))); diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index c7e97305..c15c6d5e 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -179,7 +179,7 @@ public: if( !m_img.isNull() ) { if( m_img.width() > MAX_SIZE || m_img.height() > MAX_SIZE ) - m_img = m_img.scale( MAX_SIZE, MAX_SIZE, TQ_ScaleMin ); + m_img = m_img.scale( MAX_SIZE, MAX_SIZE, TQImage::ScaleMin ); int y = 0; if( m_img.height() < text.height() ) y = text.height()/2 - m_img.height()/2; @@ -1128,7 +1128,7 @@ void LayerItem::drawPreview( TQPainter *p, const TQColorGroup &/*cg*/, const TQR if( d->previewChanged || r.size() != d->previewSize ) { //TODO handle width() != height() const int size = kMin( r.width(), kMax( previewImage()->width(), previewImage()->height() ) ); - const TQImage i = previewImage()->smoothScale( size, size, TQ_ScaleMin ); + const TQImage i = previewImage()->smoothScale( size, size, TQImage::ScaleMin ); d->scaledPreview.convertFromImage( i ); d->previewOffset.setX( r.width()/2 - i.width()/2 ); d->previewOffset.setY( r.height()/2 - i.height()/2 ); diff --git a/karbon/core/vimage.cpp b/karbon/core/vimage.cpp index 4e846661..9ea672fb 100644 --- a/karbon/core/vimage.cpp +++ b/karbon/core/vimage.cpp @@ -87,7 +87,7 @@ VImage::draw( VPainter *painter, const KoRect * ) const //painter->setWorldMatrix( m_matrix ); - //*m_image = m_image->smoothScale( m_image->width() * zoomFactor, m_image->height() * zoomFactor, TQ_ScaleMin ); + //*m_image = m_image->smoothScale( m_image->width() * zoomFactor, m_image->height() * zoomFactor, TQImage::ScaleMin ); m_boundingBox = KoRect( 0, 0, m_image->width(), m_image->height() ); m_boundingBox = m_boundingBox.transform( m_matrix ); if( !m_image->isNull() ) diff --git a/karbon/widgets/vcanvas.cpp b/karbon/widgets/vcanvas.cpp index d4cd6497..9fa94327 100644 --- a/karbon/widgets/vcanvas.cpp +++ b/karbon/widgets/vcanvas.cpp @@ -98,7 +98,7 @@ VCanvas::VCanvas( TQWidget *parent, KarbonView* view, KarbonPart* part ) WRepaintNoErase ), m_part( part ), m_view( view ) { connect(this, TQT_SIGNAL( contentsMoving( int, int ) ), this, TQT_SLOT( slotContentsMoving( int, int ) ) ); - viewport()->setFocusPolicy( TQ_StrongFocus ); + viewport()->setFocusPolicy( TQWidget::StrongFocus ); viewport()->setMouseTracking( true ); setMouseTracking( true ); diff --git a/karbon/widgets/vstrokefillpreview.cpp b/karbon/widgets/vstrokefillpreview.cpp index f69d5d85..5e05eecd 100644 --- a/karbon/widgets/vstrokefillpreview.cpp +++ b/karbon/widgets/vstrokefillpreview.cpp @@ -56,7 +56,7 @@ VStrokeFillPreview::VStrokeFillPreview( : TQFrame( parent, name ), m_part( part ) { m_strokeWidget = false; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Sunken ); diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp index 2f0db91a..a0f05ab6 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp @@ -148,7 +148,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, if ( tabs & FORMAT_AND_BORDERS ) setupTab1( true ); if ( tabs & HEADER_AND_FOOTER ) setupTab2( hf ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); } @@ -176,7 +176,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, if ( tabs & COLUMNS ) setupTab3(); if ( tabs & KW_HEADER_AND_FOOTER ) setupTab4(kwhf); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); } diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 66321cf1..58fdf6c0 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -457,14 +457,14 @@ Form::addWidgetToTabStops(ObjectTreeItem *it) TQWidget *w = it->widget(); if(!w) return; - if(!(w->focusPolicy() & TQ_TabFocus)) + if(!(w->focusPolicy() & TQWidget::TabFocus)) { TQObjectList clo = w->childrenListObject(); if (clo.isEmpty()) return; // For composed widgets, we check if one of the child can have focus for(TQObjectListIterator chIt(clo); chIt.current(); ++chIt) { - if(chIt.current()->isWidgetType()) {//TQ_TabFocus flag will be checked later! + if(chIt.current()->isWidgetType()) {//TQWidget::TabFocus flag will be checked later! if(d->tabstops.findRef(it) == -1) { d->tabstops.append(it); return; @@ -480,7 +480,7 @@ void Form::updateTabStopsOrder() { for (ObjectTreeListIterator it(d->tabstops);it.current();) { - if(!(it.current()->widget()->focusPolicy() & TQ_TabFocus)) { + if(!(it.current()->widget()->focusPolicy() & TQWidget::TabFocus)) { kexidbg << "Form::updateTabStopsOrder(): widget removed because has no TabFocus: " << it.current()->widget()->name() << endl; d->tabstops.remove( it.current() ); } diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index f4f7bdf9..dfd56a22 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -139,7 +139,7 @@ KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *parent, const char *name, m_inShell = (!args.grep("shell").isEmpty()); TQHBox *container = new TQHBox(parent, "kfd_container_widget"); - container->setFocusPolicy(TQ_ClickFocus); + container->setFocusPolicy(TQWidget::ClickFocus); m_workspace = new TQWorkspace(container, "kfd_workspace"); m_workspace->show(); diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp index f9fd3cd0..ed62c07c 100644 --- a/kexi/kexiutils/utils.cpp +++ b/kexi/kexiutils/utils.cpp @@ -283,7 +283,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, if (scaledContents) { if (keepAspectRatio) { TQImage img(pixmap.convertToImage()); - img = img.smoothScale(w, h, TQ_ScaleMin); + img = img.smoothScale(w, h, TQImage::ScaleMin); pos = rect.topLeft(); //0, 0); if (img.width() < w) { int hAlign = TQApplication::horizontalAlignment( alignment ); diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index 8aed1c0a..c6e75b54 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -481,7 +481,7 @@ void KexiSimplePrintingEngine::paintRecord(TQPainter& painter, KexiTableItem *it int( (rect.y()+m_mainLineSpacing/4) / m_SCALE), pixmap.convertToImage().smoothScale( int(pixmapWidth / m_SCALE), int(pixmapHeight / m_SCALE), - TQ_ScaleMin )); + TQImage::ScaleMin )); painter.restore(); // back to m_SCALE:1 scale } } diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index a30f2695..26d9cc64 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -192,7 +192,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_project_selector = new KexiProjectSelectorWidget( m_server_db_name->frm_dblist, "KexiProjectSelectorWidget", 0, false, false ); GLUE_WIDGET(m_project_selector, m_server_db_name->frm_dblist); - m_project_selector->setFocusPolicy(TQ_NoFocus); + m_project_selector->setFocusPolicy(TQWidget::NoFocus); m_project_selector->setSelectable(false); addPage(m_server_db_name, i18n("Select Project's Caption & Database Name")); diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index 54ecbb1d..ba21827e 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -176,7 +176,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) "add_field", "addFieldButton"); m_addField->setMinimumHeight(m_availableFieldsLabel->minimumHeight()); // m_addField->setTextPosition(TQToolButton::Right); - m_addField->setFocusPolicy(TQ_StrongFocus); + m_addField->setFocusPolicy(TQWidget::StrongFocus); TQToolTip::add(m_addField, i18n("Insert selected fields into form")); hlyr->addWidget(m_addField); connect(m_addField, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSelectedFields())); diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 52272fc7..c9b14274 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -300,9 +300,9 @@ KexiDBAutoField::setInvalidState( const TQString &text ) return; d->widgetType = Auto; createEditor(); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); if (m_subwidget) - m_subwidget->setFocusPolicy(TQ_NoFocus); + m_subwidget->setFocusPolicy(TQWidget::NoFocus); //! @todo or set this to editor's text? d->label->setText( text ); } @@ -667,7 +667,7 @@ KexiDBAutoField::sizeHint() const } void -KexiDBAutoField::setFocusPolicy( TQ_FocusPolicy policy ) +KexiDBAutoField::setFocusPolicy( TQWidget::FocusPolicy policy ) { d->focusPolicyChanged = true; TQWidget::setFocusPolicy(policy); diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h index a45289d0..3c0c7548 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.h +++ b/kexi/plugins/forms/widgets/kexidbautofield.h @@ -133,7 +133,7 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField : TQString fieldCaptionInternal() const; virtual TQSize sizeHint() const; - virtual void setFocusPolicy ( TQ_FocusPolicy policy ); + virtual void setFocusPolicy ( TQWidget::FocusPolicy policy ); //! Reimplemented to return internal editor's color. const TQColor & paletteForegroundColor() const; diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp index 5d123d4d..d97fe7d9 100644 --- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp @@ -29,7 +29,7 @@ KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const cha , m_tristateChanged(false) , m_tristate(TristateDefault) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); updateTristate(); connect(this, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotStateChanged(int))); } @@ -44,8 +44,8 @@ void KexiDBCheckBox::setInvalidState( const TQString& displayText ) setState(NoChange); m_invalidState = true; //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? - if (focusPolicy() & TQ_TabFocus) - setFocusPolicy(TQ_ClickFocus); + if (focusPolicy() & TQWidget::TabFocus) + setFocusPolicy(TQWidget::ClickFocus); setText(displayText); } diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index 26ba8ebe..afe2e3aa 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -78,7 +78,7 @@ KexiDBComboBox::KexiDBComboBox(TQWidget *parent, const char *name, bool designMo , d(new Private()) { setMouseTracking(true); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); installEventFilter(this); d->designMode = designMode; d->paintedCombo = new KComboBox(this); diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index 2b72fc53..da8c9fc4 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -82,7 +82,7 @@ void KexiDBDateEdit::setInvalidState( const TQString& ) m_invalidState = true; //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); } void diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 65edd28a..35506591 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -91,7 +91,7 @@ void KexiDBDateTimeEdit::setInvalidState(const TQString & /*! @todo paint this t m_invalidState = true; //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); } void diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp index 99afcbd6..0fdc08cf 100644 --- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp @@ -39,7 +39,7 @@ void KexiDBDoubleSpinBox::setInvalidState( const TQString& displayText ) setReadOnly(true); //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setSpecialValueText(displayText); KDoubleSpinBox::setValue(minValue()); } diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index 106e465b..a6603867 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -310,7 +310,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) // if (d->orderedFocusWidgets.isEmpty()) { //generate a new list for (KFormDesigner::ObjectTreeListIterator it(form->tabStopsIterator()); it.current(); ++it) { - if (it.current()->widget()->focusPolicy() & TQ_TabFocus) { + if (it.current()->widget()->focusPolicy() & TQWidget::TabFocus) { //this widget has tab focus: it.current()->widget()->installEventFilter(this); //also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors) @@ -368,7 +368,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) void KexiDBForm::updateTabStopsOrder() { for (TQPtrListIterator<TQWidget> it( d->orderedFocusWidgets ); it.current();) { - if (! (it.current()->focusPolicy() & TQ_TabFocus)) + if (! (it.current()->focusPolicy() & TQWidget::TabFocus)) d->orderedFocusWidgets.remove( it.current() ); else ++it; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index e8b7aa93..1d81cc1c 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -91,7 +91,7 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n } else { m_chooser = new KexiDropDownButton(this); - m_chooser->setFocusPolicy(TQ_StrongFocus); + m_chooser->setFocusPolicy(TQWidget::StrongFocus); m_chooser->setPopup(m_popupMenu); setFocusProxy(m_chooser); m_chooser->installEventFilter(this); @@ -711,7 +711,7 @@ void KexiDBImageBox::updatePixmap() KexiDBImageBox_pmDeleter.setObject( KexiDBImageBox_pm, new TQPixmap(fname, "PNG") ); TQImage img(KexiDBImageBox_pm->convertToImage()); KexiDBImageBox_pmSmallDeleter.setObject( KexiDBImageBox_pmSmall, - new TQPixmap( img.smoothScale(img.width()/2, img.height()/2, TQ_ScaleMin) ) ); + new TQPixmap( img.smoothScale(img.width()/2, img.height()/2, TQImage::ScaleMin) ) ); } } @@ -849,19 +849,19 @@ bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e ) return KexiFrame::eventFilter(watched, e); } -TQ_FocusPolicy KexiDBImageBox::focusPolicy() const +TQWidget::FocusPolicy KexiDBImageBox::focusPolicy() const { if (dataSource().isEmpty()) - return TQ_NoFocus; + return TQWidget::NoFocus; return m_focusPolicyInternal; } -TQ_FocusPolicy KexiDBImageBox::focusPolicyInternal() const +TQWidget::FocusPolicy KexiDBImageBox::focusPolicyInternal() const { return m_focusPolicyInternal; } -void KexiDBImageBox::setFocusPolicy( TQ_FocusPolicy policy ) +void KexiDBImageBox::setFocusPolicy( TQWidget::FocusPolicy policy ) { m_focusPolicyInternal = policy; KexiFrame::setFocusPolicy( focusPolicy() ); //set modified policy diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h index 4abb9fb3..8c0be858 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.h +++ b/kexi/plugins/forms/widgets/kexidbimagebox.h @@ -127,14 +127,14 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : /*! Overriden to change the policy behaviour a bit: NoFocus is returned regardless the real focus flag if the data source is empty (see dataSource()). */ - TQ_FocusPolicy focusPolicy() const; + TQWidget::FocusPolicy focusPolicy() const; //! \return the internal focus policy value, i.e. the one unrelated to data source presence. - TQ_FocusPolicy focusPolicyInternal() const; + TQWidget::FocusPolicy focusPolicyInternal() const; /*! Sets the internal focus policy value. "Internal" means that if there is no data source set, real policy becomes NoFocus. */ - virtual void setFocusPolicy( TQ_FocusPolicy policy ); + virtual void setFocusPolicy( TQWidget::FocusPolicy policy ); public slots: void setPixmapId(uint id); @@ -259,7 +259,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : // *m_deleteAction, *m_propertiesAction; // TQTimer m_clickTimer; int m_alignment; - TQ_FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal() + TQWidget::FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal() bool m_designMode : 1; bool m_readOnly : 1; bool m_scaledContents : 1; diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp index a48d06c8..633fe6fc 100644 --- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp @@ -40,7 +40,7 @@ void KexiDBIntSpinBox::setInvalidState( const TQString& displayText ) setReadOnly(true); //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setSpecialValueText(displayText); KIntSpinBox::setValue(minValue()); } diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp index 8e74324a..5d1fadf6 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.cpp +++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp @@ -80,8 +80,8 @@ void KexiDBLineEdit::setInvalidState( const TQString& displayText ) { KLineEdit::setReadOnly(true); //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? - if (focusPolicy() & TQ_TabFocus) - setFocusPolicy(TQ_ClickFocus); + if (focusPolicy() & TQWidget::TabFocus) + setFocusPolicy(TQWidget::ClickFocus); setText(displayText); } diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index 6948d840..07e932b4 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -47,8 +47,8 @@ void KexiDBTextEdit::setInvalidState( const TQString& displayText ) { setReadOnly(true); //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? - if (focusPolicy() & TQ_TabFocus) - setFocusPolicy(TQ_ClickFocus); + if (focusPolicy() & TQWidget::TabFocus) + setFocusPolicy(TQWidget::ClickFocus); KTextEdit::setText(displayText); } diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp index 5473a9cb..ac42fa85 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp @@ -56,7 +56,7 @@ void KexiDBTimeEdit::setInvalidState( const TQString&) m_invalidState = true; //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); } void diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index b1ee4366..d424ffad 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -169,7 +169,7 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent m_iconLbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); m_iconLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft); m_fnameLbl = new KActiveLabel(this); - m_fnameLbl->setFocusPolicy(TQ_NoFocus); + m_fnameLbl->setFocusPolicy(TQWidget::NoFocus); m_fnameLbl->setTextFormat(TQt::PlainText); m_fnameLbl->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0)); m_fnameLbl->setLineWidth(1); @@ -180,7 +180,7 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent hbox->addWidget(m_fnameLbl, 1, TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); hbox->addSpacing(10); m_commentLbl = new KActiveLabel(this); - m_commentLbl->setFocusPolicy(TQ_NoFocus); + m_commentLbl->setFocusPolicy(TQWidget::NoFocus); m_commentLbl->setTextFormat(TQt::PlainText); m_commentLbl->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); m_commentLbl->setLineWidth(1); diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index 1612871b..6af497d1 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -132,7 +132,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget lyr->addWidget(d->editor); setFocusProxy(d->editor); d->objectInfoLabel->setBuddy(d->editor); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); connect(d->editor, TQT_SIGNAL(propertySetChanged(KoProperty::Set*)), this, TQT_SLOT(slotPropertySetChanged(KoProperty::Set*))); diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index 6b9a819f..ea456b21 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -60,7 +60,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) // (fc.blue()+bc.blue()*2)/3); m_helpFont.setPointSize( m_helpFont.pointSize() * 3 ); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); //initial resize mode is always manual; //will be changed on show(), if needed diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 2a3003ab..7a414d2b 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -66,7 +66,7 @@ KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, d->lbl_b = new TQHBox(this); d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b); d->lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); - d->lbl->setFocusPolicy(TQ_StrongFocus); + d->lbl->setFocusPolicy(TQWidget::StrongFocus); d->lbl->installEventFilter(this); installEventFilter(this); setCaption(caption); @@ -82,7 +82,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip, { KPushButton *btn = new KPushButton(d->lbl_b); btn->setFlat(true); - btn->setFocusPolicy(TQ_NoFocus); + btn->setFocusPolicy(TQWidget::NoFocus); btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); if (receiver && member) { connect(btn, TQT_SIGNAL(clicked()), receiver, member); diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index c2ce43cf..3ad9e556 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -343,7 +343,7 @@ PixmapCollectionEditor::getPixmap(const TQString &name) KPixmapIO io; TQImage image = io.convertToImage(pixmap); - pixmap = io.convertToPixmap(image.scale(48, 48, TQ_ScaleMin)); + pixmap = io.convertToPixmap(image.scale(48, 48, TQImage::ScaleMin)); return pixmap; } @@ -420,7 +420,7 @@ PixmapCollectionChooser::getPixmap(const TQString &name) // We scale the pixmap down to 48x48 to fit in the iconView KPixmapIO io; TQImage image = io.convertToImage(pixmap); - pixmap = io.convertToPixmap(image.scale(48, 48, TQ_ScaleMin)); + pixmap = io.convertToPixmap(image.scale(48, 48, TQImage::ScaleMin)); return pixmap; } diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index faf70887..47e9c859 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -58,7 +58,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) // connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *))); viewport()->setPaletteBackgroundColor(colorGroup().mid()); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); setResizePolicy(Manual); /*MOVED TO KexiRelationDialog //actions diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 3c08b265..9eecc498 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -70,7 +70,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg m_setVisibleValueOnSetValueInternal = true; d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ ); d->button->hide(); - d->button->setFocusPolicy( TQ_NoFocus ); + d->button->setFocusPolicy( TQWidget::NoFocus ); connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked())); connect(m_lineedit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLineEditTextChanged(const TQString&))); diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index ab76fa95..39e397ea 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -192,9 +192,9 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch setResizePolicy(Manual); viewport()->setBackgroundMode(TQt::NoBackground); -// viewport()->setFocusPolicy(TQ_StrongFocus); - viewport()->setFocusPolicy(TQ_WheelFocus); - setFocusPolicy(TQ_WheelFocus); //<--- !!!!! important (was NoFocus), +// viewport()->setFocusPolicy(TQWidget::StrongFocus); + viewport()->setFocusPolicy(TQWidget::WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); //<--- !!!!! important (was NoFocus), // otherwise TQApplication::setActiveWindow() won't activate // this widget when needed! // setFocusProxy(viewport()); diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 2c4ef8cf..d61c7dc8 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -88,13 +88,13 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addWidget( m_navBtnFirst = new TQToolButton(this) ); m_navBtnFirst->setFixedWidth(bw); - m_navBtnFirst->setFocusPolicy(TQ_NoFocus); + m_navBtnFirst->setFocusPolicy(TQWidget::NoFocus); m_navBtnFirst->setIconSet( SmallIconSet("navigator_first") ); TQToolTip::add(m_navBtnFirst, i18n("First row")); d->lyr->addWidget( m_navBtnPrev = new TQToolButton(this) ); m_navBtnPrev->setFixedWidth(bw); - m_navBtnPrev->setFocusPolicy(TQ_NoFocus); + m_navBtnPrev->setFocusPolicy(TQWidget::NoFocus); m_navBtnPrev->setIconSet( SmallIconSet("navigator_prev") ); m_navBtnPrev->setAutoRepeat(true); TQToolTip::add(m_navBtnPrev, i18n("Previous row")); @@ -103,7 +103,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addWidget( m_navRecordNumber = new KLineEdit(this) ); m_navRecordNumber->setAlignment(AlignRight | AlignVCenter); - m_navRecordNumber->setFocusPolicy(TQ_ClickFocus); + m_navRecordNumber->setFocusPolicy(TQWidget::ClickFocus); m_navRecordNumber->installEventFilter(this); // m_navRowNumber->setFixedWidth(fw); m_navRecordNumberValidator = new TQIntValidator(1, INT_MAX, TQT_TQOBJECT(this)); @@ -116,7 +116,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const lbl_of->setMaximumWidth(fm.width(lbl_of->text())+8); lbl_of->setReadOnly(true); lbl_of->setLineWidth(0); - lbl_of->setFocusPolicy(TQ_NoFocus); + lbl_of->setFocusPolicy(TQWidget::NoFocus); lbl_of->setAlignment(AlignCenter); d->lyr->addWidget( lbl_of ); @@ -124,7 +124,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const m_navRecordCount->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); m_navRecordCount->setReadOnly(true); m_navRecordCount->setLineWidth(0); - m_navRecordCount->setFocusPolicy(TQ_NoFocus); + m_navRecordCount->setFocusPolicy(TQWidget::NoFocus); m_navRecordCount->setAlignment(AlignLeft | AlignVCenter); TQToolTip::add(m_navRecordCount, i18n("Number of rows")); @@ -135,21 +135,21 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addWidget( m_navBtnNext = new TQToolButton(this) ); m_navBtnNext->setFixedWidth(bw); - m_navBtnNext->setFocusPolicy(TQ_NoFocus); + m_navBtnNext->setFocusPolicy(TQWidget::NoFocus); m_navBtnNext->setIconSet( SmallIconSet("navigator_next") ); m_navBtnNext->setAutoRepeat(true); TQToolTip::add(m_navBtnNext, i18n("Next row")); d->lyr->addWidget( m_navBtnLast = new TQToolButton(this) ); m_navBtnLast->setFixedWidth(bw); - m_navBtnLast->setFocusPolicy(TQ_NoFocus); + m_navBtnLast->setFocusPolicy(TQWidget::NoFocus); m_navBtnLast->setIconSet( SmallIconSet("navigator_last") ); TQToolTip::add(m_navBtnLast, i18n("Last row")); d->lyr->addSpacing( 6 ); d->lyr->addWidget( m_navBtnNew = new TQToolButton(this) ); m_navBtnNew->setFixedWidth(bw); - m_navBtnNew->setFocusPolicy(TQ_NoFocus); + m_navBtnNew->setFocusPolicy(TQWidget::NoFocus); m_navBtnNew->setIconSet( SmallIconSet("navigator_new") ); TQToolTip::add(m_navBtnNew, i18n("New row")); m_navBtnNext->setEnabled(isInsertingEnabled()); diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp index 2a36ef09..1e8d6d80 100644 --- a/kexi/widget/utils/kexitooltip.cpp +++ b/kexi/widget/utils/kexitooltip.cpp @@ -35,7 +35,7 @@ KexiToolTip::KexiToolTip(const TQVariant& value, TQWidget* parent) , m_value(value) { setPalette( TQToolTip::palette() ); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); } KexiToolTip::~KexiToolTip() diff --git a/kformula/kformula_view.cpp b/kformula/kformula_view.cpp index 2d93ce5d..1c7e044c 100644 --- a/kformula/kformula_view.cpp +++ b/kformula/kformula_view.cpp @@ -65,8 +65,8 @@ KFormulaPartView::KFormulaPartView(KFormulaDoc* _doc, TQWidget* _parent, const c scrollview->addChild(formulaWidget); scrollview->viewport()->setFocusProxy( scrollview ); - scrollview->viewport()->setFocusPolicy( TQ_WheelFocus ); - scrollview->setFocusPolicy( TQ_NoFocus ); + scrollview->viewport()->setFocusPolicy( TQWidget::WheelFocus ); + scrollview->setFocusPolicy( TQWidget::NoFocus ); formulaWidget->setFocus(); // Nice parts start in read only mode. diff --git a/kformula/kformulawidget.cpp b/kformula/kformulawidget.cpp index b505d817..05ada79f 100644 --- a/kformula/kformulawidget.cpp +++ b/kformula/kformulawidget.cpp @@ -43,7 +43,7 @@ KFormulaWidget::KFormulaWidget(KFormula::Container* doc, connect(&formulaView, TQT_SIGNAL(cursorChanged(bool, bool)), this, TQT_SLOT(slotCursorChanged(bool, bool))); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setBackgroundMode(NoBackground/*TQWidget::PaletteBase*/); TQRect rect = doc->boundingRect(); diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp index b8c010e9..e6a192fe 100644 --- a/kivio/kiviopart/kivio_canvas.cpp +++ b/kivio/kiviopart/kivio_canvas.cpp @@ -66,7 +66,7 @@ KivioCanvas::KivioCanvas( TQWidget *par, KivioView* view, KivioDoc* doc, TQScrol setBackgroundMode(NoBackground); setAcceptDrops(true); setMouseTracking(true); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFocus(); m_showConnectorTargets = false; diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp index 94b37ae3..1c6954bc 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -50,7 +50,7 @@ void KivioStackBar::insertPage( TQWidget* w, const TQString& title ) } w->hide(); - w->setFocusPolicy(TQ_NoFocus); + w->setFocusPolicy(TQWidget::NoFocus); setMinimumWidth( TQMAX(minimumSize().width(),w->minimumSize().width() ) ); setMaximumWidth( TQMAX(maximumSize().width(),w->maximumSize().width() ) ); diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index b4a3db8f..0b20e35c 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -215,7 +215,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) m_pCanvas = new KivioCanvas(canvasBase,this,doc,m_vertScrollBar,m_horzScrollBar); canvasBase->addWidget(m_pCanvas,0); canvasBase->raiseWidget(m_pCanvas); - m_pCanvas->setFocusPolicy(TQ_StrongFocus); + m_pCanvas->setFocusPolicy(TQWidget::StrongFocus); // Rulers vRuler = new KoRuler(pRightSide, m_pCanvas, Qt::Vertical, Kivio::Config::defaultPageLayout(), @@ -254,7 +254,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) layout->setRowStretch(1, 10); layout->setColStretch(1, 10); - TQWidget::setFocusPolicy( TQ_StrongFocus ); + TQWidget::setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( m_pCanvas ); connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) ); diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 6ced7680..211a04e3 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -216,7 +216,7 @@ Navigator::Navigator(bool _selectable, TDEPopupMenu * menu, IconSidePane *_icons executedItem = 0; mMouseOn = 0; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); connect( this, TQT_SIGNAL( clicked( TQListBoxItem* ) ), TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); @@ -495,7 +495,7 @@ int IconSidePane::insertGroup(const TQString &_text, bool _selectable, TQObject m_buttongroup->insert( b, id ); connect( b, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonClicked() ) ); b->setToggleButton( true ); - b->setFocusPolicy( TQ_NoFocus ); + b->setFocusPolicy( TQWidget::NoFocus ); if (m_buttongroup->count()==1) { mCurrentNavigator->calculateMinWidth(); diff --git a/kplato/kptdatetable.cpp b/kplato/kptdatetable.cpp index ea8e16af..7184350e 100644 --- a/kplato/kptdatetable.cpp +++ b/kplato/kptdatetable.cpp @@ -90,7 +90,7 @@ DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f) kdError() <<k_funcinfo<<"Given date is invalid, using current date." << endl; date_=TQDate::currentDate(); } - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setNumCols(7+m_dateStartCol); // 7 days a week + maybe 1 for weeknumbers setNumRows(7); // 6 weeks max + headline diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 0c119b80..7903e2b7 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -152,7 +152,7 @@ KPrCanvas::KPrCanvas( TQWidget *parent, const char *name, KPrView *_view ) hide(); } - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); setKeyCompression( true ); setInputMethodEnabled( true ); // ensure using the InputMethod diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp index 95114726..97467e7a 100644 --- a/kpresenter/KPrPicturePreview.cpp +++ b/kpresenter/KPrPicturePreview.cpp @@ -44,7 +44,7 @@ void KPrPicturePreview::drawContents( TQPainter *painter ) TQSize ext = contentsRect().size(); TQPixmap _pix = origPixmap; - TQImage img( _pix.convertToImage().smoothScale( ext.width(),ext.height(), TQ_ScaleMin ) ); + TQImage img( _pix.convertToImage().smoothScale( ext.width(),ext.height(), TQImage::ScaleMin ) ); bool _horizontal = false; bool _vertical = false; diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index e201fecb..5d2a6e75 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -545,7 +545,7 @@ TQPixmap KPrThumbBar::getSlideThumb(int slideNr) const h = 130; } - const TQImage img(pix.convertToImage().smoothScale( w, h, TQ_ScaleMin )); + const TQImage img(pix.convertToImage().smoothScale( w, h, TQImage::ScaleMin )); pix.convertFromImage(img); // draw a frame around the thumb to show its size diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index 0a276a5a..7d5c4eae 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -83,7 +83,7 @@ void KPrEffectPreview::setPixmap( const TQPixmap& pixmap ) setMinimumSize( w, h ); // create smaller pixmap for preview - const TQImage img( pixmap.convertToImage().smoothScale( w, h, TQ_ScaleFree ) ); + const TQImage img( pixmap.convertToImage().smoothScale( w, h, TQImage::ScaleFree ) ); m_pixmap.convertFromImage( img ); TQLabel::setPixmap( m_pixmap ); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 67a2596f..59da1ddd 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -1575,7 +1575,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) m_canvas->reparent( ( TQWidget* )0L, 0, TQPoint( 0, 0 ), FALSE ); m_canvas->setPaletteBackgroundColor( TQt::white ); m_canvas->showFullScreen(); - m_canvas->setFocusPolicy( TQ_StrongFocus ); + m_canvas->setFocusPolicy( TQWidget::StrongFocus ); if ( !kPresenterDoc()->spManualSwitch() ) { diff --git a/kspread/kspread_canvas.cpp b/kspread/kspread_canvas.cpp index 0518e274..511e5e0c 100644 --- a/kspread/kspread_canvas.cpp +++ b/kspread/kspread_canvas.cpp @@ -213,7 +213,7 @@ Canvas::Canvas (View *_view) d->chooseCell = false; d->validationInfo = 0L; - TQWidget::setFocusPolicy( TQ_StrongFocus ); + TQWidget::setFocusPolicy( TQWidget::StrongFocus ); d->dragStart = TQPoint( -1, -1 ); d->dragging = false; diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 5561bb73..21420e12 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -1960,7 +1960,7 @@ void View::initView() // The line-editor that appears above the sheet and allows to // edit the cells content. It knows about the two buttons. d->editWidget = new EditWidget( d->toolWidget, d->canvas, d->cancelButton, d->okButton ); - d->editWidget->setFocusPolicy( TQ_StrongFocus ); + d->editWidget->setFocusPolicy( TQWidget::StrongFocus ); d->formulaBarLayout->addWidget( d->editWidget, 2 ); d->formulaBarLayout->addSpacing( 2 ); @@ -1971,8 +1971,8 @@ void View::initView() d->hBorderWidget->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); d->vBorderWidget->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - d->canvas->setFocusPolicy( TQ_StrongFocus ); - TQWidget::setFocusPolicy( TQ_StrongFocus ); + d->canvas->setFocusPolicy( TQWidget::StrongFocus ); + TQWidget::setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( d->canvas ); connect( this, TQT_SIGNAL( invalidated() ), d->canvas, TQT_SLOT( update() ) ); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index d7c0ce76..e0eb620a 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -82,7 +82,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char calc_display->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken ); calc_display->setAlignment( AlignRight|AlignVCenter ); calc_display->setFocus(); - calc_display->setFocusPolicy( TQ_StrongFocus ); + calc_display->setFocusPolicy( TQWidget::StrongFocus ); connect(calc_display,TQT_SIGNAL(clicked()),this,TQT_SLOT(display_selected())); diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index a7028ae5..c1623518 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -88,7 +88,7 @@ KudesignerView::KudesignerView( KudesignerDoc* part, TQWidget* parent, const cha l->addWidget( m_view ); m_view->viewport() ->setFocusProxy( m_view ); - m_view->viewport() ->setFocusPolicy( TQ_WheelFocus ); + m_view->viewport() ->setFocusPolicy( TQWidget::WheelFocus ); m_view->setFocus(); m_view->itemToInsert = 0; diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index d1040574..602255ed 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -36,7 +36,7 @@ KugarView::KugarView( KugarPart *part, TQWidget *parent, const char *name ) ( new TQVBoxLayout( this ) ) ->setAutoAdd( true ); view = new Kugar::MReportViewer( part->reportEngine(), this ); - view -> setFocusPolicy( TQ_ClickFocus ); + view -> setFocusPolicy( TQWidget::ClickFocus ); view -> show(); // setWidget(view); diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 044801ae..6dc6bbb3 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -115,7 +115,7 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW this, TQT_SLOT( doAutoScroll() ) ); viewport()->setFocusProxy( this ); - viewport()->setFocusPolicy( TQ_WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); setInputMethodEnabled( true ); setFocus(); viewport()->installEventFilter( this ); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index fb96aa8d..7100a562 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -7662,7 +7662,7 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) setKeyCompression( TRUE ); setAcceptDrops( TRUE ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } void KWGUI::showGUI() diff --git a/lib/kformula/kformulawidget.cpp b/lib/kformula/kformulawidget.cpp index 68f941d9..e827537e 100644 --- a/lib/kformula/kformulawidget.cpp +++ b/lib/kformula/kformulawidget.cpp @@ -44,7 +44,7 @@ KFormulaWidget::KFormulaWidget(Container* doc, TQWidget* parent, const char* nam connect(&formulaView, TQT_SIGNAL(cursorChanged(bool, bool)), this, TQT_SLOT(slotCursorChanged(bool, bool))); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setBackgroundMode(NoBackground/*TQWidget::PaletteBase*/); TQRect rect = doc->boundingRect(); diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 03a70b5b..35b518ac 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -112,7 +112,7 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, for (KoTemplate* t = group->first(); t != 0L; t = group->next()) { TDEListViewItem* item = new TDEListViewItem(m_documentList, t->name(), t->description(), t->file()); TQImage icon = t->loadPicture(instance).convertToImage(); - icon = icon.smoothScale(64, 64, TQ_ScaleMin); + icon = icon.smoothScale(64, 64, TQImage::ScaleMin); icon.setAlphaBuffer(true); icon = icon.copy((icon.width() - 64) / 2, (icon.height() - 64) / 2, 64, 64); item->setPixmap(0, TQPixmap(icon)); @@ -418,7 +418,7 @@ void KoRecentDocumentsPane::updatePreview(const KFileItem* fileItem, const TQPix if(it.current()->text(1) == fileItem->url().url()) { it.current()->setPixmap(2, preview); TQImage icon = preview.convertToImage(); - icon = icon.smoothScale(64, 64, TQ_ScaleMin); + icon = icon.smoothScale(64, 64, TQImage::ScaleMin); icon.setAlphaBuffer(true); icon = icon.copy((icon.width() - 64) / 2, (icon.height() - 64) / 2, 64, 64); it.current()->setPixmap(0, TQPixmap(icon)); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index e465ce77..3f32927e 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -173,7 +173,7 @@ public: TDEGlobal::iconLoader()->addAppDir("koffice"); m_view = 0L; // Avoid warning from KParts - we'll have the KoView as focus proxy anyway - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); } virtual ~KoViewWrapperWidget() { diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 130226be..3d7ff56e 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -275,7 +275,7 @@ TQListViewItem* KoOpenPane::addPane(const TQString& title, const TQPixmap& icon, TQImage image = icon.convertToImage(); if((image.width() > 48) || (image.height() > 48)) { - image = image.smoothScale(48, 48, TQ_ScaleMin); + image = image.smoothScale(48, 48, TQImage::ScaleMin); } image.setAlphaBuffer(true); diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index 2d0ba529..7e86257b 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -61,7 +61,7 @@ const TQPixmap &KoTemplate::loadPicture( TDEInstance* instance ) { } const int maxHeightWidth = 128; // ### TODO: some people would surely like to have 128x128 if (img.width() > maxHeightWidth || img.height() > maxHeightWidth) { - img = img.smoothScale( maxHeightWidth, maxHeightWidth, TQ_ScaleMax ); + img = img.smoothScale( maxHeightWidth, maxHeightWidth, TQImage::ScaleMax ); } m_pixmap.convertFromImage(img); return m_pixmap; diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 94941259..322c1a7d 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -116,7 +116,7 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) d->m_doc = document; KParts::PartBase::setPartObject( TQT_TQOBJECT(this) ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setMouseTracking( true ); diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index d9d22278..b530a93c 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -388,7 +388,7 @@ KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent ) setMinimumSize( 180, 180 ); m_isSticky = false; - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); connect( m_close, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( wantsToBeClosed() ) ); connect( m_sticky, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( setSticky( bool ) ) ); diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index 69a6326e..fc32a2a7 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -148,7 +148,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, if ( tabs & FORMAT_AND_BORDERS ) setupTab1( true ); if ( tabs & HEADER_AND_FOOTER ) setupTab2( hf ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); } @@ -176,7 +176,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, if ( tabs & COLUMNS ) setupTab3(); if ( tabs & KW_HEADER_AND_FOOTER ) setupTab4(kwhf); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); } diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 4ede56d9..3adcaca8 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -458,7 +458,7 @@ void KoColorPanel::finalizeInsertion( const Position& pos ) paint( pos ); if ( !isFocusEnabled() ) - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); // Did we start a new row? if ( m_nextPosition.x == 1 ) updateGeometry(); @@ -599,7 +599,7 @@ void KoColorPanel::paint( const Position& position ) void KoColorPanel::init() { - setFocusPolicy( TQ_NoFocus ); // it's empty + setFocusPolicy( TQWidget::NoFocus ); // it's empty m_nextPosition.x = 0; m_nextPosition.y = 0; m_focusPosition.x = -1; diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index 6aaab739..8188919e 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -97,7 +97,7 @@ TTDEToolBarButton::TTDEToolBarButton( const TQString& icon, const TQString& txt, d->m_text = txt; d->m_instance = instance; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()) ); connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); @@ -115,7 +115,7 @@ TTDEToolBarButton::TTDEToolBarButton( const TQPixmap& pixmap, const TQString& tx d = new TTDEToolBarButtonPrivate; d->m_text = txt; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()) ); connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); diff --git a/lib/kopainter/ko_cmyk_widget.cpp b/lib/kopainter/ko_cmyk_widget.cpp index af2136f9..21c96abe 100644 --- a/lib/kopainter/ko_cmyk_widget.cpp +++ b/lib/kopainter/ko_cmyk_widget.cpp @@ -48,22 +48,22 @@ KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, n mCSlider = new KoColorSlider(this); mCSlider->setMaximumHeight(20); mCSlider->slotSetRange(0, 255); - mCSlider->setFocusPolicy( TQ_ClickFocus ); + mCSlider->setFocusPolicy( TQWidget::ClickFocus ); mMSlider = new KoColorSlider(this); mMSlider->setMaximumHeight(20); mMSlider->slotSetRange(0, 255); - mMSlider->setFocusPolicy( TQ_ClickFocus ); + mMSlider->setFocusPolicy( TQWidget::ClickFocus ); mYSlider = new KoColorSlider(this); mYSlider->setMaximumHeight(20); mYSlider->slotSetRange(0, 255); - mYSlider->setFocusPolicy( TQ_ClickFocus ); + mYSlider->setFocusPolicy( TQWidget::ClickFocus ); mKSlider = new KoColorSlider(this); mKSlider->setMaximumHeight(20); mKSlider->slotSetRange(0, 255); - mKSlider->setFocusPolicy( TQ_ClickFocus ); + mKSlider->setFocusPolicy( TQWidget::ClickFocus ); /* setup slider labels */ mCLabel = new TQLabel("C", this); @@ -83,25 +83,25 @@ KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, n mCIn = new TQSpinBox(0, 255, 1, this); mCIn->setFixedWidth(50); mCIn->setFixedHeight(20); - mCIn->setFocusPolicy( TQ_ClickFocus ); + mCIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mCIn, i18n( "Cyan" ) ); mMIn = new TQSpinBox(0, 255, 1, this); mMIn->setFixedWidth(50); mMIn->setFixedHeight(20); - mMIn->setFocusPolicy( TQ_ClickFocus ); + mMIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mMIn, i18n( "Magenta" ) ); mYIn = new TQSpinBox(0, 255, 1, this); mYIn->setFixedWidth(50); mYIn->setFixedHeight(20); - mYIn->setFocusPolicy( TQ_ClickFocus ); + mYIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mYIn, i18n( "Yellow" ) ); mKIn = new TQSpinBox(0, 255, 1, this); mKIn->setFixedWidth(50); mKIn->setFixedHeight(20); - mKIn->setFocusPolicy( TQ_ClickFocus ); + mKIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mKIn, i18n( "Black" ) ); mGrid->addMultiCellWidget(m_ColorButton, 0, 4, 0, 0, TQt::AlignTop); diff --git a/lib/kopainter/ko_gray_widget.cpp b/lib/kopainter/ko_gray_widget.cpp index af09dfa0..16a65aa2 100644 --- a/lib/kopainter/ko_gray_widget.cpp +++ b/lib/kopainter/ko_gray_widget.cpp @@ -41,7 +41,7 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n /* setup color sliders */ mSlider = new KoColorSlider(this); - mSlider->setFocusPolicy( TQ_ClickFocus ); + mSlider->setFocusPolicy( TQWidget::ClickFocus ); mSlider->setMaximumHeight(20); mSlider->slotSetRange(0, 255); mSlider->slotSetColor1(TQColor(255, 255, 255)); @@ -56,7 +56,7 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n mIn = new TQSpinBox(0, 255, 1, this); mIn->setFixedWidth(50); mIn->setFixedHeight(20); - mIn->setFocusPolicy( TQ_ClickFocus ); + mIn->setFocusPolicy( TQWidget::ClickFocus ); mGrid->addMultiCellWidget(m_ColorButton, 0, 3, 0, 0, TQt::AlignTop); mGrid->addWidget(mLabel, 0, 1); diff --git a/lib/kopainter/ko_hsv_widget.cpp b/lib/kopainter/ko_hsv_widget.cpp index 8d77bedc..148d51be 100644 --- a/lib/kopainter/ko_hsv_widget.cpp +++ b/lib/kopainter/ko_hsv_widget.cpp @@ -56,17 +56,17 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam /* setup spin box */ mHIn = new TQSpinBox(0, 359, 1, this); mHIn->setFixedSize(50, 20); - mHIn->setFocusPolicy( TQ_ClickFocus ); + mHIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mHIn, i18n( "Hue" ) ); mSIn = new TQSpinBox(0, 255, 1, this); mSIn->setFixedSize(50, 20); - mSIn->setFocusPolicy( TQ_ClickFocus ); + mSIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mSIn, i18n( "Saturation" ) ); mVIn = new TQSpinBox(0, 255, 1, this); mVIn->setFixedSize(50, 20); - mVIn->setFocusPolicy( TQ_ClickFocus ); + mVIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mVIn, i18n( "Value (brightness)" ) ); mGrid->addMultiCellWidget(m_ColorButton, 0, 0, 0, 1, TQt::AlignTop); diff --git a/lib/kopainter/ko_rgb_widget.cpp b/lib/kopainter/ko_rgb_widget.cpp index 7680d50a..22fb9772 100644 --- a/lib/kopainter/ko_rgb_widget.cpp +++ b/lib/kopainter/ko_rgb_widget.cpp @@ -45,17 +45,17 @@ KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, nam mRSlider = new KoColorSlider(this); mRSlider->setMaximumHeight(20); mRSlider->slotSetRange(0, 255); - mRSlider->setFocusPolicy( TQ_ClickFocus ); + mRSlider->setFocusPolicy( TQWidget::ClickFocus ); mGSlider = new KoColorSlider(this); mGSlider->setMaximumHeight(20); mGSlider->slotSetRange(0, 255); - mGSlider->setFocusPolicy( TQ_ClickFocus ); + mGSlider->setFocusPolicy( TQWidget::ClickFocus ); mBSlider = new KoColorSlider(this); mBSlider->setMaximumHeight(20); mBSlider->slotSetRange(0, 255); - mBSlider->setFocusPolicy( TQ_ClickFocus ); + mBSlider->setFocusPolicy( TQWidget::ClickFocus ); /* setup slider labels */ mRLabel = new TQLabel("R:", this); @@ -72,19 +72,19 @@ KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, nam mRIn = new TQSpinBox(0, 255, 1, this); mRIn->setFixedWidth(50); mRIn->setFixedHeight(20); - mRIn->setFocusPolicy( TQ_ClickFocus ); + mRIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mRIn, i18n( "Red" ) ); mGIn = new TQSpinBox(0, 255, 1, this); mGIn->setFixedWidth(50); mGIn->setFixedHeight(20); - mGIn->setFocusPolicy( TQ_ClickFocus ); + mGIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mGIn, i18n( "Green" ) ); mBIn = new TQSpinBox(0, 255, 1, this); mBIn->setFixedWidth(50); mBIn->setFixedHeight(20); - mBIn->setFocusPolicy( TQ_ClickFocus ); + mBIn->setFocusPolicy( TQWidget::ClickFocus ); TQToolTip::add( mBIn, i18n( "Blue" ) ); mGrid->addMultiCellWidget(m_ColorButton, 0, 3, 0, 0, TQt::AlignTop); diff --git a/lib/kopalette/kopalette.cpp b/lib/kopalette/kopalette.cpp index cd392205..4c69aa59 100644 --- a/lib/kopalette/kopalette.cpp +++ b/lib/kopalette/kopalette.cpp @@ -49,7 +49,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name) setCloseMode( TQDockWindow::Never); setResizeEnabled(true); setOpaqueMoving(true); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setVerticallyStretchable(false); setHorizontallyStretchable(false); diff --git a/lib/kopalette/kotabpalette.cpp b/lib/kopalette/kotabpalette.cpp index 0e798842..cbf96336 100644 --- a/lib/kopalette/kotabpalette.cpp +++ b/lib/kopalette/kotabpalette.cpp @@ -32,7 +32,7 @@ KoTabPalette::KoTabPalette(TQWidget * parent, const char * name) { m_page = new KTabWidget(this); m_page->setTabShape(TQTabWidget::Triangular); - m_page->setFocusPolicy(TQ_TabFocus); + m_page->setFocusPolicy(TQWidget::TabFocus); //m_page->setFont(m_font); m_page->setMargin(1); //m_page->setTabReorderingEnabled(true); diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 2dc05f48..c6ebe14f 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -135,8 +135,8 @@ Editor::Editor(TQWidget *parent, bool autoSync, const char *name) d->setListLater_list = 0; d->undoButton = new TQPushButton(viewport()); - d->undoButton->setFocusPolicy(TQ_NoFocus); - setFocusPolicy(TQ_ClickFocus); + d->undoButton->setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQWidget::ClickFocus); d->undoButton->setMinimumSize(TQSize(5,5)); // allow to resize undoButton even below pixmap size d->undoButton->setPixmap(SmallIcon("edit-undo")); TQToolTip::add(d->undoButton, i18n("Undo changes")); diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index fbeb58d5..0e14bf27 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -42,7 +42,7 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name) { m_toggle = new TQToolButton(this); m_toggle->setToggleButton( true ); - m_toggle->setFocusPolicy(TQ_WheelFocus); + m_toggle->setFocusPolicy(TQWidget::WheelFocus); m_toggle->setUsesTextLabel(true); m_toggle->setTextPosition(TQToolButton::Right); m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp index 3b2bfce0..f3cb2a2a 100644 --- a/lib/koproperty/editors/coloredit.cpp +++ b/lib/koproperty/editors/coloredit.cpp @@ -34,7 +34,7 @@ ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); - m_edit->setFocusPolicy(TQ_NoFocus); + m_edit->setFocusPolicy(TQWidget::NoFocus); connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 80a3d528..0ea29b6e 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -52,7 +52,7 @@ class FontEditRequester : public TDEFontRequester label()->setFrameShape(TQFrame::Box); label()->setIndent(-1); #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) - label()->setFocusPolicy(TQ_ClickFocus); + label()->setFocusPolicy(TQWidget::ClickFocus); TDEAcceleratorManager::setNoAccel(label()); #endif layout()->remove(label()); @@ -60,7 +60,7 @@ class FontEditRequester : public TDEFontRequester delete layout(); button()->setText(i18n("...")); TQToolTip::add(button(), i18n("Change font")); - button()->setFocusPolicy(TQ_NoFocus); + button()->setFocusPolicy(TQWidget::NoFocus); button()->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQFontMetrics fm(button()->font()); button()->setFixedWidth(fm.width(button()->text()+' ')); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 4e295c96..6fdc5f62 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -70,7 +70,7 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name) m_button->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQFontMetrics fm(m_button->font()); m_button->setFixedWidth(fm.width(m_button->text()+' ')); - m_button->setFocusPolicy(TQ_NoFocus); + m_button->setFocusPolicy(TQWidget::NoFocus); m_popup = new TQLabel(0, "m_popup", TQt::WStyle_Customize|TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop); m_popup->setPaletteBackgroundColor(m_popup->palette().active().base()); @@ -105,13 +105,13 @@ PixmapEdit::setValue(const TQVariant &value, bool emitChange) else { TQImage img(m_pixmap.convertToImage()); if (!TQRect(TQPoint(0,0), m_edit->size()*3).contains(m_pixmap.rect())) { - img = img.smoothScale(m_edit->size()*3, TQ_ScaleMin); + img = img.smoothScale(m_edit->size()*3, TQImage::ScaleMin); m_previewPixmap.convertFromImage(img);//preview pixmap is a bit larger } else { m_previewPixmap = m_pixmap; } - img = img.smoothScale(m_edit->size(), TQ_ScaleMin); + img = img.smoothScale(m_edit->size(), TQImage::ScaleMin); TQPixmap pm; pm.convertFromImage(img); m_edit->setPixmap(pm); @@ -135,7 +135,7 @@ PixmapEdit::drawViewer(TQPainter *p, const TQColorGroup &, const TQRect &r, cons m_scaledPixmap = value.toPixmap(); if (m_scaledPixmap.height() > r2.height() || m_scaledPixmap.width() > r2.width()) { //scale down TQImage img(m_scaledPixmap.convertToImage()); - img = img.smoothScale(r2.size()/*+TQSize(0,2)*/, TQ_ScaleMin); + img = img.smoothScale(r2.size()/*+TQSize(0,2)*/, TQImage::ScaleMin); m_scaledPixmap.convertFromImage(img); } } diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp index c355c28b..1e4a3cef 100644 --- a/lib/koproperty/editors/pointedit.cpp +++ b/lib/koproperty/editors/pointedit.cpp @@ -39,7 +39,7 @@ PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name) { setHasBorders(false); m_edit = new KActiveLabel(this); - m_edit->setFocusPolicy(TQ_NoFocus); + m_edit->setFocusPolicy(TQWidget::NoFocus); // m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); m_edit->setPaletteBackgroundColor(palette().active().base()); m_edit->setWordWrap( TQTextEdit::NoWrap ); diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp index f9a77314..fabc59b8 100644 --- a/lib/koproperty/editors/rectedit.cpp +++ b/lib/koproperty/editors/rectedit.cpp @@ -38,7 +38,7 @@ RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name) { setHasBorders(false); m_edit = new KActiveLabel(this); - m_edit->setFocusPolicy(TQ_NoFocus); + m_edit->setFocusPolicy(TQWidget::NoFocus); m_edit->setPaletteBackgroundColor(palette().active().base()); m_edit->setWordWrap( TQTextEdit::NoWrap ); m_edit->setMinimumHeight(5); diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp index e5a37f6d..3aefe3c4 100644 --- a/lib/koproperty/editors/sizeedit.cpp +++ b/lib/koproperty/editors/sizeedit.cpp @@ -39,7 +39,7 @@ SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name) { setHasBorders(false); m_edit = new KActiveLabel(this); - m_edit->setFocusPolicy(TQ_NoFocus); + m_edit->setFocusPolicy(TQWidget::NoFocus); // m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); m_edit->setPaletteBackgroundColor(palette().active().base()); // m_edit->setBackgroundMode(TQt::PaletteBase); diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp index 2028e75c..1e1593db 100644 --- a/lib/koproperty/widget.cpp +++ b/lib/koproperty/widget.cpp @@ -152,7 +152,7 @@ void Widget::setFocusWidget(TQWidget*focusProxy) { if (focusProxy) { - if (focusProxy->focusPolicy() != TQ_NoFocus) + if (focusProxy->focusPolicy() != TQWidget::NoFocus) setFocusProxy(focusProxy); focusProxy->installEventFilter(this); } diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index 037d87f1..414d848e 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -52,7 +52,7 @@ KoCompletionBox::KoCompletionBox( TQWidget * parent, const char * name, WFlags f : TQLabel(parent,name,f) { setBackgroundColor(TQColor("#FFFFE6")); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setFrameShape(TQFrame::Box); } |