diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:58:32 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:58:32 +0200 |
| commit | 6201fa3c010dc3054ce5e81b09b4c805d19e9d0b (patch) | |
| tree | 5dc35bb75a2e56b288d28eb8c8317f6dd4788f21 | |
| parent | 3ef8b5970c24015d6ffaae58171667839522d82b (diff) | |
| download | tdeio-umountwrapper-6201fa3c.tar.gz tdeio-umountwrapper-6201fa3c.zip | |
Additional k => tde renaming and fixes
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/tdeio_umountwrapper.h | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index fa8f294..c8e2c6b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-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_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/src/Makefile.am b/src/Makefile.am index 509c91d..ed8b44e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,6 +22,6 @@ bin_PROGRAMS = tdeio_umountwrapper # the application source, library search path, and link libraries tdeio_umountwrapper_SOURCES = main.cpp tdeio_umountwrapper.cpp -tdeio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdeio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor tdeio_umountwrapper_LDADD = $(LIB_TDEUI) diff --git a/src/tdeio_umountwrapper.h b/src/tdeio_umountwrapper.h index 14cdc24..5165298 100644 --- a/src/tdeio_umountwrapper.h +++ b/src/tdeio_umountwrapper.h @@ -19,8 +19,8 @@ ***************************************************************************/ -#ifndef _KIO_UMOUNTWRAPPER_H_ -#define _KIO_UMOUNTWRAPPER_H_ +#ifndef _TDEIO_UMOUNTWRAPPER_H_ +#define _TDEIO_UMOUNTWRAPPER_H_ #ifdef HAVE_CONFIG_H #include <config.h> @@ -46,4 +46,4 @@ private slots: }; -#endif // _KIO_UMOUNTWRAPPER_H_ +#endif // _TDEIO_UMOUNTWRAPPER_H_ |