Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage

[ntk/apt.git] / apt-pkg / install-progress.h

diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index 8a5b68a..baf2453 100644 (file)
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -24,16 +24,16 @@ namespace Progress {
     int last_reported_progress;
 
  public:
-    PackageManager() 
+    PackageManager()
        : percentage(0.0), last_reported_progress(-1) {};
     virtual ~PackageManager() {};
 
     /* Global Start/Stop */
-    virtual void Start(int child_pty=-1) {};
+    virtual void Start(int /*child_pty*/=-1) {};
     virtual void Stop() {};
 
-    /* When dpkg is invoked (may happen multiple times for each 
-     * install/remove block 
+    /* When dpkg is invoked (may happen multiple times for each
+     * install/remove block
     */
     virtual void StartDpkg() {};
 
@@ -44,18 +44,18 @@ namespace Progress {
          return 500000;
     };
 
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
-                               std::string HumanReadableAction) ;
-    virtual void Error(std::string PackageName,                                
-                       unsigned int StepsDone,
-                       unsigned int TotalSteps,
-                       std::string ErrorMessage) {};
-    virtual void ConffilePrompt(std::string PackageName,
-                                unsigned int StepsDone,
-                                unsigned int TotalSteps,
-                                std::string ConfMessage) {};
+                               std::string HumanReadableAction);
+    virtual void Error(std::string /*PackageName*/,
+                       unsigned int /*StepsDone*/,
+                       unsigned int /*TotalSteps*/,
+                       std::string /*ErrorMessage*/) {}
+    virtual void ConffilePrompt(std::string /*PackageName*/,
+                                unsigned int /*StepsDone*/,
+                                unsigned int /*TotalSteps*/,
+                                std::string /*ConfMessage*/) {}
  };
 
  class PackageManagerProgressFd : public PackageManager
@@ -72,11 +72,11 @@ namespace Progress {
     virtual void StartDpkg();
     virtual void Stop();
 
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
-    virtual void Error(std::string PackageName,                                
+    virtual void Error(std::string PackageName,
                        unsigned int StepsDone,
                        unsigned int TotalSteps,
                           std::string ErrorMessage);
@@ -101,11 +101,11 @@ namespace Progress {
     virtual void StartDpkg();
     virtual void Stop();
 
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
-    virtual void Error(std::string PackageName,                                
+    virtual void Error(std::string PackageName,
                        unsigned int StepsDone,
                        unsigned int TotalSteps,
                           std::string ErrorMessage);
@@ -134,7 +134,7 @@ namespace Progress {
     ~PackageManagerFancy();
     virtual void Start(int child_pty=-1);
     virtual void Stop();
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
@@ -143,14 +143,14 @@ namespace Progress {
  class PackageManagerText : public PackageManager
  {
  public:
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
  };
 
 
-}; // namespace Progress
-}; // namespace APT
+} // namespace Progress
+} // namespace APT
 
 #endif