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

Enforce Qt-specific keywords

Browse source 
Reviewed by Albert Vaca
This commit is contained in:
Aleix Pol 2016-06-21 20:19:14 +02:00
parent f9406e8afc
commit 49713d8aca
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -29,7 +29,7 @@ include(FeatureSummary)
include(KDEConnectMacros.cmake) include(KDEConnectMacros.cmake)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS)
include(GenerateExportHeader) include(GenerateExportHeader)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})

4
plugins/telepathy/telepathy-cm/connection.h
View file

@ -42,11 +42,11 @@ public:
uint ensureContact(const QString &identifier); uint ensureContact(const QString &identifier);
public slots: public Q_SLOTS:
bool receiveMessage(const QString &sender, const QString &message); bool receiveMessage(const QString &sender, const QString &message);
void setContactList(const QStringList &identifiers); void setContactList(const QStringList &identifiers);
signals: Q_SIGNALS:
void messageReceived(const QString &sender, const QString &message); void messageReceived(const QString &sender, const QString &message);
private: private:

4
plugins/telepathy/telepathy-cm/protocol.h
View file

@ -31,11 +31,11 @@ public:
QString connectionManagerName() const; QString connectionManagerName() const;
void setConnectionManagerName(const QString &newName); void setConnectionManagerName(const QString &newName);
public slots: public Q_SLOTS:
bool sendMessage(QString sender, QString message); bool sendMessage(QString sender, QString message);
void setContactList(QStringList list); void setContactList(QStringList list);
signals: Q_SIGNALS:
void contactsListChanged(QStringList); void contactsListChanged(QStringList);
void messageReceived(QString sender, QString message); void messageReceived(QString sender, QString message);

2
plugins/telephony/sendsmsdialog.cpp
View file

@ -54,7 +54,7 @@ SendSmsDialog::SendSmsDialog(const QString& originalMessage, const QString& phon
void SendSmsDialog::sendButtonClicked() void SendSmsDialog::sendButtonClicked()
{ {
emit sendSms(mPhoneNumber, mTextEdit->toPlainText()); Q_EMIT sendSms(mPhoneNumber, mTextEdit->toPlainText());
close(); close();
} }

2
tests/pluginloadtest.cpp
View file

@ -48,7 +48,7 @@ class PluginLoadTest : public QObject
void testPlugins() { void testPlugins() {
Device* d = nullptr; Device* d = nullptr;
mDaemon->acquireDiscoveryMode("plugintest"); mDaemon->acquireDiscoveryMode("plugintest");
foreach(Device* id, mDaemon->devicesList()) { Q_FOREACH(Device* id, mDaemon->devicesList()) {
if (id->isReachable()) { if (id->isReachable()) {
if (!id->isTrusted()) if (!id->isTrusted())
id->requestPair(); id->requestPair();

2
tests/sendfiletest.cpp
View file

@ -48,7 +48,7 @@ class TestSendFile : public QObject
void testSend() { void testSend() {
mDaemon->acquireDiscoveryMode("test"); mDaemon->acquireDiscoveryMode("test");
Device* d = nullptr; Device* d = nullptr;
foreach(Device* id, mDaemon->devicesList()) { Q_FOREACH(Device* id, mDaemon->devicesList()) {
if (id->isReachable()) { if (id->isReachable()) {
if (!id->isTrusted()) if (!id->isTrusted())
id->requestPair(); id->requestPair();