Use <lttng/lttng.h> in lttngpy and clean up includes (backport #222) (#231)

Signed-off-by: Reece Holland <reece.j.holland@gmail.com>
(cherry picked from commit 91ff616)

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
Co-authored-by: RHolland <17493785+reeceholland@users.noreply.github.com>
Co-authored-by: Christophe Bedard <bedard.christophe@gmail.com>

Author: 3 people

lttngpy/src/lttngpy/channel.cpp

@@ -12,15 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Include lttng-error.h before channel.h, otherwise lttng_error_code isn't known
-// TODO(mosfet80): order it alphabetically once liblttng-ctl 2.14+ is fixed:
-// https://review.lttng.org/c/lttng-tools/+/15165
-#include <lttng/lttng-error.h>
-#include <lttng/channel.h>
-#include <lttng/constant.h>
-#include <lttng/domain.h>
-#include <lttng/event.h>
-#include <lttng/handle.h>
+#include <lttng/lttng.h>
 
 #include <optional>
 #include <string>

lttngpy/src/lttngpy/channel.hpp

@@ -15,8 +15,9 @@
 #ifndef LTTNGPY__CHANNEL_HPP_
 #define LTTNGPY__CHANNEL_HPP_
 
-#include <lttng/domain.h>
+#include <lttng/lttng.h>
 
+#include <optional>
 #include <string>
 
 namespace lttngpy

lttngpy/src/lttngpy/context_app.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <lttng/lttng-error.h>
+#include <lttng/lttng.h>
 
 #include <string>
 #include <variant>

lttngpy/src/lttngpy/context_lttng.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <lttng/event.h>
+#include <lttng/lttng.h>
 
 #include <map>
 #include <optional>

lttngpy/src/lttngpy/context_lttng.hpp

@@ -15,7 +15,7 @@
 #ifndef LTTNGPY__CONTEXT_LTTNG_HPP_
 #define LTTNGPY__CONTEXT_LTTNG_HPP_
 
-#include <lttng/event.h>
+#include <lttng/lttng.h>
 
 #include <optional>
 #include <string>

lttngpy/src/lttngpy/context_perf.cpp

@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <lttng/event.h>
-#include <lttng/lttng-error.h>
+#include <lttng/lttng.h>
 
 #include <algorithm>
 #include <map>

lttngpy/src/lttngpy/context_perf.hpp

@@ -15,7 +15,7 @@
 #ifndef LTTNGPY__CONTEXT_PERF_HPP_
 #define LTTNGPY__CONTEXT_PERF_HPP_
 
-#include <lttng/event.h>
+#include <lttng/lttng.h>
 
 #include <string>
 #include <variant>

lttngpy/src/lttngpy/event.cpp

@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <lttng/domain.h>
-#include <lttng/event.h>
-#include <lttng/lttng-error.h>
+#include <lttng/lttng.h>
 #include <string.h>
 
 #include <map>

lttngpy/src/lttngpy/event.hpp

@@ -15,8 +15,7 @@
 #ifndef LTTNGPY__EVENT_HPP_
 #define LTTNGPY__EVENT_HPP_
 
-#include <lttng/domain.h>
-#include <lttng/event.h>
+#include <lttng/lttng.h>
 
 #include <set>
 #include <string>

lttngpy/src/lttngpy/session.cpp

@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <lttng/lttng-error.h>
-#include <lttng/session.h>
+#include <lttng/lttng.h>
 
 #include <set>
 #include <string>