strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kf: Drop "5" from KF 5 desktop backend file names

Browse source 
... 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.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn 2024-05-30 13:57:03 +02:00
parent cc733542fe
commit 9214b80fe6
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shell/IwyuFilter_shell.yaml
View file

@ -4,7 +4,7 @@ excludelist:
shell/source/sessioninstall/SyncDbusSessionHelper.hxx: shell/source/sessioninstall/SyncDbusSessionHelper.hxx:
# No hpp->hdl replacement # No hpp->hdl replacement
- org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp - org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp
shell/source/backends/kf5be/kf5access.cxx: shell/source/backends/kf5be/kfaccess.cxx:
# Keep abstract QT headers # Keep abstract QT headers
- QtCore/QDir - QtCore/QDir
- QtCore/QStandardPaths - QtCore/QStandardPaths
@ -12,7 +12,7 @@ excludelist:
- QtCore/QUrl - QtCore/QUrl
- QtGui/QFont - QtGui/QFont
- QtGui/QFontDatabase - QtGui/QFontDatabase
shell/source/backends/kf5be/kf5backend.cxx: shell/source/backends/kf5be/kfbackend.cxx:
# Keep abstract QT headers # Keep abstract QT headers
- QtWidgets/QApplication - QtWidgets/QApplication
shell/source/backends/localebe/localebackend.cxx: shell/source/backends/localebe/localebackend.cxx:

4
shell/Library_kf5be.mk
View file

@ -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_set_componentfile,kf5be1,shell/source/backends/kf5be/kf5be1,services))
$(eval $(call gb_Library_add_exception_objects,kf5be1,\ $(eval $(call gb_Library_add_exception_objects,kf5be1,\
shell/source/backends/kf5be/kf5access \ shell/source/backends/kf5be/kfaccess \
shell/source/backends/kf5be/kf5backend \ shell/source/backends/kf5be/kfbackend \
)) ))
# Workaround for clang+icecream (clang's -frewrite-includes # Workaround for clang+icecream (clang's -frewrite-includes

4
shell/source/backends/kf5be/kf5access.cxx → shell/source/backends/kf5be/kfaccess.cxx
View file

@ -19,7 +19,7 @@
#include <sal/config.h> #include <sal/config.h>
#include "kf5access.hxx" #include "kfaccess.hxx"
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtCore/QString> #include <QtCore/QString>
@ -38,7 +38,7 @@
#include <osl/file.h> #include <osl/file.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
namespace kf5access namespace kfaccess
{ {
namespace namespace
{ {

2
shell/source/backends/kf5be/kf5access.hxx → shell/source/backends/kf5be/kfaccess.hxx
View file

@ -30,7 +30,7 @@ namespace com::sun::star::uno
class Any; class Any;
} }
namespace kf5access namespace kfaccess
{ {
css::beans::Optional<css::uno::Any> getValue(std::u16string_view id); css::beans::Optional<css::uno::Any> getValue(std::u16string_view id);
} }

6
shell/source/backends/kf5be/kf5backend.cxx → shell/source/backends/kf5be/kfbackend.cxx
View file

@ -46,7 +46,7 @@
#include <osl/process.h> #include <osl/process.h>
#include <osl/thread.h> #include <osl/thread.h>
#include "kf5access.hxx" #include "kfaccess.hxx"
namespace namespace
{ {
@ -144,14 +144,14 @@ void readKDESettings(std::map<OUString, css::beans::Optional<css::uno::Any>>& rS
for (const OUString& aKey : aKeys) 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::pair<OUString, css::beans::Optional<css::uno::Any>> elem
= std::make_pair(aKey, aValue); = std::make_pair(aKey, aValue);
rSettings.insert(elem); 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: use a helper process to read these values without linking to Qt directly?
// TODO: share this code somehow with Qt5Instance.cxx? // TODO: share this code somehow with Qt5Instance.cxx?
void initQApp(std::map<OUString, css::beans::Optional<css::uno::Any>>& rSettings) void initQApp(std::map<OUString, css::beans::Optional<css::uno::Any>>& rSettings)