diff --git a/include/linphone/utils/utils.h b/include/linphone/utils/utils.h index 6fea7d5c2..b11154255 100644 --- a/include/linphone/utils/utils.h +++ b/include/linphone/utils/utils.h @@ -105,8 +105,8 @@ namespace Utils { return object; } - LINPHONE_PUBLIC std::tm getTimeTAsTm (std::time_t time); - LINPHONE_PUBLIC std::time_t getTmAsTimeT (const std::tm &time); + LINPHONE_PUBLIC std::tm getTimeTAsTm (time_t time); + LINPHONE_PUBLIC time_t getTmAsTimeT (const std::tm &time); } LINPHONE_END_NAMESPACE diff --git a/src/event-log/conference/conference-call-event.h b/src/event-log/conference/conference-call-event.h index f2e58b893..53a4667ff 100644 --- a/src/event-log/conference/conference-call-event.h +++ b/src/event-log/conference/conference-call-event.h @@ -33,7 +33,7 @@ class ConferenceCallEventPrivate; class LINPHONE_PUBLIC ConferenceCallEvent : public EventLog { public: - ConferenceCallEvent (Type type, std::time_t time, const std::shared_ptr &call); + ConferenceCallEvent (Type type, time_t time, const std::shared_ptr &call); std::shared_ptr getCall () const; diff --git a/src/event-log/conference/conference-chat-message-event.h b/src/event-log/conference/conference-chat-message-event.h index f64cf7afd..64a210e90 100644 --- a/src/event-log/conference/conference-chat-message-event.h +++ b/src/event-log/conference/conference-chat-message-event.h @@ -33,7 +33,7 @@ class ConferenceChatMessageEventPrivate; class LINPHONE_PUBLIC ConferenceChatMessageEvent : public ConferenceEvent { public: - ConferenceChatMessageEvent (std::time_t time, const std::shared_ptr &chatMessage); + ConferenceChatMessageEvent (time_t time, const std::shared_ptr &chatMessage); std::shared_ptr getChatMessage () const; diff --git a/src/event-log/conference/conference-event.h b/src/event-log/conference/conference-event.h index 080c9e9a2..93a64a160 100644 --- a/src/event-log/conference/conference-event.h +++ b/src/event-log/conference/conference-event.h @@ -31,12 +31,12 @@ class ConferenceEventPrivate; class LINPHONE_PUBLIC ConferenceEvent : public EventLog { public: - ConferenceEvent (Type type, std::time_t time, const Address &conferenceAddress); + ConferenceEvent (Type type, time_t time, const Address &conferenceAddress); const Address &getConferenceAddress () const; protected: - ConferenceEvent (ConferenceEventPrivate &p, Type type, std::time_t time, const Address &conferenceAddress); + ConferenceEvent (ConferenceEventPrivate &p, Type type, time_t time, const Address &conferenceAddress); private: L_DECLARE_PRIVATE(ConferenceEvent); diff --git a/src/event-log/conference/conference-notified-event.h b/src/event-log/conference/conference-notified-event.h index eca259f49..0c16de48f 100644 --- a/src/event-log/conference/conference-notified-event.h +++ b/src/event-log/conference/conference-notified-event.h @@ -31,7 +31,7 @@ class ConferenceNotifiedEventPrivate; class LINPHONE_PUBLIC ConferenceNotifiedEvent : public ConferenceEvent { public: ConferenceNotifiedEvent ( - Type type, std::time_t time, + Type type, time_t time, const Address &conferenceAddress, unsigned int notifiyId ); @@ -42,7 +42,7 @@ protected: ConferenceNotifiedEvent ( ConferenceNotifiedEventPrivate &p, Type type, - std::time_t time, + time_t time, const Address &conferenceAddress, unsigned int notifyId ); diff --git a/src/event-log/conference/conference-participant-device-event.h b/src/event-log/conference/conference-participant-device-event.h index d57834dd7..a4e1aca79 100644 --- a/src/event-log/conference/conference-participant-device-event.h +++ b/src/event-log/conference/conference-participant-device-event.h @@ -32,7 +32,7 @@ class LINPHONE_PUBLIC ConferenceParticipantDeviceEvent : public ConferencePartic public: ConferenceParticipantDeviceEvent ( Type type, - std::time_t time, + time_t time, const Address &conferenceAddress, unsigned int notifyId, const Address &participantAddress, diff --git a/src/event-log/conference/conference-participant-event.h b/src/event-log/conference/conference-participant-event.h index 792583dcf..d699adc9b 100644 --- a/src/event-log/conference/conference-participant-event.h +++ b/src/event-log/conference/conference-participant-event.h @@ -32,7 +32,7 @@ class LINPHONE_PUBLIC ConferenceParticipantEvent : public ConferenceNotifiedEven public: ConferenceParticipantEvent ( Type type, - std::time_t time, + time_t time, const Address &conferenceAddress, unsigned int notifyId, const Address &participantAddress @@ -44,7 +44,7 @@ protected: ConferenceParticipantEvent ( ConferenceParticipantEventPrivate &p, Type type, - std::time_t time, + time_t time, const Address &conferenceAddress, unsigned int notifyId, const Address &participantAddress diff --git a/src/event-log/conference/conference-subject-event.h b/src/event-log/conference/conference-subject-event.h index 8ea9a039f..02e1bcf67 100644 --- a/src/event-log/conference/conference-subject-event.h +++ b/src/event-log/conference/conference-subject-event.h @@ -33,7 +33,7 @@ class ConferenceSubjectEventPrivate; class LINPHONE_PUBLIC ConferenceSubjectEvent : public ConferenceNotifiedEvent { public: ConferenceSubjectEvent ( - std::time_t time, + time_t time, const Address &conferenceAddress, unsigned int notifyId, const std::string &subject diff --git a/src/event-log/event-log-p.h b/src/event-log/event-log-p.h index 4c4085883..a5a566594 100644 --- a/src/event-log/event-log-p.h +++ b/src/event-log/event-log-p.h @@ -35,7 +35,7 @@ public: private: EventLog::Type type = EventLog::Type::None; - std::time_t time = -1; + time_t time = -1; L_DECLARE_PUBLIC(EventLog); }; diff --git a/src/event-log/event-log.cpp b/src/event-log/event-log.cpp index 9ccfa8afc..e6a821f1c 100644 --- a/src/event-log/event-log.cpp +++ b/src/event-log/event-log.cpp @@ -26,7 +26,7 @@ LINPHONE_BEGIN_NAMESPACE EventLog::EventLog () : BaseObject(*new EventLogPrivate) {} -EventLog::EventLog (EventLogPrivate &p, Type type, std::time_t time) : BaseObject(p) { +EventLog::EventLog (EventLogPrivate &p, Type type, time_t time) : BaseObject(p) { L_D(); d->type = type; d->time = time; @@ -37,7 +37,7 @@ EventLog::Type EventLog::getType () const { return d->type; } -std::time_t EventLog::getTime () const { +time_t EventLog::getTime () const { L_D(); return d->time; } diff --git a/src/event-log/event-log.h b/src/event-log/event-log.h index 9e43aec8c..265a63ce7 100644 --- a/src/event-log/event-log.h +++ b/src/event-log/event-log.h @@ -43,10 +43,10 @@ public: EventLog (); Type getType () const; - std::time_t getTime () const; + time_t getTime () const; protected: - EventLog (EventLogPrivate &p, Type type, std::time_t time); + EventLog (EventLogPrivate &p, Type type, time_t time); private: L_DECLARE_PRIVATE(EventLog);