From 5df58b522b52d5914bf8b49fc47ff46fde56877f Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 30 Nov 2013 16:18:03 +0100
Subject: [PATCH] Move TextTable from pkgman to libshared

---
 {src/bin/pkgman => headers/private/shared}/TextTable.h | 9 +++++++++
 src/bin/pkgman/Jamfile                                 | 3 +--
 src/bin/pkgman/command_search.cpp                      | 2 +-
 src/kits/shared/Jamfile                                | 1 +
 src/{bin/pkgman => kits/shared}/TextTable.cpp          | 8 +++++++-
 5 files changed, 19 insertions(+), 4 deletions(-)
 rename {src/bin/pkgman => headers/private/shared}/TextTable.h (91%)
 rename src/{bin/pkgman => kits/shared}/TextTable.cpp (98%)

diff --git a/src/bin/pkgman/TextTable.h b/headers/private/shared/TextTable.h
similarity index 91%
rename from src/bin/pkgman/TextTable.h
rename to headers/private/shared/TextTable.h
index dd94bfe9b7..3d37e388a9 100644
--- a/src/bin/pkgman/TextTable.h
+++ b/headers/private/shared/TextTable.h
@@ -11,6 +11,9 @@
 #include <StringList.h>
 
 
+namespace BPrivate {
+
+
 class TextTable {
 public:
 								TextTable();
@@ -39,4 +42,10 @@ private:
 };
 
 
+} // namespace BPrivate
+
+
+using ::BPrivate::TextTable;
+
+
 #endif	// TEXT_TABLE_H
diff --git a/src/bin/pkgman/Jamfile b/src/bin/pkgman/Jamfile
index e225036624..3ff4b48179 100644
--- a/src/bin/pkgman/Jamfile
+++ b/src/bin/pkgman/Jamfile
@@ -17,8 +17,7 @@ BinCommand pkgman :
 	JobStateListener.cpp
 	PackageManager.cpp
 	pkgman.cpp
-	TextTable.cpp
 	:
-	package be
+	libshared.a package be
 	$(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++)
 ;
diff --git a/src/bin/pkgman/command_search.cpp b/src/bin/pkgman/command_search.cpp
index d84cff1a96..23c1ce2a0d 100644
--- a/src/bin/pkgman/command_search.cpp
+++ b/src/bin/pkgman/command_search.cpp
@@ -18,11 +18,11 @@
 #include <set>
 
 #include <package/solver/SolverPackage.h>
+#include <TextTable.h>
 
 #include "Command.h"
 #include "PackageManager.h"
 #include "pkgman.h"
-#include "TextTable.h"
 
 
 // TODO: internationalization!
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index e170392ebd..6a44e76084 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -45,6 +45,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			ShakeTrackingFilter.cpp
 			StringForRate.cpp
 			StringForSize.cpp
+			TextTable.cpp
 			Thread.cpp
 			Variant.cpp
 			;
diff --git a/src/bin/pkgman/TextTable.cpp b/src/kits/shared/TextTable.cpp
similarity index 98%
rename from src/bin/pkgman/TextTable.cpp
rename to src/kits/shared/TextTable.cpp
index f173665532..2601205b3e 100644
--- a/src/bin/pkgman/TextTable.cpp
+++ b/src/kits/shared/TextTable.cpp
@@ -4,13 +4,16 @@
  */
 
 
-#include "TextTable.h"
+#include <TextTable.h>
 
 #include <stdio.h>
 
 #include <algorithm>
 
 
+namespace BPrivate {
+
+
 // #pragma mark - Column
 
 
@@ -272,3 +275,6 @@ TextTable::Print(int32 maxWidth)
 		fputs(line.String(), stdout);
 	}
 }
+
+
+} // namespace BPrivate