From 29df04c24350cc76a41e2410d1c92445f9338b98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- quanta/project/project.cpp | 2 +- quanta/project/projectnewweb.cpp | 20 ++++++++++---------- quanta/project/projectnewweb.h | 8 ++++---- quanta/project/projectprivate.cpp | 2 +- quanta/project/rescanprj.cpp | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'quanta/project') diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index ef737396..aed1942e 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -526,7 +526,7 @@ void Project::slotOptions() optionsPage.dtdCombo->setCurrentItem(pos); - TQStringList availableEncodingNames(KGlobal::charsets()->availableEncodingNames()); + TQStringList availableEncodingNames(TDEGlobal::charsets()->availableEncodingNames()); optionsPage.encodingCombo->insertStringList( availableEncodingNames ); TQStringList::ConstIterator iter; int iIndex = -1; diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index a087497c..31d3f620 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -105,7 +105,7 @@ void ProjectNewWeb::slotStart() { chdir( baseURL.path(1).ascii() ); - proc = new KProcess(); + proc = new TDEProcess(); proc ->clearArguments(); TQStringList list = TQStringList::split (" ", commandLine->text()); @@ -115,14 +115,14 @@ void ProjectNewWeb::slotStart() *proc << *it; } - connect( proc, TQT_SIGNAL(receivedStdout( KProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(KProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( KProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(KProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( KProcess *)), this, - TQT_SLOT( slotGetWgetExited(KProcess *))); + connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQT_SIGNAL(processExited( TDEProcess *)), this, + TQT_SLOT( slotGetWgetExited(TDEProcess *))); - if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput)) + if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { start = true; button->setText( i18n("Stop") ); @@ -159,7 +159,7 @@ void ProjectNewWeb::slotStart() } } -void ProjectNewWeb::slotGetWgetExited(KProcess*) +void ProjectNewWeb::slotGetWgetExited(TDEProcess*) { KLed2->setState(KLed::Off); KLed1->setState(KLed::Off); @@ -169,7 +169,7 @@ void ProjectNewWeb::slotGetWgetExited(KProcess*) emit enableNextButton((TQWidget *)this->parent(),true); } -void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) +void ProjectNewWeb::slotGetWgetOutput(TDEProcess *, char *buffer, int buflen) { TQString output = buffer; output = output.left( buflen ); diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h index fa7ff2e0..5c6e2b5e 100644 --- a/quanta/project/projectnewweb.h +++ b/quanta/project/projectnewweb.h @@ -29,7 +29,7 @@ *@author Dmitry Poplavsky & Alexander Yakovlev & Eric Laffoon */ -class KProcess; +class TDEProcess; class KURL; class ProjectNewWeb : public ProjectNewWebS { @@ -48,8 +48,8 @@ public slots: KURL::List files(); - void slotGetWgetExited(KProcess *); - void slotGetWgetOutput(KProcess *proc, char *buffer, int buflen); + void slotGetWgetExited(TDEProcess *); + void slotGetWgetOutput(TDEProcess *proc, char *buffer, int buflen); virtual void resizeEvent( TQResizeEvent * ); @@ -66,7 +66,7 @@ private: bool start; - KProcess *proc; + TDEProcess *proc; private slots: // Private slots /** No descriptions */ diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index ce3686bf..fd49f0ce 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -1174,7 +1174,7 @@ void ProjectPrivate::slotNewProject() if (pos >= 0) pnf->dtdCombo->setCurrentItem(pos); - TQStringList availableEncodingNames(KGlobal::charsets()->availableEncodingNames()); + TQStringList availableEncodingNames(TDEGlobal::charsets()->availableEncodingNames()); pnf->encodingCombo->insertStringList( availableEncodingNames ); TQStringList::ConstIterator iter; int iIndex = -1; diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index bf11498d..daa628a5 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -88,8 +88,8 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) KURL url = static_cast(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = list.begin(); KIO::UDSEntryListConstIterator end = list.end(); -- cgit v1.2.3