summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
Diffstat (limited to 'kate')
-rw-r--r--kate/cppsymbolviewer/plugin_katesymbolviewer.cpp2
-rw-r--r--kate/filetemplates/plugin/filetemplates.cpp12
-rw-r--r--kate/insertcommand/plugin_kateinsertcommand.cpp20
-rw-r--r--kate/insertcommand/plugin_kateinsertcommand.h8
-rw-r--r--kate/make/plugin_katemake.cpp14
-rw-r--r--kate/make/plugin_katemake.h6
-rw-r--r--kate/tabbarextension/plugin_katetabbarextension.cpp4
-rw-r--r--kate/textfilter/plugin_katetextfilter.cpp26
-rw-r--r--kate/textfilter/plugin_katetextfilter.h8
-rw-r--r--kate/xmlcheck/plugin_katexmlcheck.cpp18
-rw-r--r--kate/xmlcheck/plugin_katexmlcheck.h6
-rw-r--r--kate/xmltools/plugin_katexmltools.cpp2
12 files changed, 63 insertions, 63 deletions
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index e0f37b8..6bf06d7 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -54,7 +54,7 @@ K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory<KatePlugi
KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w)
{
- KGlobal::locale()->insertCatalogue("katecppsymbolviewer");
+ TDEGlobal::locale()->insertCatalogue("katecppsymbolviewer");
KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" );
act->setCheckedState(i18n("Show Symbols"));
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index b065113..ec68f6e 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -83,7 +83,7 @@ extern "C"
{
void* init_katefiletemplates()
{
- KGlobal::locale()->insertCatalogue("katefiletemplates");
+ TDEGlobal::locale()->insertCatalogue("katefiletemplates");
return new KatePluginFactory;
}
}
@@ -144,7 +144,7 @@ KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name )
// template menu
m_dw = new KDirWatch( this, "template_dirwatch" );
- TQStringList dirs = KGlobal::dirs()->findDirs("data", "kate/plugins/katefiletemplates/templates");
+ TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kate/plugins/katefiletemplates/templates");
for ( TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it )
{
m_dw->addDir( *it, true );
@@ -171,7 +171,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d)
{
kdDebug()<<"updateTemplateDirs called with arg "<<d<<endl;
- TQStringList templates = KGlobal::dirs()->findAllResources(
+ TQStringList templates = TDEGlobal::dirs()->findAllResources(
"data","kate/plugins/katefiletemplates/templates/*.katetemplate",
false,true);
@@ -913,7 +913,7 @@ void KateTemplateWizard::accept()
if ( ! suggestion.endsWith(".katetemplate") )
suggestion.append(".katetemplate");
- TQString dir = KGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true );
+ TQString dir = TDEGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true );
templateUrl = dir + suggestion;
@@ -1089,7 +1089,7 @@ class KFTNewStuff : public KNewStuff {
bool createUploadFile( const TQString &/*filename*/ ) { return false; }
TQString downloadDestination( KNS::Entry *entry )
{
- TQString dir = KGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true );
+ TQString dir = TDEGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true );
return dir.append( entry->payload().filename() );
}
@@ -1190,7 +1190,7 @@ void KateTemplateManager::slotRemoveTemplate()
// list of removed templates
KConfig *config = kapp->config();
TQString fname = item->templateinfo->filename.section( '/', -1 );
- TQStringList templates = KGlobal::dirs()->findAllResources(
+ TQStringList templates = TDEGlobal::dirs()->findAllResources(
"data", fname.prepend( "kate/plugins/katefiletemplates/templates/" ),
false,true);
int failed = 0;
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index bc0a6a4..ec5dafc 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -148,12 +148,12 @@ void PluginKateInsertCommand::slotInsertCommand()
if ( ! sh ) {
sh = new KShellProcess;
- connect ( sh, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)) );
- connect ( sh, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) );
- connect ( sh, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotProcessExited(KProcess*)) ) ;
+ connect ( sh, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)) );
+ connect ( sh, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
+ connect ( sh, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotProcessExited(TDEProcess*)) ) ;
}
sh->clearArguments();
@@ -170,7 +170,7 @@ void PluginKateInsertCommand::slotInsertCommand()
config->writePathEntry("Last WD", d->wd());
}
*sh << TQFile::encodeName(d->command()).data();
- sh->start( KProcess::NotifyOnExit, KProcess::All );
+ sh->start( TDEProcess::NotifyOnExit, TDEProcess::All );
// add command to history
if ( cmdhist.contains( d->command() ) ) {
@@ -219,7 +219,7 @@ void PluginKateInsertCommand::slotShowWaitDlg()
}
}
-void PluginKateInsertCommand::slotReceivedStdout( KProcess* /*p*/, char* text,
+void PluginKateInsertCommand::slotReceivedStdout( TDEProcess* /*p*/, char* text,
int len )
{
TQString t = TQString::fromLocal8Bit ( text );
@@ -227,14 +227,14 @@ void PluginKateInsertCommand::slotReceivedStdout( KProcess* /*p*/, char* text,
kv->insertText( t );
}
-void PluginKateInsertCommand::slotReceivedStderr( KProcess* p, char* text,
+void PluginKateInsertCommand::slotReceivedStderr( TDEProcess* p, char* text,
int len )
{
if ( bInsStdErr )
slotReceivedStdout( p, text, len );
}
-void PluginKateInsertCommand::slotProcessExited( KProcess* p )
+void PluginKateInsertCommand::slotProcessExited( TDEProcess* p )
{
if (wdlg) {
wdlg->hide();
diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h
index 5e158f1..19c6eb3 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.h
+++ b/kate/insertcommand/plugin_kateinsertcommand.h
@@ -42,7 +42,7 @@ namespace Kate {
class PluginView;
}
class KConfig;
-class KProcess;
+class TDEProcess;
class KShellProcess;
class TQButtonGroup;
class TQCheckBox;
@@ -95,9 +95,9 @@ class PluginKateInsertCommand : public Kate::Plugin,
void applyConfig( InsertCommandConfigPage* );
private slots:
- void slotReceivedStdout(KProcess*, char*, int);
- void slotReceivedStderr(KProcess*, char*, int);
- void slotProcessExited(KProcess*);
+ void slotReceivedStdout(TDEProcess*, char*, int);
+ void slotReceivedStderr(TDEProcess*, char*, int);
+ void slotProcessExited(TDEProcess*);
void slotShowWaitDlg();
};
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index 7a3f014..1ea92a5 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -364,11 +364,11 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
setResizeMode(TQListView::LastColumn);
connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *)));
- m_proc = new KProcess();
+ m_proc = new TDEProcess();
- connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcExited(KProcess*)));
- connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int)));
+ connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*)));
+ connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int)));
KConfig c("katemakepluginrc");
@@ -443,7 +443,7 @@ void PluginKateMakeView::processLine(const TQString &l)
}
-void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int len)
+void PluginKateMakeView::slotReceivedProcStderr(TDEProcess *, char *result, int len)
{
FUNCTIONSETUP;
@@ -460,7 +460,7 @@ void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int le
}
-void PluginKateMakeView::slotProcExited(KProcess *p)
+void PluginKateMakeView::slotProcExited(TDEProcess *p)
{
FUNCTIONSETUP;
@@ -661,7 +661,7 @@ bool PluginKateMakeView::slotValidate()
if (make.isEmpty())
make = KStandardDirs::findExe("make");
*m_proc << make;
- if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) {
+ if( make.isEmpty() || ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) {
KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ?
"make" : make));
return false;
diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h
index 35b4c2f..cdc9399 100644
--- a/kate/make/plugin_katemake.h
+++ b/kate/make/plugin_katemake.h
@@ -67,8 +67,8 @@ class PluginKateMakeView : public TQListView, public KXMLGUIClient
void slotPrev();
bool slotValidate();
- void slotProcExited(KProcess*);
- void slotReceivedProcStderr(KProcess*, char*, int);
+ void slotProcExited(TDEProcess*);
+ void slotReceivedProcStderr(TDEProcess*, char*, int);
void slotConfigure();
@@ -76,7 +76,7 @@ protected:
void processLine(const TQString &);
private:
- KProcess *m_proc;
+ TDEProcess *m_proc;
TQString output_line;
TQString doc_name;
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 66c43c1..6687c53 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -57,7 +57,7 @@ extern "C"
{
void* init_libkatetabbarextensionplugin()
{
- KGlobal::locale()->insertCatalogue("katetabbarextension");
+ TDEGlobal::locale()->insertCatalogue("katetabbarextension");
return new KatePluginFactory;
}
}
@@ -238,7 +238,7 @@ void KateTabBarButton::triggerModified()
setPaletteForegroundColor( c );
setIconSet(SmallIconSet("modified"));
} else {
- TQColor c(KGlobalSettings::textColor());
+ TQColor c(TDEGlobalSettings::textColor());
setPaletteForegroundColor( c );
setIconSet(TQIconSet());
}
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index 996353b..327f903 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -178,7 +178,7 @@ KatePrompt
void
-PluginKateTextFilter::slotFilterReceivedStdout (KProcess * pProcess, char * got, int len)
+PluginKateTextFilter::slotFilterReceivedStdout (TDEProcess * pProcess, char * got, int len)
{
assert (pProcess == m_pFilterShellProcess);
@@ -197,14 +197,14 @@ PluginKateTextFilter::slotFilterReceivedStdout (KProcess * pProcess, char * got,
void
-PluginKateTextFilter::slotFilterReceivedStderr (KProcess * pProcess, char * got, int len)
+PluginKateTextFilter::slotFilterReceivedStderr (TDEProcess * pProcess, char * got, int len)
{
slotFilterReceivedStdout (pProcess, got, len);
}
void
-PluginKateTextFilter::slotFilterProcessExited (KProcess * pProcess)
+PluginKateTextFilter::slotFilterProcessExited (TDEProcess * pProcess)
{
assert (pProcess == m_pFilterShellProcess);
@@ -233,7 +233,7 @@ slipInFilter (KShellProcess & shell, Kate::View & view, TQString command)
shell.clearArguments ();
shell << command;
- shell.start (KProcess::NotifyOnExit, KProcess::All);
+ shell.start (TDEProcess::NotifyOnExit, TDEProcess::All);
shell.writeStdin (marked.local8Bit (), marked.length ());
// TODO: Put up a modal dialog to defend the text from further
// keystrokes while the command is out. With a cancel button...
@@ -242,7 +242,7 @@ slipInFilter (KShellProcess & shell, Kate::View & view, TQString command)
void
-PluginKateTextFilter::slotFilterCloseStdin (KProcess * pProcess)
+PluginKateTextFilter::slotFilterCloseStdin (TDEProcess * pProcess)
{
assert (pProcess == m_pFilterShellProcess);
pProcess -> closeStdin ();
@@ -283,17 +283,17 @@ void PluginKateTextFilter::runFilter( Kate::View *kv, const TQString &filter )
{
m_pFilterShellProcess = new KShellProcess;
- connect ( m_pFilterShellProcess, TQT_SIGNAL(wroteStdin(KProcess *)),
- this, TQT_SLOT(slotFilterCloseStdin (KProcess *)));
+ connect ( m_pFilterShellProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)),
+ this, TQT_SLOT(slotFilterCloseStdin (TDEProcess *)));
- connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
- this, TQT_SLOT(slotFilterReceivedStdout(KProcess*,char*,int)) );
+ connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this, TQT_SLOT(slotFilterReceivedStdout(TDEProcess*,char*,int)) );
- connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
- this, TQT_SLOT(slotFilterReceivedStderr(KProcess*,char*,int)) );
+ connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ this, TQT_SLOT(slotFilterReceivedStderr(TDEProcess*,char*,int)) );
- connect ( m_pFilterShellProcess, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotFilterProcessExited(KProcess*) ) ) ;
+ connect ( m_pFilterShellProcess, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotFilterProcessExited(TDEProcess*) ) ) ;
}
slipInFilter (*m_pFilterShellProcess, *kv, filter);
diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h
index f9e7f31..9e330be 100644
--- a/kate/textfilter/plugin_katetextfilter.h
+++ b/kate/textfilter/plugin_katetextfilter.h
@@ -56,10 +56,10 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa
TQStringList completionList;
public slots:
void slotEditFilter ();
- void slotFilterReceivedStdout (KProcess * pProcess, char * got, int len);
- void slotFilterReceivedStderr (KProcess * pProcess, char * got, int len);
- void slotFilterProcessExited (KProcess * pProcess);
- void slotFilterCloseStdin (KProcess *);
+ void slotFilterReceivedStdout (TDEProcess * pProcess, char * got, int len);
+ void slotFilterReceivedStderr (TDEProcess * pProcess, char * got, int len);
+ void slotFilterProcessExited (TDEProcess * pProcess);
+ void slotFilterCloseStdin (TDEProcess *);
};
#endif // _PLUGIN_KANT_TEXTFILTER_H
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index 6e4f0ad..e7ce1e2 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -130,13 +130,13 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
*/
m_proc_stderr = "";
- m_proc = new KProcess();
- connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcExited(KProcess*)));
+ m_proc = new TDEProcess();
+ connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*)));
// we currently only want errors:
- //connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
- // this, TQT_SLOT(receivedProcStdout(KProcess*, char*, int)));
- connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
- this, TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int)));
+ //connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ // this, TQT_SLOT(receivedProcStdout(TDEProcess*, char*, int)));
+ connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ this, TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int)));
}
@@ -150,13 +150,13 @@ PluginKateXMLCheckView::~PluginKateXMLCheckView()
-void PluginKateXMLCheckView::slotReceivedProcStderr(KProcess *, char *result, int len)
+void PluginKateXMLCheckView::slotReceivedProcStderr(TDEProcess *, char *result, int len)
{
m_proc_stderr += TQString::fromLocal8Bit( TQCString(result, len+1) );
}
-void PluginKateXMLCheckView::slotProcExited(KProcess*)
+void PluginKateXMLCheckView::slotProcExited(TDEProcess*)
{
// FIXME: doesn't work correct the first time:
//if( m_dockwidget->isDockBackPossible() ) {
@@ -343,7 +343,7 @@ bool PluginKateXMLCheckView::slotValidate()
}
*m_proc << m_tmp_file->name();
- if( ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) {
+ if( ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) {
KMessageBox::error(0, i18n("<b>Error:</b> Failed to execute xmllint. Please make "
"sure that xmllint is installed. It is part of libxml2."));
return false;
diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h
index dda8683..e12a950 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.h
+++ b/kate/xmlcheck/plugin_katexmlcheck.h
@@ -56,15 +56,15 @@ class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient
public slots:
bool slotValidate();
void slotClicked(TQListViewItem *item);
- void slotProcExited(KProcess*);
- void slotReceivedProcStderr(KProcess*, char*, int);
+ void slotProcExited(TDEProcess*);
+ void slotReceivedProcStderr(TDEProcess*, char*, int);
void slotUpdate();
private:
KTempFile *m_tmp_file;
KParts::ReadOnlyPart *part;
bool m_validating;
- KProcess *m_proc;
+ TDEProcess *m_proc;
TQString m_proc_stderr;
TQString m_dtdname;
};
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 20be13e..06c1cf9 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -399,7 +399,7 @@ void PluginKateXMLTools::getDTD()
// Start where the supplied XML-DTDs are fed by default unless
// user changed directory last time:
- TQString defaultDir = KGlobal::dirs()->findResourceDir("data", "katexmltools/" ) + "katexmltools/";
+ TQString defaultDir = TDEGlobal::dirs()->findResourceDir("data", "katexmltools/" ) + "katexmltools/";
if( m_urlString.isNull() ) {
m_urlString = defaultDir;
}