diff options
Diffstat (limited to 'kate')
-rw-r--r-- | kate/cppsymbolviewer/plugin_katesymbolviewer.h | 2 | ||||
-rw-r--r-- | kate/filelistloader/katefll_initplugin.cpp | 4 | ||||
-rw-r--r-- | kate/filelistloader/katefll_plugin.cpp | 10 | ||||
-rw-r--r-- | kate/filelistloader/katefll_plugin.h | 2 | ||||
-rw-r--r-- | kate/filetemplates/plugin/filetemplates.cpp | 20 | ||||
-rw-r--r-- | kate/filetemplates/plugin/filetemplates.h | 2 | ||||
-rw-r--r-- | kate/insertcommand/plugin_kateinsertcommand.cpp | 2 | ||||
-rw-r--r-- | kate/insertcommand/plugin_kateinsertcommand.h | 4 | ||||
-rw-r--r-- | kate/make/plugin_katemake.cpp | 4 | ||||
-rw-r--r-- | kate/openheader/plugin_kateopenheader.cpp | 4 | ||||
-rw-r--r-- | kate/snippets/plugin_katesnippets.cpp | 2 | ||||
-rw-r--r-- | kate/snippets/plugin_katesnippets.h | 2 | ||||
-rw-r--r-- | kate/tabbarextension/plugin_katetabbarextension.cpp | 2 | ||||
-rw-r--r-- | kate/tabbarextension/plugin_katetabbarextension.h | 2 | ||||
-rw-r--r-- | kate/xmltools/plugin_katexmltools.cpp | 14 | ||||
-rw-r--r-- | kate/xmltools/plugin_katexmltools.h | 4 |
16 files changed, 40 insertions, 40 deletions
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h index 4988996..05fbb39 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h @@ -148,7 +148,7 @@ class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, K private: TQPtrList<KatePluginSymbolViewerView> m_views; - KConfig pConfig; + TDEConfig pConfig; }; /* XPM */ diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 1bfecb6..ccc8afa 100644 --- a/kate/filelistloader/katefll_initplugin.cpp +++ b/kate/filelistloader/katefll_initplugin.cpp @@ -50,7 +50,7 @@ int InitPluginKateFileListLoader::initKate() { TQString tmpFile; KURL tmpURL; - if( KIO::NetAccess::download( configScript(), tmpFile ) ) + if( TDEIO::NetAccess::download( configScript(), tmpFile ) ) { TQFile file(tmpFile); file.open(IO_ReadOnly); @@ -72,7 +72,7 @@ int InitPluginKateFileListLoader::initKate() file.close(); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } else application()->documentManager()->openURL(KURL()); diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index e0a20f1..deec021 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -44,7 +44,7 @@ class PluginView : public KXMLGUIClient PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList) : Plugin((Kate::Application*)parent,name), PluginViewInterface(), - m_config( new KConfig("katefilelistpluginrc") ) + m_config( new TDEConfig("katefilelistpluginrc") ) { m_config->setGroup("General"); updateInit(); @@ -141,7 +141,7 @@ void PluginKateFileListLoader::slotOpenList() void PluginKateFileListLoader::slotOpenList(const KURL& url) { - if ( url.isValid() && KIO::NetAccess::exists(url, false, 0) ) + if ( url.isValid() && TDEIO::NetAccess::exists(url, false, 0) ) { addURLToList( url ); if ( KMessageBox::questionYesNo (0, @@ -152,7 +152,7 @@ void PluginKateFileListLoader::slotOpenList(const KURL& url) application()->documentManager()->closeAllDocuments(); TQString tmpFile; - if( KIO::NetAccess::download( url, tmpFile, 0 ) ) + if( TDEIO::NetAccess::download( url, tmpFile, 0 ) ) { TQFile file(tmpFile); file.open(IO_ReadOnly); @@ -171,7 +171,7 @@ void PluginKateFileListLoader::slotOpenList(const KURL& url) if ( ! tmp.isEmpty() ) application()->activeMainWindow()->viewManager()->openURL(tmp); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } else application()->documentManager()->openURL(KURL()); } else @@ -223,7 +223,7 @@ void PluginKateFileListLoader::save() *file.textStream()<<application()->documentManager()->document(i)->url().url()<<endl; } file.close(); - KIO::NetAccess::upload(file.name(), m_saveURL, 0); + TDEIO::NetAccess::upload(file.name(), m_saveURL, 0); file.unlink(); addURLToList( m_saveURL ); } diff --git a/kate/filelistloader/katefll_plugin.h b/kate/filelistloader/katefll_plugin.h index 699b45f..dc5a85b 100644 --- a/kate/filelistloader/katefll_plugin.h +++ b/kate/filelistloader/katefll_plugin.h @@ -59,7 +59,7 @@ class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface private: TQPtrList<class PluginView> m_views; KRecentFilesAction *m_recentFiles; - KConfig* m_config; + TDEConfig* m_config; KURL m_oldInitURL; KURL m_saveURL; bool m_saveAs; diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index ec68f6e..e1c35be 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -180,7 +180,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d) TQRegExp re( "\\b(\\w+)\\s*=\\s*(.+)(?:\\s+\\w+=|$)" ); re.setMinimal( true ); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); TQStringList hidden; config->readListEntry( "Hidden", hidden, ';' ); @@ -371,7 +371,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) TQString tmpfile; TQString filename = url.fileName(); kdDebug()<<"file: "<<filename<<endl; - if ( KIO::NetAccess::download( url, tmpfile, 0L ) ) + if ( TDEIO::NetAccess::download( url, tmpfile, 0L ) ) { bool isTemplate ( filename.endsWith( ".katetemplate" ) ); TQString docname; @@ -383,7 +383,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(), i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").arg(filename), i18n("Template Plugin"), 0 ); - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); return; } @@ -451,7 +451,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) numlines++; } file.close(); - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); uint line, col; line = col = 0; @@ -969,7 +969,7 @@ void KateTemplateWizard::accept() u = KURL( kft->templates().at( selectedTemplateIdx )->filename ); TQString tmpfile, tmp; - if ( KIO::NetAccess::download( u, tmpfile, 0L ) ) + if ( TDEIO::NetAccess::download( u, tmpfile, 0L ) ) { TQFile file(tmpfile); if ( ! file.open( IO_ReadOnly ) ) @@ -979,7 +979,7 @@ void KateTemplateWizard::accept() "The document will not be created</qt>").arg(u.prettyURL()), i18n("Template Plugin"), 0 ); - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); return; } @@ -998,7 +998,7 @@ void KateTemplateWizard::accept() } file.close(); - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); } if ( toid == 2 ) // file @@ -1046,8 +1046,8 @@ void KateTemplateWizard::accept() stream << str; tmp.close(); - succes = KIO::NetAccess::upload( fn, templateUrl, 0 ); - KIO::NetAccess::removeTempFile( fn ); + succes = TDEIO::NetAccess::upload( fn, templateUrl, 0 ); + TDEIO::NetAccess::removeTempFile( fn ); } } @@ -1188,7 +1188,7 @@ void KateTemplateManager::slotRemoveTemplate() // Find all instances of filename, and try to delete them. // If it fails (there was a global, unwritable instance), add to a // list of removed templates - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); TQString fname = item->templateinfo->filename.section( '/', -1 ); TQStringList templates = TDEGlobal::dirs()->findAllResources( "data", fname.prepend( "kate/plugins/katefiletemplates/templates/" ), diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index a9d53f2..bb7f912 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -147,7 +147,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface TQPtrList<class TemplateInfo> m_templates; class KDirWatch *m_dw; class KUser *m_user; - class KConfig *m_emailstuff; + class TDEConfig *m_emailstuff; class KActionMenu *m_menu; }; diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index ec5dafc..0d473a4 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -62,7 +62,7 @@ PluginKateInsertCommand::PluginKateInsertCommand( TQObject* parent, const char* kv ( 0 ), sh ( 0 ) { - config = new KConfig("kateinsertcommandpluginrc"); + config = new TDEConfig("kateinsertcommandpluginrc"); cmdhist = config->readListEntry("Command History"); wdlg = 0; workingdir = TQDir::currentDirPath(); diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index 19c6eb3..eb8b10f 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -41,7 +41,7 @@ namespace Kate { class PluginConfigPage; class PluginView; } -class KConfig; +class TDEConfig; class TDEProcess; class KShellProcess; class TQButtonGroup; @@ -87,7 +87,7 @@ class PluginKateInsertCommand : public Kate::Plugin, TQStringList cmdhist; bool bInsStdErr; int dialogSettings; - KConfig *config; + TDEConfig *config; public slots: void slotInsertCommand(); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index 1ea92a5..f7f69ce 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -371,7 +371,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); - KConfig c("katemakepluginrc"); + TDEConfig c("katemakepluginrc"); c.setGroup("Prefixes"); source_prefix = c.readEntry("Source",TQString()); build_prefix = c.readEntry("Build",TQString()); @@ -729,7 +729,7 @@ void PluginKateMakeView::slotConfigure() // } } - KConfig c("katemakepluginrc"); + TDEConfig c("katemakepluginrc"); c.setGroup("Prefixes"); c.writeEntry("Source",source_prefix); c.writeEntry("Build",build_prefix); diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index 7694d4f..ba5dfb7 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -108,10 +108,10 @@ void PluginKateOpenHeader::tryOpen( const KURL& url, const TQStringList& extensi KURL newURL( url ); for( TQStringList::ConstIterator it = extensions.begin(); it != extensions.end(); ++it ) { newURL.setFileName( basename + "." + *it ); - if( KIO::NetAccess::exists( newURL ) ) + if( TDEIO::NetAccess::exists( newURL ) ) application()->activeMainWindow()->viewManager()->openURL( newURL ); newURL.setFileName( basename + "." + (*it).upper() ); - if( KIO::NetAccess::exists( newURL ) ) + if( TDEIO::NetAccess::exists( newURL ) ) application()->activeMainWindow()->viewManager()->openURL( newURL ); } } diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index cae9598..f28b944 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -63,7 +63,7 @@ KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, TQWidget *do lSnippets.setAutoDelete( TRUE ); // the list owns the objects - config = new KConfig("katesnippetspluginrc"); + config = new TDEConfig("katesnippetspluginrc"); readConfig(); // set text of selected item at startup diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h index ef01ca6..d50a851 100644 --- a/kate/snippets/plugin_katesnippets.h +++ b/kate/snippets/plugin_katesnippets.h @@ -53,7 +53,7 @@ protected: void writeConfig(); private: - KConfig *config; + TDEConfig *config; TQPtrList<CSnippet> lSnippets; public: diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index 6687c53..56f7b61 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -84,7 +84,7 @@ TDEInstance* KatePluginFactory::s_instance = 0L; KatePluginTabBarExtension::KatePluginTabBarExtension( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ), - pConfig(new KConfig("katetabbarextensionpluginrc")) + pConfig(new TDEConfig("katetabbarextensionpluginrc")) { pConfig->setGroup("global"); } diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index 0894828..ec808cf 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -321,7 +321,7 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface private: TQPtrList<class PluginView> m_views; - KConfig* pConfig; + TDEConfig* pConfig; }; #endif // _PLUGIN_TABBAREXTENSION_H_ diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index 06c1cf9..90108e1 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -484,22 +484,22 @@ void PluginKateXMLTools::getDTD() m_docToAssignTo = kv->document(); TQApplication::setOverrideCursor( KCursor::waitCursor() ); - KIO::Job *job = KIO::get( url ); - connect( job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotFinished(KIO::Job *)) ); - connect( job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)) ); + TDEIO::Job *job = TDEIO::get( url ); + connect( job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotFinished(TDEIO::Job *)) ); + connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)) ); } kdDebug()<<"XMLTools::getDTD: Documents: "<<m_docDtds.count()<<", DTDs: "<<m_dtds.count()<<endl; } -void PluginKateXMLTools::slotFinished( KIO::Job *job ) +void PluginKateXMLTools::slotFinished( TDEIO::Job *job ) { if( job->error() ) { //kdDebug() << "XML Plugin error: DTD in XML format (" << filename << " ) could not be loaded" << endl; job->showErrorDialog( 0 ); } - else if ( static_cast<KIO::TransferJob *>(job)->isErrorPage() ) + else if ( static_cast<TDEIO::TransferJob *>(job)->isErrorPage() ) { // catch failed loading loading via http: KMessageBox::error(0, i18n("The file '%1' could not be opened. " @@ -521,7 +521,7 @@ void PluginKateXMLTools::slotFinished( KIO::Job *job ) TQApplication::restoreOverrideCursor(); } -void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data ) +void PluginKateXMLTools::slotData( TDEIO::Job *, const TQByteArray &data ) { m_dtdString += TQString( data ); } diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 450a1b7..56fff4e 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -69,8 +69,8 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface void completionDone( KTextEditor::CompletionEntry completionEntry ); void completionAborted(); - void slotFinished( KIO::Job *job ); - void slotData( KIO::Job *, const TQByteArray &data ); + void slotFinished( TDEIO::Job *job ); + void slotData( TDEIO::Job *, const TQByteArray &data ); void backspacePressed(); void emptyKeyEvent(); |