summaryrefslogtreecommitdiffstats
path: root/kexi/widget/kexicharencodingcombobox.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:12:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:12:30 -0600
commit11191ef0b9908604d1d7aaca382b011ef22c454c (patch)
treed38f0ccd8bfcc9756f5cfc42fb2ad1dad351e6aa /kexi/widget/kexicharencodingcombobox.cpp
parentc9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (diff)
downloadkoffice-11191ef0b9908604d1d7aaca382b011ef22c454c.tar.gz
koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kexi/widget/kexicharencodingcombobox.cpp')
-rw-r--r--kexi/widget/kexicharencodingcombobox.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index ff277e7d..de6254b7 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -31,12 +31,12 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
: KComboBox( parent, "KexiCharacterEncodingComboBox" )
, m_defaultEncodingAdded(false)
{
- TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding()));
+ TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding()));
TQString defaultEncodingDescriptiveName;
TQString _selectedEncoding = selectedEncoding;
if (_selectedEncoding.isEmpty())
- _selectedEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+ _selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames());
TQStringList::ConstIterator it = descEncodings.constBegin();
@@ -84,7 +84,7 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox()
TQString KexiCharacterEncodingComboBox::selectedEncoding() const
{
if (defaultEncodingSelected()) {
- return TQString::tqfromLatin1(KGlobal::locale()->encoding());
+ return TQString::fromLatin1(KGlobal::locale()->encoding());
}
else {
return KGlobal::charsets()->encodingForName( currentText() );