(trunk libT) remove unnecessary #includes

diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c
index b20747c195c4ebb313d0c7baef1f7703c2595254..17b06e7c92b8b78775ddeee3ff26b14c367a917b 100644 (file)
--- a/libtransmission/metainfo.c
+++ b/libtransmission/metainfo.c
@@ -1,26 +1,14 @@
-/******************************************************************************
- * $Id$
- *
- * Copyright (c) 2005-2008 Transmission authors and contributors
+/*
+ * This file Copyright (C) 2009 Mnemosyne LLC
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * This file is licensed by the GPL version 2.  Works owned by the
+ * Transmission project are granted a special exemption to clause 2(b)
+ * so that the bulk of its code can remain under the MIT license.
+ * This exemption does not extend to derived works not owned by
+ * the Transmission project.
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *****************************************************************************/
+ * $Id$
+ */
 
 #include <assert.h>
 #include <errno.h>

diff --git a/libtransmission/metainfo.h b/libtransmission/metainfo.h
index 07f92ca97a75ff38ed7dc9b714c3ea0f302a0b67..87faae1b124bd42b3bd3efd5e15102f78b6059b6 100644 (file)
--- a/libtransmission/metainfo.h
+++ b/libtransmission/metainfo.h
@@ -1,26 +1,14 @@
-/******************************************************************************
- * $Id$
- *
- * Copyright (c) 2005-2008 Transmission authors and contributors
+/*
+ * This file Copyright (C) 2009 Mnemosyne LLC
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * This file is licensed by the GPL version 2.  Works owned by the
+ * Transmission project are granted a special exemption to clause 2(b)
+ * so that the bulk of its code can remain under the MIT license.
+ * This exemption does not extend to derived works not owned by
+ * the Transmission project.
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *****************************************************************************/
+ * $Id$
+ */
 
 #ifndef __TRANSMISSION__
  #error only libtransmission should #include this header.

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index e6fd889fb88c5ce90708ba5477bff7cab20a752e..ec8ba8b0555aac5a6228c91e108960be35321db1 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -31,7 +31,6 @@
 #include "peer-mgr.h"
 #include "peer-msgs.h"
 #include "platform.h" /* MAX_STACK_ARRAY_SIZE */
-#include "ratecontrol.h"
 #include "session.h"
 #include "stats.h"
 #include "torrent.h"

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 7a5ac593714848386e6dcc28d209553c7b565c27..640574a53556564be19f2ae3db6266dcb2b53f3d 100644 (file)
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -37,7 +37,6 @@
 #include "peer-mgr.h"
 #include "platform.h" /* TR_PATH_DELIMITER_STR */
 #include "ptrarray.h"
-#include "ratecontrol.h"
 #include "session.h"
 #include "torrent.h"
 #include "torrent-magnet.h"

diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index eb585b8633412db1a9adb9d2604f981353740c87..ae984c0587e23a9be694dcbcc0a736498a2aa747 100644 (file)
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -18,12 +18,10 @@
 #define TR_TORRENT_H 1
 
 #include "completion.h" /* tr_completion */
-#include "ratecontrol.h" /* tr_ratecontrol */
 #include "session.h" /* tr_globalLock(), tr_globalUnlock() */
 #include "utils.h" /* TR_GNUC_PRINTF */
 
 struct tr_bandwidth;
-struct tr_ratecontrol;
 struct tr_torrent_tiers;
 struct tr_magnet_info;