remove base/Deprecated.h (macros now in APIConfig.h)

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 30ede1b..4ad9b6c 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -224,7 +224,6 @@ SET( zypp_base_HEADERS
   base/Counter.h
   base/Debug.h
   base/DefaultIntegral.h
-  base/Deprecated.h
   base/DtorReset.h
   base/Exception.h
   base/UserRequestException.h

diff --git a/zypp/Capability.h b/zypp/Capability.h
index e54d152..9995fd6 100644 (file)
--- a/zypp/Capability.h
+++ b/zypp/Capability.h
@@ -15,7 +15,7 @@
 #include <iosfwd>
 
 #include "zypp/base/SafeBool.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/sat/detail/PoolMember.h"
 

diff --git a/zypp/OnMediaLocation.h b/zypp/OnMediaLocation.h
index 59d9f92..d8faf52 100644 (file)
--- a/zypp/OnMediaLocation.h
+++ b/zypp/OnMediaLocation.h
@@ -14,7 +14,7 @@
 
 #include <iosfwd>
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 #include "zypp/Pathname.h"
 #include "zypp/ByteCount.h"
 #include "zypp/CheckSum.h"

diff --git a/zypp/RepoInfo.h b/zypp/RepoInfo.h
index 4d98395..8ac20f5 100644 (file)
--- a/zypp/RepoInfo.h
+++ b/zypp/RepoInfo.h
@@ -16,7 +16,7 @@
 #include <set>
 
 #include "zypp/base/Iterator.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/Url.h"
 #include "zypp/Locale.h"

diff --git a/zypp/ResKind.h b/zypp/ResKind.h
index f241dcb..39c11d9 100644 (file)
--- a/zypp/ResKind.h
+++ b/zypp/ResKind.h
@@ -15,7 +15,7 @@
 #include <iosfwd>
 #include <string>
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 #include "zypp/base/String.h"
 #include "zypp/IdStringType.h"
 

diff --git a/zypp/ResObject.h b/zypp/ResObject.h
index d508dfe..c7c00cc 100644 (file)
--- a/zypp/ResObject.h
+++ b/zypp/ResObject.h
@@ -12,7 +12,7 @@
 #ifndef ZYPP_RESOBJECT_H
 #define ZYPP_RESOBJECT_H
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/Resolvable.h"
 #include "zypp/Date.h"

diff --git a/zypp/ResPool.h b/zypp/ResPool.h
index 9ef1e1c..58f0bf9 100644 (file)
--- a/zypp/ResPool.h
+++ b/zypp/ResPool.h
@@ -14,7 +14,7 @@
 
 #include <iosfwd>
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 #include "zypp/base/Iterator.h"
 
 #include "zypp/pool/PoolTraits.h"

diff --git a/zypp/Resolvable.h b/zypp/Resolvable.h
index 762f20e..eaca5aa 100644 (file)
--- a/zypp/Resolvable.h
+++ b/zypp/Resolvable.h
@@ -15,7 +15,7 @@
 #include <iosfwd>
 #include <string>
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/NonCopyable.h"

diff --git a/zypp/Target.h b/zypp/Target.h
index e07f5b8..db949e1 100644 (file)
--- a/zypp/Target.h
+++ b/zypp/Target.h
@@ -17,7 +17,7 @@
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/NonCopyable.h"
 #include "zypp/base/PtrTypes.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/Product.h"
 #include "zypp/Pathname.h"

diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h
index 18ef8e0..f2937b6 100644 (file)
--- a/zypp/ZConfig.h
+++ b/zypp/ZConfig.h
@@ -16,7 +16,7 @@
 #include <set>
 #include <string>
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 #include "zypp/base/NonCopyable.h"
 #include "zypp/base/PtrTypes.h"
 

diff --git a/zypp/ZYpp.h b/zypp/ZYpp.h
index 9452972..a5f6e09 100644 (file)
--- a/zypp/ZYpp.h
+++ b/zypp/ZYpp.h
@@ -17,7 +17,7 @@
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/NonCopyable.h"
 #include "zypp/base/PtrTypes.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/ZConfig.h"
 

diff --git a/zypp/base/Deprecated.h b/zypp/base/Deprecated.h
deleted file mode 100644 (file)
index a10c384..0000000
--- a/zypp/base/Deprecated.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/base/Deprecated.h
- *  \brief     Provides the ZYPP_DEPRECATED macro.
- */
-
-#warning base/Deprecated.h may vanish, including APIConfig.h is preferred
-#include "zypp/APIConfig.h"

diff --git a/zypp/base/LogTools.h b/zypp/base/LogTools.h
index a1e257c..b73013c 100644 (file)
--- a/zypp/base/LogTools.h
+++ b/zypp/base/LogTools.h
@@ -22,7 +22,7 @@
 #include "zypp/base/Tr1hash.h"
 #include "zypp/base/Logger.h"
 #include "zypp/base/Iterator.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp

diff --git a/zypp/media/MediaAccess.h b/zypp/media/MediaAccess.h
index e17f7b2..1a43af9 100644 (file)
--- a/zypp/media/MediaAccess.h
+++ b/zypp/media/MediaAccess.h
@@ -20,7 +20,7 @@
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/NonCopyable.h"
 #include "zypp/base/PtrTypes.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/Pathname.h"
 #include "zypp/PathInfo.h"

diff --git a/zypp/media/MediaHandler.h b/zypp/media/MediaHandler.h
index 7f7c95d..57d0922 100644 (file)
--- a/zypp/media/MediaHandler.h
+++ b/zypp/media/MediaHandler.h
@@ -25,7 +25,7 @@
 
 #include "zypp/media/MediaSource.h"
 #include "zypp/media/MediaException.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 namespace zypp {
   namespace media {

diff --git a/zypp/media/MediaManager.h b/zypp/media/MediaManager.h
index a2d79f1..107201e 100644 (file)
--- a/zypp/media/MediaManager.h
+++ b/zypp/media/MediaManager.h
@@ -14,7 +14,7 @@
 
 #include "zypp/media/MediaAccess.h"
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 #include "zypp/base/NonCopyable.h"
 #include "zypp/base/PtrTypes.h"
 #include "zypp/Pathname.h"

diff --git a/zypp/media/MediaUserAuth.h b/zypp/media/MediaUserAuth.h
index e2780ae..4a3f429 100644 (file)
--- a/zypp/media/MediaUserAuth.h
+++ b/zypp/media/MediaUserAuth.h
@@ -12,7 +12,7 @@
 #ifndef ZYPP_MEDIA_USER_AUTH_H
 #define ZYPP_MEDIA_USER_AUTH_H
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/Url.h"
 #include "zypp/base/PtrTypes.h"

diff --git a/zypp/pool/GetResolvablesToInsDel.h b/zypp/pool/GetResolvablesToInsDel.h
index 98ff5c3..5c184f7 100644 (file)
--- a/zypp/pool/GetResolvablesToInsDel.h
+++ b/zypp/pool/GetResolvablesToInsDel.h
@@ -16,7 +16,7 @@
 #include <list>
 
 #include "zypp/ResPool.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp

diff --git a/zypp/pool/PoolImpl.h b/zypp/pool/PoolImpl.h
index 30e5059..e3d1365 100644 (file)
--- a/zypp/pool/PoolImpl.h
+++ b/zypp/pool/PoolImpl.h
@@ -17,7 +17,7 @@
 #include "zypp/base/Easy.h"
 #include "zypp/base/LogTools.h"
 #include "zypp/base/SerialNumber.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/pool/PoolTraits.h"
 #include "zypp/ResPoolProxy.h"

diff --git a/zypp/ws/WebpinResult.h b/zypp/ws/WebpinResult.h
index 72af525..16d309b 100644 (file)
--- a/zypp/ws/WebpinResult.h
+++ b/zypp/ws/WebpinResult.h
@@ -17,7 +17,7 @@
 #include <set>
 #include "zypp/base/PtrTypes.h"
 #include "zypp/base/Iterator.h"
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 #include "zypp/CheckSum.h"
 #include "zypp/Edition.h"

diff --git a/zypp/zypp_detail/ZYppReadOnlyHack.h b/zypp/zypp_detail/ZYppReadOnlyHack.h
index 24b1dd7..c6426e0 100644 (file)
--- a/zypp/zypp_detail/ZYppReadOnlyHack.h
+++ b/zypp/zypp_detail/ZYppReadOnlyHack.h
@@ -14,7 +14,7 @@
 #define ZYPP_ZYPP_DETAIL_ZYPPREADONLYHACK_H
 #warning ZYPP_ZYPP_DETAIL_ZYPPREADONLYHACK_H
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp