Browse Source

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

Timothy Pearson 6 years ago
parent
commit
d04d2847e1

+ 4
- 4
acinclude.m4 View File

@@ -590,7 +590,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
590 590
         fi
591 591
 
592 592
         if test -n "$trinity2ornewer"; then
593
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
593
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
594 594
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
595 595
         fi
596 596
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -1741,7 +1741,7 @@ if test "$kde_qtver" = 1; then
1741 1741
   kde_check_lib="libtdecore.la"
1742 1742
 else
1743 1743
   kde_check_header="ksharedptr.h"
1744
-  kde_check_lib="libkio.la"
1744
+  kde_check_lib="libtdeio.la"
1745 1745
 fi
1746 1746
 
1747 1747
 if test -z "$1"; then
@@ -2037,7 +2037,7 @@ elif test $kde_qtver = 2; then
2037 2037
    AC_SUBST(LIB_KIO, "-lkio")
2038 2038
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2039 2039
    AC_SUBST(LIB_SMB, "-lsmb")
2040
-   AC_SUBST(LIB_KFILE, "-lkfile")
2040
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2041 2041
    AC_SUBST(LIB_KAB, "-lkab")
2042 2042
    AC_SUBST(LIB_KHTML, "-ltdehtml")
2043 2043
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2047,7 +2047,7 @@ else
2047 2047
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2048 2048
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2049 2049
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2050
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
2050
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2051 2051
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2052 2052
 fi
2053 2053
 ])

+ 3
- 3
kdirstat.spec View File

@@ -64,7 +64,7 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
64 64
 %dir /opt/trinity/share/icons/locolor/16x16/apps
65 65
 %dir /opt/trinity/share/icons/locolor/32x32/apps
66 66
 /opt/trinity/share/icons/??color/??x??/*/kdirstat*
67
-%dir /opt/trinity/share/apps/kconf_update
68
-/opt/trinity/share/apps/kconf_update/kdirstat.upd
69
-/opt/trinity/share/apps/kconf_update/fix_move_to_trash_bin.pl
67
+%dir /opt/trinity/share/apps/tdeconf_update
68
+/opt/trinity/share/apps/tdeconf_update/kdirstat.upd
69
+/opt/trinity/share/apps/tdeconf_update/fix_move_to_trash_bin.pl
70 70
 

+ 1
- 1
kdirstat/Makefile.am View File

@@ -53,7 +53,7 @@ EXTRA_DIST =					\
53 53
 	hi16-app-kdirstat.png
54 54
 
55 55
 
56
-updatedir	= $(kde_datadir)/kconf_update
56
+updatedir	= $(kde_datadir)/tdeconf_update
57 57
 update_DATA	= kdirstat.upd
58 58
 update_SCRIPTS	= fix_move_to_trash_bin.pl
59 59
 

+ 1
- 1
kdirstat/kactivitytracker.cpp View File

@@ -11,7 +11,7 @@
11 11
 
12 12
 #include <kapp.h>
13 13
 #include <kdebug.h>
14
-#include <kconfig.h>
14
+#include <tdeconfig.h>
15 15
 #include "kactivitytracker.h"
16 16
 
17 17
 

+ 2
- 2
kdirstat/kdirstatapp.cpp View File

@@ -17,8 +17,8 @@
17 17
 #include <kaccel.h>
18 18
 #include <kaction.h>
19 19
 #include <kapp.h>
20
-#include <kconfig.h>
21
-#include <kfiledialog.h>
20
+#include <tdeconfig.h>
21
+#include <tdefiledialog.h>
22 22
 #include <kiconloader.h>
23 23
 #include <klocale.h>
24 24
 #include <kmenubar.h>

+ 4
- 4
kdirstat/kdirtree.cpp View File

@@ -14,13 +14,13 @@
14 14
 #include <tqtimer.h>
15 15
 #include <kapp.h>
16 16
 #include <klocale.h>
17
-#include <kconfig.h>
17
+#include <tdeconfig.h>
18 18
 #include "kdirtree.h"
19 19
 #include "kdirtreeiterators.h"
20 20
 #include "kdirtreeview.h"
21 21
 #include "kdirsaver.h"
22
-#include "kio/job.h"
23
-#include "kio/netaccess.h"
22
+#include "tdeio/job.h"
23
+#include "tdeio/netaccess.h"
24 24
 
25 25
 #define HAVE_STUPID_COMPILER 0
26 26
 
@@ -1556,7 +1556,7 @@ KDirStat::fixedUrl( const TQString & dirtyUrl )
1556 1556
     }
1557 1557
 
1558 1558
 
1559
-    // Strip off the rightmost slash - some kioslaves (e.g. 'tar') can't handle that.
1559
+    // Strip off the rightmost slash - some tdeioslaves (e.g. 'tar') can't handle that.
1560 1560
 
1561 1561
     TQString path = url.path();
1562 1562
 

+ 2
- 2
kdirstat/kdirtree.h View File

@@ -21,8 +21,8 @@
21 21
 #include <dirent.h>
22 22
 #include <tqptrqueue.h>
23 23
 #include <kdebug.h>
24
-#include <kfileitem.h>
25
-#include <kio/jobclasses.h>
24
+#include <tdefileitem.h>
25
+#include <tdeio/jobclasses.h>
26 26
 
27 27
 #ifndef NOT_USED
28 28
 #    define NOT_USED(PARAM)	( (void) (PARAM) )

+ 1
- 1
kdirstat/ktreemapview.cpp View File

@@ -14,7 +14,7 @@
14 14
 #include <tqregexp.h>
15 15
 
16 16
 #include <kapp.h>
17
-#include <kconfig.h>
17
+#include <tdeconfig.h>
18 18
 #include <kglobal.h>
19 19
 #include <klocale.h>
20 20
 

Loading…
Cancel
Save