work save

RedPandaIDE/HighlighterManager.cpp

@@ -17,10 +17,10 @@
 #include "HighlighterManager.h"
 #include <QFileInfo>
 #include <QObject>
-#include "highlighter/cpp.h"
-#include "highlighter/asm.h"
-#include "highlighter/glsl.h"
-#include "Constants.h"
+#include "qsynedit/highlighter/cpp.h"
+#include "qsynedit/highlighter/asm.h"
+#include "qsynedit/highlighter/glsl.h"
+#include "qsynedit/Constants.h"
 #include "colorscheme.h"
 
 HighlighterManager highlighterManager;

RedPandaIDE/settings.h

@@ -23,9 +23,9 @@
 #include <QColor>
 #include <QString>
 #include <QPair>
-#include "SynEdit.h"
+#include "qsynedit/SynEdit.h"
 #include "compiler/compilerinfo.h"
-#include "utils.h"
+#include "qt_utils/utils.h"
 
 /**
  * use the following command to get gcc's default bin/library folders:

libs/qsynedit/qsynedit.pro

@@ -18,47 +18,47 @@ msvc {
     DEFINES += NOMINMAX
 }
 
-SOURCES += CodeFolding.cpp \
-    Constants.cpp \
-    KeyStrokes.cpp \
-    MiscClasses.cpp \
-    MiscProcs.cpp \
-    SynEdit.cpp \
-    TextBuffer.cpp \
-    TextPainter.cpp \
-    exporter/synexporter.cpp \
-    exporter/synhtmlexporter.cpp \
-    exporter/synrtfexporter.cpp \
-    highlighter/asm.cpp \
-    highlighter/base.cpp \
-    highlighter/composition.cpp \
-    highlighter/cpp.cpp \
-    highlighter/glsl.cpp \
-    Search.cpp \
-    SearchBase.cpp \
-    SearchRegex.cpp \
-    Types.cpp
+SOURCES += qsynedit/CodeFolding.cpp \
+    qsynedit/Constants.cpp \
+    qsynedit/KeyStrokes.cpp \
+    qsynedit/MiscClasses.cpp \
+    qsynedit/MiscProcs.cpp \
+    qsynedit/SynEdit.cpp \
+    qsynedit/TextBuffer.cpp \
+    qsynedit/TextPainter.cpp \
+    qsynedit/exporter/synexporter.cpp \
+    qsynedit/exporter/synhtmlexporter.cpp \
+    qsynedit/exporter/synrtfexporter.cpp \
+    qsynedit/highlighter/asm.cpp \
+    qsynedit/highlighter/base.cpp \
+    qsynedit/highlighter/composition.cpp \
+    qsynedit/highlighter/cpp.cpp \
+    qsynedit/highlighter/glsl.cpp \
+    qsynedit/Search.cpp \
+    qsynedit/SearchBase.cpp \
+    qsynedit/SearchRegex.cpp \
+    qsynedit/Types.cpp
 
-HEADERS += Search.h \
-    SearchBase.h \
-    SearchRegex.h \
-    CodeFolding.h \
-    Constants.h \
-    KeyStrokes.h \
-    MiscClasses.h \
-    MiscProcs.h \
-    SynEdit.h \
-    TextBuffer.h \
-    TextPainter.h \
-    Types.h \
-    exporter/synexporter.h \
-    exporter/synhtmlexporter.h \
-    exporter/synrtfexporter.h \
-    highlighter/asm.h \
-    highlighter/base.h \
-    highlighter/composition.h \
-    highlighter/cpp.h \
-    highlighter/glsl.h \
+HEADERS += qsynedit/Search.h \
+    qsynedit/SearchBase.h \
+    qsynedit/SearchRegex.h \
+    qsynedit/CodeFolding.h \
+    qsynedit/Constants.h \
+    qsynedit/KeyStrokes.h \
+    qsynedit/MiscClasses.h \
+    qsynedit/MiscProcs.h \
+    qsynedit/SynEdit.h \
+    qsynedit/TextBuffer.h \
+    qsynedit/TextPainter.h \
+    qsynedit/Types.h \
+    qsynedit/exporter/synexporter.h \
+    qsynedit/exporter/synhtmlexporter.h \
+    qsynedit/exporter/synrtfexporter.h \
+    qsynedit/highlighter/asm.h \
+    qsynedit/highlighter/base.h \
+    qsynedit/highlighter/composition.h \
+    qsynedit/highlighter/cpp.h \
+    qsynedit/highlighter/glsl.h \
 
 INCLUDEPATH += ../redpanda_qt_utils
 LIBS += -lredpand_qt_utils

libs/qsynedit/qsynedit/KeyStrokes.h

@@ -21,7 +21,7 @@
 #include <QList>
 #include <memory>
 #include "MiscClasses.h"
-#include "redpanda_utils.h"
+#include "qt_utils/utils.h"
 
 namespace QSynedit {
 //****************************************************************************

libs/qsynedit/qsynedit/TextBuffer.cpp

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "TextBuffer.h"
-#include "redpanda_utils.h"
+#include "qt_utils/utils.h"
 #include <QDataStream>
 #include <QFile>
 #include <QTextCodec>
@@ -25,7 +25,7 @@
 #include "SynEdit.h"
 #include <QMessageBox>
 #include <cmath>
-#include "charsetinfo.h"
+#include "qt_utils/charsetinfo.h"
 #include <QDebug>
 
 namespace QSynedit {

libs/qsynedit/qsynedit/TextBuffer.h

@@ -26,7 +26,7 @@
 #include <QFile>
 #include "MiscProcs.h"
 #include "Types.h"
-#include "redpanda_utils.h"
+#include "qt_utils/utils.h"
 
 namespace QSynedit {
 enum SynEditStringFlag {

libs/redpanda_qt_utils/qt_utils/utils.cpp

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "redpanda_utils.h"
+#include "qt_utils/utils.h"
 #include <QApplication>
 #include <QByteArray>
 #include <QDir>

libs/redpanda_qt_utils/qt_utils/utils.h

@@ -14,8 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef REDPANDA_UTILS_H
-#define REDPANDA_UTILS_H
+#ifndef REDPANDA_QT_UTILS_H
+#define REDPANDA_QT_UTILS_H
 #include <type_traits>
 #include <utility>
 #include <functional>

libs/redpanda_qt_utils/redpanda_qt_utils.pro

@@ -20,8 +20,8 @@ msvc {
     DEFINES += NOMINMAX
 }
 
-SOURCES += redpanda_utils.cpp \
-	charsetinfo.cpp
+SOURCES += qt_utils/utils.cpp \
+	qt_utils/charsetinfo.cpp
 
-HEADERS += redpanda_utils.h \
-	charsetinfo.h
+HEADERS += qt_utils/utils.h \
+	qt_utils/charsetinfo.h