diff --git a/karbon/main.cpp b/karbon/main.cpp index c5188e95b9e..2035c7bace5 100644 --- a/karbon/main.cpp +++ b/karbon/main.cpp @@ -1,94 +1,94 @@ /* This file is part of the KDE project Copyright (C) 2001-2002 Lennart Kudling Copyright (C) 2002,2004 David Faure Copyright (C) 2003,2005 Laurent Montel Copyright (C) 2003,2007 Rob Buis Copyright (C) 2003 Stephan Binner Copyright (C) 2004 Waldo Bastian Copyright (C) 2005 Thomas Zander Copyright (C) 2006 Inge Wallin Copyright (C) 2006 Jan Hambrecht Copyright (C) 2007 Chusslove Illich This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ #include "ui/splash/hi256-app-calligrakarbon.xpm" #include #include #include #include #include #include #include #include #ifdef MAINTANER_WANTED_SPLASH class KoSplashScreen : public QSplashScreen { public: explicit KoSplashScreen(const QPixmap& pixmap) : QSplashScreen(pixmap) {} void hideEvent(QHideEvent *event) { event->accept(); deleteLater(); } }; #endif -extern "C" KARBONUI_EXPORT int kdemain( int argc, char* argv[] ) +extern "C" Q_DECL_EXPORT int kdemain( int argc, char* argv[] ) { /** * Disable debug output by default, only log warnings. * Debug logs can be controlled by the environment variable QT_LOGGING_RULES. * * For example, to get full debug output, run the following: * QT_LOGGING_RULES="calligra.*=true" karbon * * See: http://doc.qt.io/qt-5/qloggingcategory.html */ QLoggingCategory::setFilterRules("calligra.*.debug=false\n" "calligra.*.warning=true"); KoApplication app(KARBON_MIME_TYPE, QStringLiteral("calligrakarbon"), newKarbonAboutData, argc, argv); // Migrate data from kde4 to kf5 locations Calligra2Migration m("karbon"); m.setConfigFiles(QStringList() << QStringLiteral("karbonrc")); m.setUiFiles(QStringList() << QStringLiteral("karbon.rc")<< QStringLiteral("karbon_readonly.rc")); m.migrate(); if (!app.start()) { // parses command line args, create initial docs and mainwindows return 1; } #ifdef MAINTANER_WANTED_SPLASH // After creating the KoApplication then create the pixmap from an xpm: we cannot get the // location of our datadir before we've started our components, // so use an xpm. QSplashScreen *splashScreen = new KoSplashScreen(QPixmap(splash_screen_xpm)); splashScreen->show(); splashScreen->showMessage("

" "Calligra Karbon is unmaintained!

" "The Calligra community welcomes someone to take over.

" "See community.kde.org/Calligra

"); #endif return app.exec(); } diff --git a/sheets/part/Main.cpp b/sheets/part/Main.cpp index 76959716c68..98ce0c1ce97 100644 --- a/sheets/part/Main.cpp +++ b/sheets/part/Main.cpp @@ -1,62 +1,60 @@ /* This file is part of the KDE project Copyright (C) 1998, 1999 Torben Weis This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "AboutData.h" #include "DocBase.h" -#include "sheets_common_export.h" - #include #include #include using namespace Calligra::Sheets; -extern "C" CALLIGRA_SHEETS_COMMON_EXPORT int kdemain(int argc, char **argv) +extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) { /** * Disable debug output by default, only log warnings. * Debug logs can be controlled by the environment variable QT_LOGGING_RULES. * * For example, to get full debug output, run the following: * QT_LOGGING_RULES="calligra.*=true" calligrasheets * * See: http://doc.qt.io/qt-5/qloggingcategory.html */ QLoggingCategory::setFilterRules("calligra.*.debug=false\n" "calligra.*.warning=true"); // QT5TODO: support custom options // options.add("scriptfile ", ki18n("Execute the scriptfile after startup.")); KoApplication app(SHEETS_MIME_TYPE, QStringLiteral("calligrasheets"), newAboutData, argc, argv); // Migrate data from kde4 to kf5 locations Calligra2Migration m("calligrasheets", "sheets"); m.setConfigFiles(QStringList() << QStringLiteral("sheetsrc")); m.setUiFiles(QStringList() << QStringLiteral("sheets.rc") << QStringLiteral("sheets_readonly.rc")); m.migrate(); if (!app.start()) { return 1; } return app.exec(); } diff --git a/stage/app/main.cpp b/stage/app/main.cpp index ec4ca25e086..85f1c9193e5 100644 --- a/stage/app/main.cpp +++ b/stage/app/main.cpp @@ -1,55 +1,55 @@ /* This file is part of the KDE project Copyright (C) 1998, 1999 Reginald Stadlbauer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ #include #include #include #include #include -extern "C" STAGE_EXPORT int kdemain( int argc, char **argv ) +extern "C" Q_DECL_EXPORT int kdemain( int argc, char **argv ) { /** * Disable debug output by default, only log warnings. * Debug logs can be controlled by the environment variable QT_LOGGING_RULES. * * For example, to get full debug output, run the following: * QT_LOGGING_RULES="calligra.*=true" calligrastage * * See: http://doc.qt.io/qt-5/qloggingcategory.html */ QLoggingCategory::setFilterRules("calligra.*.debug=false\n" "calligra.*.warning=true"); KoApplication app(STAGE_MIME_TYPE, QStringLiteral("calligrastage"), newKPresenterAboutData, argc, argv); // Migrate data from kde4 to kf5 locations Calligra2Migration m("calligrastage", "stage"); m.setConfigFiles(QStringList() << QStringLiteral("stagerc")); m.setUiFiles(QStringList() << QStringLiteral("stage.rc") << QStringLiteral("stage_readonly.rc")); m.migrate(); if (!app.start()) { return 1; } return app.exec(); } diff --git a/words/app/main.cpp b/words/app/main.cpp index a8a2cbdd146..3e0e3459b46 100644 --- a/words/app/main.cpp +++ b/words/app/main.cpp @@ -1,55 +1,55 @@ /* This file is part of the KDE project Copyright (C) 1998, 1999 Reginald Stadlbauer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ #include #include #include #include #include -extern "C" WORDS_EXPORT int kdemain(int argc, char **argv) +extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) { /** * Disable debug output by default, only log warnings. * Debug logs can be controlled by the environment variable QT_LOGGING_RULES. * * For example, to get full debug output, run the following: * QT_LOGGING_RULES="calligra.*=true" calligrawords * * See: http://doc.qt.io/qt-5/qloggingcategory.html */ QLoggingCategory::setFilterRules("calligra.*.debug=false\n" "calligra.*.warning=true"); KoApplication app(WORDS_MIME_TYPE, QStringLiteral("calligrawords"), newWordsAboutData, argc, argv); // Migrate data from kde4 to kf5 locations Calligra2Migration m("calligrawords", "words"); m.setConfigFiles(QStringList() << QStringLiteral("wordsrc")); m.setUiFiles(QStringList() << QStringLiteral("words.rc") << QStringLiteral("words_readonly.rc")); m.migrate(); if (!app.start()) { return 1; } return app.exec(); }