Commit 7d5558aa authored by Laurent Montel's avatar Laurent Montel 😁

Make it compile with KDEFrameworkCompilerSettings module

parent 1ea6533d
......@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_S
include(ECMInstallIcons)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(FeatureSummary)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets X11Extras Quick QuickWidgets)
......@@ -43,11 +43,7 @@ find_package(XCB
add_definitions(-DTRANSLATION_DOMAIN=\"kcm_sddm\")
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_NO_CAST_FROM_ASCII)
add_definitions(-DQT_NO_CAST_TO_ASCII)
add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
add_definitions(-DQT_USE_QSTRINGBUILDER)
install(FILES kcm_sddm.desktop DESTINATION ${CMAKE_INSTALL_KSERVICES5DIR})
......
......@@ -24,7 +24,7 @@ using namespace KAuth;
class SddmAuthHelper: public QObject
{
Q_OBJECT
public slots:
public Q_SLOTS:
ActionReply save(const QVariantMap &args);
ActionReply installtheme(const QVariantMap &args);
ActionReply uninstalltheme(const QVariantMap &args);
......
......@@ -39,10 +39,10 @@ public:
QVariantMap save();
signals:
Q_SIGNALS:
void changed(bool changed=true);
private slots:
private Q_SLOTS:
void slotUidRangeChanged();
private:
......
......@@ -133,19 +133,19 @@ QString XCursorTheme::findAlternative(const QString &name) const
XcursorImage *XCursorTheme::xcLoadImage(const QString &image, int size) const
{
QByteArray cursorName = QFile::encodeName(image);
QByteArray themeName = QFile::encodeName(name());
const QByteArray cursorName = QFile::encodeName(image);
const QByteArray themeName = QFile::encodeName(name());
return XcursorLibraryLoadImage(cursorName, themeName, size);
return XcursorLibraryLoadImage(cursorName.constData(), themeName.constData(), size);
}
XcursorImages *XCursorTheme::xcLoadImages(const QString &image, int size) const
{
QByteArray cursorName = QFile::encodeName(image);
QByteArray themeName = QFile::encodeName(name());
const QByteArray cursorName = QFile::encodeName(image);
const QByteArray themeName = QFile::encodeName(name());
return XcursorLibraryLoadImages(cursorName, themeName, size);
return XcursorLibraryLoadImages(cursorName.constData(), themeName.constData(), size);
}
......
......@@ -30,7 +30,7 @@ public:
explicit SddmKcm(QWidget *parent, const QVariantList &args);
~SddmKcm() Q_DECL_OVERRIDE;
public slots:
public Q_SLOTS:
void save() Q_DECL_OVERRIDE;
private:
......
......@@ -37,11 +37,11 @@ public:
QVariantMap save();
QString themeConfigPath() const;
signals:
Q_SIGNALS:
void changed(bool);
void themesChanged();
private slots:
private Q_SLOTS:
void themeSelected(const QModelIndex &index);
void backgroundChanged(const QString &imagePath);
void getNewStuffClicked();
......
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