diff options
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | kdiff3plugin/po/Makefile | 2 | ||||
| -rw-r--r-- | po/lt.po | 22 | ||||
| -rw-r--r-- | src/difftextwindow.cpp | 2 | ||||
| -rw-r--r-- | src/directorymergewindow.cpp | 2 | ||||
| -rw-r--r-- | src/fileaccess.cpp | 2 | ||||
| -rw-r--r-- | src/fileaccess.h | 4 | ||||
| -rw-r--r-- | src/kdiff3.cpp | 4 | ||||
| -rw-r--r-- | src/kdiff3_part.cpp | 2 | ||||
| -rw-r--r-- | src/kdiff3_shell.cpp | 4 | ||||
| -rw-r--r-- | src/kreplacements/tdeconfig.h (renamed from src/kreplacements/kconfig.h) | 0 | ||||
| -rw-r--r-- | src/kreplacements/tdefiledialog.h (renamed from src/kreplacements/kfiledialog.h) | 0 | ||||
| -rw-r--r-- | src/optiondialog.cpp | 2 | ||||
| -rw-r--r-- | src/smalldialogs.cpp | 2 |
14 files changed, 28 insertions, 28 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d48f730..bbfb8c4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile index 8da8a5b..65a2359 100644 --- a/kdiff3plugin/po/Makefile +++ b/kdiff3plugin/po/Makefile @@ -100,7 +100,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG) INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) -KCONFIG_COMPILER = /usr/bin/kconfig_compiler +KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler KDECONFIG = /usr/bin/tde-config KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_EXTRA_RPATH = @@ -129,7 +129,7 @@ msgstr "" "Pavadinimas\n" "#-#-#-#-# kcminput.po (kcminput) #-#-#-#-#\n" "Vardas\n" -"#-#-#-#-# knetworkconf.po (knetworkconf) #-#-#-#-#\n" +"#-#-#-#-# knetwortdeconf.po (knetwortdeconf) #-#-#-#-#\n" "Vardas\n" "#-#-#-#-# kio_print.po (kio_print) #-#-#-#-#\n" "Pavadinimas\n" @@ -145,15 +145,15 @@ msgstr "" "Vardas\n" "#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" "Vardas\n" -"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n" +"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n" "Vardas\n" "#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" "Vardas\n" "#-#-#-#-# ksysv.po (ksysv) #-#-#-#-#\n" "Pavadinimas\n" -"#-#-#-#-# kfile_rpm.po (kfile_rpm) #-#-#-#-#\n" +"#-#-#-#-# tdefile_rpm.po (tdefile_rpm) #-#-#-#-#\n" "Pavadinimas\n" -"#-#-#-#-# kfile_deb.po (kfile_deb) #-#-#-#-#\n" +"#-#-#-#-# tdefile_deb.po (tdefile_deb) #-#-#-#-#\n" "Pavadinimas\n" "#-#-#-#-# kmahjongg.po (kmahjongg) #-#-#-#-#\n" "Vardas\n" @@ -179,7 +179,7 @@ msgstr "" "Vardas\n" "#-#-#-#-# knode.po (knode) #-#-#-#-#\n" "Vardas\n" -"#-#-#-#-# kfile_vcf.po (kfile_vcf) #-#-#-#-#\n" +"#-#-#-#-# tdefile_vcf.po (tdefile_vcf) #-#-#-#-#\n" "Vardas\n" "#-#-#-#-# kontact.po (kontact) #-#-#-#-#\n" "Vardas\n" @@ -203,7 +203,7 @@ msgstr "" "Vardas\n" "#-#-#-#-# nexscope.po (nexscope) #-#-#-#-#\n" "Vardas\n" -"#-#-#-#-# kfile_desktop.po (kfile_desktop) #-#-#-#-#\n" +"#-#-#-#-# tdefile_desktop.po (tdefile_desktop) #-#-#-#-#\n" "Vardas\n" "#-#-#-#-# domtreeviewer.po (domtreeviewer) #-#-#-#-#\n" "Vardas\n" @@ -217,9 +217,9 @@ msgstr "" "Pavadinimas\n" "#-#-#-#-# kget.po (kget) #-#-#-#-#\n" "Vardas\n" -"#-#-#-#-# kfileshare.po (kfileshare) #-#-#-#-#\n" +"#-#-#-#-# tdefileshare.po (tdefileshare) #-#-#-#-#\n" "Vardas\n" -"#-#-#-#-# kfile_torrent.po (kfile_torrent) #-#-#-#-#\n" +"#-#-#-#-# tdefile_torrent.po (tdefile_torrent) #-#-#-#-#\n" "Pavadinimas\n" "#-#-#-#-# krdc.po (krdc) #-#-#-#-#\n" "Pavadinimas\n" @@ -266,7 +266,7 @@ msgstr "" "Būsena\n" "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "Būsena\n" -"#-#-#-#-# kfileshare.po (kfileshare) #-#-#-#-#\n" +"#-#-#-#-# tdefileshare.po (tdefileshare) #-#-#-#-#\n" "Būsena\n" "#-#-#-#-# kpf.po (kpf) #-#-#-#-#\n" "Būsena\n" @@ -369,7 +369,7 @@ msgid "Ready." msgstr "" "#-#-#-#-# kfindpart.po (kfindpart) #-#-#-#-#\n" "Pasiruošęs\n" -"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n" +"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n" "Pasirengęs.\n" "#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" "Pasirengęs.\n" @@ -2520,7 +2520,7 @@ msgstr "" "Skirti raidžių dydį\n" "#-#-#-#-# quanta.po (quanta) #-#-#-#-#\n" "Skirti raidžių dydį\n" -"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n" +"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n" "Skirti raidžių dydį\n" "#-#-#-#-# kbabel.po (kbabel) #-#-#-#-#\n" "Skiriant raidžių dydį\n" diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp index e8124fa..727579d 100644 --- a/src/difftextwindow.cpp +++ b/src/difftextwindow.cpp @@ -35,7 +35,7 @@ #include <cstdlib> #include <tqdragobject.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> class DiffTextWindowData { diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index b4f6b20..c56f69b 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -35,7 +35,7 @@ #include <tqtextedit.h> #include <tqprogressdialog.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klocale.h> #include <iostream> diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp index eaf1732..44f3037 100644 --- a/src/fileaccess.cpp +++ b/src/fileaccess.cpp @@ -11,7 +11,7 @@ #include "fileaccess.h" #include <iostream> #include <cstdlib> -#include <kio/global.h> +#include <tdeio/global.h> #include <kmessagebox.h> #include "optiondialog.h" #include <tqlayout.h> diff --git a/src/fileaccess.h b/src/fileaccess.h index 1103f46..9338a85 100644 --- a/src/fileaccess.h +++ b/src/fileaccess.h @@ -14,8 +14,8 @@ #include <tqdialog.h> #include <tqfileinfo.h> #include <kprogress.h> -#include <kio/job.h> -#include <kio/jobclasses.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> #include <kurldrag.h> #include <list> #include <tqstring.h> diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index 377257b..8d0839a 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -37,11 +37,11 @@ // include files for KDE #include <kiconloader.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmenubar.h> #include <kstatusbar.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstdaction.h> #include <kcmdlineargs.h> #include <kprinter.h> diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index 78bd226..6e7ce45 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -22,7 +22,7 @@ #include <kinstance.h> #include <kaction.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index a8a2a84..287a9b3 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -21,8 +21,8 @@ #include "kdiff3.h" #include <kkeydialog.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kedittoolbar.h> diff --git a/src/kreplacements/kconfig.h b/src/kreplacements/tdeconfig.h index 53443ee..53443ee 100644 --- a/src/kreplacements/kconfig.h +++ b/src/kreplacements/tdeconfig.h diff --git a/src/kreplacements/kfiledialog.h b/src/kreplacements/tdefiledialog.h index 53443ee..53443ee 100644 --- a/src/kreplacements/kfiledialog.h +++ b/src/kreplacements/tdefiledialog.h diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index a67c665..be84a9b 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -38,7 +38,7 @@ #include <kfontdialog.h> // For KFontChooser #include <kiconloader.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kmainwindow.h> //For ktoolbar.h diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp index b19b7c2..f0d715b 100644 --- a/src/smalldialogs.cpp +++ b/src/smalldialogs.cpp @@ -34,7 +34,7 @@ #include <tqcursor.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> // OpenDialog ************************************************************** |