summaryrefslogtreecommitdiffstats
path: root/khelpcenter/htmlsearch
diff options
context:
space:
mode:
Diffstat (limited to 'khelpcenter/htmlsearch')
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp54
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.h4
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp54
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.h2
-rw-r--r--khelpcenter/htmlsearch/klangcombo.cpp2
-rw-r--r--khelpcenter/htmlsearch/klangcombo.h2
-rw-r--r--khelpcenter/htmlsearch/ktagcombobox.cpp16
-rw-r--r--khelpcenter/htmlsearch/ktagcombobox.h2
-rw-r--r--khelpcenter/htmlsearch/progressdialog.cpp2
-rw-r--r--khelpcenter/htmlsearch/progressdialog.h2
10 files changed, 70 insertions, 70 deletions
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 5fd0f4640..0a9c78b69 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -4,8 +4,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
#include <tdelocale.h>
#include <tdeconfig.h>
@@ -22,7 +22,7 @@ HTMLSearch::HTMLSearch()
TQString HTMLSearch::dataPath(const TQString& _lang)
{
- return kapp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
+ return tdeApp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
}
@@ -56,7 +56,7 @@ void HTMLSearch::scanDir(const TQString& dir)
if (*it != "." && *it != "..")
{
scanDir(dir + *it + "/");
- kapp->processEvents();
+ tdeApp->processEvents();
}
}
@@ -74,7 +74,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
// add KDE help dirs
if (config->readBoolEntry("KDE", true))
- dirs = kapp->dirs()->findDirs("html", _lang + "/");
+ dirs = tdeApp->dirs()->findDirs("html", _lang + "/");
kdDebug() << "got " << dirs.count() << " dirs\n";
// TODO: Man and Info!!
@@ -232,7 +232,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// create progress dialog
progress = new ProgressDialog(parent);
progress->show();
- kapp->processEvents();
+ tdeApp->processEvents();
// create files list ----------------------------------------------
if (!saveFilesList(_lang))
@@ -243,7 +243,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// run htdig ------------------------------------------------------
TDEConfig *config = new TDEConfig("khelpcenterrc", true);
TDEConfigGroupSaver saver(config, "htdig");
- TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
+ TQString exe = config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig"));
if (exe.isEmpty())
{
@@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
kdDebug() << "Running htdig" << endl;
- connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
- this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int)));
+ connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+ this, TQ_SLOT(htdigStdout(TDEProcess *,char*,int)));
- connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(htdigExited(TDEProcess *)));
+ connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(htdigExited(TDEProcess *)));
_htdigRunning = true;
@@ -310,7 +310,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// execute htdig
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout );
- kapp->enter_loop();
+ tdeApp->enter_loop();
if (!_proc->normalExit() || _proc->exitStatus() != 0)
{
@@ -322,13 +322,13 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// _filesDigged += CHUNK_SIZE;
progress->setFilesDigged(_filesDigged);
- kapp->processEvents();
+ tdeApp->processEvents();
}
progress->setState(2);
// run htmerge -----------------------------------------------------
- exe = config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge"));
+ exe = config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge"));
if (exe.isEmpty())
{
delete config;
@@ -340,14 +340,14 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
kdDebug() << "Running htmerge" << endl;
- connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(htmergeExited(TDEProcess *)));
+ connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(htmergeExited(TDEProcess *)));
_htmergeRunning = true;
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
- kapp->enter_loop();
+ tdeApp->enter_loop();
if (!_proc->normalExit() || _proc->exitStatus() != 0)
{
@@ -360,7 +360,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
delete _proc;
progress->setState(3);
- kapp->processEvents();
+ tdeApp->processEvents();
delete progress;
delete config;
@@ -393,7 +393,7 @@ void HTMLSearch::htdigExited(TDEProcess *p)
{
kdDebug() << "htdig terminated " << p->exitStatus() << endl;
_htdigRunning = false;
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
@@ -401,7 +401,7 @@ void HTMLSearch::htmergeExited(TDEProcess *)
{
kdDebug() << "htmerge terminated" << endl;
_htmergeRunning = false;
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
@@ -415,7 +415,7 @@ void HTMLSearch::htsearchExited(TDEProcess *)
{
kdDebug() << "htsearch terminated" << endl;
_htsearchRunning = false;
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
@@ -432,7 +432,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
// run htsearch ----------------------------------------------------
TDEConfig *config = new TDEConfig("khelpcenterrc", true);
TDEConfigGroupSaver saver(config, "htdig");
- TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
+ TQString exe = config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch"));
if (exe.isEmpty())
{
delete config;
@@ -444,17 +444,17 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
kdDebug() << "Running htsearch" << endl;
- 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 *)));
+ connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+ this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int)));
+ connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(htsearchExited(TDEProcess *)));
_htsearchRunning = true;
_searchResult = "";
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
- kapp->enter_loop();
+ tdeApp->enter_loop();
if (!_proc->normalExit() || _proc->exitStatus() != 0)
{
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index 37d9bf39f..e0c533f81 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -16,9 +16,9 @@ class TDEProcess;
class ProgressDialog;
-class HTMLSearch : public QObject
+class HTMLSearch : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 3db9c9895..d130f9dbd 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -19,14 +19,14 @@
*/
#include <tqlayout.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kurllabel.h>
#include <tdeapplication.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <tdefiledialog.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include "klangcombo.h"
#include <kurlrequester.h>
#include <klineedit.h>
@@ -60,8 +60,8 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
url->setText(i18n("ht://dig home page"));
url->setAlignment(TQLabel::AlignHCenter);
grid->addMultiCellWidget(url, 2,2, 0, 1);
- connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
- this, TQT_SLOT(urlClicked(const TQString&)));
+ connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)),
+ this, TQ_SLOT(urlClicked(const TQString&)));
gb = new TQGroupBox(i18n("Program Locations"), this);
@@ -74,7 +74,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
l->setBuddy( htdigBin );
grid->addWidget(l, 1,0);
grid->addWidget(htdigBin, 1,1);
- connect(htdigBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+ connect(htdigBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
TQString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" );
TQWhatsThis::add( htdigBin, wtstr );
TQWhatsThis::add( l, wtstr );
@@ -84,7 +84,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
l->setBuddy( htsearchBin );
grid->addWidget(l, 2,0);
grid->addWidget(htsearchBin, 2,1);
- connect(htsearchBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+ connect(htsearchBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
wtstr = i18n( "Enter the path to your htsearch program here, e.g. /usr/local/bin/htsearch" );
TQWhatsThis::add( htsearchBin, wtstr );
TQWhatsThis::add( l, wtstr );
@@ -94,7 +94,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
l->setBuddy( htmergeBin );
grid->addWidget(l, 3,0);
grid->addWidget(htmergeBin, 3,1);
- connect(htmergeBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+ connect(htmergeBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
wtstr = i18n( "Enter the path to your htmerge program here, e.g. /usr/local/bin/htmerge" );
TQWhatsThis::add( htmergeBin, wtstr );
TQWhatsThis::add( l, wtstr );
@@ -110,17 +110,17 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
indexKDE = new TQCheckBox(i18n("&TDE help"), gb);
vvbox->addWidget(indexKDE);
- connect(indexKDE, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+ connect(indexKDE, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
indexMan = new TQCheckBox(i18n("&Man pages"), gb);
vvbox->addWidget(indexMan);
indexMan->setEnabled(false),
- connect(indexMan, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+ connect(indexMan, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
indexInfo = new TQCheckBox(i18n("&Info pages"), gb);
vvbox->addWidget(indexInfo);
indexInfo->setEnabled(false);
- connect(indexInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+ connect(indexInfo, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
gb = new TQGroupBox(i18n("Additional Search Paths"), this);
hbox->addWidget(gb);
@@ -159,12 +159,12 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
runButton->setFixedSize(runButton->sizeHint());
vbox->addWidget(runButton, AlignRight);
- connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
+ connect(runButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateIndex()));
- connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked()));
- connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delClicked()));
- connect(searchPaths, TQT_SIGNAL(highlighted(const TQString &)),
- this, TQT_SLOT(pathSelected(const TQString &)));
+ connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked()));
+ connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delClicked()));
+ connect(searchPaths, TQ_SIGNAL(highlighted(const TQString &)),
+ this, TQ_SLOT(pathSelected(const TQString &)));
checkButtons();
@@ -184,7 +184,7 @@ void TDEHTMLSearchConfig::loadLanguages()
for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
{
- KSimpleConfig entry(*it);
+ TDESimpleConfig entry(*it);
entry.setGroup(TQString::fromLatin1("KCM Locale"));
TQString name = entry.readEntry(TQString::fromLatin1("Name"), TDEGlobal::locale()->translate("without name"));
@@ -256,9 +256,9 @@ void TDEHTMLSearchConfig::load()
TDEConfig *config = new TDEConfig("khelpcenterrc", true);
config->setGroup("htdig");
- htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")));
- htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
- htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge")));
+ htdigBin->lineEdit()->setText(config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig")));
+ htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
+ htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge")));
config->setGroup("Scope");
indexKDE->setChecked(config->readBoolEntry("KDE", true));
@@ -310,9 +310,9 @@ void TDEHTMLSearchConfig::save()
void TDEHTMLSearchConfig::defaults()
{
- htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig"));
- htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
- htmergeBin->lineEdit()->setText(kapp->dirs()->findExe("htmerge"));
+ htdigBin->lineEdit()->setText(tdeApp->dirs()->findExe("htdig"));
+ htsearchBin->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
+ htmergeBin->lineEdit()->setText(tdeApp->dirs()->findExe("htmerge"));
indexKDE->setChecked(true);
indexMan->setChecked(false);
@@ -328,7 +328,7 @@ void TDEHTMLSearchConfig::defaults()
void TDEHTMLSearchConfig::urlClicked(const TQString &url)
{
- kapp->invokeBrowser(url);
+ tdeApp->invokeBrowser(url);
}
@@ -336,7 +336,7 @@ void TDEHTMLSearchConfig::generateIndex()
{
save();
- TQString exe = kapp->dirs()->findExe("tdehtmlindex");
+ TQString exe = tdeApp->dirs()->findExe("tdehtmlindex");
if (exe.isEmpty())
return;
@@ -345,8 +345,8 @@ void TDEHTMLSearchConfig::generateIndex()
indexProc = new TDEProcess;
*indexProc << exe << "--lang" << language->currentTag();
- connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(indexTerminated(TDEProcess *)));
+ connect(indexProc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(indexTerminated(TDEProcess *)));
runButton->setEnabled(false);
@@ -362,7 +362,7 @@ void TDEHTMLSearchConfig::indexTerminated(TDEProcess *)
extern "C"
{
- KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
+ TDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
{
TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
return new TDEHTMLSearchConfig(parent, name);
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 28445437a..72ae1c396 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -35,7 +35,7 @@ class KURLRequester;
class TDEHTMLSearchConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 308109d12..a53a1b01f 100644
--- a/khelpcenter/htmlsearch/klangcombo.cpp
+++ b/khelpcenter/htmlsearch/klangcombo.cpp
@@ -23,7 +23,7 @@
#include <tqiconset.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "klangcombo.h"
#include "klangcombo.moc"
diff --git a/khelpcenter/htmlsearch/klangcombo.h b/khelpcenter/htmlsearch/klangcombo.h
index 4ca6e2f3b..7b07fee03 100644
--- a/khelpcenter/htmlsearch/klangcombo.h
+++ b/khelpcenter/htmlsearch/klangcombo.h
@@ -34,7 +34,7 @@
*/
class KLanguageCombo : public KTagComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
KLanguageCombo(TQWidget *parent=0, const char *name=0);
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index b3c70915c..be9975d7a 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -98,10 +98,10 @@ void KTagComboBox::clear()
delete old_popup;
old_popup = popup;
popup = new TQPopupMenu(this);
- connect( popup, TQT_SIGNAL(activated(int)),
- TQT_SLOT(internalActivate(int)) );
- connect( popup, TQT_SIGNAL(highlighted(int)),
- TQT_SLOT(internalHighlight(int)) );
+ connect( popup, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(internalActivate(int)) );
+ connect( popup, TQ_SIGNAL(highlighted(int)),
+ TQ_SLOT(internalHighlight(int)) );
}
int KTagComboBox::count() const
@@ -176,10 +176,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons
checkInsertPos(pi, text, index);
pi->insertItem(text, p, count(), index);
tags->append(tag);
- connect( p, TQT_SIGNAL(activated(int)),
- TQT_SLOT(internalActivate(int)) );
- connect( p, TQT_SIGNAL(highlighted(int)),
- TQT_SLOT(internalHighlight(int)) );
+ connect( p, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(internalActivate(int)) );
+ connect( p, TQ_SIGNAL(highlighted(int)),
+ TQ_SLOT(internalHighlight(int)) );
}
void KTagComboBox::paintEvent( TQPaintEvent * ev)
diff --git a/khelpcenter/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h
index df58120ce..c28336f21 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.h
+++ b/khelpcenter/htmlsearch/ktagcombobox.h
@@ -37,7 +37,7 @@ class TQPopupMenu;
*/
class KTagComboBox : public QComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
KTagComboBox(TQWidget *parent=0, const char *name=0);
diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp
index 33a783127..a289d3f7c 100644
--- a/khelpcenter/htmlsearch/progressdialog.cpp
+++ b/khelpcenter/htmlsearch/progressdialog.cpp
@@ -4,7 +4,7 @@
#include <tdelocale.h>
#include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "progressdialog.moc"
diff --git a/khelpcenter/htmlsearch/progressdialog.h b/khelpcenter/htmlsearch/progressdialog.h
index 9ab5660d9..f39a0d83e 100644
--- a/khelpcenter/htmlsearch/progressdialog.h
+++ b/khelpcenter/htmlsearch/progressdialog.h
@@ -12,7 +12,7 @@ class KProgress;
class ProgressDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 09:50:34 +0000