added : Qt5 compatibility

ImageProcessing-ElectronicPublications · Jun 12, 2021 · a2e6610 · a2e6610 · zvezdochiot · Jun 12, 2021
1 parent a706797
commit a2e6610
Show file tree

Hide file tree

Showing 57 changed files with 150 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@
 
 # Auto-genereated files
 Makefile
-moc_*.cpp
+.qmake.stash
 build/
 
 TODO
diff --git a/README.md b/README.md
@@ -15,11 +15,11 @@ A set of plugins for the viewer [photoquick](https://github.com/ImageProcessing-
 * libgomp1
 
 ### Build 
-
+It can be built with either Qt4 or Qt5  
 #### Linux
 Install dependencies...  
 **Build dependencies ...**  
- * libqt4-dev  
+ * libqt4-dev or qtbase5-dev  
 
 To build this program, extract the source code zip.  
 Open terminal and change directory to src/  

diff --git a/src/colors/grayscale-local/grayscale-local.pro b/src/colors/grayscale-local/grayscale-local.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11
 QMAKE_LFLAGS   += -s
 LIBS           +=
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/colors/grayscale-local/grayscale_local.cpp b/src/colors/grayscale-local/grayscale_local.cpp
@@ -9,7 +9,9 @@
 #define PLUGIN_NAME "GrayScale (Local)"
 #define PLUGIN_VERSION "1.0"
 
-Q_EXPORT_PLUGIN2(grayscale-local, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(grayscale-local, FilterPlugin);
+#endif
 
 QImage color2gray(QImage &image, int radius, int samples, int iterations, bool enhance_shadows);
 

diff --git a/src/colors/grayscale-local/grayscale_local.h b/src/colors/grayscale-local/grayscale_local.h
@@ -12,6 +12,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/colors/invert/invert.cpp b/src/colors/invert/invert.cpp
@@ -4,8 +4,9 @@
 #define PLUGIN_MENU "Filters/Color/Invert%Negative"
 #define PLUGIN_VERSION "4.3.3"
 
-// first parameter is name of plugin, usually same as the library file name
-Q_EXPORT_PLUGIN2(invert, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(invert, FilterPlugin);
+#endif
 
 //********* ---------- Invert Colors or Negate --------- ********** //
 void invert(QImage &img)

diff --git a/src/colors/invert/invert.h b/src/colors/invert/invert.h
@@ -5,6 +5,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/colors/invert/invert.pro b/src/colors/invert/invert.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11
 QMAKE_LFLAGS   += -s
 LIBS           +=
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/colors/stretch-histogram/stretch-histogram.pro b/src/colors/stretch-histogram/stretch-histogram.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11
 QMAKE_LFLAGS   += -s
 LIBS           +=
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/colors/stretch-histogram/stretch_histogram.cpp b/src/colors/stretch-histogram/stretch_histogram.cpp
@@ -7,7 +7,9 @@
 #define PLUGIN_MENU "Filters/Color/Histogram Equalize"
 #define PLUGIN_VERSION "1.0"
 
-Q_EXPORT_PLUGIN2(stretch-histogram, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(stretch-histogram, FilterPlugin);
+#endif
 
 //*********** ------------ Stretch Histogram ----------- ************ //
 /* This filter gives same effect as GIMP Colors->Auto->Equalize

diff --git a/src/colors/stretch-histogram/stretch_histogram.h b/src/colors/stretch-histogram/stretch_histogram.h
@@ -5,6 +5,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/colors/unalpha/unalpha.cpp b/src/colors/unalpha/unalpha.cpp
@@ -4,8 +4,9 @@
 #define PLUGIN_MENU "Filters/Color/UnAlpha"
 #define PLUGIN_VERSION "1.0"
 
-// first parameter is name of plugin, usually same as the library file name
-Q_EXPORT_PLUGIN2(unalpha, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(unalpha, FilterPlugin);
+#endif
 
 // ********************** Unalpha *********************
 

diff --git a/src/colors/unalpha/unalpha.h b/src/colors/unalpha/unalpha.h
@@ -5,6 +5,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/colors/unalpha/unalpha.pro b/src/colors/unalpha/unalpha.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11
 QMAKE_LFLAGS   += -s
 LIBS           +=
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/decorate/photo-frame/photo-frame.pro b/src/decorate/photo-frame/photo-frame.pro
@@ -12,6 +12,8 @@ QMAKE_CXXFLAGS  = -std=c++11
 QMAKE_LFLAGS   += -s
 LIBS           +=
 
+QT += widgets
+
 UI_DIR  =     $$DESTDIR/build
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build

diff --git a/src/decorate/photo-frame/photo_frame.cpp b/src/decorate/photo-frame/photo_frame.cpp
@@ -2,12 +2,15 @@
     Copyright (C) 2021 Arindam Chaudhuri <ksharindam@gmail.com>
 */
 #include "photo_frame.h"
+#include <QMimeData>
 
 #define PLUGIN_NAME "Photo Frame"
 #define PLUGIN_MENU "Decorate/Add Photo Frame"
 #define PLUGIN_VERSION "1.0"
 
-Q_EXPORT_PLUGIN2(photo-frame, ToolPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(photo-frame, ToolPlugin);
+#endif
 
 #define MIN(a,b) ((a)<(b) ? (a):(b))
 

diff --git a/src/decorate/photo-frame/photo_frame.h b/src/decorate/photo-frame/photo_frame.h
@@ -15,6 +15,9 @@ class ToolPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/effects/kuwahara/kuwahara.cpp b/src/effects/kuwahara/kuwahara.cpp
@@ -4,7 +4,9 @@
 #define PLUGIN_MENU "Filters/Effects/Kuwahara Filter"
 #define PLUGIN_VERSION "1.0"
 
-Q_EXPORT_PLUGIN2(kuwahara, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(kuwahara, FilterPlugin);
+#endif
 
 // takes 4 pixels and a floating point coordinate, returns bilinear interpolated pixel
 QRgb interpolateBilinear(float x, float y, QRgb p00, QRgb p01, QRgb p10, QRgb p11)

diff --git a/src/effects/kuwahara/kuwahara.h b/src/effects/kuwahara/kuwahara.h
@@ -7,6 +7,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/effects/kuwahara/kuwahara.pro b/src/effects/kuwahara/kuwahara.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11 -fopenmp
 QMAKE_LFLAGS   += -s
 LIBS           += -lgomp
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/effects/tone-mapping/tone-mapping.pro b/src/effects/tone-mapping/tone-mapping.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11 -fopenmp
 QMAKE_LFLAGS   += -s -lgomp
 LIBS           +=
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/effects/tone-mapping/tone_mapping.cpp b/src/effects/tone-mapping/tone_mapping.cpp
@@ -6,7 +6,9 @@
 #define PLUGIN_NAME "Tone Mapping"
 #define PLUGIN_VERSION "1.0"
 
-Q_EXPORT_PLUGIN2(tone-mapping, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(tone-mapping, FilterPlugin);
+#endif
 
 void toneMapping_mantiuk06(QImage &img, float contrast=0.1, float saturation=0.8);
 

diff --git a/src/effects/tone-mapping/tone_mapping.h b/src/effects/tone-mapping/tone_mapping.h
@@ -11,6 +11,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/plugin.h b/src/plugin.h
@@ -71,7 +71,8 @@ class Plugin
     virtual void sendNotification(QString title, QString message) = 0;
 };
 
+#define Plugin_iid "photoquick.Plugin/1.0"
 
-Q_DECLARE_INTERFACE(Plugin, "photoquick.Plugin");
+Q_DECLARE_INTERFACE(Plugin, Plugin_iid);
 
 #endif /* __PHOTOQUIK_PLUGIN */
diff --git a/src/threshold/bimodal-adaptive/bimodal-adaptive.pro b/src/threshold/bimodal-adaptive/bimodal-adaptive.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11 -fopenmp
 QMAKE_LFLAGS   += -s
 LIBS           += -lgomp
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/threshold/bimodal-adaptive/bimodal_adaptive.cpp b/src/threshold/bimodal-adaptive/bimodal_adaptive.cpp
@@ -4,8 +4,9 @@
 #define PLUGIN_MENU "Filters/Threshold/Bimodal adaptive"
 #define PLUGIN_VERSION "4.4.3"
 
-// first parameter is name of plugin, usually same as the library file name
-Q_EXPORT_PLUGIN2(adaptive_bimodal, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(adaptive_bimodal, FilterPlugin);
+#endif
 
 int SelectChannelPixel(QRgb pix, int channel)
 {

diff --git a/src/threshold/bimodal-adaptive/bimodal_adaptive.h b/src/threshold/bimodal-adaptive/bimodal_adaptive.h
@@ -19,6 +19,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/threshold/bimodal-threshold/bimodal-threshold.pro b/src/threshold/bimodal-threshold/bimodal-threshold.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11 -fopenmp
 QMAKE_LFLAGS   += -s
 LIBS           += -lgomp
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/threshold/bimodal-threshold/bimodal_thresh.cpp b/src/threshold/bimodal-threshold/bimodal_thresh.cpp
@@ -4,8 +4,9 @@
 #define PLUGIN_MENU "Filters/Threshold/Bimodal"
 #define PLUGIN_VERSION "1.1"
 
-// first parameter is name of plugin, usually same as the library file name
-Q_EXPORT_PLUGIN2(bimodal_thresh, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(bimodal_thresh, FilterPlugin);
+#endif
 
 // ********************** Bimodal Threshold *********************
 int histogram_darkest(long long hist[])

diff --git a/src/threshold/bimodal-threshold/bimodal_thresh.h b/src/threshold/bimodal-threshold/bimodal_thresh.h
@@ -11,6 +11,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/threshold/dalg/dalg.cpp b/src/threshold/dalg/dalg.cpp
@@ -4,8 +4,9 @@
 #define PLUGIN_MENU "Filters/Threshold/Dalg"
 #define PLUGIN_VERSION "1.0"
 
-// first parameter is name of plugin, usually same as the library file name
-Q_EXPORT_PLUGIN2(dalg_thresh, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(dalg_thresh, FilterPlugin);
+#endif
 
 // **** D-algoritm dither ****
 void dalg(QImage &img, unsigned tcount, int tdelta)

diff --git a/src/threshold/dalg/dalg.h b/src/threshold/dalg/dalg.h
@@ -10,6 +10,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/threshold/dalg/dalg.pro b/src/threshold/dalg/dalg.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11 -fopenmp
 QMAKE_LFLAGS   += -s
 LIBS           += -lgomp
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/threshold/dither/dither.cpp b/src/threshold/dither/dither.cpp
@@ -4,8 +4,9 @@
 #define PLUGIN_MENU "Filters/Threshold/Dither"
 #define PLUGIN_VERSION "1.0"
 
-// first parameter is name of plugin, usually same as the library file name
-Q_EXPORT_PLUGIN2(dither_thresh, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(dither_thresh, FilterPlugin);
+#endif
 
 // **** Dither of D.E.Knuth "Computer Typesetting" ****
 void dither(QImage &img, unsigned tcount, int tdelta, int kpg)

diff --git a/src/threshold/dither/dither.h b/src/threshold/dither/dither.h
@@ -10,6 +10,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();

diff --git a/src/threshold/dither/dither.pro b/src/threshold/dither/dither.pro
@@ -11,6 +11,8 @@ QMAKE_CXXFLAGS  = -std=c++11 -fopenmp
 QMAKE_LFLAGS   += -s
 LIBS           += -lgomp
 
+QT += widgets
+
 MOC_DIR =     $$DESTDIR/build
 OBJECTS_DIR = $$DESTDIR/build
 

diff --git a/src/threshold/quant/quant.cpp b/src/threshold/quant/quant.cpp
@@ -4,8 +4,9 @@
 #define PLUGIN_MENU "Filters/Threshold/Quant"
 #define PLUGIN_VERSION "1.0"
 
-// first parameter is name of plugin, usually same as the library file name
-Q_EXPORT_PLUGIN2(quant, FilterPlugin);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    Q_EXPORT_PLUGIN2(quant, FilterPlugin);
+#endif
 
 // ********************** Quant Simple *********************
 

diff --git a/src/threshold/quant/quant.h b/src/threshold/quant/quant.h
@@ -10,6 +10,9 @@ class FilterPlugin : public QObject, Plugin
 {
     Q_OBJECT
     Q_INTERFACES(Plugin)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_PLUGIN_METADATA(IID Plugin_iid)
+#endif
 
 public:
     QString menuItem();