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 | |
| 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')
| -rw-r--r-- | libkcddb/cdinfodialogbase.ui.h | 2 | ||||
| -rw-r--r-- | libkcddb/cdinfoencodingwidget.cpp | 4 | ||||
| -rw-r--r-- | libkcddb/kcmcddb/kcmcddb.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h index 24eaa6df..93d3b2cc 100644 --- a/libkcddb/cdinfodialogbase.ui.h +++ b/libkcddb/cdinfodialogbase.ui.h @@ -230,7 +230,7 @@ void CDInfoDialogBase::slotChangeEncoding() if (dialog->exec()) { - KCharsets* charsets = KGlobal::charsets(); + KCharsets* charsets = TDEGlobal::charsets(); TQTextCodec* codec = charsets->codecForName(charsets->encodingForName(encWidget->selectedEncoding())); m_artist->setText(codec->toUnicode(m_artist->text().latin1())); 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)); diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index 3688ba6a..5235d40a 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) ) CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(parent, name) { - KGlobal::locale()->insertCatalogue("libkcddb"); + TDEGlobal::locale()->insertCatalogue("libkcddb"); setButtons(Default | Apply); widget_ = new CDDBConfigWidget(this); |