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 /kexi/plugins/importexport | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi/plugins/importexport')
| -rw-r--r-- | kexi/plugins/importexport/csv/kexicsvimportdialog.cpp | 6 | ||||
| -rw-r--r-- | kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 3f1cb6a3..eb1f1897 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -192,7 +192,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, setIcon(DesktopIcon(_IMPORT_ICON)); setSizeGripEnabled( TRUE ); -// m_encoding = TQString::fromLatin1(KGlobal::locale()->encoding()); +// m_encoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); // m_stripWhiteSpaceInTextValuesChecked = true; m_file = 0; m_inputStream = 0; @@ -308,7 +308,7 @@ if ( m_mode == Clipboard ) TQStringList mimetypes( csvMimeTypes() ); #ifdef TQ_WS_WIN //! @todo remove - TQString recentDir = KGlobalSettings::documentPath(); + TQString recentDir = TDEGlobalSettings::documentPath(); m_fname = TQFileDialog::getOpenFileName( KFileDialog::getStartURL(":CSVImportExport", recentDir).path(), KexiUtils::fileDialogFilterStrings(mimetypes, false), @@ -667,7 +667,7 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i m_file->at(0); //always seek at 0 because loadRows() is called many times m_inputStream = new TQTextStream(m_file); if (m_options.defaultEncodingExplicitySet) { - TQTextCodec *codec = KGlobal::charsets()->codecForName(m_options.encoding); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(m_options.encoding); if (codec) m_inputStream->setCodec(codec); //TQTextCodec::codecForName("CP1250")); } diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index 49b72323..21c8891f 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -37,7 +37,7 @@ KexiCSVImportOptions::KexiCSVImportOptions() kapp->config()->setGroup("ImportExport"); encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles"); if (encoding.isEmpty()) { - encoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + encoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); defaultEncodingExplicitySet = false; } else |