diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
| commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
| tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /src/generalinfowidget.cpp | |
| parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
| download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/generalinfowidget.cpp')
| -rw-r--r-- | src/generalinfowidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index 99330c1b..d84bc1e8 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -56,7 +56,7 @@ void GeneralInfoWidget::readConfig() { TQStringList encodings; encodings << i18n("Use global editor settings"); - encodings += KGlobal::charsets()->descriptiveEncodingNames(); + encodings += TDEGlobal::charsets()->descriptiveEncodingNames(); TQStringList::const_iterator it = encodings.constBegin(); while ( it != encodings.constEnd() ) { @@ -65,11 +65,11 @@ void GeneralInfoWidget::readConfig() { } encoding_combo->setCurrentItem( 0 ); -// const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) ); +// const TQString DefaultEncoding = TDEGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) ); const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ); for ( int i = 0; i < encoding_combo->count(); i++ ) { - if ( KGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding ) + if ( TDEGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding ) { encoding_combo->setCurrentItem( i ); break; @@ -192,7 +192,7 @@ void GeneralInfoWidget::writeConfig() { TQString DefaultEncoding = TQString(); if ( encoding_combo->currentItem() > 0 ) { - DefaultEncoding = KGlobal::charsets()->encodingForName( encoding_combo->currentText() ); + DefaultEncoding = TDEGlobal::charsets()->encodingForName( encoding_combo->currentText() ); } DomUtil::writeEntry( m_projectDom, "/general/defaultencoding", DefaultEncoding ); } |