From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- kword/tests/KWPageManagerTester.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kword/tests') diff --git a/kword/tests/KWPageManagerTester.cpp b/kword/tests/KWPageManagerTester.cpp index 9b261d90..641e6534 100644 --- a/kword/tests/KWPageManagerTester.cpp +++ b/kword/tests/KWPageManagerTester.cpp @@ -200,11 +200,11 @@ void KWPageManagerTester::removePages() { void KWPageManagerTester::pageInfo() { KWPageManager *pageManager = new KWPageManager(); - KoPageLayout layout; - layout.ptWidth = 300; - layout.ptHeight = 600; - layout.format = PG_DIN_A4; - pageManager->setDefaultPage(layout); + KoPageLayout tqlayout; + tqlayout.ptWidth = 300; + tqlayout.ptHeight = 600; + tqlayout.format = PG_DIN_A4; + pageManager->setDefaultPage(tqlayout); pageManager->setStartPage(1); KWPage *page1 = pageManager->appendPage(); page1->setWidth(100); @@ -216,19 +216,19 @@ void KWPageManagerTester::pageInfo() { CHECK(pageManager->topOfPage(3), 300.0); CHECK(pageManager->bottomOfPage(3), 900.0); - layout.ptHeight = 500; - pageManager->setDefaultPage(layout); + tqlayout.ptHeight = 500; + pageManager->setDefaultPage(tqlayout); CHECK(pageManager->bottomOfPage(3), 800.0); page2->setHeight(-1); CHECK(pageManager->bottomOfPage(3), 1200.0); - layout.ptTop = 5; - layout.ptLeft = 6; - layout.ptBottom = 7; - layout.ptRight = 8; - layout.ptBindingSide = -1; - layout.ptPageEdge = -1; - pageManager->setDefaultPage(layout); + tqlayout.ptTop = 5; + tqlayout.ptLeft = 6; + tqlayout.ptBottom = 7; + tqlayout.ptRight = 8; + tqlayout.ptBindingSide = -1; + tqlayout.ptPageEdge = -1; + pageManager->setDefaultPage(tqlayout); page2->setTopMargin(9); page2->setLeftMargin(10); page2->setBottomMargin(11); -- cgit v1.2.1