Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit b8cb47c3d328d373abefcff6ac2bd7b75020f8be)

14 files changed, 15 insertions, 15 deletions

diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp
index 38a362e7..4b96a2ca 100644
--- a/arts/builder/mwidget.cpp
+++ b/arts/builder/mwidget.cpp
@@ -627,7 +627,7 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n
 	setTableFlags(Tbl_autoScrollBars);
 	setZoom(100);
 
-	setFocusPolicy( TQ_NoFocus );
+	setFocusPolicy( TQWidget::NoFocus );
 
 	arts_debug("PORT: mw; bgmode");
 	setBackgroundMode(NoBackground);
diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index 9038d162..4b432e73 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -1446,7 +1446,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
         sb->resize( sb->sizeHint() ); // height is irrelevant
 	TQ_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
-	sb->setFocusPolicy( TQ_NoFocus );
+	sb->setFocusPolicy( TQWidget::NoFocus );
 	connect( sb, TQT_SIGNAL(valueChanged(int)),
 		 TQT_SLOT(verSbValue(int)));
 	connect( sb, TQT_SIGNAL(sliderMoved(int)),
@@ -1475,7 +1475,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
 	sb->setCursor( arrowCursor );
 #endif
 	sb->resize( sb->sizeHint() ); // width is irrelevant
-	sb->setFocusPolicy( TQ_NoFocus );
+	sb->setFocusPolicy( TQWidget::NoFocus );
 	TQ_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
 	connect( sb, TQT_SIGNAL(valueChanged(int)),
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index 538eb4ac..aefa80c1 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -223,7 +223,7 @@ void KPoti::init(int value)
   m_bLabel = true;
   tickInt = 0;
 
-  setFocusPolicy( TQ_TabFocus );
+  setFocusPolicy( TQWidget::TabFocus );
   initTicks();
 }
 
diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp
index ef3cd993..95af83e5 100644
--- a/juk/covermanager.cpp
+++ b/juk/covermanager.cpp
@@ -371,7 +371,7 @@ TQPixmap CoverManager::coverFromData(const CoverData &coverData, Size size)
     if(size == Thumbnail) {
         // Convert to image for smoothScale()
         TQImage image = pix->convertToImage();
-        pix->convertFromImage(image.smoothScale(80, 80, TQ_ScaleMin));
+        pix->convertFromImage(image.smoothScale(80, 80, TQImage::ScaleMin));
     }
 
     TQPixmap returnValue = *pix; // Save it early.
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index e9086f00..e5f344a6 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -123,7 +123,7 @@ void CoverItem::update(const FileHandle &file)
     if(file.coverInfo()->hasCover()) {
         show();
         TQImage image = file.coverInfo()->pixmap(CoverInfo::Thumbnail).convertToImage();
-        setPixmap(image.smoothScale(imageSize, imageSize, TQ_ScaleMin));
+        setPixmap(image.smoothScale(imageSize, imageSize, TQImage::ScaleMin));
     }
     else
         hide();
diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp
index 561331d0..24de828d 100644
--- a/juk/slideraction.cpp
+++ b/juk/slideraction.cpp
@@ -41,7 +41,7 @@ class TrackPositionSlider : public TQSlider
 public:
     TrackPositionSlider(TQWidget *parent, const char *name) : TQSlider(parent, name)
     {
-        setFocusPolicy(TQ_NoFocus);
+        setFocusPolicy(TQWidget::NoFocus);
     }
 
 protected:
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index 5fd110d8..9f6c9744 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -228,7 +228,7 @@ void CoverIconViewItem::imageResult(TDEIO::Job *job)
         return;
 
     TQPixmap iconImage(m_buffer);
-    iconImage = TQImage(iconImage.convertToImage()).smoothScale(80, 80, TQ_ScaleMin);
+    iconImage = TQImage(iconImage.convertToImage()).smoothScale(80, 80, TQImage::ScaleMin);
     setPixmap(iconImage, true, true);
 }
 
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index 7cf14afc..e5bcf305 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -77,7 +77,7 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
 	connect(video, TQT_SIGNAL(mouseButtonDoubleClick(const TQPoint&, int)), this, TQT_SLOT(slotDblClick(const TQPoint &, int) ) ) ;
 
 	TQWidget *sliderBox = new TQWidget(box);
-	sliderBox->setFocusPolicy(TQ_ClickFocus);
+	sliderBox->setFocusPolicy(TQWidget::ClickFocus);
 	sliderBox->setAcceptDrops(true);
 
 	TQHBoxLayout *layout = new TQHBoxLayout(sliderBox);
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index fd151717..5e344959 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -68,7 +68,7 @@ void KSmallSlider::init()
     //track = TRUE;
     //setMouseTracking(true);
     grayed = false;
-    setFocusPolicy( TQ_TabFocus  );
+    setFocusPolicy( TQWidget::TabFocus  );
 
     colHigh = TQColor(0,255,0);
     colLow = TQColor(255,0,0);
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 73eb0ed4..df4eeabf 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -210,7 +210,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
 
   setDocking(Prefs::docking());
 
-  setFocusPolicy(TQ_NoFocus);
+  setFocusPolicy(TQWidget::NoFocus);
 
   songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
   adjustSize();
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index da0590ce..2a7953d3 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -334,7 +334,7 @@ void NoatunSystray::updateCover()
 		if(src.load(cover))
 		{
 			if(src.width() >= COVER_MAXW || src.height() >= COVER_MAXH)
-				tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQ_ScaleMin);
+				tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQImage::ScaleMin);
 			else
 				tmpimg = src;
 
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index 4cdef1ec..a9e68a2a 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -126,7 +126,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
     newSong();
 
     // HACK: We won't get focus events otherwise
-    setFocusPolicy(TQ_ClickFocus);
+    setFocusPolicy(TQWidget::ClickFocus);
 
     show();
 }
diff --git a/tdemid/ktrianglebutton.cpp b/tdemid/ktrianglebutton.cpp
index 5bda855f..34551627 100644
--- a/tdemid/ktrianglebutton.cpp
+++ b/tdemid/ktrianglebutton.cpp
@@ -35,7 +35,7 @@ KTriangleButton::KTriangleButton( Direction d,TQWidget *_parent, const char *nam
 {
     dir=d;
     raised = FALSE;
-    setFocusPolicy( TQ_NoFocus );
+    setFocusPolicy( TQWidget::NoFocus );
 }
 
 KTriangleButton::~KTriangleButton()
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index 81c31973..17ce3c1b 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -73,7 +73,7 @@ TDEInstance *KMidFactory::instance()
 
   widget = new tdemidClient(parentWidget, actionCollection());
   widget->show();
-  widget->setFocusPolicy(TQ_ClickFocus);
+  widget->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(widget);
 
   // create and connect our actions