summaryrefslogtreecommitdiffstats
path: root/akregator/src
diff options
context:
space:
mode:
Diffstat (limited to 'akregator/src')
-rw-r--r--akregator/src/Makefile.am4
-rw-r--r--akregator/src/mainwindow.cpp2
-rw-r--r--akregator/src/pageviewer.cpp8
-rw-r--r--akregator/src/tabwidget.cpp4
-rw-r--r--akregator/src/viewer.cpp6
-rw-r--r--akregator/src/viewer.h2
6 files changed, 13 insertions, 13 deletions
diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am
index e212b260..f88d0eab 100644
--- a/akregator/src/Makefile.am
+++ b/akregator/src/Makefile.am
@@ -78,7 +78,7 @@ libakregatorprivate_la_SOURCES = akregatorconfig.kcfgc \
libakregatorprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
libakregatorprivate_la_LIBADD = $(top_builddir)/libtdepim/libtdepim.la \
- $(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
+ $(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_TDEHTML)
#########################################################################
# KPART SECTION
@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
kspeech.stub
libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
-libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 293d60ad..065d0248 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -237,7 +237,7 @@ bool MainWindow::queryExit()
kdDebug() << "MainWindow::queryExit()" << endl;
if ( !kapp->sessionSaving() )
{
- delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like KHTMLPageCache
+ delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like TDEHTMLPageCache
m_part = 0;
}
else
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 19523722..63d944c6 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -100,7 +100,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
{
// this hack is necessary since the part looks for []HTML Settings] in
// TDEGlobal::config() by default, which is wrong when running in Kontact
- KHTMLSettings* s = const_cast<KHTMLSettings*> (settings());
+ TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings());
s->init(Settings::self()->config());
setXMLFile(locate("data", "akregator/pageviewer.rc"), true);
@@ -251,7 +251,7 @@ bool PageViewer::openURL(const KURL& url)
updateHistoryEntry(); // update old history entry before switching to the new one
emit started(0);
- bool val = KHTMLPart::openURL(url);
+ bool val = TDEHTMLPart::openURL(url);
addHistoryEntry(url); // add new URL to history
@@ -358,7 +358,7 @@ void PageViewer::urlSelected(const TQString &url, int button, int state, const T
{
if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) )
{
- KHTMLPart::urlSelected(url,button,state,_target,args);
+ TDEHTMLPart::urlSelected(url,button,state,_target,args);
}
else
{
@@ -400,7 +400,7 @@ void PageViewer::slotPaletteOrFontChanged()
// this hack is necessary since the part looks for []HTML Settings] in
// TDEGlobal::config() by default, which is wrong when running in Kontact
// NOTE: when running in Kontact, immediate updating doesn't work
- KHTMLSettings* s = const_cast<KHTMLSettings*> (settings());
+ TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings());
s->init(Settings::self()->config());
}
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 6e7527d2..492e440a 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -262,7 +262,7 @@ void TabWidget::slotDetachTab()
return;
KURL url;
- KHTMLView* view = dynamic_cast<KHTMLView*>(d->currentItem);
+ TDEHTMLView* view = dynamic_cast<TDEHTMLView*>(d->currentItem);
if (!view)
return;
@@ -281,7 +281,7 @@ void TabWidget::slotCopyLinkAddress()
return;
KURL url;
- KHTMLView* view = dynamic_cast<KHTMLView*>(d->currentItem);
+ TDEHTMLView* view = dynamic_cast<TDEHTMLView*>(d->currentItem);
if (!view)
return;
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 74f2ca2a..20cf5924 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -48,7 +48,7 @@
namespace Akregator {
Viewer::Viewer(TQWidget *parent, const char *name)
- : KHTMLPart(parent, name), m_url(0)
+ : TDEHTMLPart(parent, name), m_url(0)
{
setZoomFactor(100);
setMetaRefreshEnabled(true);
@@ -89,7 +89,7 @@ bool Viewer::closeURL()
{
emit browserExtension()->loadingProgress(-1);
emit canceled(TQString());
- return KHTMLPart::closeURL();
+ return TDEHTMLPart::closeURL();
}
int Viewer::pointsToPixel(int pointSize) const
@@ -162,7 +162,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
}
return;
}
- KHTMLPart::urlSelected(url,button,state,_target,args);
+ TDEHTMLPart::urlSelected(url,button,state,_target,args);
}
void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags kpf, mode_t)
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index d1d407f9..af89fee2 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -36,7 +36,7 @@ namespace TDEIO
namespace Akregator
{
- class Viewer : public KHTMLPart
+ class Viewer : public TDEHTMLPart
{
Q_OBJECT