diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:20 -0600 |
| commit | aef5eada7f51ee48f3d21448db290bd8f06953a8 (patch) | |
| tree | 9d6e7572ebcc27e402501d6966f9b46361a1702c /kedit/ktextfiledlg.cpp | |
| parent | 95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff) | |
| download | tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kedit/ktextfiledlg.cpp')
| -rw-r--r-- | kedit/ktextfiledlg.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index 027ee2f..47dbd07 100644 --- a/kedit/ktextfiledlg.cpp +++ b/kedit/ktextfiledlg.cpp @@ -43,7 +43,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, TQT_SLOT( slotSetEncoding() ), this, "encoding" ); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); encodings.prepend( i18n( "Default encoding" ) ); mEncoding->setItems( encodings ); mEncoding->setCurrentItem(0); @@ -103,7 +103,7 @@ void KTextFileDialog::slotShowEncCombo() encCombo->setInsertionPolicy(TQComboBox::NoInsertion); encCombo->insertItem(i18n("Default Encoding")); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); encodings.prepend( i18n( "Default encoding" ) ); encCombo->insertStringList( encodings ); encCombo->setCurrentItem(0); @@ -131,7 +131,7 @@ void KTextFileDialog::slotShowEncCombo() if (encCombo->currentItem() == 0) { // Default setEncoding(""); } else { - setEncoding(KGlobal::charsets()-> + setEncoding(TDEGlobal::charsets()-> encodingForName(encCombo->currentText())); } } |