diff options
Diffstat (limited to 'kexi/widget/kexicharencodingcombobox.cpp')
| -rw-r--r-- | kexi/widget/kexicharencodingcombobox.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp index 28c4521a..ff277e7d 100644 --- a/kexi/widget/kexicharencodingcombobox.cpp +++ b/kexi/widget/kexicharencodingcombobox.cpp @@ -19,7 +19,7 @@ #include "kexicharencodingcombobox.h" -#include <textcodec.h> +#include <tqtextcodec.h> #include <kdebug.h> #include <klocale.h> @@ -31,12 +31,12 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( : KComboBox( parent, "KexiCharacterEncodingComboBox" ) , m_defaultEncodingAdded(false) { - TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding())); + TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding())); TQString defaultEncodingDescriptiveName; TQString _selectedEncoding = selectedEncoding; if (_selectedEncoding.isEmpty()) - _selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + _selectedEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames()); TQStringList::ConstIterator it = descEncodings.constBegin(); @@ -66,7 +66,7 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( if (!defaultEncodingDescriptiveName.isEmpty()) { m_defaultEncodingAdded = true; TQString desc = i18n("Text encoding: Default", "Default: %1") - .arg(defaultEncodingDescriptiveName); + .tqarg(defaultEncodingDescriptiveName); insertItem( desc, 0 ); if (_selectedEncoding==defaultEncoding) { setCurrentItem(0); @@ -84,7 +84,7 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox() TQString KexiCharacterEncodingComboBox::selectedEncoding() const { if (defaultEncodingSelected()) { - return TQString::fromLatin1(KGlobal::locale()->encoding()); + return TQString::tqfromLatin1(KGlobal::locale()->encoding()); } else { return KGlobal::charsets()->encodingForName( currentText() ); |