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

3 files changed, 10 insertions, 10 deletions

diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc
index 44b8b496c..ab1cc398a 100644
--- a/kio/bookmarks/kbookmark.cc
+++ b/kio/bookmarks/kbookmark.cc
@@ -89,9 +89,9 @@ KBookmark KBookmarkGroup::next( const KBookmark & current ) const
 // firstElement() and lastElement()
 TQDomElement KBookmarkGroup::nextKnownTag( TQDomElement start, bool goNext ) const
 {
-    static const TQString & bookmark = KGlobal::staticQString("bookmark");
-    static const TQString & folder = KGlobal::staticQString("folder");
-    static const TQString & separator = KGlobal::staticQString("separator");
+    static const TQString & bookmark = TDEGlobal::staticQString("bookmark");
+    static const TQString & folder = TDEGlobal::staticQString("folder");
+    static const TQString & separator = TDEGlobal::staticQString("separator");
 
     for( TQDomNode n = start; !n.isNull(); )
     {
diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc
index 08c34061b..dc2ad0cde 100644
--- a/kio/bookmarks/kbookmarkbar.cc
+++ b/kio/bookmarks/kbookmarkbar.cc
@@ -223,8 +223,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
             action->setDelayed( false );
 
             // this flag doesn't have any UI yet
-            KGlobal::config()->setGroup( "Settings" );
-            bool addEntriesBookmarkBar = KGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true);
+            TDEGlobal::config()->setGroup( "Settings" );
+            bool addEntriesBookmarkBar = TDEGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true);
 
             KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(),
                                                     m_actionCollection, false, addEntriesBookmarkBar,
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc
index 96ce12896..9e6d711d2 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/kio/bookmarks/kbookmarkmanager.cc
@@ -311,7 +311,7 @@ void KBookmarkManager::convertAttribute( TQDomElement elem, const TQString & old
 void KBookmarkManager::importDesktopFiles()
 {
     KBookmarkImporter importer( const_cast<TQDomDocument *>(&internalDocument()) );
-    TQString path(KGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true));
+    TQString path(TDEGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true));
     importer.import( path );
     //kdDebug(7043) << internalDocument().toCString() << endl;
 
@@ -613,23 +613,23 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser )
 
 void KBookmarkManager::slotEditBookmarks()
 {
-    KProcess proc;
+    TDEProcess proc;
     proc << TQString::fromLatin1("keditbookmarks");
     if (!dptr()->m_editorCaption.isNull())
        proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption;
     if (!dptr()->m_browserEditor)
        proc << TQString::fromLatin1("--nobrowser");
     proc << m_bookmarksFile;
-    proc.start(KProcess::DontCare);
+    proc.start(TDEProcess::DontCare);
 }
 
 void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address )
 {
-    KProcess proc;
+    TDEProcess proc;
     proc << TQString::fromLatin1("keditbookmarks")
          << TQString::fromLatin1("--address") << address
          << m_bookmarksFile;
-    proc.start(KProcess::DontCare);
+    proc.start(TDEProcess::DontCare);
 }
 
 ///////