summaryrefslogtreecommitdiffstats
path: root/kget
diff options
context:
space:
mode:
Diffstat (limited to 'kget')
-rw-r--r--kget/kmainwidget.cpp10
-rw-r--r--kget/transfer.cpp26
-rw-r--r--kget/transfer.h4
-rw-r--r--kget/transferlist.cpp2
4 files changed, 21 insertions, 21 deletions
diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp
index 8c7b63ab..e6bfa2c7 100644
--- a/kget/kmainwidget.cpp
+++ b/kget/kmainwidget.cpp
@@ -1372,7 +1372,7 @@ void KMainWidget::checkQueue()
item = it.current();
isRunning = (item->getStatus() == Transfer::ST_RUNNING) || ((item->getStatus() == Transfer::ST_TRYING));
- isQuequed = (item->getMode() == Transfer::MD_TQUEUED || item->getMode() == Transfer::MD_NEW);
+ isQuequed = (item->getMode() == Transfer::MD_QUEUED || item->getMode() == Transfer::MD_NEW);
if (!isRunning && isQuequed && !ksettings.b_offline)
{
@@ -1446,7 +1446,7 @@ void KMainWidget::slotTransferTimeout()
for (; it.current(); ++it) {
item = it.current();
if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::currentDateTime()) {
- item->setMode(Transfer::MD_TQUEUED);
+ item->setMode(Transfer::MD_QUEUED);
flag = true;
}
}
@@ -1533,7 +1533,7 @@ void KMainWidget::slotStatusChanged(Transfer * item, int _operation)
case Transfer::OP_ABORTED:
break;
case Transfer::OP_DELAYED:
- case Transfer::OP_TQUEUED:
+ case Transfer::OP_QUEUED:
slotUpdateActions();
item->slotUpdateActions();
break;
@@ -2082,9 +2082,9 @@ void KMainWidget::slotUpdateActions()
m_paDelay->setEnabled(true);
switch (item->getMode()) {
- case Transfer::MD_TQUEUED:
+ case Transfer::MD_QUEUED:
#ifdef _DEBUG
- sDebug << "....................THE MODE IS MD_TQUEUED " << item->getMode() << endl;
+ sDebug << "....................THE MODE IS MD_QUEUED " << item->getMode() << endl;
#endif
m_paQueue->setChecked(true);
break;
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index 230daa19..0043291d 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -218,7 +218,7 @@ void Transfer::slotUpdateActions()
m_paDelay->blockSignals(true);
switch (mode) {
- case MD_TQUEUED:
+ case MD_QUEUED:
m_paQueue->setChecked(true);
break;
case MD_SCHEDULED:
@@ -323,7 +323,7 @@ bool Transfer::updateStatus(int counter)
isTransfer = true;
break;
case ST_STOPPED:
- if(mode == MD_TQUEUED)
+ if(mode == MD_QUEUED)
pix = &view->pixQueued;
else if(mode == MD_SCHEDULED)
pix = &view->pixScheduled;
@@ -385,7 +385,7 @@ void Transfer::slotResume()
m_paResume->setEnabled(false);
status = ST_TRYING;
- mode = MD_TQUEUED;
+ mode = MD_QUEUED;
logMessage(i18n("Attempt number %1").arg(retryCount));
sDebug << "sending Resume to slave " << endl;
@@ -407,7 +407,7 @@ void Transfer::slotResume()
sDebug << "Killing Slave" << endl;
slotSpeed(0);
- mode = MD_TQUEUED;
+ mode = MD_QUEUED;
status=ST_STOPPED;
m_paQueue->setChecked(true);
@@ -492,11 +492,11 @@ void Transfer::slotQueue()
logMessage(i18n("Queueing"));
- assert(!(mode == MD_TQUEUED));
+ assert(!(mode == MD_QUEUED));
- mode = MD_TQUEUED;
+ mode = MD_QUEUED;
m_paQueue->setChecked(true);
- emit statusChanged(this, OP_TQUEUED);
+ emit statusChanged(this, OP_QUEUED);
sDebugOut << endl;
}
@@ -786,7 +786,7 @@ bool Transfer::read(KSimpleConfig * config, int id)
return false;
}
- mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED);
+ mode = (TransferMode) config->readNumEntry("Mode", MD_QUEUED);
status = (TransferStatus) config->readNumEntry("Status", ST_RUNNING);
startTime = config->readDateTimeEntry("ScheduledTime");
canResume = config->readBoolEntry("CanResume", true);
@@ -862,8 +862,8 @@ void Transfer::slotExecBroken()
sDebugIn << endl;
status = ST_STOPPED;
- mode = MD_TQUEUED;
- emit statusChanged(this, OP_TQUEUED);
+ mode = MD_QUEUED;
+ emit statusChanged(this, OP_QUEUED);
sDebugOut << endl;
}
@@ -897,8 +897,8 @@ void Transfer::slotExecConnected()
m_pSlave->Op(Slave::KILL);
if (ksettings.b_addQueued)
{
- mode = MD_TQUEUED;
- emit statusChanged(this, OP_TQUEUED);
+ mode = MD_QUEUED;
+ emit statusChanged(this, OP_QUEUED);
}
else
{
@@ -1016,7 +1016,7 @@ void Transfer::NotInCache()
{
logMessage(i18n("checking if file is in cache...no"));
if (ksettings.b_addQueued)
- mode = MD_TQUEUED;
+ mode = MD_QUEUED;
else
mode = MD_DELAYED;
status = ST_STOPPED;
diff --git a/kget/transfer.h b/kget/transfer.h
index f6d9585a..b9cbf6d6 100644
--- a/kget/transfer.h
+++ b/kget/transfer.h
@@ -55,13 +55,13 @@ class Transfer:public TQObject, public KListViewItem
Q_OBJECT
public:
- enum TransferMode { MD_TQUEUED, MD_DELAYED, MD_SCHEDULED, MD_NONE, MD_NEW };
+ enum TransferMode { MD_QUEUED, MD_DELAYED, MD_SCHEDULED, MD_NONE, MD_NEW };
enum TransferStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED };
enum TransferOperation {
OP_FINISHED, OP_RESUMED, OP_PAUSED, OP_REMOVED, OP_ABORTED,
- OP_TQUEUED, OP_SCHEDULED, OP_DELAYED, OP_CONNECTED
+ OP_QUEUED, OP_SCHEDULED, OP_DELAYED, OP_CONNECTED
};
diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp
index 2def3372..bf54cb87 100644
--- a/kget/transferlist.cpp
+++ b/kget/transferlist.cpp
@@ -202,7 +202,7 @@ bool TransferList::areTransfersQueuedOrScheduled()
if (childCount() > 0) {
for (; it.current(); ++it) {
- if ((it.current()->getMode() == Transfer::MD_TQUEUED)|| \
+ if ((it.current()->getMode() == Transfer::MD_QUEUED)|| \
(it.current()->getMode() == Transfer::MD_SCHEDULED))
return true;
}