fixed includes

application/main.cpp

@@ -1,10 +1,10 @@
 #include "main.h"
 #include "knownfieldmodel.h"
-#include "../cli/mainfeatures.h"
-#if defined(GUI_QTWIDGETS)
-# include "../gui/initiate.h"
-#elif defined(GUI_QTQUICK)
 
+#include "tageditor/cli/mainfeatures.h"
+#if defined(GUI_QTWIDGETS)
+# include "tageditor/gui/initiate.h"
+#elif defined(GUI_QTQUICK)
 #endif
 
 #if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)

cli/mainfeatures.cpp

@@ -1,7 +1,8 @@
 #include "mainfeatures.h"
-#include "application/knownfieldmodel.h"
-#include "misc/utility.h"
-#include "misc/htmlinfo.h"
+
+#include "tageditor/application/knownfieldmodel.h"
+#include "tageditor/misc/utility.h"
+#include "tageditor/misc/htmlinfo.h"
 
 #include <tagparser/mediafileinfo.h>
 #include <tagparser/tag.h>

gui/attachmentsedit.cpp

@@ -1,8 +1,9 @@
 #include "attachmentsedit.h"
-#include "ui_attachmentsedit.h"
 
 #include "attachmentsmodel.h"
 
+#include "gui/ui_attachmentsedit.h"
+
 #include <tagparser/mediafileinfo.h>
 #include <tagparser/abstractattachment.h>
 

gui/entertargetdialog.cpp

@@ -1,5 +1,6 @@
 #include "entertargetdialog.h"
-#include "ui_entertargetdialog.h"
+
+#include "gui/ui_entertargetdialog.h"
 
 #include <tagparser/signature.h>
 #include <tagparser/mediafileinfo.h>

gui/mainwindow.cpp

@@ -1,6 +1,4 @@
-#include "ui_mainwindow.h"
 #include "mainwindow.h"
-
 #include "settingsdialog.h"
 #include "notificationlabel.h"
 #include "renamefilesdialog.h"
@@ -8,9 +6,11 @@
 #include "attachmentsedit.h"
 #include "entertargetdialog.h"
 
-#include "application/settings.h"
-#include "misc/htmlinfo.h"
-#include "misc/utility.h"
+#include "gui/ui_mainwindow.h"
+
+#include "tageditor/application/settings.h"
+#include "tageditor/misc/htmlinfo.h"
+#include "tageditor/misc/utility.h"
 
 #include <tagparser/exceptions.h>
 #include <tagparser/signature.h>

gui/picturepreviewselection.cpp

@@ -1,8 +1,9 @@
-#include "ui_picturepreviewselection.h"
 #include "picturepreviewselection.h"
 
-#include "application/settings.h"
-#include "misc/utility.h"
+#include "gui/ui_picturepreviewselection.h"
+
+#include "tageditor/application/settings.h"
+#include "tageditor/misc/utility.h"
 
 #include <tagparser/mediafileinfo.h>
 #include <tagparser/tag.h>

gui/renamefilesdialog.cpp

@@ -1,11 +1,12 @@
-#include "ui_renamefilesdialog.h"
 #include "renamefilesdialog.h"
 #include "javascripthighlighter.h"
 
-#include "renamingutility/renamingengine.h"
-#include "renamingutility/filesystemitem.h"
-#include "renamingutility/filesystemitemmodel.h"
-#include "renamingutility/filteredfilesystemitemmodel.h"
+#include "gui/ui_renamefilesdialog.h"
+
+#include "tageditor/renamingutility/renamingengine.h"
+#include "tageditor/renamingutility/filesystemitem.h"
+#include "tageditor/renamingutility/filesystemitemmodel.h"
+#include "tageditor/renamingutility/filteredfilesystemitemmodel.h"
 
 #include <QMessageBox>
 #include <QFileDialog>

gui/renamefilesdialog.h

@@ -6,9 +6,7 @@
 
 #include <memory>
 
-QT_BEGIN_NAMESPACE
-class QItemSelection;
-QT_END_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QItemSelection)
 
 namespace RenamingUtility {
 class RemamingEngine;

gui/settingsdialog.cpp

@@ -1,8 +1,8 @@
 #include "settingsdialog.h"
 #include "notificationlabel.h"
 
-#include "application/settings.h"
-#include "application/knownfieldmodel.h"
+#include "tageditor/application/settings.h"
+#include "tageditor/application/knownfieldmodel.h"
 
 #include <tagparser/mediafileinfo.h>
 #include <tagparser/backuphelper.h>

gui/settingsdialog.h

@@ -1,15 +1,15 @@
 #ifndef ID3V2OPTIONPAGE_H
 #define ID3V2OPTIONPAGE_H
 
-#include "ui_filebrowsergeneraloptionpage.h"
-#include "ui_editorgeneraloptionpage.h"
-#include "ui_editortempoptionpage.h"
-#include "ui_editorfieldsoptionpage.h"
-#include "ui_editorautocorrectionoptionpage.h"
-#include "ui_infooptionpage.h"
-#include "ui_tagprocessinggeneraloptionpage.h"
-#include "ui_id3v1optionpage.h"
-#include "ui_id3v2optionpage.h"
+#include "gui/ui_filebrowsergeneraloptionpage.h"
+#include "gui/ui_editorgeneraloptionpage.h"
+#include "gui/ui_editortempoptionpage.h"
+#include "gui/ui_editorfieldsoptionpage.h"
+#include "gui/ui_editorautocorrectionoptionpage.h"
+#include "gui/ui_infooptionpage.h"
+#include "gui/ui_tagprocessinggeneraloptionpage.h"
+#include "gui/ui_id3v1optionpage.h"
+#include "gui/ui_id3v2optionpage.h"
 
 #include <qtutilities/settingsdialog/settingsdialog.h>
 #include <qtutilities/settingsdialog/optionpage.h>

gui/tagedit.cpp

@@ -1,8 +1,8 @@
 #include "tagedit.h"
 #include "tagfieldedit.h"
 
-#include "application/settings.h"
-#include "application/knownfieldmodel.h"
+#include "tageditor/application/settings.h"
+#include "tageditor/application/knownfieldmodel.h"
 
 #include <tagparser/tag.h>
 

gui/tagfieldedit.cpp

@@ -1,10 +1,10 @@
 #include "tagfieldedit.h"
 #include "picturepreviewselection.h"
 
-#include "application/settings.h"
-#include "application/knownfieldmodel.h"
+#include "tageditor/application/settings.h"
+#include "tageditor/application/knownfieldmodel.h"
 
-#include "misc/utility.h"
+#include "tageditor/misc/utility.h"
 
 #include <tagparser/tag.h>
 #include <tagparser/tagvalue.h>

misc/utility.cpp

@@ -1,6 +1,6 @@
 #include "utility.h"
 
-#include "application/settings.h"
+#include "tageditor/application/settings.h"
 
 #include <tagparser/exceptions.h>
 #include <tagparser/signature.h>

renamingutility/scriptfunctions.cpp

@@ -1,5 +1,6 @@
 #include "scriptfunctions.h"
-#include "misc/utility.h"
+
+#include "tageditor/misc/utility.h"
 
 #include <tagparser/mediafileinfo.h>
 #include <tagparser/tag.h>