diff options
Diffstat (limited to 'khelpcenter')
65 files changed, 235 insertions, 297 deletions
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN index 68d762a53..f2e11d0cf 100644 --- a/khelpcenter/DESIGN +++ b/khelpcenter/DESIGN @@ -384,7 +384,7 @@ protocol == "help") by itself and otherwise use the plain URL. ## mode. # Hmm yes, that should be possible. Take the toplevel widget, use -# QObject::children() and iterate over all children, use QToolTip::textFor() to +# TQObject::children() and iterate over all children, use QToolTip::textFor() to # check whether the given qwidget has a tooltip and if so, use QToolTip::tip() # to show the tooltip. # One could probably add a standard dcop call to TDEMainWindow, like @@ -429,5 +429,3 @@ Font Configuration # FWIW I added a simple font configuration facility a while back, which should # IMHO be sufficient for the vast majority of users. - -// vim:tw=78 diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index 631818dfa..cb9f17abb 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -86,5 +86,3 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) return app.exec(); } - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/application.h b/khelpcenter/application.h index 642f4dfda..b908e2b09 100644 --- a/khelpcenter/application.h +++ b/khelpcenter/application.h @@ -42,4 +42,3 @@ class Application : public KUniqueApplication extern "C" { int kdemain(int argc, char **argv); } #endif // APPLICATION_H -// vim:ts=2:sw=2:et diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp index 220ed0f93..eba2fda2d 100644 --- a/khelpcenter/docentry.cpp +++ b/khelpcenter/docentry.cpp @@ -345,4 +345,3 @@ void DocEntry::dump() const kdDebug() << " <documenttype>" << mDocumentType << "</documenttype>" << endl; kdDebug() << " </docentry>" << endl; } -// vim:ts=2:sw=2:et diff --git a/khelpcenter/docentry.h b/khelpcenter/docentry.h index d86cde9d2..bca2b1d74 100644 --- a/khelpcenter/docentry.h +++ b/khelpcenter/docentry.h @@ -114,4 +114,3 @@ class DocEntry } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/docentrytraverser.cpp b/khelpcenter/docentrytraverser.cpp index d6335d232..f89d1cf8f 100644 --- a/khelpcenter/docentrytraverser.cpp +++ b/khelpcenter/docentrytraverser.cpp @@ -46,4 +46,3 @@ DocEntry *DocEntryTraverser::parentEntry() { return mParentEntry; } -// vim:ts=2:sw=2:et diff --git a/khelpcenter/docentrytraverser.h b/khelpcenter/docentrytraverser.h index d8c8cb15e..84ec7d21b 100644 --- a/khelpcenter/docentrytraverser.h +++ b/khelpcenter/docentrytraverser.h @@ -41,4 +41,3 @@ class DocEntryTraverser } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp index 8e254d909..e56062a07 100644 --- a/khelpcenter/docmetainfo.cpp +++ b/khelpcenter/docmetainfo.cpp @@ -284,4 +284,3 @@ void DocMetaInfo::endTraverseEntries( DocEntryTraverser *traverser ) traverser->finishTraversal(); } -// vim:ts=2:sw=2:et diff --git a/khelpcenter/docmetainfo.h b/khelpcenter/docmetainfo.h index 9b6871fa7..657dad27b 100644 --- a/khelpcenter/docmetainfo.h +++ b/khelpcenter/docmetainfo.h @@ -77,4 +77,3 @@ class DocMetaInfo } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index 1f0cc8f68..7acac556d 100644 --- a/khelpcenter/fontdialog.cpp +++ b/khelpcenter/fontdialog.cpp @@ -209,4 +209,3 @@ void FontDialog::save() } #include "fontdialog.moc" -// vim:ts=4:sw=4:noet diff --git a/khelpcenter/fontdialog.h b/khelpcenter/fontdialog.h index ef06f2b84..c95004540 100644 --- a/khelpcenter/fontdialog.h +++ b/khelpcenter/fontdialog.h @@ -33,7 +33,7 @@ namespace KHC { class FontDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FontDialog( TQWidget *parent, const char *name = 0 ); @@ -63,4 +63,3 @@ class FontDialog : public KDialogBase } #endif // FONTDIALOG_H -// vim:ts=4:sw=4:noet diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp index 21e2abb27..c42aaaece 100644 --- a/khelpcenter/formatter.cpp +++ b/khelpcenter/formatter.cpp @@ -218,5 +218,3 @@ TQString Formatter::title( const TQString &title ) { return "<h2>" + title + "</h2>"; } - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/formatter.h b/khelpcenter/formatter.h index 9710a0dca..126215584 100644 --- a/khelpcenter/formatter.h +++ b/khelpcenter/formatter.h @@ -51,5 +51,3 @@ class Formatter } #endif - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index 5a2170256..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; @@ -319,4 +319,3 @@ void Glossary::slotSelectGlossEntry( const TQString &id ) } #include "glossary.moc" -// vim:ts=4:sw=4:et diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h index 616c51b86..d9893abbf 100644 --- a/khelpcenter/glossary.h +++ b/khelpcenter/glossary.h @@ -99,7 +99,7 @@ inline TQDataStream &operator>>( TQDataStream &stream, GlossaryEntry &e ) class Glossary : public TDEListView { - Q_OBJECT + TQ_OBJECT public: Glossary( TQWidget *parent ); virtual ~Glossary(); @@ -143,4 +143,3 @@ class Glossary : public TDEListView } #endif // KHC_GLOSSARY_H -// vim:ts=2:sw=2:et diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index 0f0085a02..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() @@ -348,4 +348,3 @@ bool History::canGoForward() const } #include "history.moc" -// vim:ts=2:sw=2:et diff --git a/khelpcenter/history.h b/khelpcenter/history.h index c7c4c9532..21f41fa09 100644 --- a/khelpcenter/history.h +++ b/khelpcenter/history.h @@ -36,7 +36,7 @@ class View; class History : public TQObject { - Q_OBJECT + TQ_OBJECT public: friend class foo; // to make gcc shut up struct Entry @@ -104,4 +104,3 @@ class History : public TQObject } #endif // HISTORY_H -// vim:ts=2:sw=2:et diff --git a/khelpcenter/htmlsearch.cpp b/khelpcenter/htmlsearch.cpp index 72eaa432d..0598ae896 100644 --- a/khelpcenter/htmlsearch.cpp +++ b/khelpcenter/htmlsearch.cpp @@ -57,5 +57,3 @@ TQString HTMLSearch::defaultIndexTestFile( KHC::DocEntry *entry ) { return entry->identifier() + ".exists"; } - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/htmlsearch.h b/khelpcenter/htmlsearch.h index 1ca97488f..355e8932f 100644 --- a/khelpcenter/htmlsearch.h +++ b/khelpcenter/htmlsearch.h @@ -10,9 +10,9 @@ namespace KHC { class DocEntry; -class HTMLSearch : public QObject +class HTMLSearch : public TQObject { - Q_OBJECT + TQ_OBJECT public: HTMLSearch(); ~HTMLSearch(); @@ -30,4 +30,3 @@ class HTMLSearch : public QObject } #endif -// vim:ts=2:sw=2:et 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/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h index 37d9bf39f..e0c533f81 100644 --- a/khelpcenter/htmlsearch/htmlsearch.h +++ b/khelpcenter/htmlsearch/htmlsearch.h @@ -16,9 +16,9 @@ class TDEProcess; class ProgressDialog; -class HTMLSearch : public QObject +class HTMLSearch : public TQObject { - Q_OBJECT + TQ_OBJECT public: 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/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h index 28445437a..72ae1c396 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.h +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h @@ -35,7 +35,7 @@ class KURLRequester; class TDEHTMLSearchConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/khelpcenter/htmlsearch/klangcombo.h b/khelpcenter/htmlsearch/klangcombo.h index 4ca6e2f3b..7b07fee03 100644 --- a/khelpcenter/htmlsearch/klangcombo.h +++ b/khelpcenter/htmlsearch/klangcombo.h @@ -34,7 +34,7 @@ */ class KLanguageCombo : public KTagComboBox { - Q_OBJECT + TQ_OBJECT public: KLanguageCombo(TQWidget *parent=0, const char *name=0); 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/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h index df58120ce..c28336f21 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.h +++ b/khelpcenter/htmlsearch/ktagcombobox.h @@ -37,7 +37,7 @@ class TQPopupMenu; */ class KTagComboBox : public QComboBox { - Q_OBJECT + TQ_OBJECT public: KTagComboBox(TQWidget *parent=0, const char *name=0); diff --git a/khelpcenter/htmlsearch/progressdialog.h b/khelpcenter/htmlsearch/progressdialog.h index 9ab5660d9..f39a0d83e 100644 --- a/khelpcenter/htmlsearch/progressdialog.h +++ b/khelpcenter/htmlsearch/progressdialog.h @@ -12,7 +12,7 @@ class KProgress; class ProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index a9eef3b41..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 ); @@ -148,4 +148,3 @@ void HtmlSearchConfig::urlClicked(const TQString &url) } } // End namespace KHC -// vim:ts=2:sw=2:et diff --git a/khelpcenter/htmlsearchconfig.h b/khelpcenter/htmlsearchconfig.h index 7f5742b1e..7cb5fc00a 100644 --- a/khelpcenter/htmlsearchconfig.h +++ b/khelpcenter/htmlsearchconfig.h @@ -30,7 +30,7 @@ namespace KHC { class HtmlSearchConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: HtmlSearchConfig(TQWidget *parent = 0L, const char *name = 0L); virtual ~HtmlSearchConfig(); @@ -55,4 +55,3 @@ class HtmlSearchConfig : public TQWidget } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp index c0c5a9d9e..2c71d2bbe 100644 --- a/khelpcenter/infotree.cpp +++ b/khelpcenter/infotree.cpp @@ -181,4 +181,3 @@ void InfoTree::parseInfoDirFile( const TQString &infoDirFileName ) } #include "infotree.moc" -// vim:ts=2:sw=2:et diff --git a/khelpcenter/infotree.h b/khelpcenter/infotree.h index ab1911818..e4fc4fd44 100644 --- a/khelpcenter/infotree.h +++ b/khelpcenter/infotree.h @@ -29,7 +29,7 @@ namespace KHC class NavigatorItem; class InfoTree : public TreeBuilder { - Q_OBJECT + TQ_OBJECT public: InfoTree( TQObject *parent, const char *name = 0 ); @@ -45,4 +45,3 @@ namespace KHC } #endif // KHC_INFOTREE_H -// vim:ts=2:sw=2:et diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index df8f1b36e..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." @@ -683,5 +683,3 @@ void KCMHelpCenter::findWriteableIndexDir() Prefs::setIndexDirectory( TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/") ); } #include "kcmhelpcenter.moc" - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h index 0212a22c5..0a28f5f98 100644 --- a/khelpcenter/kcmhelpcenter.h +++ b/khelpcenter/kcmhelpcenter.h @@ -47,7 +47,7 @@ class SearchEngine; class IndexDirDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: IndexDirDialog( TQWidget *parent ); @@ -60,7 +60,7 @@ class IndexDirDialog : public KDialogBase class IndexProgressDialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: IndexProgressDialog( TQWidget *parent ); ~IndexProgressDialog(); @@ -105,7 +105,7 @@ class KCMHelpCenterIface : virtual public DCOPObject class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface { - Q_OBJECT + TQ_OBJECT public: KCMHelpCenter( KHC::SearchEngine *, TQWidget *parent = 0, const char *name = 0 ); @@ -182,4 +182,3 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface }; #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 9c605687b..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,11 +211,9 @@ 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(); } #include "khc_indexbuilder.moc" - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h index 5eb849419..8cbaf6b00 100644 --- a/khelpcenter/khc_indexbuilder.h +++ b/khelpcenter/khc_indexbuilder.h @@ -30,9 +30,9 @@ class TDEProcess; namespace KHC { -class IndexBuilder : public QObject +class IndexBuilder : public TQObject { - Q_OBJECT + TQ_OBJECT public: IndexBuilder(const TQString& cmdFile); @@ -57,5 +57,3 @@ class IndexBuilder : public QObject } #endif - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index c2246232a..0bfc80118 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -90,37 +90,37 @@ MainWindow::MainWindow() { mSplitter = new TQSplitter( this ); - mDoc = new View( mSplitter, 0, TQT_TQOBJECT(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() ) ); + mDoc = new View( mSplitter, 0, this, 0, TDEHTMLPart::DefaultGUI, actionCollection() ); + 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( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - KStdAction::print( TQT_TQOBJECT(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( TQT_TQOBJECT(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( TQT_TQOBJECT(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, TQT_TQOBJECT(this), - TQT_SLOT( slotLastSearch() ), + mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, this, + TQ_SLOT( slotLastSearch() ), actionCollection(), "lastsearch" ); mLastSearchAction->setEnabled( false ); - new TDEAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator), - TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" ); - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), + new TDEAction( i18n("Build Search Index..."), 0, mNavigator, + 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, TQT_TQOBJECT(this), - TQT_SLOT( showSearchStderr() ), actionCollection(), + new TDEAction( i18n("Show Search Error Log"), 0, this, + TQ_SLOT( showSearchStderr() ), actionCollection(), "show_search_stderr" ); } History::self().setupActions( actionCollection() ); - new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); - new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); - new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), TQT_TQOBJECT(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(); } @@ -463,5 +463,3 @@ void MainWindow::slotConfigureFonts() } #include "mainwindow.moc" - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h index 795b6e13c..22b07cdca 100644 --- a/khelpcenter/mainwindow.h +++ b/khelpcenter/mainwindow.h @@ -24,7 +24,7 @@ class View; class MainWindow : public TDEMainWindow, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: MainWindow(); @@ -105,4 +105,3 @@ private: } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 9590ea54d..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( QWidget * ) ), - TQT_SLOT( slotTabChanged( QWidget * ) ) ); + 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" ) ); } @@ -294,14 +294,14 @@ void Navigator::createItemFromDesktopFile( NavigatorItem *topItem, void Navigator::insertInfoDocs( NavigatorItem *topItem ) { - InfoTree *infoTree = new InfoTree( TQT_TQOBJECT(this) ); + InfoTree *infoTree = new InfoTree( this ); infoTree->build( topItem ); } NavigatorItem *Navigator::insertScrollKeeperDocs( NavigatorItem *topItem, NavigatorItem *after ) { - ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( TQT_TQOBJECT(this) ); + ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( this ); return builder->build( topItem, after ); } @@ -556,7 +556,7 @@ void Navigator::slotSearch() // disable search Button during searches mSearchButton->setEnabled(false); - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); if ( !mSearchEngine->search( words, method, pages, scope ) ) { slotSearchFinished(); @@ -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(); @@ -678,5 +678,3 @@ void Navigator::clearSearch() } #include "navigator.moc" - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h index f91de4327..798f71101 100644 --- a/khelpcenter/navigator.h +++ b/khelpcenter/navigator.h @@ -54,7 +54,7 @@ class Formatter; class Navigator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Navigator(View *, TQWidget *parent=0, const char *name=0); virtual ~Navigator(); @@ -150,4 +150,3 @@ class Navigator : public TQWidget } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/navigatorappitem.cpp b/khelpcenter/navigatorappitem.cpp index 42f98e09d..b4992ea3d 100644 --- a/khelpcenter/navigatorappitem.cpp +++ b/khelpcenter/navigatorappitem.cpp @@ -172,5 +172,3 @@ TQString NavigatorAppItem::documentationURL( KService *s ) return TQString( "help:/" ) + docPath; } - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/navigatorappitem.h b/khelpcenter/navigatorappitem.h index c89e1de77..e751251b4 100644 --- a/khelpcenter/navigatorappitem.h +++ b/khelpcenter/navigatorappitem.h @@ -56,4 +56,3 @@ class NavigatorAppItem : public NavigatorItem } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/navigatoritem.cpp b/khelpcenter/navigatoritem.cpp index ad464bacb..45760f0bc 100644 --- a/khelpcenter/navigatoritem.cpp +++ b/khelpcenter/navigatoritem.cpp @@ -106,5 +106,3 @@ TQString NavigatorItem::key( int column, bool ascending ) const { return text( column ).lower(); } - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/navigatoritem.h b/khelpcenter/navigatoritem.h index 7808b9cda..4c0f8fedd 100644 --- a/khelpcenter/navigatoritem.h +++ b/khelpcenter/navigatoritem.h @@ -66,5 +66,3 @@ class NavigatorItem : public TQListViewItem } #endif - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/plugins/CMakeLists.txt b/khelpcenter/plugins/CMakeLists.txt index 54b806127..da976193a 100644 --- a/khelpcenter/plugins/CMakeLists.txt +++ b/khelpcenter/plugins/CMakeLists.txt @@ -18,7 +18,8 @@ tde_create_translated_desktop( applets.desktop contact.desktop faq.desktop info.desktop links.desktop support.desktop userguide.desktop welcome.desktop hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop - tdeioslaves.desktop quickstart.desktop visualdict.desktop adminguide.desktop + tdeioslaves.desktop quickstart.desktop releasenotes.desktop + visualdict.desktop adminguide.desktop DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins PO_DIR khelpcenter-desktops ) diff --git a/khelpcenter/plugins/Makefile.am b/khelpcenter/plugins/Makefile.am index f9c4f477a..979be4a92 100644 --- a/khelpcenter/plugins/Makefile.am +++ b/khelpcenter/plugins/Makefile.am @@ -4,6 +4,7 @@ SUBDIRS = Applications Manpages plugin_DATA = applets.desktop contact.desktop faq.desktop info.desktop \ links.desktop support.desktop userguide.desktop welcome.desktop \ kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop \ - tdeioslaves.desktop quickstart.desktop visualdict.desktop adminguide.desktop + tdeioslaves.desktop quickstart.desktop releasenotes.desktop \ + visualdict.desktop adminguide.desktop plugindir = $(kde_datadir)/khelpcenter/plugins diff --git a/khelpcenter/plugins/releasenotes.desktop b/khelpcenter/plugins/releasenotes.desktop new file mode 100644 index 000000000..e834fad6c --- /dev/null +++ b/khelpcenter/plugins/releasenotes.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +X-DocPath=help:/khelpcenter/releasenotes +X-DOC-Weight=-1800 +Icon=kmenu + +Name=TDE Release Notes diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp index ca33664df..80c2e33cb 100644 --- a/khelpcenter/plugintraverser.cpp +++ b/khelpcenter/plugintraverser.cpp @@ -112,5 +112,3 @@ DocEntryTraverser *PluginTraverser::createChild( DocEntry * /*entry*/ ) kdDebug( 1400 ) << "ERROR! mCurrentItem is not set." << endl; return 0; } - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/plugintraverser.h b/khelpcenter/plugintraverser.h index 93b48003c..697b8a44d 100644 --- a/khelpcenter/plugintraverser.h +++ b/khelpcenter/plugintraverser.h @@ -49,4 +49,3 @@ namespace KHC { } #endif // KHC_PLUGINTRAVERSER_H -// vim:ts=2:sw=2:et diff --git a/khelpcenter/scopeitem.h b/khelpcenter/scopeitem.h index cabbab76e..873ee5a76 100644 --- a/khelpcenter/scopeitem.h +++ b/khelpcenter/scopeitem.h @@ -47,4 +47,3 @@ class ScopeItem : public TQCheckListItem } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index f96ab3f5d..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; @@ -197,4 +197,3 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent, } #include "scrollkeepertreebuilder.moc" -// vim:sw=2:ts=2:et diff --git a/khelpcenter/scrollkeepertreebuilder.h b/khelpcenter/scrollkeepertreebuilder.h index 2761a10bf..cca8a2c22 100644 --- a/khelpcenter/scrollkeepertreebuilder.h +++ b/khelpcenter/scrollkeepertreebuilder.h @@ -33,7 +33,7 @@ namespace KHC { class ScrollKeeperTreeBuilder : public TQObject { - Q_OBJECT + TQ_OBJECT public: ScrollKeeperTreeBuilder( TQObject *parent, const char *name = 0 ); @@ -56,4 +56,3 @@ class ScrollKeeperTreeBuilder : public TQObject } #endif // KHC_SCROLLKEEPERTREEBUILDER_H -// vim:ts=2:sw=2:et diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp index 56b6e635c..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 = ""; @@ -498,5 +498,3 @@ bool SearchEngine::needsIndex( DocEntry *entry ) } #include "searchengine.moc" - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h index ac31a9e0a..268954618 100644 --- a/khelpcenter/searchengine.h +++ b/khelpcenter/searchengine.h @@ -24,7 +24,7 @@ class SearchHandler; class SearchTraverser : public TQObject, public DocEntryTraverser { - Q_OBJECT + TQ_OBJECT public: SearchTraverser( SearchEngine *engine, int level ); ~SearchTraverser(); @@ -66,7 +66,7 @@ class SearchTraverser : public TQObject, public DocEntryTraverser class SearchEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Operation { And, Or }; @@ -148,4 +148,3 @@ class SearchEngine : public TQObject } #endif -// vim:ts=2:sw=2:et 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/searchhandler.h b/khelpcenter/searchhandler.h index 31c3adb1f..b580d0ebb 100644 --- a/khelpcenter/searchhandler.h +++ b/khelpcenter/searchhandler.h @@ -47,9 +47,9 @@ class SearchJob TQString mError; }; -class SearchHandler : public QObject +class SearchHandler : public TQObject { - Q_OBJECT + TQ_OBJECT public: static SearchHandler *initFromFile( const TQString &filename ); diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp index 5040a7d81..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 * ) ) ); } @@ -388,5 +388,3 @@ int SearchWidget::scopeCount() const } #include "searchwidget.moc" - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/searchwidget.h b/khelpcenter/searchwidget.h index 14801223b..d6cd68729 100644 --- a/khelpcenter/searchwidget.h +++ b/khelpcenter/searchwidget.h @@ -44,7 +44,7 @@ class SearchEngine; class SearchWidget : public TQWidget, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: @@ -104,4 +104,3 @@ class SearchWidget : public TQWidget, public DCOPObject } #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp index 2f77ff766..260ea77d0 100644 --- a/khelpcenter/testmetainfo.cpp +++ b/khelpcenter/testmetainfo.cpp @@ -116,4 +116,3 @@ int main(int argc,char **argv) DocMetaInfo::self()->startTraverseEntries( &a ); kdDebug() << "Async TRAVERSE end" << endl; } -// vim:ts=2:sw=2:et diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index abd8019fe..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" ); @@ -268,4 +268,3 @@ TQString TOCSectionItem::url() } #include "toc.moc" -// vim:ts=2:sw=2:et diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h index 0a38c2ad5..dba0921fc 100644 --- a/khelpcenter/toc.h +++ b/khelpcenter/toc.h @@ -30,9 +30,9 @@ class TDEProcess; namespace KHC { -class TOC : public QObject +class TOC : public TQObject { - Q_OBJECT + TQ_OBJECT public: TOC( NavigatorItem *parentItem ); @@ -69,4 +69,3 @@ class TOC : public QObject } #endif // KHC_TOC_H -// vim:ts=2:sw=2:et diff --git a/khelpcenter/treebuilder.cpp b/khelpcenter/treebuilder.cpp index b8a0096d9..5463652d9 100644 --- a/khelpcenter/treebuilder.cpp +++ b/khelpcenter/treebuilder.cpp @@ -31,5 +31,3 @@ void TreeBuilder::selectURL( const TQString & ) } #include "treebuilder.moc" - -// vim:ts=2:sw=2:et diff --git a/khelpcenter/treebuilder.h b/khelpcenter/treebuilder.h index 443444691..2e788e317 100644 --- a/khelpcenter/treebuilder.h +++ b/khelpcenter/treebuilder.h @@ -30,7 +30,7 @@ namespace KHC class NavigatorItem; class TreeBuilder : public TQObject { - Q_OBJECT + TQ_OBJECT public: TreeBuilder( TQObject *parent, const char *name = 0 ); @@ -46,4 +46,3 @@ class TreeBuilder : public TQObject } #endif // TREEBUILDER_H -// vim:ts=2:sw=2:et diff --git a/khelpcenter/version.h b/khelpcenter/version.h index b8623dbf6..f9dd26a8c 100644 --- a/khelpcenter/version.h +++ b/khelpcenter/version.h @@ -4,4 +4,3 @@ #define HELPCENTER_VERSION TDE_VERSION_STRING #endif -// vim:ts=2:sw=2:et diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index cf6f90f66..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(); } @@ -329,7 +329,7 @@ bool View::eventFilter( TQObject *o, TQEvent *e ) htmlDocument().links().length() == 0 ) return TDEHTMLPart::eventFilter( o, e ); - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast<TQKeyEvent*>( e ); if ( ke->state() & TQt::ShiftButton && ke->key() == Key_Space ) { // If we're on the first page, it does not make sense to go back. if ( baseURL().path().endsWith( "/index.html" ) ) @@ -385,4 +385,3 @@ void View::slotReload( const KURL &url ) } #include "view.moc" -// vim:ts=2:sw=2:et diff --git a/khelpcenter/view.h b/khelpcenter/view.h index 2ad17af6b..04b5af5e5 100644 --- a/khelpcenter/view.h +++ b/khelpcenter/view.h @@ -18,7 +18,7 @@ class Formatter; class View : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: View( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, @@ -90,5 +90,3 @@ class View : public TDEHTMLPart } #endif - -// vim:ts=2:sw=2:et |