Commit 32ef29b0 authored by Maximiliano Curia's avatar Maximiliano Curia

Drop qalculate settingswidget.* files

The files were licensed GPL-3+ in a GPL-2+ project, just to wrap the ui.
The replacement function is based on the lua backend's settingsWidget
function.

This solves the bug 359918, and debian bug #792078
Reviewboard: https://git.reviewboard.kde.org/r/128090/
parent 841b6f6e
......@@ -13,7 +13,6 @@ qalculateexpression.cpp
qalculateextensions.cpp
qalculatecompletionobject.cpp
qalculateextensions.cpp
settingswidget.cpp
)
kconfig_add_kcfg_files(QalculateBackend_SRCS settings.kcfgc)
......
......@@ -17,13 +17,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/
#include "ui_settings.h"
#include "settings.h"
#include "qalculatebackend.h"
#include "qalculatesession.h"
#include "qalculateextensions.h"
#include "settingswidget.h"
#include "cantor_macros.h"
#include <KLocalizedString>
......@@ -84,7 +84,11 @@ KConfigSkeleton* QalculateBackend::config() const
QWidget* QalculateBackend::settingsWidget(QWidget* parent) const
{
return new QalculateSettingsWidget(parent);
QWidget* widget = new QWidget(parent);
Ui::QalculateSettingsBase s;
s.setupUi(widget);
return widget;
}
K_PLUGIN_FACTORY_WITH_JSON(qalculatebackend, "qalculatebackend.json", registerPlugin<QalculateBackend>();)
......
/*
Copyright (C) 2011 Matteo Agostinelli <agostinelli@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program 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 General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "settingswidget.h"
QalculateSettingsWidget::QalculateSettingsWidget(QWidget* parent, Qt::WindowFlags f): QWidget(parent, f)
{
setupUi(this);
}
/*
Copyright (C) 2011 Matteo Agostinelli <agostinelli@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program 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 General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SETTINGSWIDGET_H
#define SETTINGSWIDGET_H
#include "ui_settings.h"
class QalculateSettingsWidget : public QWidget, public Ui::QalculateSettingsBase
{
Q_OBJECT
public:
explicit QalculateSettingsWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
};
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment