summaryrefslogtreecommitdiffstats
path: root/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp')
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp2
1 files changed, 1 insertions, 1 deletions
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