diff options
Diffstat (limited to 'kcontrol/kfontinst')
-rw-r--r-- | kcontrol/kfontinst/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/CMakeLists.txt (renamed from kcontrol/kfontinst/kio/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/KioFonts.cpp (renamed from kcontrol/kfontinst/kio/KioFonts.cpp) | 8 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/KioFonts.h (renamed from kcontrol/kfontinst/kio/KioFonts.h) | 0 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/Makefile.am (renamed from kcontrol/kfontinst/kio/Makefile.am) | 8 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/folder.desktop (renamed from kcontrol/kfontinst/kio/folder.desktop) | 0 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/fonts.desktop (renamed from kcontrol/kfontinst/kio/fonts.desktop) | 0 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/fonts.protocol (renamed from kcontrol/kfontinst/kio/fonts.protocol) | 2 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/package.desktop (renamed from kcontrol/kfontinst/kio/package.desktop) | 0 | ||||
-rw-r--r-- | kcontrol/kfontinst/tdeio/system-folder.desktop (renamed from kcontrol/kfontinst/kio/system-folder.desktop) | 0 |
10 files changed, 12 insertions, 12 deletions
diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/CMakeLists.txt index 0fe56e1b4..e974f2a10 100644 --- a/kcontrol/kfontinst/CMakeLists.txt +++ b/kcontrol/kfontinst/CMakeLists.txt @@ -15,6 +15,6 @@ add_subdirectory( viewpart ) add_subdirectory( kcmfontinst ) add_subdirectory( tdefile-plugin ) add_subdirectory( kfontinst ) -add_subdirectory( kio ) +add_subdirectory( tdeio ) install( FILES installfont.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus ) diff --git a/kcontrol/kfontinst/kio/CMakeLists.txt b/kcontrol/kfontinst/tdeio/CMakeLists.txt index 9c6d0ad83..dff38b281 100644 --- a/kcontrol/kfontinst/kio/CMakeLists.txt +++ b/kcontrol/kfontinst/tdeio/CMakeLists.txt @@ -30,9 +30,9 @@ install( FILES fonts.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virt install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION ${MIME_INSTALL_DIR}/fonts ) -##### kio_fonts (module) ####################### +##### tdeio_fonts (module) ####################### -tde_add_kpart( kio_fonts AUTOMOC +tde_add_kpart( tdeio_fonts AUTOMOC SOURCES KioFonts.cpp LINK kxftconfig-static kfontinst-shared tdesu-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/tdeio/KioFonts.cpp index 4c28a1c33..a443ef546 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/tdeio/KioFonts.cpp @@ -28,8 +28,8 @@ /*************************************************************************** - NOTE: Large sections of this code are copied from kio_file - -- can't just inherit from kio_file as kio_file uses "error(...); + NOTE: Large sections of this code are copied from tdeio_file + -- can't just inherit from tdeio_file as tdeio_file uses "error(...); return;" So there is no way to know if an error occured! ***************************************************************************/ @@ -104,13 +104,13 @@ int kdemain(int argc, char **argv) { if (argc != 4) { - fprintf(stderr, "Usage: kio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n"); exit(-1); } KLocale::setMainCatalogue(KFI_CATALOGUE); - TDEInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL); + TDEInstance instance("tdeio_" KFI_KIO_FONTS_PROTOCOL); KFI::CKioFonts slave(argv[2], argv[3]); slave.dispatchLoop(); diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/tdeio/KioFonts.h index ec8c69c4e..ec8c69c4e 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/tdeio/KioFonts.h diff --git a/kcontrol/kfontinst/kio/Makefile.am b/kcontrol/kfontinst/tdeio/Makefile.am index ca22d13bd..9f59e28b8 100644 --- a/kcontrol/kfontinst/kio/Makefile.am +++ b/kcontrol/kfontinst/tdeio/Makefile.am @@ -1,9 +1,9 @@ -kde_module_LTLIBRARIES = kio_fonts.la -kio_fonts_la_SOURCES = \ +kde_module_LTLIBRARIES = tdeio_fonts.la +tdeio_fonts_la_SOURCES = \ KioFonts.cpp -kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la -kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined +tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la +tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE # The kxftconfig stuf really belongs to tdebase/kcontrol/fonts - here only so that can distribute this as an archive. diff --git a/kcontrol/kfontinst/kio/folder.desktop b/kcontrol/kfontinst/tdeio/folder.desktop index 848feabe5..848feabe5 100644 --- a/kcontrol/kfontinst/kio/folder.desktop +++ b/kcontrol/kfontinst/tdeio/folder.desktop diff --git a/kcontrol/kfontinst/kio/fonts.desktop b/kcontrol/kfontinst/tdeio/fonts.desktop index ac0f592cf..ac0f592cf 100644 --- a/kcontrol/kfontinst/kio/fonts.desktop +++ b/kcontrol/kfontinst/tdeio/fonts.desktop diff --git a/kcontrol/kfontinst/kio/fonts.protocol b/kcontrol/kfontinst/tdeio/fonts.protocol index 7f54dd0cc..02e5e5f29 100644 --- a/kcontrol/kfontinst/kio/fonts.protocol +++ b/kcontrol/kfontinst/tdeio/fonts.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_fonts +exec=tdeio_fonts protocol=fonts input=none output=filesystem diff --git a/kcontrol/kfontinst/kio/package.desktop b/kcontrol/kfontinst/tdeio/package.desktop index 2d2e1e4af..2d2e1e4af 100644 --- a/kcontrol/kfontinst/kio/package.desktop +++ b/kcontrol/kfontinst/tdeio/package.desktop diff --git a/kcontrol/kfontinst/kio/system-folder.desktop b/kcontrol/kfontinst/tdeio/system-folder.desktop index d2500c295..d2500c295 100644 --- a/kcontrol/kfontinst/kio/system-folder.desktop +++ b/kcontrol/kfontinst/tdeio/system-folder.desktop |