summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-08 10:40:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-08 12:42:52 +0000
commit65b7b6322b662785bf032e66c76abc36c9a2bb0e (patch)
tree762d3c233ac4a1d73dc67dd32183f1f4be9b2258 /include
parentconvert WMWindowType to scoped enum (diff)
downloadcore-65b7b6322b662785bf032e66c76abc36c9a2bb0e.tar.gz
core-65b7b6322b662785bf032e66c76abc36c9a2bb0e.zip
loplugin:unusedenumconstants read-only constants in vcl
Change-Id: I8c81444cbecdc103cc47d9a4133b0b4d9010e0c2 Reviewed-on: https://gerrit.libreoffice.org/34018 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/ptrstyle.hxx177
-rw-r--r--include/vcl/salbtype.hxx3
-rw-r--r--include/vcl/settings.hxx2
-rw-r--r--include/vcl/throbber.hxx2
-rw-r--r--include/vcl/vclenum.hxx4
-rw-r--r--include/vcl/vclevent.hxx6
-rw-r--r--include/vcl/window.hxx6
7 files changed, 84 insertions, 116 deletions
diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index 996caf5f6078..7eb50c10fc62 100644
--- a/include/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
@@ -22,102 +22,87 @@
enum class PointerStyle
{
- Arrow = 0,
- Null = 1,
- Wait = 2,
- Text = 3,
- Help = 4,
- Cross = 5,
- Move = 6,
- NSize = 7,
- SSize = 8,
- WSize = 9,
- ESize = 10,
- NWSize = 11,
- NESize = 12,
- SWSize = 13,
- SESize = 14,
- WindowNSize = 15,
- WindowSSize = 16,
- WindowWSize = 17,
- WindowESize = 18,
- WindowNWSize = 19,
- WindowNESize = 20,
- WindowSWSize = 21,
- WindowSESize = 22,
- HSplit = 23,
- VSplit = 24,
- HSizeBar = 25,
- VSizeBar = 26,
- Hand = 27,
- RefHand = 28,
- Pen = 29,
- Magnify = 30,
- Fill = 31,
- Rotate = 32,
- HShear = 33,
- VShear = 34,
- Mirror = 35,
- Crook = 36,
- Crop = 37,
- MovePoint = 38,
- MoveBezierWeight = 39,
- MoveData = 40,
- CopyData = 41,
- LinkData = 42,
- MoveDataLink = 43,
- CopyDataLink = 44,
- MoveFile = 45,
- CopyFile = 46,
- LinkFile = 47,
- MoveFileLink = 48,
- CopyFileLink = 49,
- MoveFiles = 50,
- CopyFiles = 51,
- NotAllowed = 52,
- DrawLine = 53,
- DrawRect = 54,
- DrawPolygon = 55,
- DrawBezier = 56,
- DrawArc = 57,
- DrawPie = 58,
- DrawCircleCut = 59,
- DrawEllipse = 60,
- DrawFreehand = 61,
- DrawConnect = 62,
- DrawText = 63,
- DrawCaption = 64,
- Chart = 65,
- Detective = 66,
- PivotCol = 67,
- PivotRow = 68,
- PivotField = 69,
- Chain = 70,
- ChainNotAllowed = 71,
- TimeEventMove = 72,
- TimeEventSize = 73,
- AutoScrollN = 74,
- AutoScrollS = 75,
- AutoScrollW = 76,
- AutoScrollE = 77,
- AutoScrollNW = 78,
- AutoScrollNE = 79,
- AutoScrollSW = 80,
- AutoScrollSE = 81,
- AutoScrollNS = 82,
- AutoScrollWE = 83,
- AutoScrollNSWE = 84,
- Airbrush = 85,
- TextVertical = 86,
- PivotDelete = 87,
- TabSelectS = 88,
- TabSelectE = 89,
- TabSelectSE = 90,
- TabSelectW = 91,
- TabSelectSW = 92,
- Paintbrush = 93,
- HideWhitespace = 94,
- ShowWhitespace = 95,
+ Arrow,
+ Null,
+ Wait,
+ Text,
+ Help,
+ Cross,
+ Move,
+ NSize,
+ SSize,
+ WSize,
+ ESize,
+ NWSize,
+ NESize,
+ SWSize,
+ SESize,
+ WindowNSize,
+ WindowSSize,
+ WindowWSize,
+ WindowESize,
+ WindowNWSize,
+ WindowNESize,
+ WindowSWSize,
+ WindowSESize,
+ HSplit,
+ VSplit,
+ HSizeBar,
+ VSizeBar,
+ Hand,
+ RefHand,
+ Magnify,
+ Fill,
+ Rotate,
+ HShear,
+ VShear,
+ Mirror,
+ Crook,
+ Crop,
+ MovePoint,
+ MoveBezierWeight,
+ CopyData,
+ LinkData,
+ MoveDataLink,
+ NotAllowed,
+ DrawLine,
+ DrawRect,
+ DrawPolygon,
+ DrawBezier,
+ DrawArc,
+ DrawPie,
+ DrawCircleCut,
+ DrawEllipse,
+ DrawFreehand,
+ DrawConnect,
+ DrawText,
+ DrawCaption,
+ Detective,
+ PivotCol,
+ PivotRow,
+ PivotField,
+ Chain,
+ ChainNotAllowed,
+ AutoScrollN,
+ AutoScrollS,
+ AutoScrollW,
+ AutoScrollE,
+ AutoScrollNW,
+ AutoScrollNE,
+ AutoScrollSW,
+ AutoScrollSE,
+ AutoScrollNS,
+ AutoScrollWE,
+ AutoScrollNSWE,
+ TextVertical,
+ PivotDelete,
+ TabSelectS,
+ TabSelectE,
+ TabSelectSE,
+ TabSelectW,
+ TabSelectSW,
+ HideWhitespace,
+ ShowWhitespace,
LAST = ShowWhitespace,
};
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index e395f0cc4bad..d0d71b133706 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -50,7 +50,6 @@ enum class ScanlineFormat {
N24BitTcBgr = 0x00000100,
N24BitTcRgb = 0x00000200,
- N24BitTcMask = 0x00000400,
N32BitTcAbgr = 0x00000800,
N32BitTcArgb = 0x00001000,
@@ -61,7 +60,7 @@ enum class ScanlineFormat {
TopDown = 0x00010000 // scanline adjustment
};
namespace o3tl {
- template<> struct typed_flags<ScanlineFormat> : is_typed_flags<ScanlineFormat, 0x0001ffff> {};
+ template<> struct typed_flags<ScanlineFormat> : is_typed_flags<ScanlineFormat, 0x0001fbff> {};
}
inline ScanlineFormat RemoveScanline(ScanlineFormat nFormat) { return nFormat & ~ScanlineFormat::TopDown; }
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 7fef45785e27..53bb153e4033 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -79,7 +79,7 @@ namespace o3tl
enum class MouseMiddleButtonAction
{
- Nothing, AutoScroll, PasteSelection
+ Nothing, AutoScroll
};
enum class MouseWheelBehaviour
diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx
index 8dfda97c5a62..91906c41aeae 100644
--- a/include/vcl/throbber.hxx
+++ b/include/vcl/throbber.hxx
@@ -33,8 +33,6 @@ class VCL_DLLPUBLIC Throbber : public ImageControl
public:
enum class ImageSet
{
- /// no (default) images at all
- NONE,
/// automatically decide between different image sets, depending on what fits best the actual size
Auto,
/// default images, 16x16 pixels
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 8397ec2da623..9bf5c97740d2 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -26,9 +26,7 @@
enum class ExtTimeFieldFormat
{
- Short24H, Long24H,
- Short12H, Long12H,
- ShortDuration, LongDuration
+ Short24H, Long24H
};
enum class ExtDateFieldFormat
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 4cb7723d364b..a60723167427 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -45,7 +45,6 @@ enum class VclEventId
ComboboxDoubleClick,
ComboboxItemAdded, // pData = itempos
ComboboxItemRemoved, // pData = itempos, -1=All
- ComboboxScrolled,
ComboboxSelect,
ComboboxSetText,
ControlGetFocus,
@@ -61,7 +60,6 @@ enum class VclEventId
ItemExpanded,
ListboxDoubleClick,
ListboxFocus,
- ListboxFocusItemChanged,
ListboxItemAdded, // pData = itempos
ListboxItemRemoved, // pData = itempos, -1=All
ListboxScrolled,
@@ -69,7 +67,6 @@ enum class VclEventId
ListboxStateUpdate,
ListboxTreeFocus,
ListboxTreeSelect,
- MenuAccessibleNameChanged,
MenuActivate,
MenuDeactivate,
MenuDehighlight,
@@ -107,7 +104,6 @@ enum class VclEventId
StatusbarItemAdded, // pData = itemid
StatusbarItemRemoved, // pData = itemid
StatusbarNameChanged, // pData = itemid
- StatusbarShowAllItems,
StatusbarShowItem, // pData = itemid
TabbarPageActivated, // pData = pageid
TabbarPageDeactivated, // pData = pageid
@@ -170,11 +166,9 @@ enum class VclEventId
WindowPaint, // pData = Rectangle*
WindowPrepareToggleFloating, // pData = bool
WindowResize,
- WindowScroll, // pData = ScrollEvent*
WindowShow,
WindowStartDocking, // pData = DockingData
WindowToggleFloating,
- WindowZoom, // pData = ZoomEvent*
};
class VCL_DLLPUBLIC VclSimpleEvent
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ae214c294cae..adf31f283945 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -132,7 +132,6 @@ enum class GetWindowType
Prev = 3,
Next = 4,
FirstOverlap = 5,
- LastOverlap = 6,
Overlap = 7,
ParentOverlap = 8,
Client = 9,
@@ -140,8 +139,6 @@ enum class GetWindowType
Frame = 11,
Border = 12,
FirstTopWindowChild = 13,
- LastTopWindowChild = 14,
- PrevTopWindowSibling = 15,
NextTopWindowSibling = 16,
};
@@ -329,13 +326,10 @@ enum class StateChangedType : sal_uInt16
UpdateMode = 3,
Enable = 4,
Text = 5,
- Image = 6,
Data = 7,
State = 8,
Style = 9,
Zoom = 10,
- Border = 11,
- Transparent = 12,
ControlFont = 13,
ControlForeground = 14,
ControlBackground = 15,