Purify

Gary Huang · Gary Huang · commit 9d74c5b2c2a2 · 2018-07-14T10:08:06.000+08:00
diff --git a/include/Processing b/include/Processing
@@ -7,6 +7,5 @@
 #define PROCESSING
 
 #include "processing.h"
-#include "mouse.h"
 
 #endif // PROCESSING
diff --git a/src/GuiEngine/canvas.h b/src/GuiEngine/canvas.h
@@ -4,7 +4,7 @@
 #ifndef PCANVAS_H
 #define PCANVAS_H
 
-#include "global.h"
+#include "pglobal.h"
 #include <list>
 
 PROCESSING_BEGIN_NAMESPACE
diff --git a/src/GuiEngine/guiengine.h b/src/GuiEngine/guiengine.h
@@ -4,7 +4,7 @@
 #ifndef GUIENGINE_H
 #define GUIENGINE_H
 
-#include "global.h"
+#include "pglobal.h"
 #include "window.h"
 #include "canvas.h"
 
diff --git a/src/GuiEngine/pelement.h b/src/GuiEngine/pelement.h
@@ -4,7 +4,7 @@
 #ifndef P_PELEMENT_H
 #define P_PELEMENT_H
 
-#include "global.h"
+#include "pglobal.h"
 
 PROCESSING_BEGIN_NAMESPACE
 
diff --git a/src/GuiEngine/window.h b/src/GuiEngine/window.h
@@ -4,7 +4,7 @@
 #ifndef PWINDOW_H
 #define PWINDOW_H
 
-#include "global.h"
+#include "pglobal.h"
 
 PROCESSING_BEGIN_NAMESPACE
 
diff --git a/src/Mouse/mouse.cpp b/src/Mouse/mouse.cpp
diff --git a/src/Mouse/mouse.h b/src/Mouse/mouse.h
diff --git a/src/Mouse/mouse.pri b/src/Mouse/mouse.pri
diff --git a/src/PArgs/pargs.h b/src/PArgs/pargs.h
@@ -1,10 +1,10 @@
 /**
  * Author: Gary Huang <gh.nctu+code@gmail.com>
  */
-#ifndef ARGS_H
-#define ARGS_H
+#ifndef PARGS_H
+#define PARGS_H
 
-#include "global.h"
+#include "pglobal.h"
 
 PROCESSING_BEGIN_NAMESPACE
 
@@ -21,4 +21,4 @@ class Args
 
 PROCESSING_END_NAMESPACE
 
-#endif // ARGS_H
+#endif // PARGS_H
diff --git a/src/PArgs/pargs.pri b/src/PArgs/pargs.pri
@@ -1,2 +1,2 @@
 # Author: Gary Huang <gh.nctu+code@gmail.com>
-HEADERS += $$PWD/args.h
+HEADERS += $$PWD/pargs.h
diff --git a/src/PGlobal/pglobal.h b/src/PGlobal/pglobal.h
@@ -1,8 +1,8 @@
 /**
  * Author: Gary Huang <gh.nctu+code@gmail.com>
  */
-#ifndef P_GLOBAL_H
-#define P_GLOBAL_H
+#ifndef PGLOBAL_H
+#define PGLOBAL_H
 
 #include <map>
 #include <string>
@@ -588,4 +588,4 @@ typedef std::map<std::string,PCALLBACK> PFunctions;
 
 PROCESSING_END_NAMESPACE 
 
-#endif // P_GLOBAL_H
+#endif // PGLOBAL_H
diff --git a/src/PGlobal/pglobal.pri b/src/PGlobal/pglobal.pri
@@ -1,2 +1,2 @@
 # Author: Gary Huang <gh.nctu+code@gmail.com>
-HEADERS += $$PWD/global.h
+HEADERS += $$PWD/pglobal.h
diff --git a/src/Processing/processing.h b/src/Processing/processing.h
@@ -6,8 +6,8 @@
 #ifndef PROCESSING_H
 #define PROCESSING_H
 
-#include "global.h"
-#include "args.h"
+#include "pglobal.h"
+#include "pargs.h"
 
 #include <cmath>
 #include <iostream>
@@ -153,6 +153,12 @@ extern int width;
 extern int height;
 extern int frameRate;
 extern int frameCount;
+//extern MouseButton mouseButton;
+extern bool isMousePressed;
+extern int mouseX;
+extern int mouseY;
+extern int pmouseX;
+extern int pmouseY;
 extern int keyCode;
 extern bool isKeyPressed;
 extern char key;
diff --git a/src/QtEngine/qtcanvas.h b/src/QtEngine/qtcanvas.h
@@ -10,7 +10,7 @@
 #include <QPair>
 #include <QBrush>
 #include <QPen>
-#include "global.h"
+#include "pglobal.h"
 #include "canvas.h"
 
 PROCESSING_BEGIN_NAMESPACE
diff --git a/src/QtEngine/qthelper.h b/src/QtEngine/qthelper.h
@@ -4,7 +4,7 @@
 #ifndef P_QTHELPER_H
 #define P_QTHELPER_H
 
-#include "global.h"
+#include "pglobal.h"
 
 class QPainter;
 class QPaintEvent;
diff --git a/src/QtEngine/qtwindow.h b/src/QtEngine/qtwindow.h
@@ -6,8 +6,8 @@
 
 #include <QTimer>
 #include <QWidget>
+#include "pglobal.h"
 #include "window.h"
-#include "global.h"
 
 class QHBoxLayout;
 
diff --git a/src/src.pro b/src/src.pro
@@ -6,12 +6,11 @@ DESTDIR = ../lib
 #CONFIG += debug
 CONFIG -= debug_and_release debug_and_release_target
 
-INCLUDEPATH += Args PGlobal PString Exception Processing Mouse GuiEngine QtEngine
+INCLUDEPATH += PArgs PGlobal PString Exception Processing Mouse GuiEngine QtEngine
 
-include(Args/args.pri)
-include(PGlobal/global.pri)
+include(PArgs/pargs.pri)
+include(PGlobal/pglobal.pri)
 include(Processing/processing.pri)
-include(Mouse/mouse.pri)
 include(PVector/pvector.pri)
 include(GuiEngine/guiengine.pri)
 include(QtEngine/qtengine.pri)
@@ -21,19 +20,17 @@ QMAKE_EXTRA_TARGETS += copy_headers clean distclean extraclean
 
 copy_headers.depends = FORCE
 win32: copy_headers.commands = \
-    copy Args\\args.h ..\\include & \
-    copy PGlobal\\global.h ..\\include & \
+    copy PArgs\\pargs.h ..\\include & \
+    copy PGlobal\\pglobal.h ..\\include & \
     copy PString\\pstring.h ..\\include & \
     copy PVector\\pvector.h ..\\include & \
-    copy Processing\\processing.h ..\\include & \
-    copy Mouse\\mouse.h ..\\include
+    copy Processing\\processing.h ..\\include
 unix: copy_headers.commands = \
-    cp Args/args.h ../include; \
-    cp PGlobal/global.h ../include; \
+    cp PArgs/pargs.h ../include; \
+    cp PGlobal/pglobal.h ../include; \
     cp PString/pstring.h ../include; \
     cp PVector/pvector.h ../include; \
-    cp Processing/processing.h ../include; \
-    cp Mouse/mouse.h ../include
+    cp Processing/processing.h ../include
 
 clean.depends = extraclean
 distclean.depends = extraclean

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Author: Gary Huang <gh.nctu+code@gmail.com>`
`2`		`-HEADERS += $$PWD/args.h`
	`2`	`+HEADERS += $$PWD/pargs.h`