From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kcontrol/konqhtml/appearance.cpp  | 6 +++---
 kcontrol/konqhtml/khttpoptdlg.cpp | 2 +-
 kcontrol/konqhtml/pluginopts.cpp  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kcontrol/konqhtml')

diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 1a20fd27b..fa22ab533 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -212,7 +212,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget
 
   m_pEncoding = new TQComboBox( false, this );
   label->setBuddy( m_pEncoding );
-  encodings = KGlobal::charsets()->availableEncodingNames();
+  encodings = TDEGlobal::charsets()->availableEncodingNames();
   encodings.prepend(i18n("Use Language Encoding"));
   m_pEncoding->insertStringList( encodings );
   lay->addMultiCellWidget(m_pEncoding,r, r, M, W);
@@ -337,8 +337,8 @@ void KAppearanceOptions::load( bool useDefaults )
       fSize = fMinSize;
 
     defaultFonts = TQStringList();
-    defaultFonts.append( READ_ENTRY( "StandardFont", KGlobalSettings::generalFont().family() ) );
-    defaultFonts.append( READ_ENTRY( "FixedFont", KGlobalSettings::fixedFont().family() ) );
+    defaultFonts.append( READ_ENTRY( "StandardFont", TDEGlobalSettings::generalFont().family() ) );
+    defaultFonts.append( READ_ENTRY( "FixedFont", TDEGlobalSettings::fixedFont().family() ) );
     defaultFonts.append( READ_ENTRY( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) );
     defaultFonts.append( READ_ENTRY( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) );
     defaultFonts.append( READ_ENTRY( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) );
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index ca175e8e9..93fb20d70 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -49,7 +49,7 @@ void KHTTPOptions::load( bool useDefaults )
   m_pConfig->setReadDefaults( useDefaults );
 
   m_pConfig->setGroup( "Browser Settings/HTTP" );	
-  tmp = m_pConfig->readEntry( "AcceptLanguages",KGlobal::locale()->languageList().join(","));
+  tmp = m_pConfig->readEntry( "AcceptLanguages",TDEGlobal::locale()->languageList().join(","));
   le_languages->setText( tmp );
   tmp = m_pConfig->readEntry( "AcceptCharsets",defaultCharsets);
   le_charsets->setText( tmp );
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index 221b2f9ed..c78a63eec 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -292,7 +292,7 @@ void KPluginOptions::scan()
     }
 
     m_nspluginscan = new KProcIO;
-    TQString scanExe = KGlobal::dirs()->findExe("nspluginscan");
+    TQString scanExe = TDEGlobal::dirs()->findExe("nspluginscan");
     if (!scanExe) {
         kdDebug() << "can't find nspluginviewer" << endl;
         delete m_nspluginscan; 
@@ -314,7 +314,7 @@ void KPluginOptions::scan()
     kdDebug() << "Running nspluginscan" << endl;
     connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)),
             this, TQT_SLOT(progress(KProcIO*)));
-    connect(m_nspluginscan, TQT_SIGNAL(processExited(KProcess *)),
+    connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)),
             this, TQT_SLOT(scanDone()));
     connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone()));
 
-- 
cgit v1.2.1