[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/libs/kipi-plugins
From: Pino Toscano <pino () kde ! org>
Date: 2008-06-03 12:43:21
Message-ID: 1212497001.852196.17116.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 816152 by pino:
adapt the kipi plugins to the recent libkipi api changes:
- add more includes, as there are less silently pulled
- adapt to the new values of the KIPI::Category enum
M +4 -2 acquireimages/plugin_acquireimages.cpp
M +2 -0 gpssync/kmlexport.cpp
M +4 -3 gpssync/plugin_gpssync.cpp
M +4 -2 htmlexport/plugin.cpp
M +2 -0 htmlexport/plugin.h
M +1 -0 jpeglossless/imageflip.cpp
M +1 -0 jpeglossless/imagerotate.cpp
M +1 -0 jpeglossless/jpegtransform.cpp
M +6 -5 jpeglossless/plugin_jpeglossless.cpp
M +1 -0 jpeglossless/utils.cpp
M +2 -0 metadataedit/exifeditdialog.cpp
M +2 -0 metadataedit/iptceditdialog.cpp
M +4 -2 metadataedit/plugin_metadataedit.cpp
M +2 -0 metadataedit/xmpeditdialog.cpp
M +8 -3 rawconverter/plugin_rawconverter.cpp
M +1 -0 rawconverter/rawdecodingiface.cpp
M +7 -2 sendimages/plugin_sendimages.cpp
M +3 -2 simpleviewerexport/plugin_simpleviewer.cpp
M +4 -2 timeadjust/plugin_timeadjust.cpp
--- trunk/extragear/libs/kipi-plugins/acquireimages/plugin_acquireimages.cpp #816151:816152
@@ -25,6 +25,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -39,6 +40,7 @@
// LibKIPI includes.
#include <libkipi/imagecollection.h>
+#include <libkipi/interface.h>
// Local includes.
@@ -99,8 +101,8 @@
KIPI::Category Plugin_AcquireImages::category( KAction* action ) const
{
if ( action == m_action_scanimages )
- return KIPI::IMPORTPLUGIN;
+ return KIPI::ImportPlugin;
kWarning( 51000 ) << "Unrecognized action for plugin category identification";
- return KIPI::IMPORTPLUGIN; // no warning from compiler, please
+ return KIPI::ImportPlugin; // no warning from compiler, please
}
--- trunk/extragear/libs/kipi-plugins/gpssync/kmlexport.cpp #816151:816152
@@ -31,6 +31,7 @@
#include <QPainter>
#include <QRegExp>
#include <QImageReader>
+#include <QTextStream>
// KDE includes.
@@ -49,6 +50,7 @@
#include <libkipi/plugin.h>
#include <libkipi/imageinfo.h>
+#include <libkipi/interface.h>
// Local includes.
--- trunk/extragear/libs/kipi-plugins/gpssync/plugin_gpssync.cpp #816151:816152
@@ -30,6 +30,7 @@
#include <klocale.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kactionmenu.h>
#include <kapplication.h>
#include <kgenericfactory.h>
@@ -429,10 +430,10 @@
KIPI::Category Plugin_GPSSync::category( KAction* action ) const
{
if ( action == m_action_geolocation )
- return KIPI::IMAGESPLUGIN;
+ return KIPI::ImagesPlugin;
if ( action == m_actionKMLExport )
- return KIPI::EXPORTPLUGIN;
+ return KIPI::ExportPlugin;
kWarning( 51000 ) << "Unrecognized action for plugin category identification" << endl;
- return KIPI::IMAGESPLUGIN; // no warning from compiler, please
+ return KIPI::ImagesPlugin; // no warning from compiler, please
}
--- trunk/extragear/libs/kipi-plugins/htmlexport/plugin.cpp #816151:816152
@@ -23,6 +23,7 @@
// KDE
#include <kaction.h>
+#include <kactioncollection.h>
#include <kapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -31,6 +32,7 @@
// KIPIPlugins
#include <batchprogressdialog.h>
+#include <libkipi/interface.h>
// Local
#include "galleryinfo.h"
@@ -103,11 +105,11 @@
KIPI::Category Plugin::category(KAction* action) const {
if (action == d->mAction) {
- return KIPI::EXPORTPLUGIN;
+ return KIPI::ExportPlugin;
}
kWarning( 51000 ) << "Unrecognized action for plugin category identification" << endl;
- return KIPI::EXPORTPLUGIN; // no warning from compiler, please
+ return KIPI::ExportPlugin; // no warning from compiler, please
}
} // namespace
--- trunk/extragear/libs/kipi-plugins/htmlexport/plugin.h #816151:816152
@@ -21,6 +21,8 @@
#ifndef PLUGIN_H
#define PLUGIN_H
+#include <QVariant>
+
#include <libkipi/plugin.h>
class KAction;
--- trunk/extragear/libs/kipi-plugins/jpeglossless/imageflip.cpp #816151:816152
@@ -47,6 +47,7 @@
// KDE includes.
+#include <kdebug.h>
#include <k3process.h>
#include <klocale.h>
--- trunk/extragear/libs/kipi-plugins/jpeglossless/imagerotate.cpp #816151:816152
@@ -48,6 +48,7 @@
// KDE includes.
+#include <kdebug.h>
#include <k3process.h>
#include <klocale.h>
--- trunk/extragear/libs/kipi-plugins/jpeglossless/jpegtransform.cpp #816151:816152
@@ -47,6 +47,7 @@
// KDE includes.
+#include <kdebug.h>
#include <klocale.h>
#include <ktemporaryfile.h>
--- trunk/extragear/libs/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp #816151:816152
@@ -35,6 +35,7 @@
#include <kshortcut.h>
#include <klocale.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kactionmenu.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -466,16 +467,16 @@
KIPI::Category Plugin_JPEGLossless::category( KAction* action ) const
{
if (action == d->action_AutoExif)
- return KIPI::IMAGESPLUGIN;
+ return KIPI::ImagesPlugin;
else if ( action == d->action_RotateImage )
- return KIPI::IMAGESPLUGIN;
+ return KIPI::ImagesPlugin;
else if ( action == d->action_FlipImage )
- return KIPI::IMAGESPLUGIN;
+ return KIPI::ImagesPlugin;
else if ( action == d->action_Convert2GrayScale )
- return KIPI::IMAGESPLUGIN;
+ return KIPI::ImagesPlugin;
kWarning( 51000 ) << "Unrecognized action for plugin category identification";
- return KIPI::IMAGESPLUGIN; // no warning from compiler, please
+ return KIPI::ImagesPlugin; // no warning from compiler, please
}
KUrl::List Plugin_JPEGLossless::images()
--- trunk/extragear/libs/kipi-plugins/jpeglossless/utils.cpp #816151:816152
@@ -46,6 +46,7 @@
// KDE includes.
+#include <kdebug.h>
#include <k3process.h>
#include <ktemporaryfile.h>
#include <klocale.h>
--- trunk/extragear/libs/kipi-plugins/metadataedit/exifeditdialog.cpp #816151:816152
@@ -45,6 +45,8 @@
// LibKIPI includes.
#include <libkipi/imagecollection.h>
+#include <libkipi/imageinfo.h>
+#include <libkipi/interface.h>
#include <libkipi/plugin.h>
// LibKExiv2 includes.
--- trunk/extragear/libs/kipi-plugins/metadataedit/iptceditdialog.cpp #816151:816152
@@ -45,6 +45,8 @@
// LibKIPI includes.
#include <libkipi/imagecollection.h>
+#include <libkipi/imageinfo.h>
+#include <libkipi/interface.h>
#include <libkipi/plugin.h>
// LibKExiv2 includes.
--- trunk/extragear/libs/kipi-plugins/metadataedit/plugin_metadataedit.cpp #816151:816152
@@ -24,6 +24,7 @@
#include <klocale.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kactionmenu.h>
#include <kapplication.h>
#include <kgenericfactory.h>
@@ -38,6 +39,7 @@
// LibKIPI includes.
#include <libkipi/imagecollection.h>
+#include <libkipi/interface.h>
// LibKExiv2 includes.
@@ -748,8 +750,8 @@
KIPI::Category Plugin_MetadataEdit::category( KAction* action ) const
{
if ( action == m_actionMetadataEdit )
- return KIPI::IMAGESPLUGIN;
+ return KIPI::ImagesPlugin;
kWarning( 51000 ) << "Unrecognized action for plugin category identification";
- return KIPI::IMAGESPLUGIN; // no warning from compiler, please
+ return KIPI::ImagesPlugin; // no warning from compiler, please
}
--- trunk/extragear/libs/kipi-plugins/metadataedit/xmpeditdialog.cpp #816151:816152
@@ -45,6 +45,8 @@
// LibKIPI includes.
#include <libkipi/imagecollection.h>
+#include <libkipi/imageinfo.h>
+#include <libkipi/interface.h>
#include <libkipi/plugin.h>
// LibKExiv2 includes.
--- trunk/extragear/libs/kipi-plugins/rawconverter/plugin_rawconverter.cpp #816151:816152
@@ -43,6 +43,7 @@
#include <klocale.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -54,6 +55,10 @@
#include <libkdcraw/dcrawbinary.h>
+// LibKipi includes.
+
+#include <libkipi/interface.h>
+
// Local includes.
#include "singledialog.h"
@@ -192,10 +197,10 @@
KIPI::Category Plugin_RawConverter::category( KAction* action ) const
{
if ( action == m_singleAction )
- return KIPI::TOOLSPLUGIN;
+ return KIPI::ToolsPlugin;
else if ( action == m_batchAction )
- return KIPI::BATCHPLUGIN;
+ return KIPI::BatchPlugin;
kWarning( 51000 ) << "Unrecognized action for plugin category identification";
- return KIPI::TOOLSPLUGIN; // no warning from compiler, please
+ return KIPI::ToolsPlugin; // no warning from compiler, please
}
--- trunk/extragear/libs/kipi-plugins/rawconverter/rawdecodingiface.cpp #816151:816152
@@ -38,6 +38,7 @@
// KDE includes.
+#include <kdebug.h>
#include <kstandarddirs.h>
// LibKDcraw includes.
--- trunk/extragear/libs/kipi-plugins/sendimages/plugin_sendimages.cpp #816151:816152
@@ -26,11 +26,16 @@
#include <kapplication.h>
#include <kglobal.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <kconfig.h>
#include <kdebug.h>
+// LibKipi includes.
+
+#include <libkipi/interface.h>
+
// Local includes
#include "sendimages.h"
@@ -118,8 +123,8 @@
KIPI::Category Plugin_SendImages::category( KAction* action ) const
{
if ( action == d->action_sendimages )
- return KIPI::IMAGESPLUGIN;
+ return KIPI::ImagesPlugin;
kWarning( 51000 ) << "Unrecognized action for plugin category identification";
- return KIPI::IMAGESPLUGIN; // no warning from compiler, please
+ return KIPI::ImagesPlugin; // no warning from compiler, please
}
--- trunk/extragear/libs/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp #816151:816152
@@ -25,6 +25,7 @@
#include <klocale.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <kconfig.h>
@@ -72,10 +73,10 @@
KIPI::Category Plugin_SimpleViewer::category( KAction* action ) const
{
if ( action == m_actionSimpleViewer )
- return KIPI::EXPORTPLUGIN;
+ return KIPI::ExportPlugin;
kWarning( 51000 ) << "Unrecognized action for plugin category identification" << endl;
- return KIPI::EXPORTPLUGIN; // no warning from compiler, please
+ return KIPI::ExportPlugin; // no warning from compiler, please
}
void Plugin_SimpleViewer::slotActivate()
--- trunk/extragear/libs/kipi-plugins/timeadjust/plugin_timeadjust.cpp #816151:816152
@@ -26,6 +26,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -35,6 +36,7 @@
// LibKIPI includes.
#include <libkipi/imagecollection.h>
+#include <libkipi/interface.h>
// Local includes.
@@ -95,8 +97,8 @@
KIPI::Category Plugin_TimeAdjust::category( KAction* action ) const
{
if ( action == m_actionTimeAjust )
- return KIPI::IMAGESPLUGIN;
+ return KIPI::ImagesPlugin;
kWarning( 51000 ) << "Unrecognized action for plugin category identification";
- return KIPI::IMAGESPLUGIN; // no warning from compiler, please
+ return KIPI::ImagesPlugin; // no warning from compiler, please
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic