From e6aaa3624cc6179b82a9bfff1760e742a669064c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:56 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kompare/libdiff2/komparemodellist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kompare/libdiff2/komparemodellist.cpp') 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(); -- cgit v1.2.1