Browse Source

Additional KDE3 => TDE conversion

tags/r14.0.0
Slávek Banko 5 years ago
parent
commit
272d7c3f5b

+ 1
- 1
ChangeLog View File

@@ -2,7 +2,7 @@
2 2
 ===
3 3
 
4 4
 * If root-only options are selected by a 'normal' user,
5
-  the 'kdesu' facility is envoked to run nmap as root
5
+  the 'tdesu' facility is envoked to run nmap as root
6 6
 
7 7
 * Previously all nmap output was "wrapped", this is now
8 8
   an option. The default is to wrap long lines.

+ 115
- 115
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
@@ -4545,15 +4545,15 @@ pushdef([AC_PROG_INSTALL],
4545 4545
   fi
4546 4546
 ])dnl
4547 4547
 
4548
-AC_DEFUN([KDE_LANG_CPLUSPLUS],
4548
+AC_DEFUN([TDE_LANG_CPLUSPLUS],
4549 4549
 [AC_LANG_CPLUSPLUS
4550 4550
 ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
4551
-pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
4551
+pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) TDE_LANG_CPLUSPLUS])
4552 4552
 ])
4553 4553
 
4554 4554
 pushdef([AC_LANG_CPLUSPLUS],
4555 4555
 [popdef([AC_LANG_CPLUSPLUS])
4556
-KDE_LANG_CPLUSPLUS
4556
+TDE_LANG_CPLUSPLUS
4557 4557
 ])
4558 4558
 
4559 4559
 AC_DEFUN([KDE_CHECK_LONG_LONG],
@@ -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

+ 1
- 1
doc/Makefile.am View File

@@ -1,6 +1,6 @@
1 1
 # the SUBDIRS is filled automatically by am_edit. If files are 
2 2
 # in this directory they are installed into the english dir
3 3
 
4
-KDE_LANG = en
4
+TDE_LANG = en
5 5
 KDE_DOCS = knmap
6 6
 SUBDIRS = $(AUTODIRS)  

+ 1
- 1
doc/en/Makefile.am View File

@@ -1,3 +1,3 @@
1 1
 KDE_DOCS = knmap
2
-KDE_LANG = en
2
+TDE_LANG = en
3 3
 kde_docs_KDEDOCS = new_scan.png

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

@@ -3,7 +3,7 @@
3 3
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
4 4
   <!ENTITY knmap "<application>Knmap</application>">
5 5
   <!ENTITY kappname "&knmap;">
6
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
6
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
7 7
   <!ENTITY % addindex "IGNORE">
8 8
   <!ENTITY % English "INCLUDE">
9 9
 ]>
@@ -62,7 +62,7 @@
62 62
 	</para>
63 63
 
64 64
 	<para>
65
-	Version 1.0 of &knmap; was merely a re-write of the original. Version 2.0 adds the extra functionality of multiple concurrent <computeroutput>nmap</computeroutput> scans from within the one instance of &knmap;. Version 2.1 allows a normal (non-root) user to use the privileged nmap functions via to 'kdesu' utility. (Previously, the privileged options were only available if &knmap; was run by root.)
65
+	Version 1.0 of &knmap; was merely a re-write of the original. Version 2.0 adds the extra functionality of multiple concurrent <computeroutput>nmap</computeroutput> scans from within the one instance of &knmap;. Version 2.1 allows a normal (non-root) user to use the privileged nmap functions via to 'tdesu' utility. (Previously, the privileged options were only available if &knmap; was run by root.)
66 66
 	</para>
67 67
 </chapter>
68 68
 
@@ -254,7 +254,7 @@
254 254
 				</mediaobject>
255 255
 			</screenshot>
256 256
 	
257
-		This screenshot shows those <computeroutput>nmap</computeroutput> options that require a value. The associated input area is activated when the option is activated. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'kdesu' facility will be invoked to run nmap as the super user.
257
+		This screenshot shows those <computeroutput>nmap</computeroutput> options that require a value. The associated input area is activated when the option is activated. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'tdesu' facility will be invoked to run nmap as the super user.
258 258
 		</para>
259 259
 	</sect1>
260 260
 
@@ -303,7 +303,7 @@
303 303
 				</mediaobject>
304 304
 			</screenshot>
305 305
 	
306
-		This screenshot shows the <computeroutput>nmap</computeroutput> options that control the types of ping and scans that will be performed. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'kdesu' facility will be invoked to run nmap as the super user.
306
+		This screenshot shows the <computeroutput>nmap</computeroutput> options that control the types of ping and scans that will be performed. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'tdesu' facility will be invoked to run nmap as the super user.
307 307
 		</para>
