Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 76898d15ff25a65f81962cbb5f4c04a3338a0a06)

24 files changed, 33 insertions, 33 deletions

diff --git a/kipi-plugins/calendar/calpainter.cpp b/kipi-plugins/calendar/calpainter.cpp
index 5db3307..9e628a5 100644
--- a/kipi-plugins/calendar/calpainter.cpp
+++ b/kipi-plugins/calendar/calpainter.cpp
@@ -553,7 +553,7 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month,
         }
 
         image_ = new TQImage(img.smoothScale(rImage.width(), rImage.height(),
-                                            TQ_ScaleMin));
+                                            TQImage::ScaleMin));
         // Center the image
         int x = rImage.x() + rImage.width()/2 - image_->width()/2;
         int y = rImage.y() + rImage.height()/2 - image_->height()/2;
diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp
index 8a61b40..1bec505 100644
--- a/kipi-plugins/flickrexport/flickrtalker.cpp
+++ b/kipi-plugins/flickrexport/flickrtalker.cpp
@@ -401,7 +401,7 @@ bool FlickrTalker::addPhoto(const TQString& photoPath, const FPhotoInfo& info,
         path = locateLocal("tmp", TQFileInfo(photoPath).baseName().stripWhiteSpace() + ".jpg");
 
         if (rescale && (image.width() > maxDim || image.height() > maxDim))
-            image = image.smoothScale(maxDim, maxDim, TQ_ScaleMin);
+            image = image.smoothScale(maxDim, maxDim, TQImage::ScaleMin);
 
         image.save(path, "JPEG", imageQuality);
 
diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp
index 68655d5..dc42a43 100644
--- a/kipi-plugins/flickrexport/flickrwidget.cpp
+++ b/kipi-plugins/flickrexport/flickrwidget.cpp
@@ -73,7 +73,7 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
     KSeparator *line          = new KSeparator(Horizontal, this);
     m_tab                     = new KTabWidget(this);
     KActiveLabel *headerLabel = new KActiveLabel(this);
-    headerLabel->setFocusPolicy(TQ_NoFocus);
+    headerLabel->setFocusPolicy(TQWidget::NoFocus);
     headerLabel->setLinkUnderline(false);
     headerLabel->setText(i18n("<qt><b><h2><a href='http://www.flickr.com'>"
                               "<font color=\"#0065DE\">flick</font>"
diff --git a/kipi-plugins/galleryexport/gallerytalker.cpp b/kipi-plugins/galleryexport/gallerytalker.cpp
index 86dc209..f6646e8 100644
--- a/kipi-plugins/galleryexport/gallerytalker.cpp
+++ b/kipi-plugins/galleryexport/gallerytalker.cpp
@@ -222,7 +222,7 @@ bool GalleryTalker::addPhoto( const TQString& albumName,
         // image file - see if we need to rescale it
         if (rescale && (image.width() > maxDim || image.height() > maxDim))
         {
-            image = image.smoothScale(maxDim, maxDim, TQ_ScaleMin);
+            image = image.smoothScale(maxDim, maxDim, TQImage::ScaleMin);
             path = locateLocal("tmp", KURL(photoPath).filename());
             image.save(path, TQImageIO::imageFormat(photoPath));
 
diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp
index ff06255..9211612 100644
--- a/kipi-plugins/gpssync/kmlexport.cpp
+++ b/kipi-plugins/gpssync/kmlexport.cpp
@@ -104,7 +104,7 @@ TQString kmlExport::webifyFileName(const TQString &fileName)
  */
 TQImage kmlExport::generateSquareThumbnail(const TQImage& fullImage, int size) 
 {
-    TQImage image = fullImage.smoothScale(size, size, TQ_ScaleMax);
+    TQImage image = fullImage.smoothScale(size, size, TQImage::ScaleMax);
 
     if (image.width() == size && image.height() == size) 
     {
@@ -136,7 +136,7 @@ TQImage kmlExport::generateBorderedThumbnail(const TQImage& fullImage, int size)
     int image_border = 3;
 
     // getting an image minus the border 
-    TQImage image = fullImage.smoothScale(size -(2*image_border), size - (2*image_border), TQ_ScaleMax);
+    TQImage image = fullImage.smoothScale(size -(2*image_border), size - (2*image_border), TQImage::ScaleMax);
 
     TQPixmap croppedPix(image.width() + (2*image_border), image.height() + (2*image_border));
     TQPainter painter(&croppedPix);
@@ -195,7 +195,7 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
         matrix.rotate( info.angle() );
         image = image.xForm( matrix );
     }
-    image = image.smoothScale(m_size, m_size, TQ_ScaleMax);
+    image = image.smoothScale(m_size, m_size, TQImage::ScaleMax);
 
     TQImage icon;
     if (m_optimize_googlemap) 
@@ -204,7 +204,7 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
     } 
     else 
     {
-    //	icon = image.smoothScale(m_iconSize, m_iconSize, TQ_ScaleMax);
+    //	icon = image.smoothScale(m_iconSize, m_iconSize, TQImage::ScaleMax);
         icon = generateBorderedThumbnail(image, m_iconSize);
     }
 
diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp
index 66692de..eceb1e9 100644
--- a/kipi-plugins/htmlexport/generator.cpp
+++ b/kipi-plugins/htmlexport/generator.cpp
@@ -136,7 +136,7 @@ TQCString makeXsltParam(const TQString& txt) {
  * Genearate a square thumbnail from @fullImage of @size x @size pixels
  */
 TQImage generateSquareThumbnail(const TQImage& fullImage, int size) {
-	TQImage image = fullImage.smoothScale(size, size, TQ_ScaleMax);
+	TQImage image = fullImage.smoothScale(size, size, TQImage::ScaleMax);
 
 	if (image.width() == size && image.height() == size) {
 		return image;
@@ -256,7 +256,7 @@ struct Generator::Private {
 		if (!mInfo->useOriginalImageAsFullImage()) {
 			if (mInfo->fullResize()) {
 				int size = mInfo->fullSize();
-				fullImage = fullImage.smoothScale(size, size, TQ_ScaleMin);
+				fullImage = fullImage.smoothScale(size, size, TQImage::ScaleMin);
 			}
 			if (info.angle() != 0) {
 				TQWMatrix matrix;
diff --git a/kipi-plugins/imageviewer/texture.cpp b/kipi-plugins/imageviewer/texture.cpp
index ef8ba0b..86ec9d0 100644
--- a/kipi-plugins/imageviewer/texture.cpp
+++ b/kipi-plugins/imageviewer/texture.cpp
@@ -166,7 +166,7 @@ bool Texture::_load()
 	if (w==0 || w>qimage.width() || h>qimage.height()) {
 		glimage=TQGLWidget::convertToGLFormat(qimage);
 	} else {
-		glimage=TQGLWidget::convertToGLFormat(qimage.scale(w,h,TQ_ScaleMin));
+		glimage=TQGLWidget::convertToGLFormat(qimage.scale(w,h,TQImage::ScaleMin));
 	}
 
 	w=glimage.width();
@@ -386,7 +386,7 @@ bool Texture::setSize(TQSize size)
 	if (w==0) {
 		glimage=TQGLWidget::convertToGLFormat(qimage);
 	} else {
-		glimage=TQGLWidget::convertToGLFormat(qimage.scale(w,h,TQ_ScaleMin));
+		glimage=TQGLWidget::convertToGLFormat(qimage.scale(w,h,TQImage::ScaleMin));
 	}
 	
 	//recalculate half-texel offset
diff --git a/kipi-plugins/jpeglossless/jpegtransform.cpp b/kipi-plugins/jpeglossless/jpegtransform.cpp
index 1dcd33e..ec3cc5b 100644
--- a/kipi-plugins/jpeglossless/jpegtransform.cpp
+++ b/kipi-plugins/jpeglossless/jpegtransform.cpp
@@ -345,7 +345,7 @@ bool transformJPEG(const TQString& src, const TQString& destGiven,
     // And set finaly update the metadata to target file.
 
     TQImage img(destGiven);
-    TQImage exifThumbnail = img.scale(160, 120, TQ_ScaleMin);
+    TQImage exifThumbnail = img.scale(160, 120, TQImage::ScaleMin);
     exiv2Iface.load(destGiven);
     exiv2Iface.setImageOrientation(KExiv2Iface::KExiv2::ORIENTATION_NORMAL);
     exiv2Iface.setImageProgramId(TQString("Kipi-plugins"), TQString(kipiplugins_version));
diff --git a/kipi-plugins/jpeglossless/utils.cpp b/kipi-plugins/jpeglossless/utils.cpp
index c2ac773..4e7811a 100644
--- a/kipi-plugins/jpeglossless/utils.cpp
+++ b/kipi-plugins/jpeglossless/utils.cpp
@@ -92,8 +92,8 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
     }
 
     TQImage img(src);
-    TQImage iptcPreview   = img.scale(1280, 1024, TQ_ScaleMin);
-    TQImage exifThumbnail = iptcPreview.scale(160, 120, TQ_ScaleMin);
+    TQImage iptcPreview   = img.scale(1280, 1024, TQImage::ScaleMin);
+    TQImage exifThumbnail = iptcPreview.scale(160, 120, TQImage::ScaleMin);
 
     KExiv2Iface::KExiv2 meta;
     meta.load(src);
diff --git a/kipi-plugins/kameraklient/cameraiconview.cpp b/kipi-plugins/kameraklient/cameraiconview.cpp
index 6a6b0cc..f99aff7 100644
--- a/kipi-plugins/kameraklient/cameraiconview.cpp
+++ b/kipi-plugins/kameraklient/cameraiconview.cpp
@@ -71,7 +71,7 @@ void CameraIconView::setThumbnailSize() {
     TQString iconfile = locate("data", "documents");
     TQImage image(iconfile);
     double scale = double(w-10) / double(image.width());
-    image = image.smoothScale(w-10, h-10, TQ_ScaleMin);
+    image = image.smoothScale(w-10, h-10, TQImage::ScaleMin);
     TQPixmap pix(w, h);
     pix.fill(colorGroup().base());
     TQPainter p(&pix);
@@ -93,7 +93,7 @@ void CameraIconView::setThumbnailSize() {
 void CameraIconView::createPixmap(TQPixmap& pix, const TQString& icon, double scale) {
     TQString iconfile = locate("data", icon);
     TQImage mimeImg(iconfile);
-    mimeImg = mimeImg.smoothScale((int) (mimeImg.width()*scale), (int) (mimeImg.height()*scale), TQ_ScaleMin);
+    mimeImg = mimeImg.smoothScale((int) (mimeImg.width()*scale), (int) (mimeImg.height()*scale), TQImage::ScaleMin);
     int w = THUMBSIZE;
     int h = THUMBSIZE;
     TQPainter p(&pix);
diff --git a/kipi-plugins/kameraklient/gpcontroller.cpp b/kipi-plugins/kameraklient/gpcontroller.cpp
index 24e0385..a673f01 100644
--- a/kipi-plugins/kameraklient/gpcontroller.cpp
+++ b/kipi-plugins/kameraklient/gpcontroller.cpp
@@ -387,7 +387,7 @@ void GPController::error(const TQString& errorMsg) {
 }
 
 void GPController::scaleHighlightThumbnail(TQImage& thumbnail) {
-    thumbnail = thumbnail.smoothScale(100, 100, TQ_ScaleMin);
+    thumbnail = thumbnail.smoothScale(100, 100, TQImage::ScaleMin);
     TQColor darkColor(48, 48, 48);
     TQColor lightColor(215, 215, 215);
     int w = thumbnail.width();
diff --git a/kipi-plugins/kameraklient/thumbview.cpp b/kipi-plugins/kameraklient/thumbview.cpp
index 87c43d7..56fa1b5 100644
--- a/kipi-plugins/kameraklient/thumbview.cpp
+++ b/kipi-plugins/kameraklient/thumbview.cpp
@@ -96,7 +96,7 @@ ThumbView::ThumbView(TQWidget* parent, const char* name, WFlags fl) : TQScrollVi
     setBackgroundMode(TQt::NoBackground);
     viewport()->setBackgroundMode(TQt::NoBackground);
     viewport()->setFocusProxy(this);
-    viewport()->setFocusPolicy(TQ_TabFocus);
+    viewport()->setFocusPolicy(TQWidget::TabFocus);
     renamingItem = 0;
     d = new ThumbViewPrivate;
     d->firstItem = 0;
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp
index bc767fc..bbc2915 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.cpp
+++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp
@@ -466,7 +466,7 @@ bool PicasawebTalker::addPhoto(const TQString& photoPath, FPhotoInfo& info,
         path = locateLocal("tmp", TQFileInfo(photoPath).baseName().stripWhiteSpace() + ".jpg");
 
         if (rescale && (image.width() > maxDim || image.height() > maxDim))
-            image = image.smoothScale(maxDim, maxDim, TQ_ScaleMin);
+            image = image.smoothScale(maxDim, maxDim, TQImage::ScaleMin);
 
         image.save(path, "JPEG", imageQuality);
 
diff --git a/kipi-plugins/printwizard/cropframe.cpp b/kipi-plugins/printwizard/cropframe.cpp
index 13cb3c8..5608f81 100644
--- a/kipi-plugins/printwizard/cropframe.cpp
+++ b/kipi-plugins/printwizard/cropframe.cpp
@@ -78,7 +78,7 @@ void CropFrame::init(TPhoto *photo, int width, int height, bool autoRotate, bool
   matrix.rotate(m_photo->rotation);
   scaledImg = scaledImg.xForm(matrix);
 
-  scaledImg = scaledImg.smoothScale(this->width(), this->height(), TQ_ScaleMin);
+  scaledImg = scaledImg.smoothScale(this->width(), this->height(), TQImage::ScaleMin);
 
   m_pixmap = new TQPixmap();
   m_pixmap->convertFromImage(scaledImg);
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index 59772f4..0d79956 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -827,7 +827,7 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
     int h  = NINT((double)layout->height() * yRatio);
 
     // We can use scaleFree because the crop frame should have the proper dimensions.
-    img = img.smoothScale(w, h, TQ_ScaleFree);
+    img = img.smoothScale(w, h, TQImage::ScaleFree);
     // don't have drawimage, so we copy the pixels over manually
     for(int srcY = 0; srcY < img.height(); srcY++)
       for(int srcX = 0; srcX < img.width(); srcX++)
diff --git a/kipi-plugins/printwizard/tphoto.cpp b/kipi-plugins/printwizard/tphoto.cpp
index 451e124..73cf26f 100644
--- a/kipi-plugins/printwizard/tphoto.cpp
+++ b/kipi-plugins/printwizard/tphoto.cpp
@@ -87,7 +87,7 @@ void TPhoto::loadCache()
 
   TQImage photo = loadPhoto();
 
-  m_thumbnail = new TQPixmap(TQImage( photo.scale(m_thumbnailSize, m_thumbnailSize, TQ_ScaleMin) ));
+  m_thumbnail = new TQPixmap(TQImage( photo.scale(m_thumbnailSize, m_thumbnailSize, TQImage::ScaleMin) ));
 
   if (m_size)
     delete m_size;
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index e6d7079..398fbbd 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -632,7 +632,7 @@ void BatchDialog::customEvent(TQCustomEvent *event)
                     {
                         if (!d->image.isNull())
                         {
-                            TQPixmap pix = TQPixmap(d->image.scale(64, 64, TQ_ScaleMin));
+                            TQPixmap pix = TQPixmap(d->image.scale(64, 64, TQImage::ScaleMin));
                             rawItem->viewItem->setThumbnail(pix);
                         }
                         rawItem->viewItem->setText(3, d->message);
diff --git a/kipi-plugins/rawconverter/previewwidget.cpp b/kipi-plugins/rawconverter/previewwidget.cpp
index e14dc3b..6d80d80 100644
--- a/kipi-plugins/rawconverter/previewwidget.cpp
+++ b/kipi-plugins/rawconverter/previewwidget.cpp
@@ -95,7 +95,7 @@ void PreviewWidget::load(const TQString& file)
 
     if (!d->image.isNull()) 
     {
-        TQImage img = d->image.scale(width(),height(),TQ_ScaleMin);
+        TQImage img = d->image.scale(width(),height(),TQImage::ScaleMin);
         int x = d->pix->width()/2 - img.width()/2;
         int y = d->pix->height()/2 - img.height()/2;
 
@@ -179,7 +179,7 @@ void PreviewWidget::slotResize()
     {
         if (!d->image.isNull()) 
         {
-            TQImage img = d->image.scale(width(),height(), TQ_ScaleMin);
+            TQImage img = d->image.scale(width(),height(), TQImage::ScaleMin);
             int x = d->pix->width()/2 - img.width()/2;
             int y = d->pix->height()/2 - img.height()/2;
 
diff --git a/kipi-plugins/rawconverter/rawdecodingiface.cpp b/kipi-plugins/rawconverter/rawdecodingiface.cpp
index 7345b26..d3a90b0 100644
--- a/kipi-plugins/rawconverter/rawdecodingiface.cpp
+++ b/kipi-plugins/rawconverter/rawdecodingiface.cpp
@@ -184,8 +184,8 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
         sptr += 3;
     }
 
-    TQImage iptcPreview   = img.scale(1280, 1024, TQ_ScaleMin);
-    TQImage exifThumbnail = iptcPreview.scale(160, 120, TQ_ScaleMin);
+    TQImage iptcPreview   = img.scale(1280, 1024, TQImage::ScaleMin);
+    TQImage exifThumbnail = iptcPreview.scale(160, 120, TQImage::ScaleMin);
 
     // -- Write image data into destination file -------------------------------
 
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index 9869537..9b03938 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -565,7 +565,7 @@ void SingleDialog::customEvent(TQCustomEvent *event)
             {
                 case(IDENTIFY_FULL): 
                 {
-                    TQPixmap pix = TQPixmap(d->image.scale(256, 256, TQ_ScaleMin));
+                    TQPixmap pix = TQPixmap(d->image.scale(256, 256, TQImage::ScaleMin));
                     identified(d->filePath, d->message, pix);
                     busy(false);
                     break;
diff --git a/kipi-plugins/slideshow/imageloadthread.cpp b/kipi-plugins/slideshow/imageloadthread.cpp
index f5df7a5..62e0890 100644
--- a/kipi-plugins/slideshow/imageloadthread.cpp
+++ b/kipi-plugins/slideshow/imageloadthread.cpp
@@ -158,7 +158,7 @@ bool ImageLoadThread::loadImage() {
 
     float aspect  = (float)image.width() / (float)image.height();    
     
-    image = image.smoothScale(m_width, m_height, TQ_ScaleMin);
+    image = image.smoothScale(m_width, m_height, TQImage::ScaleMin);
     
     m_imageLock.lock();
     
diff --git a/kipi-plugins/slideshow/slideshowgl.cpp b/kipi-plugins/slideshow/slideshowgl.cpp
index 8239181..eec567b 100644
--- a/kipi-plugins/slideshow/slideshowgl.cpp
+++ b/kipi-plugins/slideshow/slideshowgl.cpp
@@ -506,7 +506,7 @@ void SlideShowGL::loadImage()
         black.fill(TQt::black.rgb());
 	    
 /*        image = image.smoothScale(width(), height(),
-                                  TQ_ScaleMin);*/
+                                  TQImage::ScaleMin);*/
         montage(image, black);
 
         black = black.smoothScale(m_width, m_height);
diff --git a/kipi-plugins/slideshow/slideshowloader.cpp b/kipi-plugins/slideshow/slideshowloader.cpp
index b470885..8f09c26 100644
--- a/kipi-plugins/slideshow/slideshowloader.cpp
+++ b/kipi-plugins/slideshow/slideshowloader.cpp
@@ -64,7 +64,7 @@ namespace KIPISlideShowPlugin
     }
     
   
-    newImage = TQImage(newImage.smoothScale(m_swidth, m_sheight, TQ_ScaleMin));
+    newImage = TQImage(newImage.smoothScale(m_swidth, m_sheight, TQImage::ScaleMin));
     
     m_imageLock->lock();
     m_loadedImages->insert(m_path, newImage);
diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
index 2d3b5af..09c545e 100644
--- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
+++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
@@ -233,7 +233,7 @@ bool GallerySink::addPhoto( const TQString& albumName,
         // image file - see if we need to rescale it
         if (rescale && (image.width() > maxDim || image.height() > maxDim))
         {
-            image = image.smoothScale(maxDim, maxDim, TQ_ScaleMin);
+            image = image.smoothScale(maxDim, maxDim, TQImage::ScaleMin);
             path = locateLocal("tmp", KURL(photoPath).filename());
             image.save(path, TQImageIO::imageFormat(photoPath));