tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix various krazy2 warnings

Browse source 
Fix following krazy2 warning types:
[explicit], [endswithnewline], [doublequote_chars], [includes], [normalize],
[postfixop], [spelling]

See http://ebn.kde.org/krazy/reports/playground/base/kdeconnect-kde/index.html
for details.

SLOT/SIGNAL normalization done with Qt normalize utility:
https://github.com/qtproject/qtrepotools/tree/master/util/normalize

REVIEW: 124857
This commit is contained in:
Boris Egorov 2015-08-21 22:38:54 +06:00
parent ce354aae44
commit 1924173df2
31 changed files with 67 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/backends/lan/lanlinkprovider.cpp
View file

@ -223,7 +223,7 @@ void LanLinkProvider::newConnection()
configureSocket(socket);
//This socket is still managed by us (and child of the QTcpServer), if
//it disconnects before we manage to pass it to a LanDeviceLink, it's
//our responsability to delete it. We do so with this connection.
//our responsibility to delete it. We do so with this connection.
connect(socket, SIGNAL(disconnected()),
socket, SLOT(deleteLater()));
connect(socket, SIGNAL(readyRead()),

2
core/backends/lan/socketlinereader.h
View file

@ -37,7 +37,7 @@ class SocketLineReader
Q_OBJECT
public:
SocketLineReader(QTcpSocket* socket, QObject* parent = 0);
explicit SocketLineReader(QTcpSocket* socket, QObject* parent = 0);
QByteArray readLine() { return mPackages.dequeue(); }
qint64 write(const QByteArray& data) { return mSocket->write(data); }

3
core/backends/lan/uploadjob.cpp
View file

@ -18,10 +18,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "uploadjob.h"
#include <qalgorithms.h>
#include <QtGlobal>
#include "uploadjob.h"
#include "core_debug.h"
UploadJob::UploadJob(const QSharedPointer<QIODevice>& source): KJob()

2
core/backends/lan/uploadjob.h
View file

@ -34,7 +34,7 @@ class UploadJob
{
Q_OBJECT
public:
UploadJob(const QSharedPointer<QIODevice>& source);
explicit UploadJob(const QSharedPointer<QIODevice>& source);
virtual void start();
QVariantMap getTransferInfo();

2
core/core_debug.h
View file

@ -25,4 +25,4 @@
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_CORE)
#endif //CORE_DEBUG_H
#endif //CORE_DEBUG_H

5
core/daemon.cpp
View file

@ -31,7 +31,6 @@
#include "backends/lan/lanlinkprovider.h"
#include "backends/loopback/loopbacklinkprovider.h"
#include "device.h"
#include "networkpackage.h"
#include "backends/devicelink.h"
#include "backends/linkprovider.h"
@ -77,8 +76,8 @@ Daemon::Daemon(QObject *parent)
//Listen to new devices
Q_FOREACH (LinkProvider* a, d->mLinkProviders) {
connect(a, SIGNAL(onConnectionReceived(NetworkPackage, DeviceLink*)),
this, SLOT(onNewDeviceLink(NetworkPackage, DeviceLink*)));
connect(a, SIGNAL(onConnectionReceived(NetworkPackage,DeviceLink*)),
this, SLOT(onNewDeviceLink(NetworkPackage,DeviceLink*)));
}
setDiscoveryEnabled(true);

2
core/daemon.h
View file

@ -39,7 +39,7 @@ class KDECONNECTCORE_EXPORT Daemon
Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.daemon")
public:
Daemon(QObject *parent);
explicit Daemon(QObject *parent);
~Daemon();
public Q_SLOTS:

2
core/dbushelper.cpp
View file

@ -30,4 +30,4 @@ void filterNonExportableCharacters(QString& s)
s.replace(regexp,"_");
}
}
}

2
core/dbushelper.h
View file

@ -26,4 +26,4 @@ namespace DbusHelper {
void filterNonExportableCharacters(QString& s);
}
#endif
#endif

4
core/device.cpp
View file

@ -140,7 +140,7 @@ void Device::reloadPlugins()
//If we don't find intersection with the received on one end and the sent on the other, we don't
//let the plugin stay
//Also, if no capabilities are specified on the other end, we don't apply this optimizaton, as
//we asume that the other client doesn't know about capabilities.
//we assume that the other client doesn't know about capabilities.
if (!m_incomingCapabilities.isEmpty() && !m_outgoingCapabilities.isEmpty()
&& (m_incomingCapabilities & outgoingInterfaces.toSet()).isEmpty()
&& (m_outgoingCapabilities & incomingInterfaces.toSet()).isEmpty()
@ -512,7 +512,7 @@ QString Device::iconForStatus(bool reachable, bool paired) const
QString status = (reachable? (paired? QStringLiteral("connected") : QStringLiteral("disconnected")) : QStringLiteral("trusted"));
QString type = type2str(deviceType);
return type+"-"+status;
return type+'-'+status;
}
void Device::setName(const QString &name)

