convert TypeCode to strings, plus some fixes

Daniel K. O. · Daniel K. O. · commit 122668e48391 · 2023-03-26T01:55:47.000-03:00
diff --git a/include/libevdevxx/Event.hpp b/include/libevdevxx/Event.hpp
@@ -5,6 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 
+
 #ifndef LIBEVDEVXX_EVENT_HPP
 #define LIBEVDEVXX_EVENT_HPP
 
@@ -85,14 +86,9 @@ namespace evdev {
     to_string(const Event& e);
 
 
-    //std::ostream&
-    inline
-    auto&
-    operator <<(std::basic_ostream<auto, auto>& out,
-                const Event& e)
-    {
-        return out << to_string(e);
-    }
+    std::ostream&
+    operator <<(std::ostream& out,
+                const Event& e);
 
 
 }
diff --git a/include/libevdevxx/Property.hpp b/include/libevdevxx/Property.hpp
@@ -11,7 +11,7 @@
 
 
 #include <cstddef>
-#include <ostream>
+#include <iosfwd>
 #include <stdexcept>
 #include <string>
 #include <string_view>
diff --git a/include/libevdevxx/ReadStatus.hpp b/include/libevdevxx/ReadStatus.hpp
@@ -20,7 +20,7 @@
 namespace evdev {
 
 
-    enum class ReadStatus : int {
+    enum ReadStatus : int {
         success = LIBEVDEV_READ_STATUS_SUCCESS,
         dropped = LIBEVDEV_READ_STATUS_SYNC,
         again   = -EAGAIN
diff --git a/include/libevdevxx/Type.hpp b/include/libevdevxx/Type.hpp
@@ -12,7 +12,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <ostream>
+#include <iosfwd>
 #include <stdexcept>
 #include <string>
 #include <string_view>
@@ -115,15 +115,12 @@ namespace evdev {
 
 
     std::string
-    to_string(Type t);
+    to_string(Type type);
 
 
-    auto&
-    operator <<(std::basic_ostream<auto, auto>& out,
-                Type t)
-    {
-        return out << to_string(t);
-    }
+    std::ostream&
+    operator <<(std::ostream& out,
+                Type type);
 
 
 } // namespace evdev
diff --git a/include/libevdevxx/TypeCode.hpp b/include/libevdevxx/TypeCode.hpp
@@ -10,6 +10,13 @@
 #define LIBEVDEVXX_TYPE_CODE_HPP
 
 
+#include <string>
+#include <utility>
+
+#include "Code.hpp"
+#include "Type.hpp"
+
+
 namespace evdev {
 
 
@@ -18,6 +25,10 @@ namespace evdev {
         Code code;
     };
 
+
+    std::pair<std::string, std::string>
+    to_strings(const TypeCode& tc);
+
 }
 
 
diff --git a/include/libevdevxx/Uinput.hpp b/include/libevdevxx/Uinput.hpp
@@ -23,19 +23,13 @@
 namespace evdev {
 
 
-
+    /// A class to send events to a virtual device.
     class Uinput {
 
-        struct Deleter {
-            void operator()(::libevdev_uinput* udev) const noexcept;
-        };
-
-        std::unique_ptr<::libevdev_uinput, Deleter> udev;
-
     public:
 
         Uinput(const Device& dev);
-        Uinput(const Device& dev, int f);
+        Uinput(const Device& dev, int filedes);
 
 
         ::libevdev_uinput* data() noexcept;
@@ -72,10 +66,19 @@ namespace evdev {
 
         void flush();
 
+
+    private:
+
+        struct Deleter {
+            void operator()(::libevdev_uinput* udev) const noexcept;
+        };
+
+        std::unique_ptr<::libevdev_uinput, Deleter> udev;
+
     };
 
 
-}
+} // namespace evdev
 
 
 #endif
diff --git a/include/libevdevxx/detail/ScopedFile.hpp b/include/libevdevxx/detail/ScopedFile.hpp
@@ -60,6 +60,7 @@ namespace evdev::detail {
 
     };
 
+
 } // namespace evdev::detail
 
 
diff --git a/libevdevxx.spec.in b/libevdevxx.spec.in
@@ -6,7 +6,7 @@ Version:        @PACKAGE_VERSION@
 Release:        %mkrel 1
 Summary:        A C++ wrapper for libevdev.
 Group:          System/Libraries
-License:        GPLv3+
+License:        MIT
 Source0:        @TARBALL_NAME@
 
 %description
diff --git a/src/Event.cpp b/src/Event.cpp
@@ -5,6 +5,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+
+#include <ostream>
+
 #include "libevdevxx/Event.hpp"
 
 #include "utils.hpp"
@@ -30,11 +33,13 @@ namespace evdev {
     }
 
 
-    void
-    test(std::ostream& out, const Event& e)
+    std::ostream&
+    operator <<(std::ostream& out,
+                const Event& e)
     {
-        out << "test: " << e << std::endl;
+        return out << to_string(e);
     }
 
 
+
 } // namespace evdev
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -25,6 +25,7 @@ libevdevxx_la_SOURCES = \
 	ScopedFile.cpp \
 	SyncError.cpp \
 	Type.cpp \
+	TypeCode.cpp \
 	Uinput.cpp \
 	utils.cpp utils.hpp
 
diff --git a/src/ReadFlag.cpp b/src/ReadFlag.cpp
@@ -5,17 +5,14 @@
  * SPDX-License-Identifier: MIT
  */
 
+
 #include <ostream>
-#include <sstream>
 
 #include "libevdevxx/ReadFlag.hpp"
 
 #include "utils.hpp"
 
 
-using std::ostream;
-using std::ostringstream;
-
 using namespace std::literals;
 
 
diff --git a/src/ReadStatus.cpp b/src/ReadStatus.cpp
@@ -27,7 +27,7 @@ namespace evdev {
             case ReadStatus::dropped:
                 return "dropped"s;
             default:
-                return priv::errno_to_string(-static_cast<int>(st));
+                return priv::errno_to_string(-st);
         }
 
     }
