From 58d263711ee1e549f656a7c560cb8256e6c2d28b Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <randrianasulu@gmail.com>
Date: Fri, 24 Nov 2023 13:42:26 +0300
Subject: [PATCH] update to r14.1.1

---
 .gitignore                                |  2 ++
 ConfigureChecks.cmake                     | 11 +++++++++--
 libkdcraw/libkdcraw/dcrawbinary.h         |  2 +-
 libkdcraw/libkdcraw/dcrawsettingswidget.h |  2 +-
 libkdcraw/libkdcraw/kdcraw.h              |  2 +-
 libkdcraw/libkdcraw/rcombobox.cpp         |  2 +-
 libkdcraw/libkdcraw/rcombobox.h           |  2 +-
 libkdcraw/libkdcraw/rnuminput.cpp         |  4 ++--
 libkdcraw/libkdcraw/rnuminput.h           |  4 ++--
 9 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..73d9596
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+bk
+build
\ No newline at end of file
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 1864512..67bdce0 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -60,7 +60,7 @@ endif( WITH_OPENMP )
 
 ##### check for jpeg
 
-if( BUILD_KDCRAW )
+if( BUILD_DCRAW )
     find_package( JPEG )
 
     if( JPEG_FOUND )
@@ -69,8 +69,15 @@ if( BUILD_KDCRAW )
         tde_message_fatal( "jpeg library is required, but was not found on your system" )
     endif()
 
+find_package( Jasper )
+    if( JASPER_FOUND )
+        set( HAVE_JASPER 1 )
+     else()
+        tde_message_fatal( "jasper library is required, but was not found on your system" )
+    endif()
+
 ##### check for the math libc
 
     find_library( MATH_LIBC m )
 
-endif( BUILD_KDCRAW )
+endif( BUILD_DCRAW )
diff --git a/libkdcraw/libkdcraw/dcrawbinary.h b/libkdcraw/libkdcraw/dcrawbinary.h
index cdf16e5..28cceff 100644
--- a/libkdcraw/libkdcraw/dcrawbinary.h
+++ b/libkdcraw/libkdcraw/dcrawbinary.h
@@ -42,7 +42,7 @@ class DcrawBinaryPriv;
 
 class LIBKDCRAW_EXPORT DcrawBinary : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/libkdcraw/libkdcraw/dcrawsettingswidget.h b/libkdcraw/libkdcraw/dcrawsettingswidget.h
index 9771a60..2cde13d 100644
--- a/libkdcraw/libkdcraw/dcrawsettingswidget.h
+++ b/libkdcraw/libkdcraw/dcrawsettingswidget.h
@@ -46,7 +46,7 @@ class DcrawSettingsWidgetPriv;
 
 class LIBKDCRAW_EXPORT DcrawSettingsWidget : public TQToolBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/libkdcraw/libkdcraw/kdcraw.h b/libkdcraw/libkdcraw/kdcraw.h
index 6e7cec9..b98ae3b 100644
--- a/libkdcraw/libkdcraw/kdcraw.h
+++ b/libkdcraw/libkdcraw/kdcraw.h
@@ -48,7 +48,7 @@ class KDcrawPriv;
 
 class LIBKDCRAW_EXPORT KDcraw : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/libkdcraw/libkdcraw/rcombobox.cpp b/libkdcraw/libkdcraw/rcombobox.cpp
index c20c414..ef77888 100644
--- a/libkdcraw/libkdcraw/rcombobox.cpp
+++ b/libkdcraw/libkdcraw/rcombobox.cpp
@@ -68,7 +68,7 @@ RComboBox::RComboBox(TQWidget *parent)
     d->combo       = new KComboBox(this);
     d->resetButton = new TQToolButton(this);
     d->resetButton->setAutoRaise(true);
-    d->resetButton->setFocusPolicy(TQ_NoFocus);
+    d->resetButton->setFocusPolicy(TQWidget::NoFocus);
     d->resetButton->setIconSet(SmallIconSet("reload_page"));
     TQToolTip::add(d->resetButton, i18n("Reset to default value"));
 
diff --git a/libkdcraw/libkdcraw/rcombobox.h b/libkdcraw/libkdcraw/rcombobox.h
index 373b059..34926a4 100644
--- a/libkdcraw/libkdcraw/rcombobox.h
+++ b/libkdcraw/libkdcraw/rcombobox.h
@@ -45,7 +45,7 @@ class RComboBoxPriv;
 class LIBKDCRAW_EXPORT RComboBox : public TQHBox
 {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/libkdcraw/libkdcraw/rnuminput.cpp b/libkdcraw/libkdcraw/rnuminput.cpp
index b5c0465..39ecc3b 100644
--- a/libkdcraw/libkdcraw/rnuminput.cpp
+++ b/libkdcraw/libkdcraw/rnuminput.cpp
@@ -69,7 +69,7 @@ RIntNumInput::RIntNumInput(TQWidget *parent)
     d->input       = new KIntNumInput(this);
     d->resetButton = new TQToolButton(this);
     d->resetButton->setAutoRaise(true);
-    d->resetButton->setFocusPolicy(TQ_NoFocus);
+    d->resetButton->setFocusPolicy(TQWidget::NoFocus);
     d->resetButton->setIconSet(SmallIconSet("reload_page"));
     TQToolTip::add(d->resetButton, i18n("Reset to default value"));
 
@@ -167,7 +167,7 @@ RDoubleNumInput::RDoubleNumInput(TQWidget *parent)
     d->input       = new KDoubleNumInput(this);
     d->resetButton = new TQToolButton(this);
     d->resetButton->setAutoRaise(true);
-    d->resetButton->setFocusPolicy(TQ_NoFocus);
+    d->resetButton->setFocusPolicy(TQWidget::NoFocus);
     d->resetButton->setIconSet(SmallIconSet("reload_page"));
     TQToolTip::add(d->resetButton, i18n("Reset to default value"));
 
diff --git a/libkdcraw/libkdcraw/rnuminput.h b/libkdcraw/libkdcraw/rnuminput.h
index 28e3698..7e90da2 100644
--- a/libkdcraw/libkdcraw/rnuminput.h
+++ b/libkdcraw/libkdcraw/rnuminput.h
@@ -46,7 +46,7 @@ class RIntNumInputPriv;
 class LIBKDCRAW_EXPORT RIntNumInput : public TQHBox
 {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
@@ -89,7 +89,7 @@ class RDoubleNumInputPriv;
 class LIBKDCRAW_EXPORT RDoubleNumInput : public TQHBox
 {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 public: