Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
0923f15537

+ 1
- 1
TODO View File

@@ -18,6 +18,6 @@ Modules
18 18
 Search
19 19
 -Make search smaller and on the right
20 20
 -Grep docs?
21
--Tie into kconfigXT somehow?
21
+-Tie into tdeconfigXT somehow?
22 22
 -Look at Spotlight
23 23
 -Task oriented?

+ 4
- 4
acinclude.m4 View File

@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
602 602
         fi
603 603
 
604 604
         if test -n "$trinity2ornewer"; then
605
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
605
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
606 606
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
607 607
         fi
608 608
         if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
1788 1788
   kde_check_lib="libtdecore.la"
1789 1789
 else
1790 1790
   kde_check_header="ksharedptr.h"
1791
-  kde_check_lib="libkio.la"
1791
+  kde_check_lib="libtdeio.la"
1792 1792
 fi
1793 1793
 
1794 1794
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
2094 2094
    AC_SUBST(LIB_KIO, "-lkio")
2095 2095
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097
-   AC_SUBST(LIB_KFILE, "-lkfile")
2097
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099 2099
    AC_SUBST(LIB_KHTML, "-ltdehtml")
2100 2100
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
2104 2104
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2105 2105
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2106 2106
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2107
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
2107
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2108 2108
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2109 2109
 fi
2110 2110
 ])

+ 4
- 4
aclocal.m4 View File

@@ -614,7 +614,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
614 614
         fi
615 615
 
616 616
         if test -n "$trinity2ornewer"; then
617
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
617
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
618 618
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
619 619
         fi
620 620
         if test -n "$trinity3ornewer"; then
@@ -1800,7 +1800,7 @@ if test "$kde_qtver" = 1; then
1800 1800
   kde_check_lib="libtdecore.la"
1801 1801
 else
1802 1802
   kde_check_header="ksharedptr.h"
1803
-  kde_check_lib="libkio.la"
1803
+  kde_check_lib="libtdeio.la"
1804 1804
 fi
1805 1805
 
1806 1806
 if test -z "$1"; then
@@ -2106,7 +2106,7 @@ elif test $kde_qtver = 2; then
2106 2106
    AC_SUBST(LIB_KIO, "-lkio")
2107 2107
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2108 2108
    AC_SUBST(LIB_SMB, "-lsmb")
2109
-   AC_SUBST(LIB_KFILE, "-lkfile")
2109
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2110 2110
    AC_SUBST(LIB_KAB, "-lkab")
2111 2111
    AC_SUBST(LIB_KHTML, "-ltdehtml")
2112 2112
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2116,7 +2116,7 @@ else
2116 2116
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2117 2117
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2118 2118
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2119
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
2119
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2120 2120
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2121 2121
 fi
2122 2122
 ])

+ 1
- 1
systemsettings/HACKING View File

@@ -28,4 +28,4 @@ Also don't forget to install the ui file.
28 28
 And the desktop file.
29 29
 -share/applications/tde/systemsettings.desktop
30 30
 
31
-When you change (or install) any of the first three files make sure to run kbuildsycoca to re-generate the cache files or log out and back in.
31
+When you change (or install) any of the first three files make sure to run tdebuildsycoca to re-generate the cache files or log out and back in.

+ 2
- 2
systemsettings/menu/Makefile.am View File

@@ -1,5 +1,5 @@
1 1
 #temporary till KDE4 and it can be renamed
2
-xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetworkconfmodule_ss.desktop laptop.desktop medianotifications.desktop
2
+xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetwortdeconfmodule_ss.desktop laptop.desktop medianotifications.desktop
3 3
 
4 4
 xdg_menu_DATA = system-settings.menu
5 5
 
@@ -33,4 +33,4 @@ tde-settings-windowbehavior.directory \
33 33
 system-settings.directory
34 34
 
35 35
 #install-data-local:
36
-#	kbuildsycoca
36
+#	tdebuildsycoca

+ 1
- 1
systemsettings/menu/audioencoding.desktop View File

@@ -1,6 +1,6 @@
1 1
 [Desktop Entry]
2 2
 Encoding=UTF-8
3
-Exec=kcmshell audiocd
3
+Exec=tdecmshell audiocd
4 4
 Icon=cdaudio_unmount
5 5
 Type=Application
6 6
 

+ 1
- 1
systemsettings/menu/defaultapplication.desktop View File

