summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-09-02 15:47:55 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-09-03 22:34:58 +0900
commit015d47f52dbe77ac3e475d83ae4a476feb46275d (patch)
treefb5e927c71fec0558c49fa68b8014505628c9bc7
parentd89d2263c46beec7b91431b1fb966185873006b0 (diff)
downloadksquirrel-015d47f52dbe77ac3e475d83ae4a476feb46275d.tar.gz
ksquirrel-015d47f52dbe77ac3e475d83ae4a476feb46275d.zip
Replace TQ_*Focus* and TQ_Scale* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 8e4ca9c2167c027b4a8b8497f17817c4bec3675e)
-rw-r--r--ksquirrel/ksquirrelpart/sq_glwidget.cpp2
-rw-r--r--ksquirrel/ksquirrelpart/sq_utils.cpp2
-rw-r--r--ksquirrel/ksquirrelpart/sq_utils.h2
-rw-r--r--ksquirrel/ksquirrelpart/sq_utils_scale.cpp2
-rw-r--r--ksquirrel/sidebar/sq_previewwidget.cpp4
-rw-r--r--ksquirrel/sq_glview.cpp2
-rw-r--r--ksquirrel/sq_glwidget.cpp2
-rw-r--r--ksquirrel/sq_slideshowwidget.cpp2
-rw-r--r--ksquirrel/sq_utils.cpp2
-rw-r--r--ksquirrel/sq_utils.h2
-rw-r--r--ksquirrel/sq_utils_scale.cpp2
11 files changed, 12 insertions, 12 deletions
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
index 06991c8..30e6ea1 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
@@ -165,7 +165,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
// load cursors
setCursor(KCursor::arrowCursor());
- setFocusPolicy(TQ_WheelFocus);
+ setFocusPolicy(TQWidget::WheelFocus);
setAcceptDrops(true);
// popup menu with image pages
diff --git a/ksquirrel/ksquirrelpart/sq_utils.cpp b/ksquirrel/ksquirrelpart/sq_utils.cpp
index 2cfadaf..20eea42 100644
--- a/ksquirrel/ksquirrelpart/sq_utils.cpp
+++ b/ksquirrel/ksquirrelpart/sq_utils.cpp
@@ -92,7 +92,7 @@ TQImage SQ_Utils::scaleImage(unsigned char *im, int w, int h, int fitwithin)
orig.setAlphaBuffer(true);
// return scaled image
- return SQ_Utils::scale(orig, fitwithin, fitwithin, SQ_Utils::SMOOTH_FAST, TQ_ScaleMin);
+ return SQ_Utils::scale(orig, fitwithin, fitwithin, SQ_Utils::SMOOTH_FAST, TQImage::ScaleMin);
}
#ifndef KSQUIRREL_PART
diff --git a/ksquirrel/ksquirrelpart/sq_utils.h b/ksquirrel/ksquirrelpart/sq_utils.h
index 706aca4..6d92104 100644
--- a/ksquirrel/ksquirrelpart/sq_utils.h
+++ b/ksquirrel/ksquirrelpart/sq_utils.h
@@ -38,7 +38,7 @@ namespace SQ_Utils
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);
/*
* Scale given image to fit it within 'fitwithin'
diff --git a/ksquirrel/ksquirrelpart/sq_utils_scale.cpp b/ksquirrel/ksquirrelpart/sq_utils_scale.cpp
index dbf9aae..b4d05f1 100644
--- a/ksquirrel/ksquirrelpart/sq_utils_scale.cpp
+++ b/ksquirrel/ksquirrelpart/sq_utils_scale.cpp
@@ -1878,7 +1878,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest,
// Imlib2/Mosfet code end
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();
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp
index 51bd761..bf4d710 100644
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@@ -73,7 +73,7 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name)
multi_pix = SQ_IconLoader::instance()->loadIcon("application-vnd.tde.tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
setMinimumHeight(20);
- setFocusPolicy(TQ_WheelFocus);
+ setFocusPolicy(TQWidget::WheelFocus);
}
SQ_PreviewWidget::~SQ_PreviewWidget()
@@ -181,7 +181,7 @@ bool SQ_PreviewWidget::fit()
{
small = new TQImage();
- *small = SQ_Utils::scale(*all, width(), height(), SQ_Utils::SMOOTH_FAST, TQ_ScaleMin);
+ *small = SQ_Utils::scale(*all, width(), height(), SQ_Utils::SMOOTH_FAST, TQImage::ScaleMin);
}
return true;
diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp
index 24d9343..7fd2ab5 100644
--- a/ksquirrel/sq_glview.cpp
+++ b/ksquirrel/sq_glview.cpp
@@ -75,7 +75,7 @@ void SQ_GLView::createContent()
m_tabbar->setHoverCloseButton(m_tabsclose);
m_tabbar->setHoverCloseButtonDelayed(false);
m_tabbar->setMouseTracking(true);
- m_tabbar->setFocusPolicy(TQ_NoFocus);
+ m_tabbar->setFocusPolicy(TQWidget::NoFocus);
box->setStretchFactor(m_toolbar, 1);
diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp
index 06991c8..30e6ea1 100644
--- a/ksquirrel/sq_glwidget.cpp
+++ b/ksquirrel/sq_glwidget.cpp
@@ -165,7 +165,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
// load cursors
setCursor(KCursor::arrowCursor());
- setFocusPolicy(TQ_WheelFocus);
+ setFocusPolicy(TQWidget::WheelFocus);
setAcceptDrops(true);
// popup menu with image pages
diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp
index 2577d4a..2e4ba6a 100644
--- a/ksquirrel/sq_slideshowwidget.cpp
+++ b/ksquirrel/sq_slideshowwidget.cpp
@@ -191,7 +191,7 @@ void SQ_SlideShowWidget::loadImage(const TQString &_path, int _current)
if(w > width() || h > height())
{
small = new TQImage();
- *small = SQ_Utils::scale(*all, width(), height(), SQ_Utils::SMOOTH_FAST, TQ_ScaleMin);
+ *small = SQ_Utils::scale(*all, width(), height(), SQ_Utils::SMOOTH_FAST, TQImage::ScaleMin);
delete all;
all = 0;
diff --git a/ksquirrel/sq_utils.cpp b/ksquirrel/sq_utils.cpp
index 2cfadaf..20eea42 100644
--- a/ksquirrel/sq_utils.cpp
+++ b/ksquirrel/sq_utils.cpp
@@ -92,7 +92,7 @@ TQImage SQ_Utils::scaleImage(unsigned char *im, int w, int h, int fitwithin)
orig.setAlphaBuffer(true);
// return scaled image
- return SQ_Utils::scale(orig, fitwithin, fitwithin, SQ_Utils::SMOOTH_FAST, TQ_ScaleMin);
+ return SQ_Utils::scale(orig, fitwithin, fitwithin, SQ_Utils::SMOOTH_FAST, TQImage::ScaleMin);
}
#ifndef KSQUIRREL_PART
diff --git a/ksquirrel/sq_utils.h b/ksquirrel/sq_utils.h
index 706aca4..6d92104 100644
--- a/ksquirrel/sq_utils.h
+++ b/ksquirrel/sq_utils.h
@@ -38,7 +38,7 @@ namespace SQ_Utils
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);
/*
* Scale given image to fit it within 'fitwithin'
diff --git a/ksquirrel/sq_utils_scale.cpp b/ksquirrel/sq_utils_scale.cpp
index acb740d..39ba93e 100644
--- a/ksquirrel/sq_utils_scale.cpp
+++ b/ksquirrel/sq_utils_scale.cpp
@@ -1878,7 +1878,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest,
// Imlib2/Mosfet code end
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();