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/libdialogpages/filespage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kompare/libdialogpages/filespage.cpp') diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index 7ccd7a69..9fa58a35 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -52,7 +52,7 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal m_thirdGB = new TQGroupBox( 1, Qt::Vertical, i18n( "Encoding" ), page ); m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" ); - m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() ); + m_encodingComboBox->insertStringList( TDEGlobal::charsets()->availableEncodingNames() ); layout->addWidget( m_firstGB ); layout->addWidget( m_secondGB ); -- cgit v1.2.1