Browse Source

Initial TDE conversion

Slávek Banko 5 years ago
parent
commit
679eaaa427

+ 1
- 1
ChangeLog View File

@@ -55,7 +55,7 @@
55 55
   * Bugfix: previously the config dialog failed to set a icon for a layout, for
56 56
     which KKBSwitch could not initially guess the icon
57 57
   * Added Greek translation (from Stergios Dramis <sdramis@egnatia.ee.auth.gr>)
58
-  * Set KDEDIR in RPM spec file (fixes reported problems with incorrect
58
+  * Set TDEDIR in RPM spec file (fixes reported problems with incorrect
59 59
      installation from SRPM) 
60 60
   * configure option to not install ru_ua layout file (--disable-ru-ua-layout)
61 61
 

+ 1
- 1
Doxyfile View File

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

+ 2
- 2
Makefile.am View File

@@ -16,7 +16,7 @@ package-messages:
16 16
 	$(MAKE) -C po merge
17 17
 
18 18
 EXTRA_DIST = admin COPYING configure.in.in Makefile.cvs kkbswitch.1\
19
-   configure.files Doxyfile kkbswitch.kdevelop kkbswitch.lsm \
19
+   configure.files Doxyfile kkbswitch.tdevelop kkbswitch.lsm \
20 20
    kkbswitch.spec kkbswitch.xpm subdirs kkbswitch.sgml
21 21
 
22 22
 man_MANS = kkbswitch.1
@@ -26,7 +26,7 @@ KDE_OPTIONS = noautodist
26 26
 dist-hook:
27 27
 	cd $(top_distdir) && perl admin/am_edit -padmin
28 28
 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
29
-#	rm -f $(distdir)/kkbswitch.kdevelop.pcs
29
+#	rm -f $(distdir)/kkbswitch.tdevelop.pcs
30 30
 #	rm -f $(distdir)/$(PACKAGE)-*.tar.gz
31 31
 
32 32
 

+ 112
- 112
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!
@@ -360,24 +360,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
360 360
   fi
361 361
 
362 362
 AC_MSG_CHECKING([for KDE libraries installed])
363
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
363
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
364 364
 
365 365
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
366 366
   AC_MSG_RESULT(yes)
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
 
374
-if eval `KDEDIR= ./conftest 2>&5`; then
374
+if eval `TDEDIR= ./conftest 2>&5`; then
375 375
   kde_result=done
376 376
 else
377 377
   kde_result=problems
378 378
 fi
379 379
 
380
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
380
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
381 381
 kde_have_all_paths=yes
382 382
 
383 383
 KDE_SET_PATHS($kde_result)
@@ -543,11 +543,11 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
543 543
     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
544 544
 
545 545
         kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
546
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
547
-        if test -n "$KDEDIRS"; then
546
+        test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
547
+        if test -n "$TDEDIRS"; then
548 548
            kde_save_IFS=$IFS
549 549
            IFS=:
550
-           for dir in $KDEDIRS; do
550
+           for dir in $TDEDIRS; do
551 551
                 kde_default_bindirs="$dir/bin $kde_default_bindirs "
552 552
            done
553 553
            IFS=$kde_save_IFS
@@ -559,7 +559,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
559 559
           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
560 560
           KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
561 561
         fi
562
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
562
+        KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs])
563 563
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
564 564
 
565 565
         kde32ornewer=1
@@ -572,14 +572,14 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
572 572
         fi
573 573
 
574 574
         if test -n "$kde32ornewer"; then
575
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
575
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
576 576
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
577 577
         fi
578 578
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
579 579
 
580 580
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
581 581
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
582
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
582
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
583 583
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
584 584
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
585 585
 		KDE_XSL_STYLESHEET=""
