From f7e71d47719ab6094cf4a9fafffa5ea351973522 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 13 Jan 2011 08:32:36 +0000 Subject: Initial conversion for TQt for Qt4 3.4.0 TP2 This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/tests/drawdemo.cpp | 4 ++-- kdeprint/tests/drawdemo.h | 2 +- kdeprint/tests/helpwindow.cpp | 4 ++-- kdeprint/tests/richpage.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kdeprint/tests') diff --git a/kdeprint/tests/drawdemo.cpp b/kdeprint/tests/drawdemo.cpp index 443cc89e8..20fc3d12e 100644 --- a/kdeprint/tests/drawdemo.cpp +++ b/kdeprint/tests/drawdemo.cpp @@ -78,7 +78,7 @@ void drawFonts( TQPainter *p ) // -// This function draws some shapes +// This function draws some tqshapes // void drawShapes( TQPainter *p ) @@ -115,7 +115,7 @@ struct DrawThing { DrawThing ourDrawFunctions[] = { { drawColorWheel, "Draw color wheel" }, { drawFonts, "Draw fonts" }, - { drawShapes, "Draw shapes" }, + { drawShapes, "Draw tqshapes" }, { 0, 0 } }; diff --git a/kdeprint/tests/drawdemo.h b/kdeprint/tests/drawdemo.h index 5d2412477..963da64db 100644 --- a/kdeprint/tests/drawdemo.h +++ b/kdeprint/tests/drawdemo.h @@ -6,7 +6,7 @@ // and a text in the table above. // -class DrawView : public QWidget +class DrawView : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/tests/helpwindow.cpp b/kdeprint/tests/helpwindow.cpp index c2cdb1b22..bee755d20 100644 --- a/kdeprint/tests/helpwindow.cpp +++ b/kdeprint/tests/helpwindow.cpp @@ -67,7 +67,7 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P ); file->insertSeparator(); file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q ); - file->insertItem( "E&xit", qApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); + file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); // The same three icons are used twice each. TQIconSet icon_back( TQPixmap("back.xpm") ); @@ -278,7 +278,7 @@ void HelpWindow::print() TQRect view( body ); int page = 1; do { - richText.draw( &p, body.left(), body.top(), view, colorGroup() ); + richText.draw( &p, body.left(), body.top(), view, tqcolorGroup() ); view.moveBy( 0, body.height() ); p.translate( 0 , -body.height() ); p.setFont( font ); diff --git a/kdeprint/tests/richpage.cpp b/kdeprint/tests/richpage.cpp index f12040b71..30da712de 100644 --- a/kdeprint/tests/richpage.cpp +++ b/kdeprint/tests/richpage.cpp @@ -23,7 +23,7 @@ RichPage::RichPage(TQWidget *parent, const char *name) QFontDatabase db; QStringList fonts = db.families(); fontname_->insertStringList(fonts); - fontname_->setCurrentItem(fonts.findIndex(TQString::fromLatin1("times"))); + fontname_->setCurrentItem(fonts.findIndex(TQString::tqfromLatin1("times"))); if (fontname_->currentItem() < 0) fontname_->setCurrentItem(0); QLabel *l1 = new TQLabel("Margin:",this); -- cgit v1.2.1