diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-05 09:40:03 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-05 09:40:58 -0700 |
| commit | ad2ac58ea2c7a696227b2db243a76adb633158dd (patch) | |
| tree | 9d54e38ad0dabf2053c4c84e01a9b7a576411338 | |
| parent | 0a4b2464216d7e701e500b5a9f3370aab04791c5 (diff) | |
| download | subsurface-ad2ac58ea2c7a696227b2db243a76adb633158dd.tar.gz | |
Fix include paths
As expected, commit 7be962bfc287 ("Move subsurface-core to core and qt-mobile
to mobile-widgets") caused some breakage.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | desktop-widgets/maintab.ui | 2 | ||||
| -rw-r--r-- | desktop-widgets/printer.cpp | 4 | ||||
| -rw-r--r-- | desktop-widgets/printoptions.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/templatelayout.cpp | 4 | ||||
| -rw-r--r-- | desktop-widgets/templatelayout.h | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/desktop-widgets/maintab.ui b/desktop-widgets/maintab.ui index 964593b38..bfd67bf40 100644 --- a/desktop-widgets/maintab.ui +++ b/desktop-widgets/maintab.ui @@ -1223,7 +1223,7 @@ <customwidget> <class>TableView</class> <extends>QWidget</extends> - <header>desktop-widgets/desktop-widget/tableview.h</header> + <header>desktop-widgets/tableview.h</header> <container>1</container> </customwidget> <customwidget> diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp index 33ee71b55..eea304347 100644 --- a/desktop-widgets/printer.cpp +++ b/desktop-widgets/printer.cpp @@ -1,7 +1,7 @@ #include "printer.h" #include "templatelayout.h" -#include "statistics.h" -#include "helpers.h" +#include "core/statistics.h" +#include "core/helpers.h" #include <algorithm> #include <QtWebKitWidgets> diff --git a/desktop-widgets/printoptions.cpp b/desktop-widgets/printoptions.cpp index 75d6ad8c4..e7b5f5a69 100644 --- a/desktop-widgets/printoptions.cpp +++ b/desktop-widgets/printoptions.cpp @@ -1,6 +1,6 @@ #include "printoptions.h" #include "templateedit.h" -#include "helpers.h" +#include "core/helpers.h" #include <QDebug> #include <QFileDialog> diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp index fd0a44c75..3bd9f1fa8 100644 --- a/desktop-widgets/templatelayout.cpp +++ b/desktop-widgets/templatelayout.cpp @@ -1,8 +1,8 @@ #include <string> #include "templatelayout.h" -#include "helpers.h" -#include "display.h" +#include "core/helpers.h" +#include "core/display.h" QList<QString> grantlee_templates, grantlee_statistics_templates; diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h index fc77a5079..195441fcd 100644 --- a/desktop-widgets/templatelayout.h +++ b/desktop-widgets/templatelayout.h @@ -4,9 +4,9 @@ #include <grantlee_templates.h> #include "mainwindow.h" #include "printoptions.h" -#include "statistics.h" -#include "qthelper.h" -#include "helpers.h" +#include "core/statistics.h" +#include "core/qthelper.h" +#include "core/helpers.h" #include "core/subsurface-qt/DiveObjectHelper.h" int getTotalWork(print_options *printOptions); |