From fc49aab70dd400cb8cb77406926c49ca91b0ca5e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:20:52 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/kile/cleandialog.cpp | 2 +- src/kile/codecompletion.cpp | 2 +- src/kile/configcodecompletion.cpp | 2 +- src/kile/configtester.cpp | 14 +++++++------- src/kile/configtester.h | 8 ++++---- src/kile/convert.cpp | 2 +- src/kile/docpart.cpp | 2 +- src/kile/includegraphicsdialog.cpp | 18 +++++++++--------- src/kile/includegraphicsdialog.h | 6 +++--- src/kile/kile.cpp | 6 +++--- src/kile/kileactions.cpp | 2 +- src/kile/kileapplication.cpp | 2 +- src/kile/kilefileselect.cpp | 2 +- src/kile/kilegrepdialog.cpp | 24 ++++++++++++------------ src/kile/kilegrepdialog.h | 8 ++++---- src/kile/kilehelp.cpp | 4 ++-- src/kile/kilejscript.cpp | 6 +++--- src/kile/kilelauncher.cpp | 16 ++++++++-------- src/kile/kilelauncher.h | 6 +++--- src/kile/kileproject.cpp | 2 +- src/kile/kilestdtools.cpp | 4 ++-- src/kile/managetemplatesdialog.cpp | 2 +- src/kile/newtoolwizard.ui.h | 2 +- src/kile/postscriptdialog.cpp | 20 ++++++++++---------- src/kile/postscriptdialog.h | 4 ++-- src/kile/quickdocumentdialog.cpp | 4 ++-- src/kile/quicktoolconfigwidget.ui.h | 4 ++-- src/kile/symbolview.cpp | 6 +++--- src/kile/templates.cpp | 28 ++++++++++++++-------------- src/kile/templates.h | 6 +++--- src/kile/texdocdialog.cpp | 18 +++++++++--------- src/kile/texdocdialog.h | 4 ++-- 32 files changed, 118 insertions(+), 118 deletions(-) (limited to 'src') diff --git a/src/kile/cleandialog.cpp b/src/kile/cleandialog.cpp index 180f329..ebdaabb 100644 --- a/src/kile/cleandialog.cpp +++ b/src/kile/cleandialog.cpp @@ -43,7 +43,7 @@ namespace KileDialog // line 1: picture and label TQLabel *picture = new TQLabel("", labelwidget); - picture->setPixmap( KGlobal::instance()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium) ); + picture->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium) ); TQLabel *label = new TQLabel(i18n( "Do you really want to delete these files?" ), labelwidget); labellayout->addWidget(picture); labellayout->addSpacing(20); diff --git a/src/kile/codecompletion.cpp b/src/kile/codecompletion.cpp index 792d905..ffa408b 100644 --- a/src/kile/codecompletion.cpp +++ b/src/kile/codecompletion.cpp @@ -892,7 +892,7 @@ namespace KileDocument void CodeCompletion::readWordlist( TQStringList &wordlist, const TQString &filename, bool global ) { TQString file = ( global ) - ? KGlobal::dirs()->findResource( "appdata", "complete/" + filename ) + ? TDEGlobal::dirs()->findResource( "appdata", "complete/" + filename ) : m_localAbbrevFile; if ( file.isEmpty() ) return; diff --git a/src/kile/configcodecompletion.cpp b/src/kile/configcodecompletion.cpp index 6ddb0a1..d30b4ef 100644 --- a/src/kile/configcodecompletion.cpp +++ b/src/kile/configcodecompletion.cpp @@ -411,7 +411,7 @@ void ConfigCodeCompletion::getCwlDirs() m_localCwlDir = locateLocal("appdata","complete/"); m_globalCwlDir = TQString(); - TQStringList dirs = KGlobal::dirs()->findDirs("appdata","complete/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("appdata","complete/"); for ( TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it ) { if ( (*it) != m_localCwlDir ) diff --git a/src/kile/configtester.cpp b/src/kile/configtester.cpp index 6319964..9bada6a 100644 --- a/src/kile/configtester.cpp +++ b/src/kile/configtester.cpp @@ -161,14 +161,14 @@ void Tester::saveResults(const KURL & dest) void Tester::runTests() { - TQString srcdir = KGlobal::dirs()->findResourceDir("appdata","test/runTests.sh") + "test"; + TQString srcdir = TDEGlobal::dirs()->findResourceDir("appdata","test/runTests.sh") + "test"; KILE_DEBUG() << "Tester::runTests: srcdir = " << srcdir << endl; m_tempDir = new KTempDir(); TQString destdir = m_tempDir->name(); KILE_DEBUG() << "Tester::runTests: destdir = " << destdir << endl; m_resultsFile = destdir + "results.rc"; - TQString shellname = KGlobal::dirs()->findExe("sh"); + TQString shellname = TDEGlobal::dirs()->findExe("sh"); KILE_DEBUG() << "Tester::runTests: shellname = " << shellname << endl; m_process = new KShellProcess(TQFile::encodeName( shellname )); if (! KileConfig::teXPaths().isEmpty()) @@ -178,9 +178,9 @@ void Tester::runTests() *m_process << "cd " + KShellProcess::quote(destdir) + " && "; *m_process << "cp " + KShellProcess::quote(srcdir) +"/* " + KShellProcess::quote(destdir) + " && "; *m_process << "source runTests.sh " + KShellProcess::quote(m_resultsFile) + " " + KShellProcess::quote(destdir); - connect(m_process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(determineProgress(KProcess *, char *, int))); - connect(m_process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processTestResults(KProcess *))); - if (m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) emit(started()); + connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(determineProgress(TDEProcess *, char *, int))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processTestResults(TDEProcess *))); + if (m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) emit(started()); } void Tester::stop() @@ -188,7 +188,7 @@ void Tester::stop() if (m_process) m_process->kill(); } -void Tester::determineProgress(KProcess */*proc*/, char *buf, int len) +void Tester::determineProgress(TDEProcess */*proc*/, char *buf, int len) { static TQString s = TQString(); @@ -202,7 +202,7 @@ void Tester::determineProgress(KProcess */*proc*/, char *buf, int len) } } -void Tester::processTestResults (KProcess *proc) +void Tester::processTestResults (TDEProcess *proc) { if (proc->normalExit()) { diff --git a/src/kile/configtester.h b/src/kile/configtester.h index 0ff4f4b..f460e1d 100644 --- a/src/kile/configtester.h +++ b/src/kile/configtester.h @@ -20,7 +20,7 @@ class KTempDir; class KConfig; -class KProcess; +class TDEProcess; class KURL; /** @@ -83,8 +83,8 @@ signals: void finished(bool); private slots: - void determineProgress(KProcess *, char *, int); - void processTestResults (KProcess *); + void determineProgress(TDEProcess *, char *, int); + void processTestResults (TDEProcess *); void processTool(KConfig *, const TQString &); void addResult(const TQString &tool, const TQValueList &tests); @@ -93,7 +93,7 @@ private: TQMap > m_results; TQString m_resultsFile; KTempDir *m_tempDir; - KProcess *m_process; + TDEProcess *m_process; }; #endif diff --git a/src/kile/convert.cpp b/src/kile/convert.cpp index c40cdb2..fbe2b9d 100644 --- a/src/kile/convert.cpp +++ b/src/kile/convert.cpp @@ -111,7 +111,7 @@ bool ConvertMap::load() //makeMap(encoding()); //if map already exists, replace it - TQFile qf(KGlobal::dirs()->findResource("appdata","encodings/" + encoding() + ".enc")); + TQFile qf(TDEGlobal::dirs()->findResource("appdata","encodings/" + encoding() + ".enc")); if ( qf.open(IO_ReadOnly) ) { diff --git a/src/kile/docpart.cpp b/src/kile/docpart.cpp index 5ef5f1a..3093ae5 100644 --- a/src/kile/docpart.cpp +++ b/src/kile/docpart.cpp @@ -34,7 +34,7 @@ DocumentationViewer::DocumentationViewer(TQWidget *parent, const char *name ) : konqConfig.setGroup("HTML Settings"); //const KHTMLSettings * set = settings(); //( const_cast(set) )->init( &konqConfig, false ); - TQString rc = KGlobal::dirs()->findResource("appdata", "docpartui.rc"); + TQString rc = TDEGlobal::dirs()->findResource("appdata", "docpartui.rc"); setXMLFile(rc); (void) KStdAction::back(this, TQT_SLOT(back()), actionCollection(),"Back" ); (void) KStdAction::forward(this, TQT_SLOT(forward()), actionCollection(),"Forward" ); diff --git a/src/kile/includegraphicsdialog.cpp b/src/kile/includegraphicsdialog.cpp index 3397a91..49902b2 100644 --- a/src/kile/includegraphicsdialog.cpp +++ b/src/kile/includegraphicsdialog.cpp @@ -410,30 +410,30 @@ void IncludeGraphics::execute(const TQString &command) m_proc->clearArguments(); (*m_proc) << TQStringList::split(' ',command); - connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(slotProcessOutput(KProcess*,char*,int)) ); - connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotProcessOutput(KProcess*,char*,int)) ); - connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(slotProcessOutput(TDEProcess*,char*,int)) ); + connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(slotProcessOutput(TDEProcess*,char*,int)) ); + connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); m_output = ""; KILE_DEBUG() << "=== IncludeGraphics::execute ====================" << endl; KILE_DEBUG() << " execute '" << command << "'" << endl; - m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput); + m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } // get all output of identify -void IncludeGraphics::slotProcessOutput(KProcess*,char* buffer,int buflen) +void IncludeGraphics::slotProcessOutput(TDEProcess*,char* buffer,int buflen) { m_output += TQString::fromLocal8Bit(buffer,buflen); } // identify was called -void IncludeGraphics::slotProcessExited(KProcess* proc) +void IncludeGraphics::slotProcessExited(TDEProcess* proc) { if ( proc->normalExit() && !proc->exitStatus() ) { KILE_DEBUG() << " result: " << m_output << endl; diff --git a/src/kile/includegraphicsdialog.h b/src/kile/includegraphicsdialog.h index 396f29b..7685c1d 100644 --- a/src/kile/includegraphicsdialog.h +++ b/src/kile/includegraphicsdialog.h @@ -30,7 +30,7 @@ class TQCheckBox; class KileInfo; class KLineEdit; -class KProcess; +class TDEProcess; class KShellProcess; namespace KileDialog @@ -52,8 +52,8 @@ private slots: void chooseFile(); void updateFigure(); - void slotProcessOutput(KProcess* proc,char* buffer,int buflen); - void slotProcessExited(KProcess* proc); + void slotProcessOutput(TDEProcess* proc,char* buffer,int buflen); + void slotProcessExited(TDEProcess* proc); void slotOk(); diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp index 73df995..3221ec0 100644 --- a/src/kile/kile.cpp +++ b/src/kile/kile.cpp @@ -92,7 +92,7 @@ Kile::Kile( bool allowRestore, TQWidget *parent, const char *name ) : { m_focusWidget = this; - m_config = KGlobal::config(); + m_config = TDEGlobal::config(); readUserSettings(); readRecentFileSettings(); @@ -120,7 +120,7 @@ Kile::Kile( bool allowRestore, TQWidget *parent, const char *name ) : readGUISettings(); - KGlobal::dirs()->addResourceType( "app_symbols",KStandardDirs::kde_default("data") + "kile/mathsymbols/"); // needed for Symbolview + TDEGlobal::dirs()->addResourceType( "app_symbols",KStandardDirs::kde_default("data") + "kile/mathsymbols/"); // needed for Symbolview setXMLFile( "kileui.rc" ); @@ -652,7 +652,7 @@ void Kile::setupActions() else {WatchFileAction->setChecked(false);} setHelpMenuEnabled(false); - const TDEAboutData *aboutData = KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData(); KHelpMenu *help_menu = new KHelpMenu( this, aboutData); KStdAction::tipOfDay(TQT_TQOBJECT(this), TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); diff --git a/src/kile/kileactions.cpp b/src/kile/kileactions.cpp index d16b3e3..9206971 100644 --- a/src/kile/kileactions.cpp +++ b/src/kile/kileactions.cpp @@ -211,7 +211,7 @@ InputDialog::InputDialog(const TQString &caption, uint options, const TQStringLi if ( (options & KileAction::KeepHistory) || (options & KileAction::FromLabelList) || (options & KileAction::FromBibItemList) ) { KComboBox *input = new KComboBox(true, page, "input_dialog_input"); - input->setCompletionMode(KGlobalSettings::CompletionAuto); + input->setCompletionMode(TDEGlobalSettings::CompletionAuto); input->setMinimumWidth(300); focus = input; diff --git a/src/kile/kileapplication.cpp b/src/kile/kileapplication.cpp index b78a160..99564b8 100644 --- a/src/kile/kileapplication.cpp +++ b/src/kile/kileapplication.cpp @@ -33,7 +33,7 @@ static TQWidget *splash=0; KileApplication::KileApplication() { TQRect screen = TQApplication::desktop()->screenGeometry(); - TQPixmap pm(KGlobal::dirs()->findResource("appdata","pics/kile_splash.png")); + TQPixmap pm(TDEGlobal::dirs()->findResource("appdata","pics/kile_splash.png")); splash = new TQWidget( 0, "splash", WDestructiveClose | WStyle_Customize | WStyle_NoBorder | WX11BypassWM | WStyle_StaysOnTop ); pix=new TQFrame(splash,"pix",TQWidget::WStyle_NoBorder | TQWidget::WStyle_Customize); pix->setBackgroundPixmap(pm); diff --git a/src/kile/kilefileselect.cpp b/src/kile/kilefileselect.cpp index 154e75d..07dc472 100644 --- a/src/kile/kilefileselect.cpp +++ b/src/kile/kilefileselect.cpp @@ -86,7 +86,7 @@ KileFileSelect::KileFileSelect(KileDocument::Extensions *extensions, TQWidget *p lo->setStretchFactor(dir, 2); m_comboEncoding = new KComboBox( false, this, "comboEncoding" ); - TQStringList availableEncodingNames(KGlobal::charsets()->availableEncodingNames()); + TQStringList availableEncodingNames(TDEGlobal::charsets()->availableEncodingNames()); m_comboEncoding->setEditable( true ); m_comboEncoding->insertStringList( availableEncodingNames ); TQToolTip::add(m_comboEncoding, i18n("Set encoding")); diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp index b9f37aa..01c26de 100644 --- a/src/kile/kilegrepdialog.cpp +++ b/src/kile/kilegrepdialog.cpp @@ -478,12 +478,12 @@ void KileGrepDialog::slotItemSelected(const TQString& item) void KileGrepDialog::startGrep() { - childproc = new KProcess(); + childproc = new TDEProcess(); childproc->setUseShell(true); if ( m_mode == KileGrep::Project ) { - TQString command = buildProjectCommand() + ' ' + KProcess::quote(m_projectfiles[m_grepJobs-1]); + TQString command = buildProjectCommand() + ' ' + TDEProcess::quote(m_projectfiles[m_grepJobs-1]); KILE_DEBUG() << "\tgrep (project): " << command << endl; (*childproc) << TQStringList::split(' ',command); } @@ -495,14 +495,14 @@ void KileGrepDialog::startGrep() } m_grepJobs--; - connect( childproc, TQT_SIGNAL(processExited(KProcess *)), + connect( childproc, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(childExited()) ); - connect( childproc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(receivedOutput(KProcess *, char *, int)) ); - connect( childproc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - TQT_SLOT(receivedErrOutput(KProcess *, char *, int)) ); + connect( childproc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(receivedOutput(TDEProcess *, char *, int)) ); + connect( childproc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + TQT_SLOT(receivedErrOutput(TDEProcess *, char *, int)) ); - childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput); + childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } void KileGrepDialog::processOutput() @@ -530,13 +530,13 @@ void KileGrepDialog::processOutput() kapp->processEvents(); } -void KileGrepDialog::receivedOutput(KProcess */*proc*/, char *buffer, int buflen) +void KileGrepDialog::receivedOutput(TDEProcess */*proc*/, char *buffer, int buflen) { buf += TQString::fromLocal8Bit(buffer, buflen); processOutput(); } -void KileGrepDialog::receivedErrOutput(KProcess */*proc*/, char *buffer, int buflen) +void KileGrepDialog::receivedErrOutput(TDEProcess */*proc*/, char *buffer, int buflen) { errbuf += TQString::fromLocal8Bit( buffer, buflen ); } @@ -619,7 +619,7 @@ TQString KileGrepDialog::getShellPattern() TQString pattern = getPattern(); pattern.replace("'", "'\\''"); return '\'' + pattern + '\''; - //return KProcess::quote(pattern); + //return TDEProcess::quote(pattern); } @@ -648,7 +648,7 @@ TQString KileGrepDialog::buildFilesCommand() TQString shell_command; shell_command += "find "; - shell_command += KProcess::quote(dir_combo->url()); + shell_command += TDEProcess::quote(dir_combo->url()); shell_command += " \\( -name "; shell_command += files; shell_command += " \\)"; diff --git a/src/kile/kilegrepdialog.h b/src/kile/kilegrepdialog.h index 11341a8..1eb1489 100644 --- a/src/kile/kilegrepdialog.h +++ b/src/kile/kilegrepdialog.h @@ -37,7 +37,7 @@ class TQEvent; class KComboBox; class KLineEdit; -class KProcess; +class TDEProcess; class KURLRequester; class KListBox; @@ -73,7 +73,7 @@ signals: private: KileInfo *m_ki; KileGrep::Mode m_mode; - KProcess *childproc; + TDEProcess *childproc; int m_grepJobs; void readConfig(); @@ -123,8 +123,8 @@ private: private slots: void childExited(); - void receivedOutput(KProcess *proc, char *buffer, int buflen); - void receivedErrOutput(KProcess *proc, char *buffer, int buflen); + void receivedOutput(TDEProcess *proc, char *buffer, int buflen); + void receivedErrOutput(TDEProcess *proc, char *buffer, int buflen); void slotItemSelected(const TQString&); void slotSearch(); void slotClear(); diff --git a/src/kile/kilehelp.cpp b/src/kile/kilehelp.cpp index 7be9e10..57f842d 100644 --- a/src/kile/kilehelp.cpp +++ b/src/kile/kilehelp.cpp @@ -281,7 +281,7 @@ namespace KileHelp void Help::helpKileRefsKeyword(Kate::View *view) { - TQString kilehelp = KGlobal::dirs()->findResource("html","en/kile/latexhelp.html"); + TQString kilehelp = TDEGlobal::dirs()->findResource("html","en/kile/latexhelp.html"); KILE_DEBUG() << "kilehelp = " << kilehelp << endl; if ( ! kilehelp.isEmpty() ) { @@ -327,7 +327,7 @@ namespace KileHelp void Help::readHelpList(const TQString &filename,TQMap &map) { - TQString file = KGlobal::dirs()->findResource("appdata","help/" + filename); + TQString file = TDEGlobal::dirs()->findResource("appdata","help/" + filename); if ( file.isEmpty() ) { KILE_DEBUG() << " file not found: " << filename << endl; diff --git a/src/kile/kilejscript.cpp b/src/kile/kilejscript.cpp index dc77ef9..00c36f2 100644 --- a/src/kile/kilejscript.cpp +++ b/src/kile/kilejscript.cpp @@ -406,7 +406,7 @@ namespace KileJScript { */ JScript::JScript(unsigned int id, const TQString& file) : m_id(id), m_file(file), m_action(NULL) { - m_name = KGlobal::dirs()->relativeLocation("appdata", file); + m_name = TDEGlobal::dirs()->relativeLocation("appdata", file); if(m_name.startsWith("scripts")) { m_name = m_name.mid(8); // remove "scripts" + path separator } @@ -586,7 +586,7 @@ m_kileInfo->viewManager()->currentView()->down();*/ } m_config->setGroup(TQString()); - TQStringList scriptFileNamesList = KGlobal::dirs()->findAllResources("appdata", "scripts/*.js", true, true); + TQStringList scriptFileNamesList = TDEGlobal::dirs()->findAllResources("appdata", "scripts/*.js", true, true); for(TQStringList::iterator i = scriptFileNamesList.begin(); i != scriptFileNamesList.end(); ++i) { registerScript(*i, pathIDMap, takenIDMap, maxID); } @@ -692,7 +692,7 @@ m_kileInfo->viewManager()->currentView()->down();*/ } void Manager::populateDirWatch() { - TQStringList jScriptDirectories = KGlobal::dirs()->findDirs("appdata", "scripts"); + TQStringList jScriptDirectories = TDEGlobal::dirs()->findDirs("appdata", "scripts"); for(TQStringList::iterator i = jScriptDirectories.begin(); i != jScriptDirectories.end(); ++i) { // FIXME: future KDE versions could support the recursive // watching of directories out of the box. diff --git a/src/kile/kilelauncher.cpp b/src/kile/kilelauncher.cpp index 1899e06..cb0ca57 100644 --- a/src/kile/kilelauncher.cpp +++ b/src/kile/kilelauncher.cpp @@ -65,9 +65,9 @@ else KILE_DEBUG() << "\tNO KShellProcess created" << endl; - connect(m_proc, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), this, TQT_SLOT(slotProcessOutput(KProcess*, char*, int ) ) ); - connect(m_proc, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),this, TQT_SLOT(slotProcessOutput(KProcess*, char*, int ) ) ); - connect(m_proc, TQT_SIGNAL( processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*))); + connect(m_proc, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), this, TQT_SLOT(slotProcessOutput(TDEProcess*, char*, int ) ) ); + connect(m_proc, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),this, TQT_SLOT(slotProcessOutput(TDEProcess*, char*, int ) ) ); + connect(m_proc, TQT_SIGNAL( processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*))); } ProcessLauncher::~ProcessLauncher() @@ -142,7 +142,7 @@ out += "*****\n"; emit(output(out)); - return m_proc->start(tool()->manager()->shouldBlock() ? KProcess::Block : KProcess::NotifyOnExit, KProcess::AllOutput); + return m_proc->start(tool()->manager()->shouldBlock() ? TDEProcess::Block : TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } else return false; @@ -168,7 +168,7 @@ emit(message(Error, i18n("Launching failed, diagnostics:"))); TQString exe = KRun::binaryName(tool()->readEntry("command"), false); - TQString path = KGlobal::dirs()->findExe(exe, TQString(), true); + TQString path = TDEGlobal::dirs()->findExe(exe, TQString(), true); if ( path.isNull() ) { @@ -189,12 +189,12 @@ return true; } - void ProcessLauncher::slotProcessOutput(KProcess*, char* buf, int len) + void ProcessLauncher::slotProcessOutput(TDEProcess*, char* buf, int len) { emit output(TQString::fromLocal8Bit(buf, len)); } - void ProcessLauncher::slotProcessExited(KProcess*) + void ProcessLauncher::slotProcessExited(TDEProcess*) { KILE_DEBUG() << "==KileTool::ProcessLauncher::slotProcessExited=============" << endl; KILE_DEBUG() << "\t" << tool()->name() << endl; @@ -241,7 +241,7 @@ setCommand("konsole"); setOptions(noclose + " -T \"" + cmd + " (Kile)\" -e " + cmd + ' ' + tool()->readEntry("options")); - if ( KGlobal::dirs()->findExe(KRun::binaryName(cmd, false)).isNull() ) return false; + if ( TDEGlobal::dirs()->findExe(KRun::binaryName(cmd, false)).isNull() ) return false; return ProcessLauncher::launch(); } diff --git a/src/kile/kilelauncher.h b/src/kile/kilelauncher.h index 7af50a1..4b8a886 100644 --- a/src/kile/kilelauncher.h +++ b/src/kile/kilelauncher.h @@ -23,7 +23,7 @@ class TQWidgetStack; -class KProcess; +class TDEProcess; class KShellProcess; class KileInfo; namespace KParts { class ReadOnlyPart; class PartManager; } @@ -94,8 +94,8 @@ namespace KileTool bool selfCheck(); private slots: - void slotProcessOutput(KProcess*, char*, int ); - void slotProcessExited(KProcess*); + void slotProcessOutput(TDEProcess*, char*, int ); + void slotProcessExited(TDEProcess*); private: TQString m_wd, m_cmd, m_options, m_texinputs, m_bibinputs, m_bstinputs; diff --git a/src/kile/kileproject.cpp b/src/kile/kileproject.cpp index f4bbd26..1ad1006 100644 --- a/src/kile/kileproject.cpp +++ b/src/kile/kileproject.cpp @@ -304,7 +304,7 @@ void KileProject::readMakeIndexOptions() TQString grp = KileTool::groupFor("MakeIndex", m_config); //get the default value - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup(KileTool::groupFor("MakeIndex", KileTool::configName("MakeIndex", cfg))); TQString deflt = cfg->readEntry("options", "'%S'.idx"); diff --git a/src/kile/kilestdtools.cpp b/src/kile/kilestdtools.cpp index de9a94b..7a50c67 100644 --- a/src/kile/kilestdtools.cpp +++ b/src/kile/kilestdtools.cpp @@ -83,8 +83,8 @@ namespace KileTool void Factory::writeStdConfig() { - TQString from_cfg = KGlobal::dirs()->findResource("appdata", "kilestdtools.rc"); - TQString to_cfg = KGlobal::dirs()->saveLocation("config") + "/kilerc"; + TQString from_cfg = TDEGlobal::dirs()->findResource("appdata", "kilestdtools.rc"); + TQString to_cfg = TDEGlobal::dirs()->saveLocation("config") + "/kilerc"; KConfig *pCfg = new KConfig(from_cfg, false, false); pCfg->copyTo(to_cfg, m_config); } diff --git a/src/kile/managetemplatesdialog.cpp b/src/kile/managetemplatesdialog.cpp index c20d6d6..5c2c8bf 100644 --- a/src/kile/managetemplatesdialog.cpp +++ b/src/kile/managetemplatesdialog.cpp @@ -76,7 +76,7 @@ ManageTemplatesDialog::ManageTemplatesDialog(KileTemplate::Manager *templateMana TQHBoxLayout *iconLayout = new TQHBoxLayout(topLayout, spacingHint()); iconLayout->addWidget(new TQLabel(i18n("Icon:"), page)); - m_iconEdit = new KLineEdit(KGlobal::dirs()->findResource("appdata", "pics/type_Default.png"), page); + m_iconEdit = new KLineEdit(TDEGlobal::dirs()->findResource("appdata", "pics/type_Default.png"), page); iconLayout->addWidget(m_iconEdit); KPushButton *iconbut = new KPushButton(i18n("Select..."),page); diff --git a/src/kile/newtoolwizard.ui.h b/src/kile/newtoolwizard.ui.h index aa4ac9c..cdffdb6 100644 --- a/src/kile/newtoolwizard.ui.h +++ b/src/kile/newtoolwizard.ui.h @@ -9,7 +9,7 @@ void NewToolWizard::init() { - m_toolList = KileTool::toolList(KGlobal::config(), false); + m_toolList = KileTool::toolList(TDEGlobal::config(), false); //setup the Name page (page 0) connect(m_leName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); diff --git a/src/kile/postscriptdialog.cpp b/src/kile/postscriptdialog.cpp index b29ea62..f9cab37 100644 --- a/src/kile/postscriptdialog.cpp +++ b/src/kile/postscriptdialog.cpp @@ -275,29 +275,29 @@ void PostscriptDialog::execute() m_proc->clearArguments(); (*m_proc) << TQStringList::split(' ',"sh " + m_tempfile); - connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), - this, TQT_SLOT(slotProcessOutput(KProcess *,char *,int))); - connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotProcessOutput(KProcess*,char*,int)) ); - connect(m_proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this, TQT_SLOT(slotProcessOutput(TDEProcess *,char *,int))); + connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(slotProcessOutput(TDEProcess*,char*,int)) ); + connect(m_proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); KILE_DEBUG() << "=== PostscriptDialog::runPsutils() ====================" << endl; KILE_DEBUG() << " execute '" << m_tempfile << "'" << endl; - //if ( ! proc->start(KProcess::NotifyOnExit, KProcess::NoCommunication) ) - if ( ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) + //if ( ! proc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication) ) + if ( ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) KILE_DEBUG() << "\tstart of shell process failed" << endl; } } -void PostscriptDialog::slotProcessOutput(KProcess*,char* buf,int len) +void PostscriptDialog::slotProcessOutput(TDEProcess*,char* buf,int len) { emit( output(TQCString(buf,len+1)) ); } -void PostscriptDialog::slotProcessExited (KProcess *proc) +void PostscriptDialog::slotProcessExited (TDEProcess *proc) { if ( ! proc->normalExit() ) showError(i18n("An error occurred, while rearranging the file.")); diff --git a/src/kile/postscriptdialog.h b/src/kile/postscriptdialog.h index 31a8ec9..54f4994 100644 --- a/src/kile/postscriptdialog.h +++ b/src/kile/postscriptdialog.h @@ -72,8 +72,8 @@ private slots: void chooseOutfile(); void comboboxChanged(int index); void slotUser1(); - void slotProcessOutput(KProcess*,char* buf,int len); - void slotProcessExited (KProcess *proc); + void slotProcessOutput(TDEProcess*,char* buf,int len); + void slotProcessExited (TDEProcess *proc); private: bool checkParameter(); diff --git a/src/kile/quickdocumentdialog.cpp b/src/kile/quickdocumentdialog.cpp index 14f6330..150ea46 100644 --- a/src/kile/quickdocumentdialog.cpp +++ b/src/kile/quickdocumentdialog.cpp @@ -357,9 +357,9 @@ TQWidget *QuickDocument::setupProperties(TQTabWidget *tab) label->setBuddy(m_leDate); // set current date - m_leDate->setText( KGlobal::locale()->formatDate(TQDate::currentDate(), true) ); + m_leDate->setText( TDEGlobal::locale()->formatDate(TQDate::currentDate(), true) ); // For KDE4: - //m_leDate->setText( KGlobal::locale()->formatDate(TQDate::currentDate(), KLocale::ShortDate) ); + //m_leDate->setText( TDEGlobal::locale()->formatDate(TQDate::currentDate(), KLocale::ShortDate) ); return personalInfo; } diff --git a/src/kile/quicktoolconfigwidget.ui.h b/src/kile/quicktoolconfigwidget.ui.h index 4194528..c0ac55d 100644 --- a/src/kile/quicktoolconfigwidget.ui.h +++ b/src/kile/quicktoolconfigwidget.ui.h @@ -9,7 +9,7 @@ void QuickToolConfigWidget::updateSequence(const TQString &sequence) { - TQStringList toollist = KileTool::toolList(KGlobal::config(), true); + TQStringList toollist = KileTool::toolList(TDEGlobal::config(), true); toollist.sort(); m_cbTools->clear(); m_cbTools->insertStringList(toollist); @@ -35,7 +35,7 @@ void QuickToolConfigWidget::updateConfigs(const TQString &tool) { m_cbConfigs->clear(); m_cbConfigs->insertItem(i18n("Not Specified")); - m_cbConfigs->insertStringList(KileTool::configNames(tool, KGlobal::config())); + m_cbConfigs->insertStringList(KileTool::configNames(tool, TDEGlobal::config())); } void QuickToolConfigWidget::down() diff --git a/src/kile/symbolview.cpp b/src/kile/symbolview.cpp index eee1e93..0214644 100644 --- a/src/kile/symbolview.cpp +++ b/src/kile/symbolview.cpp @@ -260,7 +260,7 @@ void SymbolView::fillWidget(const TQString& prefix) if( prefix == MFUSprefix) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup(MFUSGroup); TQString configPaths = config->readEntry("paths"); TQString configrefCnts = config->readEntry("counts"); @@ -276,7 +276,7 @@ void SymbolView::fillWidget(const TQString& prefix) } else { - paths = KGlobal::dirs()->findAllResources("app_symbols", prefix + "/*.png",false,true); + paths = TDEGlobal::dirs()->findAllResources("app_symbols", prefix + "/*.png",false,true); paths.sort(); for( uint i = 0 ; i < paths.count() ; i++ ) refCnts.append("1"); @@ -302,7 +302,7 @@ void SymbolView::writeConfig() TQStringList paths,refCnts; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup(MFUSGroup); if( KileConfig::clearMFUS() ) diff --git a/src/kile/templates.cpp b/src/kile/templates.cpp index 4dd089d..950e0bc 100644 --- a/src/kile/templates.cpp +++ b/src/kile/templates.cpp @@ -67,7 +67,7 @@ bool Manager::copyAppData(const KURL& src, const TQString& subdir, const TQStrin TQString dir; //let saveLocation find and create the appropriate place to //store the templates (usually $HOME/.trinity/share/apps/kile/templates) - dir = KGlobal::dirs()->saveLocation("appdata", subdir, true); + dir = TDEGlobal::dirs()->saveLocation("appdata", subdir, true); KURL targetURL = KURL::fromPathOrURL(dir); targetURL.addPath(fileName); @@ -152,7 +152,7 @@ bool Manager::replace(const KileTemplate::Info& toBeReplaced, const KURL& newTem void Manager::scanForTemplates() { KILE_DEBUG() << "===scanForTemplates()===================" << endl; - TQStringList dirs = KGlobal::dirs()->findDirs("appdata", "templates"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("appdata", "templates"); TQDir templates; KileTemplate::Info ti; KileDocument::Extensions *extensions = m_kileInfo->extensions(); @@ -167,7 +167,7 @@ void Manager::scanForTemplates() { TQFileInfo fileInfo(ti.path); ti.name = fileInfo.baseName(true).mid(9); //remove "template_", do it this way to avoid problems with user input! ti.type = extensions->determineDocumentType(KURL::fromPathOrURL(ti.path)); - ti.icon = KGlobal::dirs()->findResource("appdata","pics/type_" + ti.name + extensions->defaultExtensionForDocumentType(ti.type) + ".kileicon"); + ti.icon = TDEGlobal::dirs()->findResource("appdata","pics/type_" + ti.name + extensions->defaultExtensionForDocumentType(ti.type) + ".kileicon"); if (m_TemplateList.contains(ti)) { KILE_DEBUG() << "\tignoring: " << ti.path << endl; @@ -268,34 +268,34 @@ void TemplateIconView::searchLaTeXClassFiles() delete m_proc; - m_proc = new KProcess(TQT_TQOBJECT(this)); + m_proc = new TDEProcess(TQT_TQOBJECT(this)); m_proc->clearArguments(); m_proc->setUseShell(true); (*m_proc) << TQStringList::split(' ', command); m_output = TQString(); - connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(slotProcessOutput(KProcess*,char*,int)) ); - connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotProcessOutput(KProcess*,char*,int)) ); - connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(slotProcessOutput(TDEProcess*,char*,int)) ); + connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(slotProcessOutput(TDEProcess*,char*,int)) ); + connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); KILE_DEBUG() << "=== NewFileWidget::searchClassFiles() ====================" << endl; KILE_DEBUG() << "\texecute: " << command << endl; - if ( ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) + if ( ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { KILE_DEBUG() << "\tstart of shell process failed" << endl; addTemplateIcons(KileDocument::LaTeX); } } -void TemplateIconView::slotProcessOutput(KProcess*, char* buf, int len) +void TemplateIconView::slotProcessOutput(TDEProcess*, char* buf, int len) { m_output += TQString::fromLocal8Bit(buf,len); } -void TemplateIconView::slotProcessExited(KProcess *proc) +void TemplateIconView::slotProcessExited(TDEProcess *proc) { if ( ! proc->normalExit() ) m_output = TQString(); @@ -308,7 +308,7 @@ void TemplateIconView::addTemplateIcons(KileDocument::Type type) { if(!m_templateManager) return; - TQString emptyIcon = KGlobal::dirs()->findResource("appdata", "pics/"+ TQString(DEFAULT_EMPTY_ICON) + ".png" ); + TQString emptyIcon = TDEGlobal::dirs()->findResource("appdata", "pics/"+ TQString(DEFAULT_EMPTY_ICON) + ".png" ); KileTemplate::Info emptyDocumentInfo; emptyDocumentInfo.name = DEFAULT_EMPTY_CAPTION; diff --git a/src/kile/templates.h b/src/kile/templates.h index 2c04e00..fc023de 100644 --- a/src/kile/templates.h +++ b/src/kile/templates.h @@ -153,14 +153,14 @@ class TemplateIconView : public KIconView { KileTemplate::Manager *m_templateManager; TQString m_output; TQString m_selicon; - KProcess *m_proc; + TDEProcess *m_proc; void addTemplateIcons(KileDocument::Type type); void searchLaTeXClassFiles(); protected slots: - void slotProcessOutput(KProcess*,char* buf,int len); - void slotProcessExited (KProcess *proc); + void slotProcessOutput(TDEProcess*,char* buf,int len); + void slotProcessExited (TDEProcess *proc); }; #endif diff --git a/src/kile/texdocdialog.cpp b/src/kile/texdocdialog.cpp index 6f228dc..9de82e7 100644 --- a/src/kile/texdocdialog.cpp +++ b/src/kile/texdocdialog.cpp @@ -537,26 +537,26 @@ void TexDocDialog::executeScript(const TQString &command) (*m_proc) << TQStringList::split(' ',command); m_output = TQString(); - connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(slotProcessOutput(KProcess*,char*,int)) ); - connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotProcessOutput(KProcess*,char*,int)) ); - connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(slotProcessOutput(TDEProcess*,char*,int)) ); + connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(slotProcessOutput(TDEProcess*,char*,int)) ); + connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); KILE_DEBUG() << "=== TexDocDialog::runShellSkript() ====================" << endl; KILE_DEBUG() << " execute: " << command << endl; - if ( ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) + if ( ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) KILE_DEBUG() << "\tstart of shell process failed" << endl; } -void TexDocDialog::slotProcessOutput(KProcess*,char* buf,int len) +void TexDocDialog::slotProcessOutput(TDEProcess*,char* buf,int len) { m_output += TQString::fromLocal8Bit(buf,len); } -void TexDocDialog::slotProcessExited(KProcess *proc) +void TexDocDialog::slotProcessExited(TDEProcess *proc) { if ( proc->normalExit() && !proc->exitStatus() ) { diff --git a/src/kile/texdocdialog.h b/src/kile/texdocdialog.h index 07a64ca..0d6cffb 100644 --- a/src/kile/texdocdialog.h +++ b/src/kile/texdocdialog.h @@ -88,8 +88,8 @@ private slots: void slotTextChanged(const TQString &text); void slotSearchClicked(); - void slotProcessOutput(KProcess*,char* buf,int len); - void slotProcessExited (KProcess *proc); + void slotProcessOutput(TDEProcess*,char* buf,int len); + void slotProcessExited (TDEProcess *proc); void slotInitToc(); void slotShowFile(); -- cgit v1.2.1