alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename BackgroundHints

Browse Source
This commit is contained in:
Marco Martin 2013-05-14 21:02:54 +02:00
parent 13045faffa
commit 40fd2f23ca
3 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plasma/plasma.h
View File

@ -288,26 +288,6 @@ PLASMA_EXPORT Types::Direction locationToDirection(Types::Location location);
**/ **/
PLASMA_EXPORT Types::Direction locationToInverseDirection(Types::Location location); PLASMA_EXPORT Types::Direction locationToInverseDirection(Types::Location location);
//For porting
//TODO: remove
//typedef Types::Constraint Constraint;
//Q_DECLARE_FLAGS(Constraints, Constraint)
//typedef Types::FormFactor FormFactor;
//typedef Types::ContainmentType ContainmentType;
//typedef Types::ActionType ActionType;
//typedef Types::Direction Direction;
//typedef Types::Location Location;
//typedef Types::Position Position;
//typedef Types::PopupPlacement PopupPlacement;
//typedef Types::FlipDirection FlipDirection;
//typedef Types::IntervalAlignment IntervalAlignment;
//typedef Types::ImmutabilityType ImmutabilityType;
//typedef Types::ComponentType ComponentType;
//typedef Types::MarginEdge MarginEdge;
//typedef Types::ItemStatus ItemStatus;
typedef Types::TrustLevel TrustLevel;
typedef Types::BackgroundHints BackgroundHints;
} // Plasma namespace } // Plasma namespace

4
src/plasma/staging/signing.cpp
View File

@ -590,10 +590,10 @@ TrustLevel Signing::trustLevelOf(const QString &keyID) const
return Plasma::UnverifiableTrust; return Plasma::UnverifiableTrust;
for (int i = (int)Plasma::UnverifiableTrust; i <= (int)Plasma::UltimatelyTrusted; ++i) { for (int i = (int)Plasma::UnverifiableTrust; i <= (int)Plasma::UltimatelyTrusted; ++i) {
QList< QByteArray > tmp = d->keys[(Plasma::TrustLevel)i]; QList< QByteArray > tmp = d->keys[(Plasma::Types::TrustLevel)i];
foreach(QByteArray key, tmp) { foreach(QByteArray key, tmp) {
if (key.contains(keyID.toAscii().data())) if (key.contains(keyID.toAscii().data()))
return (Plasma::TrustLevel)i; return (Plasma::Types::TrustLevel)i;
} }
} }

2
src/plasma/staging/signing.h
View File

@ -70,7 +70,7 @@ class SigningPrivate;
* QString signer = m_auth->signerOf(plasmoidPath); * QString signer = m_auth->signerOf(plasmoidPath);
* *
* // If you need to know the authentication level associated with a specific signer, simply call: * // If you need to know the authentication level associated with a specific signer, simply call:
* Plasma::TrustLevel level = m_auth->trustLevelOf(signer) * Plasma::Types::TrustLevel level = m_auth->trustLevelOf(signer)
* *
* // If you need more details about a key with a given keyID, you have to call: * // If you need more details about a key with a given keyID, you have to call:
* QString info = m_auth->descriptiveString(keyID); * QString info = m_auth->descriptiveString(keyID);