Commit 7efd0ee1 authored by Roman 3237465's avatar Roman 3237465

'doubleT' -> 'qreal'

parent 7b755a8b
......@@ -38,7 +38,7 @@ import Foreign.Hoppy.Generator.Spec.ClassFeature (
ClassFeature (Assignable, Copyable, Equatable),
classAddFeatures,
)
import Foreign.Hoppy.Generator.Types (boolT, objT, voidT, doubleT)
import Foreign.Hoppy.Generator.Types (boolT, objT, voidT)
import Foreign.Hoppy.Generator.Version (collect, just, test)
import Graphics.UI.Qtah.Generator.Flags (qtVersion)
import Graphics.UI.Qtah.Generator.Interface.Core.QMarginsF (c_QMarginsF)
......
......@@ -35,9 +35,10 @@ import Foreign.Hoppy.Generator.Spec.ClassFeature (
ClassFeature (Assignable, Copyable, Equatable),
classAddFeatures,
)
import Foreign.Hoppy.Generator.Types (voidT, doubleT)
import Foreign.Hoppy.Generator.Types (voidT)
import Foreign.Hoppy.Generator.Version (collect, just)
-- import Graphics.UI.Qtah.Generator.Flags (qtVersion)
import Graphics.UI.Qtah.Generator.Interface.Core.Types (qreal)
import Graphics.UI.Qtah.Generator.Module (AModule (AQtModule), makeQtModule)
import Graphics.UI.Qtah.Generator.Types
......@@ -56,6 +57,6 @@ c_QPainterPath =
makeClass (ident "QPainterPath") Nothing [] $
collect
[ just $ mkCtor "new" []
, just $ mkMethod' "addRect" "addRectRaw" [doubleT, doubleT, doubleT, doubleT] voidT
, just $ mkMethod' "addRect" "addRectRaw" [qreal, qreal, qreal, qreal] voidT
]
......@@ -34,7 +34,7 @@ import Foreign.Hoppy.Generator.Spec.ClassFeature (
ClassFeature (Assignable, Copyable, Equatable),
classAddFeatures,
)
import Foreign.Hoppy.Generator.Types (doubleT)
import Graphics.UI.Qtah.Generator.Interface.Core.Types (qreal)
import Graphics.UI.Qtah.Generator.Module (AModule (AQtModule), makeQtModule)
import Graphics.UI.Qtah.Generator.Types
......@@ -51,5 +51,5 @@ c_QTransform =
classAddFeatures [Assignable, Copyable, Equatable] $
classSetEntityPrefix "" $
makeClass (ident "QTransform") Nothing [] $
[ mkCtor "new2x2" [doubleT, doubleT, doubleT, doubleT, doubleT, doubleT]
[ mkCtor "new2x2" [qreal, qreal, qreal, qreal, qreal, qreal]
]
......@@ -29,7 +29,7 @@ import Foreign.Hoppy.Generator.Spec (
makeClass,
mkCtor,
)
import Foreign.Hoppy.Generator.Types (doubleT)
import Graphics.UI.Qtah.Generator.Interface.Core.Types (qreal)
import Graphics.UI.Qtah.Generator.Module (AModule (AQtModule), makeQtModule)
import Graphics.UI.Qtah.Generator.Interface.Widgets.QAbstractGraphicsShapeItem
(c_QAbstractGraphicsShapeItem)
......@@ -48,5 +48,5 @@ c_QGraphicsEllipseItem =
classSetEntityPrefix "" $
makeClass (ident "QGraphicsEllipseItem") Nothing [c_QAbstractGraphicsShapeItem]
[ mkCtor "new" []
, mkCtor "newRectRaw" [doubleT, doubleT, doubleT, doubleT]
, mkCtor "newRectRaw" [qreal, qreal, qreal, qreal]
]
......@@ -31,7 +31,8 @@ import Foreign.Hoppy.Generator.Spec (
mkConstMethod,
mkCtor,
)
import Foreign.Hoppy.Generator.Types (voidT, doubleT, objT)
import Foreign.Hoppy.Generator.Types (voidT, objT)
import Graphics.UI.Qtah.Generator.Interface.Core.Types (qreal)
import Graphics.UI.Qtah.Generator.Interface.Core.QRectF (c_QRectF)
import Graphics.UI.Qtah.Generator.Module (AModule (AQtModule), makeQtModule)
import Graphics.UI.Qtah.Generator.Interface.Widgets.QAbstractGraphicsShapeItem
......@@ -51,7 +52,7 @@ c_QGraphicsRectItem =
classSetEntityPrefix "" $
makeClass (ident "QGraphicsRectItem") Nothing [c_QAbstractGraphicsShapeItem]
[ mkCtor "new" []
, mkCtor "newWithRect" [doubleT, doubleT, doubleT, doubleT]
, mkCtor "newWithRect" [qreal, qreal, qreal, qreal]
, mkConstMethod "rect" [] $ objT c_QRectF
, mkMethod' "setRect" "setRectRaw" [doubleT, doubleT, doubleT, doubleT] voidT
, mkMethod' "setRect" "setRectRaw" [qreal, qreal, qreal, qreal] voidT
]
......@@ -37,9 +37,10 @@ import Foreign.Hoppy.Generator.Spec (
mkConstMethod,
mkConstMethod',
)
import Foreign.Hoppy.Generator.Types (voidT, objT, ptrT, doubleT, intT, boolT, enumT)
import Foreign.Hoppy.Generator.Types (voidT, objT, ptrT, intT, boolT, enumT)
import Foreign.Hoppy.Generator.Version (collect, just, test)
import Graphics.UI.Qtah.Generator.Flags (qtVersion)
import Graphics.UI.Qtah.Generator.Interface.Core.Types (qreal)
import Graphics.UI.Qtah.Generator.Interface.Core.QEvent (c_QEvent)
-- import Graphics.UI.Qtah.Generator.Interface.Core.QLineF (c_QLineF)
import Graphics.UI.Qtah.Generator.Interface.Core.QObject (c_QObject)
......@@ -83,7 +84,7 @@ c_QGraphicsScene =
[ just $ mkCtor "new" []
, just $ mkCtor "newWithParent" [ptrT $ objT c_QObject]
, just $ mkCtor "newWithRect" [objT c_QRectF]
, just $ mkCtor "newWithRaw" [doubleT, doubleT, doubleT, doubleT]
, just $ mkCtor "newWithRaw" [qreal, qreal, qreal, qreal]
, just $ mkConstMethod "activePanel" [] $ ptrT $ objT c_QGraphicsItem
-- TODO mkConstMethod "activeWindow" [] $ ptrT $ objT c_QGraphicsWidget
, just $ mkMethod' "addEllipse" "addEllipseRectF"
......@@ -91,18 +92,18 @@ c_QGraphicsScene =
, just $ mkMethod' "addEllipse" "addEllipseRectFAll"
[objT c_QRectF, objT c_QPen, objT c_QBrush] $ ptrT $ objT c_QGraphicsEllipseItem
, just $ mkMethod' "addEllipse" "addEllipseRaw"
[doubleT, doubleT, doubleT, doubleT] $ ptrT $ objT c_QGraphicsEllipseItem
[qreal, qreal, qreal, qreal] $ ptrT $ objT c_QGraphicsEllipseItem
, just $ mkMethod' "addEllipse" "addEllipseRawAll"
[doubleT, doubleT, doubleT, doubleT, objT c_QPen, objT c_QBrush] $
[qreal, qreal, qreal, qreal, objT c_QPen, objT c_QBrush] $
ptrT $ objT c_QGraphicsEllipseItem
, just $ mkMethod "addItem" [ptrT $ objT c_QGraphicsItem] voidT
-- TODO mkMethod' "addLine" "addLine" [objT c_QLineF] $
-- ptrT $ objT c_QGraphicsLineItem
-- TODO mkMethod' "addLine" "addLineAll" [objT c_QLineF, objT c_QPen] $
-- ptrT $ objT c_QGraphicsLineItem
-- TODO mkMethod' "addLine" "addLine" [doubleT, doubleT, doubleT, doubleT] $
-- TODO mkMethod' "addLine" "addLine" [qreal, qreal, qreal, qreal] $
-- ptrT $ objT c_QGraphicsLineItem
-- TODO mkMethod' "addLine" "addLineAll" [doubleT, doubleT, doubleT, doubleT, objT c_QPen] $
-- TODO mkMethod' "addLine" "addLineAll" [qreal, qreal, qreal, qreal, objT c_QPen] $
-- ptrT $ objT c_QGraphicsLineItem
-- TODO mkMethod "addPath" [objT c_QPainterPath] $ ptrT $ objT c_QGraphicsPathItem
-- TODO mkMethod' "addPath" "addPathAll" [objT c_QPainterPath, objT c_QPen, objT c_QBrush] $
......@@ -114,10 +115,10 @@ c_QGraphicsScene =
, just $ mkMethod "addRect" [objT c_QRectF] $ ptrT $ objT c_QGraphicsRectItem
, just $ mkMethod' "addRect" "addRectAll" [objT c_QRectF, objT c_QPen, objT c_QBrush] $
ptrT $ objT c_QGraphicsRectItem
, just $ mkMethod' "addRect" "addRectRaw" [doubleT, doubleT, doubleT, doubleT] $
, just $ mkMethod' "addRect" "addRectRaw" [qreal, qreal, qreal, qreal] $
ptrT $ objT c_QGraphicsRectItem
, just $ mkMethod' "addRect" "addRectRawAll"
[doubleT, doubleT, doubleT, doubleT, objT c_QPen, objT c_QBrush] $
[qreal, qreal, qreal, qreal, objT c_QPen, objT c_QBrush] $
ptrT $ objT c_QGraphicsRectItem
-- TODO mkMethod "addSimpleText" [objT c_QString] $ ptrT $ objT c_QGraphicsSimpleTextItem
-- TODO mkMethod' "addSimpleText" "addSimpleTextAll" [objT c_QString, objT c_QFont] $
......@@ -142,15 +143,15 @@ c_QGraphicsScene =
-- TODO mkConstMethod "font" [] $ objT c_QFont
, just $ mkConstMethod "foregroundBrush" [] $ objT c_QBrush
, just $ mkConstMethod "hasFocus" [] boolT
, just $ mkConstMethod "height" [] doubleT
, just $ mkConstMethod "height" [] qreal
-- TODO mkConstMethod "inputMethodQuery" [objT c_Qt::InputMethodQuery] $ objT c_QVariant
, just $ mkMethod "invalidate" [doubleT, doubleT, doubleT, doubleT] voidT
, just $ mkMethod "invalidate" [qreal, qreal, qreal, qreal] voidT
-- TODO mkMethod' "invalidate" "invalidateAll"
-- [doubleT, doubleT, doubleT, doubleT, objT c_SceneLayers] voidT
-- [qreal, qreal, qreal, qreal, objT c_SceneLayers] voidT
, just $ mkConstMethod "isActive" [] boolT
, just $ mkConstMethod' "itemAt" "itemAtPointF" [objT c_QPointF, objT c_QTransform] $
ptrT $ objT c_QGraphicsItem
, just $ mkConstMethod' "itemAt" "itemAtRaw" [doubleT, doubleT, objT c_QTransform] $
, just $ mkConstMethod' "itemAt" "itemAtRaw" [qreal, qreal, objT c_QTransform] $
ptrT $ objT c_QGraphicsItem
-- TODO mkConstMethod "itemIndexMethod" [] $ objT c_ItemIndexMethod
-- TODO mkConstMethod' "items" "items" [] $ objT c_QList<QGraphicsItem $ objT c_*>
......@@ -178,14 +179,14 @@ c_QGraphicsScene =
-- , objT c_Qt::SortOrder, objT c_QTransform
-- ] $ objT c_QList<QGraphicsItem $ objT c_*>
-- TODO mkConstMethod' "items" "items"
-- [doubleT, doubleT, doubleT, doubleT, objT c_Qt::ItemSelectionMode, objT c_Qt::SortOrder] $
-- [qreal, qreal, qreal, qreal, objT c_Qt::ItemSelectionMode, objT c_Qt::SortOrder] $
-- objT c_QList<QGraphicsItem $ objT c_*>
-- TODO mkConstMethod' "items" "itemsAll"
-- [ doubleT, doubleT, doubleT, doubleT, objT c_Qt::ItemSelectionMode
-- [ qreal, qreal, qreal, qreal, objT c_Qt::ItemSelectionMode
-- , objT c_Qt::SortOrder, objT c_QTransform
-- ] $ objT c_QList<QGraphicsItem $ objT c_*>
, just $ mkConstMethod "itemsBoundingRect" [] $ objT c_QRectF
, test (qtVersion >= [5, 4]) $ mkConstMethod "minimumRenderSize" [] doubleT
, test (qtVersion >= [5, 4]) $ mkConstMethod "minimumRenderSize" [] qreal
, just $ mkConstMethod "mouseGrabberItem" [] $ ptrT $ objT c_QGraphicsItem
-- TODO mkConstMethod "palette" [] $ objT c_QPalette
, just $ mkMethod "removeItem" [ptrT $ objT c_QGraphicsItem] voidT
......@@ -208,10 +209,10 @@ c_QGraphicsScene =
-- TODO mkMethod "setFont" [objT c_QFont] voidT
, just $ mkMethod "setForegroundBrush" [objT c_QBrush] voidT
-- TODO mkMethod "setItemIndexMethod" [objT c_ItemIndexMethod] voidT
, test (qtVersion >= [5, 4]) $ mkMethod "setMinimumRenderSize" [doubleT] voidT
, test (qtVersion >= [5, 4]) $ mkMethod "setMinimumRenderSize" [qreal] voidT
-- TODO mkMethod "setPalette" [objT c_QPalette] voidT
, just $ mkMethod "setSceneRect" [objT c_QRectF] voidT
, just $ mkMethod' "setSceneRect" "setSceneRectRaw" [doubleT, doubleT, doubleT, doubleT] voidT
, just $ mkMethod' "setSceneRect" "setSceneRectRaw" [qreal, qreal, qreal, qreal] voidT
, test (qtVersion >= [5, 5]) $ mkMethod' "setSelectionArea" "setSelectionAreaTransform"
[objT c_QPainterPath, objT c_QTransform] voidT
, test (qtVersion >= [5, 5]) $ mkMethod "setSelectionArea" [objT c_QPainterPath] voidT
......@@ -227,9 +228,9 @@ c_QGraphicsScene =
-- TODO mkMethod "setStyle" [ptrT $ objT c_QStyle] voidT
, just $ mkConstMethod "stickyFocus" [] boolT
-- TODO mkConstMethod "style" [] $ ptrT $ objT c_QStyle
, just $ mkMethod "update" [doubleT, doubleT, doubleT, doubleT] voidT
, just $ mkMethod "update" [qreal, qreal, qreal, qreal] voidT
-- TODO mkConstMethod "views" [] $ objT c_QList<QGraphicsView $ objT c_*>
, just $ mkConstMethod "width" [] doubleT
, just $ mkConstMethod "width" [] qreal
]
e_ItemIndexMethod =
......
......@@ -49,7 +49,6 @@ import Foreign.Hoppy.Generator.Types (
voidT,
enumT,
boolT,
doubleT,
bitspaceT,
)
import Graphics.UI.Qtah.Generator.Interface.Core.Types hiding (aModule)
......@@ -101,26 +100,26 @@ c_QGraphicsView =
, mkConstMethod "backgroundBrush" [] $ objT c_QBrush
, mkConstMethod "cacheMode" [] $ bitspaceT bs_CacheMode
, mkMethod' "centerOn" "centerOnPointF" [objT c_QPointF] voidT
, mkMethod' "centerOn" "centerOnRaw" [doubleT, doubleT] voidT
, mkMethod' "centerOn" "centerOnRaw" [qreal, qreal] voidT
, mkMethod' "centerOn" "centerOnItem" [ptrT $ constT $ objT c_QGraphicsItem] voidT
, mkConstMethod "dragMode" [] $ enumT e_DragMode
, mkMethod' "ensureVisible" "ensureVisibleRectF" [objT c_QRectF] voidT
, mkMethod' "ensureVisible" "ensureVisibleRaw"
[doubleT, doubleT, doubleT, doubleT] voidT
[qreal, qreal, qreal, qreal] voidT
, mkMethod' "ensureVisible" "ensureVisibleItem"
[ptrT $ constT $ objT c_QGraphicsItem] voidT
, mkMethod' "ensureVisible" "ensureVisibleRectFAll"
[objT c_QRectF, intT, intT] voidT
, mkMethod' "ensureVisible" "ensureVisibleRawAll"
[doubleT, doubleT, doubleT, doubleT, intT, intT] voidT
[qreal, qreal, qreal, qreal, intT, intT] voidT
, mkMethod' "ensureVisible" "ensureVisibleItemAll"
[ptrT $ constT $ objT c_QGraphicsItem, intT, intT] voidT
, mkMethod' "fitInView" "fitInViewRectF" [objT c_QRectF] voidT
, mkMethod' "fitInView" "fitInViewRect" [doubleT, doubleT, doubleT, doubleT] voidT
, mkMethod' "fitInView" "fitInViewRect" [qreal, qreal, qreal, qreal] voidT
, mkMethod' "fitInView" "fitInViewItem" [ptrT $ constT $ objT c_QGraphicsItem] voidT
, mkMethod' "fitInView" "fitInViewRectFAll" [objT c_QRectF, enumT e_AspectRatioMode] voidT
, mkMethod' "fitInView" "fitInViewRectAll"
[doubleT, doubleT, doubleT, doubleT, enumT e_AspectRatioMode] voidT
[qreal, qreal, qreal, qreal, enumT e_AspectRatioMode] voidT
, mkMethod' "fitInView" "fitInViewItemAll"
[ptrT $ constT $ objT c_QGraphicsItem, enumT e_AspectRatioMode] voidT
, mkConstMethod "foregroundBrush" [] $ objT c_QBrush
......@@ -148,9 +147,9 @@ c_QGraphicsView =
, mkConstMethod' "mapFromScene" "mapFromScenePainterPath"
[objT c_QPainterPath] $ objT c_QPainterPath
, mkConstMethod' "mapFromScene" "mapFromScenePointFRaw"
[doubleT, doubleT] $ objT c_QPoint
[qreal, qreal] $ objT c_QPoint
, mkConstMethod' "mapFromScene" "mapFromSceneRectFRaw"
[doubleT, doubleT, doubleT, doubleT] $ objT c_QPolygon
[qreal, qreal, qreal, qreal] $ objT c_QPolygon
, mkConstMethod' "mapToScene" "mapToScenePoint"
[objT c_QPoint] $ objT c_QPointF
, mkConstMethod' "mapToScene" "mapToSceneRect"
......@@ -173,9 +172,9 @@ c_QGraphicsView =
, mkMethod "resetMatrix" [] voidT
, mkMethod "resetTransform" [] voidT
, mkConstMethod "resizeAnchor" [] $ enumT e_ViewportAnchor
, mkMethod "rotate" [doubleT] voidT
, mkMethod "rotate" [qreal] voidT
-- TODO mkConstMethod "rubberBandSelectionMode" [] $ objT c_Qt::ItemSelectionMode
, mkMethod "scale" [doubleT, doubleT] voidT
, mkMethod "scale" [qreal, qreal] voidT
, mkConstMethod "scene" [] $ ptrT $ objT c_QGraphicsScene
, mkConstMethod "sceneRect" [] $ objT c_QRectF
, mkMethod "setAlignment" [bitspaceT bs_Alignment] voidT
......@@ -196,15 +195,15 @@ c_QGraphicsView =
-- TODO mkMethod "setRubberBandSelectionMode" [objT c_Qt::ItemSelectionMode] voidT
, mkMethod "setScene" [ptrT $ objT c_QGraphicsScene] voidT
, mkMethod' "setSceneRect" "setSceneRectF" [objT c_QRectF] voidT
, mkMethod' "setSceneRect" "setSceneRectRaw" [doubleT, doubleT, doubleT, doubleT] voidT
, mkMethod' "setSceneRect" "setSceneRectRaw" [qreal, qreal, qreal, qreal] voidT
, mkMethod "setTransform" [objT c_QTransform] voidT
, mkMethod' "setTransform" "setTransformAll" [objT c_QTransform, boolT] voidT
, mkMethod "setTransformationAnchor" [enumT e_ViewportAnchor] voidT
, mkMethod "setViewportUpdateMode" [enumT e_ViewportUpdateMode] voidT
, mkMethod "shear" [doubleT, doubleT] voidT
, mkMethod "shear" [qreal, qreal] voidT
, mkConstMethod "transform" [] $ objT c_QTransform
, mkConstMethod "transformationAnchor" [] $ enumT e_ViewportAnchor
, mkMethod "translate" [doubleT, doubleT] voidT
, mkMethod "translate" [qreal, qreal] voidT
, mkConstMethod "viewportTransform" [] $ objT c_QTransform
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment