7 files changed, 11 insertions, 11 deletions
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);