From 66cfa406430154b668f725abd9136a8a2e6041d8 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Thu, 9 Apr 2015 03:32:23 +0400 Subject: [PATCH] Deal with remaining cvs/svn keywords. A few $Id$ references remained after commit 3f66f6a5b3583b02c34854556eb83e3a808524ce or appeared in newly added files. Remove the lines containing svn keywords except when it concerns third-party files. In that case keep the line as-is or collapse it to the keyword if it had been expanded to contain wx commit information (only occurs with src/zlib/ChangeLog). --- include/wx/generic/private/addremovectrl.h | 1 - include/wx/gtk/private/addremovectrl.h | 1 - include/wx/osx/private/addremovectrl.h | 1 - include/wx/private/addremovectrl.h | 1 - include/wx/xrc/xmlreshandler.h | 1 - samples/minimal/minimal.cpp | 1 - src/msw/wince/clean_vcp.py | 1 - src/xrc/xmlreshandler.cpp | 1 - src/zlib/ChangeLog | 2 +- tests/graphics/boundingbox.cpp | 1 - tests/misc/safearrayconverttest.cpp | 1 - 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/wx/generic/private/addremovectrl.h b/include/wx/generic/private/addremovectrl.h index af2a9ee7c8..2eea6fad1d 100644 --- a/include/wx/generic/private/addremovectrl.h +++ b/include/wx/generic/private/addremovectrl.h @@ -3,7 +3,6 @@ // Purpose: Generic wxAddRemoveImpl implementation, also used in wxMSW // Author: Vadim Zeitlin // Created: 2015-02-05 -// RCS-ID: $Id$ // Copyright: (c) 2015 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/gtk/private/addremovectrl.h b/include/wx/gtk/private/addremovectrl.h index 1cb797e8c2..5644801b6e 100644 --- a/include/wx/gtk/private/addremovectrl.h +++ b/include/wx/gtk/private/addremovectrl.h @@ -3,7 +3,6 @@ // Purpose: GTK specific wxAddRemoveImpl implementation // Author: Vadim Zeitlin // Created: 2015-02-05 -// RCS-ID: $Id$ // Copyright: (c) 2015 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/osx/private/addremovectrl.h b/include/wx/osx/private/addremovectrl.h index b7fefc258e..a5b342a8d2 100644 --- a/include/wx/osx/private/addremovectrl.h +++ b/include/wx/osx/private/addremovectrl.h @@ -3,7 +3,6 @@ // Purpose: OS X specific wxAddRemoveImpl implementation // Author: Vadim Zeitlin // Created: 2015-02-05 -// RCS-ID: $Id$ // Copyright: (c) 2015 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/private/addremovectrl.h b/include/wx/private/addremovectrl.h index 2021a91723..adb349f646 100644 --- a/include/wx/private/addremovectrl.h +++ b/include/wx/private/addremovectrl.h @@ -3,7 +3,6 @@ // Purpose: wxAddRemoveImpl helper class declaration // Author: Vadim Zeitlin // Created: 2015-02-04 -// RCS-ID: $Id$ // Copyright: (c) 2015 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h index c5ee3cc2e6..0dab73b3d4 100644 --- a/include/wx/xrc/xmlreshandler.h +++ b/include/wx/xrc/xmlreshandler.h @@ -3,7 +3,6 @@ // Purpose: XML resource handler // Author: Steven Lamerton // Created: 2011/01/26 -// RCS-ID: $id$ // Copyright: (c) 2011 Steven Lamerton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 64d5356b23..e369f3b86c 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/msw/wince/clean_vcp.py b/src/msw/wince/clean_vcp.py index 580e3cda45..2226cf5cd9 100644 --- a/src/msw/wince/clean_vcp.py +++ b/src/msw/wince/clean_vcp.py @@ -6,7 +6,6 @@ and this process might take HUGE amount of time Author : Viktor Voroshylo ''' -__version__='$Revision$'[11:-2] import sys diff --git a/src/xrc/xmlreshandler.cpp b/src/xrc/xmlreshandler.cpp index cb7351d1f1..3a729ff2f9 100644 --- a/src/xrc/xmlreshandler.cpp +++ b/src/xrc/xmlreshandler.cpp @@ -3,7 +3,6 @@ // Purpose: XML resource handler // Author: Steven Lamerton // Created: 2011/01/26 -// RCS-ID: $id$ // Copyright: (c) 2011 Steven Lamerton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/zlib/ChangeLog b/src/zlib/ChangeLog index 38061fe672..f22aabaef5 100644 --- a/src/zlib/ChangeLog +++ b/src/zlib/ChangeLog @@ -1216,7 +1216,7 @@ Changes in 1.0.6 (19 Jan 1998) - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) - added makelcc.bat for lcc-win32 (Tom St Denis) - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) -- Avoid expanded $Id: ChangeLog 35458 2005-09-10 21:15:17Z MW $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. +- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. - check for unistd.h in configure (for off_t) - remove useless check parameter in inflate_blocks_free - avoid useless assignment of s->check to itself in inflate_blocks_new diff --git a/tests/graphics/boundingbox.cpp b/tests/graphics/boundingbox.cpp index 43e58e9d47..b884db56d7 100644 --- a/tests/graphics/boundingbox.cpp +++ b/tests/graphics/boundingbox.cpp @@ -3,7 +3,6 @@ // Purpose: wxGCDC bounding box unit tests // Author: Vadim Zeitlin / Maarten Spoek / Toni Ruža // Created: 2011-01-36 -// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // (c) 2014 Toni Ruža /////////////////////////////////////////////////////////////////////////////// diff --git a/tests/misc/safearrayconverttest.cpp b/tests/misc/safearrayconverttest.cpp index 20ad9a75c4..51c7f16d65 100644 --- a/tests/misc/safearrayconverttest.cpp +++ b/tests/misc/safearrayconverttest.cpp @@ -2,7 +2,6 @@ // Name: tests/misc/safearrayconverttest.cpp // Purpose: Test conversions between wxVariant and OLE VARIANT using SAFEARRAYs // Author: PB -// RCS-ID: $Id: typeinfotest.cpp 67656 2011-04-30 10:57:04Z DS $ // Copyright: (c) the wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////////