summaryrefslogtreecommitdiffstats
path: root/tdeioslave/trash
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave/trash')
-rw-r--r--tdeioslave/trash/CMakeLists.txt6
-rw-r--r--tdeioslave/trash/DESIGN8
-rw-r--r--tdeioslave/trash/Makefile.am8
-rw-r--r--tdeioslave/trash/ktrash.cpp2
-rw-r--r--tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp2
-rw-r--r--tdeioslave/trash/tdeio_trash.cpp (renamed from tdeioslave/trash/kio_trash.cpp)14
-rw-r--r--tdeioslave/trash/tdeio_trash.h (renamed from tdeioslave/trash/kio_trash.h)0
-rw-r--r--tdeioslave/trash/testtrash.cpp2
-rw-r--r--tdeioslave/trash/trash.protocol2
-rw-r--r--tdeioslave/trash/trashimpl.cpp10
-rw-r--r--tdeioslave/trash/trashimpl.h2
11 files changed, 28 insertions, 28 deletions
diff --git a/tdeioslave/trash/CMakeLists.txt b/tdeioslave/trash/CMakeLists.txt
index e54fba381..1569d07ca 100644
--- a/tdeioslave/trash/CMakeLists.txt
+++ b/tdeioslave/trash/CMakeLists.txt
@@ -37,12 +37,12 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
)
-##### kio_trash (module) ########################
+##### tdeio_trash (module) ########################
-set( target kio_trash )
+set( target tdeio_trash )
tde_add_kpart( ${target} AUTOMOC
- SOURCES kio_trash.cpp
+ SOURCES tdeio_trash.cpp
LINK trashcommon-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdeioslave/trash/DESIGN b/tdeioslave/trash/DESIGN
index 63179da08..2bb6f19df 100644
--- a/tdeioslave/trash/DESIGN
+++ b/tdeioslave/trash/DESIGN
@@ -1,10 +1,10 @@
DESIGN
======
-kio_trash implements the XDG trash standard currently at http://www.ramendik.ru/docs/trashspec.html
+tdeio_trash implements the XDG trash standard currently at http://www.ramendik.ru/docs/trashspec.html
-In case race conditions between the various instances of kio_trash
+In case race conditions between the various instances of tdeio_trash
are a problem, trashimpl could be moved to a kded module, and
-kio_trash would use DCOP to talk to it. It's a bit hard to come up
+tdeio_trash would use DCOP to talk to it. It's a bit hard to come up
with use cases where the race conditions would matter though.
BUGS
@@ -31,7 +31,7 @@ TODO
* Deleting oldest files when size is bigger than a certain configurable amount (#79553)
-Bugs closed by kio_trash
+Bugs closed by tdeio_trash
========================
#79826 (3.3 only)
#62848 (configurable trash location)
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index dae7debd5..f2ad65d28 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
SUBDIRS = . tdefile-plugin
-kde_module_LTLIBRARIES = kio_trash.la
+kde_module_LTLIBRARIES = tdeio_trash.la
-kio_trash_la_SOURCES = kio_trash.cpp
-kio_trash_la_LIBADD = libtrashcommon.la $(LIB_KIO)
-kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_trash_la_SOURCES = tdeio_trash.cpp
+tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_KIO)
+tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
bin_PROGRAMS = ktrash
ktrash_SOURCES = ktrash.cpp
diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp
index 395aabb6b..b899e7947 100644
--- a/tdeioslave/trash/ktrash.cpp
+++ b/tdeioslave/trash/ktrash.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
if ( args->isSet( "empty" ) ) {
- // We use a kio job instead of linking to TrashImpl, for a smaller binary
+ // We use a tdeio job instead of linking to TrashImpl, for a smaller binary
// (and the possibility of a central service at some point)
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp b/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
index cf4487d06..983a09db2 100644
--- a/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY(tdefile_trash, TrashFactory("tdefile_trash"))
KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name,
const TQStringList &args) : KFilePlugin(parent, name, args)
{
- TDEGlobal::locale()->insertCatalogue( "kio_trash" );
+ TDEGlobal::locale()->insertCatalogue( "tdeio_trash" );
kdDebug(7034) << "Trash file meta info plugin\n";
diff --git a/tdeioslave/trash/kio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp
index 26cfb4c6b..29fbfa778 100644
--- a/tdeioslave/trash/kio_trash.cpp
+++ b/tdeioslave/trash/tdeio_trash.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kio_trash.h"
+#include "tdeio_trash.h"
#include <tdeio/job.h>
#include <kapplication.h>
@@ -52,11 +52,11 @@ static const KCmdLineOptions options[] =
extern "C" {
int KDE_EXPORT kdemain( int argc, char **argv )
{
- //TDEInstance instance( "kio_trash" );
- // TDEApplication is necessary to use kio_file
+ //TDEInstance instance( "tdeio_trash" );
+ // TDEApplication is necessary to use tdeio_file
putenv(strdup("SESSION_MANAGER="));
TDEApplication::disableAutoDcopRegistration();
- TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0);
+ TDECmdLineArgs::init(argc, argv, "tdeio_trash", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions( options );
TDEApplication app( false, false );
@@ -364,7 +364,7 @@ void TrashProtocol::listDir(const KURL& url)
info.physicalPath += relativePath;
}
- // List subdir. Can't use kio_file here since we provide our own info...
+ // List subdir. Can't use tdeio_file here since we provide our own info...
kdDebug() << k_funcinfo << "listing " << info.physicalPath << endl;
TQStrList entryNames = impl.listDir( info.physicalPath );
totalSize( entryNames.count() );
@@ -407,7 +407,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString
addAtom( entry, TDEIO::UDS_LINK_DEST, 0, TQFile::decodeName( buffer2 ) );
// Follow symlink
- // That makes sense in kio_file, but not in the trash, especially for the size
+ // That makes sense in tdeio_file, but not in the trash, especially for the size
// #136876
#if 0
if ( KDE_stat( physicalPath_c, &buff ) == -1 ) {
@@ -593,4 +593,4 @@ void TrashProtocol::mkdir( const KURL& url, int /*permissions*/ )
}
#endif
-#include "kio_trash.moc"
+#include "tdeio_trash.moc"
diff --git a/tdeioslave/trash/kio_trash.h b/tdeioslave/trash/tdeio_trash.h
index ceaa27cfb..ceaa27cfb 100644
--- a/tdeioslave/trash/kio_trash.h
+++ b/tdeioslave/trash/tdeio_trash.h
diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
index 519de964c..12b1b939d 100644
--- a/tdeioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -21,7 +21,7 @@
#undef NDEBUG
#undef NO_DEBUG
-#include "kio_trash.h"
+#include "tdeio_trash.h"
#include "testtrash.h"
#include <config.h>
diff --git a/tdeioslave/trash/trash.protocol b/tdeioslave/trash/trash.protocol
index 8387fdcb7..43da5baa2 100644
--- a/tdeioslave/trash/trash.protocol
+++ b/tdeioslave/trash/trash.protocol
@@ -1,5 +1,5 @@
[Protocol]
-exec=kio_trash
+exec=tdeio_trash
protocol=trash
input=none
output=filesystem
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index a31ee1122..b78427d12 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 kio_trashrc since KIO uses that one already for kio_trash
+ // not using tdeio_trashrc since KIO uses that one already for tdeio_trash
// so better have a separate one, for faster parsing by e.g. kmimetype.cpp
m_config( "trashrc" )
{
@@ -406,7 +406,7 @@ bool TrashImpl::copyFromTrash( const TQString& dest, int trashId, const TQString
bool TrashImpl::copy( const TQString& src, const TQString& dest )
{
- // kio_file's copy() method is quite complex (in order to be fast), let's just call it...
+ // tdeio_file's copy() method is quite complex (in order to be fast), let's just call it...
m_lastErrorCode = 0;
KURL urlSrc;
urlSrc.setPath( src );
@@ -561,7 +561,7 @@ TrashImpl::TrashedFileInfoList TrashImpl::list()
const int trashId = it.key();
TQString infoPath = it.data();
infoPath += "/info";
- // Code taken from kio_file
+ // Code taken from tdeio_file
TQStrList entryNames = listDir( infoPath );
//char path_buffer[PATH_MAX];
//getcwd(path_buffer, PATH_MAX - 1);
@@ -725,7 +725,7 @@ int TrashImpl::findTrashDirectory( const TQString& origPath )
}
// new trash dir found, register it
// but we need stability in the trash IDs, so that restoring or asking
- // for properties works even kio_trash gets killed because idle.
+ // for properties works even tdeio_trash gets killed because idle.
#if 0
kdDebug() << k_funcinfo << "found " << trashDir << endl;
m_trashDirectories.insert( ++m_lastId, trashDir );
@@ -894,7 +894,7 @@ bool TrashImpl::checkTrashSubdirs( const TQCString& trashDir_c ) const
TQString TrashImpl::trashDirectoryPath( int trashId ) const
{
- // Never scanned for trash dirs? (This can happen after killing kio_trash
+ // Never scanned for trash dirs? (This can happen after killing tdeio_trash
// and reusing a directory listing from the earlier instance.)
if ( !m_trashDirectoriesScanned )
scanTrashDirectories();
diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
index 6aa941013..34308a712 100644
--- a/tdeioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -31,7 +31,7 @@
#include <assert.h>
/**
- * Implementation of all low-level operations done by kio_trash
+ * Implementation of all low-level operations done by tdeio_trash
* The structure of the trash directory follows the freedesktop.org standard <TODO URL>
*/
class TrashImpl : public TQObject
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 22:28:49 +0000