Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/7/head
Michele Calgaro 1 year ago
parent 1ffbcfbf6b
commit 76898d15ff
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -553,7 +553,7 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month,
} }
image_ = new TQImage(img.smoothScale(rImage.width(), rImage.height(), image_ = new TQImage(img.smoothScale(rImage.width(), rImage.height(),
TQ_ScaleMin)); TQImage::ScaleMin));
// Center the image // Center the image
int x = rImage.x() + rImage.width()/2 - image_->width()/2; int x = rImage.x() + rImage.width()/2 - image_->width()/2;
int y = rImage.y() + rImage.height()/2 - image_->height()/2; int y = rImage.y() + rImage.height()/2 - image_->height()/2;

@ -401,7 +401,7 @@ bool FlickrTalker::addPhoto(const TQString& photoPath, const FPhotoInfo& info,
path = locateLocal("tmp", TQFileInfo(photoPath).baseName().stripWhiteSpace() + ".jpg"); path = locateLocal("tmp", TQFileInfo(photoPath).baseName().stripWhiteSpace() + ".jpg");
if (rescale && (image.width() > maxDim || image.height() > maxDim)) 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); image.save(path, "JPEG", imageQuality);

@ -73,7 +73,7 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
KSeparator *line = new KSeparator(Horizontal, this); KSeparator *line = new KSeparator(Horizontal, this);
m_tab = new KTabWidget(this); m_tab = new KTabWidget(this);
KActiveLabel *headerLabel = new KActiveLabel(this); KActiveLabel *headerLabel = new KActiveLabel(this);
headerLabel->setFocusPolicy(TQ_NoFocus); headerLabel->setFocusPolicy(TQWidget::NoFocus);
headerLabel->setLinkUnderline(false); headerLabel->setLinkUnderline(false);
headerLabel->setText(i18n("<qt><b><h2><a href='http://www.flickr.com'>" headerLabel->setText(i18n("<qt><b><h2><a href='http://www.flickr.com'>"
"<font color=\"#0065DE\">flick</font>" "<font color=\"#0065DE\">flick</font>"

@ -222,7 +222,7 @@ bool GalleryTalker::addPhoto( const TQString& albumName,
// image file - see if we need to rescale it // image file - see if we need to rescale it
if (rescale && (image.width() > maxDim || image.height() > maxDim)) 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()); path = locateLocal("tmp", KURL(photoPath).filename());
image.save(path, TQImageIO::imageFormat(photoPath)); image.save(path, TQImageIO::imageFormat(photoPath));

@ -104,7 +104,7 @@ TQString kmlExport::webifyFileName(const TQString &fileName)
*/ */
TQImage kmlExport::generateSquareThumbnail(const TQImage& fullImage, int size) 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) if (image.width() == size && image.height() == size)
{ {
@ -136,7 +136,7 @@ TQImage kmlExport::generateBorderedThumbnail(const TQImage& fullImage, int size)
int image_border = 3; int image_border = 3;
// getting an image minus the border // 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)); TQPixmap croppedPix(image.width() + (2*image_border), image.height() + (2*image_border));
TQPainter painter(&croppedPix); TQPainter painter(&croppedPix);
@ -195,7 +195,7 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
matrix.rotate( info.angle() ); matrix.rotate( info.angle() );
image = image.xForm( matrix ); image = image.xForm( matrix );
} }
image = image.smoothScale(m_size, m_size, TQ_ScaleMax); image = image.smoothScale(m_size, m_size, TQImage::ScaleMax);
TQImage icon; TQImage icon;
if (m_optimize_googlemap) if (m_optimize_googlemap)
@ -204,7 +204,7 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
} }
else else
{ {
// icon = image.smoothScale(m_iconSize, m_iconSize, TQ_ScaleMax); // icon = image.smoothScale(m_iconSize, m_iconSize, TQImage::ScaleMax);
icon = generateBorderedThumbnail(image, m_iconSize); icon = generateBorderedThumbnail(image, m_iconSize);
} }

@ -136,7 +136,7 @@ TQCString makeXsltParam(const TQString& txt) {
* Genearate a square thumbnail from @fullImage of @size x @size pixels * Genearate a square thumbnail from @fullImage of @size x @size pixels
*/ */
TQImage generateSquareThumbnail(const TQImage& fullImage, int size) { 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) { if (image.width() == size && image.height() == size) {
return image; return image;
@ -256,7 +256,7 @@ struct Generator::Private {
if (!mInfo->useOriginalImageAsFullImage()) { if (!mInfo->useOriginalImageAsFullImage()) {
if (mInfo->fullResize()) { if (mInfo->fullResize()) {
int size = mInfo->fullSize(); int size = mInfo->fullSize();
fullImage = fullImage.smoothScale(size, size, TQ_ScaleMin); fullImage = fullImage.smoothScale(size, size, TQImage::ScaleMin);
} }
if (info.angle() != 0) { if (info.angle() != 0) {
TQWMatrix matrix; TQWMatrix matrix;

@ -166,7 +166,7 @@ bool Texture::_load()
if (w==0 || w>qimage.width() || h>qimage.height()) { if (w==0 || w>qimage.width() || h>qimage.height()) {
glimage=TQGLWidget::convertToGLFormat(qimage); glimage=TQGLWidget::convertToGLFormat(qimage);
} else { } else {
glimage=TQGLWidget::convertToGLFormat(qimage.scale(w,h,TQ_ScaleMin)); glimage=TQGLWidget::convertToGLFormat(qimage.scale(w,h,TQImage::ScaleMin));
} }
w=glimage.width(); w=glimage.width();
@ -386,7 +386,7 @@ bool Texture::setSize(TQSize size)
if (w==0) { if (w==0) {
glimage=TQGLWidget::convertToGLFormat(qimage); glimage=TQGLWidget::convertToGLFormat(qimage);
} else { } else {
glimage=TQGLWidget::convertToGLFormat(qimage.scale(w,h,TQ_ScaleMin)); glimage=TQGLWidget::convertToGLFormat(qimage.scale(w,h,TQImage::ScaleMin));
} }
//recalculate half-texel offset //recalculate half-texel offset

@ -345,7 +345,7 @@ bool transformJPEG(const TQString& src, const TQString& destGiven,
// And set finaly update the metadata to target file. // And set finaly update the metadata to target file.
TQImage img(destGiven); TQImage img(destGiven);
TQImage exifThumbnail = img.scale(160, 120, TQ_ScaleMin); TQImage exifThumbnail = img.scale(160, 120, TQImage::ScaleMin);
exiv2Iface.load(destGiven); exiv2Iface.load(destGiven);
exiv2Iface.setImageOrientation(KExiv2Iface::KExiv2::ORIENTATION_NORMAL); exiv2Iface.setImageOrientation(KExiv2Iface::KExiv2::ORIENTATION_NORMAL);
exiv2Iface.setImageProgramId(TQString("Kipi-plugins"), TQString(kipiplugins_version)); exiv2Iface.setImageProgramId(TQString("Kipi-plugins"), TQString(kipiplugins_version));

@ -92,8 +92,8 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
} }
TQImage img(src); TQImage img(src);
TQImage iptcPreview = img.scale(1280, 1024, TQ_ScaleMin); TQImage iptcPreview = img.scale(1280, 1024, TQImage::ScaleMin);
TQImage exifThumbnail = iptcPreview.scale(160, 120, TQ_ScaleMin); TQImage exifThumbnail = iptcPreview.scale(160, 120, TQImage::ScaleMin);
KExiv2Iface::KExiv2 meta; KExiv2Iface::KExiv2 meta;
meta.load(src); meta.load(src);

@ -71,7 +71,7 @@ void CameraIconView::setThumbnailSize() {
TQString iconfile = locate("data", "documents"); TQString iconfile = locate("data", "documents");
TQImage image(iconfile); TQImage image(iconfile);
double scale = double(w-10) / double(image.width()); 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); TQPixmap pix(w, h);
pix.fill(colorGroup().base()); pix.fill(colorGroup().base());
TQPainter p(&pix); TQPainter p(&pix);
@ -93,7 +93,7 @@ void CameraIconView::setThumbnailSize() {
void CameraIconView::createPixmap(TQPixmap& pix, const TQString& icon, double scale) { void CameraIconView::createPixmap(TQPixmap& pix, const TQString& icon, double scale) {
TQString iconfile = locate("data", icon); TQString iconfile = locate("data", icon);
TQImage mimeImg(iconfile); 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 w = THUMBSIZE;
int h = THUMBSIZE; int h = THUMBSIZE;
TQPainter p(&pix); TQPainter p(&pix);

@ -387,7 +387,7 @@ void GPController::error(const TQString& errorMsg) {
} }
void GPController::scaleHighlightThumbnail(TQImage& thumbnail) { 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 darkColor(48, 48, 48);
TQColor lightColor(215, 215, 215); TQColor lightColor(215, 215, 215);
int w = thumbnail.width(); int w = thumbnail.width();

@ -96,7 +96,7 @@ ThumbView::ThumbView(TQWidget* parent, const char* name, WFlags fl) : TQScrollVi
setBackgroundMode(TQt::NoBackground); setBackgroundMode(TQt::NoBackground);
viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setBackgroundMode(TQt::NoBackground);
viewport()->setFocusProxy(this); viewport()->setFocusProxy(this);
viewport()->setFocusPolicy(TQ_TabFocus); viewport()->setFocusPolicy(TQWidget::TabFocus);
renamingItem = 0; renamingItem = 0;
d = new ThumbViewPrivate; d = new ThumbViewPrivate;
d->firstItem = 0; d->firstItem = 0;

@ -466,7 +466,7 @@ bool PicasawebTalker::addPhoto(const TQString& photoPath, FPhotoInfo& info,
path = locateLocal("tmp", TQFileInfo(photoPath).baseName().stripWhiteSpace() + ".jpg"); path = locateLocal("tmp", TQFileInfo(photoPath).baseName().stripWhiteSpace() + ".jpg");
if (rescale && (image.width() > maxDim || image.height() > maxDim)) 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); image.save(path, "JPEG", imageQuality);

@ -78,7 +78,7 @@ void CropFrame::init(TPhoto *photo, int width, int height, bool autoRotate, bool
matrix.rotate(m_photo->rotation); matrix.rotate(m_photo->rotation);
scaledImg = scaledImg.xForm(matrix); 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 = new TQPixmap();
m_pixmap->convertFromImage(scaledImg); m_pixmap->convertFromImage(scaledImg);

@ -827,7 +827,7 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
int h = NINT((double)layout->height() * yRatio); int h = NINT((double)layout->height() * yRatio);
// We can use scaleFree because the crop frame should have the proper dimensions. // 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 // don't have drawimage, so we copy the pixels over manually
for(int srcY = 0; srcY < img.height(); srcY++) for(int srcY = 0; srcY < img.height(); srcY++)
for(int srcX = 0; srcX < img.width(); srcX++) for(int srcX = 0; srcX < img.width(); srcX++)

@ -87,7 +87,7 @@ void TPhoto::loadCache()
TQImage photo = loadPhoto(); 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) if (m_size)
delete m_size; delete m_size;

@ -632,7 +632,7 @@ void BatchDialog::customEvent(TQCustomEvent *event)
{ {
if (!d->image.isNull()) 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->setThumbnail(pix);
} }
rawItem->viewItem->setText(3, d->message); rawItem->viewItem->setText(3, d->message);

@ -95,7 +95,7 @@ void PreviewWidget::load(const TQString& file)
if (!d->image.isNull()) 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 x = d->pix->width()/2 - img.width()/2;
int y = d->pix->height()/2 - img.height()/2; int y = d->pix->height()/2 - img.height()/2;
@ -179,7 +179,7 @@ void PreviewWidget::slotResize()
{ {
if (!d->image.isNull()) 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 x = d->pix->width()/2 - img.width()/2;
int y = d->pix->height()/2 - img.height()/2; int y = d->pix->height()/2 - img.height()/2;

@ -184,8 +184,8 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
sptr += 3; sptr += 3;
} }
TQImage iptcPreview = img.scale(1280, 1024, TQ_ScaleMin); TQImage iptcPreview = img.scale(1280, 1024, TQImage::ScaleMin);
TQImage exifThumbnail = iptcPreview.scale(160, 120, TQ_ScaleMin); TQImage exifThumbnail = iptcPreview.scale(160, 120, TQImage::ScaleMin);
// -- Write image data into destination file ------------------------------- // -- Write image data into destination file -------------------------------

@ -565,7 +565,7 @@ void SingleDialog::customEvent(TQCustomEvent *event)
{ {
case(IDENTIFY_FULL): 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); identified(d->filePath, d->message, pix);
busy(false); busy(false);
break; break;

@ -158,7 +158,7 @@ bool ImageLoadThread::loadImage() {
float aspect = (float)image.width() / (float)image.height(); 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(); m_imageLock.lock();

@ -506,7 +506,7 @@ void SlideShowGL::loadImage()
black.fill(TQt::black.rgb()); black.fill(TQt::black.rgb());
/* image = image.smoothScale(width(), height(), /* image = image.smoothScale(width(), height(),
TQ_ScaleMin);*/ TQImage::ScaleMin);*/
montage(image, black); montage(image, black);
black = black.smoothScale(m_width, m_height); black = black.smoothScale(m_width, m_height);

@ -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_imageLock->lock();
m_loadedImages->insert(m_path, newImage); m_loadedImages->insert(m_path, newImage);

@ -233,7 +233,7 @@ bool GallerySink::addPhoto( const TQString& albumName,
// image file - see if we need to rescale it // image file - see if we need to rescale it
if (rescale && (image.width() > maxDim || image.height() > maxDim)) 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()); path = locateLocal("tmp", KURL(photoPath).filename());
image.save(path, TQImageIO::imageFormat(photoPath)); image.save(path, TQImageIO::imageFormat(photoPath));

Loading…
Cancel
Save