summaryrefslogtreecommitdiffstats
path: root/kcontrol/konqhtml/khttpoptdlg.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/konqhtml/khttpoptdlg.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml/khttpoptdlg.cpp')
-rw-r--r--kcontrol/konqhtml/khttpoptdlg.cpp2
1 files changed, 1 insertions, 1 deletions
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 );