diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:10 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:10 -0600 |
| commit | 782ea254f2b2cc59c01c9fa9c26df3262b05648a (patch) | |
| tree | ea2570417efdc330ee127513e1ca90180ab59311 | |
| parent | c7c2e1330f7496d86e25cd9e408ae9f62f2d9bcb (diff) | |
| download | tdeedu-782ea254f2b2cc59c01c9fa9c26df3262b05648a.tar.gz tdeedu-782ea254f2b2cc59c01c9fa9c26df3262b05648a.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
126 files changed, 186 insertions, 186 deletions
diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp index 9cd04bbb..54d45532 100644 --- a/blinken/src/blinken.cpp +++ b/blinken/src/blinken.cpp @@ -14,7 +14,7 @@ #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <khelpmenu.h> #include <kinputdialog.h> #include <klocale.h> diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp index 36f18511..16d5d91e 100644 --- a/blinken/src/button.cpp +++ b/blinken/src/button.cpp @@ -9,7 +9,7 @@ #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/blinken/src/fontchecker.cpp b/blinken/src/fontchecker.cpp index f6bc9440..56bd1731 100644 --- a/blinken/src/fontchecker.cpp +++ b/blinken/src/fontchecker.cpp @@ -10,7 +10,7 @@ #include <tqfont.h> #include <tqfontinfo.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "fontchecker.h" diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp index 1121eb30..2824c217 100644 --- a/blinken/src/highscoredialog.cpp +++ b/blinken/src/highscoredialog.cpp @@ -13,7 +13,7 @@ #include <tqtabwidget.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "highscoredialog.h" diff --git a/kalzium/Makefile.am b/kalzium/Makefile.am index 1ccfe136..eba3cc01 100644 --- a/kalzium/Makefile.am +++ b/kalzium/Makefile.am @@ -2,5 +2,5 @@ SUBDIRS = src AUTOMAKE_OPTIONS = foreign -DOXYGEN_REFERENCES = tdeui tdecore kfile libtdeedu +DOXYGEN_REFERENCES = tdeui tdecore tdefile libtdeedu include ../admin/Doxyfile.am diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp index d9bcdf6a..17e8a953 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -39,7 +39,7 @@ #include <tqscrollview.h> #include <tqspinbox.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kiconloader.h> #include <klocale.h> #include <kdebug.h> diff --git a/kalzium/src/prefs.kcfgc b/kalzium/src/prefs.kcfgc index e6df4e2e..2cafdda0 100644 --- a/kalzium/src/prefs.kcfgc +++ b/kalzium/src/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kalzium.kcfg #IncludeFiles=defines.h ClassName=Prefs diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp index f360b485..e74c8a59 100644 --- a/kalzium/src/spectrumviewimpl.cpp +++ b/kalzium/src/spectrumviewimpl.cpp @@ -14,7 +14,7 @@ #include <tqspinbox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kguiitem.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index 87ce672c..4d9dca18 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -34,15 +34,15 @@ using namespace std; #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <khelpmenu.h> #include <kinputdialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kpopupmenu.h> #include <kstandarddirs.h> -#include <kconfigdialog.h> -#include <kconfigskeleton.h> +#include <tdeconfigdialog.h> +#include <tdeconfigskeleton.h> #include <krandomsequence.h> #include <kdebug.h> diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index ffb95e2d..623a414d 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfileinfo.h> diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index 0e14a207..07651e56 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -25,12 +25,12 @@ #include <tqpushbutton.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "mainsettings.h" #include "kanagramsettings.h" diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp index a9558de1..1d3ed4b9 100644 --- a/kanagram/src/newstuffdialog.cpp +++ b/kanagram/src/newstuffdialog.cpp @@ -3,7 +3,7 @@ #include <knewstuff/knewstuff.h> #include <knewstuff/entry.h> #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <kstandarddirs.h> diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index f167ebcf..e6d35fb0 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kjanuswidget.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <klocale.h> #include <tqsplitter.h> diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index ca6de0d9..9092eb00 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <tdeparts/componentfactory.h> diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index 04dd5deb..2f54eb71 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -29,7 +29,7 @@ #include <kaboutdata.h> #include <tdeparts/genericfactory.h> #include <kstdaction.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> typedef KParts::GenericFactory<KEducaPart> KEducaPartFactory; K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory ) diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index b2c28e34..c4b8f373 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlayout.h> #include <tqvbox.h> diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index 69020fe1..5ba5bda0 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -27,10 +27,10 @@ #include <klocale.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpushbutton.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqtimer.h> #include <tqlayout.h> diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp index 913f9ff7..832c59ac 100644 --- a/keduca/keducabuilder/kcontroladdedit.cpp +++ b/keduca/keducabuilder/kcontroladdedit.cpp @@ -20,7 +20,7 @@ // KDE includes #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlrequester.h> #include <kcombobox.h> #include <knuminput.h> diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 560677ae..3f498c51 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -25,10 +25,10 @@ #include <kiconloader.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kedittoolbar.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <kprinter.h> diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index 6ff7038b..2c69c146 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -21,7 +21,7 @@ #include <kurlrequester.h> #include <kmessagebox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include "keducaeditorstartdialog.h" diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 24d66339..94d6d95d 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -19,7 +19,7 @@ #include <assert.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kmimetype.h> #include <kdebug.h> diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h index 8a823303..9a34c1a8 100644 --- a/keduca/libkeduca/fileread.h +++ b/keduca/libkeduca/fileread.h @@ -18,7 +18,7 @@ #ifndef FILEREAD_H #define FILEREAD_H -#include <kio/job.h> +#include <tdeio/job.h> #include <tqdom.h> diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp index f7e11da3..1ea3180b 100644 --- a/keduca/libkeduca/kgallerydialog.cpp +++ b/keduca/libkeduca/kgallerydialog.cpp @@ -19,10 +19,10 @@ #include "kgallerydialog.moc" #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqlineedit.h> #include <tqlistview.h> diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h index 227acd3f..9be42034 100644 --- a/keduca/libkeduca/kgallerydialog.h +++ b/keduca/libkeduca/kgallerydialog.h @@ -21,8 +21,8 @@ #include "kgallerydialogbase.h" #include <kurl.h> -// #include <kio/global.h> -// #include <kio/job.h> +// #include <tdeio/global.h> +// #include <tdeio/job.h> /**Gallery *@author Javier Campos diff --git a/kgeography/src/settings.kcfgc b/kgeography/src/settings.kcfgc index 8cbf2bf2..42685d50 100644 --- a/kgeography/src/settings.kcfgc +++ b/kgeography/src/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kgeography.kcfg ClassName=kgeographySettings Singleton=true diff --git a/khangman/khangman/fontchecker.cpp b/khangman/khangman/fontchecker.cpp index f6bc9440..56bd1731 100644 --- a/khangman/khangman/fontchecker.cpp +++ b/khangman/khangman/fontchecker.cpp @@ -10,7 +10,7 @@ #include <tqfont.h> #include <tqfontinfo.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "fontchecker.h" diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index c57565b9..4cc68c3b 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -33,7 +33,7 @@ #include <kapplication.h> #include <kactionclasses.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kdebug.h> #include <klineedit.h> #include <klocale.h> diff --git a/khangman/khangman/prefs.kcfgc b/khangman/khangman/prefs.kcfgc index 8d9311bc..feaa262c 100644 --- a/khangman/khangman/prefs.kcfgc +++ b/khangman/khangman/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=khangman.kcfg IncludeFiles=kstandarddirs.h,tqdir.h ClassName=Prefs diff --git a/kig/ChangeLog b/kig/ChangeLog index 8845e357..48a0a4e5 100644 --- a/kig/ChangeLog +++ b/kig/ChangeLog @@ -105,7 +105,7 @@ 2005-05-25 Pino Toscano <toscano.pino@tiscali.it> - * The kfile_kig displays also whether the file is compressed or + * The tdefile_kig displays also whether the file is compressed or not. 2005-05-21 Pino Toscano <toscano.pino@tiscali.it> @@ -127,7 +127,7 @@ 2005-05-19 Pino Toscano <toscano.pino@tiscali.it> - * Give to the kfile_kig the ability to read info from compressed + * Give to the tdefile_kig the ability to read info from compressed files. 2005-05-15 Danny Allen <dannya40uk@yahoo.co.uk> @@ -498,7 +498,7 @@ * Small changes to Script Wizard UI. - * kfile_kig read also the compatibility version. + * tdefile_kig read also the compatibility version. 2004-07-21 Pino Toscano <toscano.pino@tiscali.it> @@ -592,7 +592,7 @@ * Fixed a small bug that leads to display "Select the point" when I reset the name of an object after setting it. - * i18n fixes in kfile_kig. + * i18n fixes in tdefile_kig. 2004-06-29 Dominique Devriese <devriese@kde.org> @@ -606,7 +606,7 @@ 2004-06-15 Pino Toscano <toscano.pino@tiscali.it> - * Add info about whether grid and axes are shown to the kig kfile + * Add info about whether grid and axes are shown to the kig tdefile thing. * Now the coordinate system toggleaction is correctly updated @@ -742,7 +742,7 @@ * Add a Copy action to text labels to copy their text ( with substitutions already made ) into the clipboard. - * Add two little kfile plugins: kfile_kig and kfile_drgeo. + * Add two little tdefile plugins: tdefile_kig and tdefile_drgeo. * Various little improvements diff --git a/kig/Makefile.am b/kig/Makefile.am index e011bf79..d7eb4457 100644 --- a/kig/Makefile.am +++ b/kig/Makefile.am @@ -18,7 +18,7 @@ SUBDIRS = \ kig \ mimetypes \ macros \ - kfile \ + tdefile \ data \ pykig \ $(scriptingdir) @@ -42,8 +42,8 @@ messages: rc.cpp cat "$$file" | grep '<SelectStatement>' | sed -e 's/^ *<SelectStatement>\([^<]*\)<\/SelectStatement>/i18n( "\1" );/' | sed -e 's/&/\&/g' >> rc.cpp; \ done $(XGETTEXT) tips.cpp rc.cpp filters/*.h kig/*.h misc/*.h modes/*.h objects/*.h scripting/*.h */*.cc kig/*.cpp misc/*.cpp modes/*.cpp -o $(podir)/kig.pot - $(XGETTEXT) kfile/kfile_drgeo.cpp kfile/kfile_drgeo.h -o $(podir)/kfile_drgeo.pot - $(XGETTEXT) kfile/kfile_kig.cpp kfile/kfile_kig.h -o $(podir)/kfile_kig.pot + $(XGETTEXT) tdefile/tdefile_drgeo.cpp tdefile/tdefile_drgeo.h -o $(podir)/tdefile_drgeo.pot + $(XGETTEXT) tdefile/tdefile_kig.cpp tdefile/tdefile_kig.h -o $(podir)/tdefile_kig.pot CLEANFILES = dummy.cpp diff --git a/kig/kfile/Makefile.am b/kig/kfile/Makefile.am deleted file mode 100644 index 715a9c7a..00000000 --- a/kig/kfile/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDES = $(all_includes) - -noinst_HEADERS = \ - kfile_drgeo.h \ - kfile_kig.h - -kde_module_LTLIBRARIES = \ - kfile_drgeo.la \ - kfile_kig.la - -kfile_drgeo_la_SOURCES = kfile_drgeo.cpp -kfile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) -kfile_drgeo_la_LIBADD = $(LIB_KIO) - -kfile_kig_la_SOURCES = kfile_kig.cpp -kfile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) -kfile_kig_la_LIBADD = $(LIB_KIO) - -METASOURCES = AUTO - -services_DATA = \ - kfile_drgeo.desktop \ - kfile_kig.desktop -servicesdir = $(kde_servicesdir) diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index 13cbd8b7..b0eda780 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -26,10 +26,10 @@ #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kedittoolbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kkeydialog.h> #include <klibloader.h> #include <klocale.h> diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index a8117c6e..ef7fa470 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -46,7 +46,7 @@ #include <kaction.h> #include <kapplication.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kiconloader.h> #include <kinstance.h> diff --git a/kig/misc/kigfiledialog.h b/kig/misc/kigfiledialog.h index d1acc1fd..14c53a2d 100644 --- a/kig/misc/kigfiledialog.h +++ b/kig/misc/kigfiledialog.h @@ -18,7 +18,7 @@ #ifndef KIG_MISC_KIGFILEDIALOG_H #define KIG_MISC_KIGFILEDIALOG_H -#include <kfiledialog.h> +#include <tdefiledialog.h> /** * This file dialog is pretty like KFileDialog, but allow us to make an option diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index ec6a16c3..db30d652 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -30,7 +30,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kig/tdefile/Makefile.am b/kig/tdefile/Makefile.am new file mode 100644 index 00000000..fc0e4c0f --- /dev/null +++ b/kig/tdefile/Makefile.am @@ -0,0 +1,24 @@ +INCLUDES = $(all_includes) + +noinst_HEADERS = \ + tdefile_drgeo.h \ + tdefile_kig.h + +kde_module_LTLIBRARIES = \ + tdefile_drgeo.la \ + tdefile_kig.la + +tdefile_drgeo_la_SOURCES = tdefile_drgeo.cpp +tdefile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) +tdefile_drgeo_la_LIBADD = $(LIB_KIO) + +tdefile_kig_la_SOURCES = tdefile_kig.cpp +tdefile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) +tdefile_kig_la_LIBADD = $(LIB_KIO) + +METASOURCES = AUTO + +services_DATA = \ + tdefile_drgeo.desktop \ + tdefile_kig.desktop +servicesdir = $(kde_servicesdir) diff --git a/kig/kfile/kfile_drgeo.cpp b/kig/tdefile/tdefile_drgeo.cpp index b921131b..0f7eb3ee 100644 --- a/kig/kfile/kfile_drgeo.cpp +++ b/kig/tdefile/tdefile_drgeo.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kfile_drgeo.h" +#include "tdefile_drgeo.h" #include <tqdom.h> #include <tqfile.h> @@ -27,7 +27,7 @@ typedef KGenericFactory<DrgeoPlugin> drgeoFactory; -K_EXPORT_COMPONENT_FACTORY( kfile_drgeo, drgeoFactory( "kfile_drgeo" ) ) +K_EXPORT_COMPONENT_FACTORY( tdefile_drgeo, drgeoFactory( "tdefile_drgeo" ) ) DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList &args ) : KFilePlugin( parent, name, args ) @@ -95,5 +95,5 @@ bool DrgeoPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) return true; } -#include "kfile_drgeo.moc" +#include "tdefile_drgeo.moc" diff --git a/kig/kfile/kfile_drgeo.desktop b/kig/tdefile/tdefile_drgeo.desktop index b33e255f..fc06ea50 100644 --- a/kig/kfile/kfile_drgeo.desktop +++ b/kig/tdefile/tdefile_drgeo.desktop @@ -49,7 +49,7 @@ Name[vi]=Tiến sÄ© Thông tin Hình há»c Name[zh_CN]=Dr. Geo ä¿¡æ¯ Name[zh_TW]=Dr. Geo 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_drgeo +X-TDE-Library=tdefile_drgeo MimeType=application/x-drgeo PreferredGroups=DrgeoInfo PreferredItems=NumOfFigures;NumOfTexts;NumOfMacros diff --git a/kig/kfile/kfile_drgeo.h b/kig/tdefile/tdefile_drgeo.h index 94b6f696..b9f0b52a 100644 --- a/kig/kfile/kfile_drgeo.h +++ b/kig/tdefile/tdefile_drgeo.h @@ -21,7 +21,7 @@ #ifndef KIG_KFILE_KFILE_DRGEO_H #define KIG_KFILE_KFILE_DRGEO_H -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/kig/kfile/kfile_kig.cpp b/kig/tdefile/tdefile_kig.cpp index d44eb1fa..48042368 100644 --- a/kig/kfile/kfile_kig.cpp +++ b/kig/tdefile/tdefile_kig.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kfile_kig.h" +#include "tdefile_kig.h" #include <tqdom.h> #include <tqfile.h> @@ -33,7 +33,7 @@ typedef KGenericFactory<KigPlugin> kigFactory; -K_EXPORT_COMPONENT_FACTORY( kfile_kig, kigFactory( "kfile_kig" ) ) +K_EXPORT_COMPONENT_FACTORY( tdefile_kig, kigFactory( "tdefile_kig" ) ) KigPlugin::KigPlugin( TQObject *parent, const char *name, const TQStringList &args ) : KFilePlugin( parent, name, args ) @@ -150,4 +150,4 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) return true; } -#include "kfile_kig.moc" +#include "tdefile_kig.moc" diff --git a/kig/kfile/kfile_kig.desktop b/kig/tdefile/tdefile_kig.desktop index 19c37422..ac5597f8 100644 --- a/kig/kfile/kfile_kig.desktop +++ b/kig/tdefile/tdefile_kig.desktop @@ -48,7 +48,7 @@ Name[vi]=Thông tin Kig Name[zh_CN]=Kig ä¿¡æ¯ Name[zh_TW]=Kig 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_kig +X-TDE-Library=tdefile_kig MimeType=application/x-kig PreferredGroups=KigInfo PreferredItems=Version;CoordSytem diff --git a/kig/kfile/kfile_kig.h b/kig/tdefile/tdefile_kig.h index 5d1790ce..c910b33b 100644 --- a/kig/kfile/kfile_kig.h +++ b/kig/tdefile/tdefile_kig.h @@ -21,7 +21,7 @@ #ifndef KIG_KFILE_KFILE_KIG_H #define KIG_KFILE_KFILE_KIG_H -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/kiten/Makefile.am b/kiten/Makefile.am index 67356d1e..e77a4389 100644 --- a/kiten/Makefile.am +++ b/kiten/Makefile.am @@ -32,7 +32,7 @@ rc_DATA = kitenui.rc learnui.rc eeditui.rc xdg_apps_DATA = kiten.desktop -kiten_DATA = edict kanjidic radkfile vconj romkana.cnv +kiten_DATA = edict kanjidic radtdefile vconj romkana.cnv kitendir = $(kde_datadir)/kiten kde_kcfg_DATA = kiten.kcfg diff --git a/kiten/asyndeta.cpp b/kiten/asyndeta.cpp index 5c24bc23..277a537e 100644 --- a/kiten/asyndeta.cpp +++ b/kiten/asyndeta.cpp @@ -18,7 +18,7 @@ USA **/ -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp index 4b9e2203..1df5a36b 100644 --- a/kiten/configdictionaries.cpp +++ b/kiten/configdictionaries.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <klistview.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqpushbutton.h> #include <tqstringlist.h> diff --git a/kiten/edict b/kiten/edict index 1cc221eb..67acf886 100644 --- a/kiten/edict +++ b/kiten/edict @@ -5658,7 +5658,7 @@ ¥¡¼ÆþÎÏ [¥¡¼¤Ë¤å¤¦¤ê¤ç¤¯] /key (input)/ ¥¥¦¥¤ /kiwi/(P)/ ¥¥¦¥¤¥Õ¥ë¡¼¥Ä /kiwi fruit/ -¥¥ª¥¹¥¯ /kiosk/(P)/ +¥¥ª¥¹¥¯ /tdeiosk/(P)/ ¥¥±¥í /Cicero/ ¥¥·¥ê¥È¡¼¥ë /(n) (1) xylitol (artificial sweetener)/(2) birch sugar/ ¥¥·¥ê¥È¥ë /(n) (1) xylitol (artificial sweetener)/(2) birch sugar/ @@ -5832,7 +5832,7 @@ ¥¥å¥ì¡¼¥¿¡¼ /curator/(P)/ ¥¥å¥í¥Ã¥È /(fr:) (n) culotte/(P)/ ¥¥å¥í¥Ã¥È¥¹¥«¡¼¥È /(n) culotte skirt/ -¥¥è¥¹¥¯ /kiosk/(P)/ +¥¥è¥¹¥¯ /tdeiosk/(P)/ ¥¥é¡¼ /(n) killer/(P)/ ¥¥é¡¼¥À¥¹¥È /killer dust/ ¥¥é¡¼±ÒÀ± [¥¥é¡¼¤¨¤¤¤»¤¤] /(n) killer satellite/ diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index bfff027d..0a10ba0c 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -21,8 +21,8 @@ #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> -#include <kconfigdialog.h> +#include <tdeconfig.h> +#include <tdeconfigdialog.h> #include <kdebug.h> #include <tdeversion.h> #include <kedittoolbar.h> diff --git a/kiten/kloader.cpp b/kiten/kloader.cpp index a0fa1d60..7d1f202d 100644 --- a/kiten/kloader.cpp +++ b/kiten/kloader.cpp @@ -28,7 +28,7 @@ #endif #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "kloader.h" diff --git a/kiten/ksaver.cpp b/kiten/ksaver.cpp index 5a92e2b0..73ea2768 100644 --- a/kiten/ksaver.cpp +++ b/kiten/ksaver.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "ksaver.h" diff --git a/kiten/learn.cpp b/kiten/learn.cpp index b834e643..6ffbaeea 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -22,7 +22,7 @@ #include <kaction.h> #include <kapplication.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp index 823b99a7..ae97a29c 100644 --- a/kiten/optiondialog.cpp +++ b/kiten/optiondialog.cpp @@ -26,7 +26,7 @@ #include <tqtextcodec.h> #include <klocale.h> #include <tqcombobox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstandarddirs.h> #include <kurllabel.h> #include <krun.h> diff --git a/kiten/optiondialog.h b/kiten/optiondialog.h index 7dc1574b..61e5a4c7 100644 --- a/kiten/optiondialog.h +++ b/kiten/optiondialog.h @@ -31,7 +31,7 @@ class TQComboBox; class TQCheckBox; class DictList; -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kglobalaccel.h> #include <kkeydialog.h> diff --git a/kiten/rad.cpp b/kiten/rad.cpp index 20fbeae3..8c56fadc 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -20,7 +20,7 @@ **/ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> #include <klistbox.h> @@ -52,14 +52,14 @@ void Rad::load() return; KStandardDirs *dirs = TDEGlobal::dirs(); - TQString radkfile = dirs->findResource("data", "kiten/radkfile"); - if (radkfile.isNull()) + TQString radtdefile = dirs->findResource("data", "kiten/radtdefile"); + if (radtdefile.isNull()) { KMessageBox::error(0, i18n("Kanji radical information file not installed, so radical searching cannot be used.")); return; } - TQFile f(radkfile); + TQFile f(radtdefile); if (!f.open(IO_ReadOnly)) { diff --git a/kiten/radkfile b/kiten/radtdefile index 84091d53..84091d53 100644 --- a/kiten/radkfile +++ b/kiten/radtdefile diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index 9dbb22d5..05cde4f5 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -21,7 +21,7 @@ #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp index b60c3949..d11a1bfa 100644 --- a/klatin/klatin/klatin.cpp +++ b/klatin/klatin/klatin.cpp @@ -16,8 +16,8 @@ #include <tqradiobutton.h> #include <kapplication.h> -#include <kconfigdialog.h> -#include <kfiledialog.h> +#include <tdeconfigdialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klocale.h> #include <kpushbutton.h> diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index 97a8bf0e..ca005800 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -32,7 +32,7 @@ #include <kaction.h> #include <kapplication.h> #include <kcombobox.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kdebug.h> #include <klocale.h> #include <kmenubar.h> diff --git a/klettres/klettres/prefs.kcfgc b/klettres/klettres/prefs.kcfgc index 91156dab..62e8003e 100644 --- a/klettres/klettres/prefs.kcfgc +++ b/klettres/klettres/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=klettres.kcfg IncludeFiles=kdebug.h ClassName=Prefs diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 04190ce0..fa3f9cd3 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -31,10 +31,10 @@ #include <dcopclient.h> #include <kaboutdata.h> #include <kapplication.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kdebug.h> #include <kedittoolbar.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kinstance.h> #include <klineedit.h> #include <klocale.h> diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h index 021ed3e0..22607f62 100644 --- a/kmplot/kmplot/MainDlg.h +++ b/kmplot/kmplot/MainDlg.h @@ -33,7 +33,7 @@ // KDE includes #include <kaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <tdeparts/browserextension.h> diff --git a/kmplot/kmplot/coordsconfigdialog.h b/kmplot/kmplot/coordsconfigdialog.h index e480bf53..716e2909 100644 --- a/kmplot/kmplot/coordsconfigdialog.h +++ b/kmplot/kmplot/coordsconfigdialog.h @@ -26,7 +26,7 @@ #ifndef COORDSCONFIGDIALOG_H #define COORDSCONFIGDIALOG_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include "xparser.h" diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index 831cb612..deffa8df 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -26,10 +26,10 @@ #include "kmplot.h" #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kedittoolbar.h> #include <kkeydialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klibloader.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp index ad9142b2..a077b6d1 100644 --- a/kmplot/kmplot/kmplotio.cpp +++ b/kmplot/kmplot/kmplotio.cpp @@ -28,7 +28,7 @@ #include <tqfile.h> // KDE includes -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp index 50ed3c02..a88fedc4 100644 --- a/kmplot/kmplot/kparametereditor.cpp +++ b/kmplot/kmplot/kparametereditor.cpp @@ -25,9 +25,9 @@ #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinputdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klistbox.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp index 02bc7969..004a08db 100644 --- a/kmplot/kmplot/ksliderwindow.cpp +++ b/kmplot/kmplot/ksliderwindow.cpp @@ -30,7 +30,7 @@ // KDE includes #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kinputdialog.h> #include <klocale.h> diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index cff58b6c..b82a0f6f 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -22,8 +22,8 @@ #include <kpushbutton.h> #include <kiconloader.h> #include <ktempfile.h> -#include <kio/netaccess.h> -#include <kfiledialog.h> +#include <tdeio/netaccess.h> +#include <tdefiledialog.h> #include <kcombobox.h> #include <kurl.h> #include <klineedit.h> diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp index 7dbacf05..46aa2de9 100644 --- a/kstars/kstars/colorscheme.cpp +++ b/kstars/kstars/colorscheme.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqfile.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index 76fccfa5..9aa0c372 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kaction.h> #include <kaccel.h> #include <kdebug.h> diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index e72866e7..e5e510bd 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kaction.h> #include <kaccel.h> #include <kdebug.h> diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp index e687a142..4d5f799e 100644 --- a/kstars/kstars/imagereductiondlg.cpp +++ b/kstars/kstars/imagereductiondlg.cpp @@ -19,7 +19,7 @@ #include <tqpushbutton.h> #include <kurl.h> - #include <kfiledialog.h> + #include <tdefiledialog.h> #include <klocale.h> #include "imagereductiondlg.h" diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 8b0acacb..d3b92722 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -19,9 +19,9 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstatusbar.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kaction.h> #include <kaccel.h> #include <kdebug.h> diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h index 3bae7a27..39376305 100644 --- a/kstars/kstars/imageviewer.h +++ b/kstars/kstars/imageviewer.h @@ -22,7 +22,7 @@ #include <tqpixmap.h> #include <kpixmapio.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <ktempfile.h> #include <kmainwindow.h> diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index 1a20771f..162e1120 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -25,7 +25,7 @@ #include <tqdir.h> #include <kurl.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kled.h> #include <ksqueezedtextlabel.h> #include <klineedit.h> diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index d6d9ce02..5d109048 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -14,7 +14,7 @@ #include "indifitsconf.h" #include <kiconloader.h> #include <kpushbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <tqcheckbox.h> diff --git a/kstars/kstars/indistd.h b/kstars/kstars/indistd.h index a2625705..30bd07db 100644 --- a/kstars/kstars/indistd.h +++ b/kstars/kstars/indistd.h @@ -14,7 +14,7 @@ #include <tqobject.h> #include <indi/lilxml.h> - #include <kfileitem.h> + #include <tdefileitem.h> class INDI_E; class INDI_P; diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index dfa392b3..05309f25 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -24,13 +24,13 @@ #include <klineedit.h> #include <kshortcut.h> #include <kiconloader.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <ktempfile.h> #include <ktip.h> #include <kstandarddirs.h> -#include <kconfigdialog.h> -#include <kfiledialog.h> +#include <tdeconfigdialog.h> +#include <tdefiledialog.h> #include <kinputdialog.h> #include <kpopupmenu.h> #include <kstatusbar.h> diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp index 1c755175..a4cc5835 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -21,7 +21,7 @@ #include <tqlistview.h> #include <tqradiobutton.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <kprinter.h> #include <kshortcut.h> diff --git a/kstars/kstars/opscatalog.cpp b/kstars/kstars/opscatalog.cpp index d948c863..71909872 100644 --- a/kstars/kstars/opscatalog.cpp +++ b/kstars/kstars/opscatalog.cpp @@ -18,7 +18,7 @@ #include <tqlistview.h> //TQCheckListItem #include <tqcheckbox.h> #include <tqlabel.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "opscatalog.h" #include "Options.h" diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index caf645a6..10b290db 100644 --- a/kstars/kstars/skymap.cpp +++ b/kstars/kstars/skymap.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kstatusbar.h> #include <kmessagebox.h> diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 86d73a01..eb880d3e 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -19,8 +19,8 @@ #include <kpushbutton.h> #include <kiconloader.h> #include <ktempfile.h> -#include <kio/netaccess.h> -#include <kfiledialog.h> +#include <tdeio/netaccess.h> +#include <tdefiledialog.h> #include <kcombobox.h> #include <kurl.h> diff --git a/kstars/kstars/thumbnailpicker.h b/kstars/kstars/thumbnailpicker.h index 89346989..9f060ade 100644 --- a/kstars/kstars/thumbnailpicker.h +++ b/kstars/kstars/thumbnailpicker.h @@ -19,8 +19,8 @@ #define THUMBNAILPICKER_H #include <kdialogbase.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> class ThumbnailPickerUI; class ThumbnailEditor; diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index a07bfc50..2fef2a5a 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -28,7 +28,7 @@ #include <tqwhatsthis.h> #include <tqfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <kstandarddirs.h> diff --git a/kstars/kstars/tools/lcgenerator.h b/kstars/kstars/tools/lcgenerator.h index 04fa8841..569d1e7f 100644 --- a/kstars/kstars/tools/lcgenerator.h +++ b/kstars/kstars/tools/lcgenerator.h @@ -29,7 +29,7 @@ #include <tqvariant.h> #include <kdialogbase.h> -#include <kio/job.h> +#include <tdeio/job.h> class TQVBoxLayout; class TQHBoxLayout; diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp index 750ae6d6..a0ca39e1 100644 --- a/kstars/kstars/tools/modcalcangdist.cpp +++ b/kstars/kstars/tools/modcalcangdist.cpp @@ -25,7 +25,7 @@ #include <tqradiobutton.h> #include <tqtextstream.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> //#include <kapplication.h> ..already included in modcalcapcoord.h diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 4e39723f..275f3e76 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -32,7 +32,7 @@ #include <klineedit.h> #include <tqtextstream.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> //#include <kapplication.h> ..already included in modcalcapcoord.h diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index e2eb527e..8cd37816 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -32,7 +32,7 @@ #include <tqradiobutton.h> #include <tqstring.h> #include <tqtextstream.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp index c2873aa1..9a572f98 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.cpp +++ b/kstars/kstars/tools/modcalceclipticcoords.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <klineedit.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index f04c5d46..143e3341 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -28,7 +28,7 @@ #include <tqcombobox.h> #include <tqstring.h> #include <tqtextstream.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <tqcheckbox.h> #include <tqradiobutton.h> diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp index 18638a6c..ddfaba40 100644 --- a/kstars/kstars/tools/modcalcgalcoord.cpp +++ b/kstars/kstars/tools/modcalcgalcoord.cpp @@ -30,7 +30,7 @@ #include <klocale.h> #include <klineedit.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index 892b08e9..37e6ffbe 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -33,7 +33,7 @@ #include <knumvalidator.h> #include <klocale.h> #include <klineedit.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index 977b47bf..68731825 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -32,7 +32,7 @@ #include <tqdatetimeedit.h> #include <tqstring.h> #include <tqtextstream.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <tqcheckbox.h> #include <tqradiobutton.h> diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index ddf71e2e..335d773b 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <klineedit.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) { diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index 3fcf2a16..ad3da401 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqstring.h> #include <tqtextstream.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include "dmsbox.h" diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index 4f553554..885ce1c2 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -33,7 +33,7 @@ #include <tqradiobutton.h> #include <tqstring.h> #include <tqtextstream.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index 063e4b5f..c8bd8709 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -29,9 +29,9 @@ #include <kinputdialog.h> #include <kicontheme.h> #include <kiconloader.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ktempfile.h> #include <klineedit.h> diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index 7a31fbf1..a66d7bca 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -25,7 +25,7 @@ #include <kcombobox.h> #include <kicontheme.h> #include <kiconloader.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klistbox.h> #include <klistview.h> #include <kprocess.h> @@ -33,7 +33,7 @@ #include <ktempfile.h> #include <kdatewidget.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstdguiitem.h> #include <kstandarddirs.h> #include <kurl.h> diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 278ad3fe..4a3fa700 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -27,13 +27,13 @@ // KDE Header #include <klocale.h> #include <kstatusbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kaction.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kdebug.h> #include <kpopupmenu.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kaction.h> #include <kcombobox.h> #include <kfontrequester.h> diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp index 35def758..4a8d38f6 100644 --- a/ktouch/src/ktouchcolorscheme.cpp +++ b/ktouch/src/ktouchcolorscheme.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #define WRITE_COLOR(z,x,y) e = doc.createElement(x); \ n = doc.createTextNode( (y).name() ); \ diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index 8d9fd4b9..300b3482 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -16,7 +16,7 @@ #include <kdebug.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include "prefs.h" diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index 40944155..ac51b005 100644 --- a/ktouch/src/ktouchkeyboardeditor.cpp +++ b/ktouch/src/ktouchkeyboardeditor.cpp @@ -17,7 +17,7 @@ #include <tqfont.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <ksqueezedtextlabel.h> #include <klineedit.h> diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index c5c1e88f..75edfb9e 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <ktempfile.h> #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kmessagebox.h> diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp index 40a86007..6285a843 100644 --- a/ktouch/src/ktouchlecture.cpp +++ b/ktouch/src/ktouchlecture.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> bool KTouchLecture::load(TQWidget * window, const KURL& url) { // Ok, first download the contents as usual using the KIO lib diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 301b70b2..f8504c21 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -25,7 +25,7 @@ #include <kmessagebox.h> #include <kcombobox.h> #include <kfontdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <algorithm> // for std::swap diff --git a/ktouch/src/ktouchopenrequest.cpp b/ktouch/src/ktouchopenrequest.cpp index 43d236f3..59f7e605 100644 --- a/ktouch/src/ktouchopenrequest.cpp +++ b/ktouch/src/ktouchopenrequest.cpp @@ -17,7 +17,7 @@ #include <kpushbutton.h> #include <klineedit.h> #include <kcombobox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <ksqueezedtextlabel.h> #include <kmessagebox.h> diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index 88171722..67e1dac5 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #ifdef HAVE_SSTREAM # include <sstream> diff --git a/ktouch/src/prefs.kcfgc b/ktouch/src/prefs.kcfgc index d5d5d7ba..8589875f 100644 --- a/ktouch/src/prefs.kcfgc +++ b/ktouch/src/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=ktouch.kcfg IncludeFiles=kglobalsettings.h ClassName=Prefs diff --git a/kturtle/TODO b/kturtle/TODO index 0cab39f0..f2c8b3a9 100644 --- a/kturtle/TODO +++ b/kturtle/TODO @@ -269,7 +269,7 @@ print command is buggy, examples: FIXED! RESEARCH ON THE HELP PROBLEM -then the help-kioslave is tdelibs/kdoctools +then the help-tdeioslave is tdelibs/kdoctools little help needed: when i use konq to go "help:/kate?anchor=kate-part-selection-persistent" (which is the proper way to go diff --git a/kturtle/file.txt b/kturtle/file.txt index 8203dad7..05305192 100644 --- a/kturtle/file.txt +++ b/kturtle/file.txt @@ -15,7 +15,7 @@ The following packages will be REMOVED: kappfinder karm kate kcontrol kde-cvs-snapshot tdeartwork tdeartwork-misc tdeartwork-style tdeartwork-theme-desktop tdeartwork-theme-window tdebase tdebase-bin tdebase-data tdebase-kio-plugins tdelibs tdelibs-bin tdelibs-data - tdelibs4 tdelibs4-doc tdepim tdepim-kfile-plugins tdepim-libs tdeprint + tdelibs4 tdelibs4-doc tdepim tdepim-tdefile-plugins tdepim-libs tdeprint kdesktop tdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper kmail kmailcvt kmenuedit knode knotes konqueror konqueror-nsplugins konsole kontact korganizer korn kpager kpersonalizer kpilot tdescreensaver ksmserver diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 587c6020..69214822 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -28,10 +28,10 @@ #include <tqwhatsthis.h> #include <kapplication.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kdebug.h> #include <kedittoolbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kinputdialog.h> #include <klocale.h> diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp index 1691a529..71fc15c7 100644 --- a/kverbos/kverbos/kverbos.cpp +++ b/kverbos/kverbos/kverbos.cpp @@ -21,7 +21,7 @@ #include <tqradiobutton.h> // include files for KDE -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinputdialog.h> #include "kstartuplogo.h" #include <kstandarddirs.h> diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp index 2d820741..05eb4e25 100644 --- a/kverbos/kverbos/kverbosdoc.cpp +++ b/kverbos/kverbos/kverbosdoc.cpp @@ -26,7 +26,7 @@ // include files for KDE #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> // application specific includes #include "verbspanish.h" diff --git a/kverbos/kverbos/prefs.kcfgc b/kverbos/kverbos/prefs.kcfgc index 1c3e4d3e..8fdda594 100644 --- a/kverbos/kverbos/prefs.kcfgc +++ b/kverbos/kverbos/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kverbos.kcfg IncludeFiles=kdebug.h ClassName=Prefs diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp index eff5b01c..e8e25332 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp @@ -30,7 +30,7 @@ #include <kmessagebox.h> #include <kpushbutton.h> #include <kdebug.h> -#include <kconfigskeleton.h> +#include <tdeconfigskeleton.h> #include <kcolorbutton.h> #include <kfontrequester.h> #include <kcombobox.h> diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h index 6d096c41..ff4ac9e7 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h @@ -19,7 +19,7 @@ #ifndef KVOCTRAINPREFS_H #define KVOCTRAINPREFS_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> /** *@author Peter Hedlund diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index ffdf44d4..8ec23d7c 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -35,7 +35,7 @@ #include <kcombobox.h> #include <dcopclient.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include "languageoptions.h" diff --git a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc index bb9ed639..6aeff9c7 100644 --- a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc +++ b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler IncludeFiles=../kv_resource.h,../kvt-core/kvoctrainexpr.h File=kvoctrain.kcfg ClassName=Prefs diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index 7d4c338c..9cf65272 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -27,7 +27,7 @@ #include <tqtimer.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kcombobox.h> #include <kprogress.h> #include <krecentdocument.h> diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 31be75df..bc2ff5ba 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -27,7 +27,7 @@ #include <klineedit.h> #include <kcombobox.h> #include <kprogress.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <klocale.h> #include <kdebug.h> diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index f3e9e76a..b3353ded 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -31,7 +31,7 @@ #include "langset.h" #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdebug.h> #include <dcopclient.h> diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp index f1b74ae4..7abb9b80 100644 --- a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp +++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <iostream> #include <vector> diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp index e1a1efcc..b2f0f038 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfileinfo.h> #include <tqregexp.h> diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index d84dc96e..fd4abfcb 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -22,7 +22,7 @@ // include files for KDE #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstatusbar.h> #include <klocale.h> #include <kedittoolbar.h> diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index 9cda99c8..c024969c 100644 --- a/kwordquiz/src/kwordquizdoc.cpp +++ b/kwordquiz/src/kwordquizdoc.cpp @@ -20,7 +20,7 @@ // include files for KDE #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "keduvocdata.h" // application specific includes diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp index 7487ad0c..b96c66f6 100644 --- a/kwordquiz/src/kwordquizprefs.cpp +++ b/kwordquiz/src/kwordquizprefs.cpp @@ -29,7 +29,7 @@ #include <kmessagebox.h> #include <kpushbutton.h> #include <kdebug.h> -#include <kconfigskeleton.h> +#include <tdeconfigskeleton.h> #include <kcolorbutton.h> #include <kfontrequester.h> diff --git a/kwordquiz/src/kwordquizprefs.h b/kwordquiz/src/kwordquizprefs.h index 41930d09..1a99bffe 100644 --- a/kwordquiz/src/kwordquizprefs.h +++ b/kwordquiz/src/kwordquizprefs.h @@ -18,7 +18,7 @@ #ifndef KWORDQUIZPREFS_H #define KWORDQUIZPREFS_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> /** *@author Peter Hedlund diff --git a/kwordquiz/src/prefs.kcfgc b/kwordquiz/src/prefs.kcfgc index 8a1e7d8b..537d7689 100644 --- a/kwordquiz/src/prefs.kcfgc +++ b/kwordquiz/src/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kwordquiz.kcfg ClassName=Prefs Singleton=true |