Browse Source

Additional renaming of kde to tde

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
90326ffba4
5 changed files with 67 additions and 67 deletions
  1. 1
    1
      Doxyfile
  2. 61
    61
      acinclude.m4
  3. 2
    2
      d3lphin.kdevelop
  4. 2
    2
      doc/en/index.docbook
  5. 1
    1
      src/dolphin.cpp

+ 1
- 1
Doxyfile View File

@@ -3,7 +3,7 @@
3 3
 #---------------------------------------------------------------------------
4 4
 # Project related configuration options
5 5
 #---------------------------------------------------------------------------
6
-PROJECT_NAME           = d3lphin.kdevelop
6
+PROJECT_NAME           = d3lphin.tdevelop
7 7
 PROJECT_NUMBER         = 0.9
8 8
 OUTPUT_DIRECTORY       = 
9 9
 CREATE_SUBDIRS         = NO

+ 61
- 61
acinclude.m4 View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
23 23
 dnl Please do not modify this file unless you expect your modifications to be
24 24
 dnl carried into every other module in the repository. 
25 25
 dnl
26
-dnl Single-module modifications are best placed in configure.in for kdelibs
27
-dnl and kdebase or configure.in.in if present.
26
+dnl Single-module modifications are best placed in configure.in for tdelibs
27
+dnl and tdebase or configure.in.in if present.
28 28
 
29 29
 # KDE_PATH_X_DIRECT
30 30
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
103 103
 [LIBS="$ac_save_LIBS"
104 104
 # First see if replacing the include by lib works.
105 105
 # Check X11 before X11Rn because it is often a symlink to the current release.
106
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
107
-    /usr/X11/lib${kdelibsuff}           \
108
-    /usr/X11R6/lib${kdelibsuff}         \
109
-    /usr/X11R5/lib${kdelibsuff}         \
110
-    /usr/X11R4/lib${kdelibsuff}         \
106
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
107
+    /usr/X11/lib${tdelibsuff}           \
108
+    /usr/X11R6/lib${tdelibsuff}         \
109
+    /usr/X11R5/lib${tdelibsuff}         \
110
+    /usr/X11R4/lib${tdelibsuff}         \
111 111
                                         \
112
-    /usr/lib${kdelibsuff}/X11           \
113
-    /usr/lib${kdelibsuff}/X11R6         \
114
-    /usr/lib${kdelibsuff}/X11R5         \
115
-    /usr/lib${kdelibsuff}/X11R4         \
112
+    /usr/lib${tdelibsuff}/X11           \
113
+    /usr/lib${tdelibsuff}/X11R6         \
114
+    /usr/lib${tdelibsuff}/X11R5         \
115
+    /usr/lib${tdelibsuff}/X11R4         \
116 116
                                         \
117
-    /usr/local/X11/lib${kdelibsuff}     \
118
-    /usr/local/X11R6/lib${kdelibsuff}   \
119
-    /usr/local/X11R5/lib${kdelibsuff}   \
120
-    /usr/local/X11R4/lib${kdelibsuff}   \
117
+    /usr/local/X11/lib${tdelibsuff}     \
118
+    /usr/local/X11R6/lib${tdelibsuff}   \
119
+    /usr/local/X11R5/lib${tdelibsuff}   \
120
+    /usr/local/X11R4/lib${tdelibsuff}   \
121 121
                                         \
122
-    /usr/local/lib${kdelibsuff}/X11     \
123
-    /usr/local/lib${kdelibsuff}/X11R6   \
124
-    /usr/local/lib${kdelibsuff}/X11R5   \
125
-    /usr/local/lib${kdelibsuff}/X11R4   \
122
+    /usr/local/lib${tdelibsuff}/X11     \
123
+    /usr/local/lib${tdelibsuff}/X11R6   \
124
+    /usr/local/lib${tdelibsuff}/X11R5   \
125
+    /usr/local/lib${tdelibsuff}/X11R4   \
126 126
                                         \
127
-    /usr/X386/lib${kdelibsuff}          \
128
-    /usr/x386/lib${kdelibsuff}          \
129
-    /usr/XFree86/lib${kdelibsuff}/X11   \
127
+    /usr/X386/lib${tdelibsuff}          \
128
+    /usr/x386/lib${tdelibsuff}          \
129
+    /usr/XFree86/lib${tdelibsuff}/X11   \
130 130
                                         \
131
-    /usr/lib${kdelibsuff}               \
132
-    /usr/local/lib${kdelibsuff}         \
133
-    /usr/unsupported/lib${kdelibsuff}   \
134
-    /usr/athena/lib${kdelibsuff}        \
135
-    /usr/local/x11r5/lib${kdelibsuff}   \
136
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
137
-    /lib/usr/lib${kdelibsuff}/X11       \
131
+    /usr/lib${tdelibsuff}               \
132
+    /usr/local/lib${tdelibsuff}         \
133
+    /usr/unsupported/lib${tdelibsuff}   \
134
+    /usr/athena/lib${tdelibsuff}        \
135
+    /usr/local/x11r5/lib${tdelibsuff}   \
136
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
137
+    /lib/usr/lib${tdelibsuff}/X11       \
138 138
                                         \
139
-    /usr/openwin/lib${kdelibsuff}       \
140
-    /usr/openwin/share/lib${kdelibsuff} \
139
+    /usr/openwin/lib${tdelibsuff}       \
140
+    /usr/openwin/share/lib${tdelibsuff} \
141 141
     ; \
142 142
 do
143 143
 dnl Don't even attempt the hair of trying to link an X program!
@@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
378 378
 else
379 379
   AC_MSG_ERROR([your system fails at linking a small KDE application!
380 380
 Check, if your compiler is installed correctly and if you have used the
381
-same compiler to compile Qt and kdelibs as you did use now.
381
+same compiler to compile Qt and tdelibs as you did use now.
382 382
 For more details about this problem, look at the end of config.log.])
383 383
 fi
384 384
 
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
937 937
     ac_x_includes="."
938 938
   fi
939 939
   if test -z "$ac_x_libraries"; then
940
-    ac_x_libraries="/usr/lib${kdelibsuff}"
940
+    ac_x_libraries="/usr/lib${tdelibsuff}"
941 941
   fi
942 942
 esac
943 943
 #from now on we use our own again
@@ -1226,7 +1226,7 @@ if test $kde_qtver = 4; then
1226 1226
   kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
1227 1227
 fi
1228 1228
 if test $kde_qtver = 3; then
1229
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
1229
+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
1230 1230
   if test -z "$PKG_CONFIG"; then
1231 1231
       AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
1232 1232
   fi
@@ -1426,7 +1426,7 @@ qt_includes=""
1426 1426
 AC_ARG_WITH(qt-dir,
1427 1427
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1428 1428
     [  ac_qt_includes="$withval"/include
1429
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1429
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1430 1430
        ac_qt_bindir="$withval"/bin
1431 1431
     ])
1432 1432
 
@@ -1475,7 +1475,7 @@ ac_qt_includes="$qt_incdir"
1475 1475
 
1476 1476
 qt_libdirs=""
1477 1477
 for dir in $kde_qt_dirs; do
1478
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
1478
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir"
1479 1479
 done
1480 1480
 if test -z "$PKG_CONFIG"; then
1481 1481
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -1668,11 +1668,11 @@ rm -f actest.ui actest.cpp
1668 1668
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1669 1669
 if test "$kde_cv_uic_plugins" != yes; then
1670 1670
 	AC_MSG_ERROR([
1671
-you need to install kdelibs first.
1671
+you need to install tdelibs first.
1672 1672
 
1673
-If you did install kdelibs, then the Qt version that is picked up by
1674
-this configure is not the same version you used to compile kdelibs. 
1675
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
1673
+If you did install tdelibs, then the Qt version that is picked up by
1674
+this configure is not the same version you used to compile tdelibs. 
1675
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
1676 1676
 _same Qt version_, compiled with the _same compiler_ and the same Qt
1677 1677
 configuration settings.
1678 1678
 ])
@@ -1829,8 +1829,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1829 1829
 So, check this please and use another prefix!])
1830 1830
 fi
1831 1831
 
1832
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1833
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1832
+kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
1833
+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
1834 1834
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1835 1835
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1836 1836
 ac_kde_libraries="$kde_libdir"
@@ -1848,7 +1848,7 @@ fi
1848 1848
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
1849 1849
 AC_MSG_ERROR([
1850 1850
 I can't find the designer plugins. These are required and should have been installed
1851
-by kdelibs])
1851
+by tdelibs])
1852 1852
 fi
1853 1853
 
1854 1854
 if test -n "$kde_widgetdir"; then
@@ -1863,7 +1863,7 @@ else
1863 1863
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
1864 1864
 fi
1865 1865
 
1866
-else dnl test -z $1, e.g. from kdelibs
1866
+else dnl test -z $1, e.g. from tdelibs
1867 1867
 
1868 1868
   ac_cv_have_kde="have_kde=no"
1869 1869
 
@@ -3527,9 +3527,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
3527 3527
     AC_ARG_ENABLE(libsuffix,
3528 3528
         AC_HELP_STRING([--enable-libsuffix],
3529 3529
             [/lib directory suffix (64,32,none,auto[=default])]),
3530
-            kdelibsuff=$enableval, kdelibsuff="auto")
3530
+            tdelibsuff=$enableval, tdelibsuff="auto")
3531 3531
     
3532
-    if test "$kdelibsuff" = "auto"; then
3532
+    if test "$tdelibsuff" = "auto"; then
3533 3533
     
3534 3534
 cat > conftest.c << EOF
3535 3535
 #include <stdio.h>
@@ -3537,26 +3537,26 @@ int main() {
3537 3537
  return 0;
3538 3538
 }
3539 3539
 EOF
3540
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3540
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3541 3541
     s,.*/lib\([[^\/]]*\)/.*,\1, 
3542 3542
     p 
3543 3543
 }'`
3544 3544
 	rm -rf conftest.*
3545 3545
     fi	
