From 0f2acacbe7c00deb61f74b648b194a24b6919e79 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Fri, 20 Jul 2007 04:14:13 +0000 Subject: [PATCH] * const correctness fixes * allow setting/getting a service type svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=690113 --- packagemetadata.cpp | 64 +++++++++++++++++++++++++-------------------- packagemetadata.h | 36 +++++++++++++------------ 2 files changed, 54 insertions(+), 46 deletions(-) diff --git a/packagemetadata.cpp b/packagemetadata.cpp index 2fe7ea9ac..707c8c2cf 100644 --- a/packagemetadata.cpp +++ b/packagemetadata.cpp @@ -44,6 +44,7 @@ class PackageMetadata::Private QString icon; QString preview; QString type; + QString serviceType; }; PackageMetadata::PackageMetadata() @@ -62,24 +63,17 @@ PackageMetadata::~PackageMetadata() delete d; } -bool PackageMetadata::isComplete() +bool PackageMetadata::isComplete() const { - if (d->name.isEmpty() || -// d->description.isEmpty() || - d->author.isEmpty() || - d->version.isEmpty() || - d->license.isEmpty() || -// d->mainFile.isEmpty() || - d->app.isEmpty() || -// d->requiredVersion.isEmpty() || - d->type.isEmpty()) { - return false; - } else { - return true; - } + return ! (d->name.isEmpty() || + d->author.isEmpty() || + d->version.isEmpty() || + d->license.isEmpty() || + d->app.isEmpty() || + d->type.isEmpty()); } -void PackageMetadata::write(const QString& filename) +void PackageMetadata::write(const QString& filename) const { KConfig cfg(filename); KConfigGroup config(&cfg, "Desktop Entry"); @@ -89,6 +83,7 @@ void PackageMetadata::write(const QString& filename) config.writeEntry("Name", d->name); config.writeEntry("Description", d->description); config.writeEntry("Icon", d->icon); + config.writeEntry("ServiceTypes", d->serviceType); config.writeEntry("X-KDE-PluginInfo-Name", d->name); config.writeEntry("X-KDE-PluginInfo-Author", d->author); config.writeEntry("X-KDE-PluginInfo-Email", d->email); @@ -110,6 +105,7 @@ void PackageMetadata::read(const QString& filename) d->name = config.readEntry("X-KDE-PluginInfo-Name", d->name); d->description = config.readEntry("Description", d->description); d->icon = config.readEntry("Icon", d->icon); + d->serviceType = config.readEntry("ServiceTypes", d->serviceType); d->author = config.readEntry("X-KDE-PluginInfo-Author", d->author); d->email = config.readEntry("X-KDE-PluginInfo-Email", d->email); d->version = config.readEntry("X-KDE-PluginInfo-Version", d->version); @@ -121,72 +117,77 @@ void PackageMetadata::read(const QString& filename) d->requiredVersion = config.readEntry("X-KDE-Plasmagik-RequiredVersion", d->requiredVersion); } -QString PackageMetadata::name() +QString PackageMetadata::name() const { return d->name; } -QString PackageMetadata::description() +QString PackageMetadata::description() const { return d->description; } -QString PackageMetadata::author() +QString PackageMetadata::serviceType() const +{ + return d->serviceType; +} + +QString PackageMetadata::author() const { return d->author; } -QString PackageMetadata::email() +QString PackageMetadata::email() const { return d->email; } -QString PackageMetadata::version() +QString PackageMetadata::version() const { return d->version; } -QString PackageMetadata::website() +QString PackageMetadata::website() const { return d->website; } -QString PackageMetadata::license() +QString PackageMetadata::license() const { return d->license; } -QString PackageMetadata::mainFile() +QString PackageMetadata::mainFile() const { return d->mainFile; } -QString PackageMetadata::application() +QString PackageMetadata::application() const { return d->app; } -QString PackageMetadata::requiredVersion() +QString PackageMetadata::requiredVersion() const { return d->requiredVersion; } -QString PackageMetadata::releaseNotes() +QString PackageMetadata::releaseNotes() const { return d->releaseNotes; } -QString PackageMetadata::icon() +QString PackageMetadata::icon() const { return d->icon; } -QString PackageMetadata::preview() +QString PackageMetadata::preview() const { return d->preview; } -QString PackageMetadata::type() +QString PackageMetadata::type() const { return d->type; } @@ -201,6 +202,11 @@ void PackageMetadata::setDescription(const QString &description) d->description = description; } +void PackageMetadata::setServiceType(const QString &serviceType) +{ + d->serviceType = serviceType; +} + void PackageMetadata::setAuthor(const QString &author) { d->author = author; diff --git a/packagemetadata.h b/packagemetadata.h index 4323d34be..b7a7e5f79 100644 --- a/packagemetadata.h +++ b/packagemetadata.h @@ -43,7 +43,7 @@ public: PackageMetadata(const QString& path); ~PackageMetadata(); - bool isComplete(); + bool isComplete() const; /** * Writes out the metadata to filename, which should be a .desktop @@ -53,7 +53,7 @@ public: * * @arg filename path to the file to write to **/ - void write(const QString& filename); + void write(const QString& filename) const; /** * Reads in metadata from a file, which should be a .desktop @@ -65,20 +65,21 @@ public: **/ void read(const QString& filename); - QString name(); - QString description(); - QString author(); - QString email(); - QString version(); - QString website(); - QString license(); - QString mainFile(); - QString application(); - QString requiredVersion(); - QString releaseNotes(); - QString filenameToSave(); + QString name() const; + QString description() const; + QString serviceType() const; + QString author() const; + QString email() const; + QString version() const; + QString website() const; + QString license() const; + QString mainFile() const; + QString application() const; + QString requiredVersion() const; + QString releaseNotes() const; + QString filenameToSave() const; // filename - QString icon(); + QString icon() const; /** * Path to a PNG file containing a preview image. @@ -87,12 +88,13 @@ public: * @return path to a local image file, or QString() if no * preview is available **/ - QString preview(); + QString preview() const; - QString type(); + QString type() const; void setName(const QString &); void setDescription(const QString &); + void setServiceType(const QString &); void setAuthor(const QString &); void setEmail(const QString &); void setVersion(const QString &);