Commit 5fe74ce0 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix minor EBN issues and typos

parent 563dde98
......@@ -420,7 +420,7 @@ void LanLinkProvider::deviceLinkDestroyed(QObject* destroyedDeviceLink)
void LanLinkProvider::configureSslSocket(QSslSocket* socket, const QString& deviceId, bool isDeviceTrusted)
{
// Setting supported ciphers manually
// Top 3 ciphers are for new Android devices, botton two are for old Android devices
// Top 3 ciphers are for new Android devices, bottom two are for old Android devices
// FIXME : These cipher suites should be checked whether they are supported or not on device
QList<QSslCipher> socketCiphers;
socketCiphers.append(QSslCipher(QStringLiteral("ECDHE-ECDSA-AES256-GCM-SHA384")));
......
......@@ -27,7 +27,6 @@
#include <QUdpSocket>
#include <QTimer>
#include <QNetworkSession>
#include <QSslSocket>
#include "kdeconnectcore_export.h"
#include "backends/linkprovider.h"
......
......@@ -80,7 +80,7 @@ Daemon::Daemon(QObject* parent, bool testMode)
#endif
}
//Read remebered paired devices
//Read remembered paired devices
const QStringList& list = KdeConnectConfig::instance()->trustedDevices();
for (const QString& id : list) {
addDevice(new Device(this, id));
......
......@@ -33,7 +33,6 @@
#include <QSettings>
#include <QSslCertificate>
#include <QtCrypto>
#include <QSslCertificate>
#include "core_debug.h"
#include "dbushelper.h"
......@@ -115,7 +114,7 @@ KdeConnectConfig::KdeConnectConfig()
qCDebug(KDECONNECT_CORE) << "My id:" << uuid;
// FIXME: We only use QCA here to generate the cert and key, would be nice to get rid of it completely.
// The same thing we are doing with QCA could be done invoking openssl (altought it's potentially less portable):
// The same thing we are doing with QCA could be done invoking openssl (although it's potentially less portable):
// openssl req -new -x509 -sha256 -newkey rsa:2048 -nodes -keyout privateKey.pem -days 3650 -out certificate.pem -subj "/O=KDE/OU=KDE Connect/CN=_e6e29ad4_2b31_4b6d_8f7a_9872dbaa9095_"
QCA::CertificateOptions certificateOptions = QCA::CertificateOptions();
......
......@@ -97,12 +97,12 @@ void KdeConnectDeclarativePlugin::registerTypes(const char* uri)
qmlRegisterType<RemoteCommandsModel>(uri, 1, 0, "RemoteCommandsModel");
qmlRegisterType<DBusAsyncResponse>(uri, 1, 0, "DBusAsyncResponse");
qmlRegisterType<DevicesSortProxyModel>(uri, 1, 0, "DevicesSortProxyModel");
qmlRegisterUncreatableType<MprisDbusInterface>(uri, 1, 0, "MprisDbusInterface", QStringLiteral("You're not supposed to instantiate interfacess"));
qmlRegisterUncreatableType<LockDeviceDbusInterface>(uri, 1, 0, "LockDeviceDbusInterface", QStringLiteral("You're not supposed to instantiate interfacess"));
qmlRegisterUncreatableType<FindMyPhoneDeviceDbusInterface>(uri, 1, 0, "FindMyPhoneDbusInterface", QStringLiteral("You're not supposed to instantiate interfacess"));
qmlRegisterUncreatableType<RemoteKeyboardDbusInterface>(uri, 1, 0, "RemoteKeyboardDbusInterface", QStringLiteral("You're not supposed to instantiate interfacess"));
qmlRegisterUncreatableType<DeviceDbusInterface>(uri, 1, 0, "DeviceDbusInterface", QStringLiteral("You're not supposed to instantiate interfacess"));
qmlRegisterUncreatableType<DeviceDbusInterface>(uri, 1, 0, "RemoteCommandsDbusInterface", QStringLiteral("You're not supposed to instantiate interfacess"));
qmlRegisterUncreatableType<MprisDbusInterface>(uri, 1, 0, "MprisDbusInterface", QStringLiteral("You're not supposed to instantiate interfaces"));
qmlRegisterUncreatableType<LockDeviceDbusInterface>(uri, 1, 0, "LockDeviceDbusInterface", QStringLiteral("You're not supposed to instantiate interfaces"));
qmlRegisterUncreatableType<FindMyPhoneDeviceDbusInterface>(uri, 1, 0, "FindMyPhoneDbusInterface", QStringLiteral("You're not supposed to instantiate interfaces"));
qmlRegisterUncreatableType<RemoteKeyboardDbusInterface>(uri, 1, 0, "RemoteKeyboardDbusInterface", QStringLiteral("You're not supposed to instantiate interfaces"));
qmlRegisterUncreatableType<DeviceDbusInterface>(uri, 1, 0, "DeviceDbusInterface", QStringLiteral("You're not supposed to instantiate interfaces"));
qmlRegisterUncreatableType<DeviceDbusInterface>(uri, 1, 0, "RemoteCommandsDbusInterface", QStringLiteral("You're not supposed to instantiate interfaces"));
qmlRegisterSingletonType<DaemonDbusInterface>(uri, 1, 0, "DaemonDbusInterface",
[](QQmlEngine*, QJSEngine*) -> QObject* {
return new DaemonDbusInterface;
......
......@@ -17,7 +17,7 @@ public:
static DBusResponseWaiter* instance();
///extract QDbusPendingCall from \p variant and blocks untill completed
///extract QDbusPendingCall from \p variant and blocks until completed
Q_INVOKABLE QVariant waitForReply(QVariant variant) const;
const QDBusPendingCall* extractPendingCall(QVariant& variant) const;
......
......@@ -23,7 +23,7 @@
#include "modeltest.h"
#include <QtGui/QtGui>
#include <QtGui>
Q_DECLARE_METATYPE(QModelIndex)
......
......@@ -24,9 +24,9 @@
#ifndef MODELTEST_H
#define MODELTEST_H
#include <QtCore/QObject>
#include <QtCore/QAbstractItemModel>
#include <QtCore/QStack>
#include <QObject>
#include <QAbstractItemModel>
#include <QStack>
class ModelTest : public QObject
{
......
......@@ -21,7 +21,7 @@
#include "kiokdeconnect.h"
#include <QtCore/QThread>
#include <QThread>
#include <QDBusMetaType>
#include <KLocalizedString>
......
......@@ -46,7 +46,7 @@ QtObject {
var transEvent = JSON.parse(JSON.stringify(event)); // transform to anonymous object
if (transEvent.modifiers & Qt.ControlModifier) {
// special handling for ctrl+c/v/x/a, for which only 'key' gets
// set, but no visbile 'text', which is expected by the remoteKeyboard
// set, but no visible 'text', which is expected by the remoteKeyboard
// wire-format:
if (transEvent.key === Qt.Key_C)
transEvent.text = 'c';
......
......@@ -8,4 +8,4 @@ target_link_libraries(kdeconnect_contacts
kdeconnectcore
Qt5::DBus
KF5::I18n
)
\ No newline at end of file
)
......@@ -162,7 +162,7 @@ void Notification::applyIcon()
void Notification::applyNoIcon()
{
//HACK The only way to display no icon at all is trying to load a non-existant icon
//HACK The only way to display no icon at all is trying to load a non-existent icon
m_notification->setIconName(QStringLiteral("not_a_real_icon"));
}
......
......@@ -160,7 +160,7 @@ void NotificationsDbusInterface::dismissRequested(const QString& internalId)
np.set<QString>(QStringLiteral("cancel"), internalId);
m_plugin->sendPacket(np);
//Workaround: we erase notifications without waiting a repsonse from the
//Workaround: we erase notifications without waiting a response from the
//phone because we won't receive a response if we are out of sync and this
//notification no longer exists. Ideally, each time we reach the phone
//after some time disconnected we should re-sync all the notifications.
......
......@@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusArgument>
#include <QDBusConnection>
#include <QDBusInterface>
#include <QDBusArgument>
#include <QtDebug>
#include <QLoggingCategory>
#include <QStandardPaths>
......
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtDBus/QDBusAbstractAdaptor>
#include <QtDBus/QDBusArgument>
#include <QDBusAbstractAdaptor>
#include <QDBusArgument>
#include <core/device.h>
#include <QBuffer>
#include <QFile>
......
......@@ -53,7 +53,7 @@ public Q_SLOTS:
Q_SCRIPTABLE bool startBrowsing();
Q_SCRIPTABLE QString mountPoint();
Q_SCRIPTABLE QVariantMap getDirectories(); //Actually a QMap<String, String>, but QDBus preffers this
Q_SCRIPTABLE QVariantMap getDirectories(); //Actually a QMap<String, String>, but QDBus prefers this
private Q_SLOTS:
void onMounted();
......@@ -70,7 +70,7 @@ private:
QScopedPointer<Pimpl> d;
QString deviceId; //Storing it to avoid accessing device() from the destructor which could cause a crash
QVariantMap remoteDirectories; //Actually a QMap<String, String>, but QDBus preffers this
QVariantMap remoteDirectories; //Actually a QMap<String, String>, but QDBus prefers this
};
......
......@@ -60,7 +60,7 @@ void ConversationListModel::setDeviceId(const QString& deviceId)
m_deviceId = deviceId;
m_conversationsInterface = new DeviceConversationsDbusInterface(deviceId, this);
connect(m_conversationsInterface, SIGNAL(conversationCreated(QString)), this, SLOT(handleCreatedConversation(QString)));
connect(m_conversationsInterface, SIGNAL(conversationMessageReceived(QVariantMap, int)), this, SLOT(createRowFromMessage(QVariantMap, int)));
connect(m_conversationsInterface, SIGNAL(conversationMessageReceived(QVariantMap,int)), this, SLOT(createRowFromMessage(QVariantMap,int)));
prepareConversationsList();
m_conversationsInterface->requestAllConversationThreads();
......
......@@ -66,7 +66,7 @@ void ConversationModel::setDeviceId(const QString& deviceId)
m_deviceId = deviceId;
m_conversationsInterface = new DeviceConversationsDbusInterface(deviceId, this);
connect(m_conversationsInterface, SIGNAL(conversationMessageReceived(QVariantMap, int)), this, SLOT(createRowFromMessage(QVariantMap, int)));
connect(m_conversationsInterface, SIGNAL(conversationMessageReceived(QVariantMap,int)), this, SLOT(createRowFromMessage(QVariantMap,int)));
connect(m_conversationsInterface, SIGNAL(conversationUpdated(QVariantMap)), this, SLOT(handleConversationUpdate(QVariantMap)));
}
......
......@@ -178,7 +178,7 @@ void LanLinkProviderTest::pairedDeviceUdpPacketReceived()
QByteArray receivedPacket = m_reader->readLine();
testIdentityPacket(receivedPacket);
// Received identiy packet from LanLinkProvider now start ssl
// Received identity packet from LanLinkProvider now start ssl
QSignalSpy spy3(serverSocket, SIGNAL(encrypted()));
QVERIFY(connect(serverSocket, static_cast<void(QAbstractSocket::*)(QAbstractSocket::SocketError)>(&QSslSocket::error),
......
......@@ -371,7 +371,7 @@ void TestNotificationListener::testNotify()
QCOMPARE(++proxiedNotifications, d->getSentPackets());
QVERIFY(d->getLastPacket()->hasPayload());
QCOMPARE(d->getLastPacket()->payloadSize(), fi.size());
// works also with abolute paths
// works also with absolute paths
retId = listener->Notify(appName, replacesId, iconName, summary, body, {}, {{}}, 0);
QCOMPARE(retId, replacesId);
QCOMPARE(++proxiedNotifications, d->getSentPackets());
......
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