summaryrefslogtreecommitdiffstats
path: root/khelpcenter/htmlsearch
diff options
context:
space:
mode:
Diffstat (limited to 'khelpcenter/htmlsearch')
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp42
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.h14
-rw-r--r--khelpcenter/htmlsearch/index.cpp2
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp18
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.h6
5 files changed, 41 insertions, 41 deletions
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index c47300190..a4bca7e52 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -266,7 +266,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
delete _proc;
// prepare new process
- _proc = new KProcess();
+ _proc = new TDEProcess();
*_proc << exe << "-v" << "-c" << dataPath(_lang)+"/htdig.conf";
if (initial)
{
@@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
kdDebug() << "Running htdig" << endl;
- connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
- this, TQT_SLOT(htdigStdout(KProcess *,char*,int)));
+ connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+ this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int)));
- connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htdigExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htdigExited(TDEProcess *)));
_htdigRunning = true;
@@ -308,7 +308,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// execute htdig
- _proc->start(KProcess::NotifyOnExit, KProcess::Stdout );
+ _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout );
kapp->enter_loop();
@@ -335,17 +335,17 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
return false;
}
delete _proc;
- _proc = new KProcess();
+ _proc = new TDEProcess();
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf";
kdDebug() << "Running htmerge" << endl;
- connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htmergeExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htmergeExited(TDEProcess *)));
_htmergeRunning = true;
- _proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
kapp->enter_loop();
@@ -370,7 +370,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
-void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
+void HTMLSearch::htdigStdout(TDEProcess *, char *buffer, int len)
{
TQString line = TQString(buffer).left(len);
@@ -389,7 +389,7 @@ void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
}
-void HTMLSearch::htdigExited(KProcess *p)
+void HTMLSearch::htdigExited(TDEProcess *p)
{
kdDebug() << "htdig terminated " << p->exitStatus() << endl;
_htdigRunning = false;
@@ -397,7 +397,7 @@ void HTMLSearch::htdigExited(KProcess *p)
}
-void HTMLSearch::htmergeExited(KProcess *)
+void HTMLSearch::htmergeExited(TDEProcess *)
{
kdDebug() << "htmerge terminated" << endl;
_htmergeRunning = false;
@@ -405,13 +405,13 @@ void HTMLSearch::htmergeExited(KProcess *)
}
-void HTMLSearch::htsearchStdout(KProcess *, char *buffer, int len)
+void HTMLSearch::htsearchStdout(TDEProcess *, char *buffer, int len)
{
_searchResult += TQString::fromLocal8Bit(buffer,len);
}
-void HTMLSearch::htsearchExited(KProcess *)
+void HTMLSearch::htsearchExited(TDEProcess *)
{
kdDebug() << "htsearch terminated" << endl;
_htsearchRunning = false;
@@ -438,21 +438,21 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
delete config;
return TQString::null;
}
- _proc = new KProcess();
+ _proc = new TDEProcess();
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf" <<
TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5").arg(words).arg(method).arg(matches).arg(format).arg(sort);
kdDebug() << "Running htsearch" << endl;
- connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
- this, TQT_SLOT(htsearchStdout(KProcess *,char*,int)));
- connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htsearchExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+ this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)));
+ connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htsearchExited(TDEProcess *)));
_htsearchRunning = true;
_searchResult = "";
- _proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
kapp->enter_loop();
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index f1d8464e3..37d9bf39f 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -10,7 +10,7 @@ class TQWidget;
class TQProgressDialog;
-class KProcess;
+class TDEProcess;
class ProgressDialog;
@@ -32,11 +32,11 @@ public:
protected slots:
- void htdigStdout(KProcess *proc, char *buffer, int buflen);
- void htdigExited(KProcess *proc);
- void htmergeExited(KProcess *proc);
- void htsearchStdout(KProcess *proc, char *buffer, int buflen);
- void htsearchExited(KProcess *proc);
+ void htdigStdout(TDEProcess *proc, char *buffer, int buflen);
+ void htdigExited(TDEProcess *proc);
+ void htmergeExited(TDEProcess *proc);
+ void htsearchStdout(TDEProcess *proc, char *buffer, int buflen);
+ void htsearchExited(TDEProcess *proc);
protected:
@@ -52,7 +52,7 @@ protected:
private:
TQStringList _files;
- KProcess *_proc;
+ TDEProcess *_proc;
int _filesToDig, _filesDigged, _filesScanned;
volatile bool _htdigRunning, _htmergeRunning, _htsearchRunning;
TQString _searchResult;
diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp
index c7b5bce41..82bf23689 100644
--- a/khelpcenter/htmlsearch/index.cpp
+++ b/khelpcenter/htmlsearch/index.cpp
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
- KGlobal::locale()->setMainCatalogue("htmlsearch");
+ TDEGlobal::locale()->setMainCatalogue("htmlsearch");
TDEApplication app;
HTMLSearch search;
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);
};
}
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 37c4649d2..1b9c0b0f8 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -29,7 +29,7 @@ class TQLineEdit;
class TQCheckBox;
class TQPushButton;
class KListBox;
-class KProcess;
+class TDEProcess;
class KLanguageCombo;
class KURLRequester;
@@ -60,7 +60,7 @@ protected slots:
void urlClicked(const TQString&);
void generateIndex();
- void indexTerminated(KProcess *proc);
+ void indexTerminated(TDEProcess *proc);
private:
@@ -74,7 +74,7 @@ private:
KListBox *searchPaths;
KLanguageCombo *language;
- KProcess *indexProc;
+ TDEProcess *indexProc;
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 07:06:50 +0000