Remove unused QDateTime in KConfigBackend.

Spotted because it leads to race conditions due to tzset
(surely a Qt bug, but anyway no point in finding out lastModified
for nothing).

While at it, remove the unused size field as well.
wilder
David Faure 9 years ago
parent c5be11a789
commit e1fd748982
  1. 22
      src/core/kconfigbackend.cpp
  2. 9
      src/core/kconfigbackend_p.h
  3. 6
      src/core/kconfigini.cpp

@ -38,8 +38,6 @@ typedef QExplicitlySharedDataPointer<KConfigBackend> BackendPtr;
class KConfigBackendPrivate
{
public:
qint64 size;
QDateTime lastModified;
QString localFileName;
static QString whatSystem(const QString & /*fileName*/)
@ -93,26 +91,6 @@ KConfigBackend::~KConfigBackend()
delete d;
}
QDateTime KConfigBackend::lastModified() const
{
return d->lastModified;
}
void KConfigBackend::setLastModified(const QDateTime &dt)
{
d->lastModified = dt;
}
qint64 KConfigBackend::size() const
{
return d->size;
}
void KConfigBackend::setSize(qint64 sz)
{
d->size = sz;
}
QString KConfigBackend::filePath() const
{
return d->localFileName;

@ -34,7 +34,6 @@ class KConfigBackendPrivate;
class KEntryMap;
class QFile;
class QByteArray;
class QDateTime;
/**
* \class KConfigBackend kconfigbackend_p.h <KConfigBackend>
@ -181,19 +180,11 @@ public:
*/
virtual bool isLocked() const = 0;
/**
* @return the date and time when the object was last modified
*/
QDateTime lastModified() const;
/** @return the absolute path to the object */
QString filePath() const;
/** @return the size of the object */
qint64 size() const;
protected:
KConfigBackend();
void setLastModified(const QDateTime &dt);
void setSize(qint64 sz);
void setLocalFilePath(const QString &file);
private:

@ -600,14 +600,8 @@ void KConfigIniBackend::setFilePath(const QString &file)
const QFileInfo info(file);
if (info.exists()) {
setLocalFilePath(info.canonicalFilePath());
setLastModified(info.lastModified());
setSize(info.size());
} else {
setLocalFilePath(file);
setSize(0);
QDateTime dummy;
dummy.setTime_t(0);
setLastModified(dummy);
}
}

Loading…
Cancel
Save