Commit 52af3fdb authored by Martin Tobias Holmedahl Sandsmark's avatar Martin Tobias Holmedahl Sandsmark
Browse files

Fix build

parent b265047c
......@@ -26,9 +26,10 @@
#include <QDebug>
#include <KDesktopFile>
#include <KGlobal>
#include <KStandardDirs>
#include <QStandardPaths>
#include <KSharedConfig>
GlobalSettingsWidget::GlobalSettingsWidget( QWidget *parent )
......
......@@ -51,8 +51,8 @@ EditGestureDialog::EditGestureDialog(const KHotKeys::StrokePoints &pointData, QW
setLayout(layout);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accepted);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::rejected);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
connect(&_recorder, SIGNAL(recorded(KHotKeys::StrokePoints)),
SLOT(recorded(KHotKeys::StrokePoints)));
}
......
......@@ -60,7 +60,6 @@ void GestureRecorder::mouseReleaseEvent(QMouseEvent *ev)
}
}
void GestureRecorder::mouseMoveEvent(QMouseEvent *ev)
{
if (_mouseButtonDown)
......@@ -70,5 +69,8 @@ void GestureRecorder::mouseMoveEvent(QMouseEvent *ev)
}
}
void GestureRecorder::paintEvent(QPaintEvent *ev)
{
}
#include "moc_gesture_recorder.cpp"
......@@ -40,6 +40,7 @@ class GestureRecorder : public QFrame
void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE;
void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE;
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
Q_SIGNALS:
......
......@@ -111,8 +111,8 @@ public:
layout()->addWidget(buttonBox);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accepted);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::rejected);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
......
......@@ -102,8 +102,8 @@ public:
layout()->addWidget(buttonBox);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accepted);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::rejected);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
......
......@@ -48,8 +48,8 @@ KHotkeysExportDialog::KHotkeysExportDialog(QWidget *parent)
layout()->addWidget(buttonBox);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accepted);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::rejected);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
......
......@@ -31,6 +31,7 @@
#include <KStandardDirs>
#include <QApplication>
#include <QStandardPaths>
namespace KHotKeys
{
......@@ -504,7 +505,7 @@ bool Settings::read_settings(ActionDataGroup *root, KConfigBase const &config, b
bool Settings::update()
{
QStringList updates(KGlobal::dirs()->findAllResources("data", "khotkeys/*.khotkeys"));
QStringList updates(QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "khotkeys/*.khotkeys"));
bool imported(false);
Q_FOREACH (const QString &path, updates)
......
......@@ -46,7 +46,7 @@
#include <KConfigGroup>
#include <QDebug>
#include <kstandarddirs.h>
namespace KHotKeys {
......
......@@ -79,7 +79,7 @@ void WindowTrigger::accept(TriggerVisitor& visitor)
void WindowTrigger::init()
{
qDebug() << "WindowTrigger::init()";
disconnect(windows_handler, 0, this, 0);
disconnect(windows_handler, nullptr, this, nullptr);
connect( windows_handler, SIGNAL(window_added(WId)), this, SLOT(window_added(WId)));
connect( windows_handler, SIGNAL(window_removed(WId)), this, SLOT(window_removed(WId)));
if( window_actions & ( WINDOW_ACTIVATES | WINDOW_DEACTIVATES /*| WINDOW_DISAPPEARS*/ ))
......
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