Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <[email protected]>

26 files changed, 50 insertions, 50 deletions

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);
 }