Commit 1c6a9538 authored by Andreas Cord-Landwehr's avatar Andreas Cord-Landwehr
Browse files

Remove KDElibs4Support.

parent 99091196
......@@ -47,7 +47,7 @@ find_package(KF5 CONFIG REQUIRED COMPONENTS
CoreAddons
Declarative
I18n
KDELibs4Support
KIO
NewStuff
WidgetsAddons
)
......
......@@ -135,6 +135,7 @@ target_link_libraries(artikulate
Qt5::QuickWidgets
KF5::ConfigWidgets
KF5::Declarative
KF5::KIOWidgets
KF5::NewStuff
)
......
......@@ -59,8 +59,8 @@
#include <KDeclarative/KDeclarative>
#include <QGraphicsDropShadowEffect>
Application::Application()
: KApplication(true)
Application::Application(int argc, char **argv)
: QApplication(argc, argv)
{
registerQmlTypes();
}
......
......@@ -29,7 +29,7 @@ class Application : public QApplication
Q_OBJECT
public:
explicit Application();
explicit Application(int argc, char **argv);
private:
void registerQmlTypes();
......
......@@ -56,7 +56,7 @@ int main(int argc, char **argv)
aboutData.addAuthor(ki18nc("@info:credit Developer name", "Magdalena Konkiewicz").toString(),
ki18nc("@info:credit Role", "Developer and Course Data").toString());
Application app;
Application app(argc, argv);
MainWindow *widget = new MainWindow;
widget->show();
......
......@@ -34,16 +34,13 @@
#include <KMainWindow>
#include <QAction>
#include <KActionCollection>
#include <KCmdLineArgs>
#include <KDialog>
#include <KGlobal>
#include <QIcon>
#include <KLocale>
#include <KLocalizedString>
#include <KDeclarative/KDeclarative>
#include <KConfigDialog>
#include <QDebug>
#include <KStandardAction>
#include <KApplication>
#include <QApplication>
#include <KMessageBox>
#include <KNS3/DownloadDialog>
......@@ -160,7 +157,7 @@ void MainWindow::setupActions()
actionCollection()->addAction("config_learner_profile", configLearnerProfileAction);
configLearnerProfileAction->setIcon(QIcon::fromTheme("user-identity"));
KStandardAction::quit(kapp, SLOT(quit()), actionCollection());
// KStandardAction::quit(kapp, SLOT(quit()), actionCollection()); //FIXME port this
setupGUI(Keys | Save | Create, "artikulateui.rc");
}
......
......@@ -23,7 +23,7 @@
#include <QSortFilterProxyModel>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
CourseFilterModel::CourseFilterModel(QObject* parent)
......
......@@ -23,7 +23,7 @@
#include <QSortFilterProxyModel>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
LanguageModel::LanguageModel(QObject* parent)
......
......@@ -21,7 +21,7 @@
#include "learningprogressmodel.h"
#include "core/trainingsession.h"
#include <QAbstractTableModel>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
LearningProgressModel::LearningProgressModel(QObject *parent)
......
......@@ -26,7 +26,7 @@
#include <QAbstractListModel>
#include <QSignalMapper>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
PhonemeGroupModel::PhonemeGroupModel(QObject *parent)
......
......@@ -25,7 +25,7 @@
#include <QAbstractListModel>
#include <QSignalMapper>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
PhonemeModel::PhonemeModel(QObject *parent)
......
......@@ -26,7 +26,7 @@
#include <QAbstractListModel>
#include <QSignalMapper>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
PhonemeUnitModel::PhonemeUnitModel(QObject *parent)
......
......@@ -24,7 +24,7 @@
#include <QSortFilterProxyModel>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
PhraseFilterModel::PhraseFilterModel(QObject* parent)
......
......@@ -21,12 +21,9 @@
#include "phrasemodel.h"
#include "core/unit.h"
#include "core/phrase.h"
#include <QAbstractListModel>
#include <QSignalMapper>
#include <KLocale>
#include <QDebug>
#include <KLocalizedString>
PhraseModel::PhraseModel(QObject *parent)
: QAbstractListModel(parent)
......@@ -174,8 +171,10 @@ void PhraseModel::onPhrasesRemoved()
void PhraseModel::emitPhraseChanged(int row)
{
reset(); //FIXME very inefficient, but workaround to force new filtering in phrasefiltermodel
// to exclude possible new excluded phrases
beginResetModel();
endResetModel();
//FIXME very inefficient, but workaround to force new filtering in phrasefiltermodel
// to exclude possible new excluded phrases
emit phraseChanged(row);
emit dataChanged(index(row, 0), index(row, 0));
}
......
......@@ -24,8 +24,7 @@
#include <QAbstractListModel>
#include <QSignalMapper>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
using namespace LearnerProfile;
......@@ -145,8 +144,10 @@ void ProfileModel::onProfileAboutToBeRemoved(int index)
void ProfileModel::emitProfileChanged(int row)
{
reset(); //FIXME very inefficient, but workaround to force new filtering in phrasefiltermodel
// to exclude possible new excluded phrases
beginResetModel();
endResetModel();
//FIXME very inefficient, but workaround to force new filtering in phrasefiltermodel
// to exclude possible new excluded phrases
emit profileChanged(row);
emit dataChanged(index(row, 0), index(row, 0));
}
......
......@@ -26,8 +26,7 @@
#include <QAbstractListModel>
#include <QSignalMapper>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
SkeletonModel::SkeletonModel(QObject *parent)
......
......@@ -23,7 +23,7 @@
#include <QSortFilterProxyModel>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
UnitFilterModel::UnitFilterModel(QObject* parent)
......
......@@ -26,7 +26,7 @@
#include <QAbstractListModel>
#include <QSignalMapper>
#include <KLocale>
#include <KLocalizedString>
#include <QDebug>
UnitModel::UnitModel(QObject *parent)
......
......@@ -25,7 +25,7 @@
#include "core/course.h"
#include "settings.h"
#include <KLocale>
#include <KLocalizedString>
#include <QUuid>
ResourcesDialogPage::ResourcesDialogPage(ResourceManager *m_resourceManager)
......
......@@ -23,7 +23,7 @@
#include "libsound/src/outputdevicecontroller.h"
#include "settings.h"
#include <KLocale>
#include <KLocalizedString>
#include <QStandardPaths>
SoundDeviceDialogPage::SoundDeviceDialogPage()
......
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