vcl: rename OutDevState to Stack

I have moved the header file to include/vcl/rendercontext as this will
eventually be part of the RenderContext split from OutputDevice.

State and associated enums have also been moved to the vcl namespace. I
have also moved ComplexTextLayoutFlags into the vcl::text namespace.

Change-Id: I0abbf560e75b45a272854b267e948c240cd69091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121524
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

2 files changed, 15 insertions, 12 deletions

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index fd9f5936f7f8..5bcac7c67f45 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -250,7 +250,8 @@ void VclOutdevTest::testDrawBlackBitmap()
     MetaAction* pAction = aMtf.GetAction(0);
     CPPUNIT_ASSERT_EQUAL(MetaActionType::PUSH, pAction->GetType());
     auto pPushAction = static_cast<MetaPushAction*>(pAction);
-    bool bLineFillFlag = ((PushFlags::LINECOLOR | PushFlags::FILLCOLOR) == pPushAction->GetFlags());
+    bool bLineFillFlag
+        = ((vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR) == pPushAction->GetFlags());
     CPPUNIT_ASSERT_MESSAGE("Push flags not LINECOLOR | FILLCOLOR", bLineFillFlag);
 
     pAction = aMtf.GetAction(1);
@@ -293,7 +294,8 @@ void VclOutdevTest::testDrawWhiteBitmap()
     MetaAction* pAction = aMtf.GetAction(0);
     CPPUNIT_ASSERT_EQUAL(MetaActionType::PUSH, pAction->GetType());
     auto pPushAction = static_cast<MetaPushAction*>(pAction);
-    bool bLineFillFlag = ((PushFlags::LINECOLOR | PushFlags::FILLCOLOR) == pPushAction->GetFlags());
+    bool bLineFillFlag
+        = ((vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR) == pPushAction->GetFlags());
     CPPUNIT_ASSERT_MESSAGE("Push flags not LINECOLOR | FILLCOLOR", bLineFillFlag);
 
     pAction = aMtf.GetAction(1);
@@ -840,16 +842,17 @@ void VclOutdevTest::testLayoutMode()
     GDIMetaFile aMtf;
     aMtf.Record(pVDev.get());
 
-    CPPUNIT_ASSERT_EQUAL(ComplexTextLayoutFlags::Default, pVDev->GetLayoutMode());
+    CPPUNIT_ASSERT_EQUAL(vcl::text::ComplexTextLayoutFlags::Default, pVDev->GetLayoutMode());
 
-    pVDev->SetLayoutMode(ComplexTextLayoutFlags::BiDiRtl);
+    pVDev->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::BiDiRtl);
 
-    CPPUNIT_ASSERT_EQUAL(ComplexTextLayoutFlags::BiDiRtl, pVDev->GetLayoutMode());
+    CPPUNIT_ASSERT_EQUAL(vcl::text::ComplexTextLayoutFlags::BiDiRtl, pVDev->GetLayoutMode());
 
     MetaAction* pAction = aMtf.GetAction(0);
     CPPUNIT_ASSERT_EQUAL(MetaActionType::LAYOUTMODE, pAction->GetType());
     auto pLayoutModeAction = static_cast<MetaLayoutModeAction*>(pAction);
-    CPPUNIT_ASSERT_EQUAL(ComplexTextLayoutFlags::BiDiRtl, pLayoutModeAction->GetLayoutMode());
+    CPPUNIT_ASSERT_EQUAL(vcl::text::ComplexTextLayoutFlags::BiDiRtl,
+                         pLayoutModeAction->GetLayoutMode());
 }
 
 void VclOutdevTest::testDigitLanguage()
@@ -888,7 +891,7 @@ void VclOutdevTest::testStackFunctions()
     pVDev->SetTextLineColor(COL_MAGENTA);
     pVDev->SetOverlineColor(COL_YELLOW);
     pVDev->SetTextAlign(TextAlign::ALIGN_TOP);
-    pVDev->SetLayoutMode(ComplexTextLayoutFlags::BiDiRtl);
+    pVDev->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::BiDiRtl);
     pVDev->SetDigitLanguage(LANGUAGE_FRENCH);
     pVDev->SetRasterOp(RasterOp::N0);
     pVDev->SetMapMode(MapMode(MapUnit::MapTwip));
@@ -898,7 +901,7 @@ void VclOutdevTest::testStackFunctions()
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Text fill color", COL_BLUE, pVDev->GetTextFillColor());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Text line color", COL_MAGENTA, pVDev->GetTextLineColor());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Text overline color", COL_YELLOW, pVDev->GetOverlineColor());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Layout mode", ComplexTextLayoutFlags::BiDiRtl,
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Layout mode", vcl::text::ComplexTextLayoutFlags::BiDiRtl,
                                  pVDev->GetLayoutMode());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Language", LANGUAGE_FRENCH, pVDev->GetDigitLanguage());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Raster operation", RasterOp::N0, pVDev->GetRasterOp());
@@ -918,7 +921,7 @@ void VclOutdevTest::testStackFunctions()
                                  pVDev->GetTextLineColor());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Default overline color", Color(ColorTransparency, 0xFFFFFFFF),
                                  pVDev->GetOverlineColor());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Default layout mode", ComplexTextLayoutFlags::Default,
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Default layout mode", vcl::text::ComplexTextLayoutFlags::Default,
                                  pVDev->GetLayoutMode());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Default language", LANGUAGE_SYSTEM, pVDev->GetDigitLanguage());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Default raster operation", RasterOp::OverPaint,
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index cdee28bdab57..7efb1050c736 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -1969,7 +1969,7 @@ void SvmTest::testPushPop()
     pVirtualDev->Push();
     pVirtualDev->SetLineColor(COL_RED);
     pVirtualDev->DrawLine(Point(4,4), Point(6,6));
-    pVirtualDev->Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+    pVirtualDev->Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR);
     pVirtualDev->SetLineColor(COL_LIGHTRED);
     pVirtualDev->DrawLine(Point(5,5), Point(7,7));
     pVirtualDev->Pop();
@@ -2267,8 +2267,8 @@ void SvmTest::testLayoutMode()
     ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
     setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
 
-    pVirtualDev->SetLayoutMode(ComplexTextLayoutFlags::TextOriginLeft);
-    pVirtualDev->SetLayoutMode(ComplexTextLayoutFlags::BiDiRtl);
+    pVirtualDev->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::TextOriginLeft);
+    pVirtualDev->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::BiDiRtl);
 
     checkLayoutMode(writeAndReadStream(aGDIMetaFile));
     checkLayoutMode(readFile(u"layoutmode.svm"));