mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix more "type qualifiers ignored on function return type" warnings

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@105 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2009-12-21 17:26:15 +00:00
parent 1b13da2617
commit 732ffb18be
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/fontrenderer.cpp
View File

@@ -166,7 +166,7 @@ FT_Error FBFontRenderClass::getGlyphBitmap(FTC_ScalerRec *sc, FT_ULong glyph_ind
return FTC_SBitCache_LookupScaler(sbitsCache, sc, FT_LOAD_DEFAULT, glyph_index, sbit, NULL); return FTC_SBitCache_LookupScaler(sbitsCache, sc, FT_LOAD_DEFAULT, glyph_index, sbit, NULL);
} }
const char * const FBFontRenderClass::AddFont(const char * const filename, const bool make_italics) const char *FBFontRenderClass::AddFont(const char * const filename, const bool make_italics)
{ {
fflush(stdout); fflush(stdout);
int error; int error;

2
src/driver/fontrenderer.h
View File

@@ -113,7 +113,7 @@ class FBFontRenderClass
std::string getFamily(const char * const filename) const; std::string getFamily(const char * const filename) const;
const char * const AddFont(const char * const filename, const bool make_italics = false); const char * AddFont(const char * const filename, const bool make_italics = false);
FBFontRenderClass(const int xres = 72, const int yres = 72); FBFontRenderClass(const int xres = 72, const int yres = 72);
~FBFontRenderClass(); ~FBFontRenderClass();

6
src/gui/bookmarkmanager.h
View File

@@ -53,9 +53,9 @@ class CBookmark
std::string time; std::string time;
public: public:
CBookmark(const std::string & name, const std::string & url, const std::string & time); CBookmark(const std::string & name, const std::string & url, const std::string & time);
const char * const getName(void) const { return name.c_str(); }; const char *getName(void) const { return name.c_str(); };
const char * const getUrl (void) const { return url .c_str(); }; const char *getUrl (void) const { return url .c_str(); };
const char * const getTime(void) const { return time.c_str(); }; const char *getTime(void) const { return time.c_str(); };
inline void setName(const std::string & new_name) { name = new_name; }; inline void setName(const std::string & new_name) { name = new_name; };
inline void setUrl (const std::string & new_url ) { url = new_url ; }; inline void setUrl (const std::string & new_url ) { url = new_url ; };
inline void setTime(const std::string & new_time) { time = new_time; }; inline void setTime(const std::string & new_time) { time = new_time; };

2
src/gui/channellist.h
View File

@@ -98,7 +98,7 @@ class CChannelList
CZapitChannel* operator[]( uint32_t index) { if (chanlist.size() > index) return chanlist[index]; else return NULL;}; CZapitChannel* operator[]( uint32_t index) { if (chanlist.size() > index) return chanlist[index]; else return NULL;};
int getKey(int); int getKey(int);
const char * const getName (void) const { return name.c_str(); }; const char * getName (void) const { return name.c_str(); };
const std::string & getActiveChannelName (void) const; // UTF-8 const std::string & getActiveChannelName (void) const; // UTF-8
t_satellite_position getActiveSatellitePosition(void) const; t_satellite_position getActiveSatellitePosition(void) const;
int getActiveChannelNumber (void) const; int getActiveChannelNumber (void) const;

8
src/system/flashtool.cpp
View File

@@ -384,22 +384,22 @@ CFlashVersionInfo::CFlashVersionInfo(const std::string & versionString)
time[5] = 0; time[5] = 0;
} }
const char * const CFlashVersionInfo::getDate(void) const const char *CFlashVersionInfo::getDate(void) const
{ {
return date; return date;
} }
const char * const CFlashVersionInfo::getTime(void) const const char *CFlashVersionInfo::getTime(void) const
{ {
return time; return time;
} }
const char * const CFlashVersionInfo::getReleaseCycle(void) const const char *CFlashVersionInfo::getReleaseCycle(void) const
{ {
return releaseCycle; return releaseCycle;
} }
const char * const CFlashVersionInfo::getType(void) const const char *CFlashVersionInfo::getType(void) const
{ {
switch (snapshot) switch (snapshot)
{ {

8
src/system/flashtool.h
View File

@@ -81,10 +81,10 @@ class CFlashVersionInfo
CFlashVersionInfo(const std::string & versionString); CFlashVersionInfo(const std::string & versionString);
const char * const getDate(void) const; const char *getDate(void) const;
const char * const getTime(void) const; const char *getTime(void) const;
const char * const getReleaseCycle(void) const; const char *getReleaseCycle(void) const;
const char * const getType(void) const; const char *getType(void) const;
}; };

10
src/zapit/include/zapit/frontend_c.h
View File

@@ -144,7 +144,7 @@ class CFrontend
uint32_t getUncorrectedBlocks(void) const; uint32_t getUncorrectedBlocks(void) const;
void getDelSys(int f, int m, char * &fec, char * &sys, char * &mod); void getDelSys(int f, int m, char * &fec, char * &sys, char * &mod);
const int32_t getCurrentSatellitePosition() { return currentSatellitePosition; } int32_t getCurrentSatellitePosition() { return currentSatellitePosition; }
void setDiseqcRepeats(const uint8_t repeats) { diseqcRepeats = repeats; } void setDiseqcRepeats(const uint8_t repeats) { diseqcRepeats = repeats; }
void setDiseqcType(const diseqc_t type); void setDiseqcType(const diseqc_t type);
@@ -157,12 +157,12 @@ class CFrontend
void positionMotor(uint8_t motorPosition); void positionMotor(uint8_t motorPosition);
void sendMotorCommand(uint8_t cmdtype, uint8_t address, uint8_t command, uint8_t num_parameters, uint8_t parameter1, uint8_t parameter2, int repeat = 0); void sendMotorCommand(uint8_t cmdtype, uint8_t address, uint8_t command, uint8_t num_parameters, uint8_t parameter1, uint8_t parameter2, int repeat = 0);
void gotoXX(t_satellite_position pos); void gotoXX(t_satellite_position pos);
const bool tuneChannel (CZapitChannel *channel, bool nvod); bool tuneChannel(CZapitChannel *channel, bool nvod);
const bool retuneChannel (void); bool retuneChannel(void);
const bool retuneTP (bool nowait = true); bool retuneTP(bool nowait = true);
fe_code_rate_t getCFEC (); fe_code_rate_t getCFEC ();
const transponder_id_t getTsidOnid() { return currentTransponder.TP_id; } transponder_id_t getTsidOnid() { return currentTransponder.TP_id; }
void setTsidOnid(transponder_id_t newid) { currentTransponder.TP_id = newid; } void setTsidOnid(transponder_id_t newid) { currentTransponder.TP_id = newid; }
uint32_t getRate (); uint32_t getRate ();
void Close(); void Close();

6
src/zapit/src/frontend.cpp
View File

@@ -957,7 +957,7 @@ void CFrontend::setInput(t_satellite_position satellitePosition, uint32_t freque
} }
} }
const bool CFrontend::tuneChannel(CZapitChannel * /*channel*/, bool /*nvod*/) bool CFrontend::tuneChannel(CZapitChannel * /*channel*/, bool /*nvod*/)
{ {
//printf("tuneChannel: tpid %llx\n", currentTransponder.TP_id); //printf("tuneChannel: tpid %llx\n", currentTransponder.TP_id);
transponder_list_t::iterator transponder = transponders.find(currentTransponder.TP_id); transponder_list_t::iterator transponder = transponders.find(currentTransponder.TP_id);
@@ -966,14 +966,14 @@ const bool CFrontend::tuneChannel(CZapitChannel * /*channel*/, bool /*nvod*/)
return tuneFrequency(&transponder->second.feparams, transponder->second.polarization, false); return tuneFrequency(&transponder->second.feparams, transponder->second.polarization, false);
} }
const bool CFrontend::retuneTP(bool nowait) bool CFrontend::retuneTP(bool nowait)
{ {
/* used in pip only atm */ /* used in pip only atm */
tuneFrequency(&curfe, currentTransponder.polarization, nowait); tuneFrequency(&curfe, currentTransponder.polarization, nowait);
return 0; return 0;
} }
const bool CFrontend::retuneChannel(void) bool CFrontend::retuneChannel(void)
{ {
setFrontend(&currentTransponder.feparams); setFrontend(&currentTransponder.feparams);
return 0; return 0;