const fixes

setTmpStatus cleanup

svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=212382
This commit is contained in:
Alexander Kellett 2003-03-08 15:54:58 +00:00
parent 84f0b66e1d
commit 05db1a884e
3 changed files with 22 additions and 14 deletions

View file

@ -50,6 +50,8 @@ public:
void nsPut(const QString &nm);
void modUpdate();
void setOldStatus(const QString &);
void setTmpStatus(const QString &);
void restoreStatus();
@ -67,7 +69,6 @@ private:
const QString nsGet() const;
KBookmark m_bookmark;
PaintStyle m_paintStyle;
bool m_emptyFolder;
QString m_oldStatus;

View file

@ -68,13 +68,19 @@ bool TestLinkItr::isApplicable(const KBookmark &bk) const {
void TestLinkItr::doAction() {
m_errSet = false;
m_job = KIO::get(curBk().url(), true, false);
m_job->addMetaData("errorPage", "true");
connect(m_job, SIGNAL( result( KIO::Job *)),
this, SLOT( slotJobResult(KIO::Job *)));
connect(m_job, SIGNAL( data( KIO::Job *, const QByteArray &)),
this, SLOT( slotJobData(KIO::Job *, const QByteArray &)));
m_job->addMetaData("errorPage", "true");
curItem()->setTmpStatus(i18n("Checking..."));
QString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
curItem()->setOldStatus(oldModDate);
TestLinkItrHolder::setMod(curBk().url().url(), i18n("Checking..."));
}
void TestLinkItr::slotJobData(KIO::Job *job, const QByteArray &data) {
@ -157,13 +163,13 @@ void TestLinkItrHolder::resetToValue(const QString &url, const QString &oldValue
}
}
QString TestLinkItrHolder::getMod(const QString &url) /*const*/ {
const QString TestLinkItrHolder::getMod(const QString &url) const {
return self()->m_modify.contains(url)
? self()->m_modify[url]
: QString::null;
}
QString TestLinkItrHolder::getOldMod(const QString &url) /*const*/ {
const QString TestLinkItrHolder::getOldMod(const QString &url) const {
return self()->m_oldModify.contains(url)
? self()->m_oldModify[url]
: QString::null;
@ -184,26 +190,26 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P
int newMod = 0;
// get new mod date if there is one
QString newModStr = getMod(url);
QString newModStr = self()->getMod(url);
if (!newModStr.isNull()) {
newMod = newModStr.toInt(&newModValid);
}
QString oldModStr;
if (getOldMod(url).isNull()) {
if (self()->getOldMod(url).isNull()) {
// first time
oldModStr = nsinfo;
setOldMod(url, oldModStr);
} else if (!newModStr.isNull()) {
// umm... nsGet not called here, missing optimisation?
oldModStr = getOldMod(url);
oldModStr = self()->getOldMod(url);
} else {
// may be reading a second bookmark with same url
QString oom = nsinfo;
oldModStr = getOldMod(url);
oldModStr = self()->getOldMod(url);
if (oom.toInt() > oldModStr.toInt()) {
setOldMod(url, oom);
oldModStr = oom;
@ -302,9 +308,7 @@ void KEBListViewItem::nsPut(const QString &nm) {
void KEBListViewItem::modUpdate() {
QString statusLine;
// DESIGN - should return paint style?
statusLine = TestLinkItrHolder::calcPaintStyle(url(), m_paintStyle, nsGet());
// ARGGGGGGGGGGGGGGGGHHHHHHHHHHHH!!!!!!!!!!!!
if (statusLine != "Error") {
setText(KEBListView::StatusColumn, statusLine);
}
@ -314,12 +318,15 @@ const QString KEBListViewItem::url() const {
return m_bookmark.url().url();
}
void KEBListViewItem::setOldStatus(const QString &oldStatus) {
kdDebug() << "KEBListViewItem::setOldStatus" << endl;
m_oldStatus = oldStatus;
}
void KEBListViewItem::setTmpStatus(const QString &status) {
kdDebug() << "KEBListViewItem::setTmpStatus" << endl;
m_paintStyle = KEBListViewItem::BoldStyle;
m_oldStatus = TestLinkItrHolder::getMod(url());
setText(KEBListView::StatusColumn, status);
TestLinkItrHolder::setMod(url(), status);
}
void KEBListViewItem::restoreStatus() {

View file

@ -34,8 +34,8 @@ public:
if (!s_self) { s_self = new TestLinkItrHolder(); }; return s_self;
}
static void resetToValue(const QString &url, const QString &val);
static QString getMod(const QString &url) /* const */;
static QString getOldMod(const QString &url) /* const */;
const QString getMod(const QString &url) const;
const QString getOldMod(const QString &url) const;
static void setMod(const QString &url, const QString &val);
static void setOldMod(const QString &url, const QString &val);
static QString calcPaintStyle(const QString &, KEBListViewItem::PaintStyle&, const QString &);