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

---
 kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp')

diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index 49b723234..21c8891f0 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -37,7 +37,7 @@ KexiCSVImportOptions::KexiCSVImportOptions()
 	kapp->config()->setGroup("ImportExport");
 	encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles");
 	if (encoding.isEmpty()) {
-		encoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+		encoding = TQString::fromLatin1(TDEGlobal::locale()->encoding());
 		defaultEncodingExplicitySet = false;
 	}
 	else
-- 
cgit v1.2.3