From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- akregator/src/pageviewer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'akregator/src/pageviewer.cpp') diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index d7238d90..4baef48c 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -99,7 +99,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) : Viewer(parent, name), d(new PageViewerPrivate) { // this hack is necessary since the part looks for []HTML Settings] in - // KGlobal::config() by default, which is wrong when running in Kontact + // TDEGlobal::config() by default, which is wrong when running in Kontact KHTMLSettings* s = const_cast (settings()); s->init(Settings::self()->config()); @@ -260,7 +260,7 @@ bool PageViewer::openURL(const KURL& url) TQString favicon = FeedIconManager::self()->iconLocation(url); if (!favicon.isEmpty()) - emit setTabIcon(TQPixmap(KGlobal::dirs()->findResource("cache", favicon+".png"))); + emit setTabIcon(TQPixmap(TDEGlobal::dirs()->findResource("cache", favicon+".png"))); else emit setTabIcon(SmallIcon("html")); @@ -398,7 +398,7 @@ void PageViewer::slotPaletteOrFontChanged() obj->tqt_invoke(id, o); // this hack is necessary since the part looks for []HTML Settings] in - // KGlobal::config() by default, which is wrong when running in Kontact + // 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 (settings()); s->init(Settings::self()->config()); -- cgit v1.2.3