Further cleanup of include dependencies

2019-10-29 21:06:27 +01:00 · 2019-10-29 21:06:27 +01:00 · 068847eb5a
commit 068847eb5a
parent ed161c6288
57 changed files with 70 additions and 83 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@ -121,7 +121,6 @@ set(RTENGINESOURCEFILES
    rtthumbnail.cc
    shmap.cc
    simpleprocess.cc
-    slicer.cc
    stdimagesource.cc
    tmo_fattal02.cc
    utils.cc
--- a/rtengine/LUT.h
+++ b/rtengine/LUT.h
@ -64,7 +64,6 @@
 #include <cassert>

 #ifndef NDEBUG
-#include <glibmm.h>
 #include <fstream>
 #endif

@ -485,26 +484,6 @@ public:
        return (p1 + p2 * diff);
    }

-#ifndef NDEBUG
-    // Debug facility ; dump the content of the LUT in a file. No control of the filename is done
-    void dump(Glib::ustring fname)
-    {
-        if (size) {
-            Glib::ustring fname_ = fname + ".xyz"; // TopSolid'Design "plot" file format
-            std::ofstream f (fname_.c_str());
-            f << "$" << std::endl;
-
-            for (unsigned int iter = 0; iter < size; iter++) {
-                f << iter << ", " << data[iter] << ", 0." << std::endl;
-            }
-
-            f << "$" << std::endl;
-            f.close ();
-        }
-    }
-#endif
-
-
    operator bool (void) const
    {
        return size > 0;
--- a/rtengine/bilateral2.h
+++ b/rtengine/bilateral2.h
@ -22,7 +22,6 @@
 #include <cmath>
 #include <cstring>
 #include <cstdio>
-#include <glibmm.h>

 #include "rtengine.h"
 #include "rt_math.h"
--- a/rtengine/camconst.cc
+++ b/rtengine/camconst.cc
@ -2,6 +2,9 @@
 *  This file is part of RawTherapee.
 */
 #include "camconst.h"
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/ustring.h>
 #include "settings.h"
 #include "rt_math.h"
 #include <cstdio>
--- a/rtengine/camconst.h
+++ b/rtengine/camconst.h
@ -4,8 +4,9 @@
 #ifndef __CAMCONST__
 #define __CAMCONST__

-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <map>
+#include <vector>

 namespace rtengine
 {
--- a/rtengine/clutstore.h
+++ b/rtengine/clutstore.h
@ -3,8 +3,6 @@
 #include <memory>
 #include <cstdint>

-#include <gtkmm.h>
-
 #include "cache.h"
 #include "alignedbuffer.h"
 #include "noncopyable.h"
--- a/rtengine/color.h
+++ b/rtengine/color.h
@ -20,7 +20,7 @@
 #pragma once

 #include <array>
-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "rt_math.h"
 #include "LUT.h"
--- a/rtengine/curves.h
+++ b/rtengine/curves.h
@ -22,7 +22,7 @@
 #include <string>
 #include <vector>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "rt_math.h"
 #include "../rtgui/mycurve.h"
--- a/rtengine/dcp.h
+++ b/rtengine/dcp.h
@ -24,7 +24,7 @@
 #include <array>
 #include <memory>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "../rtgui/threadutils.h"

--- a/rtengine/dfmanager.cc
+++ b/rtengine/dfmanager.cc
@ -19,7 +19,6 @@
 #include "dfmanager.h"
 #include "../rtgui/options.h"
 #include <giomm.h>
-#include "../rtgui/guiutils.h"
 #include "rawimage.h"
 #include <sstream>
 #include <iostream>
--- a/rtengine/dynamicprofile.cc
+++ b/rtengine/dynamicprofile.cc
@ -17,10 +17,11 @@
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */

-#include "../rtengine/dynamicprofile.h"
+#include "dynamicprofile.h"

 #include <stdlib.h>
 #include <glibmm/regex.h>
+#include <glibmm/miscutils.h>

 using namespace rtengine;
 using namespace rtengine::procparams;
--- a/rtengine/dynamicprofile.h
+++ b/rtengine/dynamicprofile.h
@ -19,7 +19,7 @@
 #ifndef _DYNAMICPROFILE_H_
 #define _DYNAMICPROFILE_H_

-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <vector>
 #include "../rtgui/options.h"

--- a/rtengine/ffmanager.cc
+++ b/rtengine/ffmanager.cc
@ -16,6 +16,10 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
+
+#include <giomm/file.h>
+#include <glibmm/miscutils.h>
+
 #include "ffmanager.h"
 #include "../rtgui/options.h"
 #include "rawimage.h"
--- a/rtengine/iccstore.cc
+++ b/rtengine/iccstore.cc
@ -18,7 +18,9 @@
 */
 #include <cstring>

-#include <glibmm.h>
+#include <glibmm/ustring.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 #include <glib/gstdio.h>

 #ifdef WIN32
--- a/rtengine/iccstore.h
+++ b/rtengine/iccstore.h
@ -19,10 +19,11 @@
 #pragma once

 #include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include <lcms2.h>

--- a/rtengine/iimage.h
+++ b/rtengine/iimage.h
@ -19,7 +19,7 @@
 #ifndef _IIMAGE_
 #define _IIMAGE_

-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <vector>
 #include "rt_math.h"
 #include "alignedbuffer.h"
--- a/rtengine/imagedata.h
+++ b/rtengine/imagedata.h
@ -22,7 +22,7 @@
 #include <cstdio>
 #include <memory>
 #include <string>
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include "../rtexif/rtexif.h"
 #include <libiptcdata/iptc-data.h>
 #include "rtengine.h"
--- a/rtengine/imageio.h
+++ b/rtengine/imageio.h
@ -30,7 +30,7 @@

 #include <memory>

-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <libiptcdata/iptc-data.h>
 #include "rtengine.h"
 #include "imageformat.h"
--- a/rtengine/imagesource.h
+++ b/rtengine/imagesource.h
@ -21,7 +21,7 @@
 #include <array>
 #include <vector>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "coord2d.h"
 #include "dcp.h"
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@ -18,7 +18,7 @@
 */
 #include <cmath>
 #include <glib.h>
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #ifdef _OPENMP
 #include <omp.h>
 #endif
@ -46,7 +46,6 @@
 #include "StopWatch.h"
 #include "procparams.h"
 #include "../rtgui/ppversion.h"
-#include "../rtgui/guiutils.h"
 #include "../rtgui/editcallbacks.h"

 #undef CLIPD
--- a/rtengine/iplab2rgb.cc
+++ b/rtengine/iplab2rgb.cc
@ -21,7 +21,7 @@
 #include "imagefloat.h"
 #include "labimage.h"
 #include "improcfun.h"
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include "iccstore.h"
 #include "iccmatrices.h"
 #include "../rtgui/options.h"
--- a/rtengine/lcp.cc
+++ b/rtengine/lcp.cc
@ -20,6 +20,8 @@
 #include <algorithm>
 #include <cstring>

+#include <glibmm/ustring.h>
+#include <glibmm/fileutils.h>
 #include <glib/gstdio.h>

 #ifdef WIN32
--- a/rtengine/lcp.h
+++ b/rtengine/lcp.h
@ -25,7 +25,7 @@
 #include <string>
 #include <sstream>

-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <expat.h>

 #include "cache.h"
--- a/rtengine/myfile.cc
+++ b/rtengine/myfile.cc
@ -18,7 +18,6 @@
 */
 #include "myfile.h"
 #include <cstdarg>
-#include <glibmm.h>

 // get mmap() sorted out
 #ifdef MYFILE_MMAP
--- a/rtengine/previewimage.h
+++ b/rtengine/previewimage.h
@ -19,7 +19,7 @@
 #ifndef _PREVIEWIMAGE_
 #define _PREVIEWIMAGE_

-#include <gtkmm.h>
+#include <glibmm/ustring.h>
 #include <cairomm/cairomm.h>

 namespace rtengine
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@ -23,7 +23,8 @@
 #include <type_traits>
 #include <vector>

-#include <glibmm.h>
+#include <glibmm/ustring.h>
+#include <glibmm/keyfile.h>
 #include <lcms2.h>

 #include "noncopyable.h"
--- a/rtengine/profilestore.cc
+++ b/rtengine/profilestore.cc
@ -16,6 +16,10 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
+
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
+
 #include "profilestore.h"

 #include "dynamicprofile.h"
--- a/rtengine/profilestore.h
+++ b/rtengine/profilestore.h
@ -21,7 +21,7 @@

 #include <map>
 #include <vector>
-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "rtengine.h"
 #include "noncopyable.h"
--- a/rtengine/rtengine.h
+++ b/rtengine/rtengine.h
@ -22,7 +22,7 @@
 #include <ctime>
 #include <string>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include <lcms2.h>

--- a/rtengine/rtlensfun.h
+++ b/rtengine/rtlensfun.h
@ -23,7 +23,7 @@
 #include <memory>
 #include <vector>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include <lensfun.h>

--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@ -24,7 +24,7 @@
 #include "image8.h"
 #include <lcms2.h>
 #include "curves.h"
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include "improcfun.h"
 #include "colortemp.h"
 #include "mytime.h"
--- a/rtengine/rtthumbnail.h
+++ b/rtengine/rtthumbnail.h
@ -20,7 +20,7 @@
 #define _THUMBPROCESSINGPARAMETERS_

 #include "rawmetadatalocation.h"
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <lcms2.h>
 #include "image8.h"
 #include "image16.h"
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@ -28,7 +28,7 @@
 #include "clutstore.h"
 #include "processingjob.h"
 #include "procparams.h"
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include "../rtgui/options.h"
 #include "rawimagesource.h"
 #include "../rtgui/multilangmgr.h"
--- a/rtexif/rtexif.h
+++ b/rtexif/rtexif.h
@ -30,7 +30,8 @@
 #include <string>
 #include <vector>

-#include <glibmm.h>
+#include <glibmm/keyfile.h>
+#include <glibmm/ustring.h>

 #include "../rtengine/noncopyable.h"
 #include "../rtengine/rawmetadatalocation.h"
--- a/rtgui/batchqueue.cc
+++ b/rtgui/batchqueue.cc
@ -16,7 +16,7 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <glib/gstdio.h>
 #include <cstring>
 #include <functional>
--- a/rtgui/bqentryupdater.h
+++ b/rtgui/bqentryupdater.h
@ -19,7 +19,8 @@
 #ifndef _BQENTRYUPDATER_
 #define _BQENTRYUPDATER_

-#include <glibmm.h>
+#include <glibmm/thread.h>
+
 #include "../rtengine/rtengine.h"
 #include "threadutils.h"
 #include "thumbnail.h"
--- a/rtgui/browserfilter.h
+++ b/rtgui/browserfilter.h
@ -19,8 +19,9 @@
 #ifndef _BROWSERFILTER_
 #define _BROWSERFILTER_

+#include <vector>
+
 #include "exiffiltersettings.h"
-#include <glibmm.h>

 class BrowserFilter
 {
--- a/rtgui/cacheimagedata.h
+++ b/rtgui/cacheimagedata.h
@ -19,7 +19,7 @@
 #ifndef _CACHEIMAGEDATA_
 #define _CACHEIMAGEDATA_

-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include "options.h"
 #include "../rtengine/rtengine.h"
 #include "../rtengine/imageformat.h"
--- a/rtgui/extprog.cc
+++ b/rtgui/extprog.cc
@ -26,6 +26,8 @@
 #include <shlobj.h>
 #endif

+#include <gtkmm.h>
+
 #include "options.h"
 #include "multilangmgr.h"

--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@ -21,7 +21,7 @@
 #include <algorithm>
 #include <map>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "filebrowser.h"

--- a/rtgui/filmsimulation.h
+++ b/rtgui/filmsimulation.h
@ -2,7 +2,7 @@
 #define FILM_SIMULATION_INCLUDED

 #include <gtkmm.h>
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <memory>
 #include "toolpanel.h"
 #include "guiutils.h"
--- a/rtgui/histogrampanel.h
+++ b/rtgui/histogrampanel.h
@ -21,7 +21,7 @@


 #include <gtkmm.h>
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <cairomm/cairomm.h>
 #include "../rtengine/LUT.h"
 #include "../rtengine/improccoordinator.h"
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@ -18,9 +18,10 @@
 */
 #include <map>
 #include <set>
+#include <iostream>
 #include <sstream>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "lensprofile.h"

--- a/rtgui/mycurve.h
+++ b/rtgui/mycurve.h
@ -26,7 +26,6 @@
 #include "coloredbar.h"
 #include "coordinateadjuster.h"
 #include "../rtengine/LUT.h"
-#include "guiutils.h"
 #include "options.h"
 #include "../rtengine/noncopyable.h"

--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@ -19,6 +19,7 @@
 #include "options.h"
 #include <cstdio>
 #include <glib/gstdio.h>
+#include <iostream>
 #include <sstream>
 #include "multilangmgr.h"
 #include "addsetids.h"
--- a/rtgui/options.h
+++ b/rtgui/options.h
@ -20,7 +20,7 @@
 #define _OPTIONS_

 #include <set>
-#include <gtkmm.h>
+#include <gtkmm/enums.h>
 #include "../rtengine/rtengine.h"
 #include <exception>

--- a/rtgui/pathutils.cc
+++ b/rtgui/pathutils.cc
@ -16,6 +16,8 @@
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */

+#include <glibmm/miscutils.h>
+
 #include "pathutils.h"


--- a/rtgui/pathutils.h
+++ b/rtgui/pathutils.h
@ -16,19 +16,9 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
-#ifndef __PATH_UTILS_
-#define __PATH_UTILS_
-
-#include <gtkmm.h>
-#include <cairomm/cairomm.h>
-#include "../rtengine/rtengine.h"
-#include "../rtengine/coord.h"
-#include "rtimage.h"
-#include <sstream>
-#include <iostream>
+#pragma once
+#include <glibmm/ustring.h>

 // Removed from guiutils because used by rawtherapee-cli
 Glib::ustring removeExtension (const Glib::ustring& filename);
 Glib::ustring getExtension (const Glib::ustring& filename);
-
-#endif
--- a/rtgui/pparamschangelistener.h
+++ b/rtgui/pparamschangelistener.h
@ -20,7 +20,7 @@
 #define _PPARAMSCHANGELISTENER_

 #include "../rtengine/rtengine.h"
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include "paramsedited.h"

 class PParamsChangeListener
--- a/rtgui/previewloader.h
+++ b/rtgui/previewloader.h
@ -20,7 +20,7 @@
 #define _PREVIEWLOADER_

 #include <set>
-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "../rtengine/noncopyable.h"

--- a/rtgui/profilestorecombobox.h
+++ b/rtgui/profilestorecombobox.h
@ -21,7 +21,7 @@

 #include <map>
 #include <vector>
-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "../rtengine/rtengine.h"
 #include "../rtengine/profilestore.h"
--- a/rtgui/rtscalable.cc
+++ b/rtgui/rtscalable.cc
@ -20,7 +20,7 @@
 #include "rtscalable.h"
 #include <glib/gstdio.h>
 #include <regex>
-#include <glibmm.h>
+#include <gtkmm.h>
 #include <iostream>
 #include <librsvg/rsvg.h>
 #include "options.h"
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@ -16,7 +16,7 @@
 */
 #include <numeric>

-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "multilangmgr.h"
 #include "options.h"
--- a/rtgui/thumbimageupdater.h
+++ b/rtgui/thumbimageupdater.h
@ -19,7 +19,6 @@
 #ifndef _THUMBIMAGEUPDATER_
 #define _THUMBIMAGEUPDATER_

-#include <glibmm.h>
 #include <glib.h>

 #include "../rtengine/rtengine.h"
--- a/rtgui/thumbnail.cc
+++ b/rtgui/thumbnail.cc
@ -23,7 +23,6 @@
 #include "../rtengine/mytime.h"
 #include <cstdio>
 #include <cstdlib>
-#include <glibmm.h>
 #include "../rtengine/colortemp.h"
 #include "../rtengine/imagedata.h"
 #include "../rtengine/procparams.h"
--- a/rtgui/thumbnail.h
+++ b/rtgui/thumbnail.h
@ -22,7 +22,7 @@
 #include <memory>
 #include <string>

-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include "cachemanager.h"
 #include "options.h"
 #include "../rtengine/rtengine.h"
--- a/rtgui/toolpanel.h
+++ b/rtgui/toolpanel.h
@ -20,7 +20,7 @@
 #define __TOOLPANEL__

 #include <gtkmm.h>
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include "../rtengine/rtengine.h"
 #include "editbuffer.h"
 #include "guiutils.h"