From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 konqueror/sidebar/trees/history_module/history_item.cpp     | 2 +-
 konqueror/sidebar/trees/history_module/history_module.cpp   | 8 ++++----
 konqueror/sidebar/trees/history_module/history_module.h     | 2 +-
 konqueror/sidebar/trees/history_module/history_settings.cpp | 2 +-
 konqueror/sidebar/trees/history_module/kcmhistory.cpp       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'konqueror/sidebar/trees/history_module')

diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 0d31551f9..44389702e 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -119,7 +119,7 @@ TQString KonqSidebarHistoryItem::toolTipText() const
         // .arg() calls. So to fix this, we first substitute the last items
         // and then put in the url.
 	TQString tip = i18n("<qt><center><b>%4</b></center><hr>Last visited: %1<br>First visited: %2<br>Number of times visited: %3</qt>");
-	return tip.arg( KGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( KGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() );
+	return tip.arg( TDEGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( TDEGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() );
     }
 
     return m_entry->url.url();
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a7fd943ca..71c1b5a44 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -56,7 +56,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
     m_dict.setAutoDelete( true );
     m_currentTime = TQDateTime::currentDateTime();
 
-    KConfig *kc = KGlobal::config();
+    KConfig *kc = TDEGlobal::config();
     KConfigGroupSaver cs( kc, "HistorySettings" );
     m_sortsByName = kc->readEntry( "SortHistory", "byDate" ) == "byName";
 
@@ -111,7 +111,7 @@ KonqSidebarHistoryModule::~KonqSidebarHistoryModule()
 	++it;
     }
 
-    KConfig *kc = KGlobal::config();
+    KConfig *kc = TDEGlobal::config();
     KConfigGroupSaver cs( kc, "HistorySettings" );
     kc->writeEntry("OpenGroups", openGroups);
     kc->sync();
@@ -143,7 +143,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
 	++it;
     }
 
-    KConfig *kc = KGlobal::config();
+    KConfig *kc = TDEGlobal::config();
     KConfigGroupSaver cs( kc, "HistorySettings" );
     TQStringList openGroups = kc->readListEntry("OpenGroups");
     TQStringList::Iterator it2 = openGroups.begin();
@@ -297,7 +297,7 @@ void KonqSidebarHistoryModule::sortingChanged()
 {
     m_topLevelItem->sort();
 
-    KConfig *kc = KGlobal::config();
+    KConfig *kc = TDEGlobal::config();
     KConfigGroupSaver cs( kc, "HistorySettings" );
     kc->writeEntry( "SortHistory", m_sortsByName ? "byName" : "byDate" );
     kc->sync();
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index 752ff57fd..cbba40262 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -61,7 +61,7 @@ public:
     bool sortsByName() const { return m_sortsByName; }
 
     static TQString groupForURL( const KURL& url ) {
-	static const TQString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
+	static const TQString& misc = TDEGlobal::staticQString(i18n("Miscellaneous"));
 	return url.host().isEmpty() ? misc : url.host();
     }
 
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 6871415a0..3e8c8a5de 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -46,7 +46,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
     TQString oldgroup;
 
     if (global) {
-      config = KGlobal::config();
+      config = TDEGlobal::config();
       oldgroup= config->group();
     }
     else
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 532e3a164..a1ef792d6 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") )
 HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & )
     : KCModule (KCMHistoryFactory::instance(), parent, name)
 {
-    KGlobal::locale()->insertCatalogue("konqueror");
+    TDEGlobal::locale()->insertCatalogue("konqueror");
 
     m_settings = new KonqSidebarHistorySettings( 0, "history settings" );
     m_settings->readSettings( false );
-- 
cgit v1.2.1