From 8d4359abdcdefdc39b55247118d1581a97334c02 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Jan 2013 23:19:45 -0600 Subject: [PATCH] Rename a few build variables for overall consistency --- acinclude.m4 | 6 +++--- tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 213de6d..1893bea 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2111,14 +2111,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2128,7 +2128,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h index dadb856..114a4d9 100644 --- a/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h +++ b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h @@ -13,8 +13,8 @@ * See the file "COPYING" for the exact licensing terms. */ -#ifndef __KFILE_K3BPROJECTFILEPLUGIN_H__ -#define __KFILE_K3BPROJECTFILEPLUGIN_H__ +#ifndef __TDEFILE_K3BPROJECTFILEPLUGIN_H__ +#define __TDEFILE_K3BPROJECTFILEPLUGIN_H__ /** * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>