68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
|
commit 9f32257a1e930b16e64508e6fbfa9390fc0322ee
|
||
|
|
Author: Rex Dieter <rdieter@math.unl.edu>
|
||
|
|
Date: Fri Dec 21 11:55:42 2012 -0600
|
||
|
|
|
||
|
|
fix build for < libkipi-2
|
||
|
|
|
||
|
|
BUG: 307147
|
||
|
|
|
||
|
|
diff --git a/src/kamoso.cpp b/src/kamoso.cpp
|
||
|
|
index 24dd0f2..4ca0dc4 100644
|
||
|
|
--- a/src/kamoso.cpp
|
||
|
|
+++ b/src/kamoso.cpp
|
||
|
|
@@ -78,6 +78,7 @@
|
||
|
|
|
||
|
|
#include <libkipi/plugin.h>
|
||
|
|
#include <libkipi/pluginloader.h>
|
||
|
|
+#include <libkipi/version.h>
|
||
|
|
#include <KPluginInfo>
|
||
|
|
|
||
|
|
const int max_exponential_value = 50;
|
||
|
|
@@ -190,9 +191,13 @@ Kamoso::Kamoso(QWidget* parent)
|
||
|
|
connect(mTracker, SIGNAL(urlsChanged(KUrl::List)), SLOT(updateThumbnails(KUrl::List)));
|
||
|
|
|
||
|
|
QMetaObject::invokeMethod(this, "initialize");
|
||
|
|
+#if (KIPI_VERSION >= 0x020000)
|
||
|
|
mPluginLoader = new KIPI::PluginLoader();
|
||
|
|
mPluginLoader->setInterface(new KIPIInterface(this));
|
||
|
|
mPluginLoader->init();
|
||
|
|
+#else
|
||
|
|
+ mPluginLoader = new KIPI::PluginLoader(QStringList(), new KIPIInterface(this), "");
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
KUrl::List Kamoso::selectedItems()
|
||
|
|
diff --git a/src/pluginTester/pluginTester.cpp b/src/pluginTester/pluginTester.cpp
|
||
|
|
index 2619eb8..36acdb5 100644
|
||
|
|
--- a/src/pluginTester/pluginTester.cpp
|
||
|
|
+++ b/src/pluginTester/pluginTester.cpp
|
||
|
|
@@ -26,6 +26,7 @@
|
||
|
|
#include <KCmdLineArgs>
|
||
|
|
#include <libkipi/plugin.h>
|
||
|
|
#include <libkipi/pluginloader.h>
|
||
|
|
+#include <libkipi/version.h>
|
||
|
|
|
||
|
|
PluginTester::PluginTester(QObject *parent) : QObject(parent)
|
||
|
|
{
|
||
|
|
@@ -41,9 +42,13 @@ PluginTester::PluginTester(QObject *parent) : QObject(parent)
|
||
|
|
kurlList.append(KUrl(args->arg(i)));
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if (KIPI_VERSION >= 0x020000)
|
||
|
|
m_pluginLoader = new KIPI::PluginLoader();
|
||
|
|
m_pluginLoader->setInterface(new FakeKIPIInterface(kurlList));
|
||
|
|
m_pluginLoader->init();
|
||
|
|
+#else
|
||
|
|
+ m_pluginLoader = new KIPI::PluginLoader(QStringList(), new FakeKIPIInterface(kurlList), "");
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
bool found = false;
|
||
|
|
Q_FOREACH(KIPI::PluginLoader::Info *pluginInfo, m_pluginLoader->pluginList()) {
|
||
|
|
@@ -60,4 +65,4 @@ PluginTester::PluginTester(QObject *parent) : QObject(parent)
|
||
|
|
PluginTester::~PluginTester()
|
||
|
|
{
|
||
|
|
delete m_action;
|
||
|
|
-}
|
||
|
|
\ No newline at end of file
|
||
|
|
+}
|