From kde-commits Wed Apr 30 22:13:28 2008 From: =?utf-8?q?Aaron=20J=2E=20Seigo?= Date: Wed, 30 Apr 2008 22:13:28 +0000 To: kde-commits Subject: KDE/kdebase/workspace/libs/plasma Message-Id: <1209593608.389701.18169.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=120959361500334 SVN commit 802866 by aseigo: Plasma::AspectRatioMode, just like Qt::AspectRatioMode. the setter/getter in Applet even used Mode. M +3 -3 applet.cpp M +4 -4 applet.h M +7 -7 plasma.h --- trunk/KDE/kdebase/workspace/libs/plasma/applet.cpp #802865:802866 @@ -761,12 +761,12 @@ return c ? c->d->location : Plasma::Desktop; } -Plasma::AspectRatio Applet::aspectRatioMode() const +Plasma::AspectRatioMode Applet::aspectRatioMode() const { return d->aspectRatioMode; } -void Applet::setAspectRatioMode(Plasma::AspectRatio mode) +void Applet::setAspectRatioMode(Plasma::AspectRatioMode mode) { d->aspectRatioMode = mode; } @@ -1183,7 +1183,7 @@ cachedBackground(0), mainConfig(0), pendingConstraints(NoConstraint), - aspectRatioMode(Qt::KeepAspectRatio), + aspectRatioMode(Plasma::KeepAspectRatio), immutability(NotImmutable), hasConfigurationInterface(false), failed(false), --- trunk/KDE/kdebase/workspace/libs/plasma/applet.h #802865:802866 @@ -218,16 +218,16 @@ * @see Plasma::Location */ virtual Location location() const; - - /** + + /** * @return the prefered aspect ratio mode for placement and resizing */ - Plasma::AspectRatio aspectRatioMode() const; + Plasma::AspectRatioMode aspectRatioMode() const; /** * Sets the prefered aspect ratio mode for placement and resizing */ - void setAspectRatioMode(Plasma::AspectRatio); + void setAspectRatioMode(Plasma::AspectRatioMode); /** * Returns a list of all known applets. --- trunk/KDE/kdebase/workspace/libs/plasma/plasma.h #802865:802866 @@ -146,19 +146,19 @@ * Defines the immutability of items like applets, corona and containments * they can be free to modify, locked down by the user or locked down by the system (e.g. kiosk setups) */ -enum ImmutabilityType { NotImmutable = 1 /**The item can be modified in any way **/, - UserImmutable = 2 /**The user has requested a lock down, and can undo the lock down at any time **/, - SystemImmutable = 4 /** the item is locked down by the system, the user can't unlock it **/ +enum ImmutabilityType { NotImmutable = 1 /**< The item can be modified in any way **/, + UserImmutable = 2 /**< The user has requested a lock down, and can undo the lock down at any time **/, + SystemImmutable = 4 /**< the item is locked down by the system, the user can't unlock it **/ }; /** * Defines the aspect ratio used when scaling an applet */ -enum AspectRatio { IgnoreAspectRatio = 0 /** The applet can be freely resized */, - KeepAspectRatio = 1 /** The applet keeps a fixed aspect ratio */, - Square = 2 /** The applet is always a square */ - }; +enum AspectRatioMode { IgnoreAspectRatio = 0 /**< The applet can be freely resized */, + KeepAspectRatio = 1 /**< The applet keeps a fixed aspect ratio */, + Square = 2 /**< The applet is always a square */ + }; /** * The ComonentType enumeration refers to the various types of components,