summaryrefslogtreecommitdiffstats
path: root/tdeioslave/trash
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:01:54 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:58:45 +0200
commit3e88ddfbc3df52c97d5354890fb9ac68af49bddd (patch)
treef6830215ebdc83e794a7a223042537595490265f /tdeioslave/trash
parent5607b4ae2272da03b692475c2f773f3e27e671b8 (diff)
downloadtdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.tar.gz
tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.zip
Additional k => tde renaming and fixes
Diffstat (limited to 'tdeioslave/trash')
-rw-r--r--tdeioslave/trash/Makefile.am8
-rw-r--r--tdeioslave/trash/tdefile-plugin/Makefile.am2
-rw-r--r--tdeioslave/trash/tdeio_trash.h4
-rw-r--r--tdeioslave/trash/trashimpl.cpp8
-rw-r--r--tdeioslave/trash/trashimpl.h2
5 files changed, 12 insertions, 12 deletions
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index f2ad65d28..02b43e90a 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -6,13 +6,13 @@ SUBDIRS = . tdefile-plugin
kde_module_LTLIBRARIES = tdeio_trash.la
tdeio_trash_la_SOURCES = tdeio_trash.cpp
-tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_KIO)
+tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_TDEIO)
tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
bin_PROGRAMS = ktrash
ktrash_SOURCES = ktrash.cpp
-ktrash_LDADD = $(LIB_KIO)
-ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ktrash_LDADD = $(LIB_TDEIO)
+ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kde_services_DATA = trash.protocol
@@ -21,7 +21,7 @@ libtrashcommon_la_SOURCES = trashimpl.cpp
check_PROGRAMS = testtrash
testtrash_SOURCES = testtrash.cpp
-testtrash_LDADD = libtrashcommon.la $(LIB_KIO)
+testtrash_LDADD = libtrashcommon.la $(LIB_TDEIO)
testtrash_LDFLAGS = $(all_libraries)
TESTS = testtrash
diff --git a/tdeioslave/trash/tdefile-plugin/Makefile.am b/tdeioslave/trash/tdefile-plugin/Makefile.am
index 50d2373e9..4b2c5d40e 100644
--- a/tdeioslave/trash/tdefile-plugin/Makefile.am
+++ b/tdeioslave/trash/tdefile-plugin/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdefile_trash.la
tdefile_trash_la_SOURCES = tdefile_trash.cpp
tdefile_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_trash_la_LIBADD = ../libtrashcommon.la $(LIB_KIO)
+tdefile_trash_la_LIBADD = ../libtrashcommon.la $(LIB_TDEIO)
METASOURCES = AUTO
diff --git a/tdeioslave/trash/tdeio_trash.h b/tdeioslave/trash/tdeio_trash.h
index ceaa27cfb..954dbe7a6 100644
--- a/tdeioslave/trash/tdeio_trash.h
+++ b/tdeioslave/trash/tdeio_trash.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KIO_TRASH_H
-#define KIO_TRASH_H
+#ifndef TDEIO_TRASH_H
+#define TDEIO_TRASH_H
#include <tdeio/slavebase.h>
#include "trashimpl.h"
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index cf37b8b94..c96d15d3a 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -57,7 +57,7 @@ TrashImpl::TrashImpl() :
m_homeDevice( 0 ),
m_trashDirectoriesScanned( false ),
m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ),
- // not using tdeio_trashrc since KIO uses that one already for tdeio_trash
+ // not using tdeio_trashrc since TDEIO uses that one already for tdeio_trash
// so better have a separate one, for faster parsing by e.g. kmimetype.cpp
m_config( "trashrc" )
{
@@ -325,7 +325,7 @@ bool TrashImpl::moveToTrash( const TQString& origPath, int trashId, const TQStri
const TQString dest = filesPath( trashId, fileId );
if ( !move( origPath, dest ) ) {
// Maybe the move failed due to no permissions to delete source.
- // In that case, delete dest to keep things consistent, since KIO doesn't do it.
+ // In that case, delete dest to keep things consistent, since TDEIO doesn't do it.
if ( TQFileInfo( dest ).isFile() )
TQFile::remove( dest );
else
@@ -367,7 +367,7 @@ bool TrashImpl::move( const TQString& src, const TQString& dest )
urlDest.setPath( dest );
kdDebug() << k_funcinfo << urlSrc << " -> " << urlDest << endl;
TDEIO::CopyJob* job = TDEIO::moveAs( urlSrc, urlDest, false );
-#ifdef KIO_COPYJOB_HAS_SETINTERACTIVE
+#ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE
job->setInteractive( false );
#endif
connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
@@ -414,7 +414,7 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest )
urlDest.setPath( dest );
kdDebug() << k_funcinfo << "copying " << src << " to " << dest << endl;
TDEIO::CopyJob* job = TDEIO::copyAs( urlSrc, urlDest, false );
-#ifdef KIO_COPYJOB_HAS_SETINTERACTIVE
+#ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE
job->setInteractive( false );
#endif
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
index 34308a712..3a06dd9e8 100644
--- a/tdeioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -98,7 +98,7 @@ public:
/// Move data from the old trash system to the new one
void migrateOldTrash();
- /// KIO error code
+ /// TDEIO error code
int lastErrorCode() const { return m_lastErrorCode; }
TQString lastErrorMessage() const { return m_lastErrorMessage; }