@@ -1,6 +1,6 @@
1 1
 [Desktop Entry]
2 2
 Encoding=UTF-8
3
-Exec=kcmshell defaultapplication
3
+Exec=tdecmshell defaultapplication
4 4
 Icon=blockdevice
5 5
 Type=Application
6 6
 

systemsettings/menu/kcm_knetworkconfmodule_ss.desktop → systemsettings/menu/kcm_knetwortdeconfmodule_ss.desktop View File

@@ -3,12 +3,12 @@ X-TDE-RootOnly=true
3 3
 ## Keep this out of kcontrol
4 4
 #Categories=Qt;TDE;Settings;X-TDE-settings-network;Configuration-TDE-Network-mdk;
5 5
 X-TDE-ModuleType=Library
6
-X-TDE-Library=knetworkconfmodule
7
-X-TDE-FactoryName=knetworkconfmodule
6
+X-TDE-Library=knetwortdeconfmodule
7
+X-TDE-FactoryName=knetwortdeconfmodule
8 8
 Type=Application
9
-Exec=kcmshell kcm_knetworkconfmodule
10
-Icon=knetworkconf
11
-DocPath=knetworkconf/index.html
9
+Exec=tdecmshell kcm_knetwortdeconfmodule
10
+Icon=knetwortdeconf
11
+DocPath=knetwortdeconf/index.html
12 12
 
13 13
 Comment=Configure Network Settings
14 14
 Comment[ar]=إعداد تعيينات الشبكة

+ 1
- 1
systemsettings/menu/kcmfontinst.desktop View File

@@ -1,5 +1,5 @@
1 1
 [Desktop Entry]
2
-Exec=kcmshell kcmfontinst
2
+Exec=tdecmshell kcmfontinst
3 3
 Icon=fonts
4 4
 Type=Application
5 5
 DocPath=kcontrol/kcmfontinst/index.html

+ 1
- 1
systemsettings/menu/laptop.desktop View File

@@ -2,7 +2,7 @@
2 2
 X-TDE-Library=laptop
3 3
 X-TDE-FactoryName=laptop
4 4
 X-TDE-Init=laptop
5
-Exec=kcmshell laptop
5
+Exec=tdecmshell laptop
6 6
 Icon=laptop_battery
7 7
 Type=Application
8 8
 DocPath=kcontrol/laptop/index.html

+ 1
- 1
systemsettings/menu/medianotifications.desktop View File

@@ -3,7 +3,7 @@ Encoding=UTF-8
3 3
 Type=Application
4 4
 #DocPath=
5 5
 Icon=system
6
-Exec=kcmshell media
6
+Exec=tdecmshell media
7 7
 
8 8
 
9 9
 X-TDE-Library=media

+ 2
- 2
systemsettings/menu/system-settings.menu View File

@@ -290,7 +290,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
290 290
 				<Directory>tde-settings-networksettings.directory</Directory>
291 291
 
292 292
 				<Layout>
293
-					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
293
+					<Filename>tde-kcm_knetwortdeconfmodule_ss.desktop</Filename>
294 294
 					<Filename>tde-proxy.desktop</Filename>
295 295
 					<Filename>tde-netpref.desktop</Filename>
296 296
 					<Filename>tde-kcm_tdednssd.desktop</Filename>
@@ -298,7 +298,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
298 298
 				</Layout>
299 299
 
300 300
 				<Include>
301
-					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
301
+					<Filename>tde-kcm_knetwortdeconfmodule_ss.desktop</Filename>
302 302
 					<Filename>tde-proxy.desktop</Filename>
303 303
 					<Filename>tde-netpref.desktop</Filename>
304 304
 					<Filename>tde-kcm_tdednssd.desktop</Filename>

+ 1
- 1
systemsettings/tdecmodulemenu.h View File

@@ -66,7 +66,7 @@ class TDECModuleMenuPrivate;
66 66
  * 
67 67
  * example.menu should be installed in xdg/menus/ so that ksyscoco will find
68 68
  * it. See the above url for example menus.  After changing the menu you need
69
- * to run "kbuildsycoca" to regenerate the cache as ksyscoco will cache the
69
+ * to run "tdebuildsycoca" to regenerate the cache as ksyscoco will cache the
70 70
  * menu and is a file that doesn't change on users.
71 71
  */
72 72
 

Loading…
Cancel
Save