diff options
Diffstat (limited to 'khelpcenter')
-rw-r--r-- | khelpcenter/glossary.cpp | 12 | ||||
-rw-r--r-- | khelpcenter/history.cpp | 28 | ||||
-rw-r--r-- | khelpcenter/htmlsearch/htmlsearch.cpp | 20 | ||||
-rw-r--r-- | khelpcenter/htmlsearch/kcmhtmlsearch.cpp | 30 | ||||
-rw-r--r-- | khelpcenter/htmlsearch/ktagcombobox.cpp | 16 | ||||
-rw-r--r-- | khelpcenter/htmlsearchconfig.cpp | 16 | ||||
-rw-r--r-- | khelpcenter/kcmhelpcenter.cpp | 32 | ||||
-rw-r--r-- | khelpcenter/khc_indexbuilder.cpp | 14 | ||||
-rw-r--r-- | khelpcenter/mainwindow.cpp | 80 | ||||
-rw-r--r-- | khelpcenter/navigator.cpp | 46 | ||||
-rw-r--r-- | khelpcenter/scrollkeepertreebuilder.cpp | 2 | ||||
-rw-r--r-- | khelpcenter/searchengine.cpp | 28 | ||||
-rw-r--r-- | khelpcenter/searchhandler.cpp | 20 | ||||
-rw-r--r-- | khelpcenter/searchwidget.cpp | 14 | ||||
-rw-r--r-- | khelpcenter/toc.cpp | 4 | ||||
-rw-r--r-- | khelpcenter/view.cpp | 10 |
16 files changed, 186 insertions, 186 deletions
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index 093fcb8d4..8675466a6 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -73,10 +73,10 @@ Glossary::Glossary( TQWidget *parent ) : TDEListView( parent ) { m_initialized = false; - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( treeItemSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( treeItemSelected( TQListViewItem * ) ) ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); addColumn( TQString::null ); @@ -147,8 +147,8 @@ void Glossary::rebuildGlossaryCache() mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) ); TDEProcess *meinproc = new TDEProcess; - connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( meinprocExited( TDEProcess * ) ) ); + connect( meinproc, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( meinprocExited( TDEProcess * ) ) ); *meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) ); *meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile; diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index 429fa48a0..69e6521ae 100644 --- a/khelpcenter/history.cpp +++ b/khelpcenter/history.cpp @@ -56,20 +56,20 @@ void History::setupActions( TDEActionCollection *coll ) TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward(); m_backAction = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left, - this, TQT_SLOT( back() ), coll, "back" ); - connect( m_backAction->popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_SLOT( backActivated( int ) ) ); - connect( m_backAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( fillBackMenu() ) ); + this, TQ_SLOT( back() ), coll, "back" ); + connect( m_backAction->popupMenu(), TQ_SIGNAL( activated( int ) ), + TQ_SLOT( backActivated( int ) ) ); + connect( m_backAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( fillBackMenu() ) ); m_backAction->setEnabled( false ); m_forwardAction = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right, - this, TQT_SLOT( forward() ), coll, + this, TQ_SLOT( forward() ), coll, "forward" ); - connect( m_forwardAction->popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_SLOT( forwardActivated( int ) ) ); - connect( m_forwardAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( fillForwardMenu() ) ); + connect( m_forwardAction->popupMenu(), TQ_SIGNAL( activated( int ) ), + TQ_SLOT( forwardActivated( int ) ) ); + connect( m_forwardAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( fillForwardMenu() ) ); m_forwardAction->setEnabled( false ); } @@ -78,9 +78,9 @@ void History::installMenuBarHook( TDEMainWindow *mainWindow ) TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( "go_web", mainWindow ) ); if ( goMenu ) { - connect( goMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( fillGoMenu() ) ); - connect( goMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( goMenuActivated( int ) ) ); + connect( goMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( fillGoMenu() ) ); + connect( goMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( goMenuActivated( int ) ) ); m_goMenuIndex = goMenu->count(); } } @@ -178,7 +178,7 @@ void History::goHistoryActivated( int steps ) if ( m_goBuffer ) return; m_goBuffer = steps; - TQTimer::singleShot( 0, this, TQT_SLOT( goHistoryDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( goHistoryDelayed() ) ); } void History::goHistoryDelayed() diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index 5fd0f4640..ee8cb5bd4 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) kdDebug() << "Running htdig" << endl; - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htdigStdout(TDEProcess *,char*,int))); - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htdigExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htdigExited(TDEProcess *))); _htdigRunning = true; @@ -340,8 +340,8 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) kdDebug() << "Running htmerge" << endl; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htmergeExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htmergeExited(TDEProcess *))); _htmergeRunning = true; @@ -444,10 +444,10 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int kdDebug() << "Running htsearch" << endl; - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int))); - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htsearchExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htsearchExited(TDEProcess *))); _htsearchRunning = true; _searchResult = ""; diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 3db9c9895..cd4e56021 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -60,8 +60,8 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) url->setText(i18n("ht://dig home page")); url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); - connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(urlClicked(const TQString&))); + connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(urlClicked(const TQString&))); gb = new TQGroupBox(i18n("Program Locations"), this); @@ -74,7 +74,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htdigBin ); grid->addWidget(l, 1,0); grid->addWidget(htdigBin, 1,1); - connect(htdigBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htdigBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); TQString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" ); TQWhatsThis::add( htdigBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -84,7 +84,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htsearchBin ); grid->addWidget(l, 2,0); grid->addWidget(htsearchBin, 2,1); - connect(htsearchBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htsearchBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); wtstr = i18n( "Enter the path to your htsearch program here, e.g. /usr/local/bin/htsearch" ); TQWhatsThis::add( htsearchBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -94,7 +94,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htmergeBin ); grid->addWidget(l, 3,0); grid->addWidget(htmergeBin, 3,1); - connect(htmergeBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htmergeBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); wtstr = i18n( "Enter the path to your htmerge program here, e.g. /usr/local/bin/htmerge" ); TQWhatsThis::add( htmergeBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -110,17 +110,17 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) indexKDE = new TQCheckBox(i18n("&TDE help"), gb); vvbox->addWidget(indexKDE); - connect(indexKDE, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexKDE, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); indexMan = new TQCheckBox(i18n("&Man pages"), gb); vvbox->addWidget(indexMan); indexMan->setEnabled(false), - connect(indexMan, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexMan, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); indexInfo = new TQCheckBox(i18n("&Info pages"), gb); vvbox->addWidget(indexInfo); indexInfo->setEnabled(false); - connect(indexInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexInfo, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); gb = new TQGroupBox(i18n("Additional Search Paths"), this); hbox->addWidget(gb); @@ -159,12 +159,12 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) ); runButton->setFixedSize(runButton->sizeHint()); vbox->addWidget(runButton, AlignRight); - connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex())); + connect(runButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateIndex())); - connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked())); - connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delClicked())); - connect(searchPaths, TQT_SIGNAL(highlighted(const TQString &)), - this, TQT_SLOT(pathSelected(const TQString &))); + connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked())); + connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delClicked())); + connect(searchPaths, TQ_SIGNAL(highlighted(const TQString &)), + this, TQ_SLOT(pathSelected(const TQString &))); checkButtons(); @@ -345,8 +345,8 @@ void TDEHTMLSearchConfig::generateIndex() indexProc = new TDEProcess; *indexProc << exe << "--lang" << language->currentTag(); - connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(indexTerminated(TDEProcess *))); + connect(indexProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(indexTerminated(TDEProcess *))); runButton->setEnabled(false); diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp index b3c70915c..be9975d7a 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.cpp +++ b/khelpcenter/htmlsearch/ktagcombobox.cpp @@ -98,10 +98,10 @@ void KTagComboBox::clear() delete old_popup; old_popup = popup; popup = new TQPopupMenu(this); - connect( popup, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( popup, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( popup, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } int KTagComboBox::count() const @@ -176,10 +176,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons checkInsertPos(pi, text, index); pi->insertItem(text, p, count(), index); tags->append(tag); - connect( p, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( p, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::paintEvent( TQPaintEvent * ev) diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index 230a7eb69..d7af38c07 100644 --- a/khelpcenter/htmlsearchconfig.cpp +++ b/khelpcenter/htmlsearchconfig.cpp @@ -61,8 +61,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) url->setText(i18n("ht://dig home page")); url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); - connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(urlClicked(const TQString&))); + connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(urlClicked(const TQString&))); gb = new TQGroupBox(i18n("Program Locations"), this); @@ -75,8 +75,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) l->setBuddy( mHtsearchUrl ); grid->addWidget(l, 1,0); grid->addWidget(mHtsearchUrl, 1,1); - connect( mHtsearchUrl->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mHtsearchUrl->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); TQString wtstr = i18n( "Enter the URL of the htsearch CGI program." ); TQWhatsThis::add( mHtsearchUrl, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -86,8 +86,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) l->setBuddy( mIndexerBin ); grid->addWidget(l, 2,0); grid->addWidget(mIndexerBin, 2,1); - connect( mIndexerBin->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mIndexerBin->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); wtstr = i18n( "Enter the path to your htdig indexer program here." ); TQWhatsThis::add( mIndexerBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -98,8 +98,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) l->setBuddy( mDbDir ); grid->addWidget(l, 3,0); grid->addWidget(mDbDir, 3,1); - connect( mDbDir->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mDbDir->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); wtstr = i18n( "Enter the path to the htdig database folder." ); TQWhatsThis::add( mDbDir, wtstr ); TQWhatsThis::add( l, wtstr ); diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index bb3c69db6..e5b2d0937 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -73,7 +73,7 @@ IndexDirDialog::IndexDirDialog( TQWidget *parent ) urlLayout->addWidget( mIndexUrlRequester ); mIndexUrlRequester->setURL( Prefs::indexDirectory() ); - connect(mIndexUrlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotUrlChanged( const TQString &))); + connect(mIndexUrlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotUrlChanged( const TQString &))); slotUrlChanged( mIndexUrlRequester->lineEdit()->text() ); } @@ -120,13 +120,13 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent ) buttonLayout->addStretch( 1 ); mDetailsButton = new TQPushButton( this ); - connect( mDetailsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleDetails() ) ); + connect( mDetailsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( toggleDetails() ) ); buttonLayout->addWidget( mDetailsButton ); hideDetails(); mEndButton = new TQPushButton( this ); - connect( mEndButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEnd() ) ); + connect( mEndButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEnd() ) ); buttonLayout->addWidget( mEndButton ); setFinished( false ); @@ -279,8 +279,8 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent ) mListView->addColumn( i18n("Status") ); mListView->setColumnAlignment( 1, AlignCenter ); topLayout->addWidget( mListView ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( checkSelection() ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( checkSelection() ) ); TQBoxLayout *urlLayout = new TQHBoxLayout( topLayout ); @@ -291,7 +291,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent ) urlLayout->addWidget( mIndexDirLabel, 1 ); TQPushButton *button = new TQPushButton( i18n("Change..."), parent ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showIndexDirDialog() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showIndexDirDialog() ) ); urlLayout->addWidget( button ); TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); @@ -446,10 +446,10 @@ bool KCMHelpCenter::buildIndex() if ( !mProgressDialog ) { mProgressDialog = new IndexProgressDialog( this ); - connect( mProgressDialog, TQT_SIGNAL( cancelled() ), - TQT_SLOT( cancelBuildIndex() ) ); - connect( mProgressDialog, TQT_SIGNAL( closed() ), - TQT_SLOT( slotProgressClosed() ) ); + connect( mProgressDialog, TQ_SIGNAL( cancelled() ), + TQ_SLOT( cancelBuildIndex() ) ); + connect( mProgressDialog, TQ_SIGNAL( closed() ), + TQ_SLOT( slotProgressClosed() ) ); } mProgressDialog->setLabelText( name ); mProgressDialog->setTotalSteps( mIndexQueue.count() ); @@ -476,12 +476,12 @@ void KCMHelpCenter::startIndexProcess() *mProcess << mCmdFile->name(); *mProcess << Prefs::indexDirectory(); - connect( mProcess, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( slotIndexFinished( TDEProcess * ) ) ); - connect( mProcess, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) ); - connect( mProcess, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( mProcess, TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( slotIndexFinished( TDEProcess * ) ) ); + connect( mProcess, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + TQ_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) ); + connect( mProcess, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdError() << "KCMHelpcenter::startIndexProcess(): Failed to start process." diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 6fac581c2..dd0ee5811 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -91,12 +91,12 @@ void IndexBuilder::processCmdQueue() *proc << args; - connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); - connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ), - TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) ); - connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ), - TQT_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ), + TQ_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ), + TQ_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) ); mCmdQueue.remove( it ); @@ -211,7 +211,7 @@ int main( int argc, char **argv ) IndexBuilder builder(cmdFile); - TQTimer::singleShot(0, &builder, TQT_SLOT(buildIndices())); + TQTimer::singleShot(0, &builder, TQ_SLOT(buildIndices())); return app.exec(); } diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index 3579b1afe..0bfc80118 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -91,36 +91,36 @@ MainWindow::MainWindow() mSplitter = new TQSplitter( this ); mDoc = new View( mSplitter, 0, this, 0, TDEHTMLPart::DefaultGUI, actionCollection() ); - connect( mDoc, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - TQT_SLOT( setCaption( const TQString & ) ) ); - connect( mDoc, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - TQT_SLOT( statusBarMessage( const TQString & ) ) ); - connect( mDoc, TQT_SIGNAL( onURL( const TQString & ) ), - TQT_SLOT( statusBarMessage( const TQString & ) ) ); - connect( mDoc, TQT_SIGNAL( started( TDEIO::Job * ) ), - TQT_SLOT( slotStarted( TDEIO::Job * ) ) ); - connect( mDoc, TQT_SIGNAL( completed() ), - TQT_SLOT( documentCompleted() ) ); - connect( mDoc, TQT_SIGNAL( searchResultCacheAvailable() ), - TQT_SLOT( enableLastSearchAction() ) ); - - connect( mDoc, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( enableCopyTextAction() ) ); + connect( mDoc, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + TQ_SLOT( setCaption( const TQString & ) ) ); + connect( mDoc, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + TQ_SLOT( statusBarMessage( const TQString & ) ) ); + connect( mDoc, TQ_SIGNAL( onURL( const TQString & ) ), + TQ_SLOT( statusBarMessage( const TQString & ) ) ); + connect( mDoc, TQ_SIGNAL( started( TDEIO::Job * ) ), + TQ_SLOT( slotStarted( TDEIO::Job * ) ) ); + connect( mDoc, TQ_SIGNAL( completed() ), + TQ_SLOT( documentCompleted() ) ); + connect( mDoc, TQ_SIGNAL( searchResultCacheAvailable() ), + TQ_SLOT( enableLastSearchAction() ) ); + + connect( mDoc, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( enableCopyTextAction() ) ); statusBar()->insertItem(i18n("Preparing Index"), 0, 1); statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter); connect( mDoc->browserExtension(), - TQT_SIGNAL( openURLRequest( const KURL &, + TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - TQT_SLOT( slotOpenURLRequest( const KURL &, + TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); mNavigator = new Navigator( mDoc, mSplitter, "nav" ); - connect( mNavigator, TQT_SIGNAL( itemSelected( const TQString & ) ), - TQT_SLOT( viewUrl( const TQString & ) ) ); - connect( mNavigator, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ), - TQT_SLOT( slotGlossSelected( const GlossaryEntry & ) ) ); + connect( mNavigator, TQ_SIGNAL( itemSelected( const TQString & ) ), + TQ_SLOT( viewUrl( const TQString & ) ) ); + connect( mNavigator, TQ_SIGNAL( glossSelected( const GlossaryEntry & ) ), + TQ_SLOT( slotGlossSelected( const GlossaryEntry & ) ) ); mSplitter->moveToFirst(mNavigator); mSplitter->setResizeMode(mNavigator, TQSplitter::KeepSize); @@ -150,10 +150,10 @@ MainWindow::MainWindow() History::self().installMenuBarHook( this ); - connect( &History::self(), TQT_SIGNAL( goInternalUrl( const KURL & ) ), - mNavigator, TQT_SLOT( openInternalUrl( const KURL & ) ) ); - connect( &History::self(), TQT_SIGNAL( goUrl( const KURL & ) ), - mNavigator, TQT_SLOT( selectItem( const KURL & ) ) ); + connect( &History::self(), TQ_SIGNAL( goInternalUrl( const KURL & ) ), + mNavigator, TQ_SLOT( openInternalUrl( const KURL & ) ) ); + connect( &History::self(), TQ_SIGNAL( goUrl( const KURL & ) ), + mNavigator, TQ_SLOT( selectItem( const KURL & ) ) ); statusBarMessage(i18n("Ready")); enableCopyTextAction(); @@ -208,48 +208,48 @@ void MainWindow::writeConfig() void MainWindow::setupActions() { - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - KStdAction::print( this, TQT_SLOT( print() ), actionCollection(), + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); + KStdAction::print( this, TQ_SLOT( print() ), actionCollection(), "printFrame" ); - TDEAction *prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ), + TDEAction *prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQ_SLOT( prevPage() ), actionCollection(), "prevPage" ); prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) ); - TDEAction *nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ), + TDEAction *nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQ_SLOT( nextPage() ), actionCollection(), "nextPage" ); nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) ); - TDEAction *home = KStdAction::home( this, TQT_SLOT( slotShowHome() ), actionCollection() ); + TDEAction *home = KStdAction::home( this, TQ_SLOT( slotShowHome() ), actionCollection() ); home->setText(i18n("Table of &Contents")); home->setToolTip(i18n("Table of contents")); home->setWhatsThis(i18n("Go back to the table of contents")); - mCopyText = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text"); + mCopyText = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), actionCollection(), "copy_text"); mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, this, - TQT_SLOT( slotLastSearch() ), + TQ_SLOT( slotLastSearch() ), actionCollection(), "lastsearch" ); mLastSearchAction->setEnabled( false ); new TDEAction( i18n("Build Search Index..."), 0, mNavigator, - TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" ); - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), + TQ_SLOT( showIndexDialog() ), actionCollection(), "build_index" ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "Debug" ); if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) { new TDEAction( i18n("Show Search Error Log"), 0, this, - TQT_SLOT( showSearchStderr() ), actionCollection(), + TQ_SLOT( showSearchStderr() ), actionCollection(), "show_search_stderr" ); } History::self().setupActions( actionCollection() ); - new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), this, TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); - new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), this, TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); - new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), this, TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); + new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), this, TQ_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); + new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), this, TQ_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); + new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), this, TQ_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); } void MainWindow::slotCopySelectedText() @@ -265,8 +265,8 @@ void MainWindow::print() void MainWindow::slotStarted(TDEIO::Job *job) { if (job) - connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)), - TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)), + TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); History::self().updateActions(); } diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 4cb3b2f00..8b10688cd 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -85,8 +85,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name ) mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false); mSearchEngine = new SearchEngine( view ); - connect( mSearchEngine, TQT_SIGNAL( searchFinished() ), - TQT_SLOT( slotSearchFinished() ) ); + connect( mSearchEngine, TQ_SIGNAL( searchFinished() ), + TQ_SLOT( slotSearchFinished() ) ); DocMetaInfo::self()->scanMetaInfo(); @@ -103,18 +103,18 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name ) clearButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") ); searchLayout->addWidget( clearButton ); - connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( clearSearch() ) ); TQToolTip::add( clearButton, i18n("Clear search") ); mSearchEdit = new TQLineEdit( mSearchFrame ); searchLayout->addWidget( mSearchEdit ); - connect( mSearchEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotSearch() ) ); - connect( mSearchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( checkSearchButton() ) ); + connect( mSearchEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotSearch() ) ); + connect( mSearchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( checkSearchButton() ) ); mSearchButton = new TQPushButton( i18n("&Search"), mSearchFrame ); searchLayout->addWidget( mSearchButton ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSearch() ) ); clearButton->setFixedHeight( mSearchButton->height() ); @@ -134,8 +134,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name ) mSearchWidget->readConfig( TDEGlobal::config() ); } - connect( mTabWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), - TQT_SLOT( slotTabChanged( TQWidget * ) ) ); + connect( mTabWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), + TQ_SLOT( slotTabChanged( TQWidget * ) ) ); } Navigator::~Navigator() @@ -168,22 +168,22 @@ void Navigator::setupContentsTab() mContentsTree->setRootIsDecorated(false); mContentsTree->setSorting(-1, false); - connect(mContentsTree, TQT_SIGNAL(clicked(TQListViewItem*)), - TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(mContentsTree, TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(mContentsTree, TQ_SIGNAL(clicked(TQListViewItem*)), + TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(mContentsTree, TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotItemSelected(TQListViewItem*))); mTabWidget->addTab(mContentsTree, i18n("&Contents")); } void Navigator::setupSearchTab() { mSearchWidget = new SearchWidget( mSearchEngine, mTabWidget ); - connect( mSearchWidget, TQT_SIGNAL( searchResult( const TQString & ) ), - TQT_SLOT( slotShowSearchResult( const TQString & ) ) ); - connect( mSearchWidget, TQT_SIGNAL( scopeCountChanged( int ) ), - TQT_SLOT( checkSearchButton() ) ); - connect( mSearchWidget, TQT_SIGNAL( showIndexDialog() ), - TQT_SLOT( showIndexDialog() ) ); + connect( mSearchWidget, TQ_SIGNAL( searchResult( const TQString & ) ), + TQ_SLOT( slotShowSearchResult( const TQString & ) ) ); + connect( mSearchWidget, TQ_SIGNAL( scopeCountChanged( int ) ), + TQ_SLOT( checkSearchButton() ) ); + connect( mSearchWidget, TQ_SIGNAL( showIndexDialog() ), + TQ_SLOT( showIndexDialog() ) ); mTabWidget->addTab( mSearchWidget, i18n("Search Options")); } @@ -191,8 +191,8 @@ void Navigator::setupSearchTab() void Navigator::setupGlossaryTab() { mGlossaryTree = new Glossary( mTabWidget ); - connect( mGlossaryTree, TQT_SIGNAL( entrySelected( const GlossaryEntry & ) ), - this, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ) ); + connect( mGlossaryTree, TQ_SIGNAL( entrySelected( const GlossaryEntry & ) ), + this, TQ_SIGNAL( glossSelected( const GlossaryEntry & ) ) ); mTabWidget->addTab( mGlossaryTree, i18n( "G&lossary" ) ); } @@ -643,8 +643,8 @@ void Navigator::showIndexDialog() { if ( !mIndexDialog ) { mIndexDialog = new KCMHelpCenter( mSearchEngine, this ); - connect( mIndexDialog, TQT_SIGNAL( searchIndexUpdated() ), mSearchWidget, - TQT_SLOT( updateScopeList() ) ); + connect( mIndexDialog, TQ_SIGNAL( searchIndexUpdated() ), mSearchWidget, + TQ_SLOT( updateScopeList() ) ); } mIndexDialog->show(); mIndexDialog->raise(); diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index c16da7d50..7d54f0f63 100644 --- a/khelpcenter/scrollkeepertreebuilder.cpp +++ b/khelpcenter/scrollkeepertreebuilder.cpp @@ -61,7 +61,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent, KProcIO proc; proc << "scrollkeeper-get-content-list"; proc << lang; - connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *))); + connect(&proc,TQ_SIGNAL(readReady(KProcIO *)),TQ_SLOT(getContentsList(KProcIO *))); if (!proc.start(TDEProcess::Block)) { kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl; return 0; diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp index 07aa81535..6dde748a9 100644 --- a/khelpcenter/searchengine.cpp +++ b/khelpcenter/searchengine.cpp @@ -97,10 +97,10 @@ void SearchTraverser::connectHandler( SearchHandler *handler ) int count = 0; if ( it != mConnectCount.end() ) count = *it; if ( count == 0 ) { - connect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ), - TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) ); - connect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ), - TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) ); + connect( handler, TQ_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ), + TQ_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) ); + connect( handler, TQ_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ), + TQ_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) ); } mConnectCount[ handler ] = ++count; } @@ -116,10 +116,10 @@ void SearchTraverser::disconnectHandler( SearchHandler *handler ) int count = *it; --count; if ( count == 0 ) { - disconnect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ), - this, TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) ); - disconnect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ), - this, TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) ); + disconnect( handler, TQ_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ), + this, TQ_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) ); + disconnect( handler, TQ_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ), + this, TQ_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) ); } mConnectCount[ handler ] = count; } @@ -352,12 +352,12 @@ bool SearchEngine::search( TQString words, TQString method, int matches, *mProc << arg.utf8(); } - connect( mProc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) ); - connect( mProc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) ); - connect( mProc, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( searchExited( TDEProcess * ) ) ); + connect( mProc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + TQ_SLOT( searchStdout( TDEProcess *, char *, int ) ) ); + connect( mProc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + TQ_SLOT( searchStderr( TDEProcess *, char *, int ) ) ); + connect( mProc, TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( searchExited( TDEProcess * ) ) ); mSearchRunning = true; mSearchResult = ""; diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp index 54a0a9a38..a2eab853d 100644 --- a/khelpcenter/searchhandler.cpp +++ b/khelpcenter/searchhandler.cpp @@ -114,12 +114,12 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words, *proc << arg.utf8(); } - connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) ); - connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) ); - connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( searchExited( TDEProcess * ) ) ); + connect( proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + TQ_SLOT( searchStdout( TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + TQ_SLOT( searchStderr( TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( searchExited( TDEProcess * ) ) ); SearchJob *searchJob = new SearchJob; searchJob->mEntry = entry; @@ -139,10 +139,10 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words, kdDebug() << "SearchHandler::search() URL: " << urlString << endl; TDEIO::TransferJob *job = TDEIO::get( KURL( urlString ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); SearchJob *searchJob = new SearchJob; searchJob->mEntry = entry; diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp index c4ceb20be..176db92c7 100644 --- a/khelpcenter/searchwidget.cpp +++ b/khelpcenter/searchwidget.cpp @@ -81,8 +81,8 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent ) for (int i=0; i < ScopeNum; ++i ) { mScopeCombo->insertItem( scopeSelectionLabel( i ) ); } - connect( mScopeCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( scopeSelectionChanged( int ) ) ); + connect( mScopeCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( scopeSelectionChanged( int ) ) ); l = new TQLabel( mScopeCombo, i18n("&Scope selection:"), this ); @@ -96,16 +96,16 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent ) TQPushButton *indexButton = new TQPushButton( i18n("Build Search &Index..."), this ); - connect( indexButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( showIndexDialog() ) ); + connect( indexButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( showIndexDialog() ) ); topLayout->addWidget( indexButton ); // FIXME: Use SearchHandler on double-clicked document #if 0 - connect( mScopeListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( scopeDoubleClicked( TQListViewItem * ) ) ); + connect( mScopeListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( scopeDoubleClicked( TQListViewItem * ) ) ); #endif - connect( mScopeListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( scopeClicked( TQListViewItem * ) ) ); + connect( mScopeListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( scopeClicked( TQListViewItem * ) ) ); } diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index 83083da9f..e1aaf10aa 100644 --- a/khelpcenter/toc.cpp +++ b/khelpcenter/toc.cpp @@ -133,8 +133,8 @@ int TOC::cachedCTime() const void TOC::buildCache() { TDEProcess *meinproc = new TDEProcess; - connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( meinprocExited( TDEProcess * ) ) ); + connect( meinproc, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( meinprocExited( TDEProcess * ) ) ); *meinproc << locate( "exe", "meinproc" ); *meinproc << "--stylesheet" << locate( "data", "khelpcenter/table-of-contents.xslt" ); diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index f7e5940fb..49135e0b0 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -35,10 +35,10 @@ View::View( TQWidget *parentWidget, const char *widgetName, m_zoomStepping = 10; - connect( this, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setTitle( const TQString & ) ) ); - connect( this, TQT_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ), - this, TQT_SLOT( showMenu( const TQString &, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setTitle( const TQString & ) ) ); + connect( this, TQ_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ), + this, TQ_SLOT( showMenu( const TQString &, const TQPoint& ) ) ); TQString css = langLookup("common/tde-default.css"); if (!css.isEmpty()) @@ -267,7 +267,7 @@ void View::showMenu( const TQString& url, const TQPoint& pos) } else { - pop->insertItem(i18n("Copy Link Address"), this, TQT_SLOT(slotCopyLink())); + pop->insertItem(i18n("Copy Link Address"), this, TQ_SLOT(slotCopyLink())); mCopyURL = completeURL(url).url(); } |