diff --git a/sflphone-common/src/Codec.h b/sflphone-common/src/Codec.h
index 54f41923b07453e15243367a4e7d5267615cbf12..b903443fe70e9f45d6fe640701b8cc7f8be90edd 100644
--- a/sflphone-common/src/Codec.h
+++ b/sflphone-common/src/Codec.h
@@ -44,7 +44,7 @@ class Codec : public virtual MimeParameters
 {
     public:
         Codec() {};
-        virtual inline ~Codec() {}
+        virtual ~Codec() {}
 
         /**
          * @return The bitrate for which this codec is configured // TODO deal with VBR case.
diff --git a/sflphone-common/src/MimeParameters.h b/sflphone-common/src/MimeParameters.h
index aa13cfa3aef0aa845b121e0ce26f1653522eb045..1dfc6541bbf468f6163bea078fc3381288541b96 100644
--- a/sflphone-common/src/MimeParameters.h
+++ b/sflphone-common/src/MimeParameters.h
@@ -37,7 +37,7 @@
 		private: \
 			uint8 payload; \
 		public: \
-		inline virtual ~MimeParameters##subtype() {}; \
+		virtual ~MimeParameters##subtype() {}; \
         std::string getMimeType() const { \
             return std::string( mime ); \
         } \
diff --git a/sflphone-common/src/audio/alsa/alsalayer.h b/sflphone-common/src/audio/alsa/alsalayer.h
index 738fdf53e375cbe70c2f942514021a270f1fde4b..2c4020f396d9c718e18bf1fb7553f4f4334695cd 100644
--- a/sflphone-common/src/audio/alsa/alsalayer.h
+++ b/sflphone-common/src/audio/alsa/alsalayer.h
@@ -163,7 +163,7 @@ class AlsaLayer : public AudioLayer
          * Get the noise suppressor state
          * @return true if noise suppressor activated
          */
-        virtual bool getNoiseSuppressState (void) {
+        virtual bool getNoiseSuppressState (void) const {
             return AudioLayer::_noisesuppressstate;
         }
 
diff --git a/sflphone-common/src/audio/audiolayer.h b/sflphone-common/src/audio/audiolayer.h
index 0f80d71b849f62d61bfb67cfb68762f1a90bac06..32810462fa3680d1f5de25364ffac86bd5e1a560 100644
--- a/sflphone-common/src/audio/audiolayer.h
+++ b/sflphone-common/src/audio/audiolayer.h
@@ -167,7 +167,7 @@ class AudioLayer
          * Read accessor to the error state
          * @return int  The error code
          */
-        int getErrorMessage() {
+        int getErrorMessage() const {
             return _errorMessage;
         }
 
@@ -176,7 +176,7 @@ class AudioLayer
          * @return int The index of the card used for capture
          *			0 for the first available card on the system, 1 ...
          */
-        int getIndexIn() {
+        int getIndexIn() const {
             return _indexIn;
         }
 
@@ -185,7 +185,7 @@ class AudioLayer
          * @return int The index of the card used for playback
          *			0 for the first available card on the system, 1 ...
          */
-        int getIndexOut() {
+        int getIndexOut() const {
             return _indexOut;
         }
 
@@ -194,7 +194,7 @@ class AudioLayer
              * @return int The index of the card used for ringtone
              *			0 for the first available card on the system, 1 ...
              */
-        int getIndexRing() {
+        int getIndexRing() const {
             return _indexRing;
         }
 
@@ -203,7 +203,7 @@ class AudioLayer
          * @return unsigned int The sample rate
          *			    default: 44100 HZ
          */
-        unsigned int getSampleRate() {
+        unsigned int getSampleRate() const {
             return _audioSampleRate;
         }
 
@@ -212,7 +212,7 @@ class AudioLayer
          * @return unsigned int The frame size
          *			    default: 20 ms
          */
-        unsigned int getFrameSize() {
+        unsigned int getFrameSize() const {
             return _frameSize;
         }
 
@@ -221,7 +221,7 @@ class AudioLayer
              * @return unsigned int The layer type
              *
              */
-        int getLayerType (void) {
+        int getLayerType (void) const {
             return _layerType;
         }
 
@@ -233,7 +233,7 @@ class AudioLayer
          *
              * @return MainBuffer* a pointer to the MainBuffer instance
              */
-        MainBuffer* getMainBuffer (void) {
+        MainBuffer* getMainBuffer (void) const {
             return _mainBuffer;
         }
 
@@ -253,7 +253,7 @@ class AudioLayer
         /**
          * Set the audio recorder
          */
-        inline void setRecorderInstance (Recordable* rec) {
+        void setRecorderInstance (Recordable* rec) {
             _recorder = NULL;
             _recorder = rec;
         }
@@ -261,7 +261,7 @@ class AudioLayer
         /**
          * Get the audio recorder
          */
-        inline Recordable* getRecorderInstance (void) {
+        Recordable* getRecorderInstance (void) const {
             return _recorder;
         }
 
@@ -269,7 +269,7 @@ class AudioLayer
          * Get the noise suppressor state
          * @return true if noise suppressor activated
          */
-        virtual bool getNoiseSuppressState (void) = 0;
+        virtual bool getNoiseSuppressState (void) const = 0;
 
         /**
          * Set the noise suppressor state
@@ -280,7 +280,7 @@ class AudioLayer
         /**
          * Get the mutex lock for the entire audio layer
          */
-        inline ost::Mutex* getMutexLock (void) {
+        ost::Mutex* getMutexLock (void) {
             return &_mutex;
         }
 
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h b/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
index 169a7f6aa8da57c021dec8fcba92f216c720b7ae..f49c8692ea0d016ace7592e467e9eff41fc77c00 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
@@ -129,7 +129,7 @@ class AudioRtpFactory
          * @return The internal audio rtp thread of the type specified in the configuration
          * file. initAudioRtpSession must have been called prior to that.
          */
-        inline void * getAudioRtpSession (void) {
+        void * getAudioRtpSession (void) const {
             return _rtpSession;
         }
 
@@ -142,14 +142,14 @@ class AudioRtpFactory
          *         Zrtp = 1
          *         Sdes = 2
          */
-        inline RtpMethod getAudioRtpType (void) {
+        RtpMethod getAudioRtpType (void) const {
             return _rtpSessionType;
         }
 
         /**
          * @param Set internal audio rtp session type (Symmetric, Zrtp, Sdes)
          */
-        inline void setAudioRtpType (RtpMethod type) {
+        void setAudioRtpType (RtpMethod type) {
             _rtpSessionType = type;
         }
 
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h b/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h
index 687bf89f5d9dadd0ff4817a97ee674e884042549..c3481844971919f06097f41119168578e7c32d3a 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h
@@ -141,23 +141,23 @@ class AudioRtpRecordHandler
         void updateRtpMedia (AudioCodec *audioCodec);
 
 
-        AudioCodec *getAudioCodec (void) {
+        AudioCodec *getAudioCodec (void) const {
             return _audioRtpRecord._audioCodec;
         }
 
-        int getCodecPayloadType (void) {
+        int getCodecPayloadType (void) const {
             return _audioRtpRecord._codecPayloadType;
         }
 
-        int getCodecSampleRate (void) {
+        int getCodecSampleRate (void) const {
             return _audioRtpRecord._codecSampleRate;
         }
 
-        int getCodecFrameSize (void) {
+        int getCodecFrameSize (void) const {
             return _audioRtpRecord._codecFrameSize;
         }
 
-        int getHasDynamicPayload (void) {
+        int getHasDynamicPayload (void) const {
             return _audioRtpRecord._hasDynamicPayloadType;
         }
 
@@ -165,7 +165,7 @@ class AudioRtpRecordHandler
             return &_audioRtpRecord._eventQueue;
         }
 
-        int getEventQueueSize (void) {
+        int getEventQueueSize (void) const {
             return _audioRtpRecord._eventQueue.size();
         }
 
@@ -173,19 +173,19 @@ class AudioRtpRecordHandler
             return _audioRtpRecord._micData;
         }
 
-        SFLDataFormat *getMicDataConverted (void) {
+        SFLDataFormat *getMicDataConverted (void) const {
             return _audioRtpRecord._micDataConverted;
         }
 
-        unsigned char *getMicDataEncoded (void) {
+        unsigned char *getMicDataEncoded (void) const {
             return _audioRtpRecord._micDataEncoded;
         }
 
-        inline float computeCodecFrameSize (int codecSamplePerFrame, int codecClockRate) {
+        float computeCodecFrameSize (int codecSamplePerFrame, int codecClockRate) const {
             return ( (float) codecSamplePerFrame * 1000.0) / (float) codecClockRate;
         }
 
-        int computeNbByteAudioLayer (int mainBufferSamplingRate, float codecFrameSize) {
+        int computeNbByteAudioLayer (int mainBufferSamplingRate, float codecFrameSize) const {
             return (int) ( ( (float) mainBufferSamplingRate * codecFrameSize * sizeof (SFLDataFormat)) / 1000.0);
         }
 
@@ -220,7 +220,7 @@ class AudioRtpRecordHandler
         	_audioRtpRecord._dtmfPayloadType = payloadType;
         }
 
-        unsigned int getDtmfPayloadType(void) {
+        unsigned int getDtmfPayloadType(void) const {
         	return _audioRtpRecord._dtmfPayloadType;
         }
 
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.h b/sflphone-common/src/audio/pulseaudio/pulselayer.h
index 05aa20d546a408239784314ed08e80b2aa83e491..1a172d923a001e5428aa6314aeaf115981bbd372 100644
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.h
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.h
@@ -207,7 +207,7 @@ class PulseLayer : public AudioLayer
          * Get the noise suppressor state
          * @return true if noise suppressor activated
          */
-        bool getNoiseSuppressState (void) {
+        bool getNoiseSuppressState (void) const {
             return AudioLayer::_noisesuppressstate;
         }
 
diff --git a/sflphone-common/src/call.h b/sflphone-common/src/call.h
index 698cfd862ef4867d12fa5488a4a14de364cb1dfe..0e5749a07ef55f485b8443369293f451ddf68760 100644
--- a/sflphone-common/src/call.h
+++ b/sflphone-common/src/call.h
@@ -99,7 +99,7 @@ class Call: public Recordable
              * Return a reference on the conference id
              * @return call id
              */
-        CallID& getConfId() {
+        const CallID& getConfId() const {
             return _confID;
         }
 
@@ -107,7 +107,7 @@ class Call: public Recordable
             _confID = id;
         }
 
-        inline CallType getCallType (void) {
+        CallType getCallType (void) const {
             return _type;
         }
 
@@ -125,7 +125,7 @@ class Call: public Recordable
          * not protected by mutex (when created)
          * @return std::string The peer number
          */
-        const std::string& getPeerNumber() {
+        const std::string& getPeerNumber() const {
             return _peerNumber;
         }
 
@@ -143,7 +143,7 @@ class Call: public Recordable
          * not protected by mutex (when created)
          * @return std::string The peer name
          */
-        const std::string& getPeerName() {
+        const std::string& getPeerName() const {
             return _peerName;
         }
 
@@ -161,7 +161,7 @@ class Call: public Recordable
              * not protected by mutex (when created)
              * @return std::string The peer name
              */
-        const std::string& getDisplayName() {
+        const std::string& getDisplayName() const {
             return _displayName;
         }
 
@@ -204,7 +204,7 @@ class Call: public Recordable
             _callConfig = callConfig;
         }
 
-        Call::CallConfiguration getCallConfiguration (void) {
+        Call::CallConfiguration getCallConfiguration (void) const {
             return _callConfig;
         }
 
@@ -250,7 +250,7 @@ class Call: public Recordable
          * Return the audio port seen by the remote side.
          * @return unsigned int The external audio port
          */
-        unsigned int getLocalExternAudioPort() {
+        unsigned int getLocalExternAudioPort() const {
             return _localExternalAudioPort;
         }
 
@@ -270,7 +270,7 @@ class Call: public Recordable
             return getPeerName();
         }
 
-        std::string getFileName (void) {
+        std::string getFileName (void) const {
             return _peerNumber;
         }
 
diff --git a/sflphone-common/src/history/historyitem.h b/sflphone-common/src/history/historyitem.h
index df59bf36a06b1737fb0040c63859763376f7def6..84b10a3a4e7f7899221304183ed1068e4889afe2 100644
--- a/sflphone-common/src/history/historyitem.h
+++ b/sflphone-common/src/history/historyitem.h
@@ -71,7 +71,7 @@ class HistoryItem
          */
         ~HistoryItem ();
 
-        inline std::string get_timestamp () {
+        std::string get_timestamp () const {
             return _timestamp_start;
         }
 
diff --git a/sflphone-common/src/history/historymanager.h b/sflphone-common/src/history/historymanager.h
index f3740feb5145e175ec03ed19fbe7d41c7042dcba..f34e2ace261b6a8930d85c31cf17f189845fe740 100644
--- a/sflphone-common/src/history/historymanager.h
+++ b/sflphone-common/src/history/historymanager.h
@@ -90,18 +90,18 @@ class HistoryManager
         /**
          *@return bool  True if the history file has been successfully read
          */
-        inline bool is_loaded (void) {
+        bool is_loaded (void) const {
             return _history_loaded;
         }
 
-        inline void set_history_path (std::string filename) {
+        void set_history_path (const std::string &filename) {
             _history_path = filename;
         }
 
         /*
          *@return int   The number of items found in the history file
          */
-        inline int get_history_size (void) {
+        int get_history_size (void) const {
             return _history_items.size ();
         }
 
@@ -110,7 +110,7 @@ class HistoryManager
         int set_serialized_history (std::map <std::string, std::string> history, int limit);
 
     private:
-        inline int get_unix_timestamp_equivalent (int days) {
+        int get_unix_timestamp_equivalent (int days) const {
             return days * DAY_UNIX_TIMESTAMP;
         }
 
diff --git a/sflphone-common/src/managerimpl.h b/sflphone-common/src/managerimpl.h
index d6e02efc30304965fa26b3d3fb829ab273e6a679..6d98e091fa16e09a171ed3982ea6e849197a11b2 100644
--- a/sflphone-common/src/managerimpl.h
+++ b/sflphone-common/src/managerimpl.h
@@ -946,7 +946,7 @@ class ManagerImpl
          */
         bool setConfig (const std::string& section, const std::string& name, int value);
 
-        inline std::string mapStateNumberToString (RegistrationState state) {
+        std::string mapStateNumberToString (RegistrationState state) const {
             std::string stringRepresentation;
 
             if (state > NumberOfState) {
diff --git a/sflphone-common/src/numbercleaner.h b/sflphone-common/src/numbercleaner.h
index 84622c980cb0ea5d675ea76c11ef23e0c161c603..01cc7e1bc933c00568b18e94e4e1f543f5a1fe0b 100644
--- a/sflphone-common/src/numbercleaner.h
+++ b/sflphone-common/src/numbercleaner.h
@@ -44,12 +44,12 @@ class NumberCleaner
 
         std::string clean (std::string to_clean);
 
-        inline void set_phone_number_prefix (std::string prefix) {
+        void set_phone_number_prefix (std::string prefix) {
             _debug ("Number: Set phone number prefix %s", _prefix.c_str());
             _prefix = prefix;
         }
 
-        inline std::string get_phone_number_prefix (void) {
+        std::string get_phone_number_prefix (void) const {
             return _prefix;
         }
 
diff --git a/sflphone-common/src/plug-in/librarymanager.h b/sflphone-common/src/plug-in/librarymanager.h
index 3557227b32280833cf162519bf4e3501d67fe050..2dbfc0c65dc48fa7edbe6579f00594c04b9f6f88 100644
--- a/sflphone-common/src/plug-in/librarymanager.h
+++ b/sflphone-common/src/plug-in/librarymanager.h
@@ -71,7 +71,7 @@ class LibraryManagerException : public std::runtime_error
         LibraryManagerException (const std::string &libraryName, const std::string &details, Reason reason);
         ~LibraryManagerException (void) throw() {}
 
-        inline Reason getReason (void) {
+        Reason getReason (void) const {
             return _reason;
         }
 
diff --git a/sflphone-common/src/plug-in/plugin.h b/sflphone-common/src/plug-in/plugin.h
index dcc78d5d114ab66e6fdca89b13660e51bc1163a3..ca45b61cc16be0e9d32eb30e9a8e792c60038482 100644
--- a/sflphone-common/src/plug-in/plugin.h
+++ b/sflphone-common/src/plug-in/plugin.h
@@ -51,7 +51,7 @@ class Plugin
 
         virtual ~Plugin()  {}
 
-        inline std::string getPluginName (void) {
+        std::string getPluginName (void) const {
             return _name;
         }
 
diff --git a/sflphone-common/src/sip/Fmtp.h b/sflphone-common/src/sip/Fmtp.h
index 1bb287513d5ad8e34464f37b4297b61f4d3e975c..82d5ac187efb161f223ec765fdf53eea01432d40 100644
--- a/sflphone-common/src/sip/Fmtp.h
+++ b/sflphone-common/src/sip/Fmtp.h
@@ -46,7 +46,7 @@ public:
 		std::pair<std::string, std::string>(name, value) {
 	}
 	;
-	inline ~SdpParameter() {
+	~SdpParameter() {
 	}
 	;
 	std::string getName() const {
diff --git a/sflphone-common/src/sip/Pattern.h b/sflphone-common/src/sip/Pattern.h
index 9758d31d1ccaa96e5eb2e36500ba35ab3137c053..1110384fe246f0455f7d006a75bcf056718abdee 100644
--- a/sflphone-common/src/sip/Pattern.h
+++ b/sflphone-common/src/sip/Pattern.h
@@ -121,7 +121,7 @@ class Pattern
          *
          * @return The currently set pattern
          */
-        inline std::string getPattern (void) {
+        std::string getPattern (void) const {
             return _pattern;
         }
 
diff --git a/sflphone-common/src/sip/SdesNegotiator.h b/sflphone-common/src/sip/SdesNegotiator.h
index cbfc81d8071c9c5993930945eb26582097d5f407..5765a24c87a0e5209b185de03cba0ba78286f994 100644
--- a/sflphone-common/src/sip/SdesNegotiator.h
+++ b/sflphone-common/src/sip/SdesNegotiator.h
@@ -109,25 +109,25 @@ class CryptoAttribute
             mkiLength (mkiLength) {};
 
 
-        inline std::string getTag() {
+        std::string getTag() const {
             return tag;
         };
-        inline std::string getCryptoSuite() {
+        std::string getCryptoSuite() const {
             return cryptoSuite;
         };
-        inline std::string getSrtpKeyMethod() {
+        std::string getSrtpKeyMethod() const {
             return srtpKeyMethod;
         };
-        inline std::string getSrtpKeyInfo() {
+        std::string getSrtpKeyInfo() const {
             return srtpKeyInfo;
         };
-        inline std::string getLifetime() {
+        std::string getLifetime() const {
             return lifetime;
         };
-        inline std::string getMkiValue() {
+        std::string getMkiValue() const {
             return mkiValue;
         };
-        inline std::string getMkiLength() {
+        std::string getMkiLength() const {
             return mkiLength;
         };
 
@@ -163,49 +163,49 @@ class SdesNegotiator
         /**
          * Return crypto suite after negotiation
          */
-        std::string getCryptoSuite (void) {
+        std::string getCryptoSuite (void) const {
             return _cryptoSuite;
         }
 
         /**
          * Return key method after negotiation (most likely inline:)
          */
-        std::string getKeyMethod (void) {
+        std::string getKeyMethod (void) const {
             return _srtpKeyMethod;
         }
 
         /**
          * Return crypto suite after negotiation
          */
-        std::string getKeyInfo (void) {
+        std::string getKeyInfo (void) const {
             return _srtpKeyInfo;
         }
 
         /**
          * Return key lifetime after negotiation
          */
-        std::string getLifeTime (void) {
+        std::string getLifeTime (void) const {
             return _lifetime;
         }
 
         /**
          * Return mki value after negotiation
          */
-        std::string getMkiValue (void) {
+        std::string getMkiValue (void) const {
             return _mkiValue;
         }
 
         /**
          * Return mki length after negotiation
          */
-        std::string getMkiLength (void) {
+        std::string getMkiLength (void) const {
             return _mkiLength;
         }
 
         /**
         * Authentication tag lenth
         */
-        std::string getAuthTagLength (void) {
+        std::string getAuthTagLength (void) const {
             return _authTagLength;
         }
 
diff --git a/sflphone-common/src/sip/sdp.h b/sflphone-common/src/sip/sdp.h
index 2f2bdc7e4cb85904856811dcbd241e1da404c5df..99c23a7413ad687f099ba097c7da75fb4df5bf67 100644
--- a/sflphone-common/src/sip/sdp.h
+++ b/sflphone-common/src/sip/sdp.h
@@ -97,7 +97,7 @@ class Sdp
         /**
          * Accessor for the internal memory pool
          */
-        inline pj_pool_t *getMemoryPool (void) {
+        pj_pool_t *getMemoryPool (void) const {
             return memPool;
         }
 
@@ -319,7 +319,7 @@ class Sdp
          * Set the SRTP master_key
          * @param mk The Master Key of a srtp session.
          */
-        inline void setLocalSdpCrypto (const std::vector<std::string> lc) {
+        void setLocalSdpCrypto (const std::vector<std::string> lc) {
             srtpCrypto = lc;
         }
 
@@ -329,7 +329,7 @@ class Sdp
          * have to set the correct zrtp-hash value in the corresponding media section.
          * @param hash The hello hash of a rtp session. (Only audio at the moment)
          */
-        inline void setZrtpHash (const std::string& hash) {
+        void setZrtpHash (const std::string& hash) {
             zrtpHelloHash = hash;
         }
 
diff --git a/sflphone-common/src/sip/sipcall.h b/sflphone-common/src/sip/sipcall.h
index 40988af1a9d89c61fe3190641044f65fe4878d69..8669d9c821f843043493d049cb3ea745876df56b 100644
--- a/sflphone-common/src/sip/sipcall.h
+++ b/sflphone-common/src/sip/sipcall.h
@@ -69,7 +69,7 @@ class SIPCall : public Call
          * Call Identifier
          * @return int  SIP call id
          */
-        int  getCid () {
+        int  getCid () const {
             return _cid;
         }
 
@@ -85,7 +85,7 @@ class SIPCall : public Call
          * Domain identifier
          * @return int  SIP domain id
          */
-        int  getDid() {
+        int  getDid() const {
             return _did;
         }
 
@@ -101,7 +101,7 @@ class SIPCall : public Call
          * Transaction identifier
          * @return int  SIP transaction id
          */
-        int  getTid () {
+        int  getTid () const {
             return _tid;
         }
 
@@ -156,7 +156,7 @@ class SIPCall : public Call
         /**
          * Returns a pointer to the AudioRtp object
          */
-        inline sfl::AudioRtpFactory * getAudioRtp (void) {
+        sfl::AudioRtpFactory * getAudioRtp (void) {
             return _audiortp;
         }
 
diff --git a/sflphone-common/src/voiplink.h b/sflphone-common/src/voiplink.h
index 5ccbfcf66ca947543fe7092e5dda58a90b2bd472..37e36399dac9b441ab54eab1fda47d046ff28998 100644
--- a/sflphone-common/src/voiplink.h
+++ b/sflphone-common/src/voiplink.h
@@ -235,7 +235,7 @@ class VoIPLink
         /**
          * @return AccountID  parent Account's ID
          */
-        inline AccountID& getAccountID (void) {
+        AccountID& getAccountID (void) {
             return _accountID;
         }
 
@@ -244,7 +244,7 @@ class VoIPLink
         /**
          * @param accountID The account identifier
          */
-        inline void setAccountID (const AccountID& accountID) {
+        void setAccountID (const AccountID& accountID) {
             _accountID = accountID;
         }
 
diff --git a/sflphone-common/test/delaydetectiontest.h b/sflphone-common/test/delaydetectiontest.h
index e0046b42c6352ad47a9af93c1dacc05bfe2e023a..9f91030b6391aa605eabec3f52481e3286e522ac 100644
--- a/sflphone-common/test/delaydetectiontest.h
+++ b/sflphone-common/test/delaydetectiontest.h
@@ -85,7 +85,7 @@ class DelayDetectionTest : public CppUnit::TestCase {
 
     void setUp();
 
-    inline void tearDown();
+    void tearDown();
 
     void testCrossCorrelation();
 
diff --git a/sflphone-common/test/historytest.h b/sflphone-common/test/historytest.h
index fac450afdfb0783b9bb770c48670501a2dc41f9b..e7c5d3937c466acf94c288161f53372da1577bad 100644
--- a/sflphone-common/test/historytest.h
+++ b/sflphone-common/test/historytest.h
@@ -92,7 +92,7 @@ class HistoryTest : public CppUnit::TestCase {
          * Code factoring - Common resources can be released here.
          * This method is called by unitcpp after each test
          */
-        inline void tearDown ();
+        void tearDown ();
 
     private:
         HistoryManager *history;
diff --git a/sflphone-common/test/instantmessagingtest.h b/sflphone-common/test/instantmessagingtest.h
index 4375471d237cbea97b8f950ad3cb91d3a9f6eb69..4d841c08ac68c2eea5cb10e67663a79931994a39 100644
--- a/sflphone-common/test/instantmessagingtest.h
+++ b/sflphone-common/test/instantmessagingtest.h
@@ -76,7 +76,7 @@ class InstantMessagingTest : public CppUnit::TestCase {
          * Code factoring - Common resources can be released here.
          * This method is called by unitcpp after each test
          */
-        inline void tearDown ();
+        void tearDown ();
 
         void testSaveSingleMessage ();
 		
diff --git a/sflphone-common/test/mainbuffertest.h b/sflphone-common/test/mainbuffertest.h
index 1c109c9e22e3371a5816a314abd5430e073708f4..dc94230149a3b26092ff36718d66618464eb47cf 100644
--- a/sflphone-common/test/mainbuffertest.h
+++ b/sflphone-common/test/mainbuffertest.h
@@ -104,7 +104,7 @@ class MainBufferTest : public CppUnit::TestCase {
          * Code factoring - Common resources can be released here.
          * This method is called by unitcpp after each test
          */
-        inline void tearDown();
+        void tearDown();
 
         void testRingBufferCreation();
 
diff --git a/sflphone-common/test/numbercleanertest.h b/sflphone-common/test/numbercleanertest.h
index d4e8774488b19fddd276fe83b5d322fbbaee0918..ef0f428707fe525dbc4b87d1c11682189c14b6fb 100644
--- a/sflphone-common/test/numbercleanertest.h
+++ b/sflphone-common/test/numbercleanertest.h
@@ -97,7 +97,7 @@ class NumberCleanerTest : public CppUnit::TestCase {
          * Code factoring - Common resources can be released here.
          * This method is called by unitcpp after each test
          */
-        inline void tearDown ();
+        void tearDown ();
 
     private:
         NumberCleaner *cleaner;
diff --git a/sflphone-common/test/pluginmanagertest.h b/sflphone-common/test/pluginmanagertest.h
index a51682966ee9954c393cafaafc7b615e7bdb313e..35da2468f7a989857d2609c6240168cda4c1d171 100644
--- a/sflphone-common/test/pluginmanagertest.h
+++ b/sflphone-common/test/pluginmanagertest.h
@@ -77,7 +77,7 @@ class PluginManagerTest : public CppUnit::TestCase {
          * Code factoring - Common resources can be released here.
          * This method is called by unitcpp after each test
          */
-        inline void tearDown ();
+        void tearDown ();
 
         void testLoadDynamicLibrary ();
         
diff --git a/sflphone-common/test/rtptest.h b/sflphone-common/test/rtptest.h
index 57d2b49aaca46020588709b85ba4042a60bc56a9..cfa9a14315c495753653dca50b1fda5eedf350d4 100644
--- a/sflphone-common/test/rtptest.h
+++ b/sflphone-common/test/rtptest.h
@@ -92,7 +92,7 @@ public:
 	 * Code factoring - Common resources can be released here.
 	 * This method is called by unitcpp after each test
 	 */
-	inline void tearDown();
+	void tearDown();
 
 	bool pjsipInit();
 
diff --git a/sflphone-common/test/sdptest.h b/sflphone-common/test/sdptest.h
index e810082403cf7f25bc2e4361be04cec6b0424b55..ddb4ff8dace71ca057250b82d03b7f69c1a6856a 100644
--- a/sflphone-common/test/sdptest.h
+++ b/sflphone-common/test/sdptest.h
@@ -104,7 +104,7 @@ public:
      * Code factoring - Common resources can be released here.
      * This method is called by unitcpp after each test
      */
-    inline void tearDown ();
+    void tearDown ();
 
 	void testInitialOfferFirstCodec();
 
diff --git a/sflphone-common/test/siptest.h b/sflphone-common/test/siptest.h
index 08599c02c1edcf5324639d86ee90660421ccba80..6219c32ba211c83163cc6833c6d0ab72a722822d 100644
--- a/sflphone-common/test/siptest.h
+++ b/sflphone-common/test/siptest.h
@@ -74,7 +74,7 @@ class SIPTest : public CppUnit::TestCase {
          * Code factoring - Common resources can be released here.
          * This method is called by unitcpp after each test
          */
-        inline void tearDown ();
+        void tearDown ();
 
 
 	void testSimpleOutgoingIpCall(void);