@@ -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`
@@ -693,7 +693,7 @@ AC_SUBST(kde_templatesdir)
693 693
 AC_SUBST(kde_servicesdir)
694 694
 AC_SUBST(kde_servicetypesdir)
695 695
 AC_SUBST(kde_moduledir)
696
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
696
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
697 697
 AC_SUBST(kde_styledir)
698 698
 AC_SUBST(kde_widgetdir)
699 699
 if test "$kde_qtver" = 1; then
@@ -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
 ])
@@ -1730,16 +1730,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
1730 1730
 
1731 1731
 if test "$kde_qtver" = 1; then
1732 1732
   kde_check_header="ksock.h"
1733
-  kde_check_lib="libkdecore.la"
1733
+  kde_check_lib="libtdecore.la"
1734 1734
 else
1735 1735
   kde_check_header="ksharedptr.h"
1736
-  kde_check_lib="libkio.la"
1736
+  kde_check_lib="libtdeio.la"
1737 1737
 fi
1738 1738
 
1739 1739
 if test -z "$1"; then
1740 1740
 
1741
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1742
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1741
+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1742
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1743 1743
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1744 1744
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1745 1745
 ac_kde_includes="$kde_incdir"
@@ -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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
1754
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $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/kde3/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
@@ -1924,20 +1924,20 @@ cat > conftest.$ac_ext <<EOF
1924 1924
 #include <kapp.h>
1925 1925
 
1926 1926
 int main() {
1927
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
1928
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
1929
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
1930
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
1931
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
1932
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
1933
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
1934
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
1935
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
1936
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
1927
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
1928
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
1929
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
1930
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
1931
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
1932
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
1933
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
1934
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
1935
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
1936
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
1937 1937
     printf("kde_wallpaperdir=\\"%s\\"\n",
1938
-	KApplication::kde_wallpaperdir().data());
1939
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
1940
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
1938
+	TDEApplication::kde_wallpaperdir().data());
1939
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
1940
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
1941 1941
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
1942 1942
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
1943 1943
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -1975,7 +1975,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
1975 1975
  kde_cxxflags_safe="$CXXFLAGS"
1976 1976
 
1977 1977
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
1978
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
1978
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
1979 1979
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
1980 1980
 
1981 1981
  AC_TRY_LINK([
@@ -2008,39 +2008,39 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2008 2008
    AC_REQUIRE([K_PATH_X])
2009 2009
 
2010 2010
 if test $kde_qtver = 3; then
2011
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2012
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2013
-   AC_SUBST(LIB_KIO, "-lkio")
2011
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2012
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2013
+   AC_SUBST(LIB_KIO, "-ltdeio")
2014 2014
    AC_SUBST(LIB_SMB, "-lsmb")
2015 2015
    AC_SUBST(LIB_KAB, "-lkab")
2016
-   AC_SUBST(LIB_KABC, "-lkabc")
2017
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2018
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2019
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2020
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2021
-   AC_SUBST(LIB_KUTILS, "-lkutils")
2022
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2016
+   AC_SUBST(LIB_KABC, "-ltdeabc")
2017
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2018
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
2019
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2020
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2021
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2022
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2023 2023
 # these are for backward compatibility
2024
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
2025
-   AC_SUBST(LIB_KFILE, "-lkio")
2024
+   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2025
+   AC_SUBST(LIB_KFILE, "-ltdeio")
2026 2026
 elif test $kde_qtver = 2; then
2027
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2028
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2029
-   AC_SUBST(LIB_KIO, "-lkio")
2030
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
2027
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2028
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2029
+   AC_SUBST(LIB_KIO, "-ltdeio")
2030
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2031 2031
    AC_SUBST(LIB_SMB, "-lsmb")
2032
-   AC_SUBST(LIB_KFILE, "-lkfile")
2032
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2033 2033
    AC_SUBST(LIB_KAB, "-lkab")
2034
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2035
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2036
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2037
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2034
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2035
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
2036
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2037
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2038 2038
 else
2039
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2040
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2041
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2042
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
2043
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
2039
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2040
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2041
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2042
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2043
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2044 2044
 fi
2045 2045
 ])
2046 2046
 
@@ -2105,7 +2105,7 @@ if test "x$kde_cv_func_$1" = xyes; then
2105 2105
 else
2106 2106
   case "$1" in
2107 2107
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
2108
-		kde_cv_proto_$1="yes - in libkdefakes"
2108
+		kde_cv_proto_$1="yes - in libtdefakes"
2109 2109
 		;;
2110 2110
 	*)
2111 2111
 		kde_cv_proto_$1=unknown
@@ -2386,7 +2386,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2386 2386
   AC_MSG_RESULT(yes)
2387 2387
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2388 2388
 else
2389
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2389
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2390 2390
 fi
2391 2391
 ])
2392 2392
 
@@ -2450,7 +2450,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
2450 2450
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
2451 2451
 
2452 2452
 dnl if headers _and_ libraries are missing, this is no error, and we
2453
-dnl continue with a warning (the user will get no jpeg support in khtml)
2453
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
2454 2454
 dnl if only one is missing, it means a configuration error, but we still
2455 2455
 dnl only warn
2456 2456
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; 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
 
@@ -3102,7 +3102,7 @@ AC_CANONICAL_SYSTEM
3102 3102
 AC_ARG_PROGRAM
3103 3103
 AM_INIT_AUTOMAKE($1, $2)
3104 3104
 AM_DISABLE_LIBRARIES
3105
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3105
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3106 3106
 AC_CHECK_COMPILERS
3107 3107
 KDE_PROG_LIBTOOL
3108 3108
 AM_KDE_WITH_NLS
@@ -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)
@@ -4465,8 +4465,8 @@ AC_DEFUN([KDE_CONF_FILES],
4465 4465
 AC_DEFUN([KDE_SET_PREFIX],
4466 4466
 [
4467 4467
   unset CDPATH
4468
-  dnl make $KDEDIR the default for the installation
4469
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4468
+  dnl make $TDEDIR the default for the installation
4469
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4470 4470
 
4471 4471
   if test "x$prefix" = "xNONE"; then
4472 4472
     prefix=$ac_default_prefix
@@ -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

+ 112
- 112
aclocal.m4 View File

@@ -35,8 +35,8 @@ dnl IMPORTANT NOTE:
35 35
 dnl Please do not modify this file unless you expect your modifications to be
36 36
 dnl carried into every other module in the repository. 
37 37
 dnl
38
-dnl Single-module modifications are best placed in configure.in for kdelibs
39
-dnl and kdebase or configure.in.in if present.
38
+dnl Single-module modifications are best placed in configure.in for tdelibs
39
+dnl and tdebase or configure.in.in if present.
40 40
 
41 41
 # KDE_PATH_X_DIRECT
42 42
 dnl Internal subroutine of AC_PATH_X.
@@ -115,41 +115,41 @@ ac_x_libraries=],
115 115
 [LIBS="$ac_save_LIBS"
116 116
 # First see if replacing the include by lib works.
117 117
 # Check X11 before X11Rn because it is often a symlink to the current release.
118
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
119
-    /usr/X11/lib${kdelibsuff}           \
120
-    /usr/X11R6/lib${kdelibsuff}         \
121
-    /usr/X11R5/lib${kdelibsuff}         \
122
-    /usr/X11R4/lib${kdelibsuff}         \
118
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
119
+    /usr/X11/lib${tdelibsuff}           \
120
+    /usr/X11R6/lib${tdelibsuff}         \
121
+    /usr/X11R5/lib${tdelibsuff}         \
122
+    /usr/X11R4/lib${tdelibsuff}         \
123 123
                                         \
124
-    /usr/lib${kdelibsuff}/X11           \
125
-    /usr/lib${kdelibsuff}/X11R6         \
126
-    /usr/lib${kdelibsuff}/X11R5         \
127
-    /usr/lib${kdelibsuff}/X11R4         \
124
+    /usr/lib${tdelibsuff}/X11           \
125
+    /usr/lib${tdelibsuff}/X11R6         \
126
+    /usr/lib${tdelibsuff}/X11R5         \
127
+    /usr/lib${tdelibsuff}/X11R4         \
128 128
                                         \
129
-    /usr/local/X11/lib${kdelibsuff}     \
130
-    /usr/local/X11R6/lib${kdelibsuff}   \
131
-    /usr/local/X11R5/lib${kdelibsuff}   \
132
-    /usr/local/X11R4/lib${kdelibsuff}   \
129
+    /usr/local/X11/lib${tdelibsuff}     \
130
+    /usr/local/X11R6/lib${tdelibsuff}   \
131
+    /usr/local/X11R5/lib${tdelibsuff}   \
132
+    /usr/local/X11R4/lib${tdelibsuff}   \
133 133
                                         \
134
-    /usr/local/lib${kdelibsuff}/X11     \
135
-    /usr/local/lib${kdelibsuff}/X11R6   \
136
-    /usr/local/lib${kdelibsuff}/X11R5   \
137
-    /usr/local/lib${kdelibsuff}/X11R4   \
134
+    /usr/local/lib${tdelibsuff}/X11     \
135
+    /usr/local/lib${tdelibsuff}/X11R6   \
136
+    /usr/local/lib${tdelibsuff}/X11R5   \
137
+    /usr/local/lib${tdelibsuff}/X11R4   \
138 138
                                         \
139
-    /usr/X386/lib${kdelibsuff}          \
140
-    /usr/x386/lib${kdelibsuff}          \
141
-    /usr/XFree86/lib${kdelibsuff}/X11   \
139
+    /usr/X386/lib${tdelibsuff}          \
140
+    /usr/x386/lib${tdelibsuff}          \
141
+    /usr/XFree86/lib${tdelibsuff}/X11   \
142 142
                                         \
143
-    /usr/lib${kdelibsuff}               \
144
-    /usr/local/lib${kdelibsuff}         \
145
-    /usr/unsupported/lib${kdelibsuff}   \
146
-    /usr/athena/lib${kdelibsuff}        \
147
-    /usr/local/x11r5/lib${kdelibsuff}   \
148
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
149
-    /lib/usr/lib${kdelibsuff}/X11       \
143
+    /usr/lib${tdelibsuff}               \
144
+    /usr/local/lib${tdelibsuff}         \
145
+    /usr/unsupported/lib${tdelibsuff}   \
146
+    /usr/athena/lib${tdelibsuff}        \
147
+    /usr/local/x11r5/lib${tdelibsuff}   \
148
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
149
+    /lib/usr/lib${tdelibsuff}/X11       \
150 150
                                         \
151
-    /usr/openwin/lib${kdelibsuff}       \
152
-    /usr/openwin/share/lib${kdelibsuff} \
151
+    /usr/openwin/lib${tdelibsuff}       \
152
+    /usr/openwin/share/lib${tdelibsuff} \
153 153
     ; \
154 154
 do
155 155
 dnl Don't even attempt the hair of trying to link an X program!
@@ -372,24 +372,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
372 372
   fi
373 373
 
374 374
 AC_MSG_CHECKING([for KDE libraries installed])
375
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
375
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
376 376
 
377 377
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
378 378
   AC_MSG_RESULT(yes)
379 379
 else
380 380
   AC_MSG_ERROR([your system fails at linking a small KDE application!
381 381
 Check, if your compiler is installed correctly and if you have used the
382
-same compiler to compile Qt and kdelibs as you did use now.
382
+same compiler to compile Qt and tdelibs as you did use now.
383 383
 For more details about this problem, look at the end of config.log.])
384 384
 fi
385 385
 
386
-if eval `KDEDIR= ./conftest 2>&5`; then
386
+if eval `TDEDIR= ./conftest 2>&5`; then
387 387
   kde_result=done
388 388
 else
389 389
   kde_result=problems
390 390
 fi
391 391
 
392
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
392
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
393 393
 kde_have_all_paths=yes
394 394
 
395 395
 KDE_SET_PATHS($kde_result)
@@ -555,11 +555,11 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
555 555
     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
556 556
 
557 557
         kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
558
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
559
-        if test -n "$KDEDIRS"; then
558
+        test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
559
+        if test -n "$TDEDIRS"; then
560 560
            kde_save_IFS=$IFS
561 561
            IFS=:
562
-           for dir in $KDEDIRS; do
562
+           for dir in $TDEDIRS; do
563 563
                 kde_default_bindirs="$dir/bin $kde_default_bindirs "
564 564
            done
565 565
            IFS=$kde_save_IFS
@@ -571,7 +571,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
571 571
           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
572 572
           KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
573 573
         fi
574
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
574
+        KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs])
575 575
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
576 576
 
577 577
         kde32ornewer=1
@@ -584,14 +584,14 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
584 584
         fi
585 585
 
586 586
         if test -n "$kde32ornewer"; then
587
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
587
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
588 588
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
589 589
         fi
590 590
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
591 591
 
592 592
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
593 593
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
594
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
594
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
595 595
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
596 596
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
597 597
 		KDE_XSL_STYLESHEET=""
@@ -621,9 +621,9 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
621 621
         if test -x "$KDECONFIG"; then # it can be "compiled"
622 622
           kde_libs_prefix=`$KDECONFIG --prefix`
623 623
           if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
624
-               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
624
+               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
625 625
                           This means it has been moved since you installed it.
626
-                          This won't work. Please recompile kdelibs for the new prefix.
626
+                          This won't work. Please recompile tdelibs for the new prefix.
627 627
                           ])
628 628
            fi
629 629
            kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -705,7 +705,7 @@ AC_SUBST(kde_templatesdir)
705 705
 AC_SUBST(kde_servicesdir)
706 706
 AC_SUBST(kde_servicetypesdir)
707 707
 AC_SUBST(kde_moduledir)
708
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
708
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
709 709
 AC_SUBST(kde_styledir)
710 710
 AC_SUBST(kde_widgetdir)
711 711
 if test "$kde_qtver" = 1; then
@@ -922,7 +922,7 @@ mips-sgi-irix6*)
922 922
     ac_x_includes="."
923 923
   fi
924 924
   if test -z "$ac_x_libraries"; then
925
-    ac_x_libraries="/usr/lib${kdelibsuff}"
925
+    ac_x_libraries="/usr/lib${tdelibsuff}"
926 926
   fi
927 927
 esac
928 928
 #from now on we use our own again
@@ -1406,7 +1406,7 @@ qt_includes=""
1406 1406
 AC_ARG_WITH(qt-dir,
1407 1407
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1408 1408
     [  ac_qt_includes="$withval"/include
1409
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1409
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1410 1410
        ac_qt_bindir="$withval"/bin
1411 1411
     ])
1412 1412
 
@@ -1447,7 +1447,7 @@ ac_qt_includes="$qt_incdir"
1447 1447
 
1448 1448
 qt_libdirs=""
1449 1449
 for dir in $kde_qt_dirs; do
1450
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1450
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1451 1451
 done
1452 1452
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1453 1453
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1631,7 +1631,7 @@ rm -f actest.ui actest.cpp
1631 1631
 
1632 1632
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1633 1633
 if test "$kde_cv_uic_plugins" != yes; then
1634
-	AC_MSG_ERROR([you need to install kdelibs first.])
1634
+	AC_MSG_ERROR([you need to install tdelibs first.])
1635 1635
 fi
1636 1636
 fi
1637 1637
 ])
@@ -1742,16 +1742,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
1742 1742
 
1743 1743
 if test "$kde_qtver" = 1; then
1744 1744
   kde_check_header="ksock.h"
1745
-  kde_check_lib="libkdecore.la"
1745
+  kde_check_lib="libtdecore.la"
1746 1746
 else
1747 1747
   kde_check_header="ksharedptr.h"
1748
-  kde_check_lib="libkio.la"
1748
+  kde_check_lib="libtdeio.la"
1749 1749
 fi
1750 1750
 
1751 1751
 if test -z "$1"; then
1752 1752
 
1753
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1754
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1753
+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1754
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1755 1755
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1756 1756
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1757 1757
 ac_kde_includes="$kde_incdir"
@@ -1762,8 +1762,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1762 1762
 So, check this please and use another prefix!])
1763 1763
 fi
1764 1764
 
1765
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1766
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1765
+kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
1766
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1767 1767
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1768 1768
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1769 1769
 ac_kde_libraries="$kde_libdir"
@@ -1781,7 +1781,7 @@ fi
1781 1781
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1782 1782
 AC_MSG_ERROR([
1783 1783
 I can't find the designer plugins. These are required and should have been installed
1784
-by kdelibs])
1784
+by tdelibs])
1785 1785
 fi
1786 1786
 
1787 1787
 if test -n "$kde_widgetdir"; then
@@ -1936,20 +1936,20 @@ cat > conftest.$ac_ext <<EOF
1936 1936
 #include <kapp.h>
1937 1937
 
1938 1938
 int main() {
1939
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
1940
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
1941
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
1942
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
1943
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
1944
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
1945
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
1946
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
1947
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
1948
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
1939
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
1940
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
1941
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
1942
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
1943
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
1944
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
1945
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
1946
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
1947
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
1948
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
1949 1949
     printf("kde_wallpaperdir=\\"%s\\"\n",
1950
-	KApplication::kde_wallpaperdir().data());
1951
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
1952
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
1950
+	TDEApplication::kde_wallpaperdir().data());
1951
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
1952
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
1953 1953
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
1954 1954
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
1955 1955
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -1987,7 +1987,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
1987 1987
  kde_cxxflags_safe="$CXXFLAGS"
1988 1988
 
1989 1989
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
1990
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
1990
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
1991 1991
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
1992 1992
 
1993 1993
  AC_TRY_LINK([
@@ -2020,39 +2020,39 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2020 2020
    AC_REQUIRE([K_PATH_X])
2021 2021
 
2022 2022
 if test $kde_qtver = 3; then
2023
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2024
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2025
-   AC_SUBST(LIB_KIO, "-lkio")
2023
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2024
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2025
+   AC_SUBST(LIB_KIO, "-ltdeio")
2026 2026
    AC_SUBST(LIB_SMB, "-lsmb")
2027 2027
    AC_SUBST(LIB_KAB, "-lkab")
2028
-   AC_SUBST(LIB_KABC, "-lkabc")
2029
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2030
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2031
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2032
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2033
-   AC_SUBST(LIB_KUTILS, "-lkutils")
2034
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2028
+   AC_SUBST(LIB_KABC, "-ltdeabc")
2029
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2030
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
2031
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2032
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2033
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2034
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2035 2035
 # these are for backward compatibility
2036
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
2037
-   AC_SUBST(LIB_KFILE, "-lkio")
2036
+   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2037
+   AC_SUBST(LIB_KFILE, "-ltdeio")
2038 2038
 elif test $kde_qtver = 2; then
2039
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2040
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2041
-   AC_SUBST(LIB_KIO, "-lkio")
2042
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
2039
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2040
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2041
+   AC_SUBST(LIB_KIO, "-ltdeio")
2042
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2043 2043
    AC_SUBST(LIB_SMB, "-lsmb")
2044
-   AC_SUBST(LIB_KFILE, "-lkfile")
2044
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2045 2045
    AC_SUBST(LIB_KAB, "-lkab")
2046
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2047
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2048
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2049
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2046
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2047
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
2048
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2049
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2050 2050
 else
2051
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2052
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2053
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2054
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
2055
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
2051
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2052
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2053
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2054
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2055
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2056 2056
 fi
2057 2057
 ])
2058 2058
 
@@ -2117,7 +2117,7 @@ if test "x$kde_cv_func_$1" = xyes; then
2117 2117
 else
2118 2118
   case "$1" in
2119 2119
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
2120
-		kde_cv_proto_$1="yes - in libkdefakes"
2120
+		kde_cv_proto_$1="yes - in libtdefakes"
2121 2121
 		;;
2122 2122
 	*)
2123 2123
 		kde_cv_proto_$1=unknown
@@ -2398,7 +2398,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2398 2398
   AC_MSG_RESULT(yes)
2399 2399
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2400 2400
 else
2401
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2401
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2402 2402
 fi
2403 2403
 ])
2404 2404
 
@@ -2462,7 +2462,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
2462 2462
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
2463 2463
 
2464 2464
 dnl if headers _and_ libraries are missing, this is no error, and we
2465
-dnl continue with a warning (the user will get no jpeg support in khtml)
2465
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
2466 2466
 dnl if only one is missing, it means a configuration error, but we still
2467 2467
 dnl only warn
2468 2468
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3078,26 +3078,26 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
3078 3078
 
3079 3079
 AC_DEFUN([KDE_CHECK_LIB64],
3080 3080
 [
3081
-    kdelibsuff=no
3081
+    tdelibsuff=no
3082 3082
     AC_ARG_ENABLE(libsuffix,
3083 3083
         AC_HELP_STRING([--enable-libsuffix],
3084 3084
             [/lib directory suffix (64,32,none[=default])]),
3085
-            kdelibsuff=$enableval)
3085
+            tdelibsuff=$enableval)
3086 3086
     # TODO: add an auto case that compiles a little C app to check
3087 3087
     # where the glibc is
3088
-    if test "$kdelibsuff" = "no"; then
3089
-       kdelibsuff=
3088
+    if test "$tdelibsuff" = "no"; then
3089
+       tdelibsuff=
3090 3090
     fi
3091
-    if test -z "$kdelibsuff"; then
3091
+    if test -z "$tdelibsuff"; then
3092 3092
         AC_MSG_RESULT([not using lib directory suffix])
3093 3093
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3094 3094
     else
3095 3095
         if test "$libdir" = '${exec_prefix}/lib'; then
3096
-            libdir="$libdir${kdelibsuff}"
3096
+            libdir="$libdir${tdelibsuff}"
3097 3097
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3098 3098
         fi
3099
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
3100
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3099
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories)
3100
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3101 3101
     fi
3102 3102
 ])
3103 3103
 
@@ -3114,7 +3114,7 @@ AC_CANONICAL_SYSTEM
3114 3114
 AC_ARG_PROGRAM
3115 3115
 AM_INIT_AUTOMAKE($1, $2)
3116 3116
 AM_DISABLE_LIBRARIES
3117
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3117
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3118 3118
 AC_CHECK_COMPILERS
3119 3119
 KDE_PROG_LIBTOOL
3120 3120
 AM_KDE_WITH_NLS
@@ -4088,7 +4088,7 @@ fi
4088 4088
 
4089 4089
 PYTHONINC=-I$python_incdir
4090 4090
 
4091
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4091
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4092 4092
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4093 4093
 if test ! -r $python_libdir/libpython$version.so; then
4094 4094
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4477,8 +4477,8 @@ AC_DEFUN([KDE_CONF_FILES],
4477 4477
 AC_DEFUN([KDE_SET_PREFIX],
4478 4478
 [
4479 4479
   unset CDPATH
4480
-  dnl make $KDEDIR the default for the installation
4481
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4480
+  dnl make $TDEDIR the default for the installation
4481
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4482 4482
 
4483 4483
   if test "x$prefix" = "xNONE"; then
4484 4484
     prefix=$ac_default_prefix
@@ -5128,7 +5128,7 @@ ssl_includes=""
5128 5128
 AC_ARG_WITH(ssl-dir,
5129 5129
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5130 5130
     [  ac_ssl_includes="$withval"/include
5131
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5131
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5132 5132
     ])
5133 5133
 
5134 5134
 want_ssl=yes
@@ -5148,7 +5148,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5148 5148
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5149 5149
   ac_ssl_includes="$ssl_incdir"
5150 5150
 
5151
-  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"
5151
+  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"
5152 5152
   if test ! "$ac_ssl_libraries" = "NO"; then
5153 5153
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5154 5154
   fi

+ 1
- 1
configure.in View File

@@ -80,7 +80,7 @@ AM_CONDITIONAL(ENABLE_RU_UA_LAYOUT, test "x$enable_ru_ua_layout" = "xyes")
80 80
 
81 81
 dnl set prefix according to installed KDE. Strange that KDE build scripts
82 82
 dnl don't do it by default
83
-AC_PREFIX_DEFAULT(`kde-config --prefix`)
83
+AC_PREFIX_DEFAULT(`tde-config --prefix`)
84 84
 
85 85
 KDE_CREATE_SUBDIRSLIST
86 86
 AC_CONFIG_FILES([ Makefile ])

+ 1
- 1
configure.in.in View File

@@ -23,5 +23,5 @@ AM_CONDITIONAL(ENABLE_RU_UA_LAYOUT, test "x$enable_ru_ua_layout" = "xyes")
23 23
 
24 24
 dnl set prefix according to installed KDE. Strange that KDE build scripts
25 25
 dnl don't do it by default
26
-AC_PREFIX_DEFAULT(`kde-config --prefix`)
26
+AC_PREFIX_DEFAULT(`tde-config --prefix`)
27 27
 

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

@@ -330,7 +330,7 @@ is only for those who want to tweak how this guessing works or just are curious.
330 330
 The algorithm is very simple. The &kkbswitch; distribution contains a file named
331 331
 <filename>group_names</filename>, which resides in &kkbswitch;'s data directory
332 332
 (<filename
333
- class="directory">$<envar>KDEDIR</envar>/share/apps/kkbswitch</filename>).
333
+ class="directory">$<envar>TDEDIR</envar>/share/apps/kkbswitch</filename>).
334 334
 The file is a standard &kde; config file. It contains two sections. The secion  named "Mapping" contains mappings from XKeyboard group names to country codes.
335 335
 It contains various key=value pairs, key being the name of the XKeyboard layout and
336 336
 value the two-letter country code of the flag to display. The second section, "Language" contains similar mappings from XKeyboard group names to language codes. Note that if a group name is not found in the "Language" section, it is looked up in "Mapping" section, thus only layouts where country code and language code do not coincide need to be listed in "Language" section (e.g. for US/ASCII group the country code would be "us", but the language code would be "en").
@@ -340,7 +340,7 @@ value the two-letter country code of the flag to display. The second section, "L
340 340
 Once the country-code
341 341
 has been determined, &kkbswitch; will look for an icon named
342 342
 <filename>flag.png</filename> in the directory <filename
343
-class="directory">$<envar>KDEDIR</envar>/share/locale/l10n/<replaceable>country code</replaceable></filename> for icons styles that feature a flag and use the language code for styles that feature the a language code.
343
+class="directory">$<envar>TDEDIR</envar>/share/locale/l10n/<replaceable>country code</replaceable></filename> for icons styles that feature a flag and use the language code for styles that feature the a language code.
344 344
 </para>
345 345
 
346 346
 <para>
@@ -562,7 +562,7 @@ url="http://apps.kde.com/">apps.kde.com</ulink>
562 562
 <title>Requirements</title>
563 563
 <para>
564 564
 &kkbswitch; doesn't require any special environment to compile and run besides
565
- the standard &kde; 2 or 3 kdelibs and kdebase.
565
+ the standard &kde; 2 or 3 tdelibs and tdebase.
566 566
 </para>
567 567
 </sect1>
568 568
 
@@ -583,7 +583,7 @@ Options you may want or need to give to the <command>configure</command> command
583 583
 </para>
584 584
 <simplelist>
585 585
 <member>
586
-<option>--prefix</option>=<replaceable>dir</replaceable> - set the prefix where your &kde; installation is located. Alternatively, you can set $<envar>KDEDIR</envar> environment variable to the &kde; directory. Under regular circumstances, the configuration script will find the &kde; location automatically; use this option only if you are having problems without it.
586
+<option>--prefix</option>=<replaceable>dir</replaceable> - set the prefix where your &kde; installation is located. Alternatively, you can set $<envar>TDEDIR</envar> environment variable to the &kde; directory. Under regular circumstances, the configuration script will find the &kde; location automatically; use this option only if you are having problems without it.
587 587
 </member>
588 588
 <member>
589 589
 <option>--enable-ru-ua-layout</option> - install the Russian/Ukrainian layout file (described in <xref linkend="ru_ua"/>). This option is useful for users of XFree86 prior to version 4.3, who want to use Russian/Ukrainian layout file. Note that with this option it is not possible to install &kkbswitch; without root privileges, because the layout file <emphasis>must</emphasis> go to the system XKB layout directory where ordinary users don't have write access.

+ 2
- 2
kkbswitch.kdevelop View File

@@ -1,5 +1,5 @@
1 1
 <?xml version = '1.0'?>
2
-<kdevelop>
2
+<tdevelop>
3 3
   <general>
4 4
     <author>Leonid Zeitlin</author>
5 5
     <email>lz@europe.com</email>
@@ -212,4 +212,4 @@
212 212
       <usermanualurl/>
213 213
     </projectdoc>
214 214
   </kdevdocumentation>
215
-</kdevelop>
215
+</tdevelop>

+ 6
- 6
kkbswitch.spec View File

@@ -15,7 +15,7 @@ Url:       http://kkbswitch.sourceforge.net
15 15
 Packager:  Leonid Zeitlin <lz@europe.com>
16 16
 Group:     User Interface/Desktops
17 17
 Source:    kkbswitch-%{version}.tar.gz
18
-BuildRequires: kdelibs-devel 
18
+BuildRequires: tdelibs-devel 
19 19
 BuildRoot: %{_tmppath}/kkbswitch-root
20 20
 
21 21
 %description
@@ -31,7 +31,7 @@ still have to configure XKeyboard by editing the XF86Config file.
31 31
 %setup
32 32
 
33 33
 %build
34
-export KDEDIR=%{_prefix}
34
+export TDEDIR=%{_prefix}
35 35
 # Workaround for legacy auto* tools
36 36
 #[ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
37 37
 #[ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5?
@@ -65,9 +65,9 @@ rm -rf $RPM_BUILD_ROOT
65 65
 %{_bindir}/kkbswitch
66 66
 %{_datadir}/applnk/Utilities/kkbswitch.desktop
67 67
 %{_datadir}/apps/kkbswitch/*
68
-%{_datadir}/apps/kconf_update/kkbswitch.upd
69
-%{_datadir}/apps/kconf_update/kkbswitch_update_14_icons
70
-%{_datadir}/apps/kconf_update/kkbswitch_update_14_options
68
+%{_datadir}/apps/tdeconf_update/kkbswitch.upd
69
+%{_datadir}/apps/tdeconf_update/kkbswitch_update_14_icons
70
+%{_datadir}/apps/tdeconf_update/kkbswitch_update_14_options
71 71
 %{_datadir}/locale/*/LC_MESSAGES/kkbswitch.mo
72 72
 %{_datadir}/autostart/kkbswitch.desktop
73 73
 %{_mandir}/man1/kkbswitch.1*
@@ -79,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
79 79
 - Version 1.4.3
80 80
 
81 81
 * Sat Nov 13 2004 Leonid Zeitlin <lz@europe.com> 1.4.2-2
82
-- Added explicit BuildRequires: kdelibs-devel
82
+- Added explicit BuildRequires: tdelibs-devel
83 83
 - Don't use %configure, it causes binary to be named something like 
84 84
   i686-redhat-linux-gnu-kkbswitch on older (RH 7.3) systems
85 85
 

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

@@ -1,4 +1,4 @@
1 1
 
2
-updatedir = $(kde_datadir)/kconf_update
2
+updatedir = $(kde_datadir)/tdeconf_update
3 3
 update_SCRIPTS =  kkbswitch_update_14_icons kkbswitch_update_14_options
4 4
 update_DATA =  kkbswitch.upd

+ 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_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lDCOP
10
+kkbswitch_LDADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lDCOP
11 11
 
12 12
 messages:
13 13
 	$(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot

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

@@ -3,13 +3,13 @@ METASOURCES = AUTO
3 3
 
4 4
 bin_PROGRAMS =  
5 5
 lib_LTLIBRARIES =
6
-kdeinit_LTLIBRARIES = kkbswitch.la
6
+tdeinit_LTLIBRARIES = kkbswitch.la
7 7
 kkbswitch_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
8 8
 kkbswitch_la_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdlg.cpp kbgroup.cpp kbpickicondlg.cpp kbswitchapp.cpp kbswitchintf.cpp kbswitchtrayicon.cpp main.cpp pathlistboxitem.cpp xkeyboard.cpp kbswitchintf.skel boldlistboxitem.h boldmenuitem.h kbconfigdlg.h kbconfig.h kbgroup.h kbpickicondlg.h kbswitchapp.h kbswitchintf.h kbswitchtrayicon.h pathlistboxitem.h xkeyboard.h windowwatcher.cpp singlewindowwatcher.cpp windowclasswatcher.cpp
9 9
 
10 10
 INCLUDES = $(all_includes)
11 11
 
12
-kkbswitch_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI)
12
+kkbswitch_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI)
13 13
 
14 14
 messages:
15 15
 	$(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot

+ 6
- 6
kkbswitch/boldmenuitem.cpp View File

@@ -21,10 +21,10 @@
21 21
 #include <ntqpalette.h>
22 22
 #include <ntqstyle.h>
23 23
 #include <kdebug.h>
24
-#include <kglobalsettings.h>
25
-#include <kdeversion.h>
26
-#if KDE_VERSION_MAJOR >= 3
27
-  #include <kapplication.h>
24
+#include <tdeglobalsettings.h>
25
+#include <tdeversion.h>
26
+#if TDE_VERSION_MAJOR >= 3
27
+  #include <tdeapplication.h>
28 28
 #else
29 29
   #include <kapp.h>
30 30
 #endif
@@ -47,14 +47,14 @@ void BoldMenuItem::paint(TQPainter* painter, const TQColorGroup& /*cg*/,
47 47
     font.setBold(m_bold);
48 48
     painter->setFont(font);
49 49
   }
50
-  //if (act) painter->setPen(KGlobalSettings::highlightedTextColor());
50
+  //if (act) painter->setPen(TDEGlobalSettings::highlightedTextColor());
51 51
   //if (act) painter->setPen(cg.highlightedText());
52 52
   if (act) painter->setPen(m_active_text_color);
53 53
   kdDebug() << "bg color = " << painter->brush().color().rgb() << endl;
54 54
 
55 55
   painter->drawText(x, y, w, h, AlignLeft | AlignVCenter | ShowPrefix | DontClip,
56 56
     m_text);
57
-  //KApplication::style().drawItem(painter, TQRect(x, y, w, h), AlignLeft | AlignVCenter | ShowPrefix | DontClip,
57
+  //TDEApplication::style().drawItem(painter, TQRect(x, y, w, h), AlignLeft | AlignVCenter | ShowPrefix | DontClip,
58 58
   //  cg, enabled, 0, m_text);
59 59
 }	
60 60
 

+ 23
- 23
kkbswitch/kbconfig.cpp View File

@@ -16,17 +16,17 @@
16 16
  ***************************************************************************/
17 17
 
18 18
 #include <config.h> 
19
-#include <kdeversion.h>
20
-#include <klocale.h>
21
-#include <kglobal.h>
22
-#if KDE_VERSION_MAJOR >= 3
19
+#include <tdeversion.h>
20
+#include <tdelocale.h>
21
+#include <tdeglobal.h>
22
+#if TDE_VERSION_MAJOR >= 3
23 23
   #include <kstandarddirs.h>
24
-  #include <kapplication.h>
24
+  #include <tdeapplication.h>
25 25
 #else
26 26
   #include <kstddirs.h>
27 27
   #include <kapp.h>
28 28
 #endif
29
-#include <kglobalsettings.h>
29
+#include <tdeglobalsettings.h>
30 30
 #include <kdebug.h>
31 31
 #include <kglobalaccel.h>
32 32
 
@@ -58,7 +58,7 @@ KBConfig::KBConfig()
58 58
   m_group_scope = SCOPE_GLOBAL;
59 59
   m_autostart = true;
60 60
   m_icon_style = ICON_CODE_AND_FLAG;
61
-  //m_keys = new KGlobalAccel(NULL);
61
+  //m_keys = new TDEGlobalAccel(NULL);
62 62
   m_keys = NULL;
63 63
 }
64 64
 
@@ -67,8 +67,8 @@ KBConfig::~KBConfig()
67 67
 	delete m_keys;
68 68
 }
69 69
 
70
-/** load the KBSwitch configration from the application KConfig object */
71
-void KBConfig::load(KConfig *config){
70
+/** load the KBSwitch configration from the application TDEConfig object */
71
+void KBConfig::load(TDEConfig *config){
72 72
   config->setGroup(OPTIONS_SECTION);
73 73
   m_toggle_mode = config->readBoolEntry(TOGGLE_MODE_ENTRY);
74 74
   m_default_groupno = config->readNumEntry(DEFAULT_GROUP_ENTRY);
@@ -100,7 +100,7 @@ void KBConfig::load(KConfig *config){
100 100
 	}
101 101
 
102 102
 	if (m_keys) delete m_keys;
103
-  m_keys = new KGlobalAccel(NULL);
103
+  m_keys = new TDEGlobalAccel(NULL);
104 104
   for (int i = 0; i < groupCount(); i++) {
105 105
     m_keys->insert(TQString::fromLatin1("SetGroup %1").arg(i),
106 106
       i18n("Activate %1 keyboard layout").arg(m_groups[i]->getName()),
@@ -111,7 +111,7 @@ void KBConfig::load(KConfig *config){
111 111
   checkKeysEnabled();
112 112
 }
113 113
 
114
-void KBConfig::save(KConfig *config)
114
+void KBConfig::save(TDEConfig *config)
115 115
 {
116 116
   config->setGroup(OPTIONS_SECTION);
117 117
   config->writeEntry(TOGGLE_MODE_ENTRY, m_toggle_mode);
@@ -130,9 +130,9 @@ void KBConfig::drawIcons(IconStyle icon_style, TQValueVector<TQPixmap> *icons,
130 130
   TQString path, countryCode, langCode;
131 131
   TQStringList layouts;
132 132
   
133
-  KGlobal::dirs()->addResourceDir("appdata", ".");
134
-  KConfig map("group_names", true, true, "appdata");
135
-  KConfig *config = kapp->config();
133
+  TDEGlobal::dirs()->addResourceDir("appdata", ".");
134
+  TDEConfig map("group_names", true, true, "appdata");
135
+  TDEConfig *config = kapp->config();
136 136
   config->setGroup(ICONS_SECTION);
137 137
   getXkbLayouts(layouts);
138 138
 
@@ -163,8 +163,8 @@ void KBConfig::drawIcons(IconStyle icon_style, TQValueVector<TQPixmap> *icons,
163 163
 
164 164
 /** No descriptions */
165 165
 /*void KBConfig::guessGroupPixmaps(){
166
-  KGlobal::dirs()->addResourceDir("appdata", ".");
167
-  KConfig map("group_names", true, true, "appdata");
166
+  TDEGlobal::dirs()->addResourceDir("appdata", ".");
167
+  TDEConfig map("group_names", true, true, "appdata");
168 168
   TQString path, countryCode, langCode;
169 169
   TQPixmap pix;
170 170
 
@@ -188,7 +188,7 @@ void KBConfig::drawIcons(IconStyle icon_style, TQValueVector<TQPixmap> *icons,
188 188
 }*/
189 189
 
190 190
 bool KBConfig::getGroupImage(TQImage &img, TQString &path, const TQString &code,
191
-  int group, KConfig *config)
191
+  int group, TDEConfig *config)
192 192
 {
193 193
   bool ret = true;
194 194
   bool need_to_scale = false;
@@ -217,7 +217,7 @@ bool KBConfig::getGroupImage(TQImage &img, TQString &path, const TQString &code,
217 217
 }
218 218
 
219 219
 void KBConfig::drawFlagPixmap(TQPixmap &pix, TQString &path, const TQString &code,
220
-  int group, KConfig *config)
220
+  int group, TDEConfig *config)
221 221
 {
222 222
   TQImage img;
223 223
   if (getGroupImage(img, path, code, group, config)) 
@@ -232,9 +232,9 @@ void KBConfig::drawCodePixmap(TQPixmap &pix, const TQString &code)
232 232
   TQFont font("helvetica", 9, TQFont::Bold);
233 233
   font.setPixelSize(10);
234 234
   painter.setFont(font);
235
-	painter.setPen(KGlobalSettings::highlightedTextColor());
235
+	painter.setPen(TDEGlobalSettings::highlightedTextColor());
236 236
 	
237
-	pix.fill(KGlobalSettings::highlightColor());
237
+	pix.fill(TDEGlobalSettings::highlightColor());
238 238
   painter.drawText(1, 0, pix.width(), pix.height(),
239 239
     TQt::AlignHCenter | TQt::AlignVCenter, code.upper());
240 240
 
@@ -243,13 +243,13 @@ void KBConfig::drawCodePixmap(TQPixmap &pix, const TQString &code)
243 243
 }
244 244
 
245 245
 void KBConfig::drawCodeAndFlagPixmap(TQPixmap &pix, TQString &path,
246
-  const TQString &countryCode, const TQString &langCode, int group, KConfig *config)
246
+  const TQString &countryCode, const TQString &langCode, int group, TDEConfig *config)
247 247
 {
248 248
 	TQImage img;
249 249
 	if (!getGroupImage(img, path, countryCode, group, config)) return; // could not find flag
250 250
 	if (img.depth() <= 8) img = img.convertDepth(32);
251 251
 
252
-	// the following code is taken from kdebase/kxkb/pixmap.cpp
252
+	// the following code is taken from tdebase/kxkb/pixmap.cpp
253 253
   for (int y = 0; y < img.height(); y++)
254 254
     for(int x = 0; x < img.width(); x++) {
255 255
       TQRgb rgb = img.pixel(x, y);
@@ -297,7 +297,7 @@ void KBConfig::checkKeysEnabled()
297 297
 }*/
298 298
 
299 299
 /** No descriptions */
300
-/*void KBConfig::loadConfiguredPixmaps(KConfig *config){
300
+/*void KBConfig::loadConfiguredPixmaps(TDEConfig *config){
301 301
   TQString path;
302 302
   TQPixmap pix;
303 303
   config->setGroup(ICONS_SECTION);

+ 12
- 12
kkbswitch/kbconfig.h View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 #include <ntqptrvector.h>
24 24
 #include <ntqvaluevector.h>
25
-#include <kconfig.h>
25
+#include <tdeconfig.h>
26 26
 
27 27
 #define ICONS_SECTION "Icons"
28 28
 #define OPTIONS_SECTION "Options"
@@ -30,7 +30,7 @@
30 30
 #define FLAG_ICON_WIDTH 21
31 31
 #define FLAG_ICON_HEIGHT 14
32 32
 
33
-class KGlobalAccel;
33
+class TDEGlobalAccel;
34 34
 
35 35
 typedef TQPtrVector<KBGroup> KBGroupVector;
36 36
 
@@ -51,7 +51,7 @@ private:
51 51
   bool m_autostart;
52 52
   bool m_use_shortcuts;
53 53
   IconStyle m_icon_style;
54
-  KGlobalAccel *m_keys;
54
+  TDEGlobalAccel *m_keys;
55 55
 public: 
56 56
 	KBConfig();
57 57
 	~KBConfig();
@@ -72,11 +72,11 @@ public:
72 72
   void set_icon_style(IconStyle value) { m_icon_style = value; }
73 73
   bool use_shortcuts() { return m_use_shortcuts; }
74 74
   void set_use_shortcuts(bool value) { m_use_shortcuts = value; }
75
-  KGlobalAccel *keys() { return m_keys; }
76
-  /** Load the KBSwitch configration from the application KConfig object */
77
-  void load(KConfig *config);
78
-  /** Save the KBSwitch configration to the application KConfig object */
79
-  void save(KConfig *config);
75
+  TDEGlobalAccel *keys() { return m_keys; }
76
+  /** Load the KBSwitch configration from the application TDEConfig object */
77
+  void load(TDEConfig *config);
78
+  /** Save the KBSwitch configration to the application TDEConfig object */
79
+  void save(TDEConfig *config);
80 80
   /** No descriptions */
81 81
   /*void notifyChanged();*/
82 82
   /*static TQString entryForGroup(int i) {
@@ -94,16 +94,16 @@ private: // Private methods
94 94
   /** No descriptions */
95 95
   //void drawDefaultPixmaps();
96 96
   /** No descriptions */
97
-  //void loadConfiguredPixmaps(KConfig *config);
97
+  //void loadConfiguredPixmaps(TDEConfig *config);
98 98
   void drawFlagPixmap(TQPixmap &pix, TQString &path, const TQString &code,
99
-    int group, KConfig *config);
99
+    int group, TDEConfig *config);
100 100
   void drawCodePixmap(TQPixmap &pix, const TQString &code);
101 101
   void drawCodeAndFlagPixmap(TQPixmap &pix, TQString &path,
102 102
     const TQString &countryCode, const TQString &langCode, int group,
103
-    KConfig *config);
103
+    TDEConfig *config);
104 104
   void drawDefaultPixmap(TQPixmap &pix, int group);
105 105
   bool getGroupImage(TQImage &img, TQString &path, const TQString &code, int group,
106
-    KConfig *config);
106
+    TDEConfig *config);
107 107
   void getXkbLayouts(TQStringList &layouts);
108 108
 };
109 109
 

+ 16
- 16
kkbswitch/kbconfigdlg.cpp View File

@@ -31,18 +31,18 @@
31 31
 #include <ntqpushbutton.h>
32 32
 #include <ntqcombobox.h>
33 33
 
34
-#include <kdeversion.h>
35
-#include <klistbox.h>
36
-#include <klocale.h>
34
+#include <tdeversion.h>
35
+#include <tdelistbox.h>
36
+#include <tdelocale.h>
37 37
 #include <kdebug.h>
38
-#if KDE_VERSION_MAJOR >= 3
39
-  #include <kapplication.h>
38
+#if TDE_VERSION_MAJOR >= 3
39
+  #include <tdeapplication.h>
40 40
 #else
41 41
   #include <kapp.h>
42 42
 #endif
43
-#include <klistview.h>
43
+#include <tdelistview.h>
44 44
 #include <kkeydialog.h>
45
-#include <kconfig.h>
45
+#include <tdeconfig.h>
46 46
 
47 47
 /* This little subclass of KKeyChooser reimplements sizeHint() to
48 48
    look a little smaller in our config dialog. The default size
@@ -53,7 +53,7 @@ private:
53 53
   TQSize m_size_hint;
54 54
   void calcSizeHint();
55 55
 public:
56
-  SmallerKeyChooser(KGlobalAccel *accel, TQWidget *parent) :
56
+  SmallerKeyChooser(TDEGlobalAccel *accel, TQWidget *parent) :
57 57
     KKeyChooser(accel, parent) { calcSizeHint(); }
58 58
   virtual TQSize sizeHint() const { return m_size_hint; }
59 59
 };
@@ -62,7 +62,7 @@ void SmallerKeyChooser::calcSizeHint()
62 62
 {
63 63
 	m_size_hint = KKeyChooser::sizeHint();
64 64
 
65
-  KListView *lv = NULL;
65
+  TDEListView *lv = NULL;
66 66
   TQGroupBox *gb = NULL;
67 67
   const TQObjectList *objects = children();
68 68
   TQObjectListIt iter(*objects);
@@ -70,8 +70,8 @@ void SmallerKeyChooser::calcSizeHint()
70 70
 
71 71
   while ( (obj = iter.current()) ) {
72 72
 		++iter;
73
-		if (obj->inherits("KListView"))
74
-		  lv = dynamic_cast<KListView*>(obj);
73
+		if (obj->inherits("TDEListView"))
74
+		  lv = dynamic_cast<TDEListView*>(obj);
75 75
 		else if (obj->inherits("TQGroupBox"))
76 76
 		  gb = dynamic_cast<TQGroupBox*>(obj);  
77 77
 	}
@@ -123,7 +123,7 @@ void KBConfigDlg::setupGeneralPage()
123 123
   TQHBoxLayout *groupsLayout = new TQHBoxLayout(vlayout);
124 124
   groupsLayout->setSpacing(2);
125 125
 
126
-  lbGroups = new KListBox(page);
126
+  lbGroups = new TDEListBox(page);
127 127
   TQObject::connect(lbGroups, SIGNAL(selectionChanged()), this, SLOT(slotLayoutSelected()));
128 128
   TQObject::connect(lbGroups, SIGNAL(doubleClicked(TQListBoxItem *)), this,
129 129
     SLOT(slotListBoxExecuted(TQListBoxItem *)));
@@ -231,7 +231,7 @@ void KBConfigDlg::setupShortcutsPage()
231 231
 void KBConfigDlg::showConfig(){
232 232
   int i;
233 233
   KBGroup *group;
234
-  KConfig *conf = kapp->config();
234
+  TDEConfig *conf = kapp->config();
235 235
 
236 236
   m_iconpaths.clear();
237 237
   conf->setGroup(ICONS_SECTION);
@@ -307,7 +307,7 @@ void KBConfigDlg::slotListBoxExecuted(TQListBoxItem *){
307 307
 void KBConfigDlg::saveConfig(){
308 308
   TQString path;
309 309
   const TQPixmap *pix;
310
-  KConfig *conf = kapp->config();
310
+  TDEConfig *conf = kapp->config();
311 311
   conf->setGroup(ICONS_SECTION);
312 312
   for (int i = 0; i < m_kbconf->groupCount(); i++) {
313 313
     path = m_iconpaths[i];
@@ -368,7 +368,7 @@ void KBConfigDlg::redrawIcons(KBConfig::IconStyle icon_style)
368 368
 
369 369
 void KBConfigDlg::slotCancel()
370 370
 {
371
-	KConfig *config = kapp->config();
371
+	TDEConfig *config = kapp->config();
372 372
 	config->rollback();
373 373
 	config->reparseConfiguration();
374 374
 	KDialogBase::slotCancel();
@@ -397,7 +397,7 @@ void KBConfigDlg::slotSetDefaultIcon()
397 397
  */
398 398
 void KBConfigDlg::checkIconDefault(int index)
399 399
 {
400
-  KConfig *conf = kapp->config();
400
+  TDEConfig *conf = kapp->config();
401 401
   if (index == -1 || ! iconTypeShowsFlag(KBConfig::IconStyle(cbxIconType->currentItem()))) {
402 402
     btnSetDefaultIcon->setEnabled(false);
403 403
   }  

+ 1
- 1
kkbswitch/kbconfigdlg.h View File

@@ -40,7 +40,7 @@ public:
40 40
 	~KBConfigDlg();
41 41
 private: // Private attributes
42 42
   /**  */
43
-  KListBox *lbGroups;
43
+  TDEListBox *lbGroups;
44 44
   /**  */
45 45
   TQCheckBox *chkToggleMode;
46 46
   //TQCheckBox *chkPerwindowGroup;

+ 10
- 10
kkbswitch/kbpickicondlg.cpp View File

@@ -23,16 +23,16 @@
23 23
 #include <ntqpushbutton.h>
24 24
 #include <ntqimage.h>
25 25
 
26
-#include <kdeversion.h>
27
-#include <klocale.h>
28
-#if KDE_VERSION_MAJOR >= 3
26
+#include <tdeversion.h>
27
+#include <tdelocale.h>
28
+#if TDE_VERSION_MAJOR >= 3
29 29
   #include <kstandarddirs.h>
30 30
 #else
31 31
   #include <kstddirs.h>
32 32
 #endif
33
-#include <kglobal.h>
34
-#include <kfiledialog.h>
35
-#include <kmessagebox.h>
33
+#include <tdeglobal.h>
34
+#include <tdefiledialog.h>
35
+#include <tdemessagebox.h>
36 36
 
37 37
 #include "kbconfig.h"
38 38
 #include "pathlistboxitem.h"
@@ -42,7 +42,7 @@ KBPickIconDlg::KBPickIconDlg(const TQString &currentPath, const TQPixmap &curren
42 42
   : KDialogBase(parent, name, true /*modal*/, i18n("Pick an icon") /*caption*/, Ok | Cancel) {
43 43
   TQVBox *page = makeVBoxMainWidget();
44 44
   
45
-  lbIcons = new KListBox(page);
45
+  lbIcons = new TDEListBox(page);
46 46
   TQObject::connect(lbIcons, SIGNAL(doubleClicked(TQListBoxItem*)),
47 47
     this, SLOT(slotOk()));
48 48
   TQObject::connect(lbIcons, SIGNAL(returnPressed(TQListBoxItem*)),
@@ -133,7 +133,7 @@ void KBPickIconDlg::loadCountryFlags()
133 133
   TQDir dir;
134 134
   TQStringList locales;
135 135
   TQString path;
136
-  TQStringList dirs = KGlobal::dirs()->findDirs("locale", "l10n");
136
+  TQStringList dirs = TDEGlobal::dirs()->findDirs("locale", "l10n");
137 137
   
138 138
   for (TQStringList::Iterator dirIter = dirs.begin(); dirIter != dirs.end(); dirIter++) {
139 139
     dir.setPath(*dirIter);
@@ -141,7 +141,7 @@ void KBPickIconDlg::loadCountryFlags()
141 141
     for (TQStringList::Iterator iter = locales.begin(); iter != locales.end(); iter++) {
142 142
       path = dir.path() + "/" + *iter + "/flag.png";
143 143
       if (*iter != "." && *iter != ".." && pix.load(path)) {
144
-				KConfig config(dir.path() + "/" + *iter + "/entry.desktop", true, false,
144
+				TDEConfig config(dir.path() + "/" + *iter + "/entry.desktop", true, false,
145 145
 				  "locale" /*doesn't really matter*/);
146 146
         config.setGroup("KCM Locale");
147 147
         new PathListBoxItem(lbIcons, pix, config.readEntry("Name"), path);
@@ -166,7 +166,7 @@ void KBPickIconDlg::loadGkbCountryFlags()
166 166
       path = info->filePath();
167 167
       code = info->baseName();
168 168
       if (img.load(path)) {
169
-				KConfig config("l10n/" + code + "/entry.desktop", true, false, "locale");
169
+				TDEConfig config("l10n/" + code + "/entry.desktop", true, false, "locale");
170 170
 				config.setGroup("KCM Locale");
171 171
 				name = config.readEntry("Name");
172 172
 				if (!name.isNull()) {

+ 3
- 3
kkbswitch/kbpickicondlg.h View File

@@ -23,7 +23,7 @@
23 23
 class TQWidget;
24 24
 class TQStringList;
25 25
 class TQPixmap;
26
-class KListBox;
26
+class TDEListBox;
27 27
 
28 28
 /**A dialog to pick an icon for a keyboard layout
29 29
   *@author Leonid Zeitlin
@@ -43,8 +43,8 @@ private: // Private attributes
43 43
   /**  */
44 44
   //TQStringList m_pathnames;
45 45
   //TQString m_iconpath;
46
-  //KIconView *m_iconview;
47
-  KListBox *lbIcons;
46
+  //TDEIconView *m_iconview;
47
+  TDEListBox *lbIcons;
48 48
   //TQLabel *lblIcon;
49 49
   //TQRadioButton *rbFlags;
50 50
   //TQRadioButton *rbBrowse;

+ 13
- 13
kkbswitch/kbswitchapp.cpp View File

@@ -22,13 +22,13 @@
22 22
 #include "windowclasswatcher.h"
23 23
 
24 24
 #include <kdebug.h>
25
-#include <klocale.h>
26
-#include <kwinmodule.h>
25
+#include <tdelocale.h>
26
+#include <twinmodule.h>
27 27
 
28 28
 KBSwitchApp::KBSwitchApp()
29 29
 {
30 30
 #ifndef HAVE_LIBXKLAVIER
31
-  //m_kwin_module = NULL;
31
+  //m_twin_module = NULL;
32 32
   m_watcher = NULL;
33 33
 #endif	
34 34
 	if (!m_xkb.xkbAvailable()) return; // oops! No XKB in the server
@@ -87,7 +87,7 @@ KBSwitchApp::~KBSwitchApp(){
87 87
 bool KBSwitchApp::x11EventFilter(XEvent *e){
88 88
   // let m_xkb process the event and emit signals if necessary
89 89
   m_xkb.processEvent(e);
90
-  return KApplication::x11EventFilter(e);
90
+  return TDEApplication::x11EventFilter(e);
91 91
 }
92 92
 
93 93
 /** Update the tray icon to show the flag corresponding to the current keyboard group */
@@ -295,7 +295,7 @@ void KBSwitchApp::resetWindowMap()
295 295
 
296 296
   m_window_map.clear();
297 297
   
298
-  if (m_kwin_module && (active_window_id = m_kwin_module->activeWindow())) 
298
+  if (m_twin_module && (active_window_id = m_twin_module->activeWindow())) 
299 299
     addWindowToMap(active_window_id);
300 300
   else
301 301
     m_active_window = m_window_map.end();
@@ -304,10 +304,10 @@ void KBSwitchApp::resetWindowMap()
304 304
 /** Enable window manager notifications */
305 305
 /*void KBSwitchApp::enableKWinModule()
306 306
 {
307
-  if (m_kwin_module == NULL) {
308
-    m_kwin_module = new KWinModule();
309
-    connect(m_kwin_module, SIGNAL(activeWindowChanged(WId)), SLOT(slotWindowChanged(WId)));
310
-    connect(m_kwin_module, SIGNAL(windowRemoved(WId)), SLOT(slotWindowRemoved(WId)));
307
+  if (m_twin_module == NULL) {
308
+    m_twin_module = new KWinModule();
309
+    connect(m_twin_module, SIGNAL(activeWindowChanged(WId)), SLOT(slotWindowChanged(WId)));
310
+    connect(m_twin_module, SIGNAL(windowRemoved(WId)), SLOT(slotWindowRemoved(WId)));
311 311
     resetWindowMap();
312 312
     if (m_cur_groupno != -1 && m_cur_groupno != m_kbconf.default_groupno())
313 313
       setStartGroup(m_kbconf.default_groupno());
@@ -317,10 +317,10 @@ void KBSwitchApp::resetWindowMap()
317 317
 /** Disable window manager notifications */
318 318
 /*void KBSwitchApp::disableKWinModule()
319 319
 {
320
-  if (m_kwin_module) {
321
-    m_kwin_module->disconnect();
322
-    delete m_kwin_module;
323
-    m_kwin_module = NULL;
320
+  if (m_twin_module) {
321
+    m_twin_module->disconnect();
322
+    delete m_twin_module;
323
+    m_twin_module = NULL;
324 324
     resetWindowMap();
325 325
   }
326 326
 }*/

+ 3
- 3
kkbswitch/kbswitchapp.h View File

@@ -22,8 +22,8 @@
22 22
 #include <config.h>
23 23
 #endif
24 24
 
25
-#include <kdeversion.h>
26
-#if KDE_VERSION_MAJOR >= 3
25
+#include <tdeversion.h>
26
+#if TDE_VERSION_MAJOR >= 3
27 27
   #include <kuniqueapplication.h>
28 28
 #else
29 29
   #include <kuniqueapp.h>
@@ -72,7 +72,7 @@ private: // Private attributes
72 72
   KBSwitchIntf *m_intf;
73 73
 #ifndef HAVE_LIBXKLAVIER  
74 74
   /** Window manager interface */
75
-  //KWinModule *m_kwin_module;
75
+  //KWinModule *m_twin_module;
76 76
   /** Maps Window IDs to their keyboard groups */
77 77
   //KBWindowMap m_window_map;
78 78
   //KBWindowMap::iterator m_active_window;

+ 23
- 23
kkbswitch/kbswitchtrayicon.cpp View File

@@ -15,7 +15,7 @@
15 15
  *                                                                         *
16 16
  ***************************************************************************/
17 17
 
18
-#include <kdeversion.h>
18
+#include <tdeversion.h>
19 19
  
20 20
 #undef USE_BOLD_MENUITEM
21 21
  
@@ -24,37 +24,37 @@
24 24
 #ifdef USE_BOLD_MENUITEM
25 25
   #include "boldmenuitem.h"
26 26
 #endif  
27
-#include <kpopupmenu.h>
28
-#if KDE_VERSION_MAJOR >= 3
27
+#include <tdepopupmenu.h>
28
+#if TDE_VERSION_MAJOR >= 3
29 29
   #include <kstandarddirs.h>
30 30
 #else  
31 31
   #include <kstddirs.h>
32 32
 #endif  
33
-#include <klocale.h>
33
+#include <tdelocale.h>
34 34
 #include <kstdaction.h>
35
-#include <kaction.h>
36
-#include <kaboutapplication.h>
37
-#if KDE_VERSION_MAJOR >= 3
38
-  #include <kapplication.h>
35
+#include <tdeaction.h>
36
+#include <tdeaboutapplication.h>
37
+#if TDE_VERSION_MAJOR >= 3
38
+  #include <tdeapplication.h>
39 39
 #else
40 40
   #include <kapp.h>
41 41
 #endif
42 42
 #include <kiconloader.h>
43 43
 #include <kdebug.h>
44
-#include <kdeversion.h>
44
+#include <tdeversion.h>
45 45
 #include <ntqtooltip.h>
46 46
 #include <ntqstyle.h>
47 47
 #include <ntqpainter.h>
48 48
 
49 49
 #ifdef USE_BOLD_MENUITEM
50
-static TQColor getActiveTextColor(KPopupMenu *menu)
50
+static TQColor getActiveTextColor(TDEPopupMenu *menu)
51 51
 {
52 52
 	int id = menu->insertItem("test text");
53 53
 	TQMenuItem *item = menu->findItem(id);
54 54
 	TQStyleOption styleopt = TQStyleOption(item);
55 55
 	TQPainter painter(menu);
56 56
 	TQColorGroup &cg = menu->colorGroup();
57
-	KApplication::style().drawControl(TQStyle::CE_PopupMenuItem, &painter, menu,
57
+	TDEApplication::style().drawControl(TQStyle::CE_PopupMenuItem, &painter, menu,
58 58
 	  menu->contentsRect(), cg, TQStyle::Style_Enabled | TQStyle::Style_Active,
59 59
 	  styleopt);
60 60
 	menu->removeItem(id);
@@ -64,8 +64,8 @@ static TQColor getActiveTextColor(KPopupMenu *menu)
64 64
 
65 65
 KBSwitchTrayIcon::KBSwitchTrayIcon(KBConfig *conf){
66 66
   TQPixmap pix;
67
-#if KDE_VERSION_MAJOR >= 3
68
-  KActionCollection *actions = new KActionCollection(this);
67
+#if TDE_VERSION_MAJOR >= 3
68
+  TDEActionCollection *actions = new TDEActionCollection(this);
69 69
   #define ACTION_PARENT actions
70 70
 #else
71 71
   #define ACTION_PARENT this
@@ -73,21 +73,21 @@ KBSwitchTrayIcon::KBSwitchTrayIcon(KBConfig *conf){
73 73
 
74 74
   m_kbconf = conf;
75 75
   //TQObject::connect(conf, SIGNAL(changed()), this, SLOT(updateMenuIcons()));
76
-  KPopupMenu * menu = contextMenu();
76
+  TDEPopupMenu * menu = contextMenu();
77 77
   addLayoutItems(menu, false);
78 78
   TQObject::connect(menu, SIGNAL(activated(int)), this, SLOT(slotMenuActivated(int)));
79 79
 
80 80
   menu->insertSeparator();
81
-  KAction *pref = KStdAction::preferences(this, SIGNAL(preferencesSelected()), ACTION_PARENT);
81
+  TDEAction *pref = KStdAction::preferences(this, SIGNAL(preferencesSelected()), ACTION_PARENT);
82 82
   pref->plug(menu);
83
-  KAction *help = KStdAction::help(this, SLOT(slotHelp()), ACTION_PARENT);
83
+  TDEAction *help = KStdAction::help(this, SLOT(slotHelp()), ACTION_PARENT);
84 84
   help->plug(menu);
85
-  KAction *about = KStdAction::aboutApp(this, SLOT(slotAbout()), ACTION_PARENT);
85
+  TDEAction *about = KStdAction::aboutApp(this, SLOT(slotAbout()), ACTION_PARENT);
86 86
   about->plug(menu);
87 87
 
88 88
   /*TQString path = locate("icon", "hicolor/16x16/apps/locale.png");
89 89
   if (!path.isEmpty()) pix.load(path);*/
90
-  pix = kapp->iconLoader()->loadIcon("locale", KIcon::Small);
90
+  pix = kapp->iconLoader()->loadIcon("locale", TDEIcon::Small);
91 91
   menu->changeTitle(menu->idAt(0), pix, i18n("Keyboard Switch"));
92 92
   setAlignment(TQt::AlignHCenter | TQt::AlignCenter);
93 93
 }
@@ -103,7 +103,7 @@ void KBSwitchTrayIcon::slotMenuActivated(int id){
103 103
 /** No descriptions */
104 104
 void KBSwitchTrayIcon::setActiveGroup(int groupno){
105 105
   int i;
106
-  KPopupMenu *menu = contextMenu();
106
+  TDEPopupMenu *menu = contextMenu();
107 107
   for (i = 0; i < m_kbconf->groupCount(); i++)
108 108
     menu->setItemChecked(i, false);
109 109
   menu->setItemChecked(groupno, true);
@@ -113,7 +113,7 @@ void KBSwitchTrayIcon::setActiveGroup(int groupno){
113 113
 void KBSwitchTrayIcon::setToggleGroups(int group1, int group2){
114 114
   int i;
115 115
   bool toggling;
116
-  KPopupMenu *menu = contextMenu();
116
+  TDEPopupMenu *menu = contextMenu();
117 117
 
118 118
   for (i = 0; i < m_kbconf->groupCount(); i++) {
119 119
     toggling = (i == group1 || i == group2);
@@ -138,20 +138,20 @@ void KBSwitchTrayIcon::mouseReleaseEvent(TQMouseEvent *event){
138 138
 
139 139
 /** No descriptions */
140 140
 void KBSwitchTrayIcon::slotAbout(){
141
-  KAboutApplication about;
141
+  TDEAboutApplication about;
142 142
   about.exec();
143 143
 }
144 144
 
145 145
 /** No descriptions */
146 146
 void KBSwitchTrayIcon::updateMenuIcons(){
147
-  KPopupMenu *menu = contextMenu();
147
+  TDEPopupMenu *menu = contextMenu();
148 148
   for (int i = 0; i < m_kbconf->groupCount(); i++) {
149 149
     menu->changeItem(i, m_kbconf->getGroup(i)->getPixmap(), menu->text(i));
150 150
   }
151 151
 }
152 152
 
153 153
 /** No descriptions */
154
-void KBSwitchTrayIcon::addLayoutItems(KPopupMenu *menu, bool clearOld) {
154
+void KBSwitchTrayIcon::addLayoutItems(TDEPopupMenu *menu, bool clearOld) {
155 155
   KBGroup *group;
156 156
   int index;
157 157
 #ifdef USE_BOLD_MENUITEM

+ 1
- 1
kkbswitch/kbswitchtrayicon.h View File

@@ -62,7 +62,7 @@ public slots: // Public slots
62 62
   void slotUpdateIcons();
63 63
 private: // Private methods
64 64
   /** No descriptions */
65
-  void addLayoutItems(KPopupMenu *menu, bool clearOld);
65
+  void addLayoutItems(TDEPopupMenu *menu, bool clearOld);
66 66
   /** No descriptions */
67 67
   void updateMenuIcons();
68 68
   /** No descriptions */

+ 5
- 5
kkbswitch/kkbswitch.desktop View File

@@ -8,8 +8,8 @@ DocPath=kkbswitch/index.html
8 8
 Comment=Keyboard Layout Indicator
9 9
 Comment[ru]=Индикатор раскладки клавиатуры
10 10
 Comment[uk]=Індикатор розкладки клавіатури
11
-X-KDE-autostart-after=panel
12
-X-KDE-autostart-condition=kkbswitchrc:Options:autostart:true
13
-X-KDE-autostart-phase=2
14
-X-KDE-StartupNotify=false
15
-Categories=Qt;KDE;Utility;
11
+X-TDE-autostart-after=panel
12
+X-TDE-autostart-condition=kkbswitchrc:Options:autostart:true
13
+X-TDE-autostart-phase=2
14
+X-TDE-StartupNotify=false
15
+Categories=Qt;TDE;Utility;

+ 8
- 8
kkbswitch/main.cpp View File

@@ -15,9 +15,9 @@
15 15
  *                                                                         *
16 16
  ***************************************************************************/
17 17
 
18
-#include <kcmdlineargs.h>
19
-#include <kaboutdata.h>
20
-#include <klocale.h>
18
+#include <tdecmdlineargs.h>
19
+#include <tdeaboutdata.h>
20
+#include <tdelocale.h>
21 21
 #include <stdlib.h>
22 22
 
23 23
 //#include "kkbswitch.h"
@@ -28,7 +28,7 @@ static const char *description =
28 28
 // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
29 29
 	
30 30
 	
31
-static KCmdLineOptions options[] =
31
+static TDECmdLineOptions options[] =
32 32
 {
33 33
   { 0, 0, 0 }
34 34
   // INSERT YOUR COMMANDLINE OPTIONS HERE
@@ -38,8 +38,8 @@ static KCmdLineOptions options[] =
38 38
 int main(int argc, char *argv[])
39 39
 {
40 40
 
41
-  KAboutData aboutData( "kkbswitch", I18N_NOOP("Keyboard Switch"),
42
-    VERSION, description, KAboutData::License_GPL,
41
+  TDEAboutData aboutData( "kkbswitch", I18N_NOOP("Keyboard Switch"),
42
+    VERSION, description, TDEAboutData::License_GPL,
43 43
     "(c) 2001-2005 Leonid Zeitlin", 0, 0, "lz@europe.com");
44 44
   aboutData.addAuthor("Leonid Zeitlin", I18N_NOOP("Creator and maintainer"), "lz@europe.com");
45 45
   aboutData.addCredit("Mikhail Senin", I18N_NOOP("Default group config and per-window groups"),
@@ -50,8 +50,8 @@ int main(int argc, char *argv[])
50 50
   aboutData.addCredit("Sergey V Turchin", I18N_NOOP("Autostart patch"),"zerg@altlinux.org");
51 51
   aboutData.addCredit("Stergios Dramis", I18N_NOOP("Greek translation"), "sdramis@egnatia.ee.auth.gr");
52 52
   aboutData.addCredit("Michal Sulek", I18N_NOOP("Slovak translation"), "reloadshot@atlas.sk");
53
-  KCmdLineArgs::init( argc, argv, &aboutData );
54
-  KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
53
+  TDECmdLineArgs::init( argc, argv, &aboutData );
54
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
55 55
 
56 56
   if (!KUniqueApplication::start()) // starting a second instance - just exit
57 57
     exit(0);

+ 2
- 2
kkbswitch/singlewindowwatcher.cpp View File

@@ -20,7 +20,7 @@
20 20
 #include "singlewindowwatcher.h"
21 21
 #include "kbconfig.h"
22 22
 
23
-#include <kwinmodule.h>
23
+#include <twinmodule.h>
24 24
 #include <kdebug.h>
25 25
 
26 26
 SingleWindowWatcher::SingleWindowWatcher(KBConfig *kbconf, TQObject *parent, const char *name)
@@ -66,7 +66,7 @@ void SingleWindowWatcher::changeGroup(int groupno, int next_groupno)
66 66
 void SingleWindowWatcher::reset()
67 67
 {
68 68
   m_window_map.clear();
69
-  WId active_window = m_kwin_module->activeWindow();
69
+  WId active_window = m_twin_module->activeWindow();
70 70
   if (active_window)
71 71
     addWindowToMap(active_window);
72 72
   else m_active_window = m_window_map.end();

+ 3
- 3
kkbswitch/windowclasswatcher.cpp View File

@@ -20,7 +20,7 @@
20 20
 #include "windowclasswatcher.h"
21 21
 #include "kbconfig.h"
22 22
 
23
-#include <kwinmodule.h>
23
+#include <twinmodule.h>
24 24
 #include <kdebug.h>
25 25
 
26 26
 #include <X11/Xutil.h>
@@ -93,12 +93,12 @@ void WindowClassWatcher::reset()
93 93
   m_class_group_map.clear();
94 94
 
95 95
   // fill the map with existing windows  
96
-  const TQValueList<WId> windows = m_kwin_module->windows();
96
+  const TQValueList<WId> windows = m_twin_module->windows();
97 97
   const TQValueList<WId>::ConstIterator end = windows.end();
98 98
   for (TQValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it)
99 99
      windowAdded(*it);
100 100
   
101
-  WId active_window = m_kwin_module->activeWindow();
101
+  WId active_window = m_twin_module->activeWindow();
102 102
   if (active_window) 
103 103
     m_active_class = m_class_group_map.find(m_win_class_map[active_window]);
104 104
   else m_active_class = m_class_group_map.end();

+ 5
- 5
kkbswitch/windowwatcher.cpp View File

@@ -19,16 +19,16 @@
19 19
  ***************************************************************************/
20 20
 #include "windowwatcher.h"
21 21
 
22
-#include <kwinmodule.h>
22
+#include <twinmodule.h>
23 23
 
24 24
 WindowWatcher::WindowWatcher(KBConfig *kbconf, TQObject *parent, const char *name)
25 25
  : TQObject(parent, name)
26 26
 {
27 27
   m_kbconf = kbconf;
28
-  m_kwin_module = new KWinModule(this);
29
-  connect(m_kwin_module, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)));
30
-  connect(m_kwin_module, SIGNAL(windowRemoved(WId)), SLOT(windowRemoved(WId)));
31
-  connect(m_kwin_module, SIGNAL(activeWindowChanged(WId)), SLOT(activeWindowChanged(WId)));
28
+  m_twin_module = new KWinModule(this);
29
+  connect(m_twin_module, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)));
30
+  connect(m_twin_module, SIGNAL(windowRemoved(WId)), SLOT(windowRemoved(WId)));
31
+  connect(m_twin_module, SIGNAL(activeWindowChanged(WId)), SLOT(activeWindowChanged(WId)));
32 32
 }
33 33
 
34 34
 WindowWatcher::~WindowWatcher()

+ 1
- 1
kkbswitch/windowwatcher.h View File

@@ -36,7 +36,7 @@ class WindowWatcher : public TQObject {
36 36
   Q_OBJECT
37 37
 protected:
38 38
   KBConfig *m_kbconf;
39
-  KWinModule *m_kwin_module;
39
+  KWinModule *m_twin_module;
40 40
 protected slots:    
41 41
   virtual void windowAdded(WId id) = 0;
42 42
   virtual void windowRemoved(WId id) = 0;

+ 1
- 1
kkbswitch/xkeyboard.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <ntqstringlist.h>
22 22
 
23 23
 #include <kdebug.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 
26 26
 XKeyboard *XKeyboard::m_self = 0;
27 27
 

Loading…
Cancel
Save