Browse Source

Additional renaming of kde to tde

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
37406b5d97
6 changed files with 59 additions and 59 deletions
  1. 1
    1
      Doxyfile
  2. 52
    52
      acinclude.m4
  3. 2
    2
      bookreader.kdevelop
  4. 1
    1
      bookreader.spec
  5. 2
    2
      doc/en/index.docbook
  6. 1
    1
      src/bookreader.cpp

+ 1
- 1
Doxyfile View File

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

+ 52
- 52
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!
@@ -367,7 +367,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
367 367
 else
368 368
   AC_MSG_ERROR([your system fails at linking a small KDE application!
369 369
 Check, if your compiler is installed correctly and if you have used the
370
-same compiler to compile Qt and kdelibs as you did use now.
370
+same compiler to compile Qt and tdelibs as you did use now.
371 371
 For more details about this problem, look at the end of config.log.])
372 372
 fi
373 373
 
@@ -609,9 +609,9 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
609 609
         if test -x "$KDECONFIG"; then # it can be "compiled"
610 610
           kde_libs_prefix=`$KDECONFIG --prefix`
611 611
           if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
612
-               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
612
+               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
613 613
                           This means it has been moved since you installed it.
614
-                          This won't work. Please recompile kdelibs for the new prefix.
614
+                          This won't work. Please recompile tdelibs for the new prefix.
615 615
                           ])
616 616
            fi
617 617
            kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -910,7 +910,7 @@ mips-sgi-irix6*)
910 910
     ac_x_includes="."
911 911
   fi
912 912
   if test -z "$ac_x_libraries"; then
913
-    ac_x_libraries="/usr/lib${kdelibsuff}"
913
+    ac_x_libraries="/usr/lib${tdelibsuff}"
914 914
   fi
915 915
 esac
916 916
 #from now on we use our own again
@@ -1394,7 +1394,7 @@ qt_includes=""
1394 1394
 AC_ARG_WITH(qt-dir,
1395 1395
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1396 1396
     [  ac_qt_includes="$withval"/include
1397
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1397
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1398 1398
        ac_qt_bindir="$withval"/bin
1399 1399
     ])
1400 1400
 
@@ -1435,7 +1435,7 @@ ac_qt_includes="$qt_incdir"
1435 1435
 
1436 1436
 qt_libdirs=""
1437 1437
 for dir in $kde_qt_dirs; do
1438
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1438
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1439 1439
 done
1440 1440
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1441 1441
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1619,7 +1619,7 @@ rm -f actest.ui actest.cpp
1619 1619
 
1620 1620
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1621 1621
 if test "$kde_cv_uic_plugins" != yes; then
1622
-	AC_MSG_ERROR([you need to install kdelibs first.])
1622
+	AC_MSG_ERROR([you need to install tdelibs first.])
1623 1623
 fi
1624 1624
 fi
1625 1625
 ])
@@ -1750,8 +1750,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1750 1750
 So, check this please and use another prefix!])
1751 1751
 fi
1752 1752
 
1753
-kde_libdirs="/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}"
1754
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1753
+kde_libdirs="/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}"
1754
+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
1755 1755
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1756 1756
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1757 1757
 ac_kde_libraries="$kde_libdir"
@@ -1769,7 +1769,7 @@ fi
1769 1769
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
1770 1770
 AC_MSG_ERROR([
1771 1771
 I can't find the designer plugins. These are required and should have been installed
1772
-by kdelibs])
1772
+by tdelibs])
1773 1773
 fi
1774 1774
 
1775 1775
 if test -n "$kde_widgetdir"; then
@@ -3066,26 +3066,26 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
3066 3066
 
