summaryrefslogtreecommitdiffstats
path: root/khelpcenter
diff options
context:
space:
mode:
Diffstat (limited to 'khelpcenter')
-rw-r--r--khelpcenter/DESIGN16
-rw-r--r--khelpcenter/Makefile.am2
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp32
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.h6
-rw-r--r--khelpcenter/mainwindow.cpp4
-rw-r--r--khelpcenter/mainwindow.h2
-rw-r--r--khelpcenter/searchengine.h2
-rw-r--r--khelpcenter/view.cpp18
-rw-r--r--khelpcenter/view.h4
9 files changed, 43 insertions, 43 deletions
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index bd4da5090..8cc769d82 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -220,9 +220,9 @@ regexp' or 'Search case sensitive'.
# being represented by a checkable listview item. So, we just let the user
# enter a term, replace the \{@} placeholder in the URIs specified in the
# selected .desktop files with that term, send out a request via KIO and show
-# the results in our KHTMLPart (after all KHC::View is a KHTMLPart already). A
+# the results in our TDEHTMLPart (after all KHC::View is a TDEHTMLPart already). A
# problem with this: How to display the multiple HTML pages returned by the
-# selected search engines? Using a QSplitter to split multiple KHTMLParts?
+# selected search engines? Using a QSplitter to split multiple TDEHTMLParts?
# Hmm... just wondered... perhaps we can work around that by not showing the
# returned HTML data at all but rather use a XSLT script (that is, one XSLT
# script per web search) which transforms the returned search results into a
@@ -243,8 +243,8 @@ regexp' or 'Search case sensitive'.
# can nicely drop duplicate hits, for example, or create a list of hits in the
# sidebar (much like http://www.copernic.com does). After that, we can use
# another XSLT stylesheet to transform that cleaned XML tree into HTML which
-# we then feed to our KHTMLView. Since we then have one unified output, we don't
-# need to worry about having multiple KHTMLParts, and it's also nice because
+# we then feed to our TDEHTMLView. Since we then have one unified output, we don't
+# need to worry about having multiple TDEHTMLParts, and it's also nice because
# the user doesn't see which search engine returned which hit.
# A problem with this would be that we cannot tell how a particular search
@@ -274,7 +274,7 @@ regexp' or 'Search case sensitive'.
KHC::View
---------
-KHC::View inherits KHTMLPart and does the actual job of showing some sort of
+KHC::View inherits TDEHTMLPart and does the actual job of showing some sort of
document. Most importantly, it has a slot which passes it a KURL pointing to a
document to show. KHC::View will invoke kio_help if necessary (if the URL's
protocol == "help") by itself and otherwise use the plain URL.
@@ -326,7 +326,7 @@ protocol == "help") by itself and otherwise use the plain URL.
## demand.
# My perception is that filling the Navigator's listview takes a significant
-# amount of time, just like setting up the KHTML view (loading the stylesheet,
+# amount of time, just like setting up the TDEHTML view (loading the stylesheet,
# showing the welcome page). We could easily do taht in the background - show
# the mainwindow, then tell the TreeBuilders to start populating (using a
# QTimer with a timeout of 0, for a snappy GUI). Since they're collapsed at
@@ -409,7 +409,7 @@ protocol == "help") by itself and otherwise use the plain URL.
Font Configuration
------------------
-### Many bug reports on KHelpCenter not honouring KHTML font settings,
+### Many bug reports on KHelpCenter not honouring TDEHTML font settings,
### which is odd, because the stylesheet is intentionally loose,
### specifying only "sans-serif" as the font face.
@@ -423,7 +423,7 @@ Font Configuration
### Or, fix whatever is the reason KHC doesn't follow the rules. It could
### be encoding related, the help pages specify utf-8 as the encoding, and
-### previous incarnations of the KHTML settings allowed fonts set on a
+### previous incarnations of the TDEHTML settings allowed fonts set on a
### per-encoding basis (at which time, this was apparently working, the bug
### reports dropped off, and only returned post KDE 3.0
diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am
index dcf2c973d..d00e24365 100644
--- a/khelpcenter/Makefile.am
+++ b/khelpcenter/Makefile.am
@@ -13,7 +13,7 @@ khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
tdeinit_LTLIBRARIES = khelpcenter.la
khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-khelpcenter_la_LIBADD = $(LIB_KHTML)
+khelpcenter_la_LIBADD = $(LIB_TDEHTML)
khelpcenter_la_SOURCES = navigator.cpp \
navigatoritem.cpp navigatorappitem.cpp view.cpp \
searchwidget.cpp searchengine.cpp \
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 7846c3493..e0ef62dd4 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -34,7 +34,7 @@
#include "kcmhtmlsearch.moc"
-KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
+TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
: TDECModule(parent, name), indexProc(0)
{
TQVBoxLayout *vbox = new TQVBoxLayout(this, 5);
@@ -172,7 +172,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
}
-void KHTMLSearchConfig::loadLanguages()
+void TDEHTMLSearchConfig::loadLanguages()
{
// clear the list
language->clear();
@@ -198,26 +198,26 @@ void KHTMLSearchConfig::loadLanguages()
}
-TQString KHTMLSearchConfig::quickHelp() const
+TQString TDEHTMLSearchConfig::quickHelp() const
{
return i18n( "<h1>Help Index</h1> This configuration module lets you configure the ht://dig engine which can be used for fulltext search in the TDE documentation as well as other system documentation like man and info pages." );
}
-void KHTMLSearchConfig::pathSelected(const TQString &)
+void TDEHTMLSearchConfig::pathSelected(const TQString &)
{
checkButtons();
}
-void KHTMLSearchConfig::checkButtons()
+void TDEHTMLSearchConfig::checkButtons()
{
delButton->setEnabled(searchPaths->currentItem() >= 0);
}
-void KHTMLSearchConfig::addClicked()
+void TDEHTMLSearchConfig::addClicked()
{
TQString dir = KFileDialog::getExistingDirectory();
@@ -232,7 +232,7 @@ void KHTMLSearchConfig::addClicked()
}
-void KHTMLSearchConfig::delClicked()
+void TDEHTMLSearchConfig::delClicked()
{
searchPaths->removeItem(searchPaths->currentItem());
checkButtons();
@@ -240,18 +240,18 @@ void KHTMLSearchConfig::delClicked()
}
-KHTMLSearchConfig::~KHTMLSearchConfig()
+TDEHTMLSearchConfig::~TDEHTMLSearchConfig()
{
}
-void KHTMLSearchConfig::configChanged()
+void TDEHTMLSearchConfig::configChanged()
{
emit changed(true);
}
-void KHTMLSearchConfig::load()
+void TDEHTMLSearchConfig::load()
{
TDEConfig *config = new TDEConfig("khelpcenterrc", true);
@@ -279,7 +279,7 @@ void KHTMLSearchConfig::load()
}
-void KHTMLSearchConfig::save()
+void TDEHTMLSearchConfig::save()
{
TDEConfig *config= new TDEConfig("khelpcenterrc", false);
@@ -308,7 +308,7 @@ void KHTMLSearchConfig::save()
}
-void KHTMLSearchConfig::defaults()
+void TDEHTMLSearchConfig::defaults()
{
htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig"));
htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
@@ -326,13 +326,13 @@ void KHTMLSearchConfig::defaults()
}
-void KHTMLSearchConfig::urlClicked(const TQString &url)
+void TDEHTMLSearchConfig::urlClicked(const TQString &url)
{
kapp->invokeBrowser(url);
}
-void KHTMLSearchConfig::generateIndex()
+void TDEHTMLSearchConfig::generateIndex()
{
save();
@@ -354,7 +354,7 @@ void KHTMLSearchConfig::generateIndex()
}
-void KHTMLSearchConfig::indexTerminated(TDEProcess *)
+void TDEHTMLSearchConfig::indexTerminated(TDEProcess *)
{
runButton->setEnabled(true);
}
@@ -365,6 +365,6 @@ extern "C"
KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
{
TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
- return new KHTMLSearchConfig(parent, name);
+ return new TDEHTMLSearchConfig(parent, name);
};
}
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 476807db2..bc4e2fef3 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -33,14 +33,14 @@ class TDEProcess;
class KLanguageCombo;
class KURLRequester;
-class KHTMLSearchConfig : public TDECModule
+class TDEHTMLSearchConfig : public TDECModule
{
Q_OBJECT
public:
- KHTMLSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
- virtual ~KHTMLSearchConfig();
+ TDEHTMLSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
+ virtual ~TDEHTMLSearchConfig();
void load();
void save();
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 2cf00ced7..a3093fabf 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -90,7 +90,7 @@ MainWindow::MainWindow()
{
mSplitter = new TQSplitter( this );
- mDoc = new View( mSplitter, 0, TQT_TQOBJECT(this), 0, KHTMLPart::DefaultGUI, actionCollection() );
+ 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 & ) ),
@@ -135,7 +135,7 @@ MainWindow::MainWindow()
TDEConfigGroupSaver groupSaver( cfg, "General" );
if ( cfg->readBoolEntry( "UseKonqSettings", true ) ) {
TDEConfig konqCfg( "konquerorrc" );
- const_cast<KHTMLSettings *>( mDoc->settings() )->init( &konqCfg );
+ const_cast<TDEHTMLSettings *>( mDoc->settings() )->init( &konqCfg );
}
const int zoomFactor = cfg->readNumEntry( "Font zoom factor", 100 );
mDoc->setZoomFactor( zoomFactor );
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 27085dd49..e0472246a 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -13,7 +13,7 @@
#include "navigator.h"
#include "glossary.h"
-class KHTMLPart;
+class TDEHTMLPart;
class TQSplitter;
class LogDialog;
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index 2863b904f..ac31a9e0a 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -13,7 +13,7 @@
class TQWidget;
class TDEProcess;
class TDEConfig;
-class KHTMLPart;
+class TDEHTMLPart;
namespace KHC {
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index bfe430eaf..8cdf52cca 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -21,8 +21,8 @@
using namespace KHC;
View::View( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col )
- : KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
+ TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, KActionCollection *col )
+ : TDEHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
{
setJScriptEnabled(false);
setJavaEnabled(false);
@@ -73,21 +73,21 @@ bool View::openURL( const KURL &url )
return true;
}
mState = Docu;
- return KHTMLPart::openURL( url );
+ return TDEHTMLPart::openURL( url );
}
void View::saveState( TQDataStream &stream )
{
stream << mState;
if ( mState == Docu )
- KHTMLPart::saveState( stream );
+ TDEHTMLPart::saveState( stream );
}
void View::restoreState( TQDataStream &stream )
{
stream >> mState;
if ( mState == Docu )
- KHTMLPart::restoreState( stream );
+ TDEHTMLPart::restoreState( stream );
else if ( mState == About )
showAboutPage();
}
@@ -327,13 +327,13 @@ bool View::eventFilter( TQObject *o, TQEvent *e )
{
if ( e->type() != TQEvent::KeyPress ||
htmlDocument().links().length() == 0 )
- return KHTMLPart::eventFilter( o, e );
+ return TDEHTMLPart::eventFilter( o, e );
TQKeyEvent *ke = TQT_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" ) )
- return KHTMLPart::eventFilter( o, e );
+ return TDEHTMLPart::eventFilter( o, e );
const TQScrollBar * const scrollBar = view()->verticalScrollBar();
if ( scrollBar->value() == scrollBar->minValue() ) {
@@ -347,7 +347,7 @@ bool View::eventFilter( TQObject *o, TQEvent *e )
return true;
}
}
- return KHTMLPart::eventFilter( o, e );
+ return TDEHTMLPart::eventFilter( o, e );
}
KURL View::urlFromLinkNode( const DOM::Node &n ) const
@@ -374,7 +374,7 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const
void View::slotReload( const KURL &url )
{
- const_cast<KHTMLSettings *>( settings() )->init( kapp->config() );
+ const_cast<TDEHTMLSettings *>( settings() )->init( kapp->config() );
KParts::URLArgs args = browserExtension()->urlArgs();
args.reload = true;
browserExtension()->setURLArgs( args );
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 7d7c1001b..8e5099917 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -16,12 +16,12 @@ namespace KHC {
class Formatter;
-class View : public KHTMLPart
+class View : public TDEHTMLPart
{
Q_OBJECT
public:
View( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name, KHTMLPart::GUIProfile prof,
+ TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof,
KActionCollection *col );
~View();