aboutsummaryrefslogtreecommitdiff
path: root/logic/net/NetJob.h
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-01 19:58:13 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-01 19:58:13 +0100
commit983a40698c47739fee3786cf54c917004523ea36 (patch)
tree4a0d73577afbf430934cd878ff23674aaa7aea74 /logic/net/NetJob.h
parent866d7029afa10293a57d71aecbe3629399c95d06 (diff)
parent1936bd181f57a554ce0dd757ffe9419100eb47f4 (diff)
downloadPrismLauncher-983a40698c47739fee3786cf54c917004523ea36.tar.gz
PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.tar.bz2
PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.zip
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
Diffstat (limited to 'logic/net/NetJob.h')
-rw-r--r--logic/net/NetJob.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/logic/net/NetJob.h b/logic/net/NetJob.h
index 68c4c408..03d6a36e 100644
--- a/logic/net/NetJob.h
+++ b/logic/net/NetJob.h
@@ -84,7 +84,6 @@ public:
{
return m_job_name;
}
- ;
virtual bool isRunning() const
{
return m_running;
@@ -94,7 +93,6 @@ public:
signals:
void started();
void progress(qint64 current, qint64 total);
- void filesProgress(int, int, int);
void succeeded();
void failed();
public