Browse Source

Additional k => tde renaming and fixes

Slávek Banko 5 years ago
parent
commit
1c6aafac58
6 changed files with 21 additions and 21 deletions
  1. 9
    9
      acinclude.m4
  2. 9
    9
      aclocal.m4
  3. 1
    1
      admin
  4. 0
    0
      kkbswitch.tdevelop
  5. 1
    1
      kkbswitch/Makefile.am
  6. 1
    1
      kkbswitch/Makefile.am.kdeinit

+ 9
- 9
acinclude.m4 View File

@@ -2010,30 +2010,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2010 2010
 if test $kde_qtver = 3; then
2011 2011
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2012 2012
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2013
-   AC_SUBST(LIB_KIO, "-ltdeio")
2013
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2014 2014
    AC_SUBST(LIB_SMB, "-lsmb")
2015 2015
    AC_SUBST(LIB_KAB, "-lkab")
2016 2016
    AC_SUBST(LIB_KABC, "-ltdeabc")
2017 2017
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2018
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2019
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2018
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2019
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2020 2020
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2021
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2021
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2022 2022
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
2023 2023
 # these are for backward compatibility
2024
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2024
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2025 2025
    AC_SUBST(LIB_KFILE, "-ltdeio")
2026 2026
 elif test $kde_qtver = 2; then
2027 2027
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2028 2028
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2029
-   AC_SUBST(LIB_KIO, "-ltdeio")
2030
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2029
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2030
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2031 2031
    AC_SUBST(LIB_SMB, "-lsmb")
2032 2032
    AC_SUBST(LIB_KFILE, "-ltdefile")
2033 2033
    AC_SUBST(LIB_KAB, "-lkab")
2034 2034
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2035
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2036
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2035
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2036
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2037 2037
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2038 2038
 else
2039 2039
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

+ 9
- 9
aclocal.m4 View File

@@ -2022,30 +2022,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2022 2022
 if test $kde_qtver = 3; then
2023 2023
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2024 2024
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2025
-   AC_SUBST(LIB_KIO, "-ltdeio")
2025
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2026 2026
    AC_SUBST(LIB_SMB, "-lsmb")
2027 2027
    AC_SUBST(LIB_KAB, "-lkab")
2028 2028
    AC_SUBST(LIB_KABC, "-ltdeabc")
2029 2029
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2030
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2031
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2030
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2031
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2032 2032
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2033
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2033
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2034 2034
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
2035 2035
 # these are for backward compatibility
2036
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2036
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2037 2037
    AC_SUBST(LIB_KFILE, "-ltdeio")
2038 2038
 elif test $kde_qtver = 2; then
2039 2039
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2040 2040
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2041
-   AC_SUBST(LIB_KIO, "-ltdeio")
2042
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2041
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2042
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2043 2043
    AC_SUBST(LIB_SMB, "-lsmb")
2044 2044
    AC_SUBST(LIB_KFILE, "-ltdefile")
2045 2045
    AC_SUBST(LIB_KAB, "-lkab")
2046 2046
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2047
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2048
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2047
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2048
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2049 2049
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2050 2050
 else
2051 2051
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

+ 1
- 1
admin

@@ -1 +1 @@
1
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
1
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

kkbswitch.kdevelop → kkbswitch.tdevelop View File


+ 1
- 1
kkbswitch/Makefile.am View File

@@ -7,7 +7,7 @@ kkbswitch_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdl
7 7
 
8 8
 INCLUDES = $(all_includes)
9 9
 
10
-kkbswitch_LDADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lDCOP
10
+kkbswitch_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lDCOP
11 11
 
12 12
 messages:
13 13
 	$(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot

+ 1
- 1
kkbswitch/Makefile.am.kdeinit View File

@@ -9,7 +9,7 @@ kkbswitch_la_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfi
9 9
 
10 10
 INCLUDES = $(all_includes)
11 11
 
12
-kkbswitch_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI)
12
+kkbswitch_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI)
13 13
 
14 14
 messages:
15 15
 	$(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot

Loading…
Cancel
Save