Folder Structure

Author: JaDogg

codeeditor.cpp CodeEditor/codeeditor.cppcodeeditor.cpp renamed to CodeEditor/codeeditor.cpp

@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QtWidgets>
-#include "codeeditor.h"
+#include "CodeEditor/codeeditor.h"
 
 CodeEditor::CodeEditor(QWidget* parent)
     : QPlainTextEdit(parent)

codeeditor.h CodeEditor/codeeditor.hcodeeditor.h renamed to CodeEditor/codeeditor.h

@@ -22,7 +22,7 @@ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WIT
 USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "PythonSyntaxHighlighter.h"
+#include "CodeEditor/PythonSyntaxHighlighter.h"
 
 PythonSyntaxHighlighter::PythonSyntaxHighlighter(QTextDocument* parent)
     : QSyntaxHighlighter(parent)

pythonsyntaxhighlighter.cpp CodeEditor/pythonsyntaxhighlighter.cpppythonsyntaxhighlighter.cpp renamed to CodeEditor/pythonsyntaxhighlighter.cpp

@@ -1,4 +1,4 @@
-#include "snippets.h"
+#include "Features/snippets.h"
 #include <iostream>
 
 Snippets::Snippets(QObject* parent)

pythonsyntaxhighlighter.h CodeEditor/pythonsyntaxhighlighter.hpythonsyntaxhighlighter.h renamed to CodeEditor/pythonsyntaxhighlighter.h

@@ -9,32 +9,29 @@ QT       += core gui
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 
-
 TARGET = PyRun
 TEMPLATE = app
 
 SOURCES += main.cpp\
-        mainview.cpp \
-    pythonsyntaxhighlighter.cpp \
-    codeeditor.cpp \
-    snippets.cpp
+        UI/mainview.cpp \
+    CodeEditor/pythonsyntaxhighlighter.cpp \
+    CodeEditor/codeeditor.cpp \
+    Features/snippets.cpp
 
-HEADERS  += mainview.h \
-    pythonsyntaxhighlighter.h \
-    codeeditor.h \
-    snippets.h \
-    emb.h
+HEADERS  += UI/mainview.h \
+    CodeEditor/pythonsyntaxhighlighter.h \
+    CodeEditor/codeeditor.h \
+    Features/snippets.h \
+    PythonAccess/emb.h
 
-FORMS    += mainview.ui
+FORMS    += UI/mainview.ui
 
 QMAKE_CXXFLAGS += -std=c++11
 
-
 RESOURCES += \
     PyRunResources.qrc
 
-RC_FILE = PyRun.rc
-
+RC_FILE = WindowsResources/PyRun.rc
 
 
 win32: LIBS += -L$$PWD/../Python34/libs/ -lpython34

snippets.cpp Features/snippets.cppsnippets.cpp renamed to Features/snippets.cpp

@@ -7,12 +7,19 @@
 // Blog article: http://mateusz.loskot.net/?p=2819
 // --------------------------------------------------------------------------
 
+#ifndef EMB_H
+#define EMB_H
+
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <functional>
 #include <iostream>
 #include <string>
 #include <cmath>
 #include "Python.h"
-#include "mainview.h"
+#include "UI/mainview.h"
+
 namespace emb {
 
 MainView* mainView;
@@ -239,3 +246,7 @@ PyObject* PyInit_Lseba(void)
     return PyModule_Create(&LsebaModule);
 }
 }
+
+#pragma GCC diagnostic warning "-Wunused-parameter"
+#pragma GCC diagnostic warning "-Wmissing-field-initializers"
+#endif

snippets.h Features/snippets.hsnippets.h renamed to Features/snippets.h

@@ -1,5 +1,5 @@
-#include "emb.h"
-#include "mainview.h"
+#include "PythonAccess/emb.h"
+#include "UI/mainview.h"
 #include "ui_mainview.h"
 
 MainView::MainView(QWidget* parent)

PyRun.pro

@@ -13,9 +13,9 @@
 #include <QInputDialog>
 
 // internal
-#include "pythonsyntaxhighlighter.h"
-#include "codeeditor.h"
-#include "snippets.h"
+#include "CodeEditor/pythonsyntaxhighlighter.h"
+#include "CodeEditor/codeeditor.h"
+#include "Features/snippets.h"
 
 namespace Ui {
 class MainView;