mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
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: 7b87012631
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2009-12-21 (Mon, 21 Dec 2009)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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,7 +35,7 @@ class CBasicClient
|
||||
int sock_fd;
|
||||
|
||||
protected:
|
||||
virtual const unsigned char getVersion () const = 0;
|
||||
virtual unsigned char getVersion () const = 0;
|
||||
virtual const char * getSocketName() const = 0;
|
||||
|
||||
bool open_connection();
|
||||
|
@@ -35,7 +35,7 @@
|
||||
#include <controldclient/controldclient.h>
|
||||
|
||||
|
||||
const unsigned char CControldClient::getVersion () const
|
||||
unsigned char CControldClient::getVersion () const
|
||||
{
|
||||
return CControldMsg::ACTVERSION;
|
||||
}
|
||||
|
@@ -35,7 +35,7 @@
|
||||
class CControldClient:private CBasicClient
|
||||
{
|
||||
private:
|
||||
virtual const unsigned char getVersion () 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<EFBFBD>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<EFBFBD>r VCR ( composite / svideo )
|
||||
setVCROutput(char) : Setzen des Videooutputs fuer VCR ( composite / svideo )
|
||||
Parameter: VIDEOOUTPUT_COMPOSITE = cvbs
|
||||
VIDEOOUTPUT_SVIDEO = svideo
|
||||
*/
|
||||
|
@@ -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());
|
||||
}
|
||||
|
@@ -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 <obi@tuxbox.org>,
|
||||
* thegoodguy <thegoodguy@tuxbox.org>
|
||||
@@ -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; }
|
||||
|
||||
};
|
||||
|
@@ -21,7 +21,7 @@
|
||||
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <eventserver.h>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <sectionsdclient/sectionsdMsg.h>
|
||||
|
||||
|
||||
const unsigned char CSectionsdClient::getVersion () const
|
||||
unsigned char CSectionsdClient::getVersion () const
|
||||
{
|
||||
return sectionsd::ACTVERSION;
|
||||
}
|
||||
|
@@ -63,7 +63,7 @@ typedef std::vector<CChannelEvent> CChannelEventList;
|
||||
class CSectionsdClient : private CBasicClient
|
||||
{
|
||||
private:
|
||||
virtual const unsigned char getVersion () const;
|
||||
virtual unsigned char getVersion () const;
|
||||
virtual const char * getSocketName() const;
|
||||
|
||||
int readResponse(char* data = NULL, unsigned int size = 0);
|
||||
|
@@ -29,7 +29,7 @@
|
||||
#include <timerdclient/timerdclient.h>
|
||||
|
||||
|
||||
const unsigned char CTimerdClient::getVersion () const
|
||||
unsigned char CTimerdClient::getVersion () const
|
||||
{
|
||||
return CTimerdMsg::ACTVERSION;
|
||||
}
|
||||
|
@@ -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:
|
||||
|
@@ -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:
|
||||
|
@@ -34,7 +34,7 @@
|
||||
class CZapitClient:public CBasicClient
|
||||
{
|
||||
private:
|
||||
virtual const unsigned char getVersion () const;
|
||||
virtual unsigned char getVersion () const;
|
||||
virtual const char * getSocketName() const;
|
||||
|
||||
public:
|
||||
|
@@ -35,7 +35,7 @@
|
||||
#include <zapit/client/msgtypes.h>
|
||||
#include <zapit/client/zapittools.h>
|
||||
|
||||
const unsigned char CZapitClient::getVersion () const
|
||||
unsigned char CZapitClient::getVersion() const
|
||||
{
|
||||
return CZapitMessages::ACTVERSION;
|
||||
}
|
||||
|
@@ -26,7 +26,7 @@
|
||||
#include <messagetools.h> /* get_length_field_size */
|
||||
|
||||
|
||||
const unsigned char CCam::getVersion(void) const
|
||||
unsigned char CCam::getVersion(void) const
|
||||
{
|
||||
return 0x9F;
|
||||
}
|
||||
|
Reference in New Issue
Block a user