From e615e1416cc5139082593c07db99ead11c6d5d46 Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@elemtech.com>
Date: Thu, 8 Nov 2007 10:22:20 -0500
Subject: [PATCH] COMP: Fix warnings.

---
 Source/QtDialog/QCMakeCacheView.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index cfa875d1fb..5fad885e10 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -85,25 +85,25 @@ void QCMakeCacheView::contextMenuEvent(QContextMenuEvent* /*e*/)
   if(idxs.count())
     {
     QMenu* menu = new QMenu(this);
-    QAction* d = NULL;
-    QAction* i = NULL;
+    QAction* deleteAction = NULL;
+    QAction* ignoreAction = NULL;
     if(this->cacheModel()->editEnabled())
       {
       QString t = idxs.count() > 1 ? tr("Delete Cache Entries") : 
                                      tr("Delete Cache Entry");
-      d = menu->addAction(t);
+      deleteAction = menu->addAction(t);
       t = idxs.count() > 1 ? tr("Ignore Cache Entries") : 
                              tr("Ignore Cache Entry");
-      i = menu->addAction(t);
+      ignoreAction = menu->addAction(t);
       }
-    QAction* h = menu->addAction(tr("Help For Cache Entry"));
+    QAction* helpAction = menu->addAction(tr("Help For Cache Entry"));
     QAction* which = menu->exec(QCursor::pos());
     if(!which)
       {
       return;
       }
     
-    if(which == h)
+    if(which == helpAction)
       {
       QModelIndex idx = this->selectionModel()->currentIndex();
       idx = this->SearchFilter->mapToSource(idx);
@@ -134,14 +134,14 @@ void QCMakeCacheView::contextMenuEvent(QContextMenuEvent* /*e*/)
         i = this->AdvancedFilter->mapToSource(i);
         pidxs.append(i);
         }
-      if(which == d)
+      if(which == deleteAction)
         {
         foreach(QPersistentModelIndex j, pidxs)
           {
           this->cacheModel()->removeRows(j.row(), 1);
           }
         }
-      else if(which == i)
+      else if(which == ignoreAction)
         {
         foreach(QPersistentModelIndex j, pidxs)
           {