Attachment #82517 for bug #118027

View | Details | Raw Unified | Return to bug 118027
Collapse All | Expand All

Lines 33-42 Link Here

(-)Makefile (-7 / +1 lines)
33	INFO= cvs cvsclient	33	INFO= cvs cvsclient
34	USE_AUTOTOOLS= automake:15:env autoconf:261:env	34	USE_AUTOTOOLS= automake:15:env autoconf:261:env
35		35
36	.include <bsd.port.pre.mk>	36	.include <bsd.port.mk>
37
38	.if ${OSVERSION} >= 700042
39	BROKEN= Broken with gcc 4.2
40	.endif
41
42	.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)files/patch-common-UCvsFiles.cpp (-2 / +11 lines)
1	--- common/UCvsFiles.cpp.orig Tue Aug 13 13:46:40 2002	1	--- common/UCvsFiles.cpp.orig 2002-08-13 13:46:40.000000000 +0200
2	+++ common/UCvsFiles.cpp Sun Aug 24 13:47:21 2003	2	+++ common/UCvsFiles.cpp 2007-11-13 23:13:25.000000000 +0100
		3	@@ -201,7 +201,7 @@
		4
		5	#define NUM_COLUMNS 7
		6
		7	-static char *_gszColumnLabel[NUM_COLUMNS] =
		8	+static const char *_gszColumnLabel[NUM_COLUMNS] =
		9	{
		10	"Name", "Rev.", "Option", "Status", "Tag", "Date", "Conflict"
		11	};
