Git commit e619ad7f66a2096c63dfe22b37b7f46406e79406 by Inge Wallin.
Committed on 23/03/2015 at 04:14.
Pushed by ingwa into branch 'frameworks'.

Port calligraconverter to Qt5/KF5.

M  +1    -1    CalligraProducts.cmake
M  +3    -3    extras/converter/calligraconverter.cpp

http://commits.kde.org/calligra/e619ad7f66a2096c63dfe22b37b7f46406e79406

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 02ca3ee..40e8dbc 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -102,7 +102,7 @@ calligra_define_product(APP_GEMINI "The Calligra Gemini=
 application" UNPORTED  R
 calligra_define_product(DOC "Calligra Documentations" UNPORTED)
 =

 # extras
-calligra_define_product(APP_CONVERTER "Format converter for commandline" U=
NPORTED  REQUIRES LIB_CALLIGRA)
+calligra_define_product(APP_CONVERTER "Format converter for commandline" R=
EQUIRES LIB_CALLIGRA)
 calligra_define_product(FILEMANAGER_PROPERTIES "Plugin for the KDE file pr=
operties dialog" UNPORTED  REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILEMANAGER_THUMBNAIL "Plugins for KDE filesystem =
thumbnailing" UNPORTED  REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILEMANAGER_QUICKPRINT "Plugin for the filemanager=
 adding a \"Print\" action" UNPORTED)
diff --git a/extras/converter/calligraconverter.cpp b/extras/converter/call=
igraconverter.cpp
index ec4221c..579bb08 100644
--- a/extras/converter/calligraconverter.cpp
+++ b/extras/converter/calligraconverter.cpp
@@ -21,7 +21,7 @@
 =

 #include <QTimer>
 =

-#include <kaboutdata.h>
+#include <K4AboutData>
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kglobal.h>
@@ -142,9 +142,9 @@ bool convert(const KUrl &uIn, const QString &inputForma=
t, const KUrl &uOut, cons
 =

 int main(int argc, char **argv)
 {
-    KAboutData aboutData("calligraconverter", 0, ki18n("CalligraConverter"=
), CALLIGRA_VERSION_STRING,
+    K4AboutData aboutData("calligraconverter", 0, ki18n("CalligraConverter=
"), CALLIGRA_VERSION_STRING,
                          ki18n("Calligra Document Converter"),
-                         KAboutData::License_GPL,
+                         K4AboutData::License_GPL,
                          ki18n("(c) 2001-2011 Calligra developers"));
     aboutData.addAuthor(ki18n("David Faure"), KLocalizedString(), "faure@k=
de.org");
     aboutData.addAuthor(ki18n("Nicolas Goutte"), KLocalizedString(), "gout=
te@kde.org");