[Kde-imaging] extragear/libs

[Gilles Caulier]

SVN commit 785084 by cgilles:

LibKipi and Kipi-plugins from trunk (KDE4) : Moving KIPI::ImageDialog to KIPIPlugins::ImageDialog
This dialog is never used by kipi host, but only by kipi-plugins.
CCMAIL: kde-imaging at kde.org


 M  +3 -1      kipi-plugins/common/libkipiplugins/CMakeLists.txt  
 AM            kipi-plugins/common/libkipiplugins/imagedialog.cpp   [License: GPL (v2+)]
 AM            kipi-plugins/common/libkipiplugins/imagedialog.h   [License: GPL (v2+)]
 M  +2 -2      kipi-plugins/rawconverter/batchdialog.cpp  
 M  +2 -2      kipi-plugins/sendimages/imagespage.cpp  
 M  +1 -1      libkipi/NEWS  
 M  +3 -4      libkipi/libkipi/CMakeLists.txt  
 D             libkipi/libkipi/imagedialog.cpp  
 D             libkipi/libkipi/imagedialog.h  


--- trunk/extragear/libs/kipi-plugins/common/libkipiplugins/CMakeLists.txt #785083:785084
@@ -2,7 +2,7 @@
 INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_PNG_INCLUDE_DIR})
 
 SET(kipiplugins_LIB_SRCS kpaboutdata.cpp kpwriteimage.cpp iccjpeg.c squeezedcombobox.cpp
-                         batchprogressdialog.cpp)
+                         batchprogressdialog.cpp imagedialog.cpp)
 
 KDE4_ADD_LIBRARY(kipiplugins SHARED ${kipiplugins_LIB_SRCS})
 
@@ -14,6 +14,8 @@
                       ${TIFF_LIBRARIES}
                       ${PNG_LIBRARIES}
                       ${KEXIV2_LIBRARIES}
+                      ${KDCRAW_LIBRARIES} 
+                      ${KIPI_LIBRARIES} 
                      )
 
 SET_TARGET_PROPERTIES(kipiplugins PROPERTIES VERSION 1.0.0 SOVERSION 1 )
** trunk/extragear/libs/kipi-plugins/common/libkipiplugins/imagedialog.cpp #property svn:eol-style
   + native
** trunk/extragear/libs/kipi-plugins/common/libkipiplugins/imagedialog.h #property svn:eol-style
   + native
--- trunk/extragear/libs/kipi-plugins/rawconverter/batchdialog.cpp #785083:785084
@@ -71,12 +71,12 @@
 
 #include <libkipi/interface.h>
 #include <libkipi/imageinfo.h>
-#include <libkipi/imagedialog.h>
 
 // Local includes.
 
 #include "actions.h"
 #include "kpaboutdata.h"
+#include "imagedialog.h"
 #include "pluginsversion.h"
 #include "rawdecodingiface.h"
 #include "savesettingswidget.h"
@@ -452,7 +452,7 @@
 
 void BatchDialog::slotAddItems()
 {
-    KIPI::ImageDialog dlg(this, d->iface, false, true);
+    KIPIPlugins::ImageDialog dlg(this, d->iface, false, true);
     KUrl::List urls = dlg.urls();
     if (!urls.isEmpty())
     {
--- trunk/extragear/libs/kipi-plugins/sendimages/imagespage.cpp #785083:785084
@@ -43,10 +43,10 @@
 
 #include <libkipi/imagecollection.h>
 #include <libkipi/interface.h>
-#include <libkipi/imagedialog.h>
 
 // Local includes.
 
+#include "imagedialog.h"
 #include "imagespage.h"
 #include "imagespage.moc"
 
@@ -299,7 +299,7 @@
 
 void ImagesPage::slotAddItems()
 {
-    KIPI::ImageDialog dlg(this, d->iface, false);
+    KIPIPlugins::ImageDialog dlg(this, d->iface, false);
     KUrl::List urls = dlg.urls();
     if (!urls.isEmpty())
         slotAddImages(urls);
--- trunk/extragear/libs/libkipi/NEWS #785083:785084
@@ -2,13 +2,13 @@
 ------------------------------------------------------------------------
 
 	o Port to CMake/KDE4/QT4
-	o new depency to libKDcraw
 
 API changes:
 
 	o new virtual method ImageInfoShared::delAttributes()
 	o new virtual method Interface::imagecollectionselector()
 	o BatchProcessDialog moved to KIPIPlugins common library.
+        o ImageDialog moved to KIPIPlugins common library.
 
 Bugs fixed:
 
--- trunk/extragear/libs/libkipi/libkipi/CMakeLists.txt #785083:785084
@@ -1,16 +1,15 @@
-INCLUDE_DIRECTORIES(${KDCRAW_INCLUDE_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+INCLUDE_DIRECTORIES(${KDE4_INCLUDES} ${QT4_INCLUDES})
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
 SET(kipi_LIB_SRCS pluginloader.cpp interface.cpp imagecollection.cpp 
                   imagecollectionshared.cpp imageinfoshared.cpp plugin.cpp 
-                  imageinfo.cpp uploadwidget.cpp imagedialog.cpp 
+                  imageinfo.cpp uploadwidget.cpp 
                   imagecollectionselector.cpp)
 
 KDE4_ADD_LIBRARY(kipi SHARED ${kipi_LIB_SRCS})
 
 TARGET_LINK_LIBRARIES(kipi 
-                      ${KDCRAW_LIBRARIES} 
                       ${KDE4_KPARTS_LIBS} 
                       ${KDE4_KFILE_LIBS} 
                       ${QT_QTGUI_LIBRARY} 
@@ -21,7 +20,7 @@
 INSTALL(TARGETS kipi DESTINATION ${LIB_INSTALL_DIR} )
 
 INSTALL(FILES interface.h plugin.h pluginloader.h imageinfo.h imagecollection.h 
-              imageinfoshared.h imagecollectionshared.h imagedialog.h uploadwidget.h 
+              imageinfoshared.h imagecollectionshared.h uploadwidget.h 
               imagecollectionselector.h 
               ${CMAKE_CURRENT_BINARY_DIR}/version.h libkipi_export.h 
         DESTINATION ${INCLUDE_INSTALL_DIR}/libkipi)