More warning squishing.

Make a note of LuaManager: either define the needed items
or hide them away.
This commit is contained in:
Jason Felds
2011-03-14 14:26:29 -04:00
parent 99a6812fe5
commit b7a5fd9e90
6 changed files with 25 additions and 32 deletions
+4 -4
View File
@@ -7116,7 +7116,7 @@
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_MISSING_PARENTHESES = YES;
@@ -7652,7 +7652,7 @@
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_MISSING_PARENTHESES = YES;
@@ -7987,7 +7987,7 @@
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_MISSING_PARENTHESES = YES;
@@ -8116,7 +8116,7 @@
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_MISSING_PARENTHESES = YES;
+3 -12
View File
@@ -55,18 +55,9 @@ public:
float fGainSeconds; // time gained back at the beginning of the song. LifeMeterTime only.
int iGainLives; // lives gained back at the beginning of the next song
CourseEntry()
{
bSecret = false;
bNoDifficult = false;
songSort = SongSort_Randomize;
iChooseIndex = 0;
sModifiers = "";
fGainSeconds = 0;
iGainLives = -1;
}
CourseEntry(): bSecret(false), bNoDifficult(false),
songSort(SongSort_Randomize), iChooseIndex(0),
sModifiers(RString("")), fGainSeconds(0), iGainLives(-1) {}
bool IsFixedSong() const { return songID.IsValid(); }
+6
View File
@@ -42,6 +42,9 @@ public:
private:
lua_State *m_pLuaMain;
// Swallow up warnings. If they must be used, define them.
LuaManager& operator=(const LuaManager& rhs);
LuaManager(const LuaManager& rhs);
};
extern LuaManager *LUA;
@@ -155,6 +158,9 @@ private:
LuaReference *m_Name;
LuaReference *m_pOldValue;
// Swallow up warnings. If they must be used, define them.
LuaThreadVariable& operator=(const LuaThreadVariable& rhs);
};
/**
+1 -2
View File
@@ -112,9 +112,8 @@ class CachedObjectPointer
public:
typedef CachedObject<T> Object;
CachedObjectPointer()
CachedObjectPointer() : m_pCache(NULL), m_bCacheIsSet(false)
{
m_bCacheIsSet = false;
Object::Register( this );
}
+3 -6
View File
@@ -48,15 +48,12 @@ public:
} /** @brief The Song's locked status. */ m_Locked;
/** @brief Set up the initial criteria. */
StepsCriteria()
StepsCriteria(): m_difficulty(Difficulty_Invalid),
m_iLowMeter(-1), m_iHighMeter(-1),
m_st(StepsType_Invalid), m_Locked(Locked_DontCare)
{
m_difficulty = Difficulty_Invalid;
m_iLowMeter = -1;
m_iHighMeter = -1;
//m_fLowBPM = -1;
//m_fHighBPM = -1;
m_st = StepsType_Invalid;
m_Locked = Locked_DontCare;
}
/**
+8 -8
View File
@@ -52,16 +52,16 @@ enum UnlockEntryStatus {
class UnlockEntry
{
public:
UnlockEntry()
/**
* @brief Set up the UnlockEntry with default values.
*
* m_sEntryID starts as an empty string. It will be filled automatically
* if not specified. */
UnlockEntry(): m_Type(UnlockRewardType_Invalid),
m_dc(Difficulty_Invalid), m_bRequirePassHardSteps(false),
m_bRoulette(false), m_sEntryID(RString(""))
{
m_Type = UnlockRewardType_Invalid;
m_dc = Difficulty_Invalid;
ZERO( m_fRequirement );
m_bRequirePassHardSteps = false;
m_bRoulette = false;
m_sEntryID = ""; // "" means not yet filled. This will be filled in automatically if not specified.
}
UnlockRewardType m_Type;