3546 3546
 	
3547
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
3548
-       kdelibsuff=
3547
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
3548
+       tdelibsuff=
3549 3549
     fi
3550
-    if test -z "$kdelibsuff"; then
3550
+    if test -z "$tdelibsuff"; then
3551 3551
         AC_MSG_RESULT([not using lib directory suffix])
3552 3552
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3553 3553
     else
3554 3554
         if test "$libdir" = '${exec_prefix}/lib'; then
3555
-            libdir="$libdir${kdelibsuff}"
3555
+            libdir="$libdir${tdelibsuff}"
3556 3556
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3557 3557
         fi
3558
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3559
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3558
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
3559
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3560 3560
     fi
3561 3561
 ])
3562 3562
 
@@ -4581,7 +4581,7 @@ fi
4581 4581
 
4582 4582
 PYTHONINC=-I$python_incdir
4583 4583
 
4584
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4584
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4585 4585
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4586 4586
 if test ! -r $python_libdir/libpython$version.so; then
4587 4587
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4973,7 +4973,7 @@ AC_DEFUN([KDE_CONF_FILES],
4973 4973
   AC_SUBST(CONF_FILES)
4974 4974
 ])dnl
4975 4975
 
4976
-dnl This sets the prefix, for arts and kdelibs
4976
+dnl This sets the prefix, for arts and tdelibs
4977 4977
 dnl Do NOT use in any other module.
4978 4978
 dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
4979 4979
 AC_DEFUN([KDE_SET_PREFIX_CORE],
@@ -5020,9 +5020,9 @@ AC_DEFUN([KDE_SET_PREFIX],
5020 5020
 
5021 5021
   kde_libs_prefix=`$KDECONFIG --prefix`
5022 5022
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
5023
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
5023
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
5024 5024
                     This means it has been moved since you installed it.
5025
-                    This won't work. Please recompile kdelibs for the new prefix.
5025
+                    This won't work. Please recompile tdelibs for the new prefix.
5026 5026
                     ])
5027 5027
   fi
5028 5028
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5688,7 +5688,7 @@ ssl_includes=""
5688 5688
 AC_ARG_WITH(ssl-dir,
5689 5689
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5690 5690
     [  ac_ssl_includes="$withval"/include
5691
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5691
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5692 5692
     ])
5693 5693
 
5694 5694
 want_ssl=yes
@@ -5708,7 +5708,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5708 5708
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5709 5709
   ac_ssl_includes="$ssl_incdir"
5710 5710
 
5711
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
5711
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
5712 5712
   if test ! "$ac_ssl_libraries" = "NO"; then
5713 5713
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5714 5714
   fi
@@ -5945,9 +5945,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
5945 5945
 dnl also defines KSTUFF_PKG_ERRORS on error
5946 5946
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5947 5947
 
5948
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5948
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5949 5949
    if test "$prefix" != "$kde_libs_prefix"; then
5950
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5950
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5951 5951
    fi
5952 5952
    export PKG_CONFIG_PATH
5953 5953
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

+ 2
- 2
d3lphin.kdevelop View File

@@ -1,5 +1,5 @@
1 1
 <?xml version = '1.0'?>
2
-<kdevelop>
2
+<tdevelop>
3 3
   <general>
4 4
     <author>Marcel Juhnke</author>
5 5
     <email>marrat@marrat.homelinux.org</email>
@@ -287,4 +287,4 @@
287 287
     <customArguments/>
288 288
     <customTagfilePath/>
289 289
   </ctagspart>
290
-</kdevelop>
290
+</tdevelop>

+ 2
- 2
doc/en/index.docbook View File

@@ -1335,12 +1335,12 @@ url="https://svn.sourceforge.net/svnroot/dolphinfileman/">Subversion Repository.
1335 1335
 <title>Requirements</title>
1336 1336
 
1337 1337
 <para>
1338
-In order to successfully use &dolphin; you need to at least have kdebase and kdelibs from &kde; 3.5 installed.  &dolphin; may work on older
1338
+In order to successfully use &dolphin; you need to at least have tdebase and tdelibs from &kde; 3.5 installed.  &dolphin; may work on older
1339 1339
 versions of &kde;, however not all functions offered by &dolphin; may work.
1340 1340
 </para>
1341 1341
 
1342 1342
 <para>
1343
-In order to compile &dolphin; you will also require libqt2-mt-dev, libx11-dev, kdebase-dev, zlibg-dev and gcc.
1343
+In order to compile &dolphin; you will also require libqt2-mt-dev, libx11-dev, tdebase-dev, zlibg-dev and gcc.
1344 1344
 </para>
1345 1345
 
1346 1346
 <para>

+ 1
- 1
src/dolphin.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <kpropertiesdialog.h>
29 29
 #include <klocale.h>
30 30
 #include <kiconloader.h>
31
-#include <kdeversion.h>
31
+#include <tdeversion.h>
32 32
 #include <kstatusbar.h>
33 33
 #include <kaccel.h>
34 34
 #include <kio/netaccess.h>

Loading…
Cancel
Save