summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-27 02:13:42 -0600
committerTimothy Pearson <[email protected]>2012-02-27 02:13:42 -0600
commit520c05ef06ce203ad32470730f68402bc7719157 (patch)
tree8d0bb18bbbecb4c837e232848905e5819db84b81 /tools/assistant
parentb82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff)
downloadtqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz
tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip
Automated update from qt3
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/config.cpp12
-rw-r--r--tools/assistant/helpdialogimpl.cpp6
-rw-r--r--tools/assistant/index.cpp4
-rw-r--r--tools/assistant/mainwindow.ui.h16
4 files changed, 19 insertions, 19 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp
index e47e38bdc..ad7e7edda 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 c447c4cb4..adf39f2fe 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 4ce081deb..24372feed 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 d257c7cf9..d9847b8df 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();
}
}