Make method naming more consistent.

  * Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index c428cddb033..987e1ec58d0 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -237,10 +237,10 @@ namespace Internal {
             QMap<QString, InternalNode*>::const_iterator newNodeIter = subnodes.constBegin();;
             while (existingNodeIter != existingFolderNodes.constEnd()
                    && newNodeIter != subnodes.constEnd()) {
-                if ((*existingNodeIter)->name() < newNodeIter.key()) {
+                if ((*existingNodeIter)->displayName() < newNodeIter.key()) {
                     foldersToRemove << *existingNodeIter;
                     ++existingNodeIter;
-                } else if ((*existingNodeIter)->name() > newNodeIter.key()) {
+                } else if ((*existingNodeIter)->displayName() > newNodeIter.key()) {
                     FolderNode *newNode = new FolderNode(newNodeIter.value()->fullName);
                     newNode->setFolderName(newNodeIter.key());
                     if (!newNodeIter.value()->icon.isNull())