diff options
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | apt.tdevelop | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/apt+http.protocol | 2 | ||||
| -rw-r--r-- | src/apt.cpp | 6 | ||||
| -rw-r--r-- | src/apt.h | 4 | ||||
| -rw-r--r-- | src/apt.protocol | 2 | ||||
| -rw-r--r-- | src/parsers/list.cpp | 2 | ||||
| -rw-r--r-- | src/parsers/parsers.cpp | 2 | ||||
| -rw-r--r-- | src/parsers/search.cpp | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7fa8158..52ab1c3 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/apt.tdevelop b/apt.tdevelop index ebab572..26d9409 100644 --- a/apt.tdevelop +++ b/apt.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> <keyword>Qt</keyword> <keyword>KDE</keyword> - <keyword>kioslave</keyword> + <keyword>tdeioslave</keyword> </keywords> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> @@ -26,7 +26,7 @@ </general> <kdevautoproject> <general> - <activetarget>src/kio_apt.la</activetarget> + <activetarget>src/tdeio_apt.la</activetarget> <useconfiguration>debug</useconfiguration> </general> <configurations> diff --git a/src/Makefile.am b/src/Makefile.am index 4149181..182ad40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,11 +12,11 @@ kio_apt_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB protocoldir = $(kde_servicesdir) protocol_DATA = apt.protocol apt+http.protocol -appdatadir = $(kde_datadir)/kio_apt/ +appdatadir = $(kde_datadir)/tdeio_apt/ appdata_DATA = kio_apt.css kdedeb_logo.png messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kio_apt.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_apt.pot noinst_HEADERS = debug.h aptcache.h apt.h regexps.h dpkg.h packagemanager.h diff --git a/src/apt+http.protocol b/src/apt+http.protocol index bd3c25c..604cb7b 100644 --- a/src/apt+http.protocol +++ b/src/apt+http.protocol @@ -6,6 +6,6 @@ output=stream reading=true defaultMimetype=text/html Icon=remote -Description=A kioslave for using apt-cache functionalities inside konqueror +Description=A tdeioslave for using apt-cache functionalities inside konqueror determineMimetypeFromExtension=false DocPath=kio_apt/index.html diff --git a/src/apt.cpp b/src/apt.cpp index 529a702..f3799b4 100644 --- a/src/apt.cpp +++ b/src/apt.cpp @@ -21,11 +21,11 @@ #include <kapplication.h> #include <kinstance.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <klocale.h> #include <kurl.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <kmessagebox.h> #include <kdebug.h> @@ -226,7 +226,7 @@ AptProtocol::AptProtocol( const TQCString &pool_socket, const TQCString &app_soc { KStandardDirs* dirs = TDEGlobal::dirs(); - m_stylesheet = dirs->findResource( "data", "kio_apt/kio_apt.css" ); + m_stylesheet = dirs->findResource( "data", "kio_apt/tdeio_apt.css" ); m_logo = dirs->findResource( "data", "kio_apt/" + TDEGlobal::config() -> readEntryUntranslated("logo", "kdedeb_logo.png" ) ); @@ -5,8 +5,8 @@ #include <tqcstring.h> #include <kurl.h> -#include <kio/global.h> -#include <kio/slavebase.h> +#include <tdeio/global.h> +#include <tdeio/slavebase.h> #include "debug.h" #include "aptcache.h" diff --git a/src/apt.protocol b/src/apt.protocol index 24a197e..8d68e4c 100644 --- a/src/apt.protocol +++ b/src/apt.protocol @@ -6,6 +6,6 @@ output=stream reading=true defaultMimetype=text/html Icon=kioapt -Description=A kioslave for using apt-cache functionalities inside konqueror +Description=A tdeioslave for using apt-cache functionalities inside konqueror determineMimetypeFromExtension=false DocPath=kio_apt/index.html diff --git a/src/parsers/list.cpp b/src/parsers/list.cpp index 1c38cb7..9484d9d 100644 --- a/src/parsers/list.cpp +++ b/src/parsers/list.cpp @@ -11,7 +11,7 @@ #include "parsers.h" #include "../apt.h" -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <klocale.h> #include <tqregexp.h> #include <kurl.h> diff --git a/src/parsers/parsers.cpp b/src/parsers/parsers.cpp index 8cc67da..bccb3dd 100644 --- a/src/parsers/parsers.cpp +++ b/src/parsers/parsers.cpp @@ -12,7 +12,7 @@ #include <kuserprofile.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <qhtmlstream.h> #include <tqregexp.h> diff --git a/src/parsers/search.cpp b/src/parsers/search.cpp index 5fd6b22..d24073d 100644 --- a/src/parsers/search.cpp +++ b/src/parsers/search.cpp @@ -13,7 +13,7 @@ #include "qhtmlstream.h" -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> namespace Parsers { |