diff options
Diffstat (limited to 'vcs/subversion')
-rw-r--r-- | vcs/subversion/CMakeLists.txt | 4 | ||||
-rw-r--r-- | vcs/subversion/README.dox | 2 | ||||
-rw-r--r-- | vcs/subversion/configure.in.bot | 2 | ||||
-rw-r--r-- | vcs/subversion/configure.in.in | 2 | ||||
-rw-r--r-- | vcs/subversion/integrator/svnintegratordlg.cpp | 8 | ||||
-rw-r--r-- | vcs/subversion/kdevsvnd.cpp | 2 | ||||
-rw-r--r-- | vcs/subversion/subversion_core.cpp | 6 | ||||
-rw-r--r-- | vcs/subversion/subversion_core.h | 2 | ||||
-rw-r--r-- | vcs/subversion/subversion_fileinfo.cpp | 2 | ||||
-rw-r--r-- | vcs/subversion/subversion_fileinfo.h | 2 | ||||
-rw-r--r-- | vcs/subversion/subversion_widget.h | 2 | ||||
-rw-r--r-- | vcs/subversion/svn_fileselectdlg_commit.cpp | 2 | ||||
-rw-r--r-- | vcs/subversion/svn_kio.h | 4 |
13 files changed, 20 insertions, 20 deletions
diff --git a/vcs/subversion/CMakeLists.txt b/vcs/subversion/CMakeLists.txt index 294537a2..0e902488 100644 --- a/vcs/subversion/CMakeLists.txt +++ b/vcs/subversion/CMakeLists.txt @@ -64,7 +64,7 @@ tde_add_kpart( libkdevsubversion AUTOMOC tde_add_kpart( kio_kdevsvn AUTOMOC SOURCES svn_kio.cpp - LINK kio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES} + LINK tdeio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -75,6 +75,6 @@ tde_add_kpart( kded_kdevsvnd AUTOMOC SOURCES commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp kdevsvnd.skel kdevsvnd_widgets.cpp svnssltrustpromptbase.ui - LINK kio-shared tdeinit_kded-shared + LINK tdeio-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/subversion/README.dox b/vcs/subversion/README.dox index d784bd30..c463a997 100644 --- a/vcs/subversion/README.dox +++ b/vcs/subversion/README.dox @@ -7,7 +7,7 @@ Integrates the SVN (Subversion) version management system into KDevelop. \feature Integrates the SVN (Subversion) version management system into KDevelop. -\requirement You need to compile and install tdesdk/kioslave/svn +\requirement You need to compile and install tdesdk/tdeioslave/svn */ diff --git a/vcs/subversion/configure.in.bot b/vcs/subversion/configure.in.bot index ccab94db..d89532c2 100644 --- a/vcs/subversion/configure.in.bot +++ b/vcs/subversion/configure.in.bot @@ -3,7 +3,7 @@ if test "x$with_subversion" = xcheck && test -z "$SVN_SUBDIR"; then echo "You're missing Subversion libraries (1.x)" echo "KDE will not be able to browse Subversion repositories without it," echo "consider installing it." - echo "Look at kioslave/svn/README for more information" + echo "Look at tdeioslave/svn/README for more information" echo "" all_tests=bad fi diff --git a/vcs/subversion/configure.in.in b/vcs/subversion/configure.in.in index 6c132ae3..7a1bb3c2 100644 --- a/vcs/subversion/configure.in.in +++ b/vcs/subversion/configure.in.in @@ -132,4 +132,4 @@ AM_CONDITIONAL(include_subversion, test -n "$SVN_SUBDIR") AC_SUBST(SVN_INCLUDE) AC_SUBST(SVN_LIB) AC_SUBST(SVN_CPPFLAGS) -AM_CONDITIONAL(include_kioslave_svn, test -n "$SVN_SUBDIR") +AM_CONDITIONAL(include_tdeioslave_svn, test -n "$SVN_SUBDIR") diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index 94ceca77..bdba679f 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -22,19 +22,19 @@ #include "svnintegratordlg.h" #include "blockingkprocess.h" #include <kurl.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <kurlrequester.h> #include <kdebug.h> #include <tqradiobutton.h> -#include <kio/scheduler.h> +#include <tdeio/scheduler.h> #include <kprocess.h> #include <tdeversion.h> #include <kmessagebox.h> #include <klocale.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> using namespace TDEIO; diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 5e2ec8d9..112990bf 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ktextedit.h> #include <kpassdlg.h> #include <tqdir.h> diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 9f517c07..6dc79169 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -30,9 +30,9 @@ #include "svn_co.h" #include <kurlrequester.h> #include <klineedit.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> #include <kdebug.h> #include <kmainwindow.h> #include <kapplication.h> diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index 28d98d3c..f2f3f6da 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqwidget.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kurl.h> #include <ktempdir.h> #include "subversion_fileinfo.h" diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 6f960e0a..d9d3d6e1 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -29,7 +29,7 @@ #include <kmainwindow.h> #include <tqregexp.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name) diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 7a1c9bf7..9b322463 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -24,7 +24,7 @@ #include <tqmap.h> #include <kdevversioncontrol.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <dcopclient.h> #include <dcopobject.h> #include <subversion_part.h> diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index a74f7182..d59f8394 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -27,7 +27,7 @@ class subversionPart; #include <ktabwidget.h> -#include <kio/defaultprogress.h> +#include <tdeio/defaultprogress.h> #include <tqguardedptr.h> class KTextEdit; class SvnLogHolder; diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 0c014a9d..a37577bd 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -115,7 +115,7 @@ SVNFileSelectDlgCommit::~SVNFileSelectDlgCommit() int SVNFileSelectDlgCommit::exec() { if (listView()->childCount() <= 0){ - //TODO if klauncher fails, this spot is also reached. We should show correct error message to user + //TODO if tdelauncher fails, this spot is also reached. We should show correct error message to user KMessageBox::information( (TQWidget*)m_part->project()->mainWindow()->main(), i18n("No added/modified/deleted file(s) to commit") ); return TQDialog::Rejected; } diff --git a/vcs/subversion/svn_kio.h b/vcs/subversion/svn_kio.h index 0a6d56b2..b00cddb8 100644 --- a/vcs/subversion/svn_kio.h +++ b/vcs/subversion/svn_kio.h @@ -24,8 +24,8 @@ #include <tqcstring.h> #include <kurl.h> -#include <kio/global.h> -#include <kio/slavebase.h> +#include <tdeio/global.h> +#include <tdeio/slavebase.h> #include <subversion-1/svn_pools.h> #include <subversion-1/svn_auth.h> #include <subversion-1/svn_client.h> |