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

rename Plasma::ContainmentType

Browse Source
This commit is contained in:
Marco Martin 2013-05-14 18:34:40 +02:00
parent 812b9a06ab
commit c90e6d23cf
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plasma/containment.cpp
View File

@ -291,12 +291,12 @@ void Containment::restoreContents(KConfigGroup &group)
}
}
Plasma::ContainmentType Containment::containmentType() const
Plasma::Types::ContainmentType Containment::containmentType() const
{
return d->type;
}
void Containment::setContainmentType(Plasma::ContainmentType type)
void Containment::setContainmentType(Plasma::Types::ContainmentType type)
{
if (d->type == type) {
return;

4
src/plasma/containment.h
View File

@ -100,7 +100,7 @@ class PLASMA_EXPORT Containment : public Applet
/**
* Returns the type of containment
*/
Plasma::ContainmentType containmentType() const;
Plasma::Types::ContainmentType containmentType() const;
/**
* Returns the Corona (if any) that this Containment is hosted by
@ -282,7 +282,7 @@ Q_SIGNALS:
/**
* Sets the type of this containment.
*/
void setContainmentType(Plasma::ContainmentType type);
void setContainmentType(Plasma::Types::ContainmentType type);
/**
* Sets whether wallpaper is painted or not.

2
src/plasma/plasma.h
View File

@ -302,7 +302,7 @@ PLASMA_EXPORT Types::Direction locationToInverseDirection(Types::Location locati
//typedef Types::Constraint Constraint;
//Q_DECLARE_FLAGS(Constraints, Constraint)
//typedef Types::FormFactor FormFactor;
typedef Types::ContainmentType ContainmentType;
//typedef Types::ContainmentType ContainmentType;
typedef Types::ActionType ActionType;
typedef Types::Direction Direction;
//typedef Types::Location Location;

2
src/plasma/private/containment_p.h
View File

@ -102,7 +102,7 @@ public:
QHash<QString, ContainmentActions*> localActionPlugins;
int screen;
QString activityId;
ContainmentType type;
Types::ContainmentType type;
bool drawWallpaper : 1;
static const char defaultWallpaper[];

4
src/plasma/scripting/appletscript.cpp
View File

@ -146,7 +146,7 @@ void AppletScript::setDrawWallpaper(bool drawWallpaper)
}
}
Plasma::ContainmentType AppletScript::containmentType() const
Plasma::Types::ContainmentType AppletScript::containmentType() const
{
Q_ASSERT(d->applet);
Plasma::Containment *cont = qobject_cast<Plasma::Containment *>(d->applet);
@ -157,7 +157,7 @@ Plasma::ContainmentType AppletScript::containmentType() const
}
}
void AppletScript::setContainmentType(Plasma::ContainmentType type)
void AppletScript::setContainmentType(Plasma::Types::ContainmentType type)
{
Q_ASSERT(d->applet);
Plasma::Containment *cont = qobject_cast<Plasma::Containment *>(d->applet);

4
src/plasma/scripting/appletscript.h
View File

@ -143,13 +143,13 @@ public:
* @see Containment
* @since 4.7
*/
Plasma::ContainmentType containmentType() const;
Plasma::Types::ContainmentType containmentType() const;
/**
* @see Containment
* @since 4.7
*/
void setContainmentType(Plasma::ContainmentType type);
void setContainmentType(Plasma::Types::ContainmentType type);
Q_SIGNALS:
/**

2
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -97,7 +97,7 @@ ContainmentInterface::Type ContainmentInterface::containmentType() const
void ContainmentInterface::setContainmentType(ContainmentInterface::Type type)
{
m_appletScriptEngine->setContainmentType((Plasma::ContainmentType)type);
m_appletScriptEngine->setContainmentType((Plasma::Types::ContainmentType)type);
}
int ContainmentInterface::screen() const

2
src/shell/desktopcorona.cpp
View File

@ -146,7 +146,7 @@ void DesktopCorona::checkScreen(int screen, bool signalWhenExists)
continue;
}
Plasma::ContainmentType t = c->containmentType();
Plasma::Types::ContainmentType t = c->containmentType();
if (t == Plasma::Types::PanelContainment ||
t == Plasma::Types::CustomPanelContainment) {
emit containmentAdded(c);