[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-framework] scriptengines/qml/plasmoid: remove bindings of Qt enums
From:       Marco Martin <notmart () gmail ! com>
Date:       2013-02-13 12:20:24
Message-ID: 20130213122024.B0D89A60C8 () git ! kde ! org
[Download RAW message or body]

Git commit 996665c2beb54fb0dbb8b022ff3bfc14e768ba3d by Marco Martin.
Committed on 13/02/2013 at 13:18.
Pushed by mart into branch 'master'.

remove bindings of Qt enums

all Qt enums are already binded as Qt.*

M  +0    -61   scriptengines/qml/plasmoid/appletinterface.h
M  +0    -1    scriptengines/qml/plasmoid/declarativeappletscript.cpp

http://commits.kde.org/plasma-framework/996665c2beb54fb0dbb8b022ff3bfc14e768ba3d

diff --git a/scriptengines/qml/plasmoid/appletinterface.h \
b/scriptengines/qml/plasmoid/appletinterface.h index c95218c..553fe17 100644
--- a/scriptengines/qml/plasmoid/appletinterface.h
+++ b/scriptengines/qml/plasmoid/appletinterface.h
@@ -49,12 +49,6 @@ class AppletInterface : public QQuickItem
     Q_ENUMS(FormFactor)
     Q_ENUMS(Location)
     Q_ENUMS(BackgroundHints)
-    Q_ENUMS(QtOrientation)
-    Q_ENUMS(QtModifiers)
-    Q_ENUMS(QtAnchorPoint)
-    Q_ENUMS(QtCorner)
-    Q_ENUMS(QtAlignment)
-    Q_ENUMS(QtMouseButton)
     Q_ENUMS(AnimationDirection)
     Q_ENUMS(IntervalAlignment)
     Q_ENUMS(ThemeColors)
@@ -117,36 +111,6 @@ enum ItemStatus {
     AcceptingInputStatus = 4 /**< The Item is accepting input **/
 };
 
-//From Qt namespace
-enum QtModifiers {
-    QtNoModifier = Qt::NoModifier,
-    QtShiftModifier = Qt::ShiftModifier,
-    QtControlModifier = Qt::ControlModifier,
-    QtAltModifier = Qt::AltModifier,
-    QtMetaModifier = Qt::MetaModifier
-};
-
-enum QtOrientation {
-    QtHorizontal= Qt::Horizontal,
-    QtVertical = Qt::Vertical
-};
-
-enum QtAnchorPoint {
-    QtAnchorLeft = Qt::AnchorLeft,
-    QtAnchorRight = Qt::AnchorRight,
-    QtAnchorBottom = Qt::AnchorBottom,
-    QtAnchorTop = Qt::AnchorTop,
-    QtAnchorHorizontalCenter = Qt::AnchorHorizontalCenter,
-    QtAnchorVerticalCenter = Qt::AnchorVerticalCenter
-};
-
-enum QtCorner {
-    QtTopLeftCorner = Qt::TopLeftCorner,
-    QtTopRightCorner = Qt::TopRightCorner,
-    QtBottomLeftCorner = Qt::BottomLeftCorner,
-    QtBottomRightCorner = Qt::BottomRightCorner
-};
-
 enum BackgroundHints {
     NoBackground = Plasma::NoBackground,
     StandardBackground = Plasma::StandardBackground,
@@ -164,31 +128,6 @@ enum ThemeColors {
     VisitedLinkColor = Plasma::Theme::VisitedLinkColor
 };
 
-enum QtAlignment {
-    QtAlignLeft = 0x0001,
-    QtAlignRight = 0x0002,
-    QtAlignHCenter = 0x0004,
-    QtAlignJustify = 0x0005,
-    QtAlignTop = 0x0020,
-    QtAlignBottom = 0x0020,
-    QtAlignVCenter = 0x0080
-};
-
-enum QtMouseButton {
-    QtNoButton = Qt::NoButton,
-    QtLeftButton = Qt::LeftButton,
-    QtRightButton = Qt::RightButton,
-    QtMidButton = Qt::MidButton,
-    QtXButton1 = Qt::XButton1,
-    QtXButton2 = Qt::XButton2
-};
-
-enum QtScrollBarPolicy {
-    QtScrollBarAsNeeded = Qt::ScrollBarAsNeeded,
-    QtScrollBarAlwaysOff = Qt::ScrollBarAlwaysOff,
-    QtScrollBarAlwaysOn = Qt::ScrollBarAlwaysOn
-};
-
 enum AnimationDirection {
     AnimationForward = QAbstractAnimation::Forward,
     AnimationBackward = QAbstractAnimation::Backward
diff --git a/scriptengines/qml/plasmoid/declarativeappletscript.cpp \
b/scriptengines/qml/plasmoid/declarativeappletscript.cpp index 5f1721c..8fd196d \
                100644
--- a/scriptengines/qml/plasmoid/declarativeappletscript.cpp
+++ b/scriptengines/qml/plasmoid/declarativeappletscript.cpp
@@ -47,7 +47,6 @@
 
 #include "common/scriptenv.h"
 #include "declarative/qmlobject.h"
-//#include "declarative/declarativeitemcontainer_p.h"
 #include "declarative/packageaccessmanagerfactory.h"
 
 


[prev in list] [next in list] [prev in thread] [next in thread]