From 14ad34cde3cb2917e91092546631952d0258a222 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Jan 2013 23:31:44 -0600 Subject: Rename a few build variables for overall consistency --- CMakeLists.txt | 6 +++--- kcoloredit/Makefile.am | 2 +- kfax/Makefile.am | 2 +- kghostview/Makefile.am | 2 +- kiconedit/Makefile.am | 2 +- kooka/Makefile.am | 2 +- kpdf/Makefile.am | 2 +- kuickshow/src/kuickfile.h | 6 +++--- kview/modules/browser/Makefile.am | 2 +- kview/modules/effects/Makefile.am | 2 +- kview/modules/scale/Makefile.am | 2 +- kview/modules/scanner/Makefile.am | 2 +- kview/modules/template/Makefile.am | 2 +- kview/photobook/Makefile.am | 2 +- kviewshell/Makefile.am | 4 ++-- libkscan/Makefile.am | 2 +- tdefile-plugins/Makefile.am | 10 +++++----- tdefile-plugins/bmp/tdefile_bmp.h | 4 ++-- tdefile-plugins/dds/tdefile_dds.h | 4 ++-- tdefile-plugins/dvi/tdefile_dvi.h | 4 ++-- tdefile-plugins/exr/tdefile_exr.h | 4 ++-- tdefile-plugins/gif/tdefile_gif.h | 4 ++-- tdefile-plugins/ico/tdefile_ico.h | 4 ++-- tdefile-plugins/jpeg/tdefile_jpeg.h | 4 ++-- tdefile-plugins/pcx/tdefile_pcx.h | 4 ++-- tdefile-plugins/pdf/tdefile_pdf.h | 4 ++-- tdefile-plugins/png/tdefile_png.h | 4 ++-- tdefile-plugins/pnm/tdefile_pnm.h | 4 ++-- tdefile-plugins/ps/tdefile_ps.h | 4 ++-- tdefile-plugins/rgb/tdefile_rgb.h | 4 ++-- tdefile-plugins/tga/tdefile_tga.h | 4 ++-- tdefile-plugins/tiff/tdefile_tiff.h | 4 ++-- tdefile-plugins/xbm/tdefile_xbm.h | 4 ++-- tdefile-plugins/xpm/tdefile_xpm.h | 4 ++-- 34 files changed, 60 insertions(+), 60 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1439b55..feda8c2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ option( BUILD_KCOLOREDIT "Build kcoloredit" ${BUILD_ALL} ) option( BUILD_KDVI "Build kdvi" ${BUILD_ALL} ) option( BUILD_KFAX "Build kfax" ${BUILD_ALL} ) option( BUILD_KFAXVIEW "Build kfaxview" ${BUILD_ALL} ) -option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} ) +option( BUILD_TDEFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} ) option( BUILD_KGAMMA "Build kgamma" ${BUILD_ALL} ) option( BUILD_KGHOSTVIEW "Build kghostview" ${BUILD_ALL} ) option( BUILD_KICONEDIT "Build kiconedit" ${BUILD_ALL} ) @@ -114,7 +114,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### tdegraphics directories ################### # tdefile-plugins/ps requires dscparse-static library -if( BUILD_KFILE_PLUGINS AND NOT BUILD_KGHOSTVIEW ) +if( BUILD_TDEFILE_PLUGINS AND NOT BUILD_KGHOSTVIEW ) add_subdirectory( kghostview/dscparse ) endif( ) @@ -124,7 +124,7 @@ tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit ) tde_conditional_add_subdirectory( BUILD_KDVI kdvi ) tde_conditional_add_subdirectory( BUILD_KFAX kfax ) tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview ) -tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins ) +tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins ) tde_conditional_add_subdirectory( BUILD_KGAMMA kgamma ) tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview ) tde_conditional_add_subdirectory( BUILD_KICONEDIT kiconedit ) diff --git a/kcoloredit/Makefile.am b/kcoloredit/Makefile.am index 09028843..874d2cf1 100644 --- a/kcoloredit/Makefile.am +++ b/kcoloredit/Makefile.am @@ -6,7 +6,7 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \ editablestreamhistory.cpp color.cpp palette.cpp loadpalettedlg.cpp \ kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp kcoloredit_METASOURCES = AUTO -kcoloredit_LDADD = $(LIB_TDEUI) $(LIB_KFILE) +kcoloredit_LDADD = $(LIB_TDEUI) $(LIB_TDEFILE) kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor rcdir = $(kde_datadir)/kcoloredit diff --git a/kfax/Makefile.am b/kfax/Makefile.am index 01888a75..9bce4fd4 100644 --- a/kfax/Makefile.am +++ b/kfax/Makefile.am @@ -1,5 +1,5 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) -lm +LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lm INCLUDES = $(all_includes) ####### Files diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am index 072c6037..eae2dee0 100644 --- a/kghostview/Makefile.am +++ b/kghostview/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libkghostviewpart.la noinst_LTLIBRARIES = libdscparse.la libkghostviewlib_la_LDFLAGS = $(all_libraries) -libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint libdscparse.la +libkghostviewlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint libdscparse.la libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module libkghostviewpart_la_LIBADD = libkghostviewlib.la diff --git a/kiconedit/Makefile.am b/kiconedit/Makefile.am index 400e5446..4b58c40c 100644 --- a/kiconedit/Makefile.am +++ b/kiconedit/Makefile.am @@ -12,7 +12,7 @@ kiconedit_METASOURCES = AUTO # the library search path. kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kiconedit_LDADD = $(LIB_KFILE) -ltdeprint +kiconedit_LDADD = $(LIB_TDEFILE) -ltdeprint DISTCLEANFILES = *~ .deps/* .libs/* diff --git a/kooka/Makefile.am b/kooka/Makefile.am index 75a457e6..ed0932c1 100644 --- a/kooka/Makefile.am +++ b/kooka/Makefile.am @@ -16,7 +16,7 @@ kooka_SOURCES = main.cpp kooka.cpp kookaview.cpp kookapref.cpp \ kocrocrad.cpp # pagesetup.cpp -kooka_LDADD = $(LIB_KFILE) -ltdeprint -ltdetexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL) +kooka_LDADD = $(LIB_TDEFILE) -ltdeprint -ltdetexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL) kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor INCLUDES = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC) diff --git a/kpdf/Makefile.am b/kpdf/Makefile.am index b5d3739e..73506b4f 100644 --- a/kpdf/Makefile.am +++ b/kpdf/Makefile.am @@ -19,7 +19,7 @@ libkpdfpart_la_SOURCES = dcop.skel error.cpp part.cpp libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) libkpdfpart_la_LIBADD = xpdf/xpdf/libxpdf.la conf/libkpdfconf.la \ core/libkpdfcore.la ui/libkpdfui.la $(LIB_KPARTS) \ - $(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_KUTILS) -lm + $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_KUTILS) -lm partdesktopdir = $(kde_servicesdir) partdesktop_DATA = kpdf_part.desktop diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h index 78901ca7..1f6b7dd4 100644 --- a/kuickshow/src/kuickfile.h +++ b/kuickshow/src/kuickfile.h @@ -7,8 +7,8 @@ ** ****************************************************************************/ -#ifndef KUICKFILE_H -#define KUICKFILE_H +#ifndef KUICTDEFILE_H +#define KUICTDEFILE_H #include #include @@ -97,4 +97,4 @@ private: bool operator==( const KuickFile& first, const KuickFile& second ); -#endif // KUICKFILE_H +#endif // KUICTDEFILE_H diff --git a/kview/modules/browser/Makefile.am b/kview/modules/browser/Makefile.am index 2cbafea8..e62d866c 100644 --- a/kview/modules/browser/Makefile.am +++ b/kview/modules/browser/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_browserplugin.la kview_browserplugin_la_SOURCES = kmyfileitemlist.cpp kviewbrowser.cpp -kview_browserplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint +kview_browserplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint kview_browserplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kviewviewer/kpartplugins diff --git a/kview/modules/effects/Makefile.am b/kview/modules/effects/Makefile.am index aefaa6c2..2d6052f8 100644 --- a/kview/modules/effects/Makefile.am +++ b/kview/modules/effects/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_effectsplugin.la kview_effectsplugin_la_SOURCES = kvieweffects.cpp -kview_effectsplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint +kview_effectsplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint kview_effectsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kview/kpartplugins diff --git a/kview/modules/scale/Makefile.am b/kview/modules/scale/Makefile.am index 463f7a1e..e64c30d3 100644 --- a/kview/modules/scale/Makefile.am +++ b/kview/modules/scale/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_scale.la kview_scale_la_SOURCES = kfloatspinbox.cpp scaledlg.cpp kview_scale.cpp -kview_scale_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint +kview_scale_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint kview_scale_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kviewviewer/kpartplugins diff --git a/kview/modules/scanner/Makefile.am b/kview/modules/scanner/Makefile.am index 40ed2d88..ec7a9eb9 100644 --- a/kview/modules/scanner/Makefile.am +++ b/kview/modules/scanner/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_scannerplugin.la kview_scannerplugin_la_SOURCES = kviewscanner.cpp -kview_scannerplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint +kview_scannerplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint kview_scannerplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kview/kpartplugins diff --git a/kview/modules/template/Makefile.am b/kview/modules/template/Makefile.am index 9254048c..fa68246e 100644 --- a/kview/modules/template/Makefile.am +++ b/kview/modules/template/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_templateplugin.la kview_templateplugin_la_SOURCES = kviewtemplate.cpp -kview_templateplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint +kview_templateplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint kview_templateplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kview/kpartplugins diff --git a/kview/photobook/Makefile.am b/kview/photobook/Makefile.am index 967a2def..585c4a01 100644 --- a/kview/photobook/Makefile.am +++ b/kview/photobook/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libphotobook.la libphotobook_la_SOURCES = photobook.cpp libphotobook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -libphotobook_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) +libphotobook_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) partrcdir = $(kde_servicesdir) partrc_DATA = photobook.desktop diff --git a/kviewshell/Makefile.am b/kviewshell/Makefile.am index a9691440..136a4177 100644 --- a/kviewshell/Makefile.am +++ b/kviewshell/Makefile.am @@ -18,7 +18,7 @@ kviewerpart_la_SOURCES = kviewpart.cpp pageSizeWidget_base.ui \ optionDialogGUIWidget_base.ui optionDialogAccessibilityWidget.ui simplePageSize.cpp kviewerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -ltdeparts +kviewerpart_la_LIBADD = ./libifaces.la $(LIB_TDEFILE) -ltdeparts libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel \ units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp renderedDocumentPagePixmap.cpp \ @@ -30,7 +30,7 @@ libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp marklist.cpp tdemulti kde_kcfg_DATA = kviewshell.kcfg libtdemultipage_la_LDFLAGS = $(all_libraries) -libtdemultipage_la_LIBADD = $(LIB_KFILE) -ltdeprint -ltdeparts +libtdemultipage_la_LIBADD = $(LIB_TDEFILE) -ltdeprint -ltdeparts emptymultipagepart_la_SOURCES = empty_multipage.cpp emptyRenderer.cpp emptymultipagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module diff --git a/libkscan/Makefile.am b/libkscan/Makefile.am index b0c3be45..c9bdb66e 100644 --- a/libkscan/Makefile.am +++ b/libkscan/Makefile.am @@ -19,7 +19,7 @@ libkscan_la_SOURCES = kscandevice.cpp kscanslider.cpp kgammatable.cpp\ libkscan_la_LDFLAGS = $(all_libraries) $(LIBSANE_LDFLAGS) -no-undefined -version-info 1:0 -libkscan_la_LIBADD = $(LIBSANE_LIBS) $(LIB_KFILE) +libkscan_la_LIBADD = $(LIBSANE_LIBS) $(LIB_TDEFILE) kde_services_DATA = scanservice.desktop diff --git a/tdefile-plugins/Makefile.am b/tdefile-plugins/Makefile.am index bc15008f..eeb02fbc 100644 --- a/tdefile-plugins/Makefile.am +++ b/tdefile-plugins/Makefile.am @@ -1,14 +1,14 @@ if include_EXR_MODULES -KFILE_EXR_SUBDIR=exr +TDEFILE_EXR_SUBDIR=exr endif if include_TIFF -KFILE_TIFF_SUBDIR=tiff +TDEFILE_TIFF_SUBDIR=tiff endif if include_PDF -KFILE_PDF_SUBDIR=pdf +TDEFILE_PDF_SUBDIR=pdf endif -SUBDIRS=dependencies dvi png ps jpeg xbm xpm bmp tga rgb ico pcx $(KFILE_TIFF_SUBDIR) pnm \ - $(KFILE_EXR_SUBDIR) $(KFILE_PDF_SUBDIR) dds gif raw +SUBDIRS=dependencies dvi png ps jpeg xbm xpm bmp tga rgb ico pcx $(TDEFILE_TIFF_SUBDIR) pnm \ + $(TDEFILE_EXR_SUBDIR) $(TDEFILE_PDF_SUBDIR) dds gif raw diff --git a/tdefile-plugins/bmp/tdefile_bmp.h b/tdefile-plugins/bmp/tdefile_bmp.h index 27bc31a6..ce4f03eb 100644 --- a/tdefile-plugins/bmp/tdefile_bmp.h +++ b/tdefile-plugins/bmp/tdefile_bmp.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_BMP_H__ -#define __KFILE_BMP_H__ +#ifndef __TDEFILE_BMP_H__ +#define __TDEFILE_BMP_H__ #include diff --git a/tdefile-plugins/dds/tdefile_dds.h b/tdefile-plugins/dds/tdefile_dds.h index 464ed6fd..5a638a9d 100644 --- a/tdefile-plugins/dds/tdefile_dds.h +++ b/tdefile-plugins/dds/tdefile_dds.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_DDS_H__ -#define __KFILE_DDS_H__ +#ifndef __TDEFILE_DDS_H__ +#define __TDEFILE_DDS_H__ #include diff --git a/tdefile-plugins/dvi/tdefile_dvi.h b/tdefile-plugins/dvi/tdefile_dvi.h index da4bc6fe..034ddced 100644 --- a/tdefile-plugins/dvi/tdefile_dvi.h +++ b/tdefile-plugins/dvi/tdefile_dvi.h @@ -18,8 +18,8 @@ */ -#ifndef __KFILE_DVI_H__ -#define __KFILE_DVI_H__ +#ifndef __TDEFILE_DVI_H__ +#define __TDEFILE_DVI_H__ #include diff --git a/tdefile-plugins/exr/tdefile_exr.h b/tdefile-plugins/exr/tdefile_exr.h index 2fd23434..11a3a86b 100644 --- a/tdefile-plugins/exr/tdefile_exr.h +++ b/tdefile-plugins/exr/tdefile_exr.h @@ -18,8 +18,8 @@ * $Id$ */ -#ifndef __KFILE_EXR_H__ -#define __KFILE_EXR_H__ +#ifndef __TDEFILE_EXR_H__ +#define __TDEFILE_EXR_H__ #include #include diff --git a/tdefile-plugins/gif/tdefile_gif.h b/tdefile-plugins/gif/tdefile_gif.h index 37588e7a..acaa17d4 100644 --- a/tdefile-plugins/gif/tdefile_gif.h +++ b/tdefile-plugins/gif/tdefile_gif.h @@ -16,8 +16,8 @@ * */ -#ifndef __KFILE_GIF_H__ -#define __KFILE_GIF_H__ +#ifndef __TDEFILE_GIF_H__ +#define __TDEFILE_GIF_H__ #include #include diff --git a/tdefile-plugins/ico/tdefile_ico.h b/tdefile-plugins/ico/tdefile_ico.h index faa9481e..5e1331c9 100644 --- a/tdefile-plugins/ico/tdefile_ico.h +++ b/tdefile-plugins/ico/tdefile_ico.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_ICO_H__ -#define __KFILE_ICO_H__ +#ifndef __TDEFILE_ICO_H__ +#define __TDEFILE_ICO_H__ #include diff --git a/tdefile-plugins/jpeg/tdefile_jpeg.h b/tdefile-plugins/jpeg/tdefile_jpeg.h index 979ae515..c6eae8b1 100644 --- a/tdefile-plugins/jpeg/tdefile_jpeg.h +++ b/tdefile-plugins/jpeg/tdefile_jpeg.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_JPEG_H__ -#define __KFILE_JPEG_H__ +#ifndef __TDEFILE_JPEG_H__ +#define __TDEFILE_JPEG_H__ #include #include diff --git a/tdefile-plugins/pcx/tdefile_pcx.h b/tdefile-plugins/pcx/tdefile_pcx.h index c7b62e2e..14e9e628 100644 --- a/tdefile-plugins/pcx/tdefile_pcx.h +++ b/tdefile-plugins/pcx/tdefile_pcx.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_PCX_H_ -#define __KFILE_PCX_H_ +#ifndef __TDEFILE_PCX_H_ +#define __TDEFILE_PCX_H_ #include diff --git a/tdefile-plugins/pdf/tdefile_pdf.h b/tdefile-plugins/pdf/tdefile_pdf.h index d23971c7..e06e3a12 100644 --- a/tdefile-plugins/pdf/tdefile_pdf.h +++ b/tdefile-plugins/pdf/tdefile_pdf.h @@ -18,8 +18,8 @@ * $Id$ */ -#ifndef __KFILE_PDF_H__ -#define __KFILE_PDF_H__ +#ifndef __TDEFILE_PDF_H__ +#define __TDEFILE_PDF_H__ #include #include diff --git a/tdefile-plugins/png/tdefile_png.h b/tdefile-plugins/png/tdefile_png.h index 17fa31c8..5b02d3fc 100644 --- a/tdefile-plugins/png/tdefile_png.h +++ b/tdefile-plugins/png/tdefile_png.h @@ -18,8 +18,8 @@ * $Id$ */ -#ifndef __KFILE_PNG_H__ -#define __KFILE_PNG_H__ +#ifndef __TDEFILE_PNG_H__ +#define __TDEFILE_PNG_H__ #include #include diff --git a/tdefile-plugins/pnm/tdefile_pnm.h b/tdefile-plugins/pnm/tdefile_pnm.h index 4b16e4cc..0948d1a7 100644 --- a/tdefile-plugins/pnm/tdefile_pnm.h +++ b/tdefile-plugins/pnm/tdefile_pnm.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_PNM_H__ -#define __KFILE_PNM_H__ +#ifndef __TDEFILE_PNM_H__ +#define __TDEFILE_PNM_H__ #include diff --git a/tdefile-plugins/ps/tdefile_ps.h b/tdefile-plugins/ps/tdefile_ps.h index 1b095bdc..16f3c56a 100644 --- a/tdefile-plugins/ps/tdefile_ps.h +++ b/tdefile-plugins/ps/tdefile_ps.h @@ -18,8 +18,8 @@ * $Id$ */ -#ifndef __KFILE_PS_H__ -#define __KFILE_PS_H__ +#ifndef __TDEFILE_PS_H__ +#define __TDEFILE_PS_H__ #include diff --git a/tdefile-plugins/rgb/tdefile_rgb.h b/tdefile-plugins/rgb/tdefile_rgb.h index 6a4e0ae2..72c46d10 100644 --- a/tdefile-plugins/rgb/tdefile_rgb.h +++ b/tdefile-plugins/rgb/tdefile_rgb.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_RGB_H__ -#define __KFILE_RGB_H__ +#ifndef __TDEFILE_RGB_H__ +#define __TDEFILE_RGB_H__ #include diff --git a/tdefile-plugins/tga/tdefile_tga.h b/tdefile-plugins/tga/tdefile_tga.h index 68b0ae1d..ae0489b1 100644 --- a/tdefile-plugins/tga/tdefile_tga.h +++ b/tdefile-plugins/tga/tdefile_tga.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_TGA_H__ -#define __KFILE_TGA_H__ +#ifndef __TDEFILE_TGA_H__ +#define __TDEFILE_TGA_H__ #include diff --git a/tdefile-plugins/tiff/tdefile_tiff.h b/tdefile-plugins/tiff/tdefile_tiff.h index e34eef25..ab8560bf 100644 --- a/tdefile-plugins/tiff/tdefile_tiff.h +++ b/tdefile-plugins/tiff/tdefile_tiff.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_TIFF_H_ -#define __KFILE_TIFF_H_ +#ifndef __TDEFILE_TIFF_H_ +#define __TDEFILE_TIFF_H_ #include diff --git a/tdefile-plugins/xbm/tdefile_xbm.h b/tdefile-plugins/xbm/tdefile_xbm.h index 5e7f6429..0b844c1c 100644 --- a/tdefile-plugins/xbm/tdefile_xbm.h +++ b/tdefile-plugins/xbm/tdefile_xbm.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_XBM_H__ -#define __KFILE_XBM_H__ +#ifndef __TDEFILE_XBM_H__ +#define __TDEFILE_XBM_H__ #include diff --git a/tdefile-plugins/xpm/tdefile_xpm.h b/tdefile-plugins/xpm/tdefile_xpm.h index 275d3dd7..a16ca7fe 100644 --- a/tdefile-plugins/xpm/tdefile_xpm.h +++ b/tdefile-plugins/xpm/tdefile_xpm.h @@ -21,8 +21,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef KFILE_XPM_H -#define KFILE_XPM_H +#ifndef TDEFILE_XPM_H +#define TDEFILE_XPM_H /** * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h> -- cgit v1.2.1