[kgraphviewer-devel] [KGraphViewer/libkgraphviz] e035bdd: Minor: Fix CMake/gcc warnings

[Kevin Funk]

commit e035bdd46c0ba35b89463867e72b84433ffb96d4
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Mon Dec 20 14:49:05 2010 +0100

    Minor: Fix CMake/gcc warnings
    
    * GCC: Rename DotGraph::removeAttribute to fix "was hidden by" warning
    * CMake: Remove stale add_subdirectory(shared) (non-existant)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62bd826..e2bf203 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_subdirectory(kgraphviz)
 add_subdirectory(part)
-add_subdirectory(shared)
 
 include_directories( part ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
diff --git a/src/kgraphviz/dotgraph.cpp b/src/kgraphviz/dotgraph.cpp
index f3e0c54..e4ae26f 100644
--- a/src/kgraphviz/dotgraph.cpp
+++ b/src/kgraphviz/dotgraph.cpp
@@ -1004,7 +1004,7 @@ void DotGraph::addNewEdge(QString src, QString tgt, QMap<QString,QString> attrib
   edges().insert(newEdge->id(), newEdge);
 }
 
-void DotGraph::removeAttribute(const QString& nodeName, const QString& attribName)
+void DotGraph::removeElementAttribute(const QString& nodeName, const QString& attribName)
 {
   kDebug();
   GraphElement* element = elementNamed(nodeName);
diff --git a/src/kgraphviz/dotgraph.h b/src/kgraphviz/dotgraph.h
index e4f768b..5169841 100644
--- a/src/kgraphviz/dotgraph.h
+++ b/src/kgraphviz/dotgraph.h
@@ -115,7 +115,7 @@ public:
   void moveExistingNodeToMainGraph(QMap<QString,QString> attribs);
 
   void addNewEdge(QString src, QString tgt, QMap<QString,QString> attribs);
-  void removeAttribute(const QString& nodeName, const QString& attribName);
+  void removeElementAttribute(const QString& nodeName, const QString& attribName);
   void renameNode(const QString& oldNodeName, const QString& newNodeName);
   void removeNodeNamed(const QString& nodeName);
   void removeNodeFromSubgraph(const QString& nodeName, const QString& subgraphName);
diff --git a/src/kgraphviz/dotgraphview.cpp b/src/kgraphviz/dotgraphview.cpp
index 50100ab..fe77613 100644
--- a/src/kgraphviz/dotgraphview.cpp
+++ b/src/kgraphviz/dotgraphview.cpp
@@ -1298,7 +1298,7 @@ void DotGraphView::printPreview()
 bool DotGraphView::reload()
 {
   Q_D(DotGraphView);
-  d->m_graph->update();
+  return d->m_graph->update();
 }
 
 void DotGraphView::initEmpty()
diff --git a/src/part/kgraphviewer_part.cpp b/src/part/kgraphviewer_part.cpp
index 0429e34..bcaf732 100644
--- a/src/part/kgraphviewer_part.cpp
+++ b/src/part/kgraphviewer_part.cpp
@@ -323,7 +323,7 @@ void KGraphViewerPart::slotSetAttribute(const QString& elementId, const QString&
 
 void KGraphViewerPart::slotRemoveAttribute(const QString& nodeName, const QString& attribName)
 {
-  d->m_widget->graph()->removeAttribute(nodeName, attribName);
+  d->m_widget->graph()->removeElementAttribute(nodeName, attribName);
 }
 
 void KGraphViewerPart::slotRemoveEdge(const QString& id)