diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:53:08 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:53:08 -0600 |
commit | 1d166accf42ea52c5fca931ef4852822dd605fd6 (patch) | |
tree | 53d93834f8a28cbfa6f95149f836fa865ddf392f /src | |
parent | b85b744fad09538d45f9deca07a219f174334c04 (diff) | |
download | kile-1d166accf42ea52c5fca931ef4852822dd605fd6.tar.gz kile-1d166accf42ea52c5fca931ef4852822dd605fd6.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
40 files changed, 45 insertions, 45 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7c7b1b9..eb126a4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -127,7 +127,7 @@ ADD_SUBDIRECTORY( kile ) INSTALL( FILES x-kilepr.desktop DESTINATION share/mimelink/text ) -INSTALL( FILES kile.upd kile1.6_upd.pl kile1.7_upd.pl kile1.9_upd.pl kile1.9-1_upd.pl kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl DESTINATION share/apps/kconf_update ) +INSTALL( FILES kile.upd kile1.6_upd.pl kile1.7_upd.pl kile1.9_upd.pl kile1.9-1_upd.pl kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl DESTINATION share/apps/tdeconf_update ) IF( KILE_VERSION ) SET(_KILE_SPECIAL_DOC_DIR "share/doc/kile-${KILE_VERSION}") diff --git a/src/Makefile.am b/src/Makefile.am index 253c961..7e66b40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ mimetypetextdatadir = $(kde_mimedir)/text update_DATA = kile.upd update_SCRIPTS = kile1.6_upd.pl kile1.7_upd.pl kile1.9-1_upd.pl kile1.9_upd.pl \ kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update EXTRA_DIST = kile.kdevprj admin AUTHORS COPYING ChangeLog kile-remote-control.txt README README.cwl README.MacOSX kile.lsm $(mimetypetextdata_DATA) diff --git a/src/kile/codecompletion.cpp b/src/kile/codecompletion.cpp index 77394cb..16d6dd7 100644 --- a/src/kile/codecompletion.cpp +++ b/src/kile/codecompletion.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <tdetexteditor/codecompletioninterface.h> diff --git a/src/kile/codecompletion.h b/src/kile/codecompletion.h index c253af6..e54b0cf 100644 --- a/src/kile/codecompletion.h +++ b/src/kile/codecompletion.h @@ -22,7 +22,7 @@ #include <kate/view.h> #include <kate/document.h> #include <tdetexteditor/codecompletioninterface.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "latexcmd.h" #include "kileabbrevview.h" diff --git a/src/kile/configcheckerdlg.cpp b/src/kile/configcheckerdlg.cpp index 161640c..a073e6a 100644 --- a/src/kile/configcheckerdlg.cpp +++ b/src/kile/configcheckerdlg.cpp @@ -25,7 +25,7 @@ #include <kprogress.h> #include <kglobal.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klistbox.h> #include "kiledebug.h" diff --git a/src/kile/configcodecompletion.h b/src/kile/configcodecompletion.h index 6f3d76e..34cf258 100644 --- a/src/kile/configcodecompletion.h +++ b/src/kile/configcodecompletion.h @@ -27,7 +27,7 @@ #include <tdeversion.h> #include <klistview.h> #include <kpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> /** *@author Holger Danielsson diff --git a/src/kile/configstructure.cpp b/src/kile/configstructure.cpp index f2947ac..73fdcaa 100644 --- a/src/kile/configstructure.cpp +++ b/src/kile/configstructure.cpp @@ -18,7 +18,7 @@ #include "configstructure.h" #include <kdialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kiconloader.h> diff --git a/src/kile/configtester.cpp b/src/kile/configtester.cpp index 04bc20a..078329c 100644 --- a/src/kile/configtester.cpp +++ b/src/kile/configtester.cpp @@ -17,7 +17,7 @@ #include <tqfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/src/kile/docpart.cpp b/src/kile/docpart.cpp index b95fe23..0bf5d68 100644 --- a/src/kile/docpart.cpp +++ b/src/kile/docpart.cpp @@ -15,7 +15,7 @@ #include "docpart.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kstdaction.h> #include <kglobal.h> #include "kiledebug.h" diff --git a/src/kile/graphicsconfigwidget.ui b/src/kile/graphicsconfigwidget.ui index 7756845..63259b9 100644 --- a/src/kile/graphicsconfigwidget.ui +++ b/src/kile/graphicsconfigwidget.ui @@ -112,7 +112,7 @@ <customwidgets> </customwidgets> <includes> - <include location="global" impldecl="in declaration">kconfig.h</include> + <include location="global" impldecl="in declaration">tdeconfig.h</include> <include location="local" impldecl="in declaration">latexcmd.h</include> <include location="local" impldecl="in declaration">latexcmddialog.h</include> </includes> diff --git a/src/kile/includegraphicsdialog.cpp b/src/kile/includegraphicsdialog.cpp index 49902b2..8e4448d 100644 --- a/src/kile/includegraphicsdialog.cpp +++ b/src/kile/includegraphicsdialog.cpp @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <kmessagebox.h> #include "kiledebug.h" diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp index 57394e6..c4f3c69 100644 --- a/src/kile/kile.cpp +++ b/src/kile/kile.cpp @@ -29,7 +29,7 @@ #include "kiledebug.h" #include <kiconloader.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <krun.h> #include <kkeydialog.h> diff --git a/src/kile/kileactions.cpp b/src/kile/kileactions.cpp index 9206971..10ba0fb 100644 --- a/src/kile/kileactions.cpp +++ b/src/kile/kileactions.cpp @@ -34,7 +34,7 @@ #include <kcombobox.h> #include <kpushbutton.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include "kiledebug.h" diff --git a/src/kile/kileconfigdialog.h b/src/kile/kileconfigdialog.h index e09e6c2..1067f59 100644 --- a/src/kile/kileconfigdialog.h +++ b/src/kile/kileconfigdialog.h @@ -20,7 +20,7 @@ #include <tdeversion.h> #include <tdetexteditor/configinterfaceextension.h> -#include <kconfigdialogmanager.h> +#include <tdeconfigdialogmanager.h> #include "configcodecompletion.h" // code completion (dani) #include "previewconfigwidget.h" // QuickPreview (dani) diff --git a/src/kile/kiledocmanager.cpp b/src/kile/kiledocmanager.cpp index ba35ada..683dd64 100644 --- a/src/kile/kiledocmanager.cpp +++ b/src/kile/kiledocmanager.cpp @@ -35,14 +35,14 @@ #include <kmimetype.h> #include <kmessagebox.h> #include <kprogress.h> -#include <kfile.h> +#include <tdefile.h> #include <krun.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kpushbutton.h> #include <kurl.h> #include <kurldrag.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include "kileeventfilter.h" #include "kileuntitled.h" diff --git a/src/kile/kiledocumentinfo.cpp b/src/kile/kiledocumentinfo.cpp index ac639b8..77ae149 100644 --- a/src/kile/kiledocumentinfo.cpp +++ b/src/kile/kiledocumentinfo.cpp @@ -68,8 +68,8 @@ #include <tqregexp.h> #include <tqdatetime.h> -#include <kio/netaccess.h> -#include <kconfig.h> +#include <tdeio/netaccess.h> +#include <tdeconfig.h> #include <klocale.h> #include <kapplication.h> #include "kiledebug.h" diff --git a/src/kile/kilefileselect.cpp b/src/kile/kilefileselect.cpp index 07dc472..f75fac4 100644 --- a/src/kile/kilefileselect.cpp +++ b/src/kile/kilefileselect.cpp @@ -29,7 +29,7 @@ from Kate (C) 2001 by Matt Newell #include <ktoolbar.h> #include <kiconloader.h> #include <kprotocolinfo.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <kcombobox.h> diff --git a/src/kile/kilefileselect.h b/src/kile/kilefileselect.h index 3c09056..df5d745 100644 --- a/src/kile/kilefileselect.h +++ b/src/kile/kilefileselect.h @@ -21,7 +21,7 @@ from Kate (C) 2001 by Matt Newell #include <tqwidget.h> #include <tqtoolbutton.h> -#include <kfile.h> +#include <tdefile.h> #include <kdiroperator.h> #include <kurlcombobox.h> #include <kurlcompletion.h> diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp index 01c26de..3e0048a 100644 --- a/src/kile/kilegrepdialog.cpp +++ b/src/kile/kilegrepdialog.cpp @@ -58,7 +58,7 @@ #include <kapplication.h> #include <kaccelmanager.h> #include <kbuttonbox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kprocess.h> #include <klocale.h> #include <kiconloader.h> diff --git a/src/kile/kilehelp.h b/src/kile/kilehelp.h index d47f988..39d32bc 100644 --- a/src/kile/kilehelp.h +++ b/src/kile/kilehelp.h @@ -21,7 +21,7 @@ #include <tqmap.h> #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmenubar.h> #include <kate/view.h> #include "kileedit.h" diff --git a/src/kile/kilejscript.cpp b/src/kile/kilejscript.cpp index d96233a..b99f65b 100644 --- a/src/kile/kilejscript.cpp +++ b/src/kile/kilejscript.cpp @@ -18,7 +18,7 @@ */ #include <kjs/lookup.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kiledebug.h" #include <kinputdialog.h> #include <klocale.h> diff --git a/src/kile/kilejscript.h b/src/kile/kilejscript.h index 66232e4..30263ea 100644 --- a/src/kile/kilejscript.h +++ b/src/kile/kilejscript.h @@ -21,7 +21,7 @@ #include <kjs/object.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdirwatch.h> #include <tqvaluelist.h> diff --git a/src/kile/kileprojectdlgs.cpp b/src/kile/kileprojectdlgs.cpp index 49178d3..277a95a 100644 --- a/src/kile/kileprojectdlgs.cpp +++ b/src/kile/kileprojectdlgs.cpp @@ -35,7 +35,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kurlcompletion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kcombobox.h> #include "kiledebug.h" #include <kapplication.h> diff --git a/src/kile/kilestdtools.cpp b/src/kile/kilestdtools.cpp index e03f590..a336c9d 100644 --- a/src/kile/kilestdtools.cpp +++ b/src/kile/kilestdtools.cpp @@ -18,7 +18,7 @@ #include <tqfileinfo.h> #include <tqregexp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kate/document.h> #include <kstandarddirs.h> diff --git a/src/kile/kiletool.cpp b/src/kile/kiletool.cpp index 65caa4f..8e00a17 100644 --- a/src/kile/kiletool.cpp +++ b/src/kile/kiletool.cpp @@ -22,7 +22,7 @@ #include <tqtimer.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> #include "kileconfig.h" diff --git a/src/kile/kiletoolconfigwidget.cpp b/src/kile/kiletoolconfigwidget.cpp index 7bf2801..960f34b 100644 --- a/src/kile/kiletoolconfigwidget.cpp +++ b/src/kile/kiletoolconfigwidget.cpp @@ -33,7 +33,7 @@ #include <kiconloader.h> #include <kcombobox.h> #include <kpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <kmessagebox.h> #include <kinputdialog.h> diff --git a/src/kile/kiletoolmanager.cpp b/src/kile/kiletoolmanager.cpp index 9eae871..20cafc5 100644 --- a/src/kile/kiletoolmanager.cpp +++ b/src/kile/kiletoolmanager.cpp @@ -26,7 +26,7 @@ #include <kaction.h> #include <ktextedit.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kiledebug.h" #include <klocale.h> #include <tdeparts/partmanager.h> diff --git a/src/kile/latexcmd.h b/src/kile/latexcmd.h index 2321a6f..efbd36d 100644 --- a/src/kile/latexcmd.h +++ b/src/kile/latexcmd.h @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tqmap.h> -#include <kconfig.h> +#include <tdeconfig.h> class KileInfo; diff --git a/src/kile/latexcmddialog.h b/src/kile/latexcmddialog.h index 7f7e85b..4bb5ee5 100644 --- a/src/kile/latexcmddialog.h +++ b/src/kile/latexcmddialog.h @@ -24,7 +24,7 @@ #include <kdialogbase.h> #include <klineedit.h> #include <klistview.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlabel.h> #include <tqcheckbox.h> diff --git a/src/kile/latexconfigwidget.ui b/src/kile/latexconfigwidget.ui index 0902b01..ef6d51d 100644 --- a/src/kile/latexconfigwidget.ui +++ b/src/kile/latexconfigwidget.ui @@ -233,7 +233,7 @@ </connection> </connections> <includes> - <include location="global" impldecl="in declaration">kconfig.h</include> + <include location="global" impldecl="in declaration">tdeconfig.h</include> <include location="local" impldecl="in declaration">latexcmd.h</include> <include location="local" impldecl="in declaration">latexcmddialog.h</include> <include location="local" impldecl="in implementation">latexconfigwidget.ui.h</include> diff --git a/src/kile/managetemplatesdialog.cpp b/src/kile/managetemplatesdialog.cpp index 0ee55f7..d18162d 100644 --- a/src/kile/managetemplatesdialog.cpp +++ b/src/kile/managetemplatesdialog.cpp @@ -28,7 +28,7 @@ #include <kicondialog.h> #include <kmessagebox.h> #include "kiledebug.h" -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "kileextensions.h" #include "kileinfo.h" diff --git a/src/kile/newfilewizard.cpp b/src/kile/newfilewizard.cpp index 5398e70..d5e7e67 100644 --- a/src/kile/newfilewizard.cpp +++ b/src/kile/newfilewizard.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include "kiledebug.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kiconloader.h> diff --git a/src/kile/postscriptdialog.cpp b/src/kile/postscriptdialog.cpp index f9cab37..97b46da 100644 --- a/src/kile/postscriptdialog.cpp +++ b/src/kile/postscriptdialog.cpp @@ -30,7 +30,7 @@ #include <tqwhatsthis.h> #include <tqstringlist.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <ktempfile.h> #include <kmessagebox.h> diff --git a/src/kile/previewconfigwidget.h b/src/kile/previewconfigwidget.h index c593248..a05a361 100644 --- a/src/kile/previewconfigwidget.h +++ b/src/kile/previewconfigwidget.h @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <kcombobox.h> #include <klineedit.h> -#include <kconfig.h> +#include <tdeconfig.h> /** *@author Holger Danielsson diff --git a/src/kile/quickdocumentdialog.cpp b/src/kile/quickdocumentdialog.cpp index 94271e6..1ac17fd 100644 --- a/src/kile/quickdocumentdialog.cpp +++ b/src/kile/quickdocumentdialog.cpp @@ -34,7 +34,7 @@ email : holger.danielsson@t-online.de #include <kcombobox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <kiconloader.h> #include <kpushbutton.h> diff --git a/src/kile/quickpreview.cpp b/src/kile/quickpreview.cpp index 380d364..a72034b 100644 --- a/src/kile/quickpreview.cpp +++ b/src/kile/quickpreview.cpp @@ -29,7 +29,7 @@ #include "kiledebug.h" #include <ktempdir.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kileconfig.h> #include <kate/document.h> diff --git a/src/kile/symbolview.cpp b/src/kile/symbolview.cpp index 090c4ea..83d41da 100644 --- a/src/kile/symbolview.cpp +++ b/src/kile/symbolview.cpp @@ -20,7 +20,7 @@ dani 2005-11-22 - rearranged source tbraun 2006-07-01 - - added tooltips which show the keys, copied from kfileiconview + - added tooltips which show the keys, copied from tdefileiconview - reorganized the hole thing, more flexible png loading, removing the old big code_array, more groups tbraun 2007-06-04 @@ -39,7 +39,7 @@ tbraun 2007-06-13 #include <kstandarddirs.h> #include "kiledebug.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqregexp.h> #include <tqtooltip.h> diff --git a/src/kile/templates.cpp b/src/kile/templates.cpp index d63da16..8bbb90c 100644 --- a/src/kile/templates.cpp +++ b/src/kile/templates.cpp @@ -21,8 +21,8 @@ #include <kglobal.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <tqdir.h> diff --git a/src/kile/userhelp.h b/src/kile/userhelp.h index ed35af9..5e2309b 100644 --- a/src/kile/userhelp.h +++ b/src/kile/userhelp.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <kmenubar.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "kiletoolmanager.h" diff --git a/src/kile/userhelpdialog.cpp b/src/kile/userhelpdialog.cpp index a097925..3adc540 100644 --- a/src/kile/userhelpdialog.cpp +++ b/src/kile/userhelpdialog.cpp @@ -26,7 +26,7 @@ #include <tqwhatsthis.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <kmessagebox.h> #include <krun.h> |