From 5cba27652d2c311bc4ef391e0db292646d617179 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Jan 2013 23:22:43 -0600 Subject: [PATCH] Rename a few build variables for overall consistency --- acinclude.m4 | 6 +++--- kexi/3rdparty/kexisql/src/os.c | 2 +- kexi/3rdparty/kexisql3/src/os_win.c | 2 +- kexi/formeditor/tdevelop_plugin/Makefile.am | 2 +- kexi/formeditor/test/Makefile.am | 2 +- lib/kross/main/Makefile.am | 2 +- tools/tdefile-plugins/abiword/tdefile_abiword.h | 4 ++-- tools/tdefile-plugins/gnumeric/tdefile_gnumeric.h | 4 ++-- tools/tdefile-plugins/koffice/tdefile_koffice.h | 4 ++-- tools/tdefile-plugins/ooo/tdefile_ooo.h | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index fad5d0112..c3eb5b07a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2078,14 +2078,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") @@ -2095,7 +2095,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/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c index b47fd9615..7b03cab72 100644 --- a/kexi/3rdparty/kexisql/src/os.c +++ b/kexi/3rdparty/kexisql/src/os.c @@ -1367,7 +1367,7 @@ int sqliteOsReadLock(OsFile *id){ ovlp.Offset = FIRST_LOCKBYTE+1; ovlp.OffsetHigh = 0; ovlp.hEvent = 0; - res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, + res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY, 0, N_LOCKBYTE, 0, &ovlp); }else{ res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0); diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c index ec7a08405..2c1947a57 100644 --- a/kexi/3rdparty/kexisql3/src/os_win.c +++ b/kexi/3rdparty/kexisql3/src/os_win.c @@ -615,7 +615,7 @@ static int getReadLock(OsFile *id){ ovlp.Offset = SHARED_FIRST; ovlp.OffsetHigh = 0; ovlp.hEvent = 0; - res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp); + res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp); }else{ int lk; sqlite3Randomness(sizeof(lk), &lk); diff --git a/kexi/formeditor/tdevelop_plugin/Makefile.am b/kexi/formeditor/tdevelop_plugin/Makefile.am index 62507e9ce..6149421e3 100644 --- a/kexi/formeditor/tdevelop_plugin/Makefile.am +++ b/kexi/formeditor/tdevelop_plugin/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkformdesigner_kdev_part.la libkformdesigner_kdev_part_la_SOURCES = kfd_kdev_part.cpp libkformdesigner_kdev_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(VER_INFO) $(all_libraries) libkformdesigner_kdev_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ - -lkinterfacedesigner $(LIB_KFILE) + -lkinterfacedesigner $(LIB_TDEFILE) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am index 1c022c2d3..f1a563070 100644 --- a/kexi/formeditor/test/Makefile.am +++ b/kexi/formeditor/test/Makefile.am @@ -33,7 +33,7 @@ kde_module_LTLIBRARIES = libkformdesigner_part.la libkformdesigner_part_la_SOURCES = kfd_part.cpp libkformdesigner_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(VER_INFO) -libkformdesigner_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la $(LIB_KFILE) +libkformdesigner_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la $(LIB_TDEFILE) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/lib/kross/main/Makefile.am b/lib/kross/main/Makefile.am index 4072718a7..abdd63fea 100644 --- a/lib/kross/main/Makefile.am +++ b/lib/kross/main/Makefile.am @@ -22,7 +22,7 @@ maininclude_HEADERS = \ libkrossmain_la_LIBADD = \ $(LIB_QT) \ $(LIB_TDECORE) \ - $(LIB_KFILE) \ + $(LIB_TDEFILE) \ $(LIB_TDEUI) \ $(LIB_KNEWSTUFF) \ $(LIB_KROSS_API) diff --git a/tools/tdefile-plugins/abiword/tdefile_abiword.h b/tools/tdefile-plugins/abiword/tdefile_abiword.h index 0b09acb84..524996a0f 100644 --- a/tools/tdefile-plugins/abiword/tdefile_abiword.h +++ b/tools/tdefile-plugins/abiword/tdefile_abiword.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_ABIWORD_H__ -#define __KFILE_ABIWORD_H__ +#ifndef __TDEFILE_ABIWORD_H__ +#define __TDEFILE_ABIWORD_H__ #include diff --git a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.h b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.h index c48c08abb..4340f9183 100644 --- a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.h +++ b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_GNUMERIC_H__ -#define __KFILE_GNUMERIC_H__ +#ifndef __TDEFILE_GNUMERIC_H__ +#define __TDEFILE_GNUMERIC_H__ #include diff --git a/tools/tdefile-plugins/koffice/tdefile_koffice.h b/tools/tdefile-plugins/koffice/tdefile_koffice.h index 9ac501787..2dbe70253 100644 --- a/tools/tdefile-plugins/koffice/tdefile_koffice.h +++ b/tools/tdefile-plugins/koffice/tdefile_koffice.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_KOFFICE_H__ -#define __KFILE_KOFFICE_H__ +#ifndef __TDEFILE_KOFFICE_H__ +#define __TDEFILE_KOFFICE_H__ #include diff --git a/tools/tdefile-plugins/ooo/tdefile_ooo.h b/tools/tdefile-plugins/ooo/tdefile_ooo.h index 9cb9f12ae..4f3b90f3d 100644 --- a/tools/tdefile-plugins/ooo/tdefile_ooo.h +++ b/tools/tdefile-plugins/ooo/tdefile_ooo.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_OOO_H__ -#define __KFILE_OOO_H__ +#ifndef __TDEFILE_OOO_H__ +#define __TDEFILE_OOO_H__ #include #include