From 90d37aeaa98f1b4495b6233826ba67a957ea3534 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 6 Sep 2015 20:33:09 +0200 Subject: [PATCH] fixed includes --- cli/cli.cpp | 2 +- gui/initiatequi.cpp | 2 +- gui/mainwindow.cpp | 12 +++++++----- gui/mainwindow.h | 2 +- gui/passwordgeneratordialog.cpp | 5 +++-- gui/stacksupport.cpp | 2 +- gui/stacksupport.h | 2 +- gui/undocommands.cpp | 9 +++++---- main.cpp | 6 +++--- model/entryfiltermodel.cpp | 4 ++-- model/entrymodel.cpp | 2 +- model/fieldmodel.cpp | 2 +- quickgui/applicationinfo.cpp | 2 +- quickgui/applicationinfo.h | 2 +- quickgui/initiatequick.cpp | 8 ++++---- util/testroutines.cpp | 2 +- 16 files changed, 34 insertions(+), 30 deletions(-) diff --git a/cli/cli.cpp b/cli/cli.cpp index 1a7d51e..832cd4c 100644 --- a/cli/cli.cpp +++ b/cli/cli.cpp @@ -1,4 +1,4 @@ -#include "cli.h" +#include "./cli.h" #include #include diff --git a/gui/initiatequi.cpp b/gui/initiatequi.cpp index d8bf1a7..4eca73b 100644 --- a/gui/initiatequi.cpp +++ b/gui/initiatequi.cpp @@ -1,4 +1,4 @@ -#include "initiategui.h" +#include "./initiategui.h" #include "gui/mainwindow.h" diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 1a70cfe..fbb7b42 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -1,8 +1,10 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" -#include "model/fieldmodel.h" -#include "model/entrymodel.h" -#include "model/entryfiltermodel.h" +#include "./mainwindow.h" + +#include "../model/fieldmodel.h" +#include "../model/entrymodel.h" +#include "../model/entryfiltermodel.h" + +#include "gui/ui_mainwindow.h" #include #include diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 61e4286..cb03ed8 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -1,7 +1,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include "passwordgeneratordialog.h" +#include "./passwordgeneratordialog.h" #include diff --git a/gui/passwordgeneratordialog.cpp b/gui/passwordgeneratordialog.cpp index 5b6f25b..007a3b8 100644 --- a/gui/passwordgeneratordialog.cpp +++ b/gui/passwordgeneratordialog.cpp @@ -1,5 +1,6 @@ -#include "passwordgeneratordialog.h" -#include "ui_passwordgeneratordialog.h" +#include "./passwordgeneratordialog.h" + +#include "gui/ui_passwordgeneratordialog.h" #include diff --git a/gui/stacksupport.cpp b/gui/stacksupport.cpp index aed8656..fe56f98 100644 --- a/gui/stacksupport.cpp +++ b/gui/stacksupport.cpp @@ -1,4 +1,4 @@ -#include "stacksupport.h" +#include "./stacksupport.h" namespace QtGui { diff --git a/gui/stacksupport.h b/gui/stacksupport.h index 83863a7..46f79ef 100644 --- a/gui/stacksupport.h +++ b/gui/stacksupport.h @@ -1,7 +1,7 @@ #ifndef QTGUI_STACKSUPPORT_H #define QTGUI_STACKSUPPORT_H -#include "undocommands.h" +#include "./undocommands.h" #include diff --git a/gui/undocommands.cpp b/gui/undocommands.cpp index 5ebf17e..8a49b9a 100644 --- a/gui/undocommands.cpp +++ b/gui/undocommands.cpp @@ -1,7 +1,8 @@ -#include "undocommands.h" -#include "stacksupport.h" -#include "model/fieldmodel.h" -#include "model/entrymodel.h" +#include "./undocommands.h" +#include "./stacksupport.h" + +#include "../model/fieldmodel.h" +#include "../model/entrymodel.h" #include diff --git a/main.cpp b/main.cpp index a3f9d9c..449af36 100644 --- a/main.cpp +++ b/main.cpp @@ -1,9 +1,9 @@ -#include "cli/cli.h" +#include "./cli/cli.h" #ifdef GUI_QTWIDGETS -# include "gui/initiategui.h" +# include "./gui/initiategui.h" #endif #ifdef GUI_QTQUICK -# include "quickgui/initiatequick.h" +# include "./quickgui/initiatequick.h" #endif #include diff --git a/model/entryfiltermodel.cpp b/model/entryfiltermodel.cpp index cee184b..7f6b602 100644 --- a/model/entryfiltermodel.cpp +++ b/model/entryfiltermodel.cpp @@ -1,5 +1,5 @@ -#include "entryfiltermodel.h" -#include "entrymodel.h" +#include "./entryfiltermodel.h" +#include "./entrymodel.h" namespace QtGui { diff --git a/model/entrymodel.cpp b/model/entrymodel.cpp index bdda048..3318acc 100644 --- a/model/entrymodel.cpp +++ b/model/entrymodel.cpp @@ -1,4 +1,4 @@ -#include "entrymodel.h" +#include "./entrymodel.h" #ifdef MODEL_UNDO_SUPPORT #include "gui/undocommands.h" diff --git a/model/fieldmodel.cpp b/model/fieldmodel.cpp index a749513..5d08158 100644 --- a/model/fieldmodel.cpp +++ b/model/fieldmodel.cpp @@ -1,4 +1,4 @@ -#include "fieldmodel.h" +#include "./fieldmodel.h" #ifdef MODEL_UNDO_SUPPORT #include "gui/undocommands.h" #endif diff --git a/quickgui/applicationinfo.cpp b/quickgui/applicationinfo.cpp index 335bdd6..2cb93c1 100644 --- a/quickgui/applicationinfo.cpp +++ b/quickgui/applicationinfo.cpp @@ -1,4 +1,4 @@ -#include "applicationinfo.h" +#include "./applicationinfo.h" #include diff --git a/quickgui/applicationinfo.h b/quickgui/applicationinfo.h index d4f1729..ffdaab9 100644 --- a/quickgui/applicationinfo.h +++ b/quickgui/applicationinfo.h @@ -1,7 +1,7 @@ #ifndef APPLICATIONINFO_H #define APPLICATIONINFO_H -#include "model/fieldmodel.h" +#include "../model/fieldmodel.h" #include #include diff --git a/quickgui/initiatequick.cpp b/quickgui/initiatequick.cpp index 17803dc..d9cbdbe 100644 --- a/quickgui/initiatequick.cpp +++ b/quickgui/initiatequick.cpp @@ -1,8 +1,8 @@ -#include "initiatequick.h" +#include "./initiatequick.h" -# include "model/entryfiltermodel.h" -# include "model/entrymodel.h" -# include "model/fieldmodel.h" +# include "../model/entryfiltermodel.h" +# include "../model/entrymodel.h" +# include "../model/fieldmodel.h" #include "quickgui/applicationinfo.h" diff --git a/util/testroutines.cpp b/util/testroutines.cpp index e281023..775b1e3 100644 --- a/util/testroutines.cpp +++ b/util/testroutines.cpp @@ -1,4 +1,4 @@ -#include "testroutines.h" +#include "./testroutines.h" #include #include