Further reduction of include dependencies

This commit is contained in:
Ingo Weyrich
2019-11-01 12:51:08 +01:00
parent 785273e7bf
commit 962f81f6bc
12 changed files with 93 additions and 59 deletions

View File

@@ -24,13 +24,21 @@
#include <glibmm/ustring.h>
#include "cacheimagedata.h"
#include "cachemanager.h"
#include "threadutils.h"
#include "thumbnaillistener.h"
#include "../rtengine/rtengine.h"
#include "../rtengine/rtthumbnail.h"
namespace rtengine
{
class Thumbnail;
namespace procparams
{
class ProcParams;
}
}
class CacheManager;
struct ParamsEdited;
@@ -98,14 +106,8 @@ public:
void notifylisterners_procParamsChanged(int whoChangedIt);
bool isQuick() const
{
return cfs.thumbImgType == CacheImageData::QUICK_THUMBNAIL;
}
bool isPParamsValid() const
{
return pparamsValid;
}
bool isQuick() const;
bool isPParamsValid() const;
bool isRecentlySaved () const;
void imageDeveloped ();
void imageEnqueued ();
@@ -123,29 +125,10 @@ public:
const Glib::ustring& getExifString () const;
const Glib::ustring& getDateTimeString () const;
void getCamWB (double& temp, double& green) const
{
if (tpp) {
tpp->getCamWB (temp, green);
} else {
temp = green = -1.0;
}
}
void getCamWB (double& temp, double& green) const;
void getAutoWB (double& temp, double& green, double equal, double tempBias);
void getSpotWB (int x, int y, int rect, double& temp, double& green)
{
if (tpp) {
tpp->getSpotWB (getProcParams(), x, y, rect, temp, green);
} else {
temp = green = -1.0;
}
}
void applyAutoExp (rtengine::procparams::ProcParams& pparams)
{
if (tpp) {
tpp->applyAutoExp (pparams);
}
}
void getSpotWB (int x, int y, int rect, double& temp, double& green);
void applyAutoExp (rtengine::procparams::ProcParams& pparams);
ThFileType getType ();
Glib::ustring getFileName () const
@@ -156,14 +139,8 @@ public:
bool isSupported ();
const CacheImageData* getCacheImageData()
{
return &cfs;
}
std::string getMD5 () const
{
return cfs.md5;
}
const CacheImageData* getCacheImageData();
std::string getMD5 () const;
int getRank () const;
void setRank (int rank);