fix screen width detection for apt/apt-get lists

[apt.git] / apt-private / private-output.h

diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index c3c76bb92dc24bc27cbceb71e92d60b8e5b0e6d9..9633d0c37a6d077521b62d8b63befeb342d7be61 100644 (file)
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -1,37 +1,37 @@
 #ifndef APT_PRIVATE_OUTPUT_H
 #define APT_PRIVATE_OUTPUT_H
 
 #ifndef APT_PRIVATE_OUTPUT_H
 #define APT_PRIVATE_OUTPUT_H
 

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>

 
 

-#include <iostream>

 #include <fstream>
 #include <string>
 
 #include <fstream>
 #include <string>
 

-#include "private-cachefile.h"
-

 // forward declaration
 class pkgCacheFile;
 class CacheFile;
 // forward declaration
 class pkgCacheFile;
 class CacheFile;

-class pkgCache;

 class pkgDepCache;
 class pkgRecords;
 
 
 class pkgDepCache;
 class pkgRecords;
 
 

-extern std::ostream c0out;
-extern std::ostream c1out;
-extern std::ostream c2out;
-extern std::ofstream devnull;
-extern unsigned int ScreenWidth;
+APT_PUBLIC extern std::ostream c0out;
+APT_PUBLIC extern std::ostream c1out;
+APT_PUBLIC extern std::ostream c2out;
+APT_PUBLIC extern std::ofstream devnull;
+APT_PUBLIC extern unsigned int ScreenWidth;
+
+APT_PUBLIC bool InitOutput();

 
 

-bool InitOutput();
-void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, 
+void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,

                        pkgCache::VerIterator V, std::ostream &out,
                        bool include_summary=true);
 
 
                        pkgCache::VerIterator V, std::ostream &out,
                        bool include_summary=true);
 
 

+// helper to describe global state
+APT_PUBLIC void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now);

 
 

-bool ShowList(std::ostream &out, std::string Title, std::string List,
+APT_PUBLIC bool ShowList(std::ostream &out, std::string Title, std::string List,

               std::string VersionsList);
               std::string VersionsList);

-void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now);

 void ShowNew(std::ostream &out,CacheFile &Cache);
 void ShowDel(std::ostream &out,CacheFile &Cache);
 void ShowKept(std::ostream &out,CacheFile &Cache);
 void ShowNew(std::ostream &out,CacheFile &Cache);
 void ShowDel(std::ostream &out,CacheFile &Cache);
 void ShowKept(std::ostream &out,CacheFile &Cache);