308 308
 	</sect1>
309 309
 
@@ -318,7 +318,7 @@
318 318
 				</mediaobject>
319 319
 			</screenshot>
320 320
 	
321
-		This screenshot shows the boolean <computeroutput>nmap</computeroutput> options, i.e., those options that do not require a value. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'kdesu' facility will be invoked to run nmap as the super user.
321
+		This screenshot shows the boolean <computeroutput>nmap</computeroutput> options, i.e., those options that do not require a value. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'tdesu' facility will be invoked to run nmap as the super user.
322 322
 		</para>
323 323
 	</sect1>
324 324
 

+ 1
- 1
src/Makefile.am View File

@@ -31,7 +31,7 @@ knmap_SOURCES = main.cpp knmap.cpp mainwidget.cpp outputwidget.cpp \
31 31
 					tabwidgetptrlist.cpp tabwidgetdata.cpp scanwidget.cpp indexwidget.cpp scannamedialog.cpp \
32 32
 			scanstack.cpp scanmonitor.cpp scanmonitorevent.cpp nmapoutputbuffer.cpp
33 33
 knmap_LDFLAGS = $(TDE_RPATH) $(all_libraries)
34
-knmap_LDADD = $(LIB_KIO) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
34
+knmap_LDADD = $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
35 35
 
36 36
 # this is where the desktop file will go 
37 37
 shelldesktopdir   = $(kde_appsdir)/Utilities

+ 1
- 1
src/commonwidget.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <tdeglobal.h>
38 38
 #include <kiconloader.h>
39 39
 #include <tdelocale.h>
40
-#include <kmessagebox.h>
40
+#include <tdemessagebox.h>
41 41
 
42 42
 #include "commonwidget.h"
43 43
 #include "whatsthis.h"

+ 1
- 1
src/compoundwidget.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <tdeglobal.h>
34 34
 #include <kiconloader.h>
35 35
 #include <tdelocale.h>
36
-#include <kmessagebox.h>
36
+#include <tdemessagebox.h>
37 37
 
38 38
 #include "compoundwidget.h"
39 39
 #include "knmap.h"

+ 5
- 5
src/htmlwidget.cpp View File

@@ -23,13 +23,13 @@
23 23
 #include <ntqfile.h>
24 24
 #include <ntqtextstream.h>
25 25
 
26
-#include <kapplication.h>
26
+#include <tdeapplication.h>
27 27
 #include <tdeconfig.h>
28 28
 #include <kdebug.h>
29
-#include <khtml_part.h>
30
-#include <khtmlview.h>
29
+#include <tdehtml_part.h>
30
+#include <tdehtmlview.h>
31 31
 #include <tdelocale.h>
32
-#include <kmessagebox.h>
32
+#include <tdemessagebox.h>
33 33
 #include <kprocess.h>
34 34
 #include <kstandarddirs.h>
35 35
 
