diff options
Diffstat (limited to 'tools')
43 files changed, 124 insertions, 124 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp index e47e38bd..ad7e7edd 100644 --- a/tools/assistant/config.cpp +++ b/tools/assistant/config.cpp @@ -53,7 +53,7 @@ inline TQString getVersionString() Config::Config() : hideSidebar( FALSE ), profil( 0 ), maximized(FALSE) { - fontSiz = qApp->font().pointSize(); + fontSiz = tqApp->font().pointSize(); if( !static_configuration ) { static_configuration = this; } else { @@ -120,13 +120,13 @@ void Config::load() linkCol = settings.readEntry( key + "LinkColor", "#0000FF" ); src = settings.readListEntry( profkey + "Source" ); sideBar = settings.readNumEntry( key + "SideBarPage" ); - if (qApp->type() != TQApplication::Tty) { - fontFam = settings.readEntry( key + "Family", qApp->font().family() ); + if (tqApp->type() != TQApplication::Tty) { + fontFam = settings.readEntry( key + "Family", tqApp->font().family() ); fontFix = settings.readEntry( key + "FixedFamily", "courier" ); fontSiz = settings.readNumEntry( key + "Size", -1 ); if ( fontSiz < 4 ) { - fontSiz = qApp->font().pointSize(); + fontSiz = tqApp->font().pointSize(); } geom.setRect( settings.readNumEntry( key + "GeometryX", TQApplication::desktop()->availableGeometry().x() ), @@ -162,14 +162,14 @@ void Config::saveSettings() settings.writeEntry( key + "LinkColor", linkCol ); settings.writeEntry( profkey + "Source", src ); settings.writeEntry( key + "SideBarPage", sideBarPage() ); - if (qApp->type() != TQApplication::Tty) { + if (tqApp->type() != TQApplication::Tty) { settings.writeEntry( key + "GeometryX", geom.x() ); settings.writeEntry( key + "GeometryY", geom.y() ); settings.writeEntry( key + "GeometryWidth", geom.width() ); settings.writeEntry( key + "GeometryHeight", geom.height() ); settings.writeEntry( key + "GeometryMaximized", maximized ); settings.writeEntry( key + "Family", fontFam ); - settings.writeEntry( key + "Size", fontSiz < 4 ? qApp->font().pointSize() : fontSiz ); + settings.writeEntry( key + "Size", fontSiz < 4 ? tqApp->font().pointSize() : fontSiz ); settings.writeEntry( key + "FixedFamily", fontFix ); } if ( !hideSidebar ) diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index c447c4cb..adf39f2f 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -230,7 +230,7 @@ void HelpDialog::initialize() listContents->header()->hide(); listContents->header()->setStretchEnabled( TRUE ); framePrepare->hide(); - connect( qApp, SIGNAL(lastWindowClosed()), SLOT(lastWinClosed()) ); + connect( tqApp, SIGNAL(lastWindowClosed()), SLOT(lastWinClosed()) ); termsEdit->setValidator( new SearchValidator( termsEdit ) ); @@ -254,7 +254,7 @@ void HelpDialog::initialize() void HelpDialog::processEvents() { - qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); } @@ -292,7 +292,7 @@ void HelpDialog::timerEvent(TQTimerEvent *e) help->setWindowOpacity((opacity-=4)/255.0); if (opacity<=0) #endif - qApp->quit(); + tqApp->quit(); } diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp index 4ce081de..24372fee 100644 --- a/tools/assistant/index.cpp +++ b/tools/assistant/index.cpp @@ -69,7 +69,7 @@ Index::Index( const TQString &dp, const TQString &hp ) { alreadyHaveDocList = FALSE; lastWindowClosed = FALSE; - connect( qApp, SIGNAL( lastWindowClosed() ), + connect( tqApp, SIGNAL( lastWindowClosed() ), this, SLOT( setLastWinClosed() ) ); } @@ -79,7 +79,7 @@ Index::Index( const TQStringList &dl, const TQString &hp ) docList = dl; alreadyHaveDocList = TRUE; lastWindowClosed = FALSE; - connect( qApp, SIGNAL( lastWindowClosed() ), + connect( tqApp, SIGNAL( lastWindowClosed() ), this, SLOT( setLastWinClosed() ) ); } diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index d257c7cf..d9847b8d 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -118,14 +118,14 @@ void MainWindow::setup() if( setupCompleted ) return; - qApp->setOverrideCursor( TQCursor( TQt::WaitCursor ) ); + tqApp->setOverrideCursor( TQCursor( TQt::WaitCursor ) ); statusBar()->message( tr( "Initializing TQt Assistant..." ) ); setupCompleted = TRUE; helpDock->initialize(); connect( actionGoPrevious, SIGNAL( activated() ), tabs, SLOT( backward() ) ); connect( actionGoNext, SIGNAL( activated() ), tabs, SLOT( forward() ) ); connect( actionEditCopy, SIGNAL( activated() ), tabs, SLOT( copy() ) ); - connect( actionFileExit, SIGNAL( activated() ), qApp, SLOT( closeAllWindows() ) ); + connect( actionFileExit, SIGNAL( activated() ), tqApp, SLOT( closeAllWindows() ) ); connect( actionAddBookmark, SIGNAL( activated() ), helpDock, SLOT( addBookmark() ) ); connect( helpDock, SIGNAL( showLink( const TQString& ) ), @@ -167,7 +167,7 @@ void MainWindow::setup() PopupMenu->insertItem( tr( "Vie&ws" ), createDockWindowMenu() ); helpDock->tabWidget->setCurrentPage( config->sideBarPage() ); - qApp->restoreOverrideCursor(); + tqApp->restoreOverrideCursor(); actionGoPrevious->setEnabled( FALSE ); actionGoNext->setEnabled( FALSE ); } @@ -335,8 +335,8 @@ void MainWindow::print() if ( !p.begin( &printer ) ) return; - qApp->setOverrideCursor( TQCursor( TQt::WaitCursor ) ); - qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tqApp->setOverrideCursor( TQCursor( TQt::WaitCursor ) ); + tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); TQPaintDeviceMetrics metrics(p.device()); TQTextBrowser *browser = tabs->currentBrowser(); @@ -352,7 +352,7 @@ void MainWindow::print() richText.setWidth( &p, view.width() ); int page = 1; do { - qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); richText.draw( &p, margin, margin, view, palette().active() ); view.moveBy( 0, view.height() ); @@ -365,8 +365,8 @@ void MainWindow::print() page++; } while (TRUE); - qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); - qApp->restoreOverrideCursor(); + tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tqApp->restoreOverrideCursor(); } } diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp index ac517f1d..51571520 100644 --- a/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tools/designer/designer/customwidgeteditorimpl.cpp @@ -403,7 +403,7 @@ void CustomWidgetEditor::checkWidgetName() "to rename this widget with this name." ).arg( s ) ); if ( i != boxWidgets->item( boxWidgets->currentItem() ) ) { boxWidgets->setCurrentItem( i ); - qApp->processEvents(); + tqApp->processEvents(); } editClass->setText( w->className ); classNameChanged( w->className ); diff --git a/tools/designer/designer/formfile.cpp b/tools/designer/designer/formfile.cpp index 2afe8423..4f88b29e 100644 --- a/tools/designer/designer/formfile.cpp +++ b/tools/designer/designer/formfile.cpp @@ -218,7 +218,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) TQCString data( f.size() ); f.readBlock( data.data(), f.size() ); f2.writeBlock( data ); - } else if ( qApp->type() != TQApplication::Tty ) { + } else if ( tqApp->type() != TQApplication::Tty ) { TQMessageBox::warning( MainWindow::self, "Save", "The file " + codeFile() + " could not be saved" ); } diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp index b352b11d..50dd9620 100644 --- a/tools/designer/designer/formwindow.cpp +++ b/tools/designer/designer/formwindow.cpp @@ -606,7 +606,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) delete l; } } - qApp->processEvents(); + tqApp->processEvents(); } if ( ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) && sel && e->button() == LeftButton ) { // control pressed and selected, unselect widget @@ -860,7 +860,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) break; case CONNECT_TOOL: restoreConnectionLine(); - wid = qApp->widgetAt( e->globalPos(), TRUE ); + wid = tqApp->widgetAt( e->globalPos(), TRUE ); if ( wid ) wid = designerWidget( wid ); if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) @@ -874,7 +874,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) mainWindow()->statusBar()->message( tr( "Connect '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); currentPos = mapFromGlobal( e->globalPos() ); - qApp->processEvents(); + tqApp->processEvents(); if ( drawRecRect ) restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ), ( (TQWidget*)oldendWidget )->size() ) ); @@ -884,7 +884,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) if ( !validForBuddy ) break; restoreConnectionLine(); - wid = qApp->widgetAt( e->globalPos(), TRUE ); + wid = tqApp->widgetAt( e->globalPos(), TRUE ); if ( wid ) wid = designerWidget( wid ); if ( wid && canBeBuddy( wid ) && wid->isVisibleTo( this ) ) @@ -904,7 +904,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) else mainWindow()->statusBar()->message( tr( "Set buddy '%1' to ..." ).arg( startWidget->name() ) ); currentPos = mapFromGlobal( e->globalPos() ); - qApp->processEvents(); + tqApp->processEvents(); if ( drawRecRect && oldendWidget ) restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ), ( (TQWidget*)oldendWidget )->size() ) ); @@ -1035,7 +1035,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) ( (TQWidget*)endWidget )->pos() ), ( (TQWidget*)endWidget )->size() ) ); endUnclippedPainter(); - qApp->processEvents(); + tqApp->processEvents(); if ( startWidget && endWidget ) { if ( currTool == CONNECT_TOOL ) diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp index 77c84d0b..25d0f334 100644 --- a/tools/designer/designer/hierarchyview.cpp +++ b/tools/designer/designer/hierarchyview.cpp @@ -953,7 +953,7 @@ void HierarchyList::insertEntry( TQListViewItem *i, const TQPixmap &pix, const T item->setRenameEnabled( 0, TRUE ); setCurrentItem( item ); ensureItemVisible( item ); - qApp->processEvents(); + tqApp->processEvents(); newItem = item; item->startRename( 0 ); } diff --git a/tools/designer/designer/listeditor.ui.h b/tools/designer/designer/listeditor.ui.h index 5468f796..3092706d 100644 --- a/tools/designer/designer/listeditor.ui.h +++ b/tools/designer/designer/listeditor.ui.h @@ -30,7 +30,7 @@ void ListEditor::addItem() { TQListViewItem *i = new TQListViewItem( listview, listview->lastItem() ); i->setRenameEnabled( 0, TRUE ); - qApp->processEvents(); + tqApp->processEvents(); i->startRename( 0 ); } diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 4f22fb8b..1d97ffe4 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -185,7 +185,7 @@ MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir ) setupPluginManagers(); if ( !single ) - qApp->setMainWidget( this ); + tqApp->setMainWidget( this ); TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory ); #ifndef Q_WS_MACX setIcon( TQPixmap::fromMimeSource( "designer_appicon.png" ) ); @@ -247,13 +247,13 @@ MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir ) emit hasActiveWindow( FALSE ); lastPressWidget = 0; - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); - TQSize as( qApp->desktop()->size() ); + TQSize as( tqApp->desktop()->size() ); as -= TQSize( 30, 30 ); resize( TQSize( 1200, 1000 ).boundedTo( as ) ); - connect( qApp->clipboard(), SIGNAL( dataChanged() ), + connect( tqApp->clipboard(), SIGNAL( dataChanged() ), this, SLOT( clipboardChanged() ) ); clipboardChanged(); layoutChilds = FALSE; @@ -734,7 +734,7 @@ void MainWindow::previewForm( const TQString & style ) void MainWindow::helpContents() { - TQWidget *focusWidget = qApp->focusWidget(); + TQWidget *focusWidget = tqApp->focusWidget(); bool showClassDocu = TRUE; while ( focusWidget ) { if ( focusWidget->isA( "PropertyList" ) ) { @@ -1525,7 +1525,7 @@ void MainWindow::popupFormWindowMenu( const TQPoint & gp, FormWindow *fw ) setupRMBSpecialCommands( ids, commands, fw ); setupRMBProperties( ids, commands, fw ); - qApp->processEvents(); + tqApp->processEvents(); int r = rmbFormWindow->exec( gp ); handleRMBProperties( r, commands, fw ); @@ -1543,7 +1543,7 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg setupRMBSpecialCommands( ids, commands, w ); setupRMBProperties( ids, commands, w ); - qApp->processEvents(); + tqApp->processEvents(); int r = rmbWidgets->exec( gp ); handleRMBProperties( r, commands, w ); @@ -1997,7 +1997,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command void MainWindow::clipboardChanged() { - TQString text( qApp->clipboard()->text() ); + TQString text( tqApp->clipboard()->text() ); if (qWorkspace()->activeWindow() && ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow())) { actionEditPaste->setEnabled(!text.isEmpty()); } else { @@ -3355,7 +3355,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) fw->showNormal(); fw->setFocus(); lastActiveFormWindow = fw; - qApp->processEvents(); + tqApp->processEvents(); se = editSource(); if ( se ) { switch ( lm ) { @@ -3430,7 +3430,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) ); else fw->formFile()->showEditor( FALSE ); - qApp->processEvents(); // give all views the chance to get the formwindow + tqApp->processEvents(); // give all views the chance to get the formwindow SourceEditor *se = editSource(); if ( se ) { switch ( lm ) { diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index 86da0e52..dbff60da 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -1082,7 +1082,7 @@ void MainWindow::fileQuit() { close(); if ( !singleProjectMode() ) - qApp->closeAllWindows(); + tqApp->closeAllWindows(); } void MainWindow::fileClose() @@ -1531,7 +1531,7 @@ void MainWindow::editCopy() return; } if ( formWindow() ) - qApp->clipboard()->setText( formWindow()->copy() ); + tqApp->clipboard()->setText( formWindow()->copy() ); } void MainWindow::editPaste() @@ -1555,7 +1555,7 @@ void MainWindow::editPaste() } if ( w && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) { - formWindow()->paste( qApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) ); + formWindow()->paste( tqApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) ); hierarchyView->widgetInserted( 0 ); formWindow()->commandHistory()->setModified( TRUE ); } else { @@ -2048,8 +2048,8 @@ void MainWindow::showStartDialog() { if ( singleProjectMode() ) return; - for ( int i = 1; i < qApp->argc(); ++i ) { - TQString arg = qApp->argv()[i]; + for ( int i = 1; i < tqApp->argc(); ++i ) { + TQString arg = tqApp->argv()[i]; if ( arg[0] != '-' ) return; } diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp index 6687eddb..2667519f 100644 --- a/tools/designer/designer/menubareditor.cpp +++ b/tools/designer/designer/menubareditor.cpp @@ -822,7 +822,7 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e ) void MenuBarEditor::focusOutEvent( TQFocusEvent * e ) { - TQWidget * fw = qApp->focusWidget(); + TQWidget * fw = tqApp->focusWidget(); if ( e->lostFocus() && !::qt_cast<PopupMenuEditor*>(fw) ) hideItem(); update(); diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp index d257d163..b7ccc67a 100644 --- a/tools/designer/designer/multilineeditorimpl.cpp +++ b/tools/designer/designer/multilineeditorimpl.cpp @@ -265,7 +265,7 @@ int MultiLineEditor::exec() { res = 1; show(); - qApp->enter_loop(); + tqApp->enter_loop(); return res; } @@ -315,7 +315,7 @@ void MultiLineEditor::cancelClicked() void MultiLineEditor::closeEvent( TQCloseEvent *e ) { - qApp->exit_loop(); + tqApp->exit_loop(); MultiLineEditorBase::closeEvent( e ); } diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp index 5a4479b9..e54dc9de 100644 --- a/tools/designer/designer/outputwindow.cpp +++ b/tools/designer/designer/outputwindow.cpp @@ -114,7 +114,7 @@ static void debugMessageOutput( TQtMsgType type, const char *msg ) abort(); } - qApp->flush(); + tqApp->flush(); } void OutputWindow::setupDebug() diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp index 4693013b..de90f369 100644 --- a/tools/designer/designer/pixmapchooser.cpp +++ b/tools/designer/designer/pixmapchooser.cpp @@ -89,7 +89,7 @@ void PixmapView::previewUrl( const TQUrl &u ) static void buildImageFormatList( TQString &filter, TQString &all ) { - all = qApp->translate( "qChoosePixmap", "All Pixmaps (" ); + all = tqApp->translate( "qChoosePixmap", "All Pixmaps (" ); for ( uint i = 0; i < TQImageIO::outputFormats().count(); i++ ) { TQString outputFormat = TQImageIO::outputFormats().at( i ); TQString outputExtension; @@ -97,12 +97,12 @@ static void buildImageFormatList( TQString &filter, TQString &all ) outputExtension = outputFormat.lower(); else outputExtension = "jpg;*.jpeg"; - filter += qApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" ). + filter += tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" ). arg( outputFormat ).arg( "*." + outputExtension); all += "*." + outputExtension + ";"; } - filter.prepend( all + qApp->translate( "qChoosePixmap", ")\n" ) ); - filter += qApp->translate( "qChoosePixmap", "All Files (*)" ); + filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) ); + filter += tqApp->translate( "qChoosePixmap", "All Files (*)" ); } TQStringList qChoosePixmaps( TQWidget *parent ) @@ -121,7 +121,7 @@ TQStringList qChoosePixmaps( TQWidget *parent ) fd.setContentsPreview( pw, pw ); fd.setViewMode( TQFileDialog::List ); fd.setPreviewMode( TQFileDialog::Contents ); - fd.setCaption( qApp->translate( "qChoosePixmap", "Choose Images..." ) ); + fd.setCaption( tqApp->translate( "qChoosePixmap", "Choose Images..." ) ); if ( fd.exec() == TQDialog::Accepted ) return fd.selectedFiles(); return TQStringList(); @@ -144,7 +144,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T fd.setContentsPreview( pw, pw ); fd.setViewMode( TQFileDialog::List ); fd.setPreviewMode( TQFileDialog::Contents ); - fd.setCaption( qApp->translate( "qChoosePixmap", "Choose a Pixmap..." ) ); + fd.setCaption( tqApp->translate( "qChoosePixmap", "Choose a Pixmap..." ) ); if ( fd.exec() == TQDialog::Accepted ) { TQPixmap pix( fd.selectedFile() ); if ( fn ) diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp index af5a5959..355a6549 100644 --- a/tools/designer/designer/popupmenueditor.cpp +++ b/tools/designer/designer/popupmenueditor.cpp @@ -1011,7 +1011,7 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * ) void PopupMenuEditor::focusOutEvent( TQFocusEvent * ) { - TQWidget * fw = qApp->focusWidget(); + TQWidget * fw = tqApp->focusWidget(); if ( !fw || ( !::qt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) { hideSubMenu(); if ( fw && ::qt_cast<MenuBarEditor*>(fw) ) diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp index 862dd174..2d5dc2dd 100644 --- a/tools/designer/designer/project.cpp +++ b/tools/designer/designer/project.cpp @@ -1594,5 +1594,5 @@ TQString Project::locationOfObject( TQObject *o ) bool Project::hasGUI() const { - return qApp->type() != TQApplication::Tty; + return tqApp->type() != TQApplication::Tty; } diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index efbe42b9..af0db8e3 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -333,14 +333,14 @@ void PropertyItem::setOpen( bool b ) children.setAutoDelete( TRUE ); children.clear(); children.setAutoDelete( FALSE ); - qApp->processEvents(); + tqApp->processEvents(); listview->updateEditorSize(); return; } createChildren(); initChildren(); - qApp->processEvents(); + tqApp->processEvents(); listview->updateEditorSize(); } @@ -552,10 +552,10 @@ TQString PropertyItem::currentItemFromObject() const void PropertyItem::setFocus( TQWidget *w ) { - if ( !qApp->focusWidget() || + if ( !tqApp->focusWidget() || listview->propertyEditor()->formWindow() && - ( !MainWindow::self->isAFormWindowChild( qApp->focusWidget() ) && - !qApp->focusWidget()->inherits( "Editor" ) ) ) + ( !MainWindow::self->isAFormWindowChild( tqApp->focusWidget() ) && + !tqApp->focusWidget()->inherits( "Editor" ) ) ) w->setFocus(); } @@ -2560,7 +2560,7 @@ void PropertyKeysequenceItem::setValue() PropertyItem::setValue( v ); if (sequence->hasFocus() // if the user wants to use F1 as accelerator, Designer will pop up a TQWhatsThat widget - || (qApp->focusWidget() && qApp->focusWidget()->inherits("TQWhatsThat"))) + || (tqApp->focusWidget() && tqApp->focusWidget()->inherits("TQWhatsThat"))) notifyValueChange(); setChanged( TRUE ); } @@ -3314,7 +3314,7 @@ void PropertyList::setupProperties() sort(); setSorting( -1 ); setCurrentItem( firstChild() ); - qApp->processEvents(); + tqApp->processEvents(); } updateEditorSize(); diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index 4f6c997d..96720dc4 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -1637,7 +1637,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant case TQVariant::Font: { TQVariant v( value ); ts << makeIndent( indent ) << "<font>" << endl; - TQFont f( qApp->font() ); + TQFont f( tqApp->font() ); if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() ) f = ((TQWidget*)w)->parentWidget()->font(); TQFont f2( v.toFont() ); @@ -2188,7 +2188,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD TQVariant defVarient; if ( e.tagName() == "font" ) { - TQFont f( qApp->font() ); + TQFont f( tqApp->font() ); if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() ) f = ( (TQWidget*)obj )->parentWidget()->font(); defVarient = TQVariant( f ); diff --git a/tools/designer/designer/syntaxhighlighter_html.cpp b/tools/designer/designer/syntaxhighlighter_html.cpp index 629941d7..c41c8bac 100644 --- a/tools/designer/designer/syntaxhighlighter_html.cpp +++ b/tools/designer/designer/syntaxhighlighter_html.cpp @@ -41,12 +41,12 @@ SyntaxHighlighter_HTML::SyntaxHighlighter_HTML() : TQTextPreProcessor(), lastFormat( 0 ), lastFormatId( -1 ) { - TQFont f( qApp->font() ); + TQFont f( tqApp->font() ); - addFormat(Standard, new TQTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Text))); - addFormat(Keyword, new TQTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Dark))); - addFormat(Attribute, new TQTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Link))); - addFormat(AttribValue, new TQTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::LinkVisited))); + addFormat(Standard, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Text))); + addFormat(Keyword, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Dark))); + addFormat(Attribute, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Link))); + addFormat(AttribValue, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::LinkVisited))); } SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML() diff --git a/tools/designer/editor/conf.cpp b/tools/designer/editor/conf.cpp index 336f4471..bff12867 100644 --- a/tools/designer/editor/conf.cpp +++ b/tools/designer/editor/conf.cpp @@ -41,10 +41,10 @@ TQMap<TQString, ConfigStyle> Config::defaultStyles() { ConfigStyle s; TQMap<TQString, ConfigStyle> styles; - int normalSize = qApp->font().pointSize(); - TQString normalFamily = qApp->font().family(); + int normalSize = tqApp->font().pointSize(); + TQString normalFamily = tqApp->font().family(); TQString commentFamily = "times"; - int normalWeight = qApp->font().weight(); + int normalWeight = tqApp->font().weight(); s.font = TQFont( normalFamily, normalSize, normalWeight ); s.color = TQt::black; diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h index 9b1d5460..a86d2844 100644 --- a/tools/designer/examples/addressbook/addressbook.ui.h +++ b/tools/designer/examples/addressbook/addressbook.ui.h @@ -112,7 +112,7 @@ void AddressBook::fileSaveAs() void AddressBook::fileExit() { - qApp->exit(); + tqApp->exit(); } void AddressBook::editFind() diff --git a/tools/designer/examples/multiclip/multiclip.ui.h b/tools/designer/examples/multiclip/multiclip.ui.h index a2b0b0cf..a4287fa4 100644 --- a/tools/designer/examples/multiclip/multiclip.ui.h +++ b/tools/designer/examples/multiclip/multiclip.ui.h @@ -35,7 +35,7 @@ void MulticlipForm::init() lengthLCDNumber->setBackgroundColor( darkBlue ); currentLineEdit->setFocus(); - cb = qApp->clipboard(); + cb = tqApp->clipboard(); connect( cb, SIGNAL( dataChanged() ), SLOT( dataChanged() ) ); if ( cb->supportsSelection() ) connect( cb, SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) ); diff --git a/tools/designer/examples/richedit/richedit.ui.h b/tools/designer/examples/richedit/richedit.ui.h index e6acad87..02f7b1ef 100644 --- a/tools/designer/examples/richedit/richedit.ui.h +++ b/tools/designer/examples/richedit/richedit.ui.h @@ -17,7 +17,7 @@ void EditorForm::init() void EditorForm::fileExit() { if ( saveAndContinue( "Exit" ) ) - qApp->exit(); + tqApp->exit(); } void EditorForm::fileNew() diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp index ce30936c..7607cf73 100644 --- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp +++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp @@ -134,7 +134,7 @@ static TQMap<int, TQMap<TQString, int > > *wordMap = 0; SyntaxHighlighter_CPP::SyntaxHighlighter_CPP() : TQTextPreProcessor(), lastFormat( 0 ), lastFormatId( -1 ) { - TQFont f( qApp->font() ); + TQFont f( tqApp->font() ); addFormat( Standard, new TQTextFormat( f, TQt::black ) ); addFormat( Number, new TQTextFormat( f, TQt::darkBlue ) ); diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp index 626b3093..f886a259 100644 --- a/tools/designer/plugins/glade/glade2ui.cpp +++ b/tools/designer/plugins/glade/glade2ui.cpp @@ -2192,7 +2192,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) yyOut = TQString::null; widgetNo++; - qApp->processEvents(); + tqApp->processEvents(); if ( fremskritt.wasCancelled() ) break; fremskritt.setProgress( widgetNo ); diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp index b3400acc..5060ec7e 100644 --- a/tools/designer/plugins/wizards/main.cpp +++ b/tools/designer/plugins/wizards/main.cpp @@ -106,12 +106,12 @@ void StandardTemplateWizardInterface::setup( const TQString &templ, TQWidget *wi templ == "TQDataView" || templ == "TQDataBrowser" || templ == "TQDataTable" ) { - SqlFormWizard wizard( aIface, widget, qApp->mainWidget(), fw, 0, TRUE ); + SqlFormWizard wizard( aIface, widget, tqApp->mainWidget(), fw, 0, TRUE ); wizard.exec(); } #endif if ( templ == "TQMainWindow" ) { - MainWindowWizardBase wizard( qApp->mainWidget(), 0, TRUE ); + MainWindowWizardBase wizard( tqApp->mainWidget(), 0, TRUE ); wizard.setAppInterface( aIface, fw, widget ); wizard.exec(); } diff --git a/tools/designer/shared/globaldefs.h b/tools/designer/shared/globaldefs.h index 4f4c2cb2..f093e0a3 100644 --- a/tools/designer/shared/globaldefs.h +++ b/tools/designer/shared/globaldefs.h @@ -51,7 +51,7 @@ static void init_colors() return; #if 0 // a calculated alternative for backColor1 - TQColorGroup myCg = qApp->palette().active(); + TQColorGroup myCg = tqApp->palette().active(); int h1, s1, v1; int h2, s2, v2; myCg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp index cbf49cc4..9cd0ad75 100644 --- a/tools/designer/uilib/qwidgetfactory.cpp +++ b/tools/designer/uilib/qwidgetfactory.cpp @@ -296,7 +296,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, bool failed = FALSE; if ( !f.open( IO_ReadOnly ) ) failed = TRUE; - if ( failed && qApp->type() == TQApplication::Tty ) { + if ( failed && tqApp->type() == TQApplication::Tty ) { // for TQSA: If we have no GUI, we have no form definition // files, but just the code. So try if only the code exists. f.setName( uiFile + ".qs" ); @@ -331,7 +331,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge widgetFactory->toplevel = 0; // If we have no GUI, we only want to load the code - if ( qApp->type() != TQApplication::Tty ) { + if ( tqApp->type() != TQApplication::Tty ) { TQIODevice::Offset start = dev->at(); Q_UINT32 magic; TQDataStream in( dev ); @@ -2612,12 +2612,12 @@ void TQWidgetFactory::loadExtraSource() TQString TQWidgetFactory::translate( const TQString& sourceText, const TQString& comment ) { - return qApp->translate( d->translationContext, sourceText.utf8(), comment.utf8(), + return tqApp->translate( d->translationContext, sourceText.utf8(), comment.utf8(), TQApplication::UnicodeUTF8 ); } TQString TQWidgetFactory::translate( const char *sourceText, const char *comment ) { - return qApp->translate( d->translationContext, sourceText, comment, + return tqApp->translate( d->translationContext, sourceText, comment, TQApplication::UnicodeUTF8 ); } diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf index 771fff59..7074d59f 100644 --- a/tools/linguist/book/linguist-programmer.leaf +++ b/tools/linguist/book/linguist-programmer.leaf @@ -253,7 +253,7 @@ QApplication::translate() function directly: void same_global_function( LoginWidget *logwid ) { QLabel *label = new QLabel( - qApp->translate("LoginWidget", "Password:"), + tqApp->translate("LoginWidget", "Password:"), logwid ); } \endcode @@ -291,7 +291,7 @@ Example of QT_TRANSLATE_NOOP(): QString global_greeting( int greet_type ) { - return qApp->translate( "FriendlyConversation", + return tqApp->translate( "FriendlyConversation", greeting_strings[greet_type] ); } \endcode @@ -597,7 +597,7 @@ The \c TQ_OBJECT macro defines \c tr(x) in \c ArrowPad like this \index translate()!QApplication \code - qApp->translate( "ArrowPad", x ) + tqApp->translate( "ArrowPad", x ) \endcode Knowing which class each source text appears in enables \e {Qt diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp index 21d54af8..86c3b55d 100644 --- a/tools/linguist/linguist/msgedit.cpp +++ b/tools/linguist/linguist/msgedit.cpp @@ -515,7 +515,7 @@ MessageEditor::MessageEditor( MetaTranslator * t, TQWidget * parent, this, SIGNAL(cutAvailable(bool)) ); connect( editorPage->translationMed, SIGNAL(copyAvailable(bool)), this, SIGNAL(copyAvailable(bool)) ); - connect( qApp->clipboard(), SIGNAL(dataChanged()), + connect( tqApp->clipboard(), SIGNAL(dataChanged()), this, SLOT(updateCanPaste()) ); connect( phraseLv, SIGNAL(doubleClicked(TQListViewItem *)), this, SLOT(insertPhraseInTranslation(TQListViewItem *)) ); @@ -814,7 +814,7 @@ void MessageEditor::updateCanPaste() { bool oldCanPaste = canPaste; canPaste = ( !editorPage->translationMed->isReadOnly() && - !qApp->clipboard()->text().isNull() ); + !tqApp->clipboard()->text().isNull() ); if ( canPaste != oldCanPaste ) emit pasteAvailable( canPaste ); } diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp index 945d4150..0a93e89b 100644 --- a/tools/linguist/linguist/phrase.cpp +++ b/tools/linguist/linguist/phrase.cpp @@ -130,7 +130,7 @@ bool QphHandler::fatalError( const TQXmlParseException& exception ) msg.sprintf( "Parse error at line %d, column %d (%s).", exception.lineNumber(), exception.columnNumber(), exception.message().latin1() ); - TQMessageBox::information( qApp->mainWidget(), + TQMessageBox::information( tqApp->mainWidget(), TQObject::tr("TQt Linguist"), msg ); } return FALSE; diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp index d044ca69..eaa339d6 100644 --- a/tools/linguist/linguist/trwindow.cpp +++ b/tools/linguist/linguist/trwindow.cpp @@ -329,7 +329,7 @@ TrWindow::TrWindow() "are marked with a warning.") ); showNewCurrent( 0 ); - TQSize as( qApp->desktop()->size() ); + TQSize as( tqApp->desktop()->size() ); as -= TQSize( 30, 30 ); resize( TQSize( 1000, 800 ).boundedTo( as ) ); readConfig(); @@ -349,7 +349,7 @@ void TrWindow::openFile( const TQString& name ) { if ( !name.isEmpty() ) { statusBar()->message( tr("Loading...") ); - qApp->processEvents(); + tqApp->processEvents(); tor.clear(); if ( tor.load(name) ) { slv->clear(); @@ -376,7 +376,7 @@ void TrWindow::openFile( const TQString& name ) srcChars = 0; srcCharsSpc = 0; for ( it = all.begin(); it != all.end(); ++it ) { - qApp->processEvents(); + tqApp->processEvents(); ContextLVI *c = contexts.find( TQString((*it).context()) ); if ( c == 0 ) { c = new ContextLVI( lv, tor.toUnicode((*it).context(), @@ -682,7 +682,7 @@ void TrWindow::findAgain() slv->setUpdatesEnabled( TRUE ); slv->triggerUpdate(); - qApp->beep(); + tqApp->beep(); TQMessageBox::warning( this, tr("TQt Linguist"), TQString( tr("Cannot find the string '%1'.") ).arg(findText) ); foundItem = 0; @@ -1038,7 +1038,7 @@ void TrWindow::updateFinished( bool finished ) danger(m->sourceText(), m->translation(), !oldDanger) ); if ( !oldDanger && m->danger() ) - qApp->beep(); + tqApp->beep(); tor.insert( m->message() ); if ( !dirty ) { dirty = TRUE; @@ -1066,7 +1066,7 @@ void TrWindow::doneAndNext() dirty = TRUE; updateCaption(); } - qApp->beep(); + tqApp->beep(); } updateStatistics(); } @@ -1090,7 +1090,7 @@ void TrWindow::toggleFinished( TQListViewItem *item, const TQPoint& /* p */, m->setDanger( danger(m->sourceText(), m->translation(), !oldDanger) ); if ( !oldDanger && m->danger() ) - qApp->beep(); + tqApp->beep(); tor.insert( m->message() ); if ( !dirty ) { dirty = TRUE; @@ -1115,7 +1115,7 @@ void TrWindow::nextUnfinished() if( (cItem == 0) && !(cItem = lv->firstChild()) ) { statusBar()->message( tr("No phrase to translate."), MessageMS ); - qApp->beep(); + tqApp->beep(); return; } else { showNewScope( cItem ); @@ -1130,7 +1130,7 @@ void TrWindow::nextUnfinished() } else { statusBar()->message( tr("No phrase to translate."), MessageMS ); - qApp->beep(); + tqApp->beep(); return; } } @@ -1182,7 +1182,7 @@ void TrWindow::nextUnfinished() // If no Unfinished message is left, the user has finished the job. We // congratulate on a job well done with this ringing bell. statusBar()->message( tr("No untranslated phrases left."), MessageMS ); - qApp->beep(); + tqApp->beep(); } static TQListViewItem * lastChild( TQListView * view ) @@ -1214,7 +1214,7 @@ void TrWindow::prevUnfinished() if( (cItem == 0) && !(cItem = lv->firstChild()) ) { statusBar()->message( tr("No phrase to translate."), MessageMS ); - qApp->beep(); + tqApp->beep(); return; } else { showNewScope( cItem ); @@ -1229,7 +1229,7 @@ void TrWindow::prevUnfinished() } else { statusBar()->message( tr("No phrase to translate."), MessageMS ); - qApp->beep(); + tqApp->beep(); return; } } @@ -1275,7 +1275,7 @@ void TrWindow::prevUnfinished() } while ( q != 0 ); } statusBar()->message( tr("No untranslated phrases left."), MessageMS ); - qApp->beep(); + tqApp->beep(); } void TrWindow::prev() diff --git a/tools/linguist/shared/metatranslator.cpp b/tools/linguist/shared/metatranslator.cpp index 5da969d8..3ea91f2c 100644 --- a/tools/linguist/shared/metatranslator.cpp +++ b/tools/linguist/shared/metatranslator.cpp @@ -192,10 +192,10 @@ bool TsHandler::fatalError( const TQXmlParseException& exception ) msg.sprintf( "Parse error at line %d, column %d (%s).", exception.lineNumber(), exception.columnNumber(), exception.message().latin1() ); - if ( qApp == 0 ) + if ( tqApp == 0 ) fprintf( stderr, "XML error: %s\n", msg.latin1() ); else - TQMessageBox::information( qApp->mainWidget(), + TQMessageBox::information( tqApp->mainWidget(), TQObject::tr("TQt Linguist"), msg ); } return FALSE; diff --git a/tools/linguist/tutorial/tt2/mainwindow.cpp b/tools/linguist/tutorial/tt2/mainwindow.cpp index 6a9808de..b2951f6e 100644 --- a/tools/linguist/tutorial/tt2/mainwindow.cpp +++ b/tools/linguist/tutorial/tt2/mainwindow.cpp @@ -19,7 +19,7 @@ MainWindow::MainWindow( TQWidget *parent, const char *name ) setCentralWidget( ap ); TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( tr("E&xit"), qApp, SLOT(quit()), + file->insertItem( tr("E&xit"), tqApp, SLOT(quit()), tr("Ctrl+Q", "Quit") ); menuBar()->insertItem( tr("&File"), file ); menuBar()->setSeparator( TQMenuBar::InWindowsStyle ); diff --git a/tools/linguist/tutorial/tt3/mainwindow.cpp b/tools/linguist/tutorial/tt3/mainwindow.cpp index 86d2e007..efaaac93 100644 --- a/tools/linguist/tutorial/tt3/mainwindow.cpp +++ b/tools/linguist/tutorial/tt3/mainwindow.cpp @@ -22,7 +22,7 @@ MainWindow::MainWindow( TQWidget *parent, const char *name ) setCentralWidget( pp ); TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( tr("E&xit"), qApp, SLOT(quit()), + file->insertItem( tr("E&xit"), tqApp, SLOT(quit()), tr("Ctrl+Q", "Quit") ); TQPopupMenu *help = new TQPopupMenu( this ); help->insertItem( tr("&About"), this, SLOT(about()), Key_F1 ); diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp index 5d9bb185..8abd2162 100644 --- a/tools/makeqpf/main.cpp +++ b/tools/makeqpf/main.cpp @@ -198,7 +198,7 @@ public: TQListViewItem* c = view->firstChild(); while ( c ) { renderAndSave(c); - qApp->processEvents(); + tqApp->processEvents(); c = c->nextSibling(); } } diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index f0b6772f..dcfcfde6 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -306,7 +306,7 @@ Main::Main() file->insertSeparator(); file->insertItem( "&Test all", this, SLOT(testAll()), CTRL+Key_T ); file->insertSeparator(); - file->insertItem( "E&xit", qApp, SLOT(quit()), CTRL+Key_Q ); + file->insertItem( "E&xit", tqApp, SLOT(quit()), CTRL+Key_Q ); menuBar()->insertItem( "&File",file ); diff --git a/tools/qtconfig/colorbutton.cpp b/tools/qtconfig/colorbutton.cpp index 2ed4e238..94804377 100644 --- a/tools/qtconfig/colorbutton.cpp +++ b/tools/qtconfig/colorbutton.cpp @@ -67,7 +67,7 @@ void ColorButton::setColor(const TQColor &c) void ColorButton::changeColor() { - TQColor c = TQColorDialog::getColor(col, qApp->activeWindow()); + TQColor c = TQColorDialog::getColor(col, tqApp->activeWindow()); if (c.isValid()) { setColor(c); diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index bf399bd4..0d3cd74d 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -572,7 +572,7 @@ void MainWindow::fileSave() void MainWindow::fileExit() { - qApp->closeAllWindows(); + tqApp->closeAllWindows(); } @@ -1123,7 +1123,7 @@ void MainWindow::closeEvent(TQCloseEvent *e) tr("Save changes to settings?"), tr("&Yes"), tr("&No"), tr("&Cancel"), 0, 2)) { case 0: // save - qApp->processEvents(); + tqApp->processEvents(); fileSave(); // fall through intended diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp index 76dc9464..8a3c32cc 100644 --- a/tools/qvfb/qanimationwriter.cpp +++ b/tools/qvfb/qanimationwriter.cpp @@ -371,7 +371,7 @@ void TQAnimationWriter::appendFrame(const TQImage& frm, const TQPoint& offset) if ( i == alignx ) { // All the same for (i=0; i<alignx; i++) { - ld[x+i] = qRgba(0,0,0,0); + ld[x+i] = tqRgba(0,0,0,0); } } else { // Some different @@ -385,7 +385,7 @@ void TQAnimationWriter::appendFrame(const TQImage& frm, const TQPoint& offset) if ( li[x] != lp[x] ) ld[x] = 0xff000000 | li[x]; else - ld[x] = qRgba(0,0,0,0); + ld[x] = tqRgba(0,0,0,0); } } } diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp index 5ba0ea87..91f4d705 100644 --- a/tools/qvfb/qvfb.cpp +++ b/tools/qvfb/qvfb.cpp @@ -135,7 +135,7 @@ void TQVFb::createMenu(TQMenuData *menu) file->insertItem( "&Save image...", this, SLOT(saveImage()), ALT+CTRL+Key_S ); file->insertItem( "&Animation...", this, SLOT(toggleAnimation()), ALT+CTRL+Key_A ); file->insertSeparator(); - file->insertItem( "&Quit", qApp, SLOT(quit()) ); + file->insertItem( "&Quit", tqApp, SLOT(quit()) ); menu->insertItem( "&File", file ); diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp index 08566fd9..1532fe36 100644 --- a/tools/qvfb/qvfbview.cpp +++ b/tools/qvfb/qvfbview.cpp @@ -214,7 +214,7 @@ void TQVFbView::setGamma(double gr, double gg, double gb) if ( r > 255 ) r = 255; if ( g > 255 ) g = 255; if ( b > 255 ) b = 255; - gammatable[i] = qRgb(r,g,b); + gammatable[i] = tqRgb(r,g,b); //qDebug("%d: %d,%d,%d",i,r,g,b); } @@ -225,9 +225,9 @@ void TQVFbView::getGamma(int i, TQRgb& rgb) { if ( i > 255 ) i = 255; if ( i < 0 ) i = 0; - rgb = qRgb(qRed(gammatable[i*rmax/255]), - qGreen(gammatable[i*rmax/255]), - qBlue(gammatable[i*rmax/255])); + rgb = tqRgb(tqRed(gammatable[i*rmax/255]), + tqGreen(gammatable[i*rmax/255]), + tqBlue(gammatable[i*rmax/255])); } int TQVFbView::displayId() const @@ -257,7 +257,7 @@ void TQVFbView::setZoom( double z ) setDirty(TQRect(0,0,hdr->width,hdr->height)); resizeContents( int(hdr->width*z), int(hdr->height*z) ); updateGeometry(); - qApp->sendPostedEvents(); + tqApp->sendPostedEvents(); topLevelWidget()->adjustSize(); drawScreen(); } @@ -398,10 +398,10 @@ TQImage TQVFbView::getBuffer( const TQRect &r, int &leading ) const ushort s = *sptr++; #ifdef QT_QWS_REVERSE_BYTE_ENDIANNESS ushort s2 = *sptr++; - *dptr++ = qRgb(qRed(gammatable[(s2>>rsh)&rmax]),qGreen(gammatable[(s2>>gsh)&gmax]),qBlue(gammatable[(s2>>bsh)&bmax])); + *dptr++ = tqRgb(tqRed(gammatable[(s2>>rsh)&rmax]),tqGreen(gammatable[(s2>>gsh)&gmax]),tqBlue(gammatable[(s2>>bsh)&bmax])); #endif - *dptr++ = qRgb(qRed(gammatable[(s>>rsh)&rmax]),qGreen(gammatable[(s>>gsh)&gmax]),qBlue(gammatable[(s>>bsh)&bmax])); - //*dptr++ = qRgb(((s>>rsh)&rmax)*255/rmax,((s>>gsh)&gmax)*255/gmax,((s>>bsh)&bmax)*255/bmax); + *dptr++ = tqRgb(tqRed(gammatable[(s>>rsh)&rmax]),tqGreen(gammatable[(s>>gsh)&gmax]),tqBlue(gammatable[(s>>bsh)&bmax])); + //*dptr++ = tqRgb(((s>>rsh)&rmax)*255/rmax,((s>>gsh)&gmax)*255/gmax,((s>>bsh)&bmax)*255/bmax); } } leading = 0; |