funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-06-06 10:56:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing compiler warnings for linux

Browse Source
This commit is contained in:
emb
2015-02-25 17:54:40 -06:00
parent 17a3ecd97f
commit 1c3758499a
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RetroFE/Source/Collection/CollectionInfoBuilder.h
View File

@@ -32,8 +32,8 @@ public:
CollectionInfo *BuildCollection(std::string collectionName); CollectionInfo *BuildCollection(std::string collectionName);
private: private:
Configuration &Conf;
MetadataDatabase &MetaDB; MetadataDatabase &MetaDB;
bool ImportBasicList(CollectionInfo *info, std::string file, std::map<std::string, Item *> &list); bool ImportBasicList(CollectionInfo *info, std::string file, std::map<std::string, Item *> &list);
bool ImportDirectory(CollectionInfo *info); bool ImportDirectory(CollectionInfo *info);
Configuration &Conf;
}; };

2
RetroFE/Source/Database/DB.h
View File

@@ -30,7 +30,7 @@ public:
} }
private: private:
sqlite3 *Handle;
std::string Path; std::string Path;
sqlite3 *Handle;
}; };

3
RetroFE/Source/Graphics/Component/ReloadableMedia.cpp
View File

@@ -33,11 +33,12 @@ ReloadableMedia::ReloadableMedia(Configuration &config, std::string type, bool i
, LoadedComponent(NULL) , LoadedComponent(NULL)
, ReloadRequested(false) , ReloadRequested(false)
, FirstLoad(true) , FirstLoad(true)
, Type(type) , VideoInst(NULL)
, IsVideo(isVideo) , IsVideo(isVideo)
, FontInst(font) , FontInst(font)
, FontColor(fontColor) , FontColor(fontColor)
, TextFallback(false) , TextFallback(false)
, Type(type)
, ScaleX(scaleX) , ScaleX(scaleX)
, ScaleY(scaleY) , ScaleY(scaleY)
{ {

6
RetroFE/Source/Graphics/Component/ScrollingList.cpp
View File

@@ -49,6 +49,7 @@ ScrollingList::ScrollingList(Configuration &c,
, ScrollPoints(NULL) , ScrollPoints(NULL)
, TweenPoints(NULL) , TweenPoints(NULL)
, TweenEnterTime(0) , TweenEnterTime(0)
, Focus(false)
, FirstSpriteIndex(0) , FirstSpriteIndex(0)
, SelectedSpriteListIndex(0) , SelectedSpriteListIndex(0)
, ScrollStopRequested(true) , ScrollStopRequested(true)
@@ -66,7 +67,6 @@ ScrollingList::ScrollingList(Configuration &c,
, FontColor(fontColor) , FontColor(fontColor)
, LayoutKey(layoutKey) , LayoutKey(layoutKey)
, ImageType(imageType) , ImageType(imageType)
, Focus(false)
{ {
} }
@@ -74,6 +74,7 @@ ScrollingList::ScrollingList(const ScrollingList &copy)
: Component(copy) : Component(copy)
, SpriteList(NULL) , SpriteList(NULL)
, TweenEnterTime(0) , TweenEnterTime(0)
, Focus(false)
, FirstSpriteIndex(0) , FirstSpriteIndex(0)
, SelectedSpriteListIndex(0) , SelectedSpriteListIndex(0)
, ScrollStopRequested(true) , ScrollStopRequested(true)
@@ -91,7 +92,6 @@ ScrollingList::ScrollingList(const ScrollingList &copy)
, FontColor(copy.FontColor) , FontColor(copy.FontColor)
, LayoutKey(copy.LayoutKey) , LayoutKey(copy.LayoutKey)
, ImageType(copy.ImageType) , ImageType(copy.ImageType)
, Focus(false)
{ {
ScrollPoints = NULL; ScrollPoints = NULL;
@@ -467,7 +467,6 @@ void ScrollingList::TriggerMenuExitEvent()
void ScrollingList::Update(float dt) void ScrollingList::Update(float dt)
{ {
bool initializePoints = false;
Component::Update(dt); Component::Update(dt);
if(!ScrollPoints) if(!ScrollPoints)
@@ -512,7 +511,6 @@ void ScrollingList::Update(float dt)
// check to see if requested to scroll // check to see if requested to scroll
if(RequestedScrollDirection != ScrollDirectionIdle) if(RequestedScrollDirection != ScrollDirectionIdle)
{ {
initializePoints = true;
CurrentScrollState = ScrollStateActive; CurrentScrollState = ScrollStateActive;
CurrentScrollDirection = RequestedScrollDirection; CurrentScrollDirection = RequestedScrollDirection;
scrollRequested = true; scrollRequested = true;