From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- parts/documentation/docglobalconfigwidget.cpp | 6 ++--- parts/documentation/documentation_part.cpp | 2 +- parts/documentation/find_documentation.cpp | 32 +++++++++++++------------- parts/documentation/find_documentation.h | 14 +++++------ parts/documentation/searchview.cpp | 20 ++++++++-------- parts/documentation/searchview.h | 6 ++--- parts/documentation/tools/htdig/htdigindex.cpp | 26 ++++++++++----------- parts/documentation/tools/htdig/htdigindex.h | 10 ++++---- 8 files changed, 58 insertions(+), 58 deletions(-) (limited to 'parts/documentation') diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 8d524a47..712a57fa 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -105,7 +105,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, //font sizes and zoom levels KHTMLPart htmlpart; - KConfig *appConfig = KGlobal::config(); + KConfig *appConfig = TDEGlobal::config(); appConfig->setGroup("KHTMLPart"); standardFont_combo->setCurrentText(appConfig->readEntry("StandardFont", htmlpart.settings()->stdFontName())); @@ -214,7 +214,7 @@ void DocGlobalConfigWidget::accept() m_part->setAssistantUsed(useAssistant_box->isChecked()); //font sizes and zoom levels - KConfig *appConfig = KGlobal::config(); + KConfig *appConfig = TDEGlobal::config(); appConfig->setGroup("KHTMLPart"); appConfig->writeEntry("StandardFont", standardFont_combo->currentText()); appConfig->writeEntry("FixedFont", fixedFont_combo->currentText()); @@ -241,7 +241,7 @@ void DocGlobalConfigWidget::updateConfigForHTMLParts() KHTMLPart *htmlPart = dynamic_cast(m_part->partController()->partForURL(*it)); if (htmlPart) { - KConfig *appConfig = KGlobal::config(); + KConfig *appConfig = TDEGlobal::config(); appConfig->setGroup("KHTMLPart"); htmlPart->setStandardFont(appConfig->readEntry("StandardFont")); htmlPart->setFixedFont(appConfig->readEntry("FixedFont")); diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 37bd7a40..23fd0e14 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -739,7 +739,7 @@ void DocumentationPart::loadSettings() config->setGroup("Documentation"); m_assistantUsed = config->readBoolEntry("UseAssistant", false); - if (TQString(KGlobal::instance()->aboutData()->appName()) == "kdevassistant") + if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "kdevassistant") { int page = config->readNumEntry("LastPage", 0); switch (page) diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index ac95d878..e5068635 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -48,18 +48,18 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na { TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop()); setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height()); - proc_man = new KProcess( TQT_TQOBJECT(this) ); - proc_info = new KProcess( TQT_TQOBJECT(this) ); + proc_man = new TDEProcess( TQT_TQOBJECT(this) ); + proc_info = new TDEProcess( TQT_TQOBJECT(this) ); - connect( proc_man, TQT_SIGNAL(processExited( KProcess* )), - this, TQT_SLOT(procManExited( KProcess* )) ); - connect( proc_man, TQT_SIGNAL(receivedStdout( KProcess*, char*, int)), - this, TQT_SLOT(procManReadStdout( KProcess*, char*, int)) ); + connect( proc_man, TQT_SIGNAL(processExited( TDEProcess* )), + this, TQT_SLOT(procManExited( TDEProcess* )) ); + connect( proc_man, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQT_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); - connect( proc_info, TQT_SIGNAL(processExited( KProcess* )), - this, TQT_SLOT(procInfoExited( KProcess* )) ); - connect( proc_info, TQT_SIGNAL(receivedStdout( KProcess*, char*, int)), - this, TQT_SLOT(procInfoReadStdout( KProcess*, char*, int)) ); + connect( proc_info, TQT_SIGNAL(processExited( TDEProcess* )), + this, TQT_SLOT(procInfoExited( TDEProcess* )) ); + connect( proc_info, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQT_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); result_list->header()->hide(); result_list->setSorting(-1); @@ -102,7 +102,7 @@ void FindDocumentation::clickOnItem( TQListViewItem * item ) m_widget->part()->partController()->showDocument(doc_item->url()); } -void FindDocumentation::procInfoExited( KProcess* ) +void FindDocumentation::procInfoExited( TDEProcess* ) { if (proc_info->normalExit() && proc_info->exitStatus() == 0) { @@ -125,7 +125,7 @@ void FindDocumentation::procInfoExited( KProcess* ) } } -void FindDocumentation::procManExited( KProcess* ) +void FindDocumentation::procManExited( TDEProcess* ) { if (proc_man->normalExit() && proc_man->exitStatus() == 0) { @@ -145,12 +145,12 @@ void FindDocumentation::procManExited( KProcess* ) } } -void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len) +void FindDocumentation::procInfoReadStdout( TDEProcess*, char* buf, int len) { proc_info_out += TQString::fromLatin1( buf, len ); } -void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len) +void FindDocumentation::procManReadStdout( TDEProcess*, char* buf, int len) { proc_man_out += TQString::fromLatin1( buf, len ); } @@ -167,7 +167,7 @@ void FindDocumentation::searchInInfo() *proc_info << "-w"; *proc_info << search_term->text(); - if ( !proc_info->start( KProcess::NotifyOnExit, KProcess::Stdout ) ) + if ( !proc_info->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { // error handling } @@ -185,7 +185,7 @@ void FindDocumentation::searchInMan() *proc_man << "-w"; *proc_man << search_term->text(); - if ( !proc_man->start( KProcess::NotifyOnExit, KProcess::Stdout ) ) + if ( !proc_man->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { // error handling } diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index 31b7adeb..28d867c3 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -28,7 +28,7 @@ class DocumentationWidget; class KListViewItem; class FindDocumentationOptions; -class KProcess; +class TDEProcess; class FindDocumentation : public FindDocumentationBase { @@ -43,10 +43,10 @@ public slots: /*$PUBLIC_SLOTS$*/ virtual void buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c ); virtual void clickOnItem( TQListViewItem * item ); - virtual void procInfoExited( KProcess* ); - virtual void procManExited( KProcess* ); - virtual void procManReadStdout( KProcess*, char*, int ); - virtual void procInfoReadStdout( KProcess*, char*, int ); + virtual void procInfoExited( TDEProcess* ); + virtual void procManExited( TDEProcess* ); + virtual void procManReadStdout( TDEProcess*, char*, int ); + virtual void procInfoReadStdout( TDEProcess*, char*, int ); virtual void searchInInfo(); virtual void searchInMan(); virtual void searchInGoogle(); @@ -64,8 +64,8 @@ protected slots: /*$PROTECTED_SLOTS$*/ private: - KProcess* proc_man; - KProcess* proc_info; + TDEProcess* proc_man; + TDEProcess* proc_info; TQString proc_man_out; TQString proc_info_out; KListViewItem* man_item; diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index aed30404..69a91a6e 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -131,9 +131,9 @@ void SearchView::updateIndex() void SearchView::runHtdig(const TQString &arg) { - KProcess proc; + TDEProcess proc; proc << "tdevelop-htdig" << arg; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void tqt_enter_modal(TQWidget *widget); @@ -190,19 +190,19 @@ void SearchView::search() kdDebug(9002) << "starting kprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; - 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 *)) ); searchResult = ""; - if (!proc->start(KProcess::NotifyOnExit, KProcess::Stdout)) + if (!proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout)) { KMessageBox::error(this, i18n("Cannot start the htsearch executable.")); kdDebug() << "process start failed" << endl; @@ -247,12 +247,12 @@ void SearchView::search() // m_part->partController()->showDocument(KURL("file://" + indexdir + "/results.html")); } -void SearchView::htsearchStdout(KProcess *, char *buffer, int len) +void SearchView::htsearchStdout(TDEProcess *, char *buffer, int len) { searchResult += TQString::fromLocal8Bit(buffer, len); } -void SearchView::htsearchExited(KProcess *) +void SearchView::htsearchExited(TDEProcess *) { kapp->exit_loop(); } diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index 54eca941..cf7062c7 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -27,7 +27,7 @@ class KLineEdit; class KComboBox; class KListView; class KPushButton; -class KProcess; +class TDEProcess; class TQListViewItem; class SearchView: public TQWidget @@ -47,8 +47,8 @@ protected slots: void updateConfig(); void updateIndex(); - void htsearchStdout(KProcess *, char *buffer, int len); - void htsearchExited(KProcess *); + void htsearchStdout(TDEProcess *, char *buffer, int len); + void htsearchExited(TDEProcess *); void executed(TQListViewItem *item); void itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int c); diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index 328a0387..4c0dfa99 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -210,7 +210,7 @@ void ProgressDialog::scanDirectories() bool ProgressDialog::createConfig() { // locate the common dir - TQString language = KGlobal::locale()->language(); + TQString language = TDEGlobal::locale()->language(); if (language == "C") language = "en"; @@ -263,13 +263,13 @@ void ProgressDialog::startHtdigProcess(bool initial) { kdDebug(9002) << "htdig started" << endl; delete proc; - proc = new KProcess(); + proc = new TDEProcess(); *proc << exe << "-c" << (indexdir + "/htdig.conf"); if (initial) { *proc << "-i"; } - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(htdigExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(htdigExited(TDEProcess *))); htdigRunning = true; @@ -292,7 +292,7 @@ void ProgressDialog::startHtdigProcess(bool initial) f.close(); // execute htdig - proc->start(KProcess::NotifyOnExit, KProcess::Stdout); + proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } bool ProgressDialog::generateIndex() @@ -318,7 +318,7 @@ bool ProgressDialog::generateIndex() return true; } -void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len) +void ProgressDialog::htdigStdout(TDEProcess *, char *buffer, int len) { TQString line = TQString(buffer).left(len); @@ -335,7 +335,7 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len) setFilesDigged(filesDigged); } -void ProgressDialog::htdigExited(KProcess *proc) +void ProgressDialog::htdigExited(TDEProcess *proc) { kdDebug(9002) << "htdig terminated" << endl; if (!proc->normalExit()) @@ -382,20 +382,20 @@ void ProgressDialog::startHtmergeProcess() { kdDebug(9002) << "htmerge started" << endl; delete proc; - proc = new KProcess(); + proc = new TDEProcess(); *proc << exe << "-c" << (indexdir + "/htdig.conf"); kdDebug(9002) << "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); } -void ProgressDialog::htmergeExited(KProcess *proc) +void ProgressDialog::htmergeExited(TDEProcess *proc) { kdDebug(9002) << "htmerge terminated" << endl; htmergeRunning = false; @@ -458,7 +458,7 @@ int main(int argc, char *argv[]) TDEApplication app; - KGlobal::locale()->setMainCatalogue("tdevelop"); + TDEGlobal::locale()->setMainCatalogue("tdevelop"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h index 9afa4d45..5c521be1 100644 --- a/parts/documentation/tools/htdig/htdigindex.h +++ b/parts/documentation/tools/htdig/htdigindex.h @@ -19,7 +19,7 @@ class TQTimer; class TQLabel; -class KProcess; +class TDEProcess; class KProgress; class ProgressDialog : public KDialogBase @@ -36,9 +36,9 @@ public: bool generateIndex(); private slots: - void htdigStdout(KProcess *proc, char *buffer, int buflen); - void htdigExited(KProcess *proc); - void htmergeExited(KProcess *proc); + void htdigStdout(TDEProcess *proc, char *buffer, int buflen); + void htdigExited(TDEProcess *proc); + void htmergeExited(TDEProcess *proc); void cancelClicked(); void okClicked(); void slotDelayedStart(); @@ -61,7 +61,7 @@ private: TQString indexdir; TQString exe; TQStringList files; - KProcess *proc; + TDEProcess *proc; volatile int filesToDig, filesDigged, filesScanned; bool htdigRunning, htmergeRunning; }; -- cgit v1.2.3