diff options
| -rw-r--r-- | src/app/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gvcore/documentjpegloadedimpl.cpp | 2 | ||||
| -rw-r--r-- | src/gvcore/filethumbnailview.cpp | 2 | ||||
| -rw-r--r-- | src/gvcore/imageview.cpp | 4 | ||||
| -rw-r--r-- | src/gvcore/thumbnailloadjob.cpp | 4 | ||||
| -rw-r--r-- | src/gvdirpart/gvdirpart.cpp | 2 | ||||
| -rw-r--r-- | src/imageutils/imageutils.h | 2 | ||||
| -rw-r--r-- | src/imageutils/scale.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index e2ec1c9..b216445 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -1217,7 +1217,7 @@ void MainWindow::createLocationToolBar() { mURLEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); // Avoid stealing focus - mURLEdit->setFocusPolicy(TQ_ClickFocus); + mURLEdit->setFocusPolicy(TQWidget::ClickFocus); mURLEditCompletion=new KURLCompletion(); diff --git a/src/gvcore/documentjpegloadedimpl.cpp b/src/gvcore/documentjpegloadedimpl.cpp index 8d10367..66e4f8e 100644 --- a/src/gvcore/documentjpegloadedimpl.cpp +++ b/src/gvcore/documentjpegloadedimpl.cpp @@ -94,7 +94,7 @@ TQString DocumentJPEGLoadedImpl::localSave(TQFile* file, const TQCString& format d->mJPEGContent.resetOrientation(); if (!d->mJPEGContent.thumbnail().isNull()) { d->mJPEGContent.setThumbnail( ImageUtils::scale( - mDocument->image(), 128, 128, ImageUtils::SMOOTH_FAST, TQ_ScaleMin)); + mDocument->image(), 128, 128, ImageUtils::SMOOTH_FAST, TQImage::ScaleMin)); } LOG("JPEG Lossless save"); diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp index 82249e4..ff528a7 100644 --- a/src/gvcore/filethumbnailview.cpp +++ b/src/gvcore/filethumbnailview.cpp @@ -810,7 +810,7 @@ void FileThumbnailView::startDrag() { } TQImage img = pix->convertToImage(); - img = img.smoothScale(size, TQ_ScaleMin); + img = img.smoothScale(size, TQImage::ScaleMin); painter->drawImage(left, top, img); } diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp index f5b6977..1604528 100644 --- a/src/gvcore/imageview.cpp +++ b/src/gvcore/imageview.cpp @@ -311,7 +311,7 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a d->mContrast = 100; d->mBCGDialog = 0; - viewport()->setFocusPolicy(TQ_WheelFocus); + viewport()->setFocusPolicy(TQWidget::WheelFocus); setFrameStyle(NoFrame); setAcceptDrops( true ); viewport()->setAcceptDrops( true ); @@ -348,7 +348,7 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a d->mZoomCombo=new TQComboBox(true); // Avoid stealing focus - d->mZoomCombo->setFocusPolicy(TQ_ClickFocus); + d->mZoomCombo->setFocusPolicy(TQWidget::ClickFocus); connect(d->mZoomCombo, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectZoom()) ); diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp index f10889a..7969855 100644 --- a/src/gvcore/thumbnailloadjob.cpp +++ b/src/gvcore/thumbnailloadjob.cpp @@ -169,7 +169,7 @@ void ThumbnailThread::loadThumbnail() { mImage=originalImage; needCaching = false; } else { - mImage=ImageUtils::scale(originalImage,thumbSize,thumbSize,ImageUtils::SMOOTH_FAST,TQ_ScaleMin); + mImage=ImageUtils::scale(originalImage,thumbSize,thumbSize,ImageUtils::SMOOTH_FAST,TQImage::ScaleMin); } loaded = true; } @@ -741,7 +741,7 @@ void ThumbnailLoadJob::emitThumbnailLoaded(const TQImage& img, TQSize size) { TQImage thumbImg; if (biggestDimension>mThumbnailSize) { // Scale down thumbnail if necessary - thumbImg=ImageUtils::scale(img,mThumbnailSize, mThumbnailSize, ImageUtils::SMOOTH_FAST,TQ_ScaleMin); + thumbImg=ImageUtils::scale(img,mThumbnailSize, mThumbnailSize, ImageUtils::SMOOTH_FAST,TQImage::ScaleMin); } else { thumbImg=img; } diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp index beb3d9d..24cc05a 100644 --- a/src/gvdirpart/gvdirpart.cpp +++ b/src/gvdirpart/gvdirpart.cpp @@ -69,7 +69,7 @@ GVDirPart::GVDirPart(TQWidget* parentWidget, const char* /*widgetName*/, TQObjec mBrowserExtension = new GVDirPartBrowserExtension(this); mSplitter = new TQSplitter(Qt::Horizontal, parentWidget, "gwenview-kpart-splitter"); - mSplitter->setFocusPolicy(TQ_ClickFocus); + mSplitter->setFocusPolicy(TQWidget::ClickFocus); mSplitter->setOpaqueResize(true); // Create the widgets diff --git a/src/imageutils/imageutils.h b/src/imageutils/imageutils.h index 5ec9b09..2cf8559 100644 --- a/src/imageutils/imageutils.h +++ b/src/imageutils/imageutils.h @@ -30,7 +30,7 @@ namespace ImageUtils { enum SmoothAlgorithm { SMOOTH_NONE, SMOOTH_FAST, SMOOTH_NORMAL, SMOOTH_BEST }; TQImage scale(const TQImage& image, int width, int height, - SmoothAlgorithm alg, TQ_ScaleMode mode = TQ_ScaleFree, double blur = 1.0); + SmoothAlgorithm alg, TQImage::ScaleMode mode = TQImage::ScaleFree, double blur = 1.0); int extraScalePixels( SmoothAlgorithm alg, double zoom, double blur = 1.0 ); diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp index fb9ab23..3c719a7 100644 --- a/src/imageutils/scale.cpp +++ b/src/imageutils/scale.cpp @@ -1924,7 +1924,7 @@ int extraScalePixels( SmoothAlgorithm alg, double zoom, double blur ) } TQImage scale(const TQImage& image, int width, int height, - SmoothAlgorithm alg, TQ_ScaleMode mode, double blur ) + SmoothAlgorithm alg, TQImage::ScaleMode mode, double blur ) { if( image.isNull()) return image.copy(); |