diff options
Diffstat (limited to 'libreofficekit/qa')
6 files changed, 7 insertions, 7 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx index fec03e046dc2..2ebaf0e49aec 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx @@ -24,7 +24,7 @@ #include "gtv-lok-dialog.hxx" #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx index 43037b5059f5..ff6023d5a74f 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx @@ -19,7 +19,7 @@ #include <map> #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> #include <o3tl/unreachable.hxx> namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx index bcee979766f5..359b6ad20833 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx @@ -18,7 +18,7 @@ #include "gtv-lok-dialog.hxx" #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> #include <iostream> diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx index 25f7d7890fdb..f2b76c1a93e3 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx @@ -20,7 +20,7 @@ #include <memory> #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx index 1b0233fee66c..dd601375a32c 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx @@ -20,7 +20,7 @@ #include <vector> #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> void btn_clicked(GtkWidget* pButton, gpointer) { @@ -89,7 +89,7 @@ void doPaste(GtkWidget* pButton, gpointer /*pItem*/) g_free(pTargets); } - o3tl::optional<GdkAtom> oTarget; + std::optional<GdkAtom> oTarget; std::string aTargetName; std::vector<std::string> aPreferredNames = diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx index 8802cb83be4b..28b6bc54d915 100644 --- a/libreofficekit/qa/tilebench/tilebench.cxx +++ b/libreofficekit/qa/tilebench/tilebench.cxx @@ -23,7 +23,7 @@ #include <LibreOfficeKit/LibreOfficeKit.hxx> #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> using namespace lok; |