diff options
Diffstat (limited to 'kchart/csvimportdialog.cc')
| -rw-r--r-- | kchart/csvimportdialog.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc index 38cfd8c2..b0e52fea 100644 --- a/kchart/csvimportdialog.cc +++ b/kchart/csvimportdialog.cc @@ -27,11 +27,11 @@ #include <tqlineedit.h> #include <tqcombobox.h> #include <tqspinbox.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqbuttongroup.h> #include <tqpushbutton.h> #include <tqradiobutton.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kapplication.h> #include <kdebug.h> @@ -60,14 +60,14 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray) kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + 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(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); m_formatList << i18n( "Text" ); @@ -82,7 +82,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray) fillTable(); - //resize(tqsizeHint()); + //resize(sizeHint()); resize( 600, 400 ); // Try to show as much as possible of the table view setMainWidget(m_dialog); @@ -611,7 +611,7 @@ TQTextCodec* CSVImportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } |