diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
| commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
| tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /kompare/libdiff2/komparemodellist.cpp | |
| parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
| download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kompare/libdiff2/komparemodellist.cpp')
| -rw-r--r-- | kompare/libdiff2/komparemodellist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 90aff45b..4d76e07f 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -417,7 +417,7 @@ void KompareModelList::setEncoding( const TQString& encoding ) else { kdDebug() << "Encoding : " << encoding << endl; - m_textCodec = KGlobal::charsets()->codecForName( encoding.latin1() ); + m_textCodec = TDEGlobal::charsets()->codecForName( encoding.latin1() ); kdDebug() << "TextCodec: " << m_textCodec << endl; if ( !m_textCodec ) m_textCodec = TQTextCodec::codecForLocale(); |