diff options
Diffstat (limited to 'kword/tests')
-rw-r--r-- | kword/tests/FrameTester.cpp | 4 | ||||
-rw-r--r-- | kword/tests/FrameTester.h | 6 | ||||
-rw-r--r-- | kword/tests/FrameViewTester.cpp | 8 | ||||
-rw-r--r-- | kword/tests/KWPageManagerTester.cpp | 28 |
4 files changed, 23 insertions, 23 deletions
diff --git a/kword/tests/FrameTester.cpp b/kword/tests/FrameTester.cpp index 0a088674..9486f05d 100644 --- a/kword/tests/FrameTester.cpp +++ b/kword/tests/FrameTester.cpp @@ -21,7 +21,7 @@ #include <KWDocument.h> #include <kunittest/runner.h> #include <kunittest/module.h> -#include <qapplication.h> +#include <tqapplication.h> using namespace KUnitTest; @@ -31,7 +31,7 @@ KUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester); void KWFrameTester::allTests() { int argc = 0; char** argv = 0; - QApplication app( argc, argv ); // needed for KWDocument, due to KWCommandHistory -> KToolBarPopupAction -> QPopupMenu -> QWidget + TQApplication app( argc, argv ); // needed for KWDocument, due to KWCommandHistory -> KToolBarPopupAction -> TQPopupMenu -> TQWidget testSimpleFrame(); testFrameList(); diff --git a/kword/tests/FrameTester.h b/kword/tests/FrameTester.h index 9c255829..5f9432f9 100644 --- a/kword/tests/FrameTester.h +++ b/kword/tests/FrameTester.h @@ -37,7 +37,7 @@ class TestFrameSet : public KWFrameSet { public: TestFrameSet( KWDocument* doc = 0 ) : KWFrameSet(doc) { } - QDomElement save(QDomElement&, bool) { return QDomElement(); } + TQDomElement save(TQDomElement&, bool) { return TQDomElement(); } void saveOasis( KoXmlWriter&, KoSavingContext&, bool) const { }; void setProtectContent(bool) { } bool protectContent() const { return true; } @@ -45,10 +45,10 @@ public: class TestTextFrameSet : public KWTextFrameSet { public: - TestTextFrameSet(KWDocument *doc, const QString name) : KWTextFrameSet(name) { + TestTextFrameSet(KWDocument *doc, const TQString name) : KWTextFrameSet(name) { m_doc = doc; } - QDomElement save(QDomElement&, bool) { return QDomElement(); } + TQDomElement save(TQDomElement&, bool) { return TQDomElement(); } void saveOasis( KoXmlWriter&, KoSavingContext&, bool) const { }; void setProtectContent(bool) { } bool protectContent() const { return true; } diff --git a/kword/tests/FrameViewTester.cpp b/kword/tests/FrameViewTester.cpp index 652bc50e..f486e11c 100644 --- a/kword/tests/FrameViewTester.cpp +++ b/kword/tests/FrameViewTester.cpp @@ -271,11 +271,11 @@ void KWFrameViewTester::testMouseMeaning() { for(int y = 50; y <= 100; y += 25) { for(int offset2=-6; offset2 <= 6; offset2+=6) { point.setY(y + offset2); - CHECK(fv->contains(point, true), true); + CHECK(fv->tqcontains(point, true), true); if(x < 50 || x > 100 || y < 50 || y > 100) - CHECK(fv->contains(point), false); + CHECK(fv->tqcontains(point), false); else - CHECK(fv->contains(point), true); + CHECK(fv->tqcontains(point), true); if(x > 60 && x < 90 && y > 60 && y < 90) CHECK(fv->isBorderHit(point), false); else @@ -292,4 +292,4 @@ void KWFrameViewTester::testMouseMeaning() { CHECK(fv->mouseMeaning(point, 0), MEANING_NONE); } -// QCursor mouseCursor( const KoPoint &point, int keyState ) const; +// TQCursor mouseCursor( const KoPoint &point, int keyState ) const; 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); |