Fixing compiler warnings for linux

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

View File

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

View File

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

View File

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

View File

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