[Aptitude-svn-commit] r4327 - in branches/aptitude-0.3/aptitude: .
src src/cmdline src/generic/apt
Daniel Burrows
dburrows at costa.debian.org
Thu Sep 29 17:48:54 UTC 2005
Author: dburrows
Date: Thu Sep 29 17:48:50 2005
New Revision: 4327
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/Makefile.am
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.h
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc
branches/aptitude-0.3/aptitude/src/download.cc
branches/aptitude-0.3/aptitude/src/download.h
branches/aptitude-0.3/aptitude/src/download_list.cc
branches/aptitude-0.3/aptitude/src/download_list.h
branches/aptitude-0.3/aptitude/src/download_thread.cc
branches/aptitude-0.3/aptitude/src/download_thread.h
branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am
branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc
branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.h
branches/aptitude-0.3/aptitude/src/ui.cc
branches/aptitude-0.3/aptitude/src/ui.h
branches/aptitude-0.3/aptitude/src/view_changelog.cc
Log:
Follow up on the renaming.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Thu Sep 29 17:48:50 2005
@@ -1,5 +1,10 @@
2005-09-29 Daniel Burrows <dburrows at debian.org>
+ * src/cmdline/cmdline_changelog.cc, src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_download.cc, src/cmdline/cmdline_progress.cc, src/cmdline/cmdline_progress.h, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_update.cc, src/cmdline/cmdline_upgrade.cc, src/download.cc, src/download.h, src/download_list.cc, src/download_list.h, src/download_thread.cc, src/download_thread.h, src/generic/apt/acqprogress.cc, src/generic/apt/acqprogress.h, src/generic/apt/Makefile.am, src/Makefile.am, src/ui.cc, src/ui.h, src/view_changelog.cc:
+
+ Update include file locations and class names to refer to
+ download_signal_log instead of download_manager.
+
* 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
Modified: branches/aptitude-0.3/aptitude/src/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/Makefile.am Thu Sep 29 17:48:50 2005
@@ -43,8 +43,6 @@
download_screen.cc\
download_thread.h\
download_thread.cc\
- download_manager.h\
- download_manager.cc\
edit_pkg_hier.h \
edit_pkg_hier.cc\
load_config.cc \
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc Thu Sep 29 17:48:50 2005
@@ -9,9 +9,9 @@
#include "cmdline_util.h"
#include <aptitude.h>
-#include <download_manager.h>
#include <generic/apt/apt.h>
+#include <generic/apt/download_signal_log.h>
#include <generic/apt/pkg_changelog.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc Thu Sep 29 17:48:50 2005
@@ -13,10 +13,9 @@
#include "cmdline_simulate.h"
#include "cmdline_util.h"
-#include "../download_manager.h"
-
#include <generic/apt/apt.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <aptitude.h>
#include <download.h>
@@ -237,7 +236,7 @@
return 0;
}
- download_manager *m = gen_cmdline_download_progress();
+ download_signal_log *m = gen_cmdline_download_progress();
pkgAcquire *acq;
pkgPackageManager *pm;
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc Thu Sep 29 17:48:50 2005
@@ -9,10 +9,10 @@
#include "cmdline_util.h"
#include <aptitude.h>
-#include <download_manager.h>
#include <generic/apt/apt.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <generic/apt/pkg_acqfile.h>
#include <apt-pkg/acquire.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc Thu Sep 29 17:48:50 2005
@@ -1,10 +1,11 @@
-#include <download_manager.h>
+#include "cmdline_progress.h"
#include <sys/ioctl.h>
#include <generic/apt/acqprogress.h>
#include <generic/apt/apt.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <sigc++/adaptors/bind.h>
#include <sigc++/functors/mem_fun.h>
@@ -26,15 +27,15 @@
screen_width = ws.ws_col;
}
-static void dl_complete(download_manager &manager,
+static void dl_complete(download_signal_log &manager,
AcqTextStatus *acqprogress)
{
delete acqprogress;
}
-download_manager *gen_cmdline_download_progress()
+download_signal_log *gen_cmdline_download_progress()
{
- download_manager *m=new download_manager;
+ download_signal_log *m=new download_signal_log;
// FIXME: LEAK!!!! (since the command-line stuff will only use this once
// and then terminate, and killing this leak is a major pain, I'm
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.h (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.h Thu Sep 29 17:48:50 2005
@@ -5,8 +5,8 @@
#ifndef CMDLINE_PROGRESS_H
#define CMDLINE_PROGRESS_H
-class download_manager;
+class download_signal_log;
-download_manager *gen_cmdline_download_progress();
+download_signal_log *gen_cmdline_download_progress();
#endif // CMDLINE_PROGRESS_H
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc Thu Sep 29 17:48:50 2005
@@ -10,11 +10,11 @@
#include "cmdline_show.h"
#include "cmdline_util.h"
-#include <download_manager.h>
#include <ui.h>
#include <generic/apt/apt.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <generic/apt/infer_reason.h>
#include <vscreen/fragment.h>
@@ -45,7 +45,7 @@
static bool get_fetchinfo(fetchinfo &f)
{
- download_manager m;
+ download_signal_log m;
pkgAcquire fetcher(&m);
pkgSourceList l;
if(!l.ReadMainList())
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc Thu Sep 29 17:48:50 2005
@@ -1,9 +1,23 @@
// cmdline_update.cc
//
-// Copyright 2004 Daniel Burrows
+// Copyright (C) 2004 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.h"
-#include "../download_manager.h"
#include "cmdline_progress.h"
@@ -11,6 +25,7 @@
#include <generic/apt/apt.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <apt-pkg/error.h>
#include <apt-pkg/progress.h>
@@ -35,7 +50,7 @@
return -1;
}
- download_manager *m = gen_cmdline_download_progress();
+ download_signal_log *m = gen_cmdline_download_progress();
pkgAcquire *acq = prepare_pkglist_update(&progress, true, m);
int rval = 0;
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc Thu Sep 29 17:48:50 2005
@@ -10,13 +10,12 @@
#include "cmdline_simulate.h"
#include "cmdline_util.h"
-#include "../download_manager.h"
-
#include <aptitude.h>
#include <download.h>
#include <generic/apt/apt.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/error.h>
@@ -110,7 +109,7 @@
// Split this into common code?
- download_manager *m = gen_cmdline_download_progress();
+ download_signal_log *m = gen_cmdline_download_progress();
pkgAcquire *acq;
pkgPackageManager *pm;
Modified: branches/aptitude-0.3/aptitude/src/download.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download.cc (original)
+++ branches/aptitude-0.3/aptitude/src/download.cc Thu Sep 29 17:48:50 2005
@@ -26,11 +26,10 @@
#include <generic/apt/apt.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <generic/util/util.h>
-#include "download_manager.h"
-
#ifdef HAVEAPTCFG_H
#include "../config.h"
#endif
@@ -124,7 +123,7 @@
bool finish_pkglist_update(OpProgress *load_progress,
bool text_download,
- download_manager *m,
+ download_signal_log *m,
pkgAcquire *fetcher,
pkgAcquire::RunResult res)
{
@@ -388,7 +387,7 @@
install_run_result execute_install_run(OpProgress *load_progress,
bool text_download,
bool download_only,
- download_manager *manager,
+ download_signal_log *manager,
pkgAcquire *fetcher,
pkgPackageManager *pm,
pkgAcquire::RunResult res)
@@ -494,7 +493,7 @@
install_run_result finish_install_run(OpProgress *load_progress,
bool text_download,
bool download_only,
- download_manager *manager,
+ download_signal_log *manager,
pkgAcquire *fetcher,
pkgPackageManager *pm,
pkgAcquire::RunResult res)
Modified: branches/aptitude-0.3/aptitude/src/download.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download.h (original)
+++ branches/aptitude-0.3/aptitude/src/download.h Thu Sep 29 17:48:50 2005
@@ -14,7 +14,7 @@
class OpProgress;
class pkgAcquire;
class pkgPackageManager;
-class download_manager;
+class download_signal_log;
/** Do the work to prepare an Acquire object for a package-list update
* operation. Should be performed in the main UI thread. The object
@@ -37,7 +37,7 @@
*/
bool finish_pkglist_update(OpProgress *load_progress,
bool text_download,
- download_manager *manager,
+ download_signal_log *manager,
pkgAcquire *fetcher,
pkgAcquire::RunResult res);
@@ -112,7 +112,7 @@
install_run_result finish_install_run(OpProgress *load_progress,
bool text_download,
bool download_only,
- download_manager *manager,
+ download_signal_log *manager,
pkgAcquire *fetcher,
pkgPackageManager *pm,
pkgAcquire::RunResult res);
Modified: branches/aptitude-0.3/aptitude/src/download_list.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_list.cc (original)
+++ branches/aptitude-0.3/aptitude/src/download_list.cc Thu Sep 29 17:48:50 2005
@@ -19,11 +19,11 @@
#include "aptitude.h"
#include "download_list.h"
-#include "download_manager.h"
#include "ui.h"
#include <generic/apt/apt.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <generic/util/util.h>
@@ -317,7 +317,7 @@
}
void download_list::MediaChange(string media, string drive,
- download_manager &manager,
+ download_signal_log &manager,
const sigc::slot1<void, bool> &k)
{
vs_widget_ref tmpref(this);
@@ -337,7 +337,7 @@
}
void download_list::IMSHit(pkgAcquire::ItemDesc &itmdesc,
- download_manager &manager)
+ download_signal_log &manager)
{
vs_widget_ref tmpref(this);
@@ -354,12 +354,12 @@
}
void download_list::Fetch(pkgAcquire::ItemDesc &itmdesc,
- download_manager &manager)
+ download_signal_log &manager)
{
}
void download_list::Done(pkgAcquire::ItemDesc &itmdesc,
- download_manager &manager)
+ download_signal_log &manager)
{
vs_widget_ref tmpref(this);
@@ -376,7 +376,7 @@
}
void download_list::Fail(pkgAcquire::ItemDesc &itmdesc,
- download_manager &manager)
+ download_signal_log &manager)
{
vs_widget_ref tmpref(this);
@@ -406,7 +406,7 @@
}
}
-void download_list::Start(download_manager &manager)
+void download_list::Start(download_signal_log &manager)
{
vs_widget_ref tmpref(this);
@@ -415,7 +415,7 @@
msgs.erase(msgs.begin(), msgs.end());
}
-void download_list::Stop(download_manager &manager, const sigc::slot0<void> &k)
+void download_list::Stop(download_signal_log &manager, const sigc::slot0<void> &k)
{
vs_widget_ref tmpref(this);
@@ -446,13 +446,13 @@
k();
}
-void download_list::Complete(download_manager &manager)
+void download_list::Complete(download_signal_log &manager)
{
// Destroy ourselves for real.
vscreen_widget::destroy();
}
-void download_list::Pulse(pkgAcquire *Owner, download_manager &manager,
+void download_list::Pulse(pkgAcquire *Owner, download_signal_log &manager,
const sigc::slot1<void, bool> &k)
{
vs_widget_ref tmpref(this);
Modified: branches/aptitude-0.3/aptitude/src/download_list.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_list.h (original)
+++ branches/aptitude-0.3/aptitude/src/download_list.h Thu Sep 29 17:48:50 2005
@@ -31,7 +31,7 @@
#include <vscreen/vscreen_widget.h>
-class download_manager;
+class download_signal_log;
class download_list:public vscreen_widget
{
@@ -90,11 +90,8 @@
// The starting offset to display messages with.
std::string::size_type startx;
- // We have to mirror the download_manager's information (ewww)
- // Another option is to store a reference to the download-manager,
- // but I don't like that for other reasons. (sigh..)
- //
- // A note: these values are only updated when Pulse() is called anyway.
+ // We have to mirror the download_signal_log's information, since
+ // we're only synchronous with it in the log callbacks.
unsigned long TotalItems, CurrentItems;
double CurrentCPS, TotalBytes, CurrentBytes;
@@ -126,17 +123,17 @@
}
void MediaChange(std::string media, std::string drive,
- download_manager &manager,
+ download_signal_log &manager,
const sigc::slot1<void, bool> &k);
- void IMSHit(pkgAcquire::ItemDesc &itmdesc, download_manager &manager);
- void Fetch(pkgAcquire::ItemDesc &itmdesc, download_manager &manager);
- void Done(pkgAcquire::ItemDesc &itmdesc, download_manager &manager);
- void Fail(pkgAcquire::ItemDesc &itmdesc, download_manager &manager);
- void Pulse(pkgAcquire *Owner, download_manager &manager,
+ void IMSHit(pkgAcquire::ItemDesc &itmdesc, download_signal_log &manager);
+ void Fetch(pkgAcquire::ItemDesc &itmdesc, download_signal_log &manager);
+ void Done(pkgAcquire::ItemDesc &itmdesc, download_signal_log &manager);
+ void Fail(pkgAcquire::ItemDesc &itmdesc, download_signal_log &manager);
+ void Pulse(pkgAcquire *Owner, download_signal_log &manager,
const sigc::slot1<void, bool> &k);
- void Start(download_manager &manager);
- void Stop(download_manager &manager, const sigc::slot0<void> &k);
- void Complete(download_manager &manager);
+ void Start(download_signal_log &manager);
+ void Stop(download_signal_log &manager, const sigc::slot0<void> &k);
+ void Complete(download_signal_log &manager);
int width_request();
int height_request(int w);
Modified: branches/aptitude-0.3/aptitude/src/download_thread.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_thread.cc (original)
+++ branches/aptitude-0.3/aptitude/src/download_thread.cc Thu Sep 29 17:48:50 2005
@@ -19,7 +19,7 @@
#include "download_thread.h"
-#include "download_manager.h"
+#include <generic/apt/download_signal_log.h>
#include <vscreen/vscreen.h>
@@ -131,72 +131,72 @@
unsigned long ResumePoint)
{
do_foreground_execute(real_status, Size, ResumePoint,
- &download_manager::Fetched);
+ &download_signal_log::Fetched);
}
bool background_status::MediaChange(std::string Media, std::string Drive)
{
threads::box<bool> return_box;
- do_foreground_execute<download_manager,
+ do_foreground_execute<download_signal_log,
void, const std::string &, const std::string &,
const sigc::slot1<void, bool> &> (real_status, Media, Drive,
sigc::mem_fun(return_box,
&threads::box<bool>::put),
- &download_manager::MediaChange);
+ &download_signal_log::MediaChange);
return return_box.take();
}
void background_status::IMSHit(pkgAcquire::ItemDesc &item)
{
- do_foreground_execute<download_manager, void, pkgAcquire::ItemDesc &>(real_status, item, &download_manager::IMSHit);
+ do_foreground_execute<download_signal_log, void, pkgAcquire::ItemDesc &>(real_status, item, &download_signal_log::IMSHit);
}
void background_status::Fetch(pkgAcquire::ItemDesc &item)
{
- do_foreground_execute<download_manager, void, pkgAcquire::ItemDesc &>(real_status, item, &download_manager::Fetch);
+ do_foreground_execute<download_signal_log, void, pkgAcquire::ItemDesc &>(real_status, item, &download_signal_log::Fetch);
}
void background_status::Done(pkgAcquire::ItemDesc &item)
{
- do_foreground_execute<download_manager, void, pkgAcquire::ItemDesc &>(real_status, item, &download_manager::Done);
+ do_foreground_execute<download_signal_log, void, pkgAcquire::ItemDesc &>(real_status, item, &download_signal_log::Done);
}
void background_status::Fail(pkgAcquire::ItemDesc &item)
{
- do_foreground_execute<download_manager, void, pkgAcquire::ItemDesc &>(real_status, item, &download_manager::Fail);
+ do_foreground_execute<download_signal_log, void, pkgAcquire::ItemDesc &>(real_status, item, &download_signal_log::Fail);
}
bool background_status::Pulse(pkgAcquire *Owner)
{
threads::box<bool> return_box;
- do_foreground_execute<download_manager, void,
+ do_foreground_execute<download_signal_log, void,
pkgAcquire *,
const sigc::slot1<void, bool> &>(real_status, Owner,
sigc::mem_fun(&return_box,
&threads::box<bool>::put),
- &download_manager::Pulse);
+ &download_signal_log::Pulse);
return return_box.take();
}
void background_status::Start()
{
- do_foreground_execute(real_status, &download_manager::Start);
+ do_foreground_execute(real_status, &download_signal_log::Start);
}
void background_status::Stop()
{
threads::box<void> return_box;
- do_foreground_execute<download_manager,
+ do_foreground_execute<download_signal_log,
void,
const sigc::slot0<void> &>(real_status,
sigc::mem_fun(&return_box,
&threads::box<void>::put),
- &download_manager::Stop);
+ &download_signal_log::Stop);
return_box.take();
}
Modified: branches/aptitude-0.3/aptitude/src/download_thread.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_thread.h (original)
+++ branches/aptitude-0.3/aptitude/src/download_thread.h Thu Sep 29 17:48:50 2005
@@ -27,7 +27,7 @@
#include <sigc++/slot.h>
-class download_manager;
+class download_signal_log;
/** A proxy status object that posts messages to the main thread.
* Each message "blocks" the download until the user deals with it,
@@ -39,7 +39,7 @@
*/
class background_status : public pkgAcquireStatus
{
- download_manager *real_status;
+ download_signal_log *real_status;
public:
void Fetched(unsigned long Size, unsigned long ResumePoint);
bool MediaChange(std::string Media, std::string Drive);
@@ -52,7 +52,7 @@
void Stop();
void Complete();
- background_status(download_manager *_real_status)
+ background_status(download_signal_log *_real_status)
:real_status(_real_status)
{
}
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am Thu Sep 29 17:48:50 2005
@@ -29,6 +29,8 @@
apt_undo_group.h \
config_signal.cc \
config_signal.h \
+ download_signal_log.cc \
+ download_signal_log.h \
infer_reason.cc \
infer_reason.h \
matchers.cc \
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc Thu Sep 29 17:48:50 2005
@@ -10,9 +10,9 @@
// Include files /*{{{*/
#include "acqprogress.h"
+#include "download_signal_log.h"
#include <aptitude.h>
-#include <download_manager.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/acquire-worker.h>
#include <apt-pkg/strutl.h>
@@ -44,7 +44,7 @@
// AcqTextStatus::Start - Downloading has started /*{{{*/
// ---------------------------------------------------------------------
/* */
-void AcqTextStatus::Start(download_manager &manager)
+void AcqTextStatus::Start(download_signal_log &manager)
{
BlankLine[0] = 0;
ID = 1;
@@ -54,7 +54,7 @@
// ---------------------------------------------------------------------
/* */
void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm,
- download_manager &manager)
+ download_signal_log &manager)
{
if (Quiet > 1)
return;
@@ -72,7 +72,7 @@
// AcqTextStatus::Fetch - An item has started to download /*{{{*/
// ---------------------------------------------------------------------
/* This prints out the short description and the expected size */
-void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm, download_manager &manager)
+void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm, download_signal_log &manager)
{
manager.set_update(true);
if (Itm.Owner->Complete == true)
@@ -95,7 +95,7 @@
// AcqTextStatus::Done - Completed a download /*{{{*/
// ---------------------------------------------------------------------
/* We don't display anything... */
-void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm, download_manager &manager)
+void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm, download_signal_log &manager)
{
manager.set_update(true);
};
@@ -103,7 +103,7 @@
// AcqTextStatus::Fail - Called when an item fails to download /*{{{*/
// ---------------------------------------------------------------------
/* We print out the error text */
-void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm, download_manager &manager)
+void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm, download_signal_log &manager)
{
if (Quiet > 1)
return;
@@ -132,7 +132,7 @@
// ---------------------------------------------------------------------
/* This prints out the bytes downloaded and the overall average line
speed */
-void AcqTextStatus::Stop(download_manager &manager,
+void AcqTextStatus::Stop(download_signal_log &manager,
const sigc::slot0<void> &k)
{
if (Quiet > 1)
@@ -158,7 +158,7 @@
/* This draws the current progress. Each line has an overall percent
meter and a per active item status meter along with an overall
bandwidth and ETA indicator. */
-void AcqTextStatus::Pulse(pkgAcquire *Owner, download_manager &manager,
+void AcqTextStatus::Pulse(pkgAcquire *Owner, download_signal_log &manager,
const sigc::slot1<void, bool> &k)
{
TotalBytes=manager.get_total_bytes();
@@ -288,7 +288,7 @@
// ---------------------------------------------------------------------
/* Prompt for a media swap */
void AcqTextStatus::MediaChange(string Media, string Drive,
- download_manager &manager,
+ download_signal_log &manager,
const sigc::slot1<void, bool> &k)
{
if (Quiet <= 0)
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.h Thu Sep 29 17:48:50 2005
@@ -14,7 +14,7 @@
#include <sigc++/slot.h>
#include <sigc++/trackable.h>
-class download_manager;
+class download_signal_log;
class AcqTextStatus : public sigc::trackable
{
@@ -23,9 +23,7 @@
unsigned long ID;
unsigned long Quiet;
- // We have to mirror the download_manager's information (ewww)
- // Another option is to store a reference to the download-manager,
- // but I don't like that for other reasons. (sigh..)
+ // We have to mirror the download_signal_log's information.
//
// A note: these values are only updated when Pulse() is called anyway.
unsigned long TotalItems, CurrentItems;
@@ -33,16 +31,16 @@
public:
- virtual void MediaChange(std::string Media,std::string Drive, download_manager &manager,
+ virtual void MediaChange(std::string Media,std::string Drive, download_signal_log &manager,
const sigc::slot1<void, bool> &k);
- virtual void IMSHit(pkgAcquire::ItemDesc &Itm, download_manager &manager);
- virtual void Fetch(pkgAcquire::ItemDesc &Itm, download_manager &manager);
- virtual void Done(pkgAcquire::ItemDesc &Itm, download_manager &manager);
- virtual void Fail(pkgAcquire::ItemDesc &Itm, download_manager &manager);
- virtual void Start(download_manager &manager);
- virtual void Stop(download_manager &manager, const sigc::slot0<void> &k);
+ virtual void IMSHit(pkgAcquire::ItemDesc &Itm, download_signal_log &manager);
+ virtual void Fetch(pkgAcquire::ItemDesc &Itm, download_signal_log &manager);
+ virtual void Done(pkgAcquire::ItemDesc &Itm, download_signal_log &manager);
+ virtual void Fail(pkgAcquire::ItemDesc &Itm, download_signal_log &manager);
+ virtual void Start(download_signal_log &manager);
+ virtual void Stop(download_signal_log &manager, const sigc::slot0<void> &k);
- void Pulse(pkgAcquire *Owner, download_manager &manager,
+ void Pulse(pkgAcquire *Owner, download_signal_log &manager,
const sigc::slot1<void, bool> &k);
AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc (original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc Thu Sep 29 17:48:50 2005
@@ -84,6 +84,7 @@
#include <generic/apt/apt_undo_group.h>
#include <generic/apt/aptitude_resolver_universe.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <generic/apt/resolver_manager.h>
#include <generic/problemresolver/exceptions.h>
@@ -96,7 +97,6 @@
#include "download.h"
#include "download_bar.h"
#include "download_list.h"
-#include "download_manager.h"
#include "download_screen.h"
#include "download_thread.h"
#include "menu_tree.h"
@@ -1018,7 +1018,7 @@
pkgAcquire::RunResult res,
pkgAcquire *acq,
pkgPackageManager *pm,
- download_manager *m,
+ download_signal_log *m,
background_status *st,
downloader *abort_state);
@@ -1036,12 +1036,12 @@
downloader *abort_state = new downloader;
- download_manager *m = gen_download_progress(false, false,
- _("Downloading packages"),
- _("View the progress of the package download"),
- _("Package Download"),
- arg(sigc::mem_fun(abort_state,
- &downloader::abort)));
+ download_signal_log *m = gen_download_progress(false, false,
+ _("Downloading packages"),
+ _("View the progress of the package download"),
+ _("Package Download"),
+ arg(sigc::mem_fun(abort_state,
+ &downloader::abort)));
pkgAcquire *acq;
pkgPackageManager *pm;
@@ -1066,7 +1066,7 @@
pkgAcquire::RunResult res,
pkgAcquire *acq,
pkgPackageManager *pm,
- download_manager *m,
+ download_signal_log *m,
background_status *st,
downloader *abort_state)
{
@@ -1404,7 +1404,7 @@
static void finish_update_lists(download_thread *t,
pkgAcquire::RunResult res,
pkgAcquire *acq,
- download_manager *m,
+ download_signal_log *m,
background_status *st);
static void really_do_update_lists()
@@ -1416,11 +1416,11 @@
vs_progress_ref p = gen_progress_bar();
- download_manager *m = gen_download_progress(false, true,
- _("Updating package lists"),
- _("View the progress of the package list update"),
- _("List Update"),
- NULL);
+ download_signal_log *m = gen_download_progress(false, true,
+ _("Updating package lists"),
+ _("View the progress of the package list update"),
+ _("List Update"),
+ NULL);
background_status *st = new background_status(m);
@@ -1442,7 +1442,7 @@
static void finish_update_lists(download_thread *t,
pkgAcquire::RunResult res,
pkgAcquire *acq,
- download_manager *m,
+ download_signal_log *m,
background_status *st)
{
vs_progress_ref p = gen_progress_bar();
@@ -2587,14 +2587,14 @@
active_status_download=NULL;
}
-download_manager *gen_download_progress(bool force_noninvasive,
- bool list_update,
- const wstring &title,
- const wstring &longtitle,
- const wstring &tablabel,
- slot0arg abortslot)
+download_signal_log *gen_download_progress(bool force_noninvasive,
+ bool list_update,
+ const wstring &title,
+ const wstring &longtitle,
+ const wstring &tablabel,
+ slot0arg abortslot)
{
- download_manager *m=new download_manager;
+ download_signal_log *m=new download_signal_log;
download_list_ref w=NULL;
if(force_noninvasive ||
@@ -2648,12 +2648,12 @@
realslot();
}
-download_manager *gen_download_progress(bool force_noninvasive,
- bool list_update,
- const string &title,
- const string &longtitle,
- const string &tablabel,
- slot0arg abortslot)
+download_signal_log *gen_download_progress(bool force_noninvasive,
+ bool list_update,
+ const string &title,
+ const string &longtitle,
+ const string &tablabel,
+ slot0arg abortslot)
{
return gen_download_progress(force_noninvasive,
list_update,
Modified: branches/aptitude-0.3/aptitude/src/ui.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.h (original)
+++ branches/aptitude-0.3/aptitude/src/ui.h Thu Sep 29 17:48:50 2005
@@ -23,7 +23,7 @@
class OpProgress;
-class download_manager;
+class download_signal_log;
class fragment;
class pkg_hier;
class vs_progress;
@@ -214,12 +214,12 @@
*
* \return the new download manager.
*/
-download_manager *gen_download_progress(bool force_noninvasive,
- bool list_update,
- const std::string &title,
- const std::string &longtitle,
- const std::string &tablabel,
- slot0arg abortslot);
+download_signal_log *gen_download_progress(bool force_noninvasive,
+ bool list_update,
+ const std::string &title,
+ const std::string &longtitle,
+ const std::string &tablabel,
+ slot0arg abortslot);
// Asks the user for simple input (the question will appear in a "minibuffer"
// or in a dialog according to preferences)
Modified: branches/aptitude-0.3/aptitude/src/view_changelog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/view_changelog.cc (original)
+++ branches/aptitude-0.3/aptitude/src/view_changelog.cc Thu Sep 29 17:48:50 2005
@@ -25,13 +25,13 @@
#include <vscreen/vs_table.h>
#include "download_bar.h"
-#include "download_manager.h"
#include "menu_redirect.h"
#include "ui.h"
#include <generic/apt/apt.h>
#include <generic/apt/pkg_changelog.h>
#include <generic/apt/config_signal.h>
+#include <generic/apt/download_signal_log.h>
#include <sigc++/functors/mem_fun.h>
@@ -150,12 +150,12 @@
return;
}
- download_manager *widget=gen_download_progress(true,
- false,
- _("Downloading Changelog"),
- "",
- _("Download Changelog"),
- NULL);
+ download_signal_log *widget=gen_download_progress(true,
+ false,
+ _("Downloading Changelog"),
+ "",
+ _("Download Changelog"),
+ NULL);
pkg_changelog *cl=get_changelog(ver, widget,
aptcfg->FindI(PACKAGE "::UI::Download-Poll-Interval", 50000));
widget->Complete();
More information about the Aptitude-svn-commit
mailing list