ports/81081: mail/kiltdown: fix build on FreeBSD >= 5.x

[Johan van Selst]

>Number:         81081
>Category:       ports
>Synopsis:       mail/kiltdown: fix build on FreeBSD >= 5.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 15 20:50:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.4-STABLE FreeBSD 5.4-STABLE #3: Mon May 9 19:06:32 CEST 2005 root at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	A variable p shouldn't be used for two completely different things
	(a MessagePriority and QPixmap) in the same sentence.

	Fix: give each beast a unique name
	
>How-To-Repeat:
	
>Fix:

	

	Include the fix below as files/patch-kiltdown_mailviewer.cc

--- kiltdown/mailviewer.cc.orig	Sun May 15 22:29:50 2005
+++ kiltdown/mailviewer.cc	Sun May 15 22:28:00 2005
@@ -950,13 +950,13 @@ void MailViewer::layoutComponents()
                                   ? ID_LOW_PRIORITY_TEXT 
                                   : ID_HIGH_PRIORITY_TEXT);
             if (pstr) {
-                QPixmap p(p == LowPriority ? lowpriIcon : priorityhdrIcon);
-                priorityPixLabel->setPixmap(p);
-                priorityPixLabel->setGeometry(4, top, p.width() + 1, ctlHeight);
+                QPixmap qp(p == LowPriority ? lowpriIcon : priorityhdrIcon);
+                priorityPixLabel->setPixmap(qp);
+                priorityPixLabel->setGeometry(4, top, qp.width() + 1, ctlHeight);
                 priorityLabel->setText(pstr);
                 localFree(pstr);
-                priorityLabel->setGeometry(p.width() + 5, top,
-                                           this->width() - p.width() - 13,
+                priorityLabel->setGeometry(qp.width() + 5, top,
+                                           this->width() - qp.width() - 13,
                                            ctlHeight);
                 top += ctlHeight + 5;
                 priorityPixLabel->show();
>Release-Note:
>Audit-Trail:
>Unformatted: