From 520c05ef06ce203ad32470730f68402bc7719157 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 27 Feb 2012 02:13:42 -0600 Subject: Automated update from qt3 --- examples/demo/frame.cpp | 8 ++++---- examples/demo/i18n/i18n.cpp | 14 +++++++------- examples/demo/main.cpp | 2 +- examples/demo/textdrawing/textedit.cpp | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'examples/demo') diff --git a/examples/demo/frame.cpp b/examples/demo/frame.cpp index 2c7152b5..0cd5006a 100644 --- a/examples/demo/frame.cpp +++ b/examples/demo/frame.cpp @@ -132,10 +132,10 @@ void Frame::setStyle( const TQString& style ) void Frame::updateTranslators() { if ( !qt_translator ) { - qt_translator = new TQTranslator( qApp ); - translator = new TQTranslator( qApp ); - qApp->installTranslator( qt_translator ); - qApp->installTranslator( translator ); + qt_translator = new TQTranslator( tqApp ); + translator = new TQTranslator( tqApp ); + tqApp->installTranslator( qt_translator ); + tqApp->installTranslator( translator ); } TQString base = TQDir("../../translations").absPath(); diff --git a/examples/demo/i18n/i18n.cpp b/examples/demo/i18n/i18n.cpp index 1fba8925..925fdf13 100644 --- a/examples/demo/i18n/i18n.cpp +++ b/examples/demo/i18n/i18n.cpp @@ -114,14 +114,14 @@ void I18nDemo::newSlot(int id) } if (lastwrapper) { - qApp->removeTranslator(&lastwrapper->translator); + tqApp->removeTranslator(&lastwrapper->translator); lastwrapper = 0; } Wrapper *wrapper = new Wrapper(workspace, windowIdNumber); wrapper->translator.load(qmfile, "."); - qApp->installTranslator(&wrapper->translator); + tqApp->installTranslator(&wrapper->translator); connect(wrapper, SIGNAL(destroyed()), SLOT(wrapperDead())); wrapper->setCaption(tr("--language--")); @@ -139,7 +139,7 @@ void I18nDemo::newSlot(int id) "

See http://www.trolltech.com/qt/ for more " "information.

").arg(TQT_VERSION_STR)); - qApp->removeTranslator(&wrapper->translator); + tqApp->removeTranslator(&wrapper->translator); te->show(); wrapper->show(); @@ -173,7 +173,7 @@ void I18nDemo::windowSlot(int id) void I18nDemo::windowActivated(TQWidget *w) { if (lastwrapper) { - qApp->removeTranslator(&lastwrapper->translator); + tqApp->removeTranslator(&lastwrapper->translator); windowMenu->setItemChecked(lastwrapper->id, FALSE); } @@ -221,7 +221,7 @@ void I18nDemo::wrapperDead() Wrapper *w = (Wrapper *) sender(); if (w == lastwrapper) { - qApp->removeTranslator(&w->translator); + tqApp->removeTranslator(&w->translator); lastwrapper = 0; } @@ -240,7 +240,7 @@ void I18nDemo::showEvent(TQShowEvent *) if (! lastwrapper) return; - qApp->installTranslator(&lastwrapper->translator); + tqApp->installTranslator(&lastwrapper->translator); } @@ -249,5 +249,5 @@ void I18nDemo::hideEvent(TQHideEvent *) if (! lastwrapper) return; - qApp->removeTranslator(&lastwrapper->translator); + tqApp->removeTranslator(&lastwrapper->translator); } diff --git a/examples/demo/main.cpp b/examples/demo/main.cpp index 295847ac..d2d86ec3 100644 --- a/examples/demo/main.cpp +++ b/examples/demo/main.cpp @@ -59,7 +59,7 @@ static void qdemo_set_caption( CategoryInterface *c, int i ) { - TQWidget *w = qApp->mainWidget(); + TQWidget *w = tqApp->mainWidget(); if ( !w ) return; TQString title = Frame::tr( "TQt Demo Collection" ); diff --git a/examples/demo/textdrawing/textedit.cpp b/examples/demo/textdrawing/textedit.cpp index c17aa508..d76f16a0 100644 --- a/examples/demo/textdrawing/textedit.cpp +++ b/examples/demo/textdrawing/textedit.cpp @@ -316,7 +316,7 @@ void TextEdit::fileClose() void TextEdit::fileExit() { - qApp->quit(); + tqApp->quit(); } void TextEdit::editUndo() -- cgit v1.2.1