shell/IwyuFilter_shell.yaml | 4 ++--
shell/Library_kf5be.mk | 4 ++--
shell/source/backends/kf5be/kfaccess.cxx | 4 ++--
shell/source/backends/kf5be/kfaccess.hxx | 7 ++-----
shell/source/backends/kf5be/kfbackend.cxx | 6 +++---
5 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit 9214b80fe67f6771a4120b6eeaddd85cea1d6f2a
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 30 13:57:03 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 31 14:28:52 2024 +0200
kf: Drop "5" from KF 5 desktop backend file names
... and namespace.
This is in preparation of implementing a KF 6
backend that will reuse most of the code.
Change-Id: I0c0f499ff57dd18e7e0bc7dd838acfeffa30d88c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168274
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/shell/IwyuFilter_shell.yaml b/shell/IwyuFilter_shell.yaml
index 755dc738343e..5239593d0ee0 100644
--- a/shell/IwyuFilter_shell.yaml
+++ b/shell/IwyuFilter_shell.yaml
@@ -4,7 +4,7 @@ excludelist:
shell/source/sessioninstall/SyncDbusSessionHelper.hxx:
# No hpp->hdl replacement
- org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp
- shell/source/backends/kf5be/kf5access.cxx:
+ shell/source/backends/kf5be/kfaccess.cxx:
# Keep abstract QT headers
- QtCore/QDir
- QtCore/QStandardPaths
@@ -12,7 +12,7 @@ excludelist:
- QtCore/QUrl
- QtGui/QFont
- QtGui/QFontDatabase
- shell/source/backends/kf5be/kf5backend.cxx:
+ shell/source/backends/kf5be/kfbackend.cxx:
# Keep abstract QT headers
- QtWidgets/QApplication
shell/source/backends/localebe/localebackend.cxx:
diff --git a/shell/Library_kf5be.mk b/shell/Library_kf5be.mk
index 1355d402dc00..dfcac91f871a 100644
--- a/shell/Library_kf5be.mk
+++ b/shell/Library_kf5be.mk
@@ -25,8 +25,8 @@ $(eval $(call gb_Library_use_libraries,kf5be1,\
$(eval $(call
gb_Library_set_componentfile,kf5be1,shell/source/backends/kf5be/kf5be1,services))
$(eval $(call gb_Library_add_exception_objects,kf5be1,\
- shell/source/backends/kf5be/kf5access \
- shell/source/backends/kf5be/kf5backend \
+ shell/source/backends/kf5be/kfaccess \
+ shell/source/backends/kf5be/kfbackend \
))
# Workaround for clang+icecream (clang's -frewrite-includes
diff --git a/shell/source/backends/kf5be/kf5access.cxx
b/shell/source/backends/kf5be/kfaccess.cxx
similarity index 99%
rename from shell/source/backends/kf5be/kf5access.cxx
rename to shell/source/backends/kf5be/kfaccess.cxx
index d266f147d68a..93fe1ed49b20 100644
--- a/shell/source/backends/kf5be/kf5access.cxx
+++ b/shell/source/backends/kf5be/kfaccess.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#include "kf5access.hxx"
+#include "kfaccess.hxx"
#include <QtGui/QFont>
#include <QtCore/QString>
@@ -38,7 +38,7 @@
#include <osl/file.h>
#include <rtl/ustring.hxx>
-namespace kf5access
+namespace kfaccess
{
namespace
{
diff --git a/shell/source/backends/kf5be/kf5access.hxx
b/shell/source/backends/kf5be/kfaccess.hxx
similarity index 98%
rename from shell/source/backends/kf5be/kf5access.hxx
rename to shell/source/backends/kf5be/kfaccess.hxx
index bb4817c38cf5..2bbd5ad4887b 100644
--- a/shell/source/backends/kf5be/kf5access.hxx
+++ b/shell/source/backends/kf5be/kfaccess.hxx
@@ -30,7 +30,7 @@ namespace com::sun::star::uno
class Any;
}
-namespace kf5access
+namespace kfaccess
{
css::beans::Optional<css::uno::Any> getValue(std::u16string_view id);
}
diff --git a/shell/source/backends/kf5be/kf5backend.cxx
b/shell/source/backends/kf5be/kfbackend.cxx
similarity index 97%
rename from shell/source/backends/kf5be/kf5backend.cxx
rename to shell/source/backends/kf5be/kfbackend.cxx
index 7a90dfdcdffd..81a48ad53ffe 100644
--- a/shell/source/backends/kf5be/kf5backend.cxx
+++ b/shell/source/backends/kf5be/kfbackend.cxx
@@ -46,7 +46,7 @@
#include <osl/process.h>
#include <osl/thread.h>
-#include "kf5access.hxx"
+#include "kfaccess.hxx"
namespace
{
@@ -144,14 +144,14 @@ void readKDESettings(std::map<OUString,
css::beans::Optional<css::uno::Any>>& rS
for (const OUString& aKey : aKeys)
{
- css::beans::Optional<css::uno::Any> aValue = kf5access::getValue(aKey);
+ css::beans::Optional<css::uno::Any> aValue = kfaccess::getValue(aKey);
std::pair<OUString, css::beans::Optional<css::uno::Any>> elem
= std::make_pair(aKey, aValue);
rSettings.insert(elem);
}
}
-// init the QApplication when we load the kf5backend into a non-Qt vclplug
(e.g. gtk3_kde5)
+// init the QApplication when we load the kfbackend into a non-Qt vclplug
(e.g. gtk3_kde5)
// TODO: use a helper process to read these values without linking to Qt
directly?
// TODO: share this code somehow with Qt5Instance.cxx?
void initQApp(std::map<OUString, css::beans::Optional<css::uno::Any>>&
rSettings)
commit cc733542fecc2e63bc794559dfa6320d788e9254
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 30 13:48:35 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 31 14:28:44 2024 +0200
tdf#143148 kf: Use pragma once in kf5access.hxx
Change-Id: If2d8d2dc13088ba2b2972198b8386be55401871d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168273
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/shell/source/backends/kf5be/kf5access.hxx
b/shell/source/backends/kf5be/kf5access.hxx
index 765d9c706d4e..bb4817c38cf5 100644
--- a/shell/source/backends/kf5be/kf5access.hxx
+++ b/shell/source/backends/kf5be/kf5access.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_KF5BE_KF5ACCESS_HXX
-#define INCLUDED_SHELL_SOURCE_BACKENDS_KF5BE_KF5ACCESS_HXX
+#pragma once
#include <sal/config.h>
@@ -36,6 +35,4 @@ namespace kf5access
css::beans::Optional<css::uno::Any> getValue(std::u16string_view id);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
