[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7114-g429cd41

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  429cd41aaec5722de52c59369b55e1ff93aaaf7b (commit)
       via  9a48b019541b7c32faa062fdea0c4ea8910d0b60 (commit)
      from  8c325469e1bc003e6908b0ac6607994487f9bbc3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=429cd41aaec5722de52c59369b55e1ff93aaaf7b
commit 429cd41aaec5722de52c59369b55e1ff93aaaf7b
Merge: 8c32546 9a48b01
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Jan 15 10:04:09 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 15 10:04:09 2014 -0500

    Merge topic 'var-type-autofill' into next
    
    9a48b019 cmake-gui: Fix compile warning.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a48b019541b7c32faa062fdea0c4ea8910d0b60
commit 9a48b019541b7c32faa062fdea0c4ea8910d0b60
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Jan 15 08:03:33 2014 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Jan 15 08:03:33 2014 -0700

    cmake-gui: Fix compile warning.

diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index 68635d8..3881045 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -100,10 +100,10 @@ void AddCacheEntry::onCompletionActivated(const QString &text)
   int idx = this->VarNames.indexOf(text);
   if (idx != -1)
     {
-    QString type = this->VarTypes[idx];
+    QString vartype = this->VarTypes[idx];
     for (int i = 0; i < NumTypes; i++)
       {
-        if (TypeStrings[i] == type)
+        if (TypeStrings[i] == vartype)
           {
           this->Type->setCurrentIndex(i);
           break;

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/AddCacheEntry.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake