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

7 files changed, 9 insertions, 9 deletions

diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
index 6f5d663..d4066c8 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
@@ -51,7 +51,7 @@ TQString BookmarkListItem::text( int column ) const
     if ( column == 0 )
         return m_desc;
     else if ( column == 1 )
-        return KGlobal::locale()->formatDateTime( m_dateTime );
+        return TDEGlobal::locale()->formatDateTime( m_dateTime );
 
     return TQString();
 }
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 7caf899..20aaa26 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -47,7 +47,7 @@ MainWidget::MainWidget( KConfig * config, TQWidget * parent )
 {
     loadTags();
 
-    KIconLoader * il = KGlobal::iconLoader();
+    KIconLoader * il = TDEGlobal::iconLoader();
 
     btnRefreshTags->setIconSet( il->loadIconSet( "reload", KIcon::Small ) );
     btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", KIcon::Small ) );
@@ -234,7 +234,7 @@ void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int
     tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) );
     tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) );
     tagMenu->insertSeparator();
-    tagMenu->insertItem( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ),
+    tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ),
                          i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) );
 
     tagMenu->exec( pos );
@@ -323,7 +323,7 @@ void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos
     TQPopupMenu * menu = new TQPopupMenu( this );
     TQ_CHECK_PTR( menu );
 
-    menu->insertItem( KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ),
+    menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ),
                       i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) );
 
     menu->exec( pos );
diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp
index b033e92..84843d7 100644
--- a/konq-plugins/sidebar/delicious/plugin.cpp
+++ b/konq-plugins/sidebar/delicious/plugin.cpp
@@ -71,7 +71,7 @@ extern "C"
     KDE_EXPORT void* create_konqsidebar_delicious( TDEInstance *instance, TQObject *par, TQWidget *widp,
                                                    TQString &desktopname, const char *name )
     {
-        KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" );
+        TDEGlobal::locale()->insertCatalogue( "konqsidebar_delicious" );
         return new KonqSidebarDelicious( instance, par, widp, desktopname, name );
     }
 }
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index ab6463b..fc281b4 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -53,7 +53,7 @@ extern "C"
 {
     KDE_EXPORT void* create_konqsidebar_mediaplayer(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
     {
-	KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer");
+	TDEGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer");
         return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name);
     }
 }
diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp
index 9839fd0..08e38a0 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabar.cpp
@@ -11,7 +11,7 @@ Metabar::Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQSt
                    KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
 {
   KImageIO::registerFormats();
-  KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" );
+  TDEGlobal::locale()->insertCatalogue( "konqsidebar_metabar" );
 
   widget = new MetabarWidget(widgetParent, "metabarwidget");
 }
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 5e5650d..fd8c02b 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -57,7 +57,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
   urlList.clear();
   urlList.append(url);
   
-  TQStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" );
+  TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" );
   KConfig config("metabarrc", true, false);
   config.setGroup("General");
   int maxActions = config.readNumEntry("MaxActions");
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index 1ba4f94..87a3d00 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -256,7 +256,7 @@ namespace KSB_News {
                                              TQWidget *widp,
                                              TQString &desktopname,
                                              const char *name) {
-      KGlobal::locale()->insertCatalogue("konqsidebar_news");
+      TDEGlobal::locale()->insertCatalogue("konqsidebar_news");
       return new KonqSidebar_News(instance, par, widp, desktopname, name);
     }
   }