summaryrefslogtreecommitdiffstats
path: root/khelpcenter
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
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khelpcenter')
-rw-r--r--khelpcenter/docmetainfo.cpp4
-rw-r--r--khelpcenter/fontdialog.cpp6
-rw-r--r--khelpcenter/formatter.cpp2
-rw-r--r--khelpcenter/glossary.cpp10
-rw-r--r--khelpcenter/glossary.h4
-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
-rw-r--r--khelpcenter/kcmhelpcenter.cpp32
-rw-r--r--khelpcenter/kcmhelpcenter.h10
-rw-r--r--khelpcenter/khc_indexbuilder.cpp22
-rw-r--r--khelpcenter/khc_indexbuilder.h8
-rw-r--r--khelpcenter/khelpcenter.kcfg2
-rw-r--r--khelpcenter/mainwindow.cpp6
-rw-r--r--khelpcenter/navigator.cpp6
-rw-r--r--khelpcenter/navigator.h2
-rw-r--r--khelpcenter/scrollkeepertreebuilder.cpp4
-rw-r--r--khelpcenter/searchengine.cpp30
-rw-r--r--khelpcenter/searchengine.h10
-rw-r--r--khelpcenter/searchhandler.cpp30
-rw-r--r--khelpcenter/searchhandler.h10
-rw-r--r--khelpcenter/searchwidget.cpp4
-rw-r--r--khelpcenter/toc.cpp12
-rw-r--r--khelpcenter/toc.h4
-rw-r--r--khelpcenter/view.cpp4
27 files changed, 152 insertions, 152 deletions
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 2ff496074..a63b473ce 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -123,7 +123,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
{
if ( mLoaded && !force ) return;
- mLanguages = KGlobal::locale()->languagesTwoAlpha();
+ mLanguages = TDEGlobal::locale()->languagesTwoAlpha();
kdDebug( 1400 ) << "LANGS: " << mLanguages.join( " " ) << endl;
@@ -137,7 +137,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
TQStringList metaInfos = config.readListEntry( "MetaInfoDirs" );
if ( metaInfos.isEmpty() ) {
- KStandardDirs* kstd = KGlobal::dirs();
+ KStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/khelpcenter" );
metaInfos = kstd->findDirs( "data", "plugins" );
}
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index e540ae811..1919ce841 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -134,7 +134,7 @@ void FontDialog::setupFontEncodingBox()
layout->addWidget( lDefaultEncoding, 0, 0 );
m_defaultEncoding = new KComboBox( false, gb );
layout->addWidget( m_defaultEncoding, 0, 1 );
- TQStringList encodings = KGlobal::charsets()->availableEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->availableEncodingNames();
encodings.prepend( i18n( "Use Language Encoding" ) );
m_defaultEncoding->insertStringList( encodings );
lDefaultEncoding->setBuddy( m_defaultEncoding );
@@ -157,8 +157,8 @@ void FontDialog::load()
TQStringList fonts = cfg->readListEntry( "Fonts" );
if ( fonts.isEmpty() )
- fonts << KGlobalSettings::generalFont().family()
- << KGlobalSettings::fixedFont().family()
+ fonts << TDEGlobalSettings::generalFont().family()
+ << TDEGlobalSettings::fixedFont().family()
<< HTML_DEFAULT_VIEW_SERIF_FONT
<< HTML_DEFAULT_VIEW_SANSSERIF_FONT
<< HTML_DEFAULT_VIEW_CURSIVE_FONT
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index b9f394289..892b2d0cd 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -42,7 +42,7 @@ Formatter:: ~Formatter()
bool Formatter::readTemplates()
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Templates" );
TQString mainTemplate = cfg->readEntry( "MainTemplate" );
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index b0ba47352..8a406230a 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -146,9 +146,9 @@ void Glossary::rebuildGlossaryCache()
Q_ASSERT( mainWindow );
mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
- KProcess *meinproc = new KProcess;
- connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
- this, TQT_SLOT( meinprocExited( KProcess * ) ) );
+ TDEProcess *meinproc = new TDEProcess;
+ connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
*meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
*meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
@@ -156,10 +156,10 @@ void Glossary::rebuildGlossaryCache()
<< locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) );
*meinproc << m_sourceFile;
- meinproc->start( KProcess::NotifyOnExit );
+ meinproc->start( TDEProcess::NotifyOnExit );
}
-void Glossary::meinprocExited( KProcess *meinproc )
+void Glossary::meinprocExited( TDEProcess *meinproc )
{
delete meinproc;
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index b288cb497..37594811c 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -27,7 +27,7 @@
#include <tqstringlist.h>
class KConfig;
-class KProcess;
+class TDEProcess;
class EntryItem;
@@ -117,7 +117,7 @@ class Glossary : public KListView
void entrySelected( const GlossaryEntry &entry );
private slots:
- void meinprocExited( KProcess *meinproc );
+ void meinprocExited( TDEProcess *meinproc );
void treeItemSelected( TQListViewItem *item );
private:
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;
};
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 1c7e54391..10a3ced0f 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -135,7 +135,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
IndexProgressDialog::~IndexProgressDialog()
{
if ( !mLogView->isHidden() ) {
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "indexprogressdialog" );
cfg->writeEntry( "size", size() );
}
@@ -196,7 +196,7 @@ void IndexProgressDialog::slotEnd()
void IndexProgressDialog::toggleDetails()
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "indexprogressdialog" );
if ( mLogView->isHidden() ) {
mLogLabel->show();
@@ -234,7 +234,7 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, TQWidget *parent,
setButtonOK( i18n("Build Index") );
- mConfig = KGlobal::config();
+ mConfig = TDEGlobal::config();
DocMetaInfo::self()->scanMetaInfo();
@@ -465,7 +465,7 @@ void KCMHelpCenter::startIndexProcess()
{
kdDebug() << "KCMHelpCenter::startIndexProcess()" << endl;
- mProcess = new KProcess;
+ mProcess = new TDEProcess;
if ( mRunAsRoot ) {
*mProcess << "tdesu" << "--nonewdcop";
@@ -476,14 +476,14 @@ void KCMHelpCenter::startIndexProcess()
*mProcess << mCmdFile->name();
*mProcess << Prefs::indexDirectory();
- connect( mProcess, TQT_SIGNAL( processExited( KProcess * ) ),
- TQT_SLOT( slotIndexFinished( KProcess * ) ) );
- connect( mProcess, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
- TQT_SLOT( slotReceivedStdout(KProcess *, char *, int ) ) );
- connect( mProcess, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
- TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
+ connect( mProcess, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( slotIndexFinished( TDEProcess * ) ) );
+ connect( mProcess, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
+ connect( mProcess, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
- if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
kdError() << "KCMHelpcenter::startIndexProcess(): Failed to start process."
<< endl;
}
@@ -502,7 +502,7 @@ void KCMHelpCenter::cancelBuildIndex()
}
}
-void KCMHelpCenter::slotIndexFinished( KProcess *proc )
+void KCMHelpCenter::slotIndexFinished( TDEProcess *proc )
{
kdDebug() << "KCMHelpCenter::slotIndexFinished()" << endl;
@@ -527,7 +527,7 @@ void KCMHelpCenter::slotIndexFinished( KProcess *proc )
return;
}
} else if ( !mProcess->normalExit() || mProcess->exitStatus() != 0 ) {
- kdDebug() << "KProcess reported an error." << endl;
+ kdDebug() << "TDEProcess reported an error." << endl;
KMessageBox::error( this, i18n("Failed to build index.") );
} else {
mConfig->setGroup( "Search" );
@@ -608,7 +608,7 @@ void KCMHelpCenter::advanceProgress()
}
}
-void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen )
+void KCMHelpCenter::slotReceivedStdout( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
int pos = text.findRev( '\n' );
@@ -622,7 +622,7 @@ void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen )
}
}
-void KCMHelpCenter::slotReceivedStderr( KProcess *, char *buffer, int buflen )
+void KCMHelpCenter::slotReceivedStderr( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
int pos = text.findRev( '\n' );
@@ -680,7 +680,7 @@ void KCMHelpCenter::findWriteableIndexDir()
{
TQFileInfo currentDir( Prefs::indexDirectory() );
if ( !currentDir.isWritable() )
- Prefs::setIndexDirectory( KGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
+ Prefs::setIndexDirectory( TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
}
#include "kcmhelpcenter.moc"
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index a5a336afc..4e28428fc 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -32,7 +32,7 @@ class TQProgressBar;
class TQTextEdit;
class TQLabel;
-class KProcess;
+class TDEProcess;
class KConfig;
class TDEAboutData;
class KTempFile;
@@ -123,11 +123,11 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
protected slots:
bool buildIndex();
void cancelBuildIndex();
- void slotIndexFinished( KProcess * );
+ void slotIndexFinished( TDEProcess * );
void slotIndexProgress();
void slotIndexError( const TQString & );
- void slotReceivedStdout(KProcess *proc, char *buffer, int buflen);
- void slotReceivedStderr(KProcess *proc, char *buffer, int buflen);
+ void slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen);
+ void slotReceivedStderr(TDEProcess *proc, char *buffer, int buflen);
void slotProgressClosed();
void slotOk();
@@ -171,7 +171,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
KTempFile *mCmdFile;
- KProcess *mProcess;
+ TDEProcess *mProcess;
bool mIsClosing;
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 3759b3048..0efd5ac2b 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -84,29 +84,29 @@ void IndexBuilder::processCmdQueue()
kdDebug(1402) << "PROCESS: " << cmd << endl;
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
proc->setRunPrivileged( true );
TQStringList args = TQStringList::split( " ", cmd );
*proc << args;
- connect( proc, TQT_SIGNAL( processExited( KProcess * ) ),
- TQT_SLOT( slotProcessExited( KProcess * ) ) );
- connect( proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int ) ),
- TQT_SLOT( slotReceivedStdout(KProcess *, char *, int ) ) );
- connect( proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int ) ),
- TQT_SLOT( slotReceivedStderr(KProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
+ connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) );
mCmdQueue.remove( it );
- if ( !proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
sendErrorSignal( i18n("Unable to start command '%1'.").arg( cmd ) );
processCmdQueue();
}
}
-void IndexBuilder::slotProcessExited( KProcess *proc )
+void IndexBuilder::slotProcessExited( TDEProcess *proc )
{
kdDebug(1402) << "IndexBuilder::slotIndexFinished()" << endl;
@@ -124,13 +124,13 @@ void IndexBuilder::slotProcessExited( KProcess *proc )
processCmdQueue();
}
-void IndexBuilder::slotReceivedStdout( KProcess *, char *buffer, int buflen )
+void IndexBuilder::slotReceivedStdout( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
std::cout << text.local8Bit().data() << std::flush;
}
-void IndexBuilder::slotReceivedStderr( KProcess *, char *buffer, int buflen )
+void IndexBuilder::slotReceivedStderr( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
std::cerr << text.local8Bit().data() << std::flush;
diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h
index 07871c39c..5eb849419 100644
--- a/khelpcenter/khc_indexbuilder.h
+++ b/khelpcenter/khc_indexbuilder.h
@@ -26,7 +26,7 @@
#include <tqobject.h>
#include <tqtimer.h>
-class KProcess;
+class TDEProcess;
namespace KHC {
@@ -44,9 +44,9 @@ class IndexBuilder : public QObject
protected slots:
void buildIndices();
- void slotProcessExited( KProcess * );
- void slotReceivedStdout( KProcess *, char *buffer, int buflen );
- void slotReceivedStderr( KProcess *, char *buffer, int buflen );
+ void slotProcessExited( TDEProcess * );
+ void slotReceivedStdout( TDEProcess *, char *buffer, int buflen );
+ void slotReceivedStderr( TDEProcess *, char *buffer, int buflen );
private:
TQString m_cmdFile;
diff --git a/khelpcenter/khelpcenter.kcfg b/khelpcenter/khelpcenter.kcfg
index 0ece51e12..836bb9f45 100644
--- a/khelpcenter/khelpcenter.kcfg
+++ b/khelpcenter/khelpcenter.kcfg
@@ -10,7 +10,7 @@
<entry type="Path" key="IndexDirectory">
<label>Path to index directory.</label>
<whatsthis>Path to directory containing search indices.</whatsthis>
- <default code="true">KGlobal::dirs()->saveLocation("data", "khelpcenter/index/")</default>
+ <default code="true">TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/")</default>
</entry>
<entry type="Int" key="Method">
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 30f81015f..f6e16da15 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -185,7 +185,7 @@ void MainWindow::readProperties( KConfig *config )
void MainWindow::readConfig()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "MainWindowState" );
TQValueList<int> sizes = config->readIntListEntry( "Splitter" );
if ( sizes.count() == 2 ) {
@@ -197,7 +197,7 @@ void MainWindow::readConfig()
void MainWindow::writeConfig()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "MainWindowState" );
config->writeEntry( "Splitter", mSplitter->sizes() );
@@ -237,7 +237,7 @@ void MainWindow::setupActions()
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
actionCollection() );
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Debug" );
if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index c2179e702..1907ac1f8 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -131,7 +131,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
hideSearch();
} else {
mSearchWidget->updateScopeList();
- mSearchWidget->readConfig( KGlobal::config() );
+ mSearchWidget->readConfig( TDEGlobal::config() );
}
connect( mTabWidget, TQT_SIGNAL( currentChanged( QWidget * ) ),
@@ -591,7 +591,7 @@ void Navigator::hideSearch()
bool Navigator::checkSearchIndex()
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Search" );
if ( cfg->readBoolEntry( "IndexExists", false ) ) return true;
@@ -626,7 +626,7 @@ KURL Navigator::homeURL()
{
if ( !mHomeUrl.isEmpty() ) return mHomeUrl;
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
// We have to reparse the configuration here in order to get a
// language-specific StartUrl, e.g. "StartUrl[de]".
cfg->reparseConfiguration();
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index 741660e16..e6912d5ef 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -38,7 +38,7 @@ class TQPushButton;
class KListView;
class KService;
-class KProcess;
+class TDEProcess;
class KProcIO;
class KCMHelpCenter;
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 55bdfa689..0b830725e 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -54,7 +54,7 @@ void ScrollKeeperTreeBuilder::loadConfig()
NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
NavigatorItem *after )
{
- TQString lang = KGlobal::locale()->language();
+ TQString lang = TDEGlobal::locale()->language();
kdDebug(1400) << "ScrollKeeper language: " << lang << endl;
@@ -62,7 +62,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
proc << "scrollkeeper-get-content-list";
proc << lang;
connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *)));
- if (!proc.start(KProcess::Block)) {
+ if (!proc.start(TDEProcess::Block)) {
kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl;
return 0;
}
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index b779afc8e..bc0a1d167 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -205,7 +205,7 @@ SearchEngine::SearchEngine( View *destination )
mProc( 0 ), mSearchRunning( false ), mView( destination ),
mRootTraverser( 0 )
{
- mLang = KGlobal::locale()->language().left( 2 );
+ mLang = TDEGlobal::locale()->language().left( 2 );
}
SearchEngine::~SearchEngine()
@@ -215,7 +215,7 @@ SearchEngine::~SearchEngine()
bool SearchEngine::initSearchHandlers()
{
- TQStringList resources = KGlobal::dirs()->findAllResources(
+ TQStringList resources = TDEGlobal::dirs()->findAllResources(
"appdata", "searchhandlers/*.desktop" );
TQStringList::ConstIterator it;
for( it = resources.begin(); it != resources.end(); ++it ) {
@@ -246,7 +246,7 @@ bool SearchEngine::initSearchHandlers()
return true;
}
-void SearchEngine::searchStdout(KProcess *, char *buffer, int len)
+void SearchEngine::searchStdout(TDEProcess *, char *buffer, int len)
{
if ( !buffer || len == 0 )
return;
@@ -262,7 +262,7 @@ void SearchEngine::searchStdout(KProcess *, char *buffer, int len)
free(p);
}
-void SearchEngine::searchStderr(KProcess *, char *buffer, int len)
+void SearchEngine::searchStderr(TDEProcess *, char *buffer, int len)
{
if ( !buffer || len == 0 )
return;
@@ -270,7 +270,7 @@ void SearchEngine::searchStderr(KProcess *, char *buffer, int len)
mStderr.append( TQString::fromUtf8( buffer, len ) );
}
-void SearchEngine::searchExited(KProcess *)
+void SearchEngine::searchExited(TDEProcess *)
{
kdDebug() << "Search terminated" << endl;
mSearchRunning = false;
@@ -293,7 +293,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
if ( method == "or" ) mOperation = Or;
else mOperation = And;
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Search" );
TQString commonSearchProgram = cfg->readPathEntry( "CommonProgram" );
bool useCommon = cfg->readBoolEntry( "UseCommonProgram", false );
@@ -320,7 +320,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
return true;
} else {
- TQString lang = KGlobal::locale()->language().left(2);
+ TQString lang = TDEGlobal::locale()->language().left(2);
if ( lang.lower() == "c" || lang.lower() == "posix" )
lang = "en";
@@ -340,7 +340,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
kdDebug() << "Common Search: " << commonSearchProgram << endl;
- mProc = new KProcess();
+ mProc = new TDEProcess();
TQStringList cmd = TQStringList::split( " ", commonSearchProgram );
TQStringList::ConstIterator it;
@@ -352,18 +352,18 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
*mProc << arg.utf8();
}
- connect( mProc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
- TQT_SLOT( searchStdout( KProcess *, char *, int ) ) );
- connect( mProc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
- TQT_SLOT( searchStderr( KProcess *, char *, int ) ) );
- connect( mProc, TQT_SIGNAL( processExited( KProcess * ) ),
- TQT_SLOT( searchExited( KProcess * ) ) );
+ connect( mProc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
+ connect( mProc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
+ connect( mProc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( searchExited( TDEProcess * ) ) );
mSearchRunning = true;
mSearchResult = "";
mStderr = "<b>" + commonSearchProgram + "</b>\n\n";
- mProc->start(KProcess::NotifyOnExit, KProcess::All);
+ mProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
while (mSearchRunning && mProc->isRunning())
kapp->processEvents();
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index 84f252746..31f4c667f 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -11,7 +11,7 @@
#include "docentrytraverser.h"
class TQWidget;
-class KProcess;
+class TDEProcess;
class KConfig;
class KHTMLPart;
@@ -114,15 +114,15 @@ class SearchEngine : public TQObject
void searchFinished();
protected slots:
- void searchStdout(KProcess *proc, char *buffer, int buflen);
- void searchStderr(KProcess *proc, char *buffer, int buflen);
- void searchExited(KProcess *proc);
+ void searchStdout(TDEProcess *proc, char *buffer, int buflen);
+ void searchStderr(TDEProcess *proc, char *buffer, int buflen);
+ void searchExited(TDEProcess *proc);
protected:
void processSearchQueue();
private:
- KProcess *mProc;
+ TDEProcess *mProc;
bool mSearchRunning;
TQString mSearchResult;
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 9c34d7399..076890428 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -37,7 +37,7 @@ using namespace KHC;
SearchHandler::SearchHandler()
{
- mLang = KGlobal::locale()->language().left( 2 );
+ mLang = TDEGlobal::locale()->language().left( 2 );
}
SearchHandler *SearchHandler::initFromFile( const TQString &filename )
@@ -102,7 +102,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
kdDebug() << "SearchHandler::search() CMD: " << cmdString << endl;
- KProcess *proc = new KProcess();
+ TDEProcess *proc = new TDEProcess();
TQStringList cmd = TQStringList::split( " ", cmdString );
TQStringList::ConstIterator it;
@@ -114,12 +114,12 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
*proc << arg.utf8();
}
- connect( proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
- TQT_SLOT( searchStdout( KProcess *, char *, int ) ) );
- connect( proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
- TQT_SLOT( searchStderr( KProcess *, char *, int ) ) );
- connect( proc, TQT_SIGNAL( processExited( KProcess * ) ),
- TQT_SLOT( searchExited( KProcess * ) ) );
+ connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( searchExited( TDEProcess * ) ) );
SearchJob *searchJob = new SearchJob;
searchJob->mEntry = entry;
@@ -128,7 +128,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
mProcessJobs.insert( proc, searchJob );
- if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
+ if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
TQString txt = i18n("Error executing search command '%1'.").arg( cmdString );
emit searchFinished( this, entry, txt );
}
@@ -155,7 +155,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
}
}
-void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
+void SearchHandler::searchStdout( TDEProcess *proc, char *buffer, int len )
{
if ( !buffer || len == 0 )
return;
@@ -166,7 +166,7 @@ void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
p = strncpy( p, buffer, len );
p[len] = '\0';
- TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
(*it)->mResult += bufferStr.fromUtf8( p );
}
@@ -174,18 +174,18 @@ void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
free( p );
}
-void SearchHandler::searchStderr( KProcess *proc, char *buffer, int len )
+void SearchHandler::searchStderr( TDEProcess *proc, char *buffer, int len )
{
if ( !buffer || len == 0 )
return;
- TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
(*it)->mError += TQString::fromUtf8( buffer, len );
}
}
-void SearchHandler::searchExited( KProcess *proc )
+void SearchHandler::searchExited( TDEProcess *proc )
{
// kdDebug() << "SearchHandler::searchExited()" << endl;
@@ -193,7 +193,7 @@ void SearchHandler::searchExited( KProcess *proc )
TQString error;
DocEntry *entry = 0;
- TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
SearchJob *j = *it;
entry = j->mEntry;
diff --git a/khelpcenter/searchhandler.h b/khelpcenter/searchhandler.h
index 13a6a56c1..356446db5 100644
--- a/khelpcenter/searchhandler.h
+++ b/khelpcenter/searchhandler.h
@@ -38,7 +38,7 @@ class SearchJob
DocEntry *mEntry;
- KProcess *mProcess;
+ TDEProcess *mProcess;
KIO::Job *mKioJob;
TQString mCmd;
@@ -71,9 +71,9 @@ class SearchHandler : public QObject
bool checkBinary( const TQString &cmd ) const;
protected slots:
- void searchStdout( KProcess *proc, char *buffer, int buflen );
- void searchStderr( KProcess *proc, char *buffer, int buflen );
- void searchExited( KProcess *proc );
+ void searchStdout( TDEProcess *proc, char *buffer, int buflen );
+ void searchStderr( TDEProcess *proc, char *buffer, int buflen );
+ void searchExited( TDEProcess *proc );
void slotJobResult( KIO::Job *job );
void slotJobData( KIO::Job *, const TQByteArray &data );
@@ -88,7 +88,7 @@ class SearchHandler : public QObject
TQString mIndexCommand;
TQStringList mDocumentTypes;
- TQMap<KProcess *,SearchJob *> mProcessJobs;
+ TQMap<TDEProcess *,SearchJob *> mProcessJobs;
TQMap<KIO::Job *,SearchJob *> mKioJobs;
};
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index 39b57bf3c..df04f9531 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -111,7 +111,7 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent )
SearchWidget::~SearchWidget()
{
- writeConfig( KGlobal::config() );
+ writeConfig( TDEGlobal::config() );
}
@@ -311,7 +311,7 @@ int ScopeTraverser::mNestingLevel = 2;
void SearchWidget::searchIndexUpdated()
{
- KGlobal::config()->reparseConfiguration();
+ TDEGlobal::config()->reparseConfiguration();
updateScopeList();
update();
}
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index d9b1752c8..19bcb01c0 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -78,7 +78,7 @@ void TOC::build( const TQString &file )
{
TQFileInfo fileInfo( file );
TQString fileName = fileInfo.absFilePath();
- const TQStringList resourceDirs = KGlobal::dirs()->resourceDirs( "html" );
+ const TQStringList resourceDirs = TDEGlobal::dirs()->resourceDirs( "html" );
TQStringList::ConstIterator it = resourceDirs.begin();
TQStringList::ConstIterator end = resourceDirs.end();
for ( ; it != end; ++it ) {
@@ -132,19 +132,19 @@ int TOC::cachedCTime() const
void TOC::buildCache()
{
- KProcess *meinproc = new KProcess;
- connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
- this, TQT_SLOT( meinprocExited( KProcess * ) ) );
+ TDEProcess *meinproc = new TDEProcess;
+ connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
*meinproc << locate( "exe", "meinproc" );
*meinproc << "--stylesheet" << locate( "data", "khelpcenter/table-of-contents.xslt" );
*meinproc << "--output" << m_cacheFile;
*meinproc << m_sourceFile;
- meinproc->start( KProcess::NotifyOnExit );
+ meinproc->start( TDEProcess::NotifyOnExit );
}
-void TOC::meinprocExited( KProcess *meinproc )
+void TOC::meinprocExited( TDEProcess *meinproc )
{
if ( !meinproc->normalExit() || meinproc->exitStatus() != 0 ) {
delete meinproc;
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index 270112235..0a38c2ad5 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -26,7 +26,7 @@
#include <tqlistview.h>
#include <tqobject.h>
-class KProcess;
+class TDEProcess;
namespace KHC {
@@ -47,7 +47,7 @@ class TOC : public QObject
private slots:
void slotItemSelected( TQListViewItem *item );
- void meinprocExited( KProcess *meinproc );
+ void meinprocExited( TDEProcess *meinproc );
private:
enum CacheStatus { NeedRebuild, CacheOk };
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 3a559409a..5e29114bc 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -149,12 +149,12 @@ TQString View::langLookup( const TQString &fname )
TQStringList search;
// assemble the local search paths
- const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html");
+ const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html");
// look up the different languages
for (int id=localDoc.count()-1; id >= 0; --id)
{
- TQStringList langs = KGlobal::locale()->languageList();
+ TQStringList langs = TDEGlobal::locale()->languageList();
langs.append( "en" );
langs.remove( "C" );
TQStringList::ConstIterator lang;