3
core/kdeconnectconfig.cpp
View file

@ -27,7 +27,6 @@
#include <QDebug>
#include <QFileInfo>
#include <QUuid>
#include <QDebug>
#include <QDir>
#include <QStandardPaths>
#include <QCoreApplication>
@ -114,7 +113,7 @@ KdeConnectConfig::KdeConnectConfig()
QString KdeConnectConfig::name()
{
QString defaultName = qgetenv("USER") + "@" + QHostInfo::localHostName();
QString defaultName = qgetenv("USER") + '@' + QHostInfo::localHostName();
d->config->beginGroup("myself");
QString name = d->config->value("name", defaultName).toString();
d->config->endGroup();

2
core/networkpackage.h
View file

@ -52,7 +52,7 @@ public:
const static QCA::EncryptionAlgorithm EncryptionAlgorithm;
const static int ProtocolVersion;
NetworkPackage(const QString& type);
explicit NetworkPackage(const QString& type);
static void createIdentityPackage(NetworkPackage*);

16
interfaces/dbusinterfaces.h
View file

@ -42,7 +42,7 @@ class KDECONNECTINTERFACES_EXPORT DaemonDbusInterface
{
Q_OBJECT
public:
DaemonDbusInterface(QObject* parent = 0);
explicit DaemonDbusInterface(QObject* parent = 0);
virtual ~DaemonDbusInterface();
static QString activatedService();
@ -57,7 +57,7 @@ class KDECONNECTINTERFACES_EXPORT DeviceDbusInterface
Q_PROPERTY(bool isPaired READ isPaired NOTIFY pairingChangedProxy)
public:
DeviceDbusInterface(const QString& deviceId, QObject* parent = 0);
explicit DeviceDbusInterface(const QString& deviceId, QObject* parent = 0);
virtual ~DeviceDbusInterface();
Q_SCRIPTABLE QString id() const;
@ -75,7 +75,7 @@ class KDECONNECTINTERFACES_EXPORT DeviceBatteryDbusInterface
{
Q_OBJECT
public:
DeviceBatteryDbusInterface(const QString& deviceId, QObject* parent = 0);
explicit DeviceBatteryDbusInterface(const QString& deviceId, QObject* parent = 0);
virtual ~DeviceBatteryDbusInterface();
};
@ -84,7 +84,7 @@ class KDECONNECTINTERFACES_EXPORT DeviceNotificationsDbusInterface
{
Q_OBJECT
public:
DeviceNotificationsDbusInterface(const QString& deviceId, QObject* parent = 0);
explicit DeviceNotificationsDbusInterface(const QString& deviceId, QObject* parent = 0);
virtual ~DeviceNotificationsDbusInterface();
};
@ -102,7 +102,7 @@ class KDECONNECTINTERFACES_EXPORT SftpDbusInterface
{
Q_OBJECT
public:
SftpDbusInterface(const QString& deviceId, QObject* parent = 0);
explicit SftpDbusInterface(const QString& deviceId, QObject* parent = 0);
virtual ~SftpDbusInterface();
};
@ -119,7 +119,7 @@ class KDECONNECTINTERFACES_EXPORT MprisDbusInterface
Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY propertiesChangedProxy)
Q_PROPERTY(int position READ position WRITE setPosition NOTIFY propertiesChangedProxy)
public:
MprisDbusInterface(const QString& deviceId, QObject* parent = 0);
explicit MprisDbusInterface(const QString& deviceId, QObject* parent = 0);
virtual ~MprisDbusInterface();
Q_SIGNALS:
@ -131,7 +131,7 @@ class KDECONNECTINTERFACES_EXPORT RemoteControlDbusInterface
{
Q_OBJECT
public:
RemoteControlDbusInterface(const QString& deviceId, QObject* parent = 0);
explicit RemoteControlDbusInterface(const QString& deviceId, QObject* parent = 0);
~RemoteControlDbusInterface() override;
};
@ -141,7 +141,7 @@ class KDECONNECTINTERFACES_EXPORT LockDeviceDbusInterface
Q_OBJECT
Q_PROPERTY(bool isLocked READ isLocked WRITE setIsLocked NOTIFY lockedChangedProxy)
public:
LockDeviceDbusInterface(const QString& deviceId, QObject* parent = 0);
explicit LockDeviceDbusInterface(const QString& deviceId, QObject* parent = 0);
virtual ~LockDeviceDbusInterface();
Q_SIGNALS:

4
interfaces/devicesmodel.cpp
View file

@ -42,9 +42,9 @@ DevicesModel::DevicesModel(QObject *parent)
//new ModelTest(this, this);
connect(this, SIGNAL(rowsRemoved(QModelIndex, int, int)),
connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SIGNAL(rowsChanged()));
connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)),
connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SIGNAL(rowsChanged()));
connect(m_dbusInterface, SIGNAL(deviceAdded(QString)),

2
interfaces/devicesmodel.h
View file

@ -57,7 +57,7 @@ public:
Q_FLAGS(StatusFilterFlags)
Q_ENUMS(StatusFilterFlag)
DevicesModel(QObject *parent = 0);
explicit DevicesModel(QObject *parent = 0);
virtual ~DevicesModel();
void setDisplayFilter(int flags);

2
interfaces/devicessortproxymodel.h
View file

@ -30,7 +30,7 @@ class KDECONNECTINTERFACES_EXPORT DevicesSortProxyModel : public QSortFilterProx
{
Q_OBJECT
public:
DevicesSortProxyModel(DevicesModel* devicesModel = Q_NULLPTR);
explicit DevicesSortProxyModel(DevicesModel* devicesModel = Q_NULLPTR);
virtual bool lessThan(const QModelIndex& left, const QModelIndex& right) const;
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
virtual void setSourceModel(QAbstractItemModel *sourceModel);

2
interfaces/interfaces_debug.h
View file

@ -25,4 +25,4 @@
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_INTERFACES)
#endif //KDECONNECT_INTERFACE_DEBUG_H
#endif //KDECONNECT_INTERFACE_DEBUG_H

46
interfaces/modeltest.cpp
View file

@ -21,10 +21,10 @@
**
****************************************************************************/
#include <QtGui/QtGui>
#include "modeltest.h"
#include <QtGui/QtGui>
Q_DECLARE_METATYPE(QModelIndex)
/*!
@ -34,28 +34,28 @@ ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(pare
{
Q_ASSERT(model);
connect(model, SIGNAL(columnsAboutToBeInserted(const QModelIndex &, int, int)),
connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)),
connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(columnsInserted(const QModelIndex &, int, int)),
connect(model, SIGNAL(columnsInserted(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(columnsRemoved(const QModelIndex &, int, int)),
connect(model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(headerDataChanged(Qt::Orientation, int, int)),
connect(model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(layoutAboutToBeChanged ()), this, SLOT(runAllTests()));
connect(model, SIGNAL(layoutChanged ()), this, SLOT(runAllTests()));
connect(model, SIGNAL(modelReset ()), this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
connect(model, SIGNAL(layoutAboutToBeChanged()), this, SLOT(runAllTests()));
connect(model, SIGNAL(layoutChanged()), this, SLOT(runAllTests()));
connect(model, SIGNAL(modelReset()), this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SLOT(runAllTests()));
// Special checks for inserting/removing
@ -64,14 +64,14 @@ ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(pare
connect(model, SIGNAL(layoutChanged()),
this, SLOT(layoutChanged()));
connect(model, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
this, SLOT(rowsAboutToBeInserted(const QModelIndex &, int, int)));
connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int)));
connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
this, SLOT(rowsInserted(const QModelIndex &, int, int)));
connect(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
this, SLOT(rowsRemoved(const QModelIndex &, int, int)));
connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int)));
connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(rowsInserted(QModelIndex,int,int)));
connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SLOT(rowsRemoved(QModelIndex,int,int)));
runAllTests();
}

2
interfaces/modeltest.h
View file

@ -33,7 +33,7 @@ class ModelTest : public QObject
Q_OBJECT
public:
ModelTest(QAbstractItemModel *model, QObject *parent = 0);
explicit ModelTest(QAbstractItemModel *model, QObject *parent = 0);
private Q_SLOTS:
void nonDestructiveBasicTest();

6
interfaces/notificationsmodel.cpp
View file

@ -37,12 +37,12 @@ NotificationsModel::NotificationsModel(QObject* parent)
//new ModelTest(this, this);
connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)),
connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SIGNAL(rowsChanged()));
connect(this, SIGNAL(rowsRemoved(QModelIndex, int, int)),
connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SIGNAL(rowsChanged()));
connect(this, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
connect(this, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SIGNAL(anyDismissableChanged()));

2
interfaces/notificationsmodel.h
View file

@ -47,7 +47,7 @@ public:
DbusInterfaceRole,
};
NotificationsModel(QObject* parent = 0);
explicit NotificationsModel(QObject* parent = 0);
virtual ~NotificationsModel();
QString deviceId() const;

4
kio/kiokdeconnect.cpp
View file

@ -143,7 +143,7 @@ void KioKdeconnect::listDevice()
QVariantMap urls = urlreply.value();
for (QVariantMap::iterator it = urls.begin(); it != urls.end(); it++) {
for (QVariantMap::iterator it = urls.begin(); it != urls.end(); ++it) {
QString path = it.key();
QString name = it.value().toString();
@ -170,7 +170,7 @@ void KioKdeconnect::listDir(const QUrl &url)
{
qCDebug(KDECONNECT_KIO) << "Listing..." << url;
/// Url is not used here becuase all we could care about the url is the host, and that's already
/// Url is not used here because all we could care about the url is the host, and that's already
/// handled in @p setHost
Q_UNUSED(url);

2
plasmoid/declarativeplugin/processrunner.h
View file

@ -27,7 +27,7 @@ class ProcessRunner : public QObject
Q_OBJECT
public:
ProcessRunner(QObject *parent = 0);
explicit ProcessRunner(QObject *parent = 0);
~ProcessRunner();
Q_INVOKABLE void runKdeconnectKCM();

3
plasmoid/declarativeplugin/responsewaiter.cpp
View file

@ -1,11 +1,10 @@
#include "responsewaiter.h"
#include <QDBusPendingCall>
#include <QDBusPendingReply>
#include <QDebug>
#include <QCoreApplication>
#include "responsewaiter.h"
Q_DECLARE_METATYPE(QDBusPendingReply<>)
Q_DECLARE_METATYPE(QDBusPendingReply<QVariant>)
Q_DECLARE_METATYPE(QDBusPendingReply<bool>)

2
plasmoid/declarativeplugin/responsewaiter.h
View file

@ -36,7 +36,7 @@ class DBusAsyncResponse : public QObject
Q_PROPERTY(bool autoDelete READ autodelete WRITE setAutodelete)
public:
DBusAsyncResponse(QObject* parent = 0);
explicit DBusAsyncResponse(QObject* parent = 0);
virtual ~DBusAsyncResponse() {};
Q_INVOKABLE void setPendingCall(QVariant e);

2
plugins/mpriscontrol/mpriscontrolplugin.cpp
View file

@ -67,7 +67,7 @@ void MprisControlPlugin::addPlayer(const QString& service)
sendPlayerList();
OrgFreedesktopDBusPropertiesInterface* freedesktopInterface = new OrgFreedesktopDBusPropertiesInterface(service, "/org/mpris/MediaPlayer2", QDBusConnection::sessionBus(), this);
connect(freedesktopInterface, SIGNAL(PropertiesChanged(QString, QVariantMap, QStringList)), this, SLOT(propertiesChanged(QString, QVariantMap)));
connect(freedesktopInterface, SIGNAL(PropertiesChanged(QString,QVariantMap,QStringList)), this, SLOT(propertiesChanged(QString,QVariantMap)));
OrgMprisMediaPlayer2PlayerInterface* mprisInterface0 = new OrgMprisMediaPlayer2PlayerInterface(service, "/org/mpris/MediaPlayer2", QDBusConnection::sessionBus());
connect(mprisInterface0, SIGNAL(Seeked(qlonglong)), this, SLOT(seeked(qlonglong)));

2
plugins/notifications/notification_debug.h
View file

@ -25,4 +25,4 @@
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_NOTIFICATION)
#endif //NOTIFICATION_DEBUG_H
#endif //NOTIFICATION_DEBUG_H

2
plugins/sftp/mounter.cpp
View file

@ -107,7 +107,7 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
const QString program = "sshfs";
QString path;
if (np.has("multiPaths")) path = "/";
if (np.has("multiPaths")) path = '/';
else path = np.get<QString>("path");
const QStringList arguments = QStringList()

2
plugins/sftp/sftp_debug.h
View file

@ -25,4 +25,4 @@
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_SFTP)
#endif //SFTP_DEBUG_H
#endif //SFTP_DEBUG_H

2
plugins/share/autoclosingqfile.h
View file

@ -28,7 +28,7 @@ class AutoClosingQFile : public QFile
Q_OBJECT
public:
AutoClosingQFile(const QString &name);
explicit AutoClosingQFile(const QString &name);
qint64 readData(char* data, qint64 maxlen) Q_DECL_OVERRIDE {
qint64 read = QFile::readData(data, maxlen);
if (read == -1 || read == bytesAvailable()) {

2
plugins/share/share_debug.h
View file

@ -25,4 +25,4 @@
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_SHARE)
#endif //SHARE_DEBUG_H
#endif //SHARE_DEBUG_H