Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

[oweals/minetest.git] / src / clientiface.h

diff --git a/src/clientiface.h b/src/clientiface.h
index 403cd04208d7b8493f27a4ede26cc682b2172321..d2299c8796910d3c020ae34d6d388c8e40aa7797 100644 (file)
--- a/src/clientiface.h
+++ b/src/clientiface.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "threading/mutex.h"
 #include "network/networkpacket.h"
 #include "util/cpp11_container.h"
+#include "porting.h"
 
 #include <list>
 #include <vector>
@@ -265,7 +266,7 @@ public:
                m_version_patch(0),
                m_full_version("unknown"),
                m_deployed_compression(0),
-               m_connection_time(getTime(PRECISION_SECONDS))
+               m_connection_time(porting::getTimeS())
        {
        }
        ~RemoteClient()
@@ -324,14 +325,11 @@ public:
        */
        std::set<u16> m_known_objects;
 
-       ClientState getState()
-               { return m_state; }
+       ClientState getState() const { return m_state; }
 
-       std::string getName()
-               { return m_name; }
+       std::string getName() const { return m_name; }
 
-       void setName(std::string name)
-               { m_name = name; }
+       void setName(const std::string &name) { m_name = name; }
 
        /* update internal client state */
        void notifyEvent(ClientStateEvent event);
@@ -347,10 +345,11 @@ public:
                { serialization_version = m_pending_serialization_version; }
 
        /* get uptime */
-       u32 uptime();
+       u64 uptime() const;
 
        /* set version information */
-       void setVersionInfo(u8 major, u8 minor, u8 patch, std::string full) {
+       void setVersionInfo(u8 major, u8 minor, u8 patch, const std::string &full)
+       {
                m_version_major = major;
                m_version_minor = minor;
                m_version_patch = patch;
@@ -358,10 +357,9 @@ public:
        }
 
        /* read version information */
-       u8 getMajor() { return m_version_major; }
-       u8 getMinor() { return m_version_minor; }
-       u8 getPatch() { return m_version_patch; }
-       std::string getVersion() { return m_full_version; }
+       u8 getMajor() const { return m_version_major; }
+       u8 getMinor() const { return m_version_minor; }
+       u8 getPatch() const { return m_version_patch; }
 private:
        // Version is stored in here after INIT before INIT2
        u8 m_pending_serialization_version;
@@ -434,7 +432,7 @@ private:
        /*
                time this client was created
         */
-       const u32 m_connection_time;
+       const u64 m_connection_time;
 };
 
 class ClientInterface {