Git commit 339537ae5ecc7952c716140029564a212e4a9a4b by Jeremy Whiting.
Committed on 30/06/2014 at 20:44.
Pushed by whiting into branch 'master'.

Fix compilation of Kompare

REVIEW: 119024

M  +1    -2    kompare_shell.h
M  +2    -3    komparenavtreepart/komparenavtreepart.h
M  +1    -2    komparepart/kompare_part.h
M  +1    -1    komparepart/komparesaveoptionswidget.h
M  +2    -0    libdialogpages/CMakeLists.txt
M  +2    -1    libdialogpages/filessettings.h
M  +1    -2    libdialogpages/pagebase.h
M  +3    -2    libdialogpages/viewsettings.h

http://commits.kde.org/kompare/339537ae5ecc7952c716140029564a212e4a9a4b

diff --git a/kompare_shell.h b/kompare_shell.h
index 56dd779..de099ff 100644
--- a/kompare_shell.h
+++ b/kompare_shell.h
@@ -21,8 +21,7 @@
 =

 #include <kapplication.h>
 #include <kparts/mainwindow.h>
-
-#include "kompare.h"
+#include <kompare.h>
 =

 class KompareInterface;
 namespace KParts {
diff --git a/komparenavtreepart/komparenavtreepart.h b/komparenavtreepart/k=
omparenavtreepart.h
index 7740478..eb08329 100644
--- a/komparenavtreepart/komparenavtreepart.h
+++ b/komparenavtreepart/komparenavtreepart.h
@@ -26,9 +26,8 @@
 #include <QtGui/QTreeWidgetItem>
 =

 #include <kparts/part.h>
-
-#include "kompare.h"
-#include "diffmodellist.h"
+#include <kompare.h>
+#include <diffmodellist.h>
 =

 namespace Diff2 {
 class DiffModel;
diff --git a/komparepart/kompare_part.h b/komparepart/kompare_part.h
index 7957184..0c4d3dd 100644
--- a/komparepart/kompare_part.h
+++ b/komparepart/kompare_part.h
@@ -23,8 +23,7 @@
 #include <kparts/factory.h>
 #include <kparts/part.h>
 #include <QVariantList>
-
-#include "kompare.h"
+#include <kompare.h>
 =

 #include "kompareinterface.h"
 =

diff --git a/komparepart/komparesaveoptionswidget.h b/komparepart/komparesa=
veoptionswidget.h
index 5105803..9c49815 100644
--- a/komparepart/komparesaveoptionswidget.h
+++ b/komparepart/komparesaveoptionswidget.h
@@ -19,9 +19,9 @@
 #define KOMPARESAVEOPTIONSWIDGET_H
 =

 #include <kurl.h>
+#include <kompare.h>
 =

 #include "komparesaveoptionsbase.h"
-#include "kompare.h"
 =

 class DiffSettings;
 class QButtonGroup;
diff --git a/libdialogpages/CMakeLists.txt b/libdialogpages/CMakeLists.txt
index 0f3f315..2290665 100644
--- a/libdialogpages/CMakeLists.txt
+++ b/libdialogpages/CMakeLists.txt
@@ -12,6 +12,8 @@ set(dialogpages_PART_SRCS
 =

 kde4_add_library(komparedialogpages SHARED ${dialogpages_PART_SRCS})
 =

+include_directories(${LIBKOMPAREDIFF2_INCLUDE_DIR})
+
 target_link_libraries(komparedialogpages  ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LI=
BS} ${LIBKOMPAREDIFF2_LIBRARIES})
 =

 set_target_properties(komparedialogpages PROPERTIES VERSION ${GENERIC_LIB_=
VERSION}
diff --git a/libdialogpages/filessettings.h b/libdialogpages/filessettings.h
index 7fd171f..dc3306e 100644
--- a/libdialogpages/filessettings.h
+++ b/libdialogpages/filessettings.h
@@ -20,7 +20,8 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 =

-#include "settingsbase.h"
+#include <settingsbase.h>
+
 #include "dialogpagesexport.h"
 =

 class KConfig;
diff --git a/libdialogpages/pagebase.h b/libdialogpages/pagebase.h
index b8cce57..0cef46f 100644
--- a/libdialogpages/pagebase.h
+++ b/libdialogpages/pagebase.h
@@ -22,8 +22,7 @@
 #include <QtCore/QSize>
 =

 #include <kvbox.h>
-
-#include "kompare.h"
+#include <kompare.h>
 =

 class PageBase : public KVBox
 {
diff --git a/libdialogpages/viewsettings.h b/libdialogpages/viewsettings.h
index f6f50c6..305e934 100644
--- a/libdialogpages/viewsettings.h
+++ b/libdialogpages/viewsettings.h
@@ -21,8 +21,9 @@
 #include <QtGui/QColor>
 #include <QtGui/QWidget>
 =

-#include "difference.h"
-#include "settingsbase.h"
+#include <difference.h>
+#include <settingsbase.h>
+
 #include "dialogpagesexport.h"
 =

 class DIALOGPAGES_EXPORT ViewSettings : public SettingsBase