diff --git a/src/Type.cpp b/src/Type.cpp
@@ -6,6 +6,8 @@
  */
 
 
+#include <ostream>
+
 #include "libevdevxx/Type.hpp"
 
 #include "utils.hpp"
@@ -48,4 +50,13 @@ namespace evdev {
     }
 
 
+
+    std::ostream&
+    operator <<(std::ostream& out,
+                Type type)
+    {
+        return out << to_string(type);
+    }
+
+
 }
diff --git a/src/TypeCode.cpp b/src/TypeCode.cpp
@@ -0,0 +1,24 @@
+/*
+ * libevdevxx - a C++ wrapper for libevdev
+ *
+ * Copyright (C) 2021-2023  Daniel K. O.
+ * SPDX-License-Identifier: MIT
+ */
+
+
+#include "libevdevxx/TypeCode.hpp"
+
+
+namespace evdev {
+
+
+    std::pair<std::string, std::string>
+    to_strings(const TypeCode& tc)
+    {
+        std::string type_name = to_string(tc.type);
+        std::string code_name = code_to_string(tc.type, tc.code);
+        return { type_name, code_name };
+    }
+
+
+}
diff --git a/src/Uinput.cpp b/src/Uinput.cpp
@@ -28,11 +28,11 @@ namespace evdev {
 
 
     Uinput::Uinput(const Device& dev,
-                   int f)
+                   int filedes)
     {
         ::libevdev_uinput* ptr = nullptr;
         int e = ::libevdev_uinput_create_from_device(dev.data(),
-                                                     f,
+                                                     filedes,
                                                      &ptr);
         if (e < 0)
             throw_sys_error(-e, "from libevdev_uinput_create_from_device()");

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ namespace evdev::detail {`
`60`	`60`
`61`	`61`	`};`
`62`	`62`
	`63`	`+`
`63`	`64`	`} // namespace evdev::detail`
`64`	`65`
`65`	`66`