3067 3067
 AC_DEFUN([KDE_CHECK_LIB64],
3068 3068
 [
3069
-    kdelibsuff=no
3069
+    tdelibsuff=no
3070 3070
     AC_ARG_ENABLE(libsuffix,
3071 3071
         AC_HELP_STRING([--enable-libsuffix],
3072 3072
             [/lib directory suffix (64,32,none[=default])]),
3073
-            kdelibsuff=$enableval)
3073
+            tdelibsuff=$enableval)
3074 3074
     # TODO: add an auto case that compiles a little C app to check
3075 3075
     # where the glibc is
3076
-    if test "$kdelibsuff" = "no"; then
3077
-       kdelibsuff=
3076
+    if test "$tdelibsuff" = "no"; then
3077
+       tdelibsuff=
3078 3078
     fi
3079
-    if test -z "$kdelibsuff"; then
3079
+    if test -z "$tdelibsuff"; then
3080 3080
         AC_MSG_RESULT([not using lib directory suffix])
3081 3081
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3082 3082
     else
3083 3083
         if test "$libdir" = '${exec_prefix}/lib'; then
3084
-            libdir="$libdir${kdelibsuff}"
3084
+            libdir="$libdir${tdelibsuff}"
3085 3085
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3086 3086
         fi
3087
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
3088
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3087
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories)
3088
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3089 3089
     fi
3090 3090
 ])
3091 3091
 
@@ -4076,7 +4076,7 @@ fi
4076 4076
 
4077 4077
 PYTHONINC=-I$python_incdir
4078 4078
 
4079
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4079
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4080 4080
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4081 4081
 if test ! -r $python_libdir/libpython$version.so; then
4082 4082
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -5116,7 +5116,7 @@ ssl_includes=""
5116 5116
 AC_ARG_WITH(ssl-dir,
5117 5117
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5118 5118
     [  ac_ssl_includes="$withval"/include
5119
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5119
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5120 5120
     ])
5121 5121
 
5122 5122
 want_ssl=yes
@@ -5136,7 +5136,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5136 5136
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5137 5137
   ac_ssl_includes="$ssl_incdir"
5138 5138
 
5139
-  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"
5139
+  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"
5140 5140
   if test ! "$ac_ssl_libraries" = "NO"; then
5141 5141
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5142 5142
   fi

+ 2
- 2
bookreader.kdevelop View File

@@ -1,5 +1,5 @@
1 1
 <?xml version = '1.0'?>
2
-<kdevelop>
2
+<tdevelop>
3 3
   <general>
4 4
     <author>Alexander Nemish</author>
5 5
     <email>atlanter@gmail.com</email>
@@ -286,4 +286,4 @@
286 286
     <appskde>false</appskde>
287 287
     <url/>
288 288
   </dist>
289
-</kdevelop>
289
+</tdevelop>

+ 1
- 1
bookreader.spec View File

@@ -1,5 +1,5 @@
1 1
 # This spec file was generated by KDevelop 
2
-# Please report any problem to KDevelop Team <kdevelop-devel@kdevelop.org> 
2
+# Please report any problem to KDevelop Team <tdevelop-devel@tdevelop.org> 
3 3
 # Thanks to Matthias Saou for his explanations on http://freshrpms.net/docs/fight.html
4 4
 
5 5
 Name: bookreader

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

@@ -2,7 +2,7 @@
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY bookreader "<application>BookReader 0.1</application>">
4 4
   <!ENTITY kappname "&bookreader;"><!-- Do *not* replace kappname-->
5
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
5
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
6 6
   <!ENTITY % addindex "IGNORE">
7 7
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
8 8
   
@@ -489,7 +489,7 @@ application -->
489 489
 <!--
490 490
 List any special requirements for your application here. This should include:
491 491
 .Libraries or other software that is not included in tdesupport,
492
-kdelibs, or kdebase.
492
+tdelibs, or tdebase.
493 493
 .Hardware requirements like amount of RAM, disk space, graphics card
494 494
 capabilities, screen resolution, special expansion cards, etc.
495 495
 .Operating systems the app will run on. If your app is designed only for a

+ 1
- 1
src/bookreader.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <kconfig.h>
24 24
 #include <kconfigdialog.h>
25 25
 #include <kdebug.h>
26
-#include <kdeversion.h>
26
+#include <tdeversion.h>
27 27
 #include <kencodingfiledialog.h>
28 28
 #include <kfiledialog.h>
29 29
 #include <kglobal.h>

Loading…
Cancel
Save