nathan/slide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

- Remove _t postfix from struct defns

Browse Source 
- Remove inline header function definitions
- Change assorted functions to return structs rather than modifying an argument
This commit is contained in:
Alfred Reynolds
2021-08-05 19:50:07 +12:00
parent ceadcf7a54
commit eac73d618b
11 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/imageselector.h
View File

@@ -14,13 +14,13 @@ class ImageSelector
public:
ImageSelector(std::unique_ptr<PathTraverser>& pathTraverser);
virtual ~ImageSelector();
virtual const ImageDetails_t getNextImage(const ImageDisplayOptions_t &baseOptions) = 0;
void setDebugMode(bool debugModeIn) { debugMode = debugModeIn;}
virtual const ImageDetails getNextImage(const ImageDisplayOptions &baseOptions) = 0;
void setDebugMode(bool debugModeIn);
protected:
void populateImageDetails(const std::string&filename, ImageDetails_t &imageDetails, const ImageDisplayOptions_t &baseOptions);
bool imageValidForAspect(const ImageDetails_t& imageDetails);
bool imageMatchesFilter(const ImageDetails_t& imageDetails);
ImageDetails populateImageDetails(const std::string&filename, const ImageDisplayOptions &baseOptions);
bool imageValidForAspect(const ImageDetails& imageDetails);
bool imageMatchesFilter(const ImageDetails& imageDetails);
std::unique_ptr<PathTraverser>& pathTraverser;
bool debugMode = false;
};
@@ -30,7 +30,7 @@ class RandomImageSelector : public ImageSelector
public:
RandomImageSelector(std::unique_ptr<PathTraverser>& pathTraverser);
virtual ~RandomImageSelector();
virtual const ImageDetails_t getNextImage(const ImageDisplayOptions_t &baseOptions);
virtual const ImageDetails getNextImage(const ImageDisplayOptions &baseOptions);
private:
unsigned int selectRandom(const QStringList& images) const;
@@ -41,7 +41,7 @@ class ShuffleImageSelector : public ImageSelector
public:
ShuffleImageSelector(std::unique_ptr<PathTraverser>& pathTraverser);
virtual ~ShuffleImageSelector();
virtual const ImageDetails_t getNextImage(const ImageDisplayOptions_t &baseOptions);
virtual const ImageDetails getNextImage(const ImageDisplayOptions &baseOptions);
private:
void reloadImagesIfNoneLeft();
@@ -54,7 +54,7 @@ class SortedImageSelector : public ImageSelector
public:
SortedImageSelector(std::unique_ptr<PathTraverser>& pathTraverser);
virtual ~SortedImageSelector();
virtual const ImageDetails_t getNextImage(const ImageDisplayOptions_t &baseOptions);
virtual const ImageDetails getNextImage(const ImageDisplayOptions &baseOptions);
private:
void reloadImagesIfEmpty();