TDE
/
digikam
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/digikam
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix a few remaining references to kio_

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 201db8ada8
commit 2f7f5c0918
19 changed files with 114 additions and 114 deletions
Show Stats Download Patch File Download Diff File

6
ChangeLog
Unescape View File

@ -1029,7 +1029,7 @@
* NEWS, digikam/albummanager.cpp, digikam/albummanager.h: Prevent * NEWS, digikam/albummanager.cpp, digikam/albummanager.h: Prevent
that changes of the database file trigger a rescan which that changes of the database file trigger a rescan which
leads to an invocation of kio_digikamalbums/dates etc (this is a leads to an invocation of tdeio_digikamalbums/dates etc (this is a
modified backport from the KDE4 version). modified backport from the KDE4 version).
BUG: 170758 BUG: 170758
@ -36914,7 +36914,7 @@ v0.9.0-beta1 - 20/07/2006
2006-04-21 12:13 mwiesweg 2006-04-21 12:13 mwiesweg
* trunk/extragear/graphics/digikam/tdeioslave/digikamalbums.cpp: * trunk/extragear/graphics/digikam/tdeioslave/digikamalbums.cpp:
Change kio_digikamalbums::copyImage like AlbumDB::copyItem Change tdeio_digikamalbums::copyImage like AlbumDB::copyItem
2006-04-21 11:15 mwiesweg 2006-04-21 11:15 mwiesweg
@ -58374,7 +58374,7 @@ v0.7-rc1 11/01/04
2004-10-29 13:03 aseigo 2004-10-29 13:03 aseigo
* digikam/syncjob.cpp: make this work with kio_trash if it exists * digikam/syncjob.cpp: make this work with tdeio_trash if it exists
2004-10-29 13:02 aseigo 2004-10-29 13:02 aseigo

2
digikam/digikam/albumlister.cpp
Unescape View File

@ -171,7 +171,7 @@ void AlbumLister::openAlbum(Album *album)
ds << d->recurseAlbums; ds << d->recurseAlbums;
ds << d->recurseTags; ds << d->recurseTags;
// Protocol = digikamalbums -> kio_digikamalbums // Protocol = digikamalbums -> tdeio_digikamalbums
d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL, d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL,
ba, TQByteArray(), false); ba, TQByteArray(), false);

36
digikam/tdeioslave/Makefile.am
Unescape View File

@ -13,9 +13,9 @@ INCLUDES = -I$(top_srcdir)/digikam/libs/jpegutils \
$(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) \ $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) \
$(all_includes) $(all_includes)
kde_module_LTLIBRARIES = kio_digikamthumbnail.la kio_digikamtags.la \ kde_module_LTLIBRARIES = tdeio_digikamthumbnail.la tdeio_digikamtags.la \
kio_digikamalbums.la kio_digikamdates.la \ tdeio_digikamalbums.la tdeio_digikamdates.la \
kio_digikamsearch.la tdeio_digikamsearch.la
protocol_DATA = digikamthumbnail.protocol digikamtags.protocol \ protocol_DATA = digikamthumbnail.protocol digikamtags.protocol \
digikamalbums.protocol digikamdates.protocol \ digikamalbums.protocol digikamdates.protocol \
@ -28,45 +28,45 @@ protocoldir = $(kde_servicesdir)
# -- digikam KIO image thumbnails generator ---------------------------------------- # -- digikam KIO image thumbnails generator ----------------------------------------
kio_digikamthumbnail_la_SOURCES = digikamthumbnail.cpp tdeio_digikamthumbnail_la_SOURCES = digikamthumbnail.cpp
kio_digikamthumbnail_la_LIBADD = $(LIB_KIO) $(LIBJPEG) $(LIBPNG) \ tdeio_digikamthumbnail_la_LIBADD = $(LIB_KIO) $(LIBJPEG) $(LIBPNG) \
$(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \ $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
$(top_builddir)/digikam/libs/dimg/libdimg.la $(top_builddir)/digikam/libs/dimg/libdimg.la
kio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx tdeio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx
# -- digikam tags KIO -------------------------------------------------------------- # -- digikam tags KIO --------------------------------------------------------------
kio_digikamtags_la_SOURCES = digikamtags.cpp sqlitedb.cpp tdeio_digikamtags_la_SOURCES = digikamtags.cpp sqlitedb.cpp
kio_digikamtags_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) tdeio_digikamtags_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL)
kio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx tdeio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx
# -- digikam albums KIO ------------------------------------------------------------ # -- digikam albums KIO ------------------------------------------------------------
kio_digikamalbums_la_SOURCES = digikamalbums.cpp sqlitedb.cpp tdeio_digikamalbums_la_SOURCES = digikamalbums.cpp sqlitedb.cpp
kio_digikamalbums_la_LIBADD = $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \ tdeio_digikamalbums_la_LIBADD = $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
$(top_builddir)/digikam/libs/dimg/libdimg.la \ $(top_builddir)/digikam/libs/dimg/libdimg.la \
$(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL)
kio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx tdeio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx
# -- digikam dates KIO ------------------------------------------------------------- # -- digikam dates KIO -------------------------------------------------------------
kio_digikamdates_la_SOURCES = digikamdates.cpp sqlitedb.cpp tdeio_digikamdates_la_SOURCES = digikamdates.cpp sqlitedb.cpp
kio_digikamdates_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) tdeio_digikamdates_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL)
kio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx tdeio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx
# -- digikam search KIO ------------------------------------------------------------ # -- digikam search KIO ------------------------------------------------------------
kio_digikamsearch_la_SOURCES = digikamsearch.cpp sqlitedb.cpp tdeio_digikamsearch_la_SOURCES = digikamsearch.cpp sqlitedb.cpp
kio_digikamsearch_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) tdeio_digikamsearch_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL)
kio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx tdeio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx

60
digikam/tdeioslave/digikamalbums.cpp
Unescape View File

@ -86,13 +86,13 @@ extern "C"
#include "digikam_export.h" #include "digikam_export.h"
#include "digikamalbums.h" #include "digikamalbums.h"
kio_digikamalbums::kio_digikamalbums(const TQCString &pool_socket, tdeio_digikamalbums::tdeio_digikamalbums(const TQCString &pool_socket,
const TQCString &app_socket) const TQCString &app_socket)
: SlaveBase("kio_digikamalbums", pool_socket, app_socket) : SlaveBase("tdeio_digikamalbums", pool_socket, app_socket)
{ {
} }
kio_digikamalbums::~kio_digikamalbums() tdeio_digikamalbums::~tdeio_digikamalbums()
{ {
} }
@ -128,7 +128,7 @@ static bool matchFilterList( const TQValueList<TQRegExp>& filters,
return false; return false;
} }
void kio_digikamalbums::special(const TQByteArray& data) void tdeio_digikamalbums::special(const TQByteArray& data)
{ {
bool folders = (metaData("folders") == "yes"); bool folders = (metaData("folders") == "yes");
@ -369,7 +369,7 @@ static int write_all(int fd, const char *buf, size_t len)
return 0; return 0;
} }
void kio_digikamalbums::get( const KURL& url ) void tdeio_digikamalbums::get( const KURL& url )
{ {
// Code duplication from file:// ioslave // Code duplication from file:// ioslave
kdDebug() << k_funcinfo << " : " << url << endl; kdDebug() << k_funcinfo << " : " << url << endl;
@ -455,7 +455,7 @@ void kio_digikamalbums::get( const KURL& url )
finished(); finished();
} }
void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bool /*resume*/) void tdeio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bool /*resume*/)
{ {
// Code duplication from file:// ioslave // Code duplication from file:// ioslave
kdDebug() << k_funcinfo << " : " << url.url() << endl; kdDebug() << k_funcinfo << " : " << url.url() << endl;
@ -609,7 +609,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo
finished(); finished();
} }
void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool overwrite ) void tdeio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool overwrite )
{ {
// Code duplication from file:// ioslave? // Code duplication from file:// ioslave?
kdDebug() << k_funcinfo << "Src: " << src.path() << ", Dst: " << dst.path() << endl; kdDebug() << k_funcinfo << "Src: " << src.path() << ", Dst: " << dst.path() << endl;
@ -854,7 +854,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o
finished(); finished();
} }
void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite ) void tdeio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite )
{ {
// Code duplication from file:// ioslave? // Code duplication from file:// ioslave?
kdDebug() << k_funcinfo << "Src: " << src << ", Dst: " << dst << endl; kdDebug() << k_funcinfo << "Src: " << src << ", Dst: " << dst << endl;
@ -1005,7 +1005,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite
finished(); finished();
} }
void kio_digikamalbums::stat( const KURL& url ) void tdeio_digikamalbums::stat( const KURL& url )
{ {
TQString libraryPath = url.user(); TQString libraryPath = url.user();
if (libraryPath.isEmpty()) if (libraryPath.isEmpty())
@ -1025,7 +1025,7 @@ void kio_digikamalbums::stat( const KURL& url )
finished(); finished();
} }
void kio_digikamalbums::listDir( const KURL& url ) void tdeio_digikamalbums::listDir( const KURL& url )
{ {
// Code duplication from file:// ioslave? // Code duplication from file:// ioslave?
kdDebug() << k_funcinfo << " : " << url.path() << endl; kdDebug() << k_funcinfo << " : " << url.path() << endl;
@ -1075,7 +1075,7 @@ void kio_digikamalbums::listDir( const KURL& url )
finished(); finished();
} }
void kio_digikamalbums::mkdir( const KURL& url, int permissions ) void tdeio_digikamalbums::mkdir( const KURL& url, int permissions )
{ {
// Code duplication from file:// ioslave? // Code duplication from file:// ioslave?
kdDebug() << k_funcinfo << " : " << url.url() << endl; kdDebug() << k_funcinfo << " : " << url.url() << endl;
@ -1148,7 +1148,7 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions )
error( TDEIO::ERR_FILE_ALREADY_EXIST, path ); error( TDEIO::ERR_FILE_ALREADY_EXIST, path );
} }
void kio_digikamalbums::chmod( const KURL& url, int permissions ) void tdeio_digikamalbums::chmod( const KURL& url, int permissions )
{ {
// Code duplication from file:// ioslave? // Code duplication from file:// ioslave?
kdDebug() << k_funcinfo << " : " << url.url() << endl; kdDebug() << k_funcinfo << " : " << url.url() << endl;
@ -1168,7 +1168,7 @@ void kio_digikamalbums::chmod( const KURL& url, int permissions )
finished(); finished();
} }
void kio_digikamalbums::del( const KURL& url, bool isfile) void tdeio_digikamalbums::del( const KURL& url, bool isfile)
{ {
// Code duplication from file:// ioslave? // Code duplication from file:// ioslave?
kdDebug() << k_funcinfo << " : " << url.url() << endl; kdDebug() << k_funcinfo << " : " << url.url() << endl;
@ -1267,7 +1267,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile)
} }
bool kio_digikamalbums::createUDSEntry(const TQString& path, TDEIO::UDSEntry& entry) bool tdeio_digikamalbums::createUDSEntry(const TQString& path, TDEIO::UDSEntry& entry)
{ {
entry.clear(); entry.clear();
@ -1317,7 +1317,7 @@ bool kio_digikamalbums::createUDSEntry(const TQString& path, TDEIO::UDSEntry& en
return true; return true;
} }
void kio_digikamalbums::createDigikamPropsUDSEntry(TDEIO::UDSEntry& entry) void tdeio_digikamalbums::createDigikamPropsUDSEntry(TDEIO::UDSEntry& entry)
{ {
entry.clear(); entry.clear();
@ -1348,7 +1348,7 @@ void kio_digikamalbums::createDigikamPropsUDSEntry(TDEIO::UDSEntry& entry)
entry.append(atom); entry.append(atom);
} }
void kio_digikamalbums::buildAlbumList() void tdeio_digikamalbums::buildAlbumList()
{ {
// simplified from AlbumDB::scanAlbums() // simplified from AlbumDB::scanAlbums()
m_albumList.clear(); m_albumList.clear();
@ -1378,7 +1378,7 @@ void kio_digikamalbums::buildAlbumList()
} }
} }
AlbumInfo kio_digikamalbums::findAlbum(const TQString& url, bool addIfNotExists) AlbumInfo tdeio_digikamalbums::findAlbum(const TQString& url, bool addIfNotExists)
{ {
// similar to AlbumDB::getOrCreateAlbumId // similar to AlbumDB::getOrCreateAlbumId
AlbumInfo album; AlbumInfo album;
@ -1416,14 +1416,14 @@ AlbumInfo kio_digikamalbums::findAlbum(const TQString& url, bool addIfNotExists)
return album; return album;
} }
void kio_digikamalbums::delAlbum(int albumID) void tdeio_digikamalbums::delAlbum(int albumID)
{ {
// code duplication from AlbumDB::deleteAlbum // code duplication from AlbumDB::deleteAlbum
m_sqlDB.execSql(TQString("DELETE FROM Albums WHERE id='%1'") m_sqlDB.execSql(TQString("DELETE FROM Albums WHERE id='%1'")
.arg(albumID)); .arg(albumID));
} }
void kio_digikamalbums::renameAlbum(const TQString& oldURL, const TQString& newURL) void tdeio_digikamalbums::renameAlbum(const TQString& oldURL, const TQString& newURL)
{ {
// similar to AlbumDB::setAlbumURL, but why more extended? // similar to AlbumDB::setAlbumURL, but why more extended?
// first update the url of the album which was renamed // first update the url of the album which was renamed
@ -1449,7 +1449,7 @@ void kio_digikamalbums::renameAlbum(const TQString& oldURL, const TQString& newU
} }
} }
bool kio_digikamalbums::findImage(int albumID, const TQString& name) const bool tdeio_digikamalbums::findImage(int albumID, const TQString& name) const
{ {
// no similar method in AlbumDB? // no similar method in AlbumDB?
TQStringList values; TQStringList values;
@ -1476,7 +1476,7 @@ public:
TQString icon; TQString icon;
}; };
void kio_digikamalbums::addImage(int albumID, const TQString& filePath) void tdeio_digikamalbums::addImage(int albumID, const TQString& filePath)
{ {
// Code duplication: ScanLib::storeItemInDatabase, AlbumDB::addItem, // Code duplication: ScanLib::storeItemInDatabase, AlbumDB::addItem,
// AlbumDB::setItemRating, AlbumDB::addItemTag, AlbumDB::addTag // AlbumDB::setItemRating, AlbumDB::addItemTag, AlbumDB::addTag
@ -1714,7 +1714,7 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
} }
} }
void kio_digikamalbums::delImage(int albumID, const TQString& name) void tdeio_digikamalbums::delImage(int albumID, const TQString& name)
{ {
// code duplication from AlbumDB::deleteItem // code duplication from AlbumDB::deleteItem
m_sqlDB.execSql( TQString("DELETE FROM Images " m_sqlDB.execSql( TQString("DELETE FROM Images "
@ -1723,7 +1723,7 @@ void kio_digikamalbums::delImage(int albumID, const TQString& name)
.arg(escapeString(name)) ); .arg(escapeString(name)) );
} }
void kio_digikamalbums::renameImage(int oldAlbumID, const TQString& oldName, void tdeio_digikamalbums::renameImage(int oldAlbumID, const TQString& oldName,
int newAlbumID, const TQString& newName) int newAlbumID, const TQString& newName)
{ {
// code duplication from AlbumDB::deleteItem, AlbumDB::moveItem // code duplication from AlbumDB::deleteItem, AlbumDB::moveItem
@ -1742,7 +1742,7 @@ void kio_digikamalbums::renameImage(int oldAlbumID, const TQString& oldName,
escapeString(oldName)) ); escapeString(oldName)) );
} }
void kio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName, void tdeio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName,
int dstAlbumID, const TQString& dstName) int dstAlbumID, const TQString& dstName)
{ {
// code duplication from AlbumDB::copyItem // code duplication from AlbumDB::copyItem
@ -1796,13 +1796,13 @@ void kio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName,
.arg(TQString::number(dstId), TQString::number(srcId)) ); .arg(TQString::number(dstId), TQString::number(srcId)) );
} }
void kio_digikamalbums::scanAlbum(const TQString& url) void tdeio_digikamalbums::scanAlbum(const TQString& url)
{ {
scanOneAlbum(url); scanOneAlbum(url);
removeInvalidAlbums(); removeInvalidAlbums();
} }
void kio_digikamalbums::scanOneAlbum(const TQString& url) void tdeio_digikamalbums::scanOneAlbum(const TQString& url)
{ {
TQDir dir(m_libraryPath + url); TQDir dir(m_libraryPath + url);
if (!dir.exists() || !dir.isReadable()) if (!dir.exists() || !dir.isReadable())
@ -1920,7 +1920,7 @@ void kio_digikamalbums::scanOneAlbum(const TQString& url)
} }
} }
void kio_digikamalbums::removeInvalidAlbums() void tdeio_digikamalbums::removeInvalidAlbums()
{ {
TQStringList urlList; TQStringList urlList;
@ -1952,16 +1952,16 @@ extern "C"
DIGIKAM_EXPORT int kdemain(int argc, char **argv) DIGIKAM_EXPORT int kdemain(int argc, char **argv)
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamalbums" ); TDEInstance instance( "tdeio_digikamalbums" );
TDEGlobal::locale(); TDEGlobal::locale();
if (argc != 4) { if (argc != 4) {
kdDebug() << "Usage: kio_digikamalbums protocol domain-socket1 domain-socket2" kdDebug() << "Usage: tdeio_digikamalbums protocol domain-socket1 domain-socket2"
<< endl; << endl;
exit(-1); exit(-1);
} }
kio_digikamalbums slave(argv[2], argv[3]); tdeio_digikamalbums slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
return 0; return 0;

6
digikam/tdeioslave/digikamalbums.h
Unescape View File

@ -54,14 +54,14 @@ public:
TQDate date; TQDate date;
}; };
class kio_digikamalbums : public TDEIO::SlaveBase class tdeio_digikamalbums : public TDEIO::SlaveBase
{ {
public: public:
kio_digikamalbums(const TQCString &pool_socket, tdeio_digikamalbums(const TQCString &pool_socket,
const TQCString &app_socket); const TQCString &app_socket);
~kio_digikamalbums(); ~tdeio_digikamalbums();
void special(const TQByteArray& data); void special(const TQByteArray& data);

2
digikam/tdeioslave/digikamalbums.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_digikamalbums exec=tdeio_digikamalbums
protocol=digikamalbums protocol=digikamalbums
input=stream input=stream
output=stream output=stream

14
digikam/tdeioslave/digikamdates.cpp
Unescape View File

@ -60,13 +60,13 @@ extern "C"
#include "digikam_export.h" #include "digikam_export.h"
#include "digikamdates.h" #include "digikamdates.h"
kio_digikamdates::kio_digikamdates(const TQCString &pool_socket, tdeio_digikamdates::tdeio_digikamdates(const TQCString &pool_socket,
const TQCString &app_socket) const TQCString &app_socket)
: SlaveBase("kio_digikamdates", pool_socket, app_socket) : SlaveBase("tdeio_digikamdates", pool_socket, app_socket)
{ {
} }
kio_digikamdates::~kio_digikamdates() tdeio_digikamdates::~tdeio_digikamdates()
{ {
} }
@ -102,7 +102,7 @@ static bool matchFilterList( const TQValueList<TQRegExp>& filters,
return false; return false;
} }
void kio_digikamdates::special(const TQByteArray& data) void tdeio_digikamdates::special(const TQByteArray& data)
{ {
bool folders = (metaData("folders") == "yes"); bool folders = (metaData("folders") == "yes");
@ -295,16 +295,16 @@ extern "C"
DIGIKAM_EXPORT int kdemain(int argc, char **argv) DIGIKAM_EXPORT int kdemain(int argc, char **argv)
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamdates" ); TDEInstance instance( "tdeio_digikamdates" );
TDEGlobal::locale(); TDEGlobal::locale();
if (argc != 4) { if (argc != 4) {
kdDebug() << "Usage: kio_digikamdates protocol domain-socket1 domain-socket2" kdDebug() << "Usage: tdeio_digikamdates protocol domain-socket1 domain-socket2"
<< endl; << endl;
exit(-1); exit(-1);
} }
kio_digikamdates slave(argv[2], argv[3]); tdeio_digikamdates slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
return 0; return 0;

6
digikam/tdeioslave/digikamdates.h
Unescape View File

@ -34,14 +34,14 @@
class TQStringList; class TQStringList;
class kio_digikamdates : public TDEIO::SlaveBase class tdeio_digikamdates : public TDEIO::SlaveBase
{ {
public: public:
kio_digikamdates(const TQCString &pool_socket, tdeio_digikamdates(const TQCString &pool_socket,
const TQCString &app_socket); const TQCString &app_socket);
~kio_digikamdates(); ~tdeio_digikamdates();
void special(const TQByteArray& data); void special(const TQByteArray& data);

2
digikam/tdeioslave/digikamdates.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_digikamdates exec=tdeio_digikamdates
protocol=digikamdates protocol=digikamdates
input=stream input=stream
output=stream output=stream

22
digikam/tdeioslave/digikamsearch.cpp
Unescape View File

@ -68,9 +68,9 @@ extern "C"
#include "digikam_export.h" #include "digikam_export.h"
#include "digikamsearch.h" #include "digikamsearch.h"
kio_digikamsearch::kio_digikamsearch(const TQCString &pool_socket, tdeio_digikamsearch::tdeio_digikamsearch(const TQCString &pool_socket,
const TQCString &app_socket) const TQCString &app_socket)
: SlaveBase("kio_digikamsearch", pool_socket, app_socket) : SlaveBase("tdeio_digikamsearch", pool_socket, app_socket)
{ {
// build a lookup table for month names // build a lookup table for month names
const KCalendarSystem* cal = TDEGlobal::locale()->calendar(); const KCalendarSystem* cal = TDEGlobal::locale()->calendar();
@ -81,7 +81,7 @@ kio_digikamsearch::kio_digikamsearch(const TQCString &pool_socket,
} }
} }
kio_digikamsearch::~kio_digikamsearch() tdeio_digikamsearch::~tdeio_digikamsearch()
{ {
} }
@ -119,7 +119,7 @@ static bool matchFilterList( const TQValueList<TQRegExp>& filters,
return false; return false;
} }
void kio_digikamsearch::special(const TQByteArray& data) void tdeio_digikamsearch::special(const TQByteArray& data)
{ {
TQString libraryPath; TQString libraryPath;
KURL url; KURL url;
@ -294,7 +294,7 @@ void kio_digikamsearch::special(const TQByteArray& data)
finished(); finished();
} }
TQString kio_digikamsearch::buildQuery(const KURL& url) const TQString tdeio_digikamsearch::buildQuery(const KURL& url) const
{ {
int count = url.queryItem("count").toInt(); int count = url.queryItem("count").toInt();
if (count <= 0) if (count <= 0)
@ -455,8 +455,8 @@ TQString kio_digikamsearch::buildQuery(const KURL& url) const
return sqlQuery; return sqlQuery;
} }
TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, TQString tdeio_digikamsearch::subQuery(enum tdeio_digikamsearch::SKey key,
enum kio_digikamsearch::SOperator op, enum tdeio_digikamsearch::SOperator op,
const TQString& val) const const TQString& val) const
{ {
TQString query; TQString query;
@ -675,24 +675,24 @@ extern "C"
DIGIKAM_EXPORT int kdemain(int argc, char **argv) DIGIKAM_EXPORT int kdemain(int argc, char **argv)
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamsearch" ); TDEInstance instance( "tdeio_digikamsearch" );
TDEGlobal::locale(); TDEGlobal::locale();
if (argc != 4) if (argc != 4)
{ {
kdDebug() << "Usage: kio_digikamsearch protocol domain-socket1 domain-socket2" kdDebug() << "Usage: tdeio_digikamsearch protocol domain-socket1 domain-socket2"
<< endl; << endl;
exit(-1); exit(-1);
} }
kio_digikamsearch slave(argv[2], argv[3]); tdeio_digikamsearch slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
return 0; return 0;
} }
} }
TQString kio_digikamsearch::possibleDate(const TQString& str, bool& exact) const TQString tdeio_digikamsearch::possibleDate(const TQString& str, bool& exact) const
{ {
TQDate date = TQDate::fromString(str, Qt::ISODate); TQDate date = TQDate::fromString(str, Qt::ISODate);
if (date.isValid()) if (date.isValid())

6
digikam/tdeioslave/digikamsearch.h
Unescape View File

@ -33,7 +33,7 @@
class TQStringList; class TQStringList;
class kio_digikamsearch : public TDEIO::SlaveBase class tdeio_digikamsearch : public TDEIO::SlaveBase
{ {
public: public:
@ -67,8 +67,8 @@ public:
public: public:
kio_digikamsearch(const TQCString &pool_socket, const TQCString &app_socket); tdeio_digikamsearch(const TQCString &pool_socket, const TQCString &app_socket);
~kio_digikamsearch(); ~tdeio_digikamsearch();
void special(const TQByteArray& data); void special(const TQByteArray& data);

2
digikam/tdeioslave/digikamsearch.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_digikamsearch exec=tdeio_digikamsearch
protocol=digikamsearch protocol=digikamsearch
input=none input=none
output=filesystem,stream output=filesystem,stream

18
digikam/tdeioslave/digikamtags.cpp
Unescape View File

@ -62,13 +62,13 @@ extern "C"
#include "digikam_export.h" #include "digikam_export.h"
#include "digikamtags.h" #include "digikamtags.h"
kio_digikamtagsProtocol::kio_digikamtagsProtocol(const TQCString &pool_socket, tdeio_digikamtagsProtocol::tdeio_digikamtagsProtocol(const TQCString &pool_socket,
const TQCString &app_socket) const TQCString &app_socket)
: SlaveBase("kio_digikamtags", pool_socket, app_socket) : SlaveBase("tdeio_digikamtags", pool_socket, app_socket)
{ {
} }
kio_digikamtagsProtocol::~kio_digikamtagsProtocol() tdeio_digikamtagsProtocol::~tdeio_digikamtagsProtocol()
{ {
} }
@ -104,7 +104,7 @@ static bool matchFilterList( const TQValueList<TQRegExp>& filters,
return false; return false;
} }
void kio_digikamtagsProtocol::special(const TQByteArray& data) void tdeio_digikamtagsProtocol::special(const TQByteArray& data)
{ {
bool folders = (metaData("folders") == "yes"); bool folders = (metaData("folders") == "yes");
@ -304,21 +304,21 @@ extern "C"
DIGIKAM_EXPORT int kdemain(int argc, char **argv) DIGIKAM_EXPORT int kdemain(int argc, char **argv)
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamtags" ); TDEInstance instance( "tdeio_digikamtags" );
( void ) TDEGlobal::locale(); ( void ) TDEGlobal::locale();
kdDebug() << "*** kio_digikamtag started ***" << endl; kdDebug() << "*** tdeio_digikamtag started ***" << endl;
if (argc != 4) { if (argc != 4) {
kdDebug() << "Usage: kio_digikamtags protocol domain-socket1 domain-socket2" kdDebug() << "Usage: tdeio_digikamtags protocol domain-socket1 domain-socket2"
<< endl; << endl;
exit(-1); exit(-1);
} }
kio_digikamtagsProtocol slave(argv[2], argv[3]); tdeio_digikamtagsProtocol slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
kdDebug() << "*** kio_digikamtags finished ***" << endl; kdDebug() << "*** tdeio_digikamtags finished ***" << endl;
return 0; return 0;
} }
} }

6
digikam/tdeioslave/digikamtags.h
Unescape View File

@ -40,13 +40,13 @@
class KURL; class KURL;
class TQCString; class TQCString;
class kio_digikamtagsProtocol : public TDEIO::SlaveBase class tdeio_digikamtagsProtocol : public TDEIO::SlaveBase
{ {
public: public:
kio_digikamtagsProtocol(const TQCString &pool_socket, tdeio_digikamtagsProtocol(const TQCString &pool_socket,
const TQCString &app_socket); const TQCString &app_socket);
virtual ~kio_digikamtagsProtocol(); virtual ~tdeio_digikamtagsProtocol();
void special(const TQByteArray& data); void special(const TQByteArray& data);

2
digikam/tdeioslave/digikamtags.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_digikamtags exec=tdeio_digikamtags
protocol=digikamtags protocol=digikamtags
input=none input=none
output=filesystem output=filesystem

28
digikam/tdeioslave/digikamthumbnail.cpp
Unescape View File

@ -99,8 +99,8 @@ extern "C"
using namespace TDEIO; using namespace TDEIO;
using namespace Digikam; using namespace Digikam;
kio_digikamthumbnailProtocol::kio_digikamthumbnailProtocol(int argc, char** argv) tdeio_digikamthumbnailProtocol::tdeio_digikamthumbnailProtocol(int argc, char** argv)
: SlaveBase("kio_digikamthumbnail", argv[2], argv[3]) : SlaveBase("tdeio_digikamthumbnail", argv[2], argv[3])
{ {
argc_ = argc; argc_ = argc;
argv_ = argv; argv_ = argv;
@ -109,11 +109,11 @@ kio_digikamthumbnailProtocol::kio_digikamthumbnailProtocol(int argc, char** argv
createThumbnailDirs(); createThumbnailDirs();
} }
kio_digikamthumbnailProtocol::~kio_digikamthumbnailProtocol() tdeio_digikamthumbnailProtocol::~tdeio_digikamthumbnailProtocol()
{ {
} }
void kio_digikamthumbnailProtocol::get(const KURL& url) void tdeio_digikamthumbnailProtocol::get(const KURL& url)
{ {
int size = metaData("size").toInt(); int size = metaData("size").toInt();
bool exif = (metaData("exif") == "yes"); bool exif = (metaData("exif") == "yes");
@ -250,7 +250,7 @@ void kio_digikamthumbnailProtocol::get(const KURL& url)
finished(); finished();
} }
bool kio_digikamthumbnailProtocol::loadByExtension(TQImage& image, const TQString& path) bool tdeio_digikamthumbnailProtocol::loadByExtension(TQImage& image, const TQString& path)
{ {
TQFileInfo fileInfo(path); TQFileInfo fileInfo(path);
if (!fileInfo.exists()) if (!fileInfo.exists())
@ -288,12 +288,12 @@ bool kio_digikamthumbnailProtocol::loadByExtension(TQImage& image, const TQStrin
return false; return false;
} }
bool kio_digikamthumbnailProtocol::loadJPEG(TQImage& image, const TQString& path) bool tdeio_digikamthumbnailProtocol::loadJPEG(TQImage& image, const TQString& path)
{ {
return Digikam::loadJPEGScaled(image, path, cachedSize_); return Digikam::loadJPEGScaled(image, path, cachedSize_);
} }
void kio_digikamthumbnailProtocol::exifRotate(const TQString& filePath, TQImage& thumb) void tdeio_digikamthumbnailProtocol::exifRotate(const TQString& filePath, TQImage& thumb)
{ {
// Rotate thumbnail based on metadata orientation information // Rotate thumbnail based on metadata orientation information
@ -347,7 +347,7 @@ void kio_digikamthumbnailProtocol::exifRotate(const TQString& filePath, TQImage&
thumb = thumb.xForm(matrix); thumb = thumb.xForm(matrix);
} }
TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path) TQImage tdeio_digikamthumbnailProtocol::loadPNG(const TQString& path)
{ {
png_uint_32 w32, h32; png_uint_32 w32, h32;
int w, h; int w, h;
@ -493,7 +493,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
// -- Load using DImg --------------------------------------------------------------------- // -- Load using DImg ---------------------------------------------------------------------
bool kio_digikamthumbnailProtocol::loadDImg(TQImage& image, const TQString& path) bool tdeio_digikamthumbnailProtocol::loadDImg(TQImage& image, const TQString& path)
{ {
Digikam::DImg dimg_im; Digikam::DImg dimg_im;
@ -526,7 +526,7 @@ bool kio_digikamthumbnailProtocol::loadDImg(TQImage& image, const TQString& path
// -- Load using KDE API --------------------------------------------------------------------- // -- Load using KDE API ---------------------------------------------------------------------
bool kio_digikamthumbnailProtocol::loadKDEThumbCreator(TQImage& image, const TQString& path) bool tdeio_digikamthumbnailProtocol::loadKDEThumbCreator(TQImage& image, const TQString& path)
{ {
// this sucks royally. some of the thumbcreators need an instance of // this sucks royally. some of the thumbcreators need an instance of
// app running so that they can use pixmap. till they get their // app running so that they can use pixmap. till they get their
@ -597,7 +597,7 @@ bool kio_digikamthumbnailProtocol::loadKDEThumbCreator(TQImage& image, const TQS
return true; return true;
} }
void kio_digikamthumbnailProtocol::createThumbnailDirs() void tdeio_digikamthumbnailProtocol::createThumbnailDirs()
{ {
TQString path = TQDir::homeDirPath() + "/.thumbnails/"; TQString path = TQDir::homeDirPath() + "/.thumbnails/";
@ -615,19 +615,19 @@ extern "C"
DIGIKAM_EXPORT int kdemain(int argc, char **argv) DIGIKAM_EXPORT int kdemain(int argc, char **argv)
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamthumbnail" ); TDEInstance instance( "tdeio_digikamthumbnail" );
( void ) TDEGlobal::locale(); ( void ) TDEGlobal::locale();
if (argc != 4) if (argc != 4)
{ {
kdDebug() << "Usage: kio_digikamthumbnail protocol domain-socket1 domain-socket2" kdDebug() << "Usage: tdeio_digikamthumbnail protocol domain-socket1 domain-socket2"
<< endl; << endl;
exit(-1); exit(-1);
} }
KImageIO::registerFormats(); KImageIO::registerFormats();
kio_digikamthumbnailProtocol slave(argc, argv); tdeio_digikamthumbnailProtocol slave(argc, argv);
slave.dispatchLoop(); slave.dispatchLoop();
return 0; return 0;

6
digikam/tdeioslave/digikamthumbnail.h
Unescape View File

@ -35,13 +35,13 @@ class TQApplication;
class KURL; class KURL;
class kio_digikamthumbnailProtocol : public TDEIO::SlaveBase class tdeio_digikamthumbnailProtocol : public TDEIO::SlaveBase
{ {
public: public:
kio_digikamthumbnailProtocol(int argc, char** argv); tdeio_digikamthumbnailProtocol(int argc, char** argv);
virtual ~kio_digikamthumbnailProtocol(); virtual ~tdeio_digikamthumbnailProtocol();
virtual void get(const KURL& url); virtual void get(const KURL& url);
private: private:

2
digikam/tdeioslave/digikamthumbnail.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_digikamthumbnail exec=tdeio_digikamthumbnail
protocol=digikamthumbnail protocol=digikamthumbnail
input=stream input=stream
output=stream output=stream

2
digikam/utilities/batch/imageinfojob.cpp
Unescape View File

@ -94,7 +94,7 @@ void ImageInfoJob::allItemsFromAlbum(Album *album)
ds << 0; // recursive sub-album (not needed here) ds << 0; // recursive sub-album (not needed here)
ds << 0; // recursive sub-tags (not needed here) ds << 0; // recursive sub-tags (not needed here)
// Protocol = digikamalbums -> kio_digikamalbums // Protocol = digikamalbums -> tdeio_digikamalbums
d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL, d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL,
ba, TQByteArray(), false); ba, TQByteArray(), false);

Write Preview
Loading…
Cancel
Save