From c170382c1686a9a512cb829991bfc48a37234733 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Mon, 21 Dec 2009 00:00:02 +0000 Subject: [PATCH] compiler warning fixes Fix a bunch of "warning: type qualifiers ignored on function return type" (you see them with -Wall -Wextra). Still lots to fix. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@103 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7b87012631f445bd0a0ad6e23af408eee9c85855 Author: Stefan Seyfried Date: 2009-12-21 (Mon, 21 Dec 2009) ------------------ This commit was generated by Migit --- lib/connection/basicclient.h | 6 +++--- lib/controldclient/controldclient.cpp | 2 +- lib/controldclient/controldclient.h | 14 +++++++------- lib/libconfigfile/configfile.cpp | 8 ++++---- lib/libconfigfile/configfile.h | 14 +++++++------- lib/sectionsdclient/sectionsdclient.cpp | 4 ++-- lib/sectionsdclient/sectionsdclient.h | 4 ++-- lib/timerdclient/timerdclient.cpp | 2 +- lib/timerdclient/timerdclient.h | 2 +- src/zapit/include/zapit/cam.h | 2 +- src/zapit/include/zapit/client/zapitclient.h | 4 ++-- src/zapit/lib/zapitclient.cpp | 4 ++-- src/zapit/src/cam.cpp | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lib/connection/basicclient.h b/lib/connection/basicclient.h index 7b82de108..8fce9d700 100644 --- a/lib/connection/basicclient.h +++ b/lib/connection/basicclient.h @@ -1,5 +1,5 @@ /* - * $Header: /cvs/tuxbox/apps/misc/libs/libconnection/basicclient.h,v 1.7 2004/04/08 07:19:00 thegoodguy Exp $ + * $Header: /cvs/tuxbox/apps/misc/libs/libconnection/basicclient.h,v 1.8 2009/02/24 19:09:06 seife Exp $ * * Basic Client Class - The Tuxbox Project * @@ -35,8 +35,8 @@ class CBasicClient int sock_fd; protected: - virtual const unsigned char getVersion () const = 0; - virtual const char * getSocketName() const = 0; + virtual unsigned char getVersion () const = 0; + virtual const char * getSocketName() const = 0; bool open_connection(); bool send_data(const char * data, const size_t size); diff --git a/lib/controldclient/controldclient.cpp b/lib/controldclient/controldclient.cpp index 89bdfd9ca..f0c44520f 100644 --- a/lib/controldclient/controldclient.cpp +++ b/lib/controldclient/controldclient.cpp @@ -35,7 +35,7 @@ #include -const unsigned char CControldClient::getVersion () const +unsigned char CControldClient::getVersion () const { return CControldMsg::ACTVERSION; } diff --git a/lib/controldclient/controldclient.h b/lib/controldclient/controldclient.h index 8df78261a..7a9ded911 100644 --- a/lib/controldclient/controldclient.h +++ b/lib/controldclient/controldclient.h @@ -35,8 +35,8 @@ class CControldClient:private CBasicClient { private: - virtual const unsigned char getVersion () const; - virtual const char * getSocketName() const; + virtual unsigned char getVersion () const; + virtual const char * getSocketName() const; public: @@ -70,7 +70,7 @@ class CControldClient:private CBasicClient static const char SCARTMODE_OFF = 0; /* - setVolume(volume_type) : Setzten der Lautstärke + setVolume(volume_type) : Setzen der Lautstaerke Parameter: 0..100 - 0=leise 100=laut volume_type : device AVS/OST/UNKOWN(=last used) */ @@ -110,9 +110,9 @@ class CControldClient:private CBasicClient char getVideoFormat(); /* getAspectRatio : Aktueller Wert aus dem Bitstream - 2: 4:3 - 3: 16:9 - 4: 2:2.1 + 0: 4:3 + 1: 16:9 + 2: 2:2.1 */ char getAspectRatio(); @@ -128,7 +128,7 @@ class CControldClient:private CBasicClient char getVideoOutput(); /* - setVCROutput(char) : Setzten des Videooutputs für VCR ( composite / svideo ) + setVCROutput(char) : Setzen des Videooutputs fuer VCR ( composite / svideo ) Parameter: VIDEOOUTPUT_COMPOSITE = cvbs VIDEOOUTPUT_SVIDEO = svideo */ diff --git a/lib/libconfigfile/configfile.cpp b/lib/libconfigfile/configfile.cpp index 0b28f9f40..8d7677456 100644 --- a/lib/libconfigfile/configfile.cpp +++ b/lib/libconfigfile/configfile.cpp @@ -49,7 +49,7 @@ void CConfigFile::clear() // // public file operation methods // -const bool CConfigFile::loadConfig(const char * const filename) +bool CConfigFile::loadConfig(const char * const filename) { std::ifstream configFile(filename); @@ -84,12 +84,12 @@ const bool CConfigFile::loadConfig(const char * const filename) } } -const bool CConfigFile::loadConfig(const std::string & filename) +bool CConfigFile::loadConfig(const std::string & filename) { return loadConfig(filename.c_str()); } -const bool CConfigFile::saveConfig(const char * const filename) +bool CConfigFile::saveConfig(const char * const filename) { std::ofstream configFile(filename); @@ -114,7 +114,7 @@ const bool CConfigFile::saveConfig(const char * const filename) } } -const bool CConfigFile::saveConfig(const std::string & filename) +bool CConfigFile::saveConfig(const std::string & filename) { return saveConfig(filename.c_str()); } diff --git a/lib/libconfigfile/configfile.h b/lib/libconfigfile/configfile.h index 0142d4544..69aa5353a 100644 --- a/lib/libconfigfile/configfile.h +++ b/lib/libconfigfile/configfile.h @@ -1,5 +1,5 @@ /* - * $Id: configfile.h,v 1.11 2003/09/25 18:52:27 thegoodguy Exp $ + * $Id: configfile.h,v 1.12 2009/02/24 19:09:06 seife Exp $ * * Copyright (C) 2001, 2002 Andreas Oberritter , * thegoodguy @@ -51,11 +51,11 @@ class CConfigFile public: CConfigFile(const char p_delimiter, const bool p_saveDefaults = true); - const bool loadConfig(const char * const filename); - const bool loadConfig(const std::string & filename); + bool loadConfig(const char * const filename); + bool loadConfig(const std::string & filename); - const bool saveConfig(const char * const filename); - const bool saveConfig(const std::string & filename); + bool saveConfig(const char * const filename); + bool saveConfig(const std::string & filename); void clear(); @@ -100,10 +100,10 @@ class CConfigFile // // flags // - const bool getModifiedFlag() const { return modifiedFlag; } + bool getModifiedFlag() const { return modifiedFlag; } void setModifiedFlag(const bool val) { modifiedFlag = val; } - const bool getUnknownKeyQueryedFlag() const { return unknownKeyQueryedFlag; } + bool getUnknownKeyQueryedFlag() const { return unknownKeyQueryedFlag; } void setUnknownKeyQueryedFlag(const bool val) { unknownKeyQueryedFlag = val; } }; diff --git a/lib/sectionsdclient/sectionsdclient.cpp b/lib/sectionsdclient/sectionsdclient.cpp index 9f73160b1..61b137e7c 100644 --- a/lib/sectionsdclient/sectionsdclient.cpp +++ b/lib/sectionsdclient/sectionsdclient.cpp @@ -21,7 +21,7 @@ */ -#include +#include #include #include @@ -29,7 +29,7 @@ #include -const unsigned char CSectionsdClient::getVersion () const +unsigned char CSectionsdClient::getVersion () const { return sectionsd::ACTVERSION; } diff --git a/lib/sectionsdclient/sectionsdclient.h b/lib/sectionsdclient/sectionsdclient.h index 458a2f764..2f1ed8390 100644 --- a/lib/sectionsdclient/sectionsdclient.h +++ b/lib/sectionsdclient/sectionsdclient.h @@ -63,8 +63,8 @@ typedef std::vector CChannelEventList; class CSectionsdClient : private CBasicClient { private: - virtual const unsigned char getVersion () const; - virtual const char * getSocketName() const; + virtual unsigned char getVersion () const; + virtual const char * getSocketName() const; int readResponse(char* data = NULL, unsigned int size = 0); bool send(const unsigned char command, const char* data = NULL, const unsigned int size = 0); diff --git a/lib/timerdclient/timerdclient.cpp b/lib/timerdclient/timerdclient.cpp index 3348b32f6..8ad4e967d 100644 --- a/lib/timerdclient/timerdclient.cpp +++ b/lib/timerdclient/timerdclient.cpp @@ -29,7 +29,7 @@ #include -const unsigned char CTimerdClient::getVersion () const +unsigned char CTimerdClient::getVersion () const { return CTimerdMsg::ACTVERSION; } diff --git a/lib/timerdclient/timerdclient.h b/lib/timerdclient/timerdclient.h index debc061fc..eb7b23af9 100644 --- a/lib/timerdclient/timerdclient.h +++ b/lib/timerdclient/timerdclient.h @@ -37,7 +37,7 @@ class CTimerdClient:private CBasicClient { private: - virtual const unsigned char getVersion () const; + virtual unsigned char getVersion () const; virtual const char * getSocketName() const; public: diff --git a/src/zapit/include/zapit/cam.h b/src/zapit/include/zapit/cam.h index 78e16936e..e39d6efdb 100644 --- a/src/zapit/include/zapit/cam.h +++ b/src/zapit/include/zapit/cam.h @@ -29,7 +29,7 @@ class CCam : public CBasicClient { private: - virtual const unsigned char getVersion(void) const; + virtual unsigned char getVersion(void) const; virtual const char *getSocketName(void) const; public: diff --git a/src/zapit/include/zapit/client/zapitclient.h b/src/zapit/include/zapit/client/zapitclient.h index d7d4c8e68..c6d49b34f 100644 --- a/src/zapit/include/zapit/client/zapitclient.h +++ b/src/zapit/include/zapit/client/zapitclient.h @@ -34,8 +34,8 @@ class CZapitClient:public CBasicClient { private: - virtual const unsigned char getVersion () const; - virtual const char * getSocketName() const; + virtual unsigned char getVersion () const; + virtual const char * getSocketName() const; public: enum events diff --git a/src/zapit/lib/zapitclient.cpp b/src/zapit/lib/zapitclient.cpp index b2a198cbb..fdc6e8285 100644 --- a/src/zapit/lib/zapitclient.cpp +++ b/src/zapit/lib/zapitclient.cpp @@ -35,12 +35,12 @@ #include #include -const unsigned char CZapitClient::getVersion () const +unsigned char CZapitClient::getVersion() const { return CZapitMessages::ACTVERSION; } -const char * CZapitClient::getSocketName() const +const char * CZapitClient::getSocketName() const { return ZAPIT_UDS_NAME; } diff --git a/src/zapit/src/cam.cpp b/src/zapit/src/cam.cpp index 35cdaac87..1c4b578eb 100644 --- a/src/zapit/src/cam.cpp +++ b/src/zapit/src/cam.cpp @@ -26,7 +26,7 @@ #include /* get_length_field_size */ -const unsigned char CCam::getVersion(void) const +unsigned char CCam::getVersion(void) const { return 0x9F; }