From c8443a095827f291e173b5d27a5f3a07ebb11524 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Fri, 27 May 2011 12:12:52 +0200 Subject: [PATCH] remove deprecated prefix methods; there are now multiple prefixes! --- packagestructure.cpp | 11 ----------- packagestructure.h | 17 ----------------- 2 files changed, 28 deletions(-) diff --git a/packagestructure.cpp b/packagestructure.cpp index 53265f3fd..322382080 100644 --- a/packagestructure.cpp +++ b/packagestructure.cpp @@ -541,17 +541,6 @@ void PackageStructure::write(KConfigBase *config) const } } -QString PackageStructure::contentsPrefix() const -{ - return d->contentsPrefixPaths.isEmpty() ? QString() : d->contentsPrefixPaths.first(); -} - -void PackageStructure::setContentsPrefix(const QString &prefix) -{ - d->contentsPrefixPaths.clear(); - d->contentsPrefixPaths << prefix; -} - QStringList PackageStructure::contentsPrefixPaths() const { return d->contentsPrefixPaths; diff --git a/packagestructure.h b/packagestructure.h index 645a94b57..0933001ba 100644 --- a/packagestructure.h +++ b/packagestructure.h @@ -284,12 +284,6 @@ public: */ virtual void createNewWidgetBrowser(QWidget *parent = 0); - /** - * @return the prefix inserted between the base path and content entries - * @deprecated use contentsPrefixPaths() instead. - */ - KDE_DEPRECATED QString contentsPrefix() const; - /** * @return the prefix paths inserted between the base path and content entries, in order of priority. * When searching for a file, all paths will be tried in order. @@ -337,17 +331,6 @@ protected: */ void setAllowExternalPaths(bool allow); - /** - * Sets the prefix that all the contents in this package should - * appear under. This defaults to "contents/" and is added automatically - * between the base path and the entries as defined by the package - * structure - * - * @arg prefix the directory prefix to use - * @deprecated use setContentsPrefixPaths() instead. - */ - KDE_DEPRECATED void setContentsPrefix(const QString &prefix); - /** * Sets the prefixes that all the contents in this package should * appear under. This defaults to "contents/" and is added automatically