Make the oKular part and its shell compile and link.

Created a oKularcore lib, so the generators ca link to it, and made the oKularpart link to it too, of course.
Adapted the sources of the Okularpart to the new location for the generated settings.h.

svn path=/branches/work/kde4/playground/graphics/okular/; revision=523729

CMakeLists.txt

@@ -62,7 +62,17 @@ set(oKularagg2_SRCS
 )
 kde4_add_kcfg_files(oKularconf_SRCS ${CMAKE_SOURCE_DIR}/okular/conf/settings.kcfgc )
 
-set(oKularpart_PART_SRCS part.cpp ${oKularconf_SRCS} ${oKularcore_SRCS} ${oKularui_SRCS} ${oKularagg2_SRCS} )
+set(oKularcore_SRCS ${oKularconf_SRCS} ${oKularcore_SRCS} )
+
+kde4_automoc(${oKularcore_SRCS})
+
+kde4_add_plugin(oKularcore WITH_PREFIX ${oKularcore_SRCS})
+
+target_link_libraries(oKularcore  ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} m )
+
+install_targets(${LIB_INSTALL_DIR} oKularcore )
+
+set(oKularpart_PART_SRCS part.cpp ${oKularui_SRCS} ${oKularagg2_SRCS} )
 
 kde4_automoc(${oKularpart_PART_SRCS})
 
@@ -72,7 +82,7 @@ kde4_add_plugin(oKularpart WITH_PREFIX ${oKularpart_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} oKularpart )
 
-target_link_libraries(oKularpart  ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KNEWSTUFF_LIBS} ${KDE4_KHTML_LIBS} m ${X11_Xrender_LIB} )
+target_link_libraries(oKularpart  oKularcore ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KNEWSTUFF_LIBS} ${KDE4_KHTML_LIBS} m ${X11_Xrender_LIB} )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 oKularpart )
 

core/document.cpp

@@ -40,7 +40,7 @@
 #include "link.h"
 #include "chooseenginedialog.h"
 
-#include "conf/settings.h"
+#include "settings.h"
 
 // structures used internally by KPDFDocument for local variables storage
 class AllocatedPixmap;

core/page.cpp

@@ -18,7 +18,7 @@
 #include "pagetransition.h"
 #include "link.h"
 #include "annotations.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "area.h"
 
 // temp includes

part.cpp

@@ -69,7 +69,7 @@
 #include "ui/propertiesdialog.h"
 #include "ui/presentationwidget.h"
 #include "conf/preferencesdialog.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "core/document.h"
 #include "core/generator.h"
 #include "core/page.h"

ui/pagepainter.cpp

@@ -25,7 +25,7 @@
 #include "core/area.h"
 #include "core/page.h"
 #include "core/annotations.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 void PagePainter::paintPageOnPainter( QPainter * destPainter, const KPDFPage * page,
     int pixID, int flags, int scaledWidth, int scaledHeight, const QRect & limits )

ui/pageview.cpp

@@ -57,7 +57,7 @@
 #include "core/misc.h"
 #include "core/link.h"
 #include "core/generator.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 #define ROUND(x) (int(x + 0.5))
 

ui/pageviewannotator.cpp

@@ -26,7 +26,7 @@
 #include "core/document.h"
 #include "core/page.h"
 #include "core/annotations.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "pageview.h"
 #include "pageviewutils.h"
 #include "pageviewannotator.h"

ui/pageviewutils.cpp

@@ -27,7 +27,7 @@
 // local includes
 #include "pageviewutils.h"
 #include "core/page.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 /*********************/
 /** PageViewItem     */

ui/presentationwidget.cpp

@@ -36,7 +36,7 @@
 #include "core/generator.h"
 #include "core/page.h"
 #include "core/link.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 
 // comment this to disable the top-right progress indicator

ui/searchwidget.cpp

@@ -22,7 +22,7 @@
 // local includes
 #include "searchwidget.h"
 #include "core/document.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 SearchWidget::SearchWidget( QWidget * parent, KPDFDocument * document )
     : KToolBar( parent, "iSearchBar" ), m_document( document ),

ui/side_reviews.cpp

@@ -24,7 +24,7 @@
 #include "core/annotations.h"
 #include "core/document.h"
 #include "core/page.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "side_reviews.h"
 
 

ui/thumbnaillist.cpp

@@ -27,7 +27,7 @@
 #include "core/document.h"
 #include "core/generator.h"
 #include "core/page.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 // ThumbnailWidget represents a single thumbnail in the ThumbnailList
 class ThumbnailWidget : public QWidget

ui/toc.cpp

@@ -14,7 +14,7 @@
 #include "toc.h"
 #include "core/document.h"
 #include "core/page.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "core/link.h"
 
 // uncomment following to enable a 2nd column showing the page referred