diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:31 -0600 |
| commit | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch) | |
| tree | 1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp | |
| parent | 94844816550ad672ccfcdc25659c625546239998 (diff) | |
| download | koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp')
| -rw-r--r-- | kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index bf64aad5..ed1a5b30 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -21,8 +21,8 @@ #include <widget/kexicharencodingcombobox.h> #include <tqlabel.h> -#include <layout.h> -#include <textcodec.h> +#include <tqlayout.h> +#include <tqtextcodec.h> #include <tqcheckbox.h> #include <kapplication.h> @@ -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::tqfromLatin1(KGlobal::locale()->encoding()); defaultEncodingExplicitySet = false; } else |