From 27430f06c6cc2187c639f59f342f07f1fde91a8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libkcddb/cdinfoencodingwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libkcddb/cdinfoencodingwidget.cpp') diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp index 42d0e506..18b08363 100644 --- a/libkcddb/cdinfoencodingwidget.cpp +++ b/libkcddb/cdinfoencodingwidget.cpp @@ -33,7 +33,7 @@ namespace KCDDB : CDInfoEncodingWidgetBase(parent), m_artist(artist), m_title(title), m_songTitles(songTitles) { - encodingCombo->insertStringList(KGlobal::charsets()->descriptiveEncodingNames()); + encodingCombo->insertStringList(TDEGlobal::charsets()->descriptiveEncodingNames()); slotEncodingChanged(encodingCombo->currentText()); @@ -48,7 +48,7 @@ namespace KCDDB void CDInfoEncodingWidget::slotEncodingChanged(const TQString& encoding) { - KCharsets* charsets = KGlobal::charsets(); + KCharsets* charsets = TDEGlobal::charsets(); TQTextCodec* codec = charsets->codecForName(charsets->encodingForName(encoding)); -- cgit v1.2.3