3	@@ -1214,7 +1214,7 @@	12	@@ -1214,7 +1214,7 @@
4	{	13	{
5	UStr uppath, filename;	14	UStr uppath, filename;




--- common/AboutDlg.cpp.orig	2007-11-13 22:57:56.000000000 +0100
+++ common/AboutDlg.cpp	2007-11-13 22:59:13.000000000 +0100
@@ -290,11 +290,11 @@
 void AboutDialog(void)
 {
 	void *wid = UCreate_AboutDlg();
-	UStr  appText = UCvsApp::gApp->GetAppName();
+	const UStr  appText = UCvsApp::gApp->GetAppName();
 		
 	UAboutDlg *dlg = new UAboutDlg ();
 	UEventSendMessage(dlg->GetWidID(), EV_INIT_WIDGET, kUMainWidget, wid);	
-	UEventSendMessage(dlg->GetWidID(), EV_SETTEXT, kUMainWidget, appText);	
+	UEventSendMessage(dlg->GetWidID(), EV_SETTEXT, kUMainWidget, (const char *)appText);	
 	
 	bool res = false;
 	




--- common/AppGlue.h.orig	2007-11-13 22:34:29.000000000 +0100
+++ common/AppGlue.h	2007-11-13 22:34:36.000000000 +0100
@@ -30,8 +30,8 @@
 class CCvsConsole
 {
 public:
-	virtual long cvs_out(char *txt, long len) = 0L;
-	virtual long cvs_err(char *txt, long len) = 0L;
+	virtual long cvs_out(char *txt, long len) = 0;
+	virtual long cvs_err(char *txt, long len) = 0;
 };
 
 #define errInternal -99




--- common/ImportDlg.cpp.orig	2007-11-13 22:38:26.000000000 +0100
+++ common/ImportDlg.cpp	2007-11-13 22:49:01.000000000 +0100
@@ -51,20 +51,20 @@
 #include "PromptFiles.h"
 #include "TextBinary.h"
 
-static char *sDefReleases[] = 
+static const char * const sDefReleases[] = 
 {
 	"V10",
 	"V101",
 	0L
 };
 
-static char *sDefVendors[] = 
+static const char * const sDefVendors[] = 
 {
 	"GNU",
 	0L
 };
 
-static char *sDefModuleNames[] = 
+static const char * const sDefModuleNames[] = 
 {
 	"Module",
 	"Project",

Added Link Here

(-)files/patch-common_ImportFilterDlg.cpp (+11 lines)
1	--- common/ImportFilterDlg.cpp.orig 2007-11-13 22:52:32.000000000 +0100
2	+++ common/ImportFilterDlg.cpp 2007-11-13 22:53:30.000000000 +0100
3	@@ -892,7 +892,7 @@
4
5	#define NUM_COLUMNS 3
6
7	-static char *_gszColumnLabel[NUM_COLUMNS] =
8	+static const char *_gszColumnLabel[NUM_COLUMNS] =
9	{
10	"Entry state", "Entry description", "Entry kind"
11	};

Added Link Here

(-)files/patch-common_LineCmd.cpp (+11 lines)
1	--- common/LineCmd.cpp.orig 2007-11-13 23:00:05.000000000 +0100
2	+++ common/LineCmd.cpp 2007-11-13 23:00:24.000000000 +0100
3	@@ -49,7 +49,7 @@
4	# include "UCvsDialogs.h"
5	#endif
6
7	-char *sDefPrevCvsCmd[] =
8	+const char *sDefPrevCvsCmd[] =
9	{
10	"cvs --help-options",
11	"cvs --help-commands",




--- common/LogDlg.cpp.orig	2007-11-13 23:54:34.000000000 +0100
+++ common/LogDlg.cpp	2007-11-13 23:54:59.000000000 +0100
@@ -57,7 +57,7 @@
 #include "CvsPrefs.h"
 #include "MultiString.h"
 
-char *sDefLogTagNames[] = 
+const char *sDefLogTagNames[] = 
 {
 	"1.32:1.35",
 	"1.32:",
@@ -67,7 +67,7 @@
 	0L
 };
 
-char *sDefLogDateNames[] = 
+const char *sDefLogDateNames[] = 
 {
 	">1998-3-24",
 	"<1998-1-24",
@@ -76,7 +76,7 @@
 	0L
 };
 
-char *sDefLogStateNames[] = 
+const char *sDefLogStateNames[] = 
 {
 	"mystate",
 	"dead",
@@ -85,7 +85,7 @@
 	0L
 };
 
-char *sDefLogUserNames[] = 
+const char *sDefLogUserNames[] = 
 {
 	"johna",
 	"garyb",

Added Link Here

(-)files/patch-common_MultiString.cpp (+11 lines)
1	--- common/MultiString.cpp.orig 2007-11-13 23:07:12.000000000 +0100
2	+++ common/MultiString.cpp 2007-11-13 23:07:34.000000000 +0100
3	@@ -40,7 +40,7 @@
4	#endif /* WIN32 */
5
6	template<class T>
7	-TMString<T>::TMString(unsigned int maxstr, const char uniqueName, char const *defaultStr,
8	+TMString<T>::TMString(unsigned int maxstr, const char uniqueName, const char const *defaultStr,
9	kClassPersistent pclass) : CPersistent(uniqueName, pclass), fMaxStr(maxstr)
10	{
11	if(defaultStr != 0L)




--- common/MultiString.h.orig	2007-11-13 22:48:04.000000000 +0100
+++ common/MultiString.h	2007-11-13 22:50:02.000000000 +0100
@@ -95,7 +95,7 @@
 	typedef	NAMESPACE(std) vector<T> list_t;
 	
 	TMString(unsigned int maxstr, const char *uniqueName,
-		char * const *defaultStr = 0L, kClassPersistent pclass = kNoClass);
+		const char * const *defaultStr = NULL, kClassPersistent pclass = kNoClass);
 		// defaultStr is a null terminated set of strings
 
 	virtual ~TMString();
@@ -134,7 +134,7 @@
 	UDECLARE_DYNAMIC(CMString)
 public:
 	CMString(unsigned int maxstr, const char *uniqueName,
-		char * const *defaultStr = 0L, kClassPersistent pclass = kNoClass) :
+		const char * const *defaultStr = NULL, kClassPersistent pclass = kNoClass) :
 		TMString<CStr>(maxstr, uniqueName, defaultStr, pclass)
 	{
 	}




--- common/Persistent.h.orig	2007-11-13 22:33:34.000000000 +0100
+++ common/Persistent.h	2007-11-13 22:33:49.000000000 +0100
@@ -47,9 +47,9 @@
 	CPersistent(const char *uniqueName, kClassPersistent pclass);
 	virtual ~CPersistent();
 
-	virtual unsigned int SizeOf(void) const = 0L;
-	virtual const void *GetData(void) const = 0L;
-	virtual void SetData(const void *ptr, unsigned int size) = 0L;
+	virtual unsigned int SizeOf(void) const = 0;
+	virtual const void *GetData(void) const = 0;
+	virtual void SetData(const void *ptr, unsigned int size) = 0;
 		// virtual access
 	
 	static void SaveAll(void);

Added Link Here

(-)files/patch-common_UpdateDlg.cpp (+29 lines)
1	--- common/UpdateDlg.cpp.orig 2007-11-13 23:56:27.000000000 +0100
2	+++ common/UpdateDlg.cpp 2007-11-13 23:56:46.000000000 +0100
3	@@ -56,7 +56,7 @@
4	# endif
5	#endif /* WIN32 */
6
7	-char *sDefTagNames[] =
8	+const char *sDefTagNames[] =
9	{
10	"1.1",
11	"1.6.2.4",
12	@@ -65,7 +65,7 @@
13	0L
14	};
15
16	-char *sDefDateNames[] =
17	+const char *sDefDateNames[] =
18	{
19	"1998-3",
20	"1998-3-24",
21	@@ -76,7 +76,7 @@
22	0L
23	};
24
25	-char *sDefRevDateNames[] =
26	+const char *sDefRevDateNames[] =
27	{
28	"1.1",
29	"1.6.2.4",

Added Link Here

(-)files/patch-common_getopt.c (+11 lines)
1	--- common/getopt.c.orig 2007-11-13 23:33:47.000000000 +0100
2	+++ common/getopt.c 2007-11-13 23:34:27.000000000 +0100
3	@@ -509,7 +509,7 @@
4	const struct option *pfound = NULL;
5	int exact = 0;
6	int ambig = 0;
7	- int indfound;
8	+ int indfound = 0;
9	int option_index;
10
11	for (nameend = nextchar; nameend && nameend != '='; nameend++)




--- rf/uevent.cpp.orig	2007-11-13 23:59:55.000000000 +0100
+++ rf/uevent.cpp	2007-11-14 00:04:31.000000000 +0100
@@ -196,7 +196,7 @@
 	int(UCmdTarget::*pfni_VP)(void *);
 };
 
-int UEventSendMessage(int wid, int/*UEventType*/ evt, int arg1, void *arg2)
+int UEventSendMessage(int wid, int/*UEventType*/ evt, int arg1, const void *arg2)
 {
 	if(sTurnOffDispatching)
 		return 0;
@@ -320,7 +320,7 @@
 	targets.erase(i);
 }
 
-int UCmdTarget::UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
+int UCmdTarget::UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
 {
 	const UMSGMAP* themap;
 	const UMSGMAP_ENTRY *entries;
@@ -357,13 +357,13 @@
 		(this->*mmf.pfnV_V)();
 		break;
 	case epV_VP:
-		(this->*mmf.pfnV_VP)(arg2);
+		(this->*mmf.pfnV_VP)((void *)arg2);
 		break;
 	case epV_iVP:
-		(this->*mmf.pfnV_iVP)(arg1, arg2);
+		(this->*mmf.pfnV_iVP)(arg1, (void *)arg2);
 		break;
 	case epV_IVP:
-		(this->*mmf.pfnV_iVP)(UHIWORD(arg1), arg2);
+		(this->*mmf.pfnV_iVP)(UHIWORD(arg1), (void *)arg2);
 		break;
 	case epV_i:
 		(this->*mmf.pfnV_i)(arg1);
@@ -378,7 +378,7 @@
 		(this->*mmf.pfnV_iii)(ULOWORD(arg1), UHIWORD(arg1), (int)arg2);
 		break;
 	case epV_iiVP:
-		(this->*mmf.pfnV_iiVP)(ULOWORD(arg1), UHIWORD(arg1), arg2);
+		(this->*mmf.pfnV_iiVP)(ULOWORD(arg1), UHIWORD(arg1), (void *)arg2);
 		break;
 	case epi_ii:
 		res = (this->*mmf.pfni_ii)(ULOWORD(arg1), UHIWORD(arg1));
@@ -390,10 +390,10 @@
 		res = (this->*mmf.pfni_V)();
 		break;
 	case epi_iVP:
-		res = (this->*mmf.pfni_iVP)(arg1, arg2);
+		res = (this->*mmf.pfni_iVP)(arg1, (void *)arg2);
 		break;
 	case epi_VP:
-		res = (this->*mmf.pfni_VP)(arg2);
+		res = (this->*mmf.pfni_VP)((void *)arg2);
 		break;
 	default:
 		UAppConsole("Unknown event cast : %d\n", entries->nSig);




--- rf/umain.h.orig	2002-01-02 17:46:33.000000000 +0100
+++ rf/umain.h	2007-11-14 00:02:57.000000000 +0100
@@ -690,7 +690,7 @@
 	} UDispatchInfo;
 
 	//! dispatch an event using the static message table.
-	virtual int UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo);
+	virtual int UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo);
 
 	inline int GetWidID(void) const { return m_widid; }
 private:
@@ -969,7 +969,7 @@
 extern "C" {
 #endif
 
-UEXPORT int UEventSendMessage(int wid, int/*UEventType*/ evt, int arg1, void *arg2);
+UEXPORT int UEventSendMessage(int wid, int/*UEventType*/ evt, int arg1, const void *arg2);
 	/* send a message to a pseudo-widget */
 
 UEXPORT int UEventSendMessageExt(int wid, int/*UEventType*/ evt, int arg1, void *arg2, int * handledFlag);

Added Link Here

(-)files/patch-rf_ustr.cpp (+10 lines)
1	--- rf/ustr.cpp.orig 2007-11-13 23:46:12.000000000 +0100
2	+++ rf/ustr.cpp 2007-11-13 23:46:29.000000000 +0100
3	@@ -428,4 +428,5 @@
4	newvalue[len] = '\0';
5
6	return newvalue;
7	-}
8	\ No newline at end of file
9	+}
10	+




--- rf/ustr.h.orig	2007-11-13 22:31:20.000000000 +0100
+++ rf/ustr.h	2007-11-13 22:32:08.000000000 +0100
@@ -175,13 +175,13 @@
 	//! concatenate
 	UStr & operator<<(int addToStr);
 	//! concatenate
-	UStr & UStr::operator+=(int addToStr);
+	UStr & operator+=(int addToStr);
 	//! concatenate
-	UStr & UStr::operator+=(char *addToStr);
+	UStr & operator+=(char *addToStr);
 	//! concatenate
-	UStr & UStr::operator+=(const char *addToStr);
+	UStr & operator+=(const char *addToStr);
 	//! concatenate
-	UStr & UStr::operator+=(const UStr & addToStr);
+	UStr & operator+=(const UStr & addToStr);
 
 	//! compare
 	inline int compare(const char *thestr) const { return strcmp(*this, thestr); }




--- rf/utoolbar.cpp.orig	2002-06-15 19:49:37.000000000 +0200
+++ rf/utoolbar.cpp	2007-11-14 00:09:12.000000000 +0100
@@ -736,14 +736,14 @@
 		delete m_winInfo;
 }
 
-int UToolbar::UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
+int UToolbar::UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
 {
 	if(evt == EV_CMD)
 	{
 		WININFO *info = m_winInfo;
 		if(info != 0L)
 		{
-			int index;
+			int index = 0;
 			std::vector<TbEntry *>::iterator f = info->Search(arg1, &index);
 			if(f != info->entries.end())
 			{
@@ -772,7 +772,7 @@
 	if(info == 0L)
 		return;
 
-	int index;
+	int index = 0;
 	std::vector<TbEntry *>::iterator f = info->Search(cmd, &index);
 	if(f == info->entries.end())
 		return;

Added Link Here

(-)files/patch-rf_utoolbar.h (+11 lines)
1	--- rf/utoolbar.h.orig 2007-11-14 00:07:09.000000000 +0100
2	+++ rf/utoolbar.h 2007-11-14 00:07:18.000000000 +0100
3	@@ -85,7 +85,7 @@
4	UToolbar(int widid);
5	virtual ~UToolbar();
6
7	- virtual int UDispatchMessage(int/UEventType/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo);
8	+ virtual int UDispatchMessage(int/UEventType/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo);
9
10	protected:
11	ev_msg void OnDestroy();




--- rf/uwidget.cpp.orig	2007-11-13 23:26:42.000000000 +0100
+++ rf/uwidget.cpp	2007-11-13 23:30:47.000000000 +0100
@@ -782,7 +782,7 @@
 	m_listeners.push_back(listener);
 }
 
-int UWidget::UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
+int UWidget::UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
 {
 	std::vector<UCmdTarget *>::iterator i;
 	for(i = m_listeners.begin(); i != m_listeners.end(); ++i)
@@ -3136,10 +3136,10 @@
 	if(!GTK_IS_CLIST(w))
 		return;
 
-	gchar *emptyTxts[] = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
+	const gchar *emptyTxts[] = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
 
     GtkCList *list = GTK_CLIST(w);
-	*num = gtk_clist_append  (list, emptyTxts);
+	*num = gtk_clist_append  (list, (gchar **)emptyTxts);
 #endif
 #if qMacAPP
 	TView *view = (TView *)w;

Added Link Here

(-)files/patch-rf_uwidget.h (+11 lines)
1	--- rf/uwidget.h.orig 2007-11-13 23:19:17.000000000 +0100
2	+++ rf/uwidget.h 2007-11-13 23:19:38.000000000 +0100
3	@@ -119,7 +119,7 @@
4	virtual void AddListener(UCmdTarget * listener);
5
6	//! this is overided in order to broadcast to the listeners
7	- virtual int UDispatchMessage(int/UEventType/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo);
8	+ virtual int UDispatchMessage(int/UEventType/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo);
9
10	//! return a sub-widget as inserted by EV_INIT_WIDGET
11	//! \arg \c cmd the sub-widget identifier.

Lines 1-5 Link Here

(-)files/patch-cvsunix-configure.in (-3 / +26 lines)
1	--- cvsunix/configure.in.orig Wed Nov 22 16:09:07 2006	1	--- cvsunix/configure.in.orig 2001-03-06 20:23:49.000000000 +0100
2	+++ cvsunix/configure.in Wed Nov 22 16:10:02 2006	2	+++ cvsunix/configure.in 2007-11-14 00:25:06.000000000 +0100
3	@@ -178,7 +178,7 @@	3	@@ -178,7 +178,7 @@
4	# the user's setting for LDFLAGS	4	# the user's setting for LDFLAGS
5	hold_ldflags=$LDFLAGS	5	hold_ldflags=$LDFLAGS
Lines 9-15 Link Here
9	LDFLAGS=$hold_ldflags	9	LDFLAGS=$hold_ldflags
10	if test -n "$krb_incdir"; then	10	if test -n "$krb_incdir"; then
11	includeopt="${includeopt} -I$krb_incdir"	11	includeopt="${includeopt} -I$krb_incdir"
12	@@ -212,7 +212,7 @@	12	@@ -202,27 +202,22 @@
		13
		14	hold_cppflags=$CPPFLAGS
		15	CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
		16	-AC_CHECK_HEADERS(krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
		17	+AC_CHECK_HEADERS(krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h)
		18	CPPFLAGS=$hold_cppflags
		19
		20	if test "$ac_cv_header_krb5_h" = "yes" &&
		21	- (test "$ac_cv_header_gssapi_h" = "yes" \|\|
		22	- test "$ac_cv_header_gssapi_gssapi_h" = "yes"); then
		23	+ test "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
		24	AC_DEFINE(HAVE_GSSAPI)
13	includeopt="${includeopt} -I$GSSAPI/include"	25	includeopt="${includeopt} -I$GSSAPI/include"
14	# FIXME: This is ugly, but these things don't seem to be standardized.	26	# FIXME: This is ugly, but these things don't seem to be standardized.
15	if test "$ac_cv_header_gssapi_h" = "yes"; then	27	if test "$ac_cv_header_gssapi_h" = "yes"; then
Lines 18-20 Link Here
18	else	30	else
19	LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"	31	LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
20	fi	32	fi
		33	save_CPPFLAGS=$CPPFLAGS
		34	CPPFLAGS="-I$GSSAPI/include $CPPFLAGS"
		35	- if test "$ac_cv_header_gssapi_h" = "yes"; then
		36	- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
		37	- else
		38	- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
		39	- fi
		40	+ AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
		41	CPPFLAGS=$save_CPPFLAGS
		42	# This is necessary on Irix 5.3, in order to link against libkrb5 --
		43	# there, an_to_ln.o refers to things defined only in -lgen.

Return to bug 118027

Added Link Here

(-)files/patch-common_AboutDlg.cpp (+16 lines)
1	--- common/AboutDlg.cpp.orig 2007-11-13 22:57:56.000000000 +0100
2	+++ common/AboutDlg.cpp 2007-11-13 22:59:13.000000000 +0100
3	@@ -290,11 +290,11 @@
4	void AboutDialog(void)
5	{
6	void *wid = UCreate_AboutDlg();
7	- UStr appText = UCvsApp::gApp->GetAppName();
8	+ const UStr appText = UCvsApp::gApp->GetAppName();
9
10	UAboutDlg *dlg = new UAboutDlg ();
11	UEventSendMessage(dlg->GetWidID(), EV_INIT_WIDGET, kUMainWidget, wid);
12	- UEventSendMessage(dlg->GetWidID(), EV_SETTEXT, kUMainWidget, appText);
13	+ UEventSendMessage(dlg->GetWidID(), EV_SETTEXT, kUMainWidget, (const char *)appText);
14
15	bool res = false;
16

Added Link Here

(-)files/patch-common_AppGlue.h (+13 lines)
1	--- common/AppGlue.h.orig 2007-11-13 22:34:29.000000000 +0100
2	+++ common/AppGlue.h 2007-11-13 22:34:36.000000000 +0100
3	@@ -30,8 +30,8 @@
4	class CCvsConsole
5	{
6	public:
7	- virtual long cvs_out(char *txt, long len) = 0L;
8	- virtual long cvs_err(char *txt, long len) = 0L;
9	+ virtual long cvs_out(char *txt, long len) = 0;
10	+ virtual long cvs_err(char *txt, long len) = 0;
11	};
12
13	#define errInternal -99

Added Link Here

(-)files/patch-common_ImportDlg.cpp (+26 lines)
1	--- common/ImportDlg.cpp.orig 2007-11-13 22:38:26.000000000 +0100
2	+++ common/ImportDlg.cpp 2007-11-13 22:49:01.000000000 +0100
3	@@ -51,20 +51,20 @@
4	#include "PromptFiles.h"
5	#include "TextBinary.h"
6
7	-static char *sDefReleases[] =
8	+static const char * const sDefReleases[] =
9	{
10	"V10",
11	"V101",
12	0L
13	};
14
15	-static char *sDefVendors[] =
16	+static const char * const sDefVendors[] =
17	{
18	"GNU",
19	0L
20	};
21
22	-static char *sDefModuleNames[] =
23	+static const char * const sDefModuleNames[] =
24	{
25	"Module",
26	"Project",

Added Link Here

(-)files/patch-common_LogDlg.cpp (+38 lines)
1	--- common/LogDlg.cpp.orig 2007-11-13 23:54:34.000000000 +0100
2	+++ common/LogDlg.cpp 2007-11-13 23:54:59.000000000 +0100
3	@@ -57,7 +57,7 @@
4	#include "CvsPrefs.h"
5	#include "MultiString.h"
6
7	-char *sDefLogTagNames[] =
8	+const char *sDefLogTagNames[] =
9	{
10	"1.32:1.35",
11	"1.32:",
12	@@ -67,7 +67,7 @@
13	0L
14	};
15
16	-char *sDefLogDateNames[] =
17	+const char *sDefLogDateNames[] =
18	{
19	">1998-3-24",
20	"<1998-1-24",
21	@@ -76,7 +76,7 @@
22	0L
23	};
24
25	-char *sDefLogStateNames[] =
26	+const char *sDefLogStateNames[] =
27	{
28	"mystate",
29	"dead",
30	@@ -85,7 +85,7 @@
31	0L
32	};
33
34	-char *sDefLogUserNames[] =
35	+const char *sDefLogUserNames[] =
36	{
37	"johna",
38	"garyb",

Added Link Here

(-)files/patch-common_MultiString.h (+20 lines)
1	--- common/MultiString.h.orig 2007-11-13 22:48:04.000000000 +0100
2	+++ common/MultiString.h 2007-11-13 22:50:02.000000000 +0100
3	@@ -95,7 +95,7 @@
4	typedef NAMESPACE(std) vector<T> list_t;
5
6	TMString(unsigned int maxstr, const char *uniqueName,
7	- char * const *defaultStr = 0L, kClassPersistent pclass = kNoClass);
8	+ const char * const *defaultStr = NULL, kClassPersistent pclass = kNoClass);
9	// defaultStr is a null terminated set of strings
10
11	virtual ~TMString();
12	@@ -134,7 +134,7 @@
13	UDECLARE_DYNAMIC(CMString)
14	public:
15	CMString(unsigned int maxstr, const char *uniqueName,
16	- char * const *defaultStr = 0L, kClassPersistent pclass = kNoClass) :
17	+ const char * const *defaultStr = NULL, kClassPersistent pclass = kNoClass) :
18	TMString<CStr>(maxstr, uniqueName, defaultStr, pclass)
19	{
20	}

Added Link Here

(-)files/patch-common_Persistent.h (+15 lines)
1	--- common/Persistent.h.orig 2007-11-13 22:33:34.000000000 +0100
2	+++ common/Persistent.h 2007-11-13 22:33:49.000000000 +0100
3	@@ -47,9 +47,9 @@
4	CPersistent(const char *uniqueName, kClassPersistent pclass);
5	virtual ~CPersistent();
6
7	- virtual unsigned int SizeOf(void) const = 0L;
8	- virtual const void *GetData(void) const = 0L;
9	- virtual void SetData(const void *ptr, unsigned int size) = 0L;
10	+ virtual unsigned int SizeOf(void) const = 0;
11	+ virtual const void *GetData(void) const = 0;
12	+ virtual void SetData(const void *ptr, unsigned int size) = 0;
13	// virtual access
14
15	static void SaveAll(void);

Added Link Here

(-)files/patch-rf_uevent.cpp (+59 lines)
1	--- rf/uevent.cpp.orig 2007-11-13 23:59:55.000000000 +0100
2	+++ rf/uevent.cpp 2007-11-14 00:04:31.000000000 +0100
3	@@ -196,7 +196,7 @@
4	int(UCmdTarget::pfni_VP)(void );
5	};
6
7	-int UEventSendMessage(int wid, int/UEventType/ evt, int arg1, void *arg2)
8	+int UEventSendMessage(int wid, int/UEventType/ evt, int arg1, const void *arg2)
9	{
10	if(sTurnOffDispatching)
11	return 0;
12	@@ -320,7 +320,7 @@
13	targets.erase(i);
14	}
15
16	-int UCmdTarget::UDispatchMessage(int/UEventType/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
17	+int UCmdTarget::UDispatchMessage(int/UEventType/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
18	{
19	const UMSGMAP* themap;
20	const UMSGMAP_ENTRY *entries;
21	@@ -357,13 +357,13 @@
22	(this->*mmf.pfnV_V)();
23	break;
24	case epV_VP:
25	- (this->*mmf.pfnV_VP)(arg2);
26	+ (this->mmf.pfnV_VP)((void )arg2);
27	break;
28	case epV_iVP:
29	- (this->*mmf.pfnV_iVP)(arg1, arg2);
30	+ (this->mmf.pfnV_iVP)(arg1, (void )arg2);
31	break;
32	case epV_IVP:
33	- (this->*mmf.pfnV_iVP)(UHIWORD(arg1), arg2);
34	+ (this->mmf.pfnV_iVP)(UHIWORD(arg1), (void )arg2);
35	break;
36	case epV_i:
37	(this->*mmf.pfnV_i)(arg1);
38	@@ -378,7 +378,7 @@
39	(this->*mmf.pfnV_iii)(ULOWORD(arg1), UHIWORD(arg1), (int)arg2);
40	break;
41	case epV_iiVP:
42	- (this->*mmf.pfnV_iiVP)(ULOWORD(arg1), UHIWORD(arg1), arg2);
43	+ (this->mmf.pfnV_iiVP)(ULOWORD(arg1), UHIWORD(arg1), (void )arg2);
44	break;
45	case epi_ii:
46	res = (this->*mmf.pfni_ii)(ULOWORD(arg1), UHIWORD(arg1));
47	@@ -390,10 +390,10 @@
48	res = (this->*mmf.pfni_V)();
49	break;
50	case epi_iVP:
51	- res = (this->*mmf.pfni_iVP)(arg1, arg2);
52	+ res = (this->mmf.pfni_iVP)(arg1, (void )arg2);
53	break;
54	case epi_VP:
55	- res = (this->*mmf.pfni_VP)(arg2);
56	+ res = (this->mmf.pfni_VP)((void )arg2);
57	break;
58	default:
59	UAppConsole("Unknown event cast : %d\n", entries->nSig);

Added Link Here

(-)files/patch-rf_umain.h (+20 lines)
1	--- rf/umain.h.orig 2002-01-02 17:46:33.000000000 +0100
2	+++ rf/umain.h 2007-11-14 00:02:57.000000000 +0100
3	@@ -690,7 +690,7 @@
4	} UDispatchInfo;
5
6	//! dispatch an event using the static message table.
7	- virtual int UDispatchMessage(int/UEventType/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo);
8	+ virtual int UDispatchMessage(int/UEventType/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo);
9
10	inline int GetWidID(void) const { return m_widid; }
11	private:
12	@@ -969,7 +969,7 @@
13	extern "C" {
14	#endif
15
16	-UEXPORT int UEventSendMessage(int wid, int/UEventType/ evt, int arg1, void *arg2);
17	+UEXPORT int UEventSendMessage(int wid, int/UEventType/ evt, int arg1, const void *arg2);
18	/* send a message to a pseudo-widget */
19
20	UEXPORT int UEventSendMessageExt(int wid, int/UEventType/ evt, int arg1, void arg2, int handledFlag);

Added Link Here

(-)files/patch-rf_ustr.h (+20 lines)
1	--- rf/ustr.h.orig 2007-11-13 22:31:20.000000000 +0100
2	+++ rf/ustr.h 2007-11-13 22:32:08.000000000 +0100
3	@@ -175,13 +175,13 @@
4	//! concatenate
5	UStr & operator<<(int addToStr);
6	//! concatenate
7	- UStr & UStr::operator+=(int addToStr);
8	+ UStr & operator+=(int addToStr);
9	//! concatenate
10	- UStr & UStr::operator+=(char *addToStr);
11	+ UStr & operator+=(char *addToStr);
12	//! concatenate
13	- UStr & UStr::operator+=(const char *addToStr);
14	+ UStr & operator+=(const char *addToStr);
15	//! concatenate
16	- UStr & UStr::operator+=(const UStr & addToStr);
17	+ UStr & operator+=(const UStr & addToStr);
18
19	//! compare
20	inline int compare(const char thestr) const { return strcmp(this, thestr); }

Added Link Here

(-)files/patch-rf_utoolbar.cpp (+28 lines)
1	--- rf/utoolbar.cpp.orig 2002-06-15 19:49:37.000000000 +0200
2	+++ rf/utoolbar.cpp 2007-11-14 00:09:12.000000000 +0100
3	@@ -736,14 +736,14 @@
4	delete m_winInfo;
5	}
6
7	-int UToolbar::UDispatchMessage(int/UEventType/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
8	+int UToolbar::UDispatchMessage(int/UEventType/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
9	{
10	if(evt == EV_CMD)
11	{
12	WININFO *info = m_winInfo;
13	if(info != 0L)
14	{
15	- int index;
16	+ int index = 0;
17	std::vector<TbEntry *>::iterator f = info->Search(arg1, &index);
18	if(f != info->entries.end())
19	{
20	@@ -772,7 +772,7 @@
21	if(info == 0L)
22	return;
23
24	- int index;
25	+ int index = 0;
26	std::vector<TbEntry *>::iterator f = info->Search(cmd, &index);
27	if(f == info->entries.end())
28	return;

Added Link Here

(-)files/patch-rf_uwidget.cpp (+24 lines)
1	--- rf/uwidget.cpp.orig 2007-11-13 23:26:42.000000000 +0100
2	+++ rf/uwidget.cpp 2007-11-13 23:30:47.000000000 +0100
3	@@ -782,7 +782,7 @@
4	m_listeners.push_back(listener);
5	}
6
7	-int UWidget::UDispatchMessage(int/UEventType/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
8	+int UWidget::UDispatchMessage(int/UEventType/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
9	{
10	std::vector<UCmdTarget *>::iterator i;
11	for(i = m_listeners.begin(); i != m_listeners.end(); ++i)
12	@@ -3136,10 +3136,10 @@
13	if(!GTK_IS_CLIST(w))
14	return;
15
16	- gchar *emptyTxts[] = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
17	+ const gchar *emptyTxts[] = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
18
19	GtkCList *list = GTK_CLIST(w);
20	- *num = gtk_clist_append (list, emptyTxts);
21	+ num = gtk_clist_append (list, (gchar *)emptyTxts);
22	#endif
23	#if qMacAPP
24	TView view = (TView )w;