diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kchart/csvimportdialog.cc | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kchart/csvimportdialog.cc')
| -rw-r--r-- | kchart/csvimportdialog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc index 31b0ee3f..814dcc53 100644 --- a/kchart/csvimportdialog.cc +++ b/kchart/csvimportdialog.cc @@ -62,7 +62,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray) TQStringList encodings; encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); - encodings += KGlobal::charsets()->descriptiveEncodingNames(); + encodings += TDEGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); encodings << description.arg("Apple Roman"); // Apple @@ -589,7 +589,7 @@ void CSVImportDialog::ignoreDuplicatesChanged(int) TQTextCodec* CSVImportDialog::getCodec(void) const { - const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) ); + const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) ); kdDebug(30502) << "Encoding: " << strCodec << endl; bool ok = false; @@ -602,7 +602,7 @@ TQTextCodec* CSVImportDialog::getCodec(void) const } else { - codec = KGlobal::charsets()->codecForName( strCodec, ok ); + codec = TDEGlobal::charsets()->codecForName( strCodec, ok ); } // Still nothing? |