[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdesvn] src: Cleanup DateTime class - ctors are explciit now, removed unused functions
From: Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date: 2016-10-09 13:16:16
Message-ID: E1btDxg-0003lJ-Mn () code ! kde ! org
[Download RAW message or body]
Git commit 9d3f3d83b6fc9a7a6447dc65f1e8a1a57ac156d5 by Christian Ehrlicher.
Committed on 09/10/2016 at 13:14.
Pushed by chehrlic into branch 'master'.
Cleanup DateTime class - ctors are explciit now, removed unused functions
M +3 -4 src/kiosvn/kiosvn.cpp
M +1 -1 src/svnfrontend/commandexec.cpp
M +1 -1 src/svnfrontend/models/logmodelhelper.cpp
M +3 -3 src/svnfrontend/svnactions.cpp
M +1 -1 src/svnfrontend/svnitem.cpp
M +0 -57 src/svnqt/datetime.cpp
M +9 -30 src/svnqt/datetime.h
M +2 -2 src/svnqt/entry.cpp
M +4 -4 src/svnqt/info_entry.cpp
M +8 -9 src/svnqt/lock_entry.cpp
M +1 -1 src/svnqt/log_entry.h
M +1 -1 src/svnqt/revision.cpp
http://commits.kde.org/kdesvn/9d3f3d83b6fc9a7a6447dc65f1e8a1a57ac156d5
diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 116f8d3..8254e2e 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -179,7 +179,7 @@ namespace KIO
void kio_svnProtocol::listSendDirEntry(const svn::DirEntry &direntry)
{
- QDateTime dt = svn::DateTime(direntry.time());
+ const QDateTime dt(direntry.time().toQDateTime());
KIO::UDSEntry entry;
if (direntry.name().isEmpty()) {
qCDebug(KDESVN_LOG) << "Skipping empty entry!" << endl;
@@ -246,11 +246,10 @@ void kio_svnProtocol::stat(const QUrl &url)
}
KIO::UDSEntry entry;
- QDateTime dt;
if (dummy) {
- createUDSEntry(url.fileName(), QString(), 0, true, dt.toTime_t(), entry);
+ createUDSEntry(url.fileName(), QString(), 0, true, 0, entry);
} else {
- dt = svn::DateTime(e[0].cmtDate());
+ const QDateTime dt(e[0].cmtDate().toQDateTime());
if (e[0].kind() == svn_node_file) {
createUDSEntry(url.fileName(), QString(), 0, false, dt.toTime_t(), entry);
} else {
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index a26a9d5..dadd4ac 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/src/svnfrontend/commandexec.cpp
@@ -506,7 +506,7 @@ void CommandExec::slotCmd_list()
return;
}
Q_FOREACH(const svn::DirEntry &entry, res) {
- QString d = svn::DateTime(entry.time()).toString(QString("yyyy-MM-dd hh:mm::ss"));
+ QString d = entry.time().toString(QStringLiteral("yyyy-MM-dd hh:mm::ss"));
m_pCPart->Stdout
<< (entry.kind() == svn_node_dir ? "D" : "F") << " "
<< d << " "
diff --git a/src/svnfrontend/models/logmodelhelper.cpp b/src/svnfrontend/models/logmodelhelper.cpp
index 624b685..11b213b 100644
--- a/src/svnfrontend/models/logmodelhelper.cpp
+++ b/src/svnfrontend/models/logmodelhelper.cpp
@@ -47,7 +47,7 @@ void LogChangePathItem::init(const svn::LogChangePathEntry &e)
SvnLogModelNode::SvnLogModelNode(const svn::LogEntry &_entry)
: _data(_entry)
, _realName(QString())
- , _date(svn::DateTime(_entry.date))
+ , _date(svn::DateTime(_entry.date).toQDateTime())
{
const QVector<QStringRef> sp = _entry.message.splitRef(QLatin1Char('\n'));
if (sp.isEmpty()) {
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index ced966f..32c4c49 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -798,15 +798,15 @@ QString SvnActions::getInfo(const svn::InfoEntries &entries, const QString &_wha
text += rb + i18n("UUID") + cs + ((*it).uuid()) + re;
}
text += rb + i18n("Last author") + cs + ((*it).cmtAuthor()) + re;
- if ((*it).cmtDate() > 0) {
+ if ((*it).cmtDate().IsValid()) {
text += rb + i18n("Last committed") + cs + (*it).cmtDate().toString() + re;
}
text += rb + i18n("Last revision") + cs + (*it).cmtRev().toString() + re;
- if ((*it).textTime() > 0) {
+ if ((*it).textTime().IsValid()) {
text += rb + i18n("Content last changed") + cs + (*it).textTime().toString() + re;
}
if (all) {
- if ((*it).propTime() > 0) {
+ if ((*it).propTime().IsValid()) {
text += rb + i18n("Property last changed") + cs + (*it).propTime().toString() + re;
}
#ifdef SVN_INFO_SIMPLE_CONFLICT_TYPE
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index 96a8a36..f22e5fa 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -96,7 +96,7 @@ void SvnItem_p::init()
m_short = m_full;
}
m_url = m_Stat->entry().url();
- m_fullDate = svn::DateTime(m_Stat->entry().cmtDate());
+ m_fullDate = m_Stat->entry().cmtDate().toQDateTime();
m_infoText.clear();
}
diff --git a/src/svnqt/datetime.cpp b/src/svnqt/datetime.cpp
index b73b046..6873cdc 100644
--- a/src/svnqt/datetime.cpp
+++ b/src/svnqt/datetime.cpp
@@ -57,43 +57,6 @@ DateTime::DateTime(const QString &dt)
SetRFC822Date(dt.toUtf8().constData());
}
-bool DateTime::operator<(const DateTime &dateTime)const
-{
- return m_time < dateTime.m_time;
-}
-
-bool DateTime::operator>(const DateTime &dateTime)const
-{
- return dateTime < *this;
-}
-
-bool DateTime::operator!=(const DateTime &dateTime)const
-{
- return *this < dateTime || dateTime < *this;
-}
-
-bool DateTime::operator==(const DateTime &dateTime)const
-{
- return !(*this != dateTime);
-}
-
-bool
-DateTime::operator<=(const DateTime &dateTime)const
-{
- return *this == dateTime || *this < dateTime;
-}
-bool
-DateTime::operator>=(const DateTime &dateTime)const
-{
- return *this == dateTime || *this > dateTime;
-}
-
-bool
-DateTime::IsValid() const
-{
- return m_time.isValid();
-}
-
apr_time_t
DateTime::GetAPRTimeT() const
{
@@ -110,16 +73,6 @@ DateTime::SetRFC822Date(const char *date)
return IsValid();
}
-DateTime::operator const QDateTime &()const
-{
- return m_time;
-}
-
-const QDateTime &DateTime::toQDateTime()const
-{
- return *this;
-}
-
void DateTime::setAprTime(apr_time_t aTime)
{
m_time.setTimeSpec(Qt::LocalTime);
@@ -139,14 +92,4 @@ QString DateTime::toString(Qt::DateFormat f) const
{
return m_time.toString(f);
}
-
-unsigned int DateTime::toTime_t()const
-{
- return m_time.toTime_t();
-}
-
-void DateTime::setTime_t(unsigned int sec)
-{
- m_time.setTime_t(sec);
-}
} // namespace svn
diff --git a/src/svnqt/datetime.h b/src/svnqt/datetime.h
index 5c84ba2..8882b31 100644
--- a/src/svnqt/datetime.h
+++ b/src/svnqt/datetime.h
@@ -63,55 +63,35 @@ public:
*
* @param time number of microseconds since 00:00:00 january 1, 1970 UTC
*/
- DateTime(const apr_time_t time); //krazy:exclude=explicit
+ explicit DateTime(const apr_time_t time);
/**
* Constructor
*
* @param dt QDateTime class
*/
- DateTime(const QDateTime &dt); //krazy:exclude=explicit
+ explicit DateTime(const QDateTime &dt);
/**
* Constructor
* @param dt RFC822 compatible string
*/
- DateTime(const QString &dt); //krazy:exclude=explicit
-
- bool
- operator<(const DateTime &dateTime)const;
- bool
- operator>(const DateTime &dateTime)const;
- bool
- operator!=(const DateTime &dateTime)const;
- bool
- operator==(const DateTime &dateTime)const;
- bool
- operator<=(const DateTime &dateTime)const;
- bool
- operator>=(const DateTime &dateTime)const;
+ explicit DateTime(const QString &dt);
/**
* @return Is a valid (non-zero) date
*/
- bool
- IsValid() const;
+ bool IsValid() const { return m_time.isValid(); }
/**
* @return APR apr_time_t
*/
- apr_time_t
- GetAPRTimeT() const;
+ apr_time_t GetAPRTimeT() const;
/**
* @return QDateTime object
*/
- operator const QDateTime &()const;
-
- /**
- * @return QDateTime object
- */
- const QDateTime &toQDateTime()const;
+ const QDateTime &toQDateTime()const { return m_time; }
/**
* @param format format string
@@ -131,12 +111,11 @@ public:
* @see apr_date_parse_rfc
* @return Successfully parsed
*/
- bool
- SetRFC822Date(const char *date);
+ bool SetRFC822Date(const char *date);
void setAprTime(apr_time_t aTime);
- unsigned int toTime_t()const;
- void setTime_t(unsigned int sec);
+ //unsigned int toTime_t()const;
+ //void setTime_t(unsigned int sec);
};
}
diff --git a/src/svnqt/entry.cpp b/src/svnqt/entry.cpp
index 1dc01c2..2937f22 100644
--- a/src/svnqt/entry.cpp
+++ b/src/svnqt/entry.cpp
@@ -80,7 +80,7 @@ void Entry_private::init_clean()
_cmt_author.clear();
_revision = _cmt_rev = -1;
_kind = svn_node_unknown;
- _cmt_date = 0;
+ _cmt_date = DateTime();
_copied = false;
}
@@ -116,7 +116,7 @@ Entry_private::init(const svn_client_status_t *src)
_kind = src->kind;
_copied = src->copied != 0;
_cmt_rev = src->changed_rev;
- _cmt_date = src->changed_date;
+ _cmt_date = DateTime(src->changed_date);
_cmt_author = QString::fromUtf8(src->changed_author);
m_Lock.init(src->lock);
m_valid = true;
diff --git a/src/svnqt/info_entry.cpp b/src/svnqt/info_entry.cpp
index 37aac53..d1c7d99 100644
--- a/src/svnqt/info_entry.cpp
+++ b/src/svnqt/info_entry.cpp
@@ -184,9 +184,9 @@ svn::Depth InfoEntry::depth()const
void svn::InfoEntry::init()
{
m_name.clear();
- m_last_changed_date = 0;
- m_text_time = 0;
- m_prop_time = 0;
+ m_last_changed_date = DateTime();
+ m_text_time = DateTime();
+ m_prop_time = DateTime();
m_hasWc = false;
m_Lock = LockEntry();
m_checksum.clear();
@@ -226,7 +226,7 @@ void svn::InfoEntry::init(const svn_client_info2_t *item, const QString &path)
return;
}
m_name = path;
- m_last_changed_date = item->last_changed_date;
+ m_last_changed_date = DateTime(item->last_changed_date);
if (item->lock) {
m_Lock.init(item->lock);
} else {
diff --git a/src/svnqt/lock_entry.cpp b/src/svnqt/lock_entry.cpp
index 0454b8e..825738d 100644
--- a/src/svnqt/lock_entry.cpp
+++ b/src/svnqt/lock_entry.cpp
@@ -84,38 +84,37 @@ bool LockEntry::Locked()const
void LockEntry::init(const svn_wc_entry_t *src)
{
if (src) {
- date = src->lock_creation_date;
+ date = DateTime(src->lock_creation_date);
locked = src->lock_token ? true : false;
token = (src->lock_token ? QString::fromUtf8(src->lock_token) : QString());
comment = (src->lock_comment ? QString::fromUtf8(src->lock_comment) : QString());
owner = (src->lock_owner ? QString::fromUtf8(src->lock_owner) : QString());
} else {
- date = 0;
+ date = DateTime();
owner.clear();
comment.clear();
token.clear();
locked = false;
}
- exp = 0;
+ exp = DateTime();
}
void LockEntry::init(const svn_lock_t *src)
{
if (src) {
- date = src->creation_date;
+ date = DateTime(src->creation_date);
locked = src->token ? true : false;
token = (src->token ? QString::fromUtf8(src->token) : QString());
comment = (src->comment ? QString::fromUtf8(src->comment) : QString());
owner = (src->owner ? QString::fromUtf8(src->owner) : QString());
} else {
- date = 0;
- exp = 0;
+ date = DateTime();
owner.clear();
comment.clear();
token.clear();
locked = false;
}
-
+ exp = DateTime();
}
void LockEntry::init(
@@ -125,8 +124,8 @@ void LockEntry::init(
const char *lock_comment,
const char *lock_token)
{
- date = lock_time;
- exp = expiration_time;
+ date = DateTime(lock_time);
+ exp = DateTime(expiration_time);
locked = lock_token ? true : false;
token = lock_token ? QString::fromUtf8(lock_token) : QString();
owner = lock_owner ? QString::fromUtf8(lock_owner) : QString();
diff --git a/src/svnqt/log_entry.h b/src/svnqt/log_entry.h
index 3904bda..301b2d4 100644
--- a/src/svnqt/log_entry.h
+++ b/src/svnqt/log_entry.h
@@ -92,7 +92,7 @@ public:
//! if -1 the entry is a fake entry and not real usable!
qlonglong revision;
- qlonglong date;
+ qlonglong date; // apr_time
QString author;
QString message;
LogChangePathEntries changedPaths;
diff --git a/src/svnqt/revision.cpp b/src/svnqt/revision.cpp
index 02d013c..4cc4729 100644
--- a/src/svnqt/revision.cpp
+++ b/src/svnqt/revision.cpp
@@ -172,7 +172,7 @@ QString Revision::toString()const
value.sprintf("%li", m_revision.value.number);
break;
case svn_opt_revision_date:
- value = DateTime(m_revision.value.date).toString(QLatin1String("{yyyy-MM-dd}"));
+ value = DateTime(m_revision.value.date).toString(QStringLiteral("{yyyy-MM-dd}"));
break;
case svn_opt_revision_base:
value = QLatin1String("BASE");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic