[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kpilot/lib
From:       Jason vanRijn Kasper <vR () movingparts ! net>
Date:       2007-04-21 19:40:59
Message-ID: 1177184459.383249.21839.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 656592 by vanrijn:

fixing reported problem with duplicate default_category_names and --enable-final

 M  +7 -7      pilotAddress.cc  
 M  +3 -3      pilotDateEntry.cc  


--- branches/KDE/3.5/kdepim/kpilot/lib/pilotAddress.cc #656591:656592
@@ -40,7 +40,7 @@
 
 #include "pilotAddress.h"
 
-static const char *default_category_names[] = {
+static const char *default_address_category_names[] = {
 	"Unfiled",
 	"Business",
 	"Personal",
@@ -48,7 +48,7 @@
 	0L
 } ;
 
-static const char *default_field_labels[] = {
+static const char *default_address_field_labels[] = {
 	"Last name",
 	"First name",
 	"Company",
@@ -77,17 +77,17 @@
 	// Reset to all 0s
 	memset(&fInfo,0,sizeof(fInfo));
 	// Fill up default categories
-	for (unsigned int i=0; (i<4) && default_category_names[i]; ++i)
+	for (unsigned int i=0; (i<4) && default_address_category_names[i]; ++i)
 	{
-		strncpy(fInfo.category.name[i],default_category_names[i],sizeof(fInfo.category.name[0]));
+		strncpy(fInfo.category.name[i],default_address_category_names[i],sizeof(fInfo.category.name[0]));
 	}
 	// Weird hack, looks like there's an extra copy of Unfiled
-	strncpy(fInfo.category.name[15],default_category_names[0],sizeof(fInfo.category.name[0]));
+	strncpy(fInfo.category.name[15],default_address_category_names[0],sizeof(fInfo.category.name[0]));
 
 	// And fill up the default labels.
-	for (unsigned int i=0; (i<19) && default_field_labels[i]; ++i)
+	for (unsigned int i=0; (i<19) && default_address_field_labels[i]; ++i)
 	{
-		strncpy(fInfo.labels[i],default_field_labels[i],sizeof(fInfo.labels[0]));
+		strncpy(fInfo.labels[i],default_address_field_labels[i],sizeof(fInfo.labels[0]));
 	}
 }
 
--- branches/KDE/3.5/kdepim/kpilot/lib/pilotDateEntry.cc #656591:656592
@@ -39,7 +39,7 @@
 
 #include "pilotDateEntry.h"
 
-static const char *default_category_names[] = {
+static const char *default_date_category_names[] = {
 	"Unfiled",
 	"Business",
 	"Personal",
@@ -52,9 +52,9 @@
 	// Reset to all 0s
 	memset(&fInfo,0,sizeof(fInfo));
 	// Fill up default categories
-	for (unsigned int i=0; (i<4) && default_category_names[i]; ++i)
+	for (unsigned int i=0; (i<4) && default_date_category_names[i]; ++i)
 	{
-		strncpy(fInfo.category.name[i],default_category_names[i],sizeof(fInfo.category.name[0]));
+		strncpy(fInfo.category.name[i],default_date_category_names[i],sizeof(fInfo.category.name[0]));
 	}
 
 	fInfo.startOfWeek = 0;
[prev in list] [next in list] [prev in thread] [next in thread]