Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

3 files changed, 3 insertions, 3 deletions

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 );
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 1deb9e21..19f5b057 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -172,7 +172,7 @@ void ViewPage::setDefaults()
 	m_snolSpinBox->setValue       ( 3 );
         m_tabSpinBox->setValue        ( 4 );
 
-	m_fontCombo->setCurrentFont   ( KGlobalSettings::fixedFont().family() );
+	m_fontCombo->setCurrentFont   ( TDEGlobalSettings::fixedFont().family() );
         m_fontSizeSpinBox->setValue   ( 10 );
 }
 
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 403746b1..85420d53 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -56,7 +56,7 @@ void ViewSettings::loadSettings( KConfig* config )
 	m_scrollNoOfLines     = cfg.readNumEntry  ( "ScrollNoOfLines",     3 );
 	m_tabToNumberOfSpaces = cfg.readNumEntry  ( "TabToNumberOfSpaces", 4 );
 
-	TQFont stdFixed = KGlobalSettings::fixedFont();
+	TQFont stdFixed = TDEGlobalSettings::fixedFont();
 	stdFixed.setPointSize( 10 );
 	m_font                = cfg.readFontEntry ( "TextFont", &stdFixed );
 }