[Aptitude-svn-commit] r4326 - in branches/aptitude-0.3/aptitude: .
src src/generic/apt
Daniel Burrows
dburrows at costa.debian.org
Thu Sep 29 17:43:50 UTC 2005
Author: dburrows
Date: Thu Sep 29 17:43:46 2005
New Revision: 4326
Added:
branches/aptitude-0.3/aptitude/src/generic/apt/download_signal_log.cc
- copied, changed from r4311, branches/aptitude-0.3/aptitude/src/download_manager.cc
branches/aptitude-0.3/aptitude/src/generic/apt/download_signal_log.h
- copied, changed from r4311, branches/aptitude-0.3/aptitude/src/download_manager.h
Removed:
branches/aptitude-0.3/aptitude/src/download_manager.cc
branches/aptitude-0.3/aptitude/src/download_manager.h
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
Log:
Move and rename the download_manager files.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Thu Sep 29 17:43:46 2005
@@ -1,3 +1,10 @@
+2005-09-29 Daniel Burrows <dburrows at debian.org>
+
+ * src/download_manager.cc, src/download_manager.h, src/generic/apt/download_signal_log.cc, src/generic/apt/download_signal_log.h:
+
+ Move the download_manager code into the generic layer and rename
+ it.
+
2005-09-27 Daniel Burrows <dburrows at debian.org>
* src/view_changelog.cc:
Copied: branches/aptitude-0.3/aptitude/src/generic/apt/download_signal_log.cc (from r4311, branches/aptitude-0.3/aptitude/src/download_manager.cc)
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_manager.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/download_signal_log.cc Thu Sep 29 17:43:46 2005
@@ -1,25 +1,34 @@
-// download_manager.cc
+// download_signal_log.cc
//
-// Just passes the calls along as signals.
+// Copyright (C) 2001, 2005 Daniel Burrows
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; see the file COPYING. If not, write to
+// the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
-#include "download_manager.h"
+#include "download_signal_log.h"
#include "vscreen/vscreen_widget.h"
#include <sigc++/adaptors/bind.h>
-download_manager::download_manager()
-{
-}
-
-download_manager::download_manager(const vs_widget_ref &_w)
- :w(_w)
+download_signal_log::download_signal_log()
{
}
-void download_manager::set_widget(const vs_widget_ref &_w)
+download_signal_log::~download_signal_log()
{
- w = _w;
}
/** If out is 1, do nothing; otherwise, set out to either 1 or 0,
@@ -33,20 +42,20 @@
*out = val ? 1 : 0;
}
-void download_manager::Fetched(unsigned long Size, unsigned long ResumePoint)
+void download_signal_log::Fetched(unsigned long Size, unsigned long ResumePoint)
{
pkgAcquireStatus::Fetched(Size, ResumePoint);
Fetched_sig(Size, ResumePoint, *this);
}
-void download_manager::MediaChange(const string &Media, const string &Drive,
+void download_signal_log::MediaChange(const string &Media, const string &Drive,
const sigc::slot1<void, bool> &k)
{
MediaChange_sig(Media, Drive, *this, k);
}
-bool download_manager::MediaChange(string Media, string Drive)
+bool download_signal_log::MediaChange(string Media, string Drive)
{
int rval = -1;
@@ -59,27 +68,27 @@
return rval != 0;
}
-void download_manager::IMSHit(pkgAcquire::ItemDesc &item)
+void download_signal_log::IMSHit(pkgAcquire::ItemDesc &item)
{
IMSHit_sig(item, *this);
}
-void download_manager::Fetch(pkgAcquire::ItemDesc &item)
+void download_signal_log::Fetch(pkgAcquire::ItemDesc &item)
{
Fetch_sig(item, *this);
}
-void download_manager::Done(pkgAcquire::ItemDesc &item)
+void download_signal_log::Done(pkgAcquire::ItemDesc &item)
{
Done_sig(item, *this);
}
-void download_manager::Fail(pkgAcquire::ItemDesc &item)
+void download_signal_log::Fail(pkgAcquire::ItemDesc &item)
{
Fail_sig(item, *this);
}
-void download_manager::Pulse(pkgAcquire *Owner,
+void download_signal_log::Pulse(pkgAcquire *Owner,
const sigc::slot1<void, bool> &k)
{
pkgAcquireStatus::Pulse(Owner);
@@ -87,7 +96,7 @@
Pulse_sig(Owner, *this, k);
}
-bool download_manager::Pulse(pkgAcquire *Owner)
+bool download_signal_log::Pulse(pkgAcquire *Owner)
{
int rval = -1;
@@ -98,14 +107,14 @@
return rval != 0;
}
-void download_manager::Start()
+void download_signal_log::Start()
{
pkgAcquireStatus::Start();
Start_sig(*this);
}
-void download_manager::Stop(const sigc::slot0<void> &k)
+void download_signal_log::Stop(const sigc::slot0<void> &k)
{
pkgAcquireStatus::Stop();
@@ -116,12 +125,12 @@
{
}
-void download_manager::Stop()
+void download_signal_log::Stop()
{
Stop(sigc::ptr_fun(nop));
}
-void download_manager::Complete()
+void download_signal_log::Complete()
{
Complete_sig(*this);
}
Copied: branches/aptitude-0.3/aptitude/src/generic/apt/download_signal_log.h (from r4311, branches/aptitude-0.3/aptitude/src/download_manager.h)
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_manager.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/download_signal_log.h Thu Sep 29 17:43:46 2005
@@ -1,12 +1,28 @@
-// download_manager.h -*-c++-*-
+// download_signal_log.h -*-c++-*-
//
-// Copyright 2000 Daniel Burrows
+// Copyright (C) 2001, 2005 Daniel Burrows
//
-// A class that sits there emitting signals about the current download status,
-// and can be queried for specific info about that status.
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; see the file COPYING. If not, write to
+// the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+//
+// A class that sits there emitting signals about the current
+// download status, and can be queried for specific info about that
+// status.
-#ifndef DOWNLOAD_MANAGER_H
-#define DOWNLOAD_MANAGER_H
+#ifndef DOWNLOAD_SIGNAL_LOG_H
+#define DOWNLOAD_SIGNAL_LOG_H
#include <apt-pkg/acquire.h>
@@ -18,7 +34,7 @@
class vscreen_widget;
typedef ref_ptr<vscreen_widget> vs_widget_ref;
-/** A download manager translates AcquireStatus calls into signals.
+/** A download-signal log translates AcquireStatus calls into signals.
* Typically only one slot will be attached to each signal, but this
* allows a degree of separation to be introduced between the
* back-end progress object and the higher-level objects that display
@@ -41,17 +57,11 @@
* continuation before returning). Mainly this means the
* command-line download mode.
*/
-class download_manager : public pkgAcquireStatus
+class download_signal_log : public pkgAcquireStatus
{
- // A widget which should live in memory at least as long as this
- // download does. Used to ensure that widgets which are responsible
- // for handling callbacks stick around long enough. (HACK?)
- vs_widget_ref w;
public:
- download_manager();
- download_manager(const vs_widget_ref &_w);
-
- void set_widget(const vs_widget_ref &_w);
+ download_signal_log();
+ virtual ~download_signal_log();
struct timeval &get_time() {return Time;}
struct timeval &get_start_time() {return StartTime;}
@@ -67,19 +77,19 @@
void set_update(bool _Update) {Update=_Update;}
sigc::signal3<void, unsigned long, unsigned long,
- download_manager &> Fetched_sig;
+ download_signal_log &> Fetched_sig;
sigc::signal4<void, std::string, std::string,
- download_manager &, const sigc::slot1<void, bool> &> MediaChange_sig;
- sigc::signal2<void, pkgAcquire::ItemDesc &, download_manager &> IMSHit_sig;
- sigc::signal2<void, pkgAcquire::ItemDesc &, download_manager &> Fetch_sig;
- sigc::signal2<void, pkgAcquire::ItemDesc &, download_manager &> Done_sig;
- sigc::signal2<void, pkgAcquire::ItemDesc &, download_manager &> Fail_sig;
- sigc::signal3<void, pkgAcquire *, download_manager &,
+ download_signal_log &, const sigc::slot1<void, bool> &> MediaChange_sig;
+ sigc::signal2<void, pkgAcquire::ItemDesc &, download_signal_log &> IMSHit_sig;
+ sigc::signal2<void, pkgAcquire::ItemDesc &, download_signal_log &> Fetch_sig;
+ sigc::signal2<void, pkgAcquire::ItemDesc &, download_signal_log &> Done_sig;
+ sigc::signal2<void, pkgAcquire::ItemDesc &, download_signal_log &> Fail_sig;
+ sigc::signal3<void, pkgAcquire *, download_signal_log &,
const sigc::slot1<void, bool> &> Pulse_sig;
- sigc::signal1<void, download_manager &> Start_sig;
- sigc::signal2<void, download_manager &,
+ sigc::signal1<void, download_signal_log &> Start_sig;
+ sigc::signal2<void, download_signal_log &,
const sigc::slot0<void> &> Stop_sig;
- sigc::signal1<void, download_manager &> Complete_sig;
+ sigc::signal1<void, download_signal_log &> Complete_sig;
void Fetched(unsigned long Size, unsigned long ResumePoint);
void MediaChange(const std::string &Media, const std::string &Drive,
More information about the Aptitude-svn-commit
mailing list