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

11 files changed, 37 insertions, 37 deletions

diff --git a/apps/ktorrent/groups/group.cpp b/apps/ktorrent/groups/group.cpp
index 9a1fd90..09de6db 100644
--- a/apps/ktorrent/groups/group.cpp
+++ b/apps/ktorrent/groups/group.cpp
@@ -42,7 +42,7 @@ namespace kt
 	void Group::setIconByName(const TQString & in)
 	{
 		icon_name = in;
-		icon = KGlobal::iconLoader()->loadIcon(in,KIcon::Small);
+		icon = TDEGlobal::iconLoader()->loadIcon(in,KIcon::Small);
 	}
 	
 	void Group::rename(const TQString & nn)
diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index 92b78c3..0b6af06 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -89,7 +89,7 @@ namespace kt
 		current_item = 0;
 		menu = 0;
 		createMenu(col);
-		save_file = KGlobal::dirs()->saveLocation("data","ktorrent") + "groups";
+		save_file = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "groups";
 		GroupViewItem* all = addGroup(gman->allGroup(),0);
 		GroupViewItem* dwnld = addGroup(gman->downloadGroup(),all);
 		GroupViewItem* upld = addGroup(gman->uploadGroup(),all);
@@ -105,7 +105,7 @@ namespace kt
 		addGroup(gman->activeUploadsGroup(), active);
 		
 		custom_root = new KListViewItem(all,i18n("Custom Groups"));
-		custom_root->setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
+		custom_root->setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
 		setOpen(custom_root,true);
 	}
 
diff --git a/apps/ktorrent/groups/torrentdrag.cpp b/apps/ktorrent/groups/torrentdrag.cpp
index c0aad98..69aaf94 100644
--- a/apps/ktorrent/groups/torrentdrag.cpp
+++ b/apps/ktorrent/groups/torrentdrag.cpp
@@ -26,7 +26,7 @@ namespace kt
 
 	TorrentDrag::TorrentDrag(TQWidget* src, const char *name) : TQStoredDrag("application/x-ktorrent-drag-object",src, name)
 	{
-		setPixmap(KGlobal::iconLoader()->loadIcon("player_playlist",KIcon::Small));
+		setPixmap(TDEGlobal::iconLoader()->loadIcon("player_playlist",KIcon::Small));
 	}
 
 
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index c4e29fc..d492f02 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -132,7 +132,7 @@ KTorrent::KTorrent()
 	m_systray_icon = new TrayIcon(m_core, this);
 	
 	m_group_view->loadGroups();
-	m_view_man->restoreViewState(KGlobal::config(),this);
+	m_view_man->restoreViewState(TDEGlobal::config(),this);
 	
 	TQToolButton* tb = new TQToolButton(m_activeTabWidget);
 	tb->setIconSet(SmallIcon("tab_new"));
@@ -215,8 +215,8 @@ KTorrent::KTorrent()
 	addToolWidget(m_group_view,"player_playlist",i18n("Groups"),DOCK_LEFT);
 	
 	setAutoSaveSettings("WindowStatus",true);
-	KGlobal::config()->setGroup("WindowStatus");
-	bool hidden_on_exit = KGlobal::config()->readBoolEntry("hidden_on_exit",false);
+	TDEGlobal::config()->setGroup("WindowStatus");
+	bool hidden_on_exit = TDEGlobal::config()->readBoolEntry("hidden_on_exit",false);
 	if (Settings::showSystemTrayIcon())
 	{
 		if (hidden_on_exit)
@@ -234,11 +234,11 @@ KTorrent::KTorrent()
 		show();
 	}
 
-	bool menubar_hidden = KGlobal::config()->readBoolEntry("menubar_hidden",false);
+	bool menubar_hidden = TDEGlobal::config()->readBoolEntry("menubar_hidden",false);
 	menuBar()->setHidden(menubar_hidden);
 	m_menubarAction->setChecked(!menubar_hidden);
 
-	bool statusbar_hidden = KGlobal::config()->readBoolEntry("statusbar_hidden",false);
+	bool statusbar_hidden = TDEGlobal::config()->readBoolEntry("statusbar_hidden",false);
 	statusBar()->setHidden(statusbar_hidden);
 	m_statusbarAction->setChecked(!statusbar_hidden);
 
@@ -598,11 +598,11 @@ bool KTorrent::queryExit()
 	// stop timers to prevent update
 	m_gui_update_timer.stop();
 	
-	KGlobal::config()->setGroup("WindowStatus");
-	KGlobal::config()->writeEntry("hidden_on_exit",this->isHidden());
-	KGlobal::config()->writeEntry("menubar_hidden",menuBar()->isHidden());
-	KGlobal::config()->writeEntry("statusbar_hidden",statusBar()->isHidden());
-	m_view_man->saveViewState(KGlobal::config());
+	TDEGlobal::config()->setGroup("WindowStatus");
+	TDEGlobal::config()->writeEntry("hidden_on_exit",this->isHidden());
+	TDEGlobal::config()->writeEntry("menubar_hidden",menuBar()->isHidden());
+	TDEGlobal::config()->writeEntry("statusbar_hidden",statusBar()->isHidden());
+	m_view_man->saveViewState(TDEGlobal::config());
 	saveSettings();
 	hide();
 	m_systray_icon->hide(); // hide system tray icon upon exit
