diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konqueror/sidebar/web_module | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/web_module')
-rw-r--r-- | konqueror/sidebar/web_module/web_module.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index 3697c443f..a337c65c6 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -191,10 +191,10 @@ extern "C" { extern "C" { KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) { Q_UNUSED(param); - KGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar"); + TDEGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar"); KURL url; url.setProtocol("file"); - TQStringList paths = KGlobal::dirs()->resourceDirs("websidebardata"); + TQStringList paths = TDEGlobal::dirs()->resourceDirs("websidebardata"); for (TQStringList::Iterator i = paths.begin(); i != paths.end(); ++i) { if (TQFileInfo(*i + "websidebar.html").exists()) { url.setPath(*i + "websidebar.html"); |