diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
| commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
| tree | 493c1095950b7f0a82690cedac1b749666be1b47 /libkcddb/cdinfoencodingwidget.cpp | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkcddb/cdinfoencodingwidget.cpp')
| -rw-r--r-- | libkcddb/cdinfoencodingwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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)); |