Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

3 files changed, 8 insertions, 8 deletions

diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index ec7af3e..d5b3e6a 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -71,7 +71,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
     if (view)
         m_part = view->part();
      
-    KGlobal::locale()->insertCatalogue("akregator_konqplugin");
+    TDEGlobal::locale()->insertCatalogue("akregator_konqplugin");
     m_feedMimeTypes << "text/rss" << "text/rdf" << "text/xml";
     // Get the list of URLs clicked on from Konqi.
     //KFileItemList m_list = popupmenu->fileItemList();
@@ -97,7 +97,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
 
 AkregatorMenu::~AkregatorMenu()
 {
-    KGlobal::locale()->removeCatalogue("akregator_konqplugin");
+    TDEGlobal::locale()->removeCatalogue("akregator_konqplugin");
     delete m_conf;
 }
 
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index 9350bb4..a81d1a1 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -58,7 +58,7 @@ K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon,
 KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &)
     : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0)
 {
-    KGlobal::locale()->insertCatalogue("akregator_konqplugin");
+    TDEGlobal::locale()->insertCatalogue("akregator_konqplugin");
 
     m_part = dynamic_cast<KHTMLPart*>(parent);
     if(!m_part) { kdDebug() << "couldn't get part" << endl; return; }
@@ -77,7 +77,7 @@ void KonqFeedIcon::waitPartToLoad()
 
 KonqFeedIcon::~KonqFeedIcon()
 {
-    KGlobal::locale()->removeCatalogue("akregator_konqplugin");
+    TDEGlobal::locale()->removeCatalogue("akregator_konqplugin");
     m_statusBarEx = KParts::StatusBarExtension::childObject(m_part);
     if (m_statusBarEx)
     {
@@ -205,14 +205,14 @@ void KonqFeedIcon::addFeeds()
     }
     else {
         kdDebug() << "KonqFeedIcon::addFeeds(): use command line" << endl;
-        KProcess *proc = new KProcess;
+        TDEProcess *proc = new TDEProcess;
         *proc << "akregator" << "-g" << i18n("Imported Feeds");
 
         for ( FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it ) {
             *proc << "-a" << fixRelativeURL((*it).url(), m_part->baseURL());
         }
 
-        proc->start(KProcess::DontCare);
+        proc->start(TDEProcess::DontCare);
         delete proc;
 
     }
diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp
index c0ade83..eb590eb 100644
--- a/konq-plugins/akregator/pluginbase.cpp
+++ b/konq-plugins/akregator/pluginbase.cpp
@@ -62,10 +62,10 @@ void PluginBase::addFeedsViaDCOP(const TQStringList& urls)
 
 void PluginBase::addFeedViaCmdLine(TQString url)
 {
-    KProcess *proc = new KProcess;
+    TDEProcess *proc = new TDEProcess;
     *proc << "akregator" << "-g" << i18n("Imported Feeds");
     *proc << "-a" << url;
-    proc->start(KProcess::DontCare);
+    proc->start(TDEProcess::DontCare);
     delete proc;
 }