From 01c60a267846a8712bca34218ecf7da57566c049 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 31 Jan 2013 13:26:45 -0600
Subject: Rename KStandard for enhanced compatibility with KDE4

---
 konqueror/sidebar/sidebar_widget.cpp         | 8 ++++----
 konqueror/sidebar/trees/konq_sidebartree.cpp | 2 +-
 konqueror/sidebar/trees/konqsidebar_tree.cpp | 2 +-
 konqueror/sidebar/web_module/web_module.cpp  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'konqueror/sidebar')

diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 44b3cca35..8dc49bb5c 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -67,7 +67,7 @@ void addBackEnd::aboutToShowAddMenu()
 {
 	if (!menu)
 		return;
-	KStandardDirs *dirs = TDEGlobal::dirs();
+	TDEStandardDirs *dirs = TDEGlobal::dirs();
 	TQStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
 	libNames.setAutoDelete(true);
 	libNames.resize(0);
@@ -122,7 +122,7 @@ void addBackEnd::doRollBack()
 {
 	if (KMessageBox::warningContinueCancel(m_parent, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"))==KMessageBox::Continue)
 	{
-		KStandardDirs *dirs = TDEGlobal::dirs();
+		TDEStandardDirs *dirs = TDEGlobal::dirs();
 		TQString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);
 		TQDir dir(loc);
 		TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
@@ -139,7 +139,7 @@ void addBackEnd::doRollBack()
 
 static TQString findFileName(const TQString* tmpl,bool universal, const TQString &profile) {
 	TQString myFile, filename;
-	KStandardDirs *dirs = TDEGlobal::dirs();
+	TDEStandardDirs *dirs = TDEGlobal::dirs();
 	TQString tmp = *tmpl;
 
 	if (universal) {
@@ -331,7 +331,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 	//	<< " [" << name << "]" << endl;
 
 	// Look for existing ones with this URL
-	KStandardDirs *dirs = TDEGlobal::dirs();
+	TDEStandardDirs *dirs = TDEGlobal::dirs();
 	TQString list;
 	dirs->saveLocation("data", m_relPath, true);
 	list = locateLocal("data", m_relPath);
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index b53ce2635..af7177b2e 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -87,7 +87,7 @@ void KonqSidebarTree::loadModuleFactories()
 {
   pluginFactories.clear();
   pluginInfo.clear();
-  KStandardDirs *dirs=TDEGlobal::dirs();
+  TDEStandardDirs *dirs=TDEGlobal::dirs();
   TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
 
 
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 1cdf54da0..900d25e03 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -134,7 +134,7 @@ extern "C"
 {
    KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
    {
-	  KStandardDirs *dirs=TDEGlobal::dirs();
+	  TDEStandardDirs *dirs=TDEGlobal::dirs();
 	  TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
 	  TQStringList names;
 	  for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index f0705ae3a..da5a5c9bb 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -191,7 +191,7 @@ extern "C" {
 extern "C" {
 	KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
 		Q_UNUSED(param);
-		TDEGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
+		TDEGlobal::dirs()->addResourceType("websidebardata", TDEStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
 		KURL url;
 		url.setProtocol("file");
 		TQStringList paths = TDEGlobal::dirs()->resourceDirs("websidebardata");
-- 
cgit v1.2.1