summaryrefslogtreecommitdiffstats
path: root/khelpcenter/htmlsearch/kcmhtmlsearch.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 /khelpcenter/htmlsearch/kcmhtmlsearch.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khelpcenter/htmlsearch/kcmhtmlsearch.cpp')
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 578245190..7bb403b06 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -178,7 +178,7 @@ void KHTMLSearchConfig::loadLanguages()
language->clear();
// add all languages to the list
- TQStringList langs = KGlobal::dirs()->findAllResources("locale",
+ TQStringList langs = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"));
langs.sort();
@@ -186,7 +186,7 @@ void KHTMLSearchConfig::loadLanguages()
{
KSimpleConfig entry(*it);
entry.setGroup(TQString::fromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), TDEGlobal::locale()->translate("without name"));
TQString path = *it;
int index = path.findRev('/');
@@ -272,7 +272,7 @@ void KHTMLSearchConfig::load()
searchPaths->insertItem(*it);
config->setGroup("Locale");
- TQString lang = config->readEntry("Search Language", KGlobal::locale()->language());
+ TQString lang = config->readEntry("Search Language", TDEGlobal::locale()->language());
language->setCurrentItem(lang);
emit changed(false);
@@ -320,7 +320,7 @@ void KHTMLSearchConfig::defaults()
searchPaths->clear();
- language->setCurrentItem(KGlobal::locale()->language());
+ language->setCurrentItem(TDEGlobal::locale()->language());
emit changed(true);
}
@@ -342,11 +342,11 @@ void KHTMLSearchConfig::generateIndex()
delete indexProc;
- indexProc = new KProcess;
+ indexProc = new TDEProcess;
*indexProc << exe << "--lang" << language->currentTag();
- connect(indexProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(indexTerminated(KProcess *)));
+ connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(indexTerminated(TDEProcess *)));
runButton->setEnabled(false);
@@ -354,7 +354,7 @@ void KHTMLSearchConfig::generateIndex()
}
-void KHTMLSearchConfig::indexTerminated(KProcess *)
+void KHTMLSearchConfig::indexTerminated(TDEProcess *)
{
runButton->setEnabled(true);
}
@@ -364,7 +364,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_htmlsearch(TQWidget *parent, const char *name)
{
- KGlobal::locale()->insertCatalogue("kcmhtmlsearch");
+ TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
return new KHTMLSearchConfig(parent, name);
};
}