diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-08-16 23:41:36 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-08-16 23:41:36 +0000 |
| commit | c606126c3efaec7e3fdf1283fc37dfb7140bee13 (patch) | |
| tree | 080e62c82b369684ba61696da3fd5af612d5ede5 /lib/base | |
| parent | e573cf16494de5150298e52250c0474a94ca7fb1 (diff) | |
| download | enigma2-c606126c3efaec7e3fdf1283fc37dfb7140bee13.tar.gz enigma2-c606126c3efaec7e3fdf1283fc37dfb7140bee13.zip | |
small cleanup
Diffstat (limited to 'lib/base')
| -rw-r--r-- | lib/base/ebase.h | 12 | ||||
| -rw-r--r-- | lib/base/object.h | 15 |
2 files changed, 9 insertions, 18 deletions
diff --git a/lib/base/ebase.h b/lib/base/ebase.h index b464b44c..32a22dbe 100644 --- a/lib/base/ebase.h +++ b/lib/base/ebase.h @@ -140,13 +140,11 @@ class eSocketNotifier { public: enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP }; -#ifndef SWIG private: eMainloop &context; int fd; int state; int requested; // requested events (POLLIN, ...) -#endif public: /** * \brief Constructs a eSocketNotifier. @@ -175,7 +173,6 @@ class eTimer; // werden in einer mainloop verarbeitet class eMainloop { -#ifndef SWIG friend class eTimer; friend class eSocketNotifier; std::multimap<int, eSocketNotifier*> notifiers; @@ -188,13 +185,12 @@ class eMainloop int m_now_is_invalid; int m_interrupt_requested; -#endif -public: - static void addTimeOffset(int offset); void addSocketNotifier(eSocketNotifier *sn); void removeSocketNotifier(eSocketNotifier *sn); void addTimer(eTimer* e); void removeTimer(eTimer* e); +public: + static void addTimeOffset(int offset); #ifndef SWIG static ePtrList<eMainloop> existing_loops; @@ -263,14 +259,13 @@ public: */ class eTimer { -#ifndef SWIG friend class eMainloop; eMainloop &context; timeval nextActivation; long interval; bool bSingleShot; bool bActive; -#endif + void addTimeOffset(int); public: /** * \brief Constructs a timer. @@ -294,6 +289,5 @@ public: bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; } #endif void startLongTimer( int seconds ); - void addTimeOffset(int); }; #endif diff --git a/lib/base/object.h b/lib/base/object.h index adb5d67c..93989a67 100644 --- a/lib/base/object.h +++ b/lib/base/object.h @@ -25,6 +25,7 @@ public: virtual void Release()=0; }; +#ifndef SWIG struct oRefCount { volatile int count; @@ -37,7 +38,6 @@ struct oRefCount } }; -#ifndef SWIG #if defined(__mips__) #define DECLARE_REF(x) \ private: oRefCount ref; \ @@ -158,17 +158,14 @@ struct oRefCount } #endif #endif -#else +#else // SWIG #define DECLARE_REF(x) \ private: \ void AddRef(); \ void Release(); -#endif - -#ifdef SWIG -class Object -{ -}; -#endif + class Object + { + }; +#endif // SWIG #endif |