[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam] /: rename class
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2015-11-15 16:35:23
Message-ID: E1Zy0Gx-0007rx-SI () scm ! kde ! org
[Download RAW message or body]
Git commit 1aaa93259ec98e7f11a91967de7f814bd2f5493d by Gilles Caulier.
Committed on 15/11/2015 at 16:35.
Pushed by cgilles into branch 'master'.
rename class
M +10 -10 libs/album/album.cpp
M +6 -6 libs/album/album.h
M +3 -3 libs/album/albummanager.cpp
M +1 -1 libs/database/CMakeLists.txt
M +1 -1 libs/database/collection/collectionmanager.h
R +76 -76 libs/database/coredb/coredburl.cpp [from: \
libs/database/coredb/databaseurl.cpp - 066% similarity] R +24 -24 \
libs/database/coredb/coredburl.h [from: libs/database/coredb/databaseurl.h - 082% \
similarity] M +1 -1 libs/database/dbjobs/dbjobinfo.h
M +3 -3 libs/database/item/imageinfo.cpp
M +2 -2 libs/database/item/imageinfo.h
M +1 -1 libs/database/item/imageinfodata.h
M +1 -1 libs/database/item/imagelister.cpp
M +2 -2 libs/database/item/imagelister.h
M +2 -2 libs/database/item/imagescanner.cpp
M +3 -3 libs/dialogs/deletedialog.cpp
M +3 -3 libs/models/imagealbummodel.cpp
M +1 -1 utilities/maintenance/imageinfojob.cpp
http://commits.kde.org/digikam/1aaa93259ec98e7f11a91967de7f814bd2f5493d
diff --git a/libs/album/album.cpp b/libs/album/album.cpp
index eb27d4c..43d19fc 100644
--- a/libs/album/album.cpp
+++ b/libs/album/album.cpp
@@ -36,7 +36,7 @@
#include "albummanager.h"
#include "collectionmanager.h"
#include "databaseaccess.h"
-#include "databaseurl.h"
+#include "coredburl.h"
#include "tagscache.h"
namespace Digikam
@@ -457,9 +457,9 @@ QString PAlbum::albumPath() const
return m_parentPath + m_path;
}
-DatabaseUrl PAlbum::databaseUrl() const
+CoreDbUrl PAlbum::databaseUrl() const
{
- return DatabaseUrl::fromAlbumAndName(QString(), albumPath(), \
QUrl::fromLocalFile(albumRootPath()), m_albumRootId); + return \
CoreDbUrl::fromAlbumAndName(QString(), albumPath(), \
QUrl::fromLocalFile(albumRootPath()), m_albumRootId); }
QString PAlbum::prettyUrl() const
@@ -529,9 +529,9 @@ QString TAlbum::prettyUrl() const
return i18n("Tags") + tagPath(true);
}
-DatabaseUrl TAlbum::databaseUrl() const
+CoreDbUrl TAlbum::databaseUrl() const
{
- return DatabaseUrl::fromTagIds(tagIDs());
+ return CoreDbUrl::fromTagIds(tagIDs());
}
QList<int> TAlbum::tagIDs() const
@@ -619,14 +619,14 @@ DAlbum::Range DAlbum::range() const
return m_range;
}
-DatabaseUrl DAlbum::databaseUrl() const
+CoreDbUrl DAlbum::databaseUrl() const
{
if (m_range == Month)
{
- return DatabaseUrl::fromDateForMonth(m_date);
+ return CoreDbUrl::fromDateForMonth(m_date);
}
- return DatabaseUrl::fromDateForYear(m_date);
+ return CoreDbUrl::fromDateForYear(m_date);
}
// --------------------------------------------------------------------------
@@ -648,9 +648,9 @@ void SAlbum::setSearch(DatabaseSearch::Type type, const QString& \
query) m_query = query;
}
-DatabaseUrl SAlbum::databaseUrl() const
+CoreDbUrl SAlbum::databaseUrl() const
{
- return DatabaseUrl::searchUrl(id());
+ return CoreDbUrl::searchUrl(id());
}
QString SAlbum::query() const
diff --git a/libs/album/album.h b/libs/album/album.h
index b74907d..bc20bd4 100644
--- a/libs/album/album.h
+++ b/libs/album/album.h
@@ -50,7 +50,7 @@ namespace Digikam
class Album;
typedef QList<Album*> AlbumList;
-class DatabaseUrl;
+class CoreDbUrl;
/**
* \class Album
@@ -159,7 +159,7 @@ public:
/**
* @return the kde url of the album
*/
- virtual DatabaseUrl databaseUrl() const = 0;
+ virtual CoreDbUrl databaseUrl() const = 0;
/**
* @return true is the album is a Root Album
@@ -369,7 +369,7 @@ public:
QString albumPath() const;
QString prettyUrl() const;
QString folderPath() const;
- DatabaseUrl databaseUrl() const;
+ CoreDbUrl databaseUrl() const;
QUrl fileUrl() const;
qlonglong iconId() const;
bool isAlbumRoot() const;
@@ -413,7 +413,7 @@ public:
* The root TAlbum returns "/" resp. "".
*/
QString tagPath(bool leadingSlash = true) const;
- DatabaseUrl databaseUrl() const;
+ CoreDbUrl databaseUrl() const;
QString prettyUrl() const;
QString icon() const;
qlonglong iconId() const;
@@ -456,7 +456,7 @@ public:
QDate date() const;
Range range() const;
- DatabaseUrl databaseUrl() const;
+ CoreDbUrl databaseUrl() const;
private:
@@ -479,7 +479,7 @@ public:
SAlbum(const QString& title, int id, bool root=false);
~SAlbum();
- DatabaseUrl databaseUrl() const;
+ CoreDbUrl databaseUrl() const;
QString query() const;
DatabaseSearch::Type searchType() const;
bool isNormalSearch() const;
diff --git a/libs/album/albummanager.cpp b/libs/album/albummanager.cpp
index c1bbecb..6e055ff 100644
--- a/libs/album/albummanager.cpp
+++ b/libs/album/albummanager.cpp
@@ -85,7 +85,7 @@ extern "C"
#include "databaseparameters.h"
#include "databaseserverstarter.h"
#include "coredbthumbinfoprovider.h"
-#include "databaseurl.h"
+#include "coredburl.h"
#include "coredbwatch.h"
#include "dio.h"
#include "facetags.h"
@@ -2196,7 +2196,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* parent,
child = static_cast<PAlbum*>(child->m_next);
}
- DatabaseUrl url = parent->databaseUrl();
+ CoreDbUrl url = parent->databaseUrl();
url = url.adjusted(QUrl::StripTrailingSlash);
url.setPath(url.path() + QLatin1Char('/') + name);
QUrl fileUrl = url.fileUrl();
@@ -2938,7 +2938,7 @@ void AlbumManager::removePAlbum(PAlbum* album)
d->albumPathHash.remove(album);
d->allAlbumsIdHash.remove(album->globalID());
- DatabaseUrl url = album->databaseUrl();
+ CoreDbUrl url = album->databaseUrl();
if(!d->currentAlbums.isEmpty())
{
diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt
index c0c3ea2..f9dfe0f 100644
--- a/libs/database/CMakeLists.txt
+++ b/libs/database/CMakeLists.txt
@@ -46,7 +46,6 @@ set(libdatabase_SRCS
collection/collectionscannerhints.cpp
coredb/databaseaccess.cpp
- coredb/databaseurl.cpp
coredb/downloadhistory.cpp
coredb/namefilter.cpp
coredb/searchxml.cpp
@@ -61,6 +60,7 @@ set(libdatabase_SRCS
coredb/coredbbackend.cpp
coredb/coredbwatch.cpp
coredb/coredbwatchadaptor.cpp
+ coredb/coredburl.cpp
tags/tagproperties.cpp
tags/tagscache.cpp
diff --git a/libs/database/collection/collectionmanager.h \
b/libs/database/collection/collectionmanager.h index c630771..495333f 100644
--- a/libs/database/collection/collectionmanager.h
+++ b/libs/database/collection/collectionmanager.h
@@ -210,7 +210,7 @@ public:
* Only available (or hidden, but available) album roots are guaranteed to be \
found.
*/
bool isAlbumRoot(const QUrl& fileUrl);
- /// the file path should not end with the directory slash. Using DatabaseUrl's \
method is fine. + /// the file path should not end with the directory slash. Using \
CoreDbUrl's method is fine. bool isAlbumRoot(const QString& filePath);
/**
diff --git a/libs/database/coredb/databaseurl.cpp \
b/libs/database/coredb/coredburl.cpp similarity index 66%
rename from libs/database/coredb/databaseurl.cpp
rename to libs/database/coredb/coredburl.cpp
index ea768c0..992a1ce 100644
--- a/libs/database/coredb/databaseurl.cpp
+++ b/libs/database/coredb/coredburl.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2007-03-19
- * Description : Handling of database specific URLs
+ * Description : Core database Url interface.
*
* Copyright (C) 2007-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
@@ -21,7 +21,7 @@
*
* ============================================================ */
-#include "databaseurl.h"
+#include "coredburl.h"
// Qt includes
@@ -37,21 +37,21 @@
namespace Digikam
{
-DatabaseUrl DatabaseUrl::fromFileUrl(const QUrl& fileUrl,
- const QUrl& albumRoot,
- const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::fromFileUrl(const QUrl& fileUrl,
+ const QUrl& albumRoot,
+ const DatabaseParameters& parameters)
{
CollectionLocation location = \
CollectionManager::instance()->locationForAlbumRoot(albumRoot);
return fromFileUrl(fileUrl, albumRoot, location.id(), parameters);
}
-DatabaseUrl DatabaseUrl::fromFileUrl(const QUrl& fileUrl,
- const QUrl& albumRoot,
- int albumRootId,
- const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::fromFileUrl(const QUrl& fileUrl,
+ const QUrl& albumRoot,
+ int albumRootId,
+ const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikamalbums"));
// get album root path without trailing slash
QString albumRootPath = \
albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile(); @@ -66,28 +66,28 @@ \
DatabaseUrl DatabaseUrl::fromFileUrl(const QUrl& fileUrl,
url.setParameters(parameters);
-// qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::fromFileUrl : " << \
url.toDisplayString(); +// qCDebug(DIGIKAM_DATABASE_LOG) << \
"CoreDbUrl::fromFileUrl : " << url.toDisplayString();
return url;
}
-DatabaseUrl DatabaseUrl::fromAlbumAndName(const QString& name,
- const QString& album,
- const QUrl& albumRoot,
- const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name,
+ const QString& album,
+ const QUrl& albumRoot,
+ const DatabaseParameters& parameters)
{
CollectionLocation location = \
CollectionManager::instance()->locationForAlbumRoot(albumRoot);
return fromAlbumAndName(name, album, albumRoot, location.id(), parameters);
}
-DatabaseUrl DatabaseUrl::fromAlbumAndName(const QString& name,
- const QString& album,
- const QUrl& albumRoot,
- int albumRootId,
- const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name,
+ const QString& album,
+ const QUrl& albumRoot,
+ int albumRootId,
+ const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikamalbums"));
url.setPath(QLatin1String("/"));
@@ -100,25 +100,25 @@ DatabaseUrl DatabaseUrl::fromAlbumAndName(const QString& name,
url.setQuery(q);
url.setParameters(parameters);
-// qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::fromAlbumAndName : " << \
url.toDisplayString(); +// qCDebug(DIGIKAM_DATABASE_LOG) << \
"CoreDbUrl::fromAlbumAndName : " << url.toDisplayString();
return url;
}
-DatabaseUrl DatabaseUrl::albumUrl(const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::albumUrl(const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikamalbums"));
url.setParameters(parameters);
- qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::albumUrl : " << \
url.toDisplayString(); + qCDebug(DIGIKAM_DATABASE_LOG) << "CoreDbUrl::albumUrl : " \
<< url.toDisplayString(); return url;
}
-DatabaseUrl DatabaseUrl::fromTagIds(const QList<int>& tagIds,
- const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::fromTagIds(const QList<int>& tagIds,
+ const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikamtags"));
for (QList<int>::const_iterator it = tagIds.constBegin(); it != \
tagIds.constEnd(); ++it) @@ -128,23 +128,23 @@ DatabaseUrl \
DatabaseUrl::fromTagIds(const QList<int>& tagIds,
url.setParameters(parameters);
-// qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::fromTagIds : " << \
url.toDisplayString(); +// qCDebug(DIGIKAM_DATABASE_LOG) << "CoreDbUrl::fromTagIds \
: " << url.toDisplayString();
return url;
}
-DatabaseUrl DatabaseUrl::dateUrl(const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::dateUrl(const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikamdates"));
url.setParameters(parameters);
-// qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::dateUrl : " << \
url.toDisplayString(); +// qCDebug(DIGIKAM_DATABASE_LOG) << "CoreDbUrl::dateUrl : \
" << url.toDisplayString();
return url;
}
-DatabaseUrl DatabaseUrl::fromDateForMonth(const QDate& date, const \
DatabaseParameters& parameters) +CoreDbUrl CoreDbUrl::fromDateForMonth(const QDate& \
date, const DatabaseParameters& parameters) {
QDate firstDayOfMonth(date.year(), date.month(), 1);
QDate firstDayOfNextMonth = firstDayOfMonth.addMonths(1);
@@ -152,7 +152,7 @@ DatabaseUrl DatabaseUrl::fromDateForMonth(const QDate& date, \
const DatabaseParam
return ( fromDateRange(firstDayOfMonth, firstDayOfNextMonth, parameters) );
}
-DatabaseUrl DatabaseUrl::fromDateForYear(const QDate& date, const \
DatabaseParameters& parameters) +CoreDbUrl CoreDbUrl::fromDateForYear(const QDate& \
date, const DatabaseParameters& parameters) {
QDate firstDayOfYear(date.year(), 1, 1);
QDate firstDayOfNextYear = firstDayOfYear.addYears(1);
@@ -160,36 +160,36 @@ DatabaseUrl DatabaseUrl::fromDateForYear(const QDate& date, \
const DatabaseParame
return ( fromDateRange(firstDayOfYear, firstDayOfNextYear, parameters) );
}
-DatabaseUrl DatabaseUrl::fromDateRange(const QDate& startDate,
- const QDate& endDate,
- const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::fromDateRange(const QDate& startDate,
+ const QDate& endDate,
+ const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikamdates"));
url.setPath(startDate.toString(Qt::ISODate) + QLatin1Char('/') + \
endDate.toString(Qt::ISODate)); url.setParameters(parameters);
-// qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::fromDateRange : " << \
url.toDisplayString(); +// qCDebug(DIGIKAM_DATABASE_LOG) << \
"CoreDbUrl::fromDateRange : " << url.toDisplayString();
return url;
}
-DatabaseUrl DatabaseUrl::mapImagesUrl(const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::mapImagesUrl(const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikammapimages"));
url.setParameters(parameters);
-// qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::mapImagesUrl : " << \
url.toDisplayString(); +// qCDebug(DIGIKAM_DATABASE_LOG) << \
"CoreDbUrl::mapImagesUrl : " << url.toDisplayString();
return url;
}
-DatabaseUrl DatabaseUrl::fromAreaRange(const qreal lat1, const qreal lat2,
- const qreal lng1, const qreal lng2,
- const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::fromAreaRange(const qreal lat1, const qreal lat2,
+ const qreal lng1, const qreal lng2,
+ const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikammapimages"));
QUrlQuery q(url);
@@ -201,14 +201,14 @@ DatabaseUrl DatabaseUrl::fromAreaRange(const qreal lat1, const \
qreal lat2,
url.setParameters(parameters);
-// qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::fromAreaRange : " << \
url.toDisplayString(); +// qCDebug(DIGIKAM_DATABASE_LOG) << \
"CoreDbUrl::fromAreaRange : " << url.toDisplayString();
return url;
}
-DatabaseUrl DatabaseUrl::searchUrl(int id, const DatabaseParameters& parameters)
+CoreDbUrl CoreDbUrl::searchUrl(int id, const DatabaseParameters& parameters)
{
- DatabaseUrl url;
+ CoreDbUrl url;
url.setScheme(QLatin1String("digikamsearch"));
QUrlQuery q(url);
@@ -217,46 +217,46 @@ DatabaseUrl DatabaseUrl::searchUrl(int id, const \
DatabaseParameters& parameters)
url.setParameters(parameters);
-// qCDebug(DIGIKAM_DATABASE_LOG) << "DatabaseUrl::searchUrl : " << \
url.toDisplayString(); +// qCDebug(DIGIKAM_DATABASE_LOG) << "CoreDbUrl::searchUrl \
: " << url.toDisplayString();
return url;
}
-DatabaseUrl::DatabaseUrl(const QUrl& digikamalbumsUrl)
+CoreDbUrl::CoreDbUrl(const QUrl& digikamalbumsUrl)
: QUrl(digikamalbumsUrl)
{
}
-DatabaseUrl::DatabaseUrl(const DatabaseUrl& url)
+CoreDbUrl::CoreDbUrl(const CoreDbUrl& url)
: QUrl(url)
{
}
-DatabaseUrl::DatabaseUrl()
+CoreDbUrl::CoreDbUrl()
{
}
-DatabaseUrl& DatabaseUrl::operator=(const QUrl& digikamalbumsUrl)
+CoreDbUrl& CoreDbUrl::operator=(const QUrl& digikamalbumsUrl)
{
QUrl::operator=(digikamalbumsUrl);
return *this;
}
-DatabaseUrl& DatabaseUrl::operator=(const DatabaseUrl& url)
+CoreDbUrl& CoreDbUrl::operator=(const CoreDbUrl& url)
{
QUrl::operator=(url);
return *this;
}
-bool DatabaseUrl::operator==(const QUrl& digikamalbumsUrl) const
+bool CoreDbUrl::operator==(const QUrl& digikamalbumsUrl) const
{
return ( QUrl::operator==(digikamalbumsUrl) );
}
/*
-DatabaseUrl::operator DatabaseParameters() const
+CoreDbUrl::operator DatabaseParameters() const
{
return parameters();
}
@@ -264,46 +264,46 @@ DatabaseUrl::operator DatabaseParameters() const
// --- Database parameters \
---------------------------------------------------------------------
-DatabaseParameters DatabaseUrl::parameters() const
+DatabaseParameters CoreDbUrl::parameters() const
{
return DatabaseParameters(*this);
}
-void DatabaseUrl::setParameters(const DatabaseParameters& parameters)
+void CoreDbUrl::setParameters(const DatabaseParameters& parameters)
{
parameters.insertInUrl(*this);
}
// --- Protocol --------------------------------------------------------------------------------
-bool DatabaseUrl::isAlbumUrl() const
+bool CoreDbUrl::isAlbumUrl() const
{
return ( scheme() == QLatin1String("digikamalbums") );
}
-bool DatabaseUrl::isTagUrl() const
+bool CoreDbUrl::isTagUrl() const
{
return ( scheme() == QLatin1String("digikamtags") );
}
-bool DatabaseUrl::isDateUrl() const
+bool CoreDbUrl::isDateUrl() const
{
return ( scheme() == QLatin1String("digikamdates") );
}
-bool DatabaseUrl::isMapImagesUrl() const
+bool CoreDbUrl::isMapImagesUrl() const
{
return ( scheme() == QLatin1String("digikammapimages") );
}
-bool DatabaseUrl::isSearchUrl() const
+bool CoreDbUrl::isSearchUrl() const
{
return ( scheme() == QLatin1String("digikamsearch") );
}
// --- Album URL ----------------------------------------------------------------------------
-QUrl DatabaseUrl::albumRoot() const
+QUrl CoreDbUrl::albumRoot() const
{
QString albumRoot = QUrlQuery(*this).queryItemValue(QLatin1String("albumRoot"));
@@ -317,17 +317,17 @@ QUrl DatabaseUrl::albumRoot() const
return QUrl();
}
-QString DatabaseUrl::albumRootPath() const
+QString CoreDbUrl::albumRootPath() const
{
return ( QUrlQuery(*this).queryItemValue(QLatin1String("albumRoot")));
}
-int DatabaseUrl::albumRootId() const
+int CoreDbUrl::albumRootId() const
{
return ( QUrlQuery(*this).queryItemValue(QLatin1String("albumRootId")).toInt() \
); }
-QString DatabaseUrl::album() const
+QString CoreDbUrl::album() const
{
// obey trailing slash in the path - albums have a trailing slash
// get result without trailing slash
@@ -336,13 +336,13 @@ QString DatabaseUrl::album() const
return ( url.adjusted(QUrl::StripTrailingSlash).path() );
}
-QString DatabaseUrl::name() const
+QString CoreDbUrl::name() const
{
// do not ignore trailing slash in the path - albums have a trailing slash
return fileName();
}
-QUrl DatabaseUrl::fileUrl() const
+QUrl CoreDbUrl::fileUrl() const
{
QUrl fileUrl = QUrl::fromLocalFile(albumRoot().toString() + path());
@@ -351,7 +351,7 @@ QUrl DatabaseUrl::fileUrl() const
// --- Tag URL ------------------------------------------------------------------------
-int DatabaseUrl::tagId() const
+int CoreDbUrl::tagId() const
{
if (path() == QLatin1String("/"))
{
@@ -361,7 +361,7 @@ int DatabaseUrl::tagId() const
return ( fileName().toInt() );
}
-QList<int> DatabaseUrl::tagIds() const
+QList<int> CoreDbUrl::tagIds() const
{
QList<int> ids;
QStringList stringIds = path().split(QLatin1Char('/'), QString::SkipEmptyParts);
@@ -376,7 +376,7 @@ QList<int> DatabaseUrl::tagIds() const
// --- Date URL -----------------------------------------------------------------------
-QDate DatabaseUrl::startDate() const
+QDate CoreDbUrl::startDate() const
{
QStringList dates = path().split(QLatin1Char('/'));
@@ -388,7 +388,7 @@ QDate DatabaseUrl::startDate() const
return QDate();
}
-QDate DatabaseUrl::endDate() const
+QDate CoreDbUrl::endDate() const
{
QStringList dates = path().split(QLatin1Char('/'));
@@ -404,7 +404,7 @@ QDate DatabaseUrl::endDate() const
// --- MapImages URL \
--------------------------------------------------------------------------------
-bool DatabaseUrl::areaCoordinates(double* lat1, double* lat2, double* lon1, double* \
lon2) const +bool CoreDbUrl::areaCoordinates(double* lat1, double* lat2, double* \
lon1, double* lon2) const {
bool ok;
bool allOk = true;
@@ -422,7 +422,7 @@ bool DatabaseUrl::areaCoordinates(double* lat1, double* lat2, \
double* lon1, doub
// --- Search URL --------------------------------------------------------------------
-int DatabaseUrl::searchId() const
+int CoreDbUrl::searchId() const
{
return QUrlQuery(*this).queryItemValue(QLatin1String("searchId")).toInt();
}
diff --git a/libs/database/coredb/databaseurl.h b/libs/database/coredb/coredburl.h
similarity index 82%
rename from libs/database/coredb/databaseurl.h
rename to libs/database/coredb/coredburl.h
index 927d610..665247d 100644
--- a/libs/database/coredb/databaseurl.h
+++ b/libs/database/coredb/coredburl.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2007-03-19
- * Description : Handling of database specific URLs
+ * Description : Core database Url interface.
*
* Copyright (C) 2007-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef DATABASEURL_H
-#define DATABASEURL_H
+#ifndef COREDATABASEURL_H
+#define COREDATABASEURL_H
// Qt includes
@@ -39,7 +39,7 @@
namespace Digikam
{
-class DIGIKAM_DATABASE_EXPORT DatabaseUrl : public QUrl
+class DIGIKAM_DATABASE_EXPORT CoreDbUrl : public QUrl
{
public:
@@ -60,12 +60,12 @@ public:
* (if the file is "/media/fotos/Summer 2007/001.jpg", the album root may be \
"/media/fotos")
* - The parameters of the database that is referenced
*/
- static DatabaseUrl fromFileUrl(const QUrl& fileUrl,
+ static CoreDbUrl fromFileUrl(const QUrl& fileUrl,
const QUrl& albumRoot,
int albumRootId,
const DatabaseParameters& parameters = \
DatabaseAccess::parameters());
- static DatabaseUrl fromFileUrl(const QUrl& fileUrl,
+ static CoreDbUrl fromFileUrl(const QUrl& fileUrl,
const QUrl& albumRoot,
const DatabaseParameters& parameters = \
DatabaseAccess::parameters());
@@ -74,13 +74,13 @@ public:
* If name is empty, the album is referenced.
* Other parameters as above.
*/
- static DatabaseUrl fromAlbumAndName(const QString& name,
+ static CoreDbUrl fromAlbumAndName(const QString& name,
const QString& album,
const QUrl& albumRoot,
int albumRootId,
const DatabaseParameters& parameters = \
DatabaseAccess::parameters());
- static DatabaseUrl fromAlbumAndName(const QString& name,
+ static CoreDbUrl fromAlbumAndName(const QString& name,
const QString& album,
const QUrl& albumRoot,
const DatabaseParameters& parameters = \
DatabaseAccess::parameters()); @@ -88,33 +88,33 @@ public:
/**
* Create an empty digikamalbums:/ url
*/
- static DatabaseUrl albumUrl(const DatabaseParameters& parameters = \
DatabaseAccess::parameters()); + static CoreDbUrl albumUrl(const \
DatabaseParameters& parameters = DatabaseAccess::parameters());
/**
* Create a digikamtags:/ url from a list of tag IDs, where this list is the tag \
hierarchy
* of the referenced tag, with the topmost parent first, and the tag last in the \
list.
* An empty list references the root tag.
*/
- static DatabaseUrl fromTagIds(const QList<int>& tagIds,
+ static CoreDbUrl fromTagIds(const QList<int>& tagIds,
const DatabaseParameters& parameters = \
DatabaseAccess::parameters());
/**
* Create an empty digikamdates:/ url
*/
- static DatabaseUrl dateUrl(const DatabaseParameters& parameters = \
DatabaseAccess::parameters()); + static CoreDbUrl dateUrl(const \
DatabaseParameters& parameters = DatabaseAccess::parameters());
/**
* Create a digikamdates:/ url for the month of the given date.
* (The whole month of the given date will included in the referenced time span)
*/
- static DatabaseUrl fromDateForMonth(const QDate& date,
+ static CoreDbUrl fromDateForMonth(const QDate& date,
const DatabaseParameters& parameters = \
DatabaseAccess::parameters());
/**
* Create a digikamdates:/ url for the year of the given date.
* (The whole year of the given date will included in the referenced time span)
*/
- static DatabaseUrl fromDateForYear(const QDate& date,
+ static CoreDbUrl fromDateForYear(const QDate& date,
const DatabaseParameters& parameters = \
DatabaseAccess::parameters());
/**
@@ -122,30 +122,30 @@ public:
* start date (inclusive) and ends before the end date (exclusive).
* To cover the whole year of 1984, you would pass 1/1/1984 and 1/1/1985.
*/
- static DatabaseUrl fromDateRange(const QDate& startDate, const QDate& endDate,
+ static CoreDbUrl fromDateRange(const QDate& startDate, const QDate& endDate,
const DatabaseParameters& parameters = \
DatabaseAccess::parameters());
/**
* Create an empty digikammapimages:/ url
*/
- static DatabaseUrl mapImagesUrl(const DatabaseParameters& parameters = \
DatabaseAccess::parameters()); + static CoreDbUrl mapImagesUrl(const \
DatabaseParameters& parameters = DatabaseAccess::parameters());
- static DatabaseUrl fromAreaRange(const qreal lat1, const qreal lng1, const qreal \
lat2, const qreal lng2, const DatabaseParameters& parameters = \
DatabaseAccess::parameters()); + static CoreDbUrl fromAreaRange(const qreal lat1, \
const qreal lng1, const qreal lat2, const qreal lng2, const DatabaseParameters& \
parameters = DatabaseAccess::parameters());
/**
* Create a digikamsearch: URL for the search with the given id.
*/
- static DatabaseUrl searchUrl(int searchId, const DatabaseParameters& parameters \
= DatabaseAccess::parameters()); + static CoreDbUrl searchUrl(int searchId, const \
DatabaseParameters& parameters = DatabaseAccess::parameters());
/**
- * Create a DatabaseUrl object from a QUrl, to retrieve the information stored
+ * Create a CoreDbUrl object from a QUrl, to retrieve the information stored
*/
- DatabaseUrl(const QUrl& digikamUrl);
+ CoreDbUrl(const QUrl& digikamUrl);
/**
* Create an invalid database URL
*/
- DatabaseUrl();
+ CoreDbUrl();
/**
* These test for the protocol of this URL.
@@ -249,14 +249,14 @@ public:
*/
int searchId() const;
- DatabaseUrl(const DatabaseUrl& url);
+ CoreDbUrl(const CoreDbUrl& url);
- DatabaseUrl& operator=(const QUrl& digikamalbumsUrl);
- DatabaseUrl& operator=(const DatabaseUrl& url);
+ CoreDbUrl& operator=(const QUrl& digikamalbumsUrl);
+ CoreDbUrl& operator=(const CoreDbUrl& url);
bool operator==(const QUrl& digikamalbumsUrl) const;
};
} // namespace Digikam
-#endif // DATABASEURL_H
+#endif // COREDATABASEURL_H
diff --git a/libs/database/dbjobs/dbjobinfo.h b/libs/database/dbjobs/dbjobinfo.h
index 04e7753..fc759a6 100644
--- a/libs/database/dbjobs/dbjobinfo.h
+++ b/libs/database/dbjobs/dbjobinfo.h
@@ -30,7 +30,7 @@
// Local includes
-#include "databaseurl.h"
+#include "coredburl.h"
#include "digikam_export.h"
namespace Digikam
diff --git a/libs/database/item/imageinfo.cpp b/libs/database/item/imageinfo.cpp
index b93ac78..999fa75 100644
--- a/libs/database/item/imageinfo.cpp
+++ b/libs/database/item/imageinfo.cpp
@@ -756,18 +756,18 @@ int ImageInfo::orientation() const
return values.first().toInt();
}
-DatabaseUrl ImageInfo::databaseUrl() const
+CoreDbUrl ImageInfo::databaseUrl() const
{
if (!m_data)
{
- return DatabaseUrl();
+ return CoreDbUrl();
}
QString album = \
ImageInfoStatic::cache()->albumRelativePath(m_data->albumId);
QString albumRoot = \
CollectionManager::instance()->albumRootPath(m_data->albumRootId);
ImageInfoReadLocker lock;
- return DatabaseUrl::fromAlbumAndName(m_data->name, album, \
QUrl::fromLocalFile(albumRoot), m_data->albumRootId); + return \
CoreDbUrl::fromAlbumAndName(m_data->name, album, QUrl::fromLocalFile(albumRoot), \
m_data->albumRootId); }
QUrl ImageInfo::fileUrl() const
diff --git a/libs/database/item/imageinfo.h b/libs/database/item/imageinfo.h
index 9172ca6..497297f 100644
--- a/libs/database/item/imageinfo.h
+++ b/libs/database/item/imageinfo.h
@@ -40,7 +40,7 @@
#include "albuminfo.h"
#include "digikam_export.h"
#include "dshareddata.h"
-#include "databaseurl.h"
+#include "coredburl.h"
#include "imageinfolist.h"
#include "coredbfields.h"
@@ -156,7 +156,7 @@ public:
* The returned object can be used as a QUrl.
* Always use this for KIO operations
*/
- DatabaseUrl databaseUrl() const;
+ CoreDbUrl databaseUrl() const;
/**
* Returns the file:// url.
diff --git a/libs/database/item/imageinfodata.h b/libs/database/item/imageinfodata.h
index ff69086..f686fc2 100644
--- a/libs/database/item/imageinfodata.h
+++ b/libs/database/item/imageinfodata.h
@@ -37,7 +37,7 @@
// Local includes
-#include "databaseurl.h"
+#include "coredburl.h"
#include "dshareddata.h"
#include "albuminfo.h"
#include "imageinfocache.h"
diff --git a/libs/database/item/imagelister.cpp b/libs/database/item/imagelister.cpp
index 0804f76..b5f97bb 100644
--- a/libs/database/item/imagelister.cpp
+++ b/libs/database/item/imagelister.cpp
@@ -129,7 +129,7 @@ void ImageLister::setAllowExtraValues(bool useExtraValue)
d->allowExtraValues = useExtraValue;
}
-void ImageLister::list(ImageListerReceiver* const receiver, const DatabaseUrl& url)
+void ImageLister::list(ImageListerReceiver* const receiver, const CoreDbUrl& url)
{
if (url.isAlbumUrl())
{
diff --git a/libs/database/item/imagelister.h b/libs/database/item/imagelister.h
index f399bee..e8a8507 100644
--- a/libs/database/item/imagelister.h
+++ b/libs/database/item/imagelister.h
@@ -37,7 +37,7 @@
#include "imageinfo.h"
#include "imageinfolist.h"
#include "databaseaccess.h"
-#include "databaseurl.h"
+#include "coredburl.h"
#include "imagelisterrecord.h"
#include "imagelisterreceiver.h"
#include "dbjobinfo.h"
@@ -73,7 +73,7 @@ public:
/**
* Convenience method for Album, Tag and Date URLs, _not_ for Search URLs.
*/
- void list(ImageListerReceiver* const receiver, const DatabaseUrl& url);
+ void list(ImageListerReceiver* const receiver, const CoreDbUrl& url);
/**
* List images in the Album (physical album) specified by albumRoot, album.
diff --git a/libs/database/item/imagescanner.cpp \
b/libs/database/item/imagescanner.cpp index 2f670f1..64467d4 100644
--- a/libs/database/item/imagescanner.cpp
+++ b/libs/database/item/imagescanner.cpp
@@ -36,7 +36,7 @@
// Local includes
#include "digikam_debug.h"
-#include "databaseurl.h"
+#include "coredburl.h"
#include "databaseaccess.h"
#include "albumdb.h"
#include "collectionlocation.h"
@@ -187,7 +187,7 @@ ImageScanner::ImageScanner(qlonglong imageid)
}
QString albumRootPath = \
CollectionManager::instance()->albumRootPath(shortInfo.albumRootID);
- d->fileInfo = \
QFileInfo(DatabaseUrl::fromAlbumAndName(shortInfo.itemName, + d->fileInfo \
= QFileInfo(CoreDbUrl::fromAlbumAndName(shortInfo.itemName,
shortInfo.album, \
QUrl::fromLocalFile(albumRootPath), shortInfo.albumRootID).fileUrl().toLocalFile()); \
}
diff --git a/libs/dialogs/deletedialog.cpp b/libs/dialogs/deletedialog.cpp
index e03a0e7..44b399d 100644
--- a/libs/dialogs/deletedialog.cpp
+++ b/libs/dialogs/deletedialog.cpp
@@ -53,7 +53,7 @@
#include "digikam_debug.h"
#include "applicationsettings.h"
-#include "databaseurl.h"
+#include "coredburl.h"
namespace Digikam
{
@@ -81,7 +81,7 @@ DeleteItem::DeleteItem(QTreeWidget* const parent, const QUrl& url)
if (d->url.scheme() == QLatin1String("digikamalbums"))
{
- if (DatabaseUrl(d->url).isAlbumUrl())
+ if (CoreDbUrl(d->url).isAlbumUrl())
{
setThumb(QIcon::fromTheme(QLatin1String("folder")).pixmap(parent->iconSize().width()));
}
@@ -121,7 +121,7 @@ QString DeleteItem::fileUrl() const
}
else if (d->url.scheme() == QLatin1String("digikamalbums"))
{
- return (DatabaseUrl(d->url).fileUrl().toLocalFile());
+ return (CoreDbUrl(d->url).fileUrl().toLocalFile());
}
return (d->url.toDisplayString());
diff --git a/libs/models/imagealbummodel.cpp b/libs/models/imagealbummodel.cpp
index 378054c..690274e 100644
--- a/libs/models/imagealbummodel.cpp
+++ b/libs/models/imagealbummodel.cpp
@@ -36,7 +36,7 @@
#include "coredbchangesets.h"
#include "databaseface.h"
#include "coredbwatch.h"
-#include "databaseurl.h"
+#include "coredburl.h"
#include "imageinfo.h"
#include "imageinfolist.h"
#include "imagelister.h"
@@ -321,7 +321,7 @@ void ImageAlbumModel::startListJob(QList<Album*> albums)
d->jobThread = 0;
}
- DatabaseUrl url;
+ CoreDbUrl url;
QList<int> tagIds;
if (albums.first()->isTrashAlbum())
@@ -336,7 +336,7 @@ void ImageAlbumModel::startListJob(QList<Album*> albums)
tagIds << (*it)->id();
}
- url = DatabaseUrl::fromTagIds(tagIds);
+ url = CoreDbUrl::fromTagIds(tagIds);
}
else
{
diff --git a/utilities/maintenance/imageinfojob.cpp \
b/utilities/maintenance/imageinfojob.cpp index b108c3b..20c4d7a 100644
--- a/utilities/maintenance/imageinfojob.cpp
+++ b/utilities/maintenance/imageinfojob.cpp
@@ -82,7 +82,7 @@ void ImageInfoJob::allItemsFromAlbum(Album* const album)
}
// TODO: Drop Database Url usage
- DatabaseUrl url = album->databaseUrl();
+ CoreDbUrl url = album->databaseUrl();
if(album->type() == Album::DATE)
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic