[kgraphviewer-devel] [KGraphViewer/libkgraphviz] b47a6a7: Prefix setters with set for consistency

[Kevin Funk]

commit b47a6a7621156190a21bcc2aadcaf0f65c92b64e
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Tue Dec 14 16:51:29 2010 +0100

    Prefix setters with set for consistency

diff --git a/src/kgraphviz/dotgraph.h b/src/kgraphviz/dotgraph.h
index 8fbe481..7c5a207 100644
--- a/src/kgraphviz/dotgraph.h
+++ b/src/kgraphviz/dotgraph.h
@@ -72,13 +72,13 @@ public:
   double width() const {return m_width;}
   double height() const {return m_height;}
   double scale() const {return m_scale;}
-  void width(double w) {m_width = w;}
-  void height(double h) {m_height = h;}
-  void scale(double s) {m_scale = s;}
+  void setWidth(double w) {m_width = w;}
+  void setHeight(double h) {m_height = h;}
+  void setScale(double s) {m_scale = s;}
   virtual QString backColor() const;
   
-  inline void strict(bool s) {m_strict = s;}
-  inline void directed(bool d) {m_directed = d;}
+  inline void setStrict(bool s) {m_strict = s;}
+  inline void setDirected(bool d) {m_directed = d;}
   inline bool strict() const {return m_strict;}
   inline bool directed() const {return m_directed;}
 
@@ -89,10 +89,10 @@ public:
   inline double wdhcf() const {return m_wdhcf;}
   inline double hdvcf() const {return m_hdvcf;}
   
-  inline void layoutCommand(const QString& command) {m_layoutCommand = command;}
-  inline const QString& layoutCommand() {return m_layoutCommand;}
+  inline void setLayoutCommand(const QString& command) {m_layoutCommand = command;}
+  inline const QString& layoutCommand() const {return m_layoutCommand;}
   
-  inline void dotFileName(const QString& fileName) {m_dotFileName = fileName;}
+  inline void setDotFileName(const QString& fileName) {m_dotFileName = fileName;}
   inline const QString& dotFileName() const {return m_dotFileName;}
 
   bool update();
diff --git a/src/kgraphviz/dotgraphview.cpp b/src/kgraphviz/dotgraphview.cpp
index 4ad248b..0a7472e 100644
--- a/src/kgraphviz/dotgraphview.cpp
+++ b/src/kgraphviz/dotgraphview.cpp
@@ -1239,7 +1239,7 @@ void DotGraphView::slotElementHoverLeave(CanvasEdge* element)
 void DotGraphView::setLayoutCommand(const QString& command)
 {
   Q_D(DotGraphView);
-  d->m_graph->layoutCommand(command);
+  d->m_graph->setLayoutCommand(command);
   reload();
 }
 
@@ -1934,7 +1934,7 @@ void DotGraphView::slotAGraphLayoutFinished()
   
   bool result = loadLibrary(d->m_layoutThread.g(), d->m_layoutThread.layoutCommand());
   if (result)
-    d->m_graph->dotFileName(d->m_loadThread.dotFileName());
+    d->m_graph->setDotFileName(d->m_loadThread.dotFileName());
 
   gvFreeLayout(d->m_layoutThread.gvc(), d->m_layoutThread.g());
   agclose(d->m_layoutThread.g());
diff --git a/src/kgraphviz/support/dotgrammar.cpp b/src/kgraphviz/support/dotgrammar.cpp
index 5c7b0f5..202f7b8 100644
--- a/src/kgraphviz/support/dotgrammar.cpp
+++ b/src/kgraphviz/support/dotgrammar.cpp
@@ -141,7 +141,7 @@ void dump(char const* first, char const* last)
 
 void strict(char const* /*first*/, char const* /*last*/)
 {
-  if (phelper) phelper->graph->strict(true);
+  if (phelper) phelper->graph->setStrict(true);
 }
 
 void gotid(char const* first, char const* last)
@@ -153,13 +153,13 @@ void gotid(char const* first, char const* last)
 void undigraph(char const* /*first*/, char const* /*last*/)
 {
 //   kDebug() << "Setting graph as undirected";
-  if (phelper) phelper->graph->directed(false);
+  if (phelper) phelper->graph->setDirected(false);
 }
 
 void digraph(char const* /*first*/, char const* /*last*/)
 {
 //   kDebug() << "Setting graph as directed";
-  if (phelper) phelper->graph->directed(true);
+  if (phelper) phelper->graph->setDirected(true);
 }
 
 void graphid(char const* first, char const* last)
diff --git a/src/kgraphviz/support/dotgraphparsinghelper.cpp b/src/kgraphviz/support/dotgraphparsinghelper.cpp
index 79732e5..8de315d 100644
--- a/src/kgraphviz/support/dotgraphparsinghelper.cpp
+++ b/src/kgraphviz/support/dotgraphparsinghelper.cpp
@@ -173,8 +173,8 @@ void DotGraphParsingHelper::setattributedlist()
       if (v.size()>=4)
       {
 //         kDebug() << "setting width and height to " << v[2] << v[3];
-        graph->width(v[2]);
-        graph->height(v[3]);
+        graph->setWidth(v[2]);
+        graph->setHeight(v[3]);
       }
     }
     AttributesMap::const_iterator it, it_end;