@@ -712,12 +712,12 @@ void KTorrent::optionsConfigureToolbars()
 	// use the standard toolbar editor
 #if defined(TDE_MAKE_VERSION)
 # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
-	saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+	saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 # else
-	saveMainWindowSettings(KGlobal::config());
+	saveMainWindowSettings(TDEGlobal::config());
 # endif
 #else
-	saveMainWindowSettings(KGlobal::config());
+	saveMainWindowSettings(TDEGlobal::config());
 #endif
         KEditToolbar dlg(factory());
         connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
@@ -732,12 +732,12 @@ void KTorrent::newToolbarConfig()
 
 #if defined(TDE_MAKE_VERSION)
 # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
-	applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+	applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 # else
-	applyMainWindowSettings(KGlobal::config());
+	applyMainWindowSettings(TDEGlobal::config());
 # endif
 #else
-	applyMainWindowSettings(KGlobal::config());
+	applyMainWindowSettings(TDEGlobal::config());
 #endif
 }
 
@@ -859,7 +859,7 @@ void KTorrent::addToolWidget(TQWidget* w,const TQString & icon,const TQString &
 	
 	
 	if (!icon.isNull())
-		w->setIcon(KGlobal::iconLoader()->loadIcon(icon,KIcon::Small));
+		w->setIcon(TDEGlobal::iconLoader()->loadIcon(icon,KIcon::Small));
 	
 	switch (dock)
 	{
diff --git a/apps/ktorrent/ktorrentapp.cpp b/apps/ktorrent/ktorrentapp.cpp
index 44f8e1c..4e3c88e 100644
--- a/apps/ktorrent/ktorrentapp.cpp
+++ b/apps/ktorrent/ktorrentapp.cpp
@@ -48,7 +48,7 @@ int KTorrentApp::newInstance()
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	bt::Globals::instance().setDebugMode(args->isSet("debug"));
 
-	TQString data_dir = KGlobal::dirs()->saveLocation("data","ktorrent");
+	TQString data_dir = TDEGlobal::dirs()->saveLocation("data","ktorrent");
 	if (!data_dir.endsWith(bt::DirSeparator()))
 		data_dir += bt::DirSeparator();
 	bt::Globals::instance().initLog(data_dir + "log");
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index da8a9f4..ac04a79 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -77,7 +77,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
 	bool dd_not_exist = !bt::Exists(data_dir);
 	if (data_dir == TQString() || dd_not_exist)
 	{
-		data_dir = KGlobal::dirs()->saveLocation("data","ktorrent");
+		data_dir = TDEGlobal::dirs()->saveLocation("data","ktorrent");
 		if (dd_not_exist)
 		{
 			Settings::setTempDir(data_dir);
@@ -139,7 +139,7 @@ KTorrentCore::~KTorrentCore()
 
 void KTorrentCore::loadPlugins()
 {
-	pman->loadConfigFile(KGlobal::dirs()->saveLocation("data","ktorrent") + "plugins");
+	pman->loadConfigFile(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "plugins");
 	pman->loadPluginList();
 }
 
diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
index ae37665..ff21871 100644
--- a/apps/ktorrent/ktorrentviewitem.cpp
+++ b/apps/ktorrent/ktorrentviewitem.cpp
@@ -160,8 +160,8 @@ QCStringList KTorrentViewItem::getTorrentInfo(kt::TorrentInterface* tc)
 	}
 	
 	info.append(TQString::number(s.num_peers).local8Bit());
-	info.append(TQString(KGlobal::locale()->formatNumber(Percentage(s),2) + " %").local8Bit());
-	info.append(KGlobal::locale()->formatNumber(kt::ShareRatio(s),2).local8Bit());
+	info.append(TQString(TDEGlobal::locale()->formatNumber(Percentage(s),2) + " %").local8Bit());
+	info.append(TDEGlobal::locale()->formatNumber(kt::ShareRatio(s),2).local8Bit());
 	info.append(TQString::number(s.seeders_connected_to).local8Bit());
 	info.append(TQString::number(s.leechers_connected_to).local8Bit());
 	return info;
@@ -252,13 +252,13 @@ void KTorrentViewItem::update()
 
 	if(m_parent->columnVisible(10))
 	{
-		setText(10,i18n("%1 %").arg(KGlobal::locale()->formatNumber(Percentage(s),2)));
+		setText(10,i18n("%1 %").arg(TDEGlobal::locale()->formatNumber(Percentage(s),2)));
 	}
 	
 	if(m_parent->columnVisible(11))
 	{
 		float ratio = kt::ShareRatio(s);
-		setText(11,TQString("%1").arg(KGlobal::locale()->formatNumber(ratio,2)));
+		setText(11,TQString("%1").arg(TDEGlobal::locale()->formatNumber(ratio,2)));
 	}
 	
 	if (m_parent->columnVisible(12))
diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp
index 9dee4ce..7ebb62d 100644
--- a/apps/ktorrent/ktorrentviewmenu.cpp
+++ b/apps/ktorrent/ktorrentviewmenu.cpp
@@ -31,7 +31,7 @@ using namespace kt;
 KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
 		: KPopupMenu ( parent, name ),view(parent)
 {
-	KIconLoader* iload = KGlobal::iconLoader();
+	KIconLoader* iload = TDEGlobal::iconLoader();
 	
 	stop_id = insertItem(
 			iload->loadIconSet("ktstop",KIcon::Small),i18n("to stop", "Stop"),
diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp
index 826663a..5acc667 100644
--- a/apps/ktorrent/pref.cpp
+++ b/apps/ktorrent/pref.cpp
@@ -144,7 +144,7 @@ void KTorrentPreferences::removePrefPage(kt::PrefPageInterface* pp)
 
 ///////////////////////////////////////////////////////
 
-DownloadPrefPage::DownloadPrefPage() : kt::PrefPageInterface(i18n("Downloads"), i18n("Download Options"), KGlobal::iconLoader()->loadIcon("down", KIcon::NoGroup)), dp(0)
+DownloadPrefPage::DownloadPrefPage() : kt::PrefPageInterface(i18n("Downloads"), i18n("Download Options"), TDEGlobal::iconLoader()->loadIcon("down", KIcon::NoGroup)), dp(0)
 {}
 
 DownloadPrefPage::~ DownloadPrefPage()
@@ -214,7 +214,7 @@ void DownloadPrefPage::deleteWidget()
 //////////////////////////////////////
 GeneralPrefPage::GeneralPrefPage() :
 		kt::PrefPageInterface(i18n("General"), i18n("General Options"),
-							  KGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), gp(0)
+							  TDEGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), gp(0)
 {}
 
 GeneralPrefPage::~GeneralPrefPage()
@@ -338,7 +338,7 @@ void GeneralPrefPage::updateData()
 
 	if (Settings::tempDir() == TQString())
 	{
-		TQString data_dir = KGlobal::dirs()->saveLocation("data", "ktorrent");
+		TQString data_dir = TDEGlobal::dirs()->saveLocation("data", "ktorrent");
 
 		if (!data_dir.endsWith(bt::DirSeparator()))
 			data_dir += bt::DirSeparator();
@@ -409,7 +409,7 @@ void GeneralPrefPage::deleteWidget()
 
 AdvancedPrefPage::AdvancedPrefPage() :
 		kt::PrefPageInterface(i18n("Advanced"), i18n("Advanced Options"),
-							  KGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), ap(0)
+							  TDEGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), ap(0)
 {}
 
 AdvancedPrefPage::~AdvancedPrefPage()
diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp
index d5cb5e5..a828017 100644
--- a/apps/ktorrent/queuedialog.cpp
+++ b/apps/ktorrent/queuedialog.cpp
@@ -98,7 +98,7 @@ void QueueItem::paintCell(TQPainter* p,const TQColorGroup & cg,int column,int wi
 QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *name)
 	:QueueDlg(parent, name)
 {
-	KIconLoader* iload = KGlobal::iconLoader();
+	KIconLoader* iload = TDEGlobal::iconLoader();
 	
 	m_tabs->setTabIconSet(m_tabs->page(0), iload->loadIconSet("down", KIcon::Small));
 	m_tabs->setTabIconSet(m_tabs->page(1), iload->loadIconSet("up", KIcon::Small));
diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index 8588fc2..de633c4 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -159,7 +159,7 @@ void TrayIcon::maxShareRatioReached(kt::TorrentInterface* tc)
 		return;
 	
 	const TorrentStats & s = tc->getStats();
-	KLocale* loc = KGlobal::locale();
+	KLocale* loc = TDEGlobal::locale();
 	double speed_up = (double)s.bytes_uploaded / 1024.0;
 	
 	TQString msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and has been stopped."
@@ -178,7 +178,7 @@ void TrayIcon::maxSeedTimeReached(kt::TorrentInterface* tc)
 		return;
 	
 	const TorrentStats & s = tc->getStats();
-	KLocale* loc = KGlobal::locale();
+	KLocale* loc = TDEGlobal::locale();
 	double speed_up = (double)s.bytes_uploaded / 1024.0;
 	
 	TQString msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and has been stopped."
@@ -223,7 +223,7 @@ void TrayIcon::queuingNotPossible(kt::TorrentInterface* tc)
 	const TorrentStats & s = tc->getStats();
 		
 	TQString msg;
-	KLocale* loc = KGlobal::locale();
+	KLocale* loc = TDEGlobal::locale();
 	 
 	if (tc->overMaxRatio())
 		msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. Remove the limit manually if you want to continue seeding.")