diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kexi/widget/kexicharencodingcombobox.cpp | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi/widget/kexicharencodingcombobox.cpp')
| -rw-r--r-- | kexi/widget/kexicharencodingcombobox.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp index 84038dcd..ad368e69 100644 --- a/kexi/widget/kexicharencodingcombobox.cpp +++ b/kexi/widget/kexicharencodingcombobox.cpp @@ -31,21 +31,21 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( : KComboBox( parent, "KexiCharacterEncodingComboBox" ) , m_defaultEncodingAdded(false) { - TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding())); + TQString defaultEncoding(TQString::fromLatin1(TDEGlobal::locale()->encoding())); TQString defaultEncodingDescriptiveName; TQString _selectedEncoding = selectedEncoding; if (_selectedEncoding.isEmpty()) - _selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + _selectedEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); - TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList descEncodings(TDEGlobal::charsets()->descriptiveEncodingNames()); TQStringList::ConstIterator it = descEncodings.constBegin(); for (uint id = 0; it!=descEncodings.constEnd(); ++it) { bool found = false; - TQString name( KGlobal::charsets()->encodingForName( *it ) ); - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(name, found); + TQString name( TDEGlobal::charsets()->encodingForName( *it ) ); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(name, found); if (found) { insertItem(*it); if (codecForEnc->name() == defaultEncoding || name == defaultEncoding) { @@ -84,10 +84,10 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox() TQString KexiCharacterEncodingComboBox::selectedEncoding() const { if (defaultEncodingSelected()) { - return TQString::fromLatin1(KGlobal::locale()->encoding()); + return TQString::fromLatin1(TDEGlobal::locale()->encoding()); } else { - return KGlobal::charsets()->encodingForName( currentText() ); + return TDEGlobal::charsets()->encodingForName( currentText() ); } } |