[kgraphviewer-devel] [kgraphviewer/libkgraphviz] src/kgraphviz: Correct naming of include guards
Kevin Funk
krf at electrostorm.net
Thu Feb 10 18:22:31 CET 2011
Git commit a26d13d49020125dc35a1ee2d1bdee044f8ac965 by Kevin Funk.
Committed on 10/02/2011 at 18:18.
Pushed by kfunk into branch 'libkgraphviz'.
Correct naming of include guards
Add namespace prefix to include guards
M +2 -2 src/kgraphviz/canvasedge.h
M +2 -2 src/kgraphviz/canvasedge_p.h
M +3 -3 src/kgraphviz/canvaselement.h
M +2 -2 src/kgraphviz/canvaselement_p.h
M +2 -2 src/kgraphviz/canvasnode.h
M +2 -2 src/kgraphviz/canvassubgraph.h
M +2 -2 src/kgraphviz/dotgraph.h
M +2 -2 src/kgraphviz/dotgraph_p.h
M +3 -3 src/kgraphviz/dotgraphscene.h
M +3 -3 src/kgraphviz/dotgraphview.h
M +2 -2 src/kgraphviz/dotgraphview_p.h
M +2 -2 src/kgraphviz/graphedge.h
M +2 -2 src/kgraphviz/graphedge_p.h
M +2 -2 src/kgraphviz/graphelement.h
M +2 -2 src/kgraphviz/graphelement_p.h
M +2 -2 src/kgraphviz/graphexporter.h
M +3 -3 src/kgraphviz/graphio.h
M +2 -2 src/kgraphviz/graphio_p.h
M +2 -2 src/kgraphviz/graphnode.h
M +2 -2 src/kgraphviz/graphsubgraph.h
M +2 -2 src/kgraphviz/pannerview.h
M +2 -2 src/kgraphviz/support/dot2qtconsts.h
M +2 -2 src/kgraphviz/support/dotdefaults.h
M +2 -2 src/kgraphviz/support/dotgrammar.h
M +2 -2 src/kgraphviz/support/dotgraphparsinghelper.h
M +2 -2 src/kgraphviz/support/dotrenderop.h
M +2 -2 src/kgraphviz/support/fontscache.h
M +3 -3 src/kgraphviz/support/layoutagraphthread.h
M +3 -3 src/kgraphviz/support/loadagraphthread.h
M +2 -2 src/kgraphviz/support/singleton.h
http://commits.kde.org/kgraphviewer/a26d13d49020125dc35a1ee2d1bdee044f8ac965
diff --git a/src/kgraphviz/canvasedge.h b/src/kgraphviz/canvasedge.h
index bc6b3ea..76e1a16 100644
--- a/src/kgraphviz/canvasedge.h
+++ b/src/kgraphviz/canvasedge.h
@@ -24,8 +24,8 @@
License as published by the Free Software Foundation, version 2.
*/
-#ifndef CANVAS_EDGE_H
-#define CANVAS_EDGE_H
+#ifndef KGRAPHVIZ_CANVAS_EDGE_H
+#define KGRAPHVIZ_CANVAS_EDGE_H
#include "canvaselement.h"
diff --git a/src/kgraphviz/canvasedge_p.h b/src/kgraphviz/canvasedge_p.h
index 148ed94..c81b0e1 100644
--- a/src/kgraphviz/canvasedge_p.h
+++ b/src/kgraphviz/canvasedge_p.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef CANVAS_EDGE_P_H
-#define CANVAS_EDGE_P_H
+#ifndef KGRAPHVIZ_CANVAS_EDGE_P_H
+#define KGRAPHVIZ_CANVAS_EDGE_P_H
#include "canvasedge.h"
diff --git a/src/kgraphviz/canvaselement.h b/src/kgraphviz/canvaselement.h
index 44d27b3..d918142 100644
--- a/src/kgraphviz/canvaselement.h
+++ b/src/kgraphviz/canvaselement.h
@@ -16,8 +16,8 @@
02110-1301, USA
*/
-#ifndef CANVAS_ELEMENT_H
-#define CANVAS_ELEMENT_H
+#ifndef KGRAPHVIZ_CANVAS_ELEMENT_H
+#define KGRAPHVIZ_CANVAS_ELEMENT_H
#include <QAbstractGraphicsShapeItem>
@@ -85,4 +85,4 @@ private:
}
-#endif // CANVAS_ELEMENT_H
+#endif // KGRAPHVIZ_CANVAS_ELEMENT_H
diff --git a/src/kgraphviz/canvaselement_p.h b/src/kgraphviz/canvaselement_p.h
index 1a03016..92e7597 100644
--- a/src/kgraphviz/canvaselement_p.h
+++ b/src/kgraphviz/canvaselement_p.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef CANVAS_ELEMENT_P_H
-#define CANVAS_ELEMENT_P_H
+#ifndef KGRAPHVIZ_CANVAS_ELEMENT_P_H
+#define KGRAPHVIZ_CANVAS_ELEMENT_P_H
#include "canvaselement.h"
diff --git a/src/kgraphviz/canvasnode.h b/src/kgraphviz/canvasnode.h
index 734a4d7..0df398b 100644
--- a/src/kgraphviz/canvasnode.h
+++ b/src/kgraphviz/canvasnode.h
@@ -24,8 +24,8 @@
License as published by the Free Software Foundation, version 2.
*/
-#ifndef CANVAS_NODE_H
-#define CANVAS_NODE_H
+#ifndef KGRAPHVIZ_CANVAS_NODE_H
+#define KGRAPHVIZ_CANVAS_NODE_H
#include "canvaselement.h"
diff --git a/src/kgraphviz/canvassubgraph.h b/src/kgraphviz/canvassubgraph.h
index 5c81f64..9ae925f 100644
--- a/src/kgraphviz/canvassubgraph.h
+++ b/src/kgraphviz/canvassubgraph.h
@@ -16,8 +16,8 @@
02110-1301, USA
*/
-#ifndef CANVAS_SUBGRAPH_H
-#define CANVAS_SUBGRAPH_H
+#ifndef KGRAPHVIZ_CANVAS_SUBGRAPH_H
+#define KGRAPHVIZ_CANVAS_SUBGRAPH_H
#include "canvaselement.h"
diff --git a/src/kgraphviz/dotgraph.h b/src/kgraphviz/dotgraph.h
index 829dacf..9809e91 100644
--- a/src/kgraphviz/dotgraph.h
+++ b/src/kgraphviz/dotgraph.h
@@ -16,8 +16,8 @@
02110-1301, USA
*/
-#ifndef DOT_GRAPH_H
-#define DOT_GRAPH_H
+#ifndef KGRAPHVIZ_DOT_GRAPH_H
+#define KGRAPHVIZ_DOT_GRAPH_H
#include <QMap>
diff --git a/src/kgraphviz/dotgraph_p.h b/src/kgraphviz/dotgraph_p.h
index c4cc982..0ea0464 100644
--- a/src/kgraphviz/dotgraph_p.h
+++ b/src/kgraphviz/dotgraph_p.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef DOTGRAPH_P_H
-#define DOTGRAPH_P_H
+#ifndef KGRAPHVIZ_DOTGRAPH_P_H
+#define KGRAPHVIZ_DOTGRAPH_P_H
#include "graphio.h"
diff --git a/src/kgraphviz/dotgraphscene.h b/src/kgraphviz/dotgraphscene.h
index 95e0a2d..e41c03c 100644
--- a/src/kgraphviz/dotgraphscene.h
+++ b/src/kgraphviz/dotgraphscene.h
@@ -16,8 +16,8 @@
*/
-#ifndef DOTGRAPHSCENE_H
-#define DOTGRAPHSCENE_H
+#ifndef KGRAPHVIZ_DOTGRAPHSCENE_H
+#define KGRAPHVIZ_DOTGRAPHSCENE_H
#include <QGraphicsScene>
@@ -36,4 +36,4 @@ protected:
}
-#endif // DOTGRAPHSCENE_H
+#endif // KGRAPHVIZ_DOTGRAPHSCENE_H
diff --git a/src/kgraphviz/dotgraphview.h b/src/kgraphviz/dotgraphview.h
index edf1541..d87a75e 100644
--- a/src/kgraphviz/dotgraphview.h
+++ b/src/kgraphviz/dotgraphview.h
@@ -24,8 +24,8 @@
License as published by the Free Software Foundation, version 2.
*/
-#ifndef DOTGRAPHVIEW_H
-#define DOTGRAPHVIEW_H
+#ifndef KGRAPHVIZ_DOTGRAPHVIEW_H
+#define KGRAPHVIZ_DOTGRAPHVIEW_H
#include "kgraphviz_export.h"
@@ -209,4 +209,4 @@ private:
}
-#endif // DOTGRAPHVIEW_H
+#endif // KGRAPHVIZ_DOTGRAPHVIEW_H
diff --git a/src/kgraphviz/dotgraphview_p.h b/src/kgraphviz/dotgraphview_p.h
index 13e472c..750d801 100644
--- a/src/kgraphviz/dotgraphview_p.h
+++ b/src/kgraphviz/dotgraphview_p.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef DOTGRAPHVIEW_P_H
-#define DOTGRAPHVIEW_P_H
+#ifndef KGRAPHVIZ_DOTGRAPHVIEW_P_H
+#define KGRAPHVIZ_DOTGRAPHVIEW_P_H
#include "dotgraphview.h"
diff --git a/src/kgraphviz/graphedge.h b/src/kgraphviz/graphedge.h
index 0fd9044..6344e66 100644
--- a/src/kgraphviz/graphedge.h
+++ b/src/kgraphviz/graphedge.h
@@ -24,8 +24,8 @@
License as published by the Free Software Foundation, version 2.
*/
-#ifndef GRAPH_EDGE_H
-#define GRAPH_EDGE_H
+#ifndef KGRAPHVIZ_GRAPH_EDGE_H
+#define KGRAPHVIZ_GRAPH_EDGE_H
#include "graphelement.h"
diff --git a/src/kgraphviz/graphedge_p.h b/src/kgraphviz/graphedge_p.h
index 13d06fc..589ab28 100644
--- a/src/kgraphviz/graphedge_p.h
+++ b/src/kgraphviz/graphedge_p.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef GRAPHEDGE_P_H
-#define GRAPHEDGE_P_H
+#ifndef KGRAPHVIZ_GRAPHEDGE_P_H
+#define KGRAPHVIZ_GRAPHEDGE_P_H
#include "graphedge.h"
diff --git a/src/kgraphviz/graphelement.h b/src/kgraphviz/graphelement.h
index 9908683..48e20c2 100644
--- a/src/kgraphviz/graphelement.h
+++ b/src/kgraphviz/graphelement.h
@@ -16,8 +16,8 @@
02110-1301, USA
*/
-#ifndef GRAPH_ELEMENT_H
-#define GRAPH_ELEMENT_H
+#ifndef KGRAPHVIZ_GRAPH_ELEMENT_H
+#define KGRAPHVIZ_GRAPH_ELEMENT_H
#include "kgraphviz_export.h"
#include "support/dotrenderop.h"
diff --git a/src/kgraphviz/graphelement_p.h b/src/kgraphviz/graphelement_p.h
index 9b5c4d6..1de5de6 100644
--- a/src/kgraphviz/graphelement_p.h
+++ b/src/kgraphviz/graphelement_p.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef GRAPHELEMENT_P_H
-#define GRAPHELEMENT_P_H
+#ifndef KGRAPHVIZ_GRAPHELEMENT_P_H
+#define KGRAPHVIZ_GRAPHELEMENT_P_H
#include "graphelement.h"
diff --git a/src/kgraphviz/graphexporter.h b/src/kgraphviz/graphexporter.h
index 46a92ee..eb97107 100644
--- a/src/kgraphviz/graphexporter.h
+++ b/src/kgraphviz/graphexporter.h
@@ -24,8 +24,8 @@
License as published by the Free Software Foundation, version 2.
*/
-#ifndef GRAPH_EXPORTER_H
-#define GRAPH_EXPORTER_H
+#ifndef KGRAPHVIZ_GRAPH_EXPORTER_H
+#define KGRAPHVIZ_GRAPH_EXPORTER_H
class Agraph_t;
diff --git a/src/kgraphviz/graphio.h b/src/kgraphviz/graphio.h
index b800aab..92cbfe3 100644
--- a/src/kgraphviz/graphio.h
+++ b/src/kgraphviz/graphio.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef GRAPHIO_H
-#define GRAPHIO_H
+#ifndef KGRAPHVIZ_GRAPHIO_H
+#define KGRAPHVIZ_GRAPHIO_H
#include <QObject>
@@ -60,4 +60,4 @@ private:
}
-#endif // GRAPHIO_H
+#endif // KGRAPHVIZ_GRAPHIO_H
diff --git a/src/kgraphviz/graphio_p.h b/src/kgraphviz/graphio_p.h
index a1d7211..7dc31a0 100644
--- a/src/kgraphviz/graphio_p.h
+++ b/src/kgraphviz/graphio_p.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef GRAPHIO_P_H
-#define GRAPHIO_P_H
+#ifndef KGRAPHVIZ_GRAPHIO_P_H
+#define KGRAPHVIZ_GRAPHIO_P_H
#include "graphio.h"
diff --git a/src/kgraphviz/graphnode.h b/src/kgraphviz/graphnode.h
index 3cded48..e85a13c 100644
--- a/src/kgraphviz/graphnode.h
+++ b/src/kgraphviz/graphnode.h
@@ -29,8 +29,8 @@
* Graph Node model
*/
-#ifndef GRAPH_NODE_H
-#define GRAPH_NODE_H
+#ifndef KGRAPHVIZ_GRAPH_NODE_H
+#define KGRAPHVIZ_GRAPH_NODE_H
#include "graphelement.h"
diff --git a/src/kgraphviz/graphsubgraph.h b/src/kgraphviz/graphsubgraph.h
index a25bd07..1558575 100644
--- a/src/kgraphviz/graphsubgraph.h
+++ b/src/kgraphviz/graphsubgraph.h
@@ -16,8 +16,8 @@
02110-1301, USA
*/
-#ifndef GRAPH_SUBGRAPH_H
-#define GRAPH_SUBGRAPH_H
+#ifndef KGRAPHVIZ_GRAPH_SUBGRAPH_H
+#define KGRAPHVIZ_GRAPH_SUBGRAPH_H
#include "graphelement.h"
diff --git a/src/kgraphviz/pannerview.h b/src/kgraphviz/pannerview.h
index 842c5f6..be55c5f 100644
--- a/src/kgraphviz/pannerview.h
+++ b/src/kgraphviz/pannerview.h
@@ -24,8 +24,8 @@
License as published by the Free Software Foundation, version 2.
*/
-#ifndef PANNER_VIEW_H
-#define PANNER_VIEW_H
+#ifndef KGRAPHVIZ_PANNER_VIEW_H
+#define KGRAPHVIZ_PANNER_VIEW_H
#include <QGraphicsView>
diff --git a/src/kgraphviz/support/dot2qtconsts.h b/src/kgraphviz/support/dot2qtconsts.h
index c2ec8a9..ce42b12 100644
--- a/src/kgraphviz/support/dot2qtconsts.h
+++ b/src/kgraphviz/support/dot2qtconsts.h
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA
***************************************************************************/
-#ifndef DOT2QTCONSTS_H
-#define DOT2QTCONSTS_H
+#ifndef KGRAPHVIZ_DOT2QTCONSTS_H
+#define KGRAPHVIZ_DOT2QTCONSTS_H
#include <QMap>
#include <QString>
diff --git a/src/kgraphviz/support/dotdefaults.h b/src/kgraphviz/support/dotdefaults.h
index ec655f6..3c2fa49 100644
--- a/src/kgraphviz/support/dotdefaults.h
+++ b/src/kgraphviz/support/dotdefaults.h
@@ -16,8 +16,8 @@
02110-1301, USA
*/
-#ifndef DOT_DEFAULTS_H
-#define DOT_DEFAULTS_H
+#ifndef KGRAPHVIZ_DOT_DEFAULTS_H
+#define KGRAPHVIZ_DOT_DEFAULTS_H
#define DOT_DEFAULT_DPI 72
#define DOT_DEFAULT_FONTSIZE 11
diff --git a/src/kgraphviz/support/dotgrammar.h b/src/kgraphviz/support/dotgrammar.h
index 37661d4..17053b8 100644
--- a/src/kgraphviz/support/dotgrammar.h
+++ b/src/kgraphviz/support/dotgrammar.h
@@ -20,8 +20,8 @@
* GraphViz dot Graph parsing grammar implemented with boost Spirit
*/
-#ifndef DOT_GRAMMAR_H
-#define DOT_GRAMMAR_H
+#ifndef KGRAPHVIZ_DOT_GRAMMAR_H
+#define KGRAPHVIZ_DOT_GRAMMAR_H
#include "dotrenderop.h"
diff --git a/src/kgraphviz/support/dotgraphparsinghelper.h b/src/kgraphviz/support/dotgraphparsinghelper.h
index 6bb2915..0a2f201 100644
--- a/src/kgraphviz/support/dotgraphparsinghelper.h
+++ b/src/kgraphviz/support/dotgraphparsinghelper.h
@@ -16,8 +16,8 @@
02110-1301, USA
*/
-#ifndef DOT_GRAPHPARSINGHELPER_H
-#define DOT_GRAPHPARSINGHELPER_H
+#ifndef KGRAPHVIZ_DOT_GRAPHPARSINGHELPER_H
+#define KGRAPHVIZ_DOT_GRAPHPARSINGHELPER_H
#include <map>
#include <list>
diff --git a/src/kgraphviz/support/dotrenderop.h b/src/kgraphviz/support/dotrenderop.h
index 6e15b6a..25b86c7 100644
--- a/src/kgraphviz/support/dotrenderop.h
+++ b/src/kgraphviz/support/dotrenderop.h
@@ -16,8 +16,8 @@
02110-1301, USA
*/
-#ifndef DOT_RENDEROP_H
-#define DOT_RENDEROP_H
+#ifndef KGRAPHVIZ_DOT_RENDEROP_H
+#define KGRAPHVIZ_DOT_RENDEROP_H
#include <QChar>
#include <QList>
diff --git a/src/kgraphviz/support/fontscache.h b/src/kgraphviz/support/fontscache.h
index 3c893e9..0228505 100644
--- a/src/kgraphviz/support/fontscache.h
+++ b/src/kgraphviz/support/fontscache.h
@@ -17,8 +17,8 @@
*/
-#ifndef KGRAPHVIEWER_FONTSCACHE_H
-#define KGRAPHVIEWER_FONTSCACHE_H
+#ifndef KGRAPHVIZ_FONTSCACHE_H
+#define KGRAPHVIZ_FONTSCACHE_H
#include "singleton.h"
diff --git a/src/kgraphviz/support/layoutagraphthread.h b/src/kgraphviz/support/layoutagraphthread.h
index 630f782..79cccf7 100644
--- a/src/kgraphviz/support/layoutagraphthread.h
+++ b/src/kgraphviz/support/layoutagraphthread.h
@@ -17,8 +17,8 @@
*/
-#ifndef LAYOUTAGRAPHTHREAD_H
-#define LAYOUTAGRAPHTHREAD_H
+#ifndef KGRAPHVIZ_LAYOUTAGRAPHTHREAD_H
+#define KGRAPHVIZ_LAYOUTAGRAPHTHREAD_H
#include <QThread>
@@ -41,4 +41,4 @@ private:
GVC_t *m_gvc;
};
-#endif // LAYOUTAGRAPHTHREAD_H
+#endif // KGRAPHVIZ_LAYOUTAGRAPHTHREAD_H
diff --git a/src/kgraphviz/support/loadagraphthread.h b/src/kgraphviz/support/loadagraphthread.h
index 86a4c44..642e945 100644
--- a/src/kgraphviz/support/loadagraphthread.h
+++ b/src/kgraphviz/support/loadagraphthread.h
@@ -17,8 +17,8 @@
*/
-#ifndef LOADAGRAPHTHREAD_H
-#define LOADAGRAPHTHREAD_H
+#ifndef KGRAPHVIZ_LOADAGRAPHTHREAD_H
+#define KGRAPHVIZ_LOADAGRAPHTHREAD_H
#include <QThread>
@@ -41,4 +41,4 @@ private:
GVC_t *m_gvc;
};
-#endif // LOADAGRAPHTHREAD_H
+#endif // KGRAPHVIZ_LOADAGRAPHTHREAD_H
diff --git a/src/kgraphviz/support/singleton.h b/src/kgraphviz/support/singleton.h
index 43dbca1..c3bb8dd 100644
--- a/src/kgraphviz/support/singleton.h
+++ b/src/kgraphviz/support/singleton.h
@@ -17,8 +17,8 @@
*/
-#ifndef KGRAPHVIEWER_SINGLETON_H
-#define KGRAPHVIEWER_SINGLETON_H
+#ifndef KGRAPHVIZ_SINGLETON_H
+#define KGRAPHVIZ_SINGLETON_H
/**
* An implementation of the singleton pattern
More information about the kgraphviewer-devel
mailing list