diff options
Diffstat (limited to 'kcontrol/kfontinst')
26 files changed, 55 insertions, 55 deletions
diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/CMakeLists.txt index 38056cd3c..0fe56e1b4 100644 --- a/kcontrol/kfontinst/CMakeLists.txt +++ b/kcontrol/kfontinst/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory( lib ) add_subdirectory( thumbnail ) add_subdirectory( viewpart ) add_subdirectory( kcmfontinst ) -add_subdirectory( kfile-plugin ) +add_subdirectory( tdefile-plugin ) add_subdirectory( kfontinst ) add_subdirectory( kio ) diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog index 0c2de0ed1..7916d0b45 100644 --- a/kcontrol/kfontinst/ChangeLog +++ b/kcontrol/kfontinst/ChangeLog @@ -118,11 +118,11 @@ KDE3.1 -> KDE3.2 4. Settings are saved on "Apply". 5. Settings tab simplified - some uneccesary settings removed. 6. Removal of Anti-Alias tab - relevant settings moved to kcmfonts. -7. Add kfile-plugin to display Meta data for fonts. +7. Add tdefile-plugin to display Meta data for fonts. 8. Remove settings wizard. 9. Drop use of internal version numbering - not tagging CVS anyway, so whats the point? 10. DCOP interface. -11. Remember size of main window when run via kcmshell. +11. Remember size of main window when run via tdecmshell. 0.10->0.11 (KDE3.0) =================== diff --git a/kcontrol/kfontinst/Makefile.am b/kcontrol/kfontinst/Makefile.am index 963ec3c93..190855a8a 100644 --- a/kcontrol/kfontinst/Makefile.am +++ b/kcontrol/kfontinst/Makefile.am @@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail FONTINST_VP_SUBDIR=viewpart endif -SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst kfile-plugin kfontinst kio +SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin kfontinst kio EXTRA_DIST = TODO diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c5db61ecc..bce091cd7 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -51,12 +51,12 @@ #include <ktoolbar.h> #include <ktoolbarbutton.h> #include <kstdaccel.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kcmdlineargs.h> #include <kapplication.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <kdirlister.h> #include <kpushbutton.h> #include <kguiitem.h> diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index c3d64c7b0..4895f273e 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -36,8 +36,8 @@ #include <tqstringlist.h> #include <tdecmodule.h> #include <kurl.h> -#include <kconfig.h> -#include <kio/job.h> +#include <tdeconfig.h> +#include <tdeio/job.h> #ifdef HAVE_XFT #include <tdeparts/part.h> #endif diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp index 241ac88bf..0770094e3 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// #include <tqevent.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kurldrag.h> #include "KFileFontIconView.h" diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h index bb5ccfa5a..8a86b1ae2 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h @@ -29,7 +29,7 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include <kfileiconview.h> +#include <tdefileiconview.h> namespace KFI { diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index 0d05799d9..3c8801e75 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// // -// NOTE: HEAVILY copied from kfiledetailview.cpp... +// NOTE: HEAVILY copied from tdefiledetailview.cpp... // // Copyright (C) 1997 Stephan Kulow <[email protected]> // 2000, 2001 Carsten Pfeiffer <[email protected]> @@ -39,7 +39,7 @@ #include <tqpainter.h> #include <tqpixmap.h> #include <kapplication.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kicontheme.h> diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index c160175be..6496c13fd 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -30,7 +30,7 @@ //////////////////////////////////////////////////////////////////////////////// // -// NOTE: HEAVILY copied from kfiledetailview.cpp... +// NOTE: HEAVILY copied from tdefiledetailview.cpp... // // Copyright (C) 1997 Stephan Kulow <[email protected]> // 2000, 2001 Carste @@ -42,7 +42,7 @@ class TQKeyEvent; #include <klistview.h> #include <kmimetyperesolver.h> -#include "kfileview.h" +#include "tdefileview.h" /** * An item for the listiew, that has a reference to its corresponding diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp index c4a0d26b1..e555dc7fd 100644 --- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp @@ -34,10 +34,10 @@ #include <tqvbox.h> #include <tqwhatsthis.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> namespace KFI { diff --git a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop b/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop index dfdb9bad6..134e658c8 100644 --- a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop +++ b/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kcmfontinst +Exec=tdecmshell kcmfontinst Icon=fonts Type=Application DocPath=kcontrol/kcmfontinst/index.html diff --git a/kcontrol/kfontinst/kfile-plugin/Makefile.am b/kcontrol/kfontinst/kfile-plugin/Makefile.am deleted file mode 100644 index 7f136357f..000000000 --- a/kcontrol/kfontinst/kfile-plugin/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -kde_module_LTLIBRARIES = kfile_font.la - -kfile_font_la_SOURCES = KFileFont.cpp -kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) -kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la - -kdelnkdir = $(kde_servicesdir) -kde_services_DATA = kfile_font.desktop - -AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) - -METASOURCES = AUTO -noinst_HEADERS = KFileFont.h diff --git a/kcontrol/kfontinst/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/kfontinst/CMakeLists.txt index f288ca5ea..fdcb51b15 100644 --- a/kcontrol/kfontinst/kfontinst/CMakeLists.txt +++ b/kcontrol/kfontinst/kfontinst/CMakeLists.txt @@ -31,6 +31,6 @@ tde_add_executable( kfontinst SOURCES Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c XConfig.cpp - LINK kxftconfig-static kfontinst-shared kio-shared + LINK kxftconfig-static kfontinst-shared tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index c7c03d107..4c28a1c33 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -44,11 +44,11 @@ #include <sys/resource.h> #include <unistd.h> #include <fcntl.h> -#include <kio/global.h> -#include <kio/ioslave_defaults.h> -#include <kio/netaccess.h> -#include <kio/slaveinterface.h> -#include <kio/connection.h> +#include <tdeio/global.h> +#include <tdeio/ioslave_defaults.h> +#include <tdeio/netaccess.h> +#include <tdeio/slaveinterface.h> +#include <tdeio/connection.h> #include <tqtextstream.h> #include <kmimetype.h> #include <kmessagebox.h> diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h index 1de87f5f1..ec8c69c4e 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/kio/KioFonts.h @@ -31,7 +31,7 @@ #include <fontconfig/fontconfig.h> #include <time.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <kurl.h> #include <klocale.h> #include <tqstring.h> diff --git a/kcontrol/kfontinst/lib/CMakeLists.txt b/kcontrol/kfontinst/lib/CMakeLists.txt index 989d60810..83f977aaa 100644 --- a/kcontrol/kfontinst/lib/CMakeLists.txt +++ b/kcontrol/kfontinst/lib/CMakeLists.txt @@ -28,6 +28,6 @@ link_directories( tde_add_library( kfontinst SHARED SOURCES Misc.cpp FcEngine.cpp VERSION 0.0.0 - LINK kio-shared ${XFT_LIBRARIES} + LINK tdeio-shared ${XFT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 57fb765f1..6faf700c6 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -4,9 +4,9 @@ #include <tqfile.h> #include <tqtextstream.h> #include <kurl.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <math.h> #include "FcEngine.h" #include "KfiConstants.h" diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index a2c150a08..5f39afec8 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -31,7 +31,7 @@ #include <kprocess.h> #include <kstandarddirs.h> #include <klargefile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <unistd.h> namespace KFI diff --git a/kcontrol/kfontinst/kfile-plugin/CMakeLists.txt b/kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt index 229c243d7..d12537903 100644 --- a/kcontrol/kfontinst/kfile-plugin/CMakeLists.txt +++ b/kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt @@ -24,13 +24,13 @@ link_directories( ##### other data ################################ -install( FILES kfile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### kfile_font (module) ####################### +##### tdefile_font (module) ####################### -tde_add_kpart( kfile_font +tde_add_kpart( tdefile_font SOURCES KFileFont.cpp - LINK kfontinst-shared kio-shared + LINK kfontinst-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp index 46339fc4f..4ac55807f 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ b/kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp @@ -31,7 +31,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <kgenericfactory.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> static void addEntry(int face, TQString &existing, const TQString &add) { @@ -260,7 +260,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt } typedef KGenericFactory<KFI::KFileFontPlugin> KFileFontPluginFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_font, KFileFontPluginFactory("kfontinst")) +K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("kfontinst")) namespace KFI { diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.h b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h index d33079e0b..a383d9a8e 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.h +++ b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h @@ -29,7 +29,7 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include "FcEngine.h" namespace KFI diff --git a/kcontrol/kfontinst/tdefile-plugin/Makefile.am b/kcontrol/kfontinst/tdefile-plugin/Makefile.am new file mode 100644 index 000000000..04ab41861 --- /dev/null +++ b/kcontrol/kfontinst/tdefile-plugin/Makefile.am @@ -0,0 +1,13 @@ +kde_module_LTLIBRARIES = tdefile_font.la + +tdefile_font_la_SOURCES = KFileFont.cpp +tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) +tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la + +kdelnkdir = $(kde_servicesdir) +kde_services_DATA = tdefile_font.desktop + +AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) + +METASOURCES = AUTO +noinst_HEADERS = KFileFont.h diff --git a/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop b/kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop index b18e51af7..20e502c59 100644 --- a/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop +++ b/kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop @@ -80,7 +80,7 @@ Name[zh_CN]=字体信息 Name[zh_TW]=字型資訊 Name[zu]=Ulwazi lohlobo lwamagama ServiceTypes=KFilePlugin -X-TDE-Library=kfile_font +X-TDE-Library=tdefile_font MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;application/x-font-ttc;application/x-afm PreferredGroups=General PreferredItems=Full,Family,Foundry,Weight,Width,Spacing,Slant diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.h b/kcontrol/kfontinst/thumbnail/FontThumbnail.h index 456e38b65..c902ce019 100644 --- a/kcontrol/kfontinst/thumbnail/FontThumbnail.h +++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.h @@ -29,7 +29,7 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include <kio/thumbcreator.h> +#include <tdeio/thumbcreator.h> #include "FcEngine.h" namespace KFI diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 1eeb2396c..6147363b9 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -44,7 +44,7 @@ #include <tqsettings.h> #include <tqstringlist.h> #include <tqtimer.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kinstance.h> #include <kmessagebox.h> #include <knuminput.h> diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index f4b57bde0..6690cc44b 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -33,8 +33,8 @@ #include <klibloader.h> #include <klocale.h> #include <kglobal.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #define CFG_GROUP "FontViewer Settings" #define CFG_SIZE_KEY "Window Size" |