From beb932f7af60a620045d225355c198c8551cfd3c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 3 Aug 2021 00:56:35 +0300 Subject: [PATCH] plasma: remove deprecated and unused signal Signed-off-by: Ivailo Monev --- plasma/containment.h | 6 ------ plasma/corona.h | 11 ----------- plasma/packagestructure.cpp | 9 +-------- plasma/plasma.h | 8 -------- 4 files changed, 1 insertion(+), 33 deletions(-) diff --git a/plasma/containment.h b/plasma/containment.h index a3a61854..7a1da053 100644 --- a/plasma/containment.h +++ b/plasma/containment.h @@ -408,12 +408,6 @@ Q_SIGNALS: */ void appletRemoved(Plasma::Applet *applet); - /** - * Emitted when the containment requests zooming in or out one step. - * @deprecated - */ - void zoomRequested(Plasma::Containment *containment, Plasma::ZoomDirection direction); - /** * Emitted when the user clicks on the toolbox */ diff --git a/plasma/corona.h b/plasma/corona.h index a781f76f..e254e8dc 100644 --- a/plasma/corona.h +++ b/plasma/corona.h @@ -287,17 +287,6 @@ public: */ AbstractDialogManager *dialogManager(); - /** - * Imports an applet layout from a config file. The results will be added to the - * current set of Containments. - * @deprecated Use the 4.6 version that takes a KConfigGroup - * - * @param config the name of the config file to load from, - * or the default config file if QString() - * @return the list of containments that were loaded - * @since 4.5 - */ - /** * Returns the name of the preferred plugin to be used as containment toolboxes. * CustomContainments and CustomPanelContainments can still override it as their liking. It's also not guaranteed that the plugin will actually exist. diff --git a/plasma/packagestructure.cpp b/plasma/packagestructure.cpp index 81461b1d..2f5e3b1f 100644 --- a/plasma/packagestructure.cpp +++ b/plasma/packagestructure.cpp @@ -353,14 +353,7 @@ void PackageStructure::removeDefinition(const char *key) QString PackageStructure::path(const char *key) const { - //kDebug() << "looking for" << key; - QMap::const_iterator it = d->contents.constFind(key); - if (it == d->contents.constEnd()) { - return QString(); - } - - //kDebug() << "found" << key << "and the value is" << it.value().paths.first(); - return it.value().paths.first(); + return searchPath(key).first(); } QStringList PackageStructure::searchPath(const char *key) const diff --git a/plasma/plasma.h b/plasma/plasma.h index b83dd9e8..4a6d86ad 100644 --- a/plasma/plasma.h +++ b/plasma/plasma.h @@ -94,14 +94,6 @@ enum Direction { Right /**< Display to the right */ }; -/** - * The direction of a zoom action. - */ -enum ZoomDirection { - ZoomIn = 0, /**< Zoom in one step */ - ZoomOut = 1 /**< Zoom out one step */ -}; - /** * The Location enumeration describes where on screen an element, such as an * Applet or its managing container, is positioned on the screen.