fixed compile errors with g++ 4.3 and replaced some c headers by their

c++ counterparts

diff --git a/lib/base/buffer.cpp b/lib/base/buffer.cpp
index 3a0a6a3..5dfdfad 100644 (file)
--- a/lib/base/buffer.cpp
+++ b/lib/base/buffer.cpp
@@ -1,8 +1,9 @@
 #include <lib/base/buffer.h>
 #include <lib/base/eerror.h>
 #include <lib/base/buffer.h>
 #include <lib/base/eerror.h>

-#include <stdio.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>

 #include <unistd.h>
 #include <unistd.h>

-#include <errno.h>

 
 void eIOBuffer::removeblock()
 {
 
 void eIOBuffer::removeblock()
 {

diff --git a/lib/base/eerror.cpp b/lib/base/eerror.cpp
index 4c4d655..35e46e0 100644 (file)
--- a/lib/base/eerror.cpp
+++ b/lib/base/eerror.cpp
@@ -1,8 +1,9 @@
 #include <lib/base/eerror.h>
 #include <lib/base/elock.h>
 #include <lib/base/eerror.h>
 #include <lib/base/elock.h>

-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>

 #include <unistd.h>
 
 #include <string>
 #include <unistd.h>
 
 #include <string>

diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp
index 5d6617d..45fea10 100644 (file)
--- a/lib/base/encoding.cpp
+++ b/lib/base/encoding.cpp
@@ -1,3 +1,4 @@
+#include <cstdlib>

 #include <lib/base/encoding.h>
 #include <lib/base/eerror.h>
 
 #include <lib/base/encoding.h>
 #include <lib/base/eerror.h>
 

diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp
index f1d50cc..dcba770 100644 (file)
--- a/lib/base/estring.cpp
+++ b/lib/base/estring.cpp
@@ -1,6 +1,7 @@
+#include <algorithm>
+#include <cctype>
+#include <climits>

 #include <string>
 #include <string>

-#include <ctype.h>
-#include <limits.h>

 #include <lib/base/eerror.h>
 #include <lib/base/encoding.h>
 #include <lib/base/estring.h>
 #include <lib/base/eerror.h>
 #include <lib/base/encoding.h>
 #include <lib/base/estring.h>

diff --git a/lib/driver/misc_options.cpp b/lib/driver/misc_options.cpp
index c567878..43e6dad 100644 (file)
--- a/lib/driver/misc_options.cpp
+++ b/lib/driver/misc_options.cpp
@@ -1,3 +1,4 @@
+#include <cstring>

 #include <lib/driver/misc_options.h>
 
 #include <unistd.h>
 #include <lib/driver/misc_options.h>
 
 #include <unistd.h>

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 55e008f..11fb1ab 100644 (file)
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -51,11 +51,11 @@ public:
 
        RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm);
        
 
        RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm);
        

-       RESULT addService(const eServiceReferenceDVB &service, eDVBService *service);
+       RESULT addService(const eServiceReferenceDVB &referenc, eDVBService *service);

        RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service);
        RESULT flush();
 
        RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service);
        RESULT flush();
 

-       RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source);
+       RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q, const eServiceReference &source);

 
        RESULT getBouquet(const eServiceReference &ref, eBouquet* &bouquet);
 //////
 
        RESULT getBouquet(const eServiceReference &ref, eBouquet* &bouquet);
 //////

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index ec016d6..6dd0f90 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -385,13 +385,13 @@ public:
        
        virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=0;
        
        
        virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=0;
        

-       virtual RESULT addService(const eServiceReferenceDVB &service, eDVBService *service)=0;
+       virtual RESULT addService(const eServiceReferenceDVB &reference, eDVBService *service)=0;

        virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
        virtual RESULT flush()=0;
 
        virtual RESULT getBouquet(const eServiceReference &ref,  eBouquet* &bouquet)=0;
 
        virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
        virtual RESULT flush()=0;
 
        virtual RESULT getBouquet(const eServiceReference &ref,  eBouquet* &bouquet)=0;
 

-       virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
+       virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q, const eServiceReference &source)=0;

 };
 
 #endif  // SWIG
 };
 
 #endif  // SWIG

diff --git a/lib/gdi/accel.cpp b/lib/gdi/accel.cpp
index 27b4abc..d9c80e2 100644 (file)
--- a/lib/gdi/accel.cpp
+++ b/lib/gdi/accel.cpp
@@ -1,3 +1,4 @@
+#include <cstring>

 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 #include <lib/gdi/accel.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 #include <lib/gdi/accel.h>

diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp
index 315c18d..e01e5e4 100644 (file)
--- a/lib/gdi/gpixmap.cpp
+++ b/lib/gdi/gpixmap.cpp
@@ -1,3 +1,5 @@
+#include <cstdlib>
+#include <cstring>

 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
 #include <lib/gdi/accel.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
 #include <lib/gdi/accel.h>

diff --git a/lib/gui/elistboxcontent.h b/lib/gui/elistboxcontent.h
index 6469901..6bb4559 100644 (file)
--- a/lib/gui/elistboxcontent.h
+++ b/lib/gui/elistboxcontent.h
@@ -73,7 +73,7 @@ public:
        void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
        int currentCursorSelectable();
        void setList(SWIG_PYOBJECT(ePyObject) list);
        void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
        int currentCursorSelectable();
        void setList(SWIG_PYOBJECT(ePyObject) list);

-       void setFont(int fnt, gFont *fnt);
+       void setFont(int fnt, gFont *font);

        void setBuildFunc(SWIG_PYOBJECT(ePyObject) func);
        void setSelectableFunc(SWIG_PYOBJECT(ePyObject) func);
        void setItemHeight(int height);
        void setBuildFunc(SWIG_PYOBJECT(ePyObject) func);
        void setSelectableFunc(SWIG_PYOBJECT(ePyObject) func);
        void setItemHeight(int height);