@@ -48,7 +48,7 @@ HTMLWidget::HTMLWidget( TQStringList* stylesheetURLs, TQWidget* parent, const ch
48 48
   m_process( NULL ),
49 49
   m_stylesheetURLs( stylesheetURLs ),
50 50
   m_zoomFactor( 100 )
51
-{	m_htmlPart = new KHTMLPart( this, "html part" );
51
+{	m_htmlPart = new TDEHTMLPart( this, "html part" );
52 52
 	m_htmlPart->setOnlyLocalReferences( true );
53 53
 }
54 54
 

+ 2
- 2
src/htmlwidget.h View File

@@ -35,7 +35,7 @@
35 35
 //	forward class definitions
36 36
 //	=========================
37 37
 
38
-class KHTMLPart;
38
+class TDEHTMLPart;
39 39
 class TDEProcess;
40 40
 class StylesheetDialog;
41 41
 
@@ -82,7 +82,7 @@ class HTMLWidget : public TQWidget
82 82
 
83 83
 		StylesheetDialog*  m_dlg;
84 84
 		TQString            m_htmlData;
85
-		KHTMLPart*         m_htmlPart;
85
+		TDEHTMLPart*         m_htmlPart;
86 86
 		TQString            m_manPageData;
87 87
 		TQString            m_manPagePath;
88 88
 		TDEProcess*          m_process;

+ 2
- 2
src/indexwidget.cpp View File

@@ -26,11 +26,11 @@
26 26
 #include <ntqpopupmenu.h>
27 27
 #include <ntqtimer.h>
28 28
 
29
-#include <kapplication.h>
29
+#include <tdeapplication.h>
30 30
 #include <tdeconfig.h>
31 31
 #include <kdebug.h>
32 32
 #include <tdeglobal.h>
33
-#include <kglobalsettings.h>
33
+#include <tdeglobalsettings.h>
34 34
 #include <kiconloader.h>
35 35
 #include <tdelocale.h>
36 36
 

+ 24
- 24
src/knmap.cpp View File

@@ -23,18 +23,18 @@
23 23
 #include <ntqdir.h>
24 24
 #include <ntqlineedit.h>
25 25
 
26
-#include <kaction.h>
27
-#include <kapplication.h>
26
+#include <tdeaction.h>
27
+#include <tdeapplication.h>
28 28
 #include <tdeconfig.h>
29 29
 #include <kdebug.h>
30 30
 #include <kedittoolbar.h>
31
-#include <kfiledialog.h>
32
-#include <kglobalsettings.h>
31
+#include <tdefiledialog.h>
32
+#include <tdeglobalsettings.h>
33 33
 #include <kinputdialog.h>
34 34
 #include <kkeydialog.h>
35 35
 #include <tdelocale.h>
36 36
 #include <tdemainwindow.h>
37
-#include <kmessagebox.h>
37
+#include <tdemessagebox.h>
38 38
 #include <kstandarddirs.h>
39 39
 #include <kstatusbar.h>
40 40
 #include <kstdaction.h>
@@ -93,7 +93,7 @@ void Knmap::createMenu( )
93 93
 											 SLOT( slotFileSaveAs( )),
94 94
 											 actionCollection( ));
95 95
 
96
-	m_settingsManAction = new KAction( i18n( "&Use local man page" ),
96
+	m_settingsManAction = new TDEAction( i18n( "&Use local man page" ),
97 97
 										"localman.png",
98 98
 										0,
99 99
 										m_mainWidget,
@@ -101,7 +101,7 @@ void Knmap::createMenu( )
101 101
 										actionCollection( ),
102 102
 										"settings_local" );
103 103
 
104
-	m_useTargetHostAction = new KToggleAction( i18n( "Use target host name" ),
104
+	m_useTargetHostAction = new TDEToggleAction( i18n( "Use target host name" ),
105 105
 											   NULL,
106 106
 											   0,
107 107
 											   m_mainWidget,
@@ -109,7 +109,7 @@ void Knmap::createMenu( )
109 109
 											   actionCollection( ),
110 110
 											   "scan_use" );
111 111
 
112
-	m_wrapTextAction = new KToggleAction( i18n( "Wrap text" ),
112
+	m_wrapTextAction = new TDEToggleAction( i18n( "Wrap text" ),
113 113
 										  NULL,
114 114
 										  0,
115 115
 										  m_mainWidget,
@@ -117,7 +117,7 @@ void Knmap::createMenu( )
117 117
 										  actionCollection( ),
118 118
 										  "settings_wrap_text" );
119 119
 
120
-	new KAction( i18n( "Close scan" ),
120
+	new TDEAction( i18n( "Close scan" ),
121 121
 				 "scanclose",
122 122
 				 CTRL+Key_W,
123 123
 				 m_mainWidget,
@@ -125,7 +125,7 @@ void Knmap::createMenu( )
125 125
 				 actionCollection( ),
126 126
 				 "scan_close" );
127 127
 
128
-	new KAction( i18n( "Copy profile..." ),
128
+	new TDEAction( i18n( "Copy profile..." ),
129 129
 				 "profilecopy",
130 130
 				 0,
131 131
 				 m_mainWidget,
@@ -133,7 +133,7 @@ void Knmap::createMenu( )
133 133
 				 actionCollection( ),
134 134
 				 "profile_copy" );
135 135
 
136
-	new KAction( i18n( "Delete profile..." ),
136
+	new TDEAction( i18n( "Delete profile..." ),
137 137
 				 "profiledelete",
138 138
 				 0,
139 139
 				 m_mainWidget,
@@ -141,7 +141,7 @@ void Knmap::createMenu( )
141 141
 				 actionCollection( ),
142 142
 				 "profile_delete" );
143 143
 
144
-	new KAction( i18n( "Display nmap man page" ),
144
+	new TDEAction( i18n( "Display nmap man page" ),
145 145
 				 "manpage",
146 146
 				 0,
147 147
 				 m_mainWidget,
@@ -149,7 +149,7 @@ void Knmap::createMenu( )
149 149
 				 actionCollection( ),
150 150
 				 "help_man_page" );
151 151
 
152
-	new KAction( i18n( "Duplicate scan" ),
152
+	new TDEAction( i18n( "Duplicate scan" ),
153 153
 				 "scanduplicate",
154 154
 				 CTRL+Key_C,
155 155
 				 m_mainWidget,
@@ -157,7 +157,7 @@ void Knmap::createMenu( )
157 157
 				 actionCollection( ),
158 158
 				 "scan_duplicate" );
159 159
 
160
-	new KAction( i18n( "Load profile..." ),
160
+	new TDEAction( i18n( "Load profile..." ),
161 161
 				 "profileload",
162 162
 				 0,
163 163
 				 m_mainWidget,
@@ -165,7 +165,7 @@ void Knmap::createMenu( )
165 165
 				 actionCollection( ),
166 166
 				 "profile_load" );
167 167
 
168
-	new KAction( i18n( "man page stylesheet..." ),
168
+	new TDEAction( i18n( "man page stylesheet..." ),
169 169
 				 "manstylesheet",
170 170
 				 0,
171 171
 				 m_mainWidget,
@@ -173,7 +173,7 @@ void Knmap::createMenu( )
173 173
 				 actionCollection( ),
174 174
 				 "settings_stylesheet" );
175 175
 
176
-	new KAction( i18n( "New scan..." ),
176
+	new TDEAction( i18n( "New scan..." ),
177 177
 				 "scannew",
178 178
 				 CTRL+Key_N,
179 179
 				 m_mainWidget,
@@ -181,7 +181,7 @@ void Knmap::createMenu( )
181 181
 				 actionCollection( ),
182 182
 				 "scan_new" );
183 183
 
184
-	new KAction( i18n( "Rename profile..." ),
184
+	new TDEAction( i18n( "Rename profile..." ),
185 185
 				 "profilerename",
186 186
 				 0,
187 187
 				 m_mainWidget,
@@ -189,7 +189,7 @@ void Knmap::createMenu( )
189 189
 				 actionCollection( ),
190 190
 				 "profile_rename" );
191 191
 
192
-	new KAction( i18n( "Rename scan..." ),
192
+	new TDEAction( i18n( "Rename scan..." ),
193 193
 				 "scanrename",
194 194
 				 Key_F2,
195 195
 				 m_mainWidget,
@@ -197,7 +197,7 @@ void Knmap::createMenu( )
197 197
 				 actionCollection( ),
198 198
 				 "scan_rename" );
199 199
 
200
-	new KAction( i18n( "Save profile..." ),
200
+	new TDEAction( i18n( "Save profile..." ),
201 201
 				 "profilesave",
202 202
 				 0,
203 203
 				 m_mainWidget,
@@ -205,7 +205,7 @@ void Knmap::createMenu( )
205 205
 				 actionCollection( ),
206 206
 				 "profile_save" );
207 207
 
208
-	new KAction( i18n( "Save profile as..." ),
208
+	new TDEAction( i18n( "Save profile as..." ),
209 209
 				 "profilesaveas",
210 210
 				 0,
211 211
 				 m_mainWidget,
@@ -213,7 +213,7 @@ void Knmap::createMenu( )
213 213
 				 actionCollection( ),
214 214
 				 "profile_save_as" );
215 215
 
216
-	new KAction( i18n( "Zoom custom"  ),
216
+	new TDEAction( i18n( "Zoom custom"  ),
217 217
 				 "zoomcustom",
218 218
 				 0,
219 219
 				 m_mainWidget,
@@ -221,7 +221,7 @@ void Knmap::createMenu( )
221 221
 				 actionCollection( ),
222 222
 				 "settings_zoom_custom"  );
223 223
 
224
-	new KAction( i18n( "Zoom in"  ),
224
+	new TDEAction( i18n( "Zoom in"  ),
225 225
 				 "zoomin",
226 226
 				 0,
227 227
 				 m_mainWidget,
@@ -229,7 +229,7 @@ void Knmap::createMenu( )
229 229
 				 actionCollection( ),
230 230
 				 "settings_zoom_in"  );
231 231
 
232
-	new KAction( i18n( "Zoom out" ),
232
+	new TDEAction( i18n( "Zoom out" ),
233 233
 				 "zoomout",
234 234
 				 0,
235 235
 				 m_mainWidget,
@@ -255,7 +255,7 @@ void Knmap::createMenu( )
255 255
 //	========
256 256
 
257 257
 void Knmap::findNmap( )
258
-{	TQString nmapPath = KStandardDirs::findExe( "nmap" );
258
+{	TQString nmapPath = TDEStandardDirs::findExe( "nmap" );
259 259
 
260 260
 	if( nmapPath.isEmpty( ))
261 261
 	{	KMessageBox::error( this,

+ 1
- 1
src/knmap.desktop View File

@@ -39,4 +39,4 @@ Comment[xx]=xxA simple KDE Applicationxx
39 39
 Comment[zh_CN]=一个简单的 KDE 应用程序
40 40
 GenericName=nmap Graphical User Interface
41 41
 GenericName[fr]=Interface Graphique pour nmap
42
-Categories=Qt;KDE;Utility
42
+Categories=Qt;TDE;Utility

+ 7
- 7
src/knmap.h View File

@@ -34,8 +34,8 @@
34 34
 //	forward class definitions
35 35
 //	=========================
36 36
 
37
-class KAction;
38
-class KToggleAction;
37
+class TDEAction;
38
+class TDEToggleAction;
39 39
 class MainWidget;
40 40
 class ScanWidget;
41 41
 
@@ -70,12 +70,12 @@ class Knmap : public TDEMainWindow
70 70
 		void saveSettings( );
71 71
 		void switchManPages( );
72 72
 
73
-		KAction*       m_fileSaveAction;
74
-		KAction*       m_fileSaveAsAction;
73
+		TDEAction*       m_fileSaveAction;
74
+		TDEAction*       m_fileSaveAsAction;
75 75
 		MainWidget*    m_mainWidget;
76
-		KAction*       m_settingsManAction;
77
-		KToggleAction* m_useTargetHostAction;
78
-		KToggleAction* m_wrapTextAction;
76
+		TDEAction*       m_settingsManAction;
77
+		TDEToggleAction* m_useTargetHostAction;
78
+		TDEToggleAction* m_wrapTextAction;
79 79
 };
80 80
 
81 81
 #endif // _KNMAP_H_

+ 1
- 1
src/loggingoptions.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <kiconloader.h>
33 33
 #include <kinputdialog.h>
34 34
 #include <tdelocale.h>
35
-#include <kmessagebox.h>
35
+#include <tdemessagebox.h>
36 36
 
37 37
 #include "knmap.h"
38 38
 #include "loggingoptions.h"

+ 3
- 3
src/main.cpp View File

@@ -21,7 +21,7 @@
21 21
  ***************************************************************************/
22 22
 
23 23
 #include <tdeaboutdata.h>
24
-#include <kapplication.h>
24
+#include <tdeapplication.h>
25 25
 #include <tdecmdlineargs.h>
26 26
 #include <kdebug.h>
27 27
 #include <tdelocale.h>
@@ -30,7 +30,7 @@
30 30
 #include "knmap.h"
31 31
 
32 32
 static const char      description[] = I18N_NOOP( "A KDE frontend for nmap" );
33
-static TDECmdLineOptions options[]     = { KCmdLineLastOption };
33
+static TDECmdLineOptions options[]     = { TDECmdLineLastOption };
34 34
 
35 35
 //	main
36 36
 //	====
@@ -61,7 +61,7 @@ int main( int argc, string argv[])
61 61
 					 "http://informatics.cdu.edu.au/staff/kgilbert" );
62 62
 	TDECmdLineArgs::init( argc, argv, &about );
63 63
 	TDECmdLineArgs::addCmdLineOptions( options );
64
-	KApplication app;
64
+	TDEApplication app;
65 65
 
66 66
 	if( app.isRestored( ))
67 67
 	{	RESTORE( Knmap );

+ 2
- 2
src/mainwidget.cpp View File

@@ -22,12 +22,12 @@
22 22
 
23 23
 #include <ntqtimer.h>
24 24
 
25
-#include <kapplication.h>
25
+#include <tdeapplication.h>
26 26
 #include <tdeconfig.h>
27 27
 #include <kdebug.h>
28 28
 #include <kinputdialog.h>
29 29
 #include <tdelocale.h>
30
-#include <kmessagebox.h>
30
+#include <tdemessagebox.h>
31 31
 
32 32
 #include "htmlwidget.h"
33 33
 #include "indexwidget.h"

+ 1
- 1
src/outputwidget.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tdeconfig.h>
27 27
 #include <kdebug.h>
28 28
 #include <tdelocale.h>
29
-#include <kmessagebox.h>
29
+#include <tdemessagebox.h>
30 30
 
31 31
 #include "knmap.h"
32 32
 #include "outputwidget.h"

+ 1
- 1
src/pandsoptions.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <kdebug.h>
30 30
 #include <tdeglobal.h>
31 31
 #include <tdelocale.h>
32
-#include <kmessagebox.h>
32
+#include <tdemessagebox.h>
33 33
 
34 34
 #include "pandsoptions.h"
35 35
 #include "whatsthis.h"

+ 2
- 2
src/profiledialog.cpp View File

@@ -27,12 +27,12 @@
27 27
 #include <ntqmap.h>
28 28
 #include <ntqpopupmenu.h>
29 29
 
30
-#include <kapplication.h>
30
+#include <tdeapplication.h>
31 31
 #include <tdeconfig.h>
32 32
 #include <kdebug.h>
33 33
 #include <kinputdialog.h>
34 34
 #include <tdelocale.h>
35
-#include <kmessagebox.h>
35
+#include <tdemessagebox.h>
36 36
 
37 37
 #include "profiledialog.h"
38 38
 

+ 1
- 1
src/scannamedialog.cpp View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 #include <kdebug.h>
29 29
 #include <tdelocale.h>
30
-#include <kmessagebox.h>
30
+#include <tdemessagebox.h>
31 31
 
32 32
 #include "scannamedialog.h"
33 33
 #include "scanwidget.h"

+ 5
- 5
src/scanwidget.cpp View File

@@ -34,11 +34,11 @@
34 34
 #include <ntqstringlist.h>
35 35
 #include <ntqtimer.h>
36 36
 
37
-#include <kapplication.h>
37
+#include <tdeapplication.h>
38 38
 #include <tdeconfig.h>
39 39
 #include <kdebug.h>
40 40
 #include <tdelocale.h>
41
-#include <kmessagebox.h>
41
+#include <tdemessagebox.h>
42 42
 #include <kprocess.h>
43 43
 #include <kstandarddirs.h>
44 44
 #include <ktabwidget.h>
@@ -120,7 +120,7 @@ ScanWidget::~ScanWidget( )
120 120
 
121 121
 TQStringList ScanWidget::buildNmapOptionsList( )
122 122
 {	TQStringList nmapOptions;
123
-	nmapOptions << KStandardDirs::findExe ( "nmap" );
123
+	nmapOptions << TDEStandardDirs::findExe ( "nmap" );
124 124
 
125 125
 	if( m_commonWidget->resovleAlwaysState( ))
126 126
 		nmapOptions << "-R";
@@ -509,7 +509,7 @@ bool ScanWidget::createPipes( )
509 509
 {	ASSERT( m_pipeStderr == NULL );
510 510
 	ASSERT( m_pipeStdout == NULL );
511 511
 
512
-	KStandardDirs standardDirs;
512
+	TDEStandardDirs standardDirs;
513 513
 	TQStringList tempDir = standardDirs.resourceDirs( "tmp" );
514 514
 
515 515
 	if( tempDir.isEmpty( ))
@@ -969,7 +969,7 @@ void ScanWidget::slotStartClicked( )
969 969
 		nmapOptions << "2>";
970 970
 		nmapOptions << m_pipeStderr->name( );
971 971
 
972
-		*m_nmapProcess << "kdesu";
972
+		*m_nmapProcess << "tdesu";
973 973
 		*m_nmapProcess << "-n";
974 974
 		*m_nmapProcess << nmapOptions.join( " " );
975 975
 	}

+ 3
- 3
src/stylesheetdialog.cpp View File

@@ -30,11 +30,11 @@
30 30
 #include <ntqstringlist.h>
31 31
 
32 32
 #include <kdebug.h>
33
-#include <kfiledialog.h>
34
-#include <kglobalsettings.h>
33
+#include <tdefiledialog.h>
34
+#include <tdeglobalsettings.h>
35 35
 #include <kiconloader.h>
36 36
 #include <tdelocale.h>
37
-#include <kmessagebox.h>
37
+#include <tdemessagebox.h>
38 38
 
39 39
 #include "stylesheetdialog.h"
40 40
 

+ 1
- 1
src/timingwidget.cpp View File

@@ -34,7 +34,7 @@
34 34
 #include <tdeglobal.h>
35 35
 #include <kiconloader.h>
36 36
 #include <tdelocale.h>
37
-#include <kmessagebox.h>
37
+#include <tdemessagebox.h>
38 38
 
39 39
 #include "timingwidget.h"
40 40
 #include "whatsthis.h"

Loading…
Cancel
Save