← Back to branch summary

~gerboland/qtubuntu/devicePixelRatio

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/clipboard.cpp

  • Committer: CI Train Bot
  • Author(s): Albert Astals Cid
  • Date: 2015-11-17 14:49:30 UTC
  • mfrom: (280.5.3 clazy_run)
  • Revision ID: ci-train-bot@canonical.com-20151117144930-26q44qd460f3uowg
Improvements from running clazy over the code

* Add some missing overrides
* Wrap const char * into QStringLiteral
* Use new connect syntax
* Don't call data() on temporary QByteArray as it detaches

clazy: https://quickgit.kde.org/?p=clazy.git
Approved by: PS Jenkins bot, Gerry Boland

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/clipboard.cpp
66
66
    if (!mPendingGetContentsCall.isNull())
67
67
        return;
68
68
 
69
 
    QDBusPendingCall pendingCall = mDBusClipboard->asyncCall("GetContents");
 
69
    QDBusPendingCall pendingCall = mDBusClipboard->asyncCall(QStringLiteral("GetContents"));
70
70
 
71
71
    mPendingGetContentsCall = new QDBusPendingCallWatcher(pendingCall, this);
72
72
 
73
 
    QObject::connect(mPendingGetContentsCall.data(), SIGNAL(finished(QDBusPendingCallWatcher*)),
74
 
                     this, SLOT(onDBusClipboardGetContentsFinished(QDBusPendingCallWatcher*)));
 
73
    QObject::connect(mPendingGetContentsCall.data(), &QDBusPendingCallWatcher::finished,
 
74
                     this, &UbuntuClipboard::onDBusClipboardGetContentsFinished);
75
75
}
76
76
 
77
77
void UbuntuClipboard::onDBusClipboardGetContentsFinished(QDBusPendingCallWatcher* call)
122
122
    QDBusConnection dbusConnection = QDBusConnection::sessionBus();
123
123
 
124
124
    bool ok = dbusConnection.connect(
125
 
            "com.canonical.QtMir",
126
 
            "/com/canonical/QtMir/Clipboard",
127
 
            "com.canonical.QtMir.Clipboard",
128
 
            "ContentsChanged",
 
125
            QStringLiteral("com.canonical.QtMir"),
 
126
            QStringLiteral("/com/canonical/QtMir/Clipboard"),
 
127
            QStringLiteral("com.canonical.QtMir.Clipboard"),
 
128
            QStringLiteral("ContentsChanged"),
129
129
            this, SLOT(updateMimeData(QByteArray)));
130
130
    if (!ok) {
131
131
        qCritical("UbuntuClipboard - Failed to connect to ContentsChanged signal form the D-Bus system clipboard.");
132
132
    }
133
133
 
134
 
    mDBusClipboard = new QDBusInterface("com.canonical.QtMir",
135
 
            "/com/canonical/QtMir/Clipboard",
136
 
            "com.canonical.QtMir.Clipboard",
 
134
    mDBusClipboard = new QDBusInterface(QStringLiteral("com.canonical.QtMir"),
 
135
            QStringLiteral("/com/canonical/QtMir/Clipboard"),
 
136
            QStringLiteral("com.canonical.QtMir.Clipboard"),
137
137
            dbusConnection);
138
138
 
139
139
    mDBusSetupDone = true;
161
161
            int offset = headerSize;
162
162
            header[0] = formatCount;
163
163
            for (int i = 0; i < formatCount; i++) {
 
164
                const QByteArray data = mimeData->data(formats[i]);
164
165
                const int formatOffset = offset;
165
166
                const int formatSize = formats[i].size();
166
167
                const int dataOffset = offset + formatSize;
167
 
                const int dataSize = mimeData->data(formats[i]).size();
 
168
                const int dataSize = data.size();
168
169
                memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
169
 
                memcpy(&buffer[dataOffset], mimeData->data(formats[i]).data(), dataSize);
 
170
                memcpy(&buffer[dataOffset], data.data(), dataSize);
170
171
                header[i*4+1] = formatOffset;
171
172
                header[i*4+2] = formatSize;
172
173
                header[i*4+3] = dataOffset;
283
284
        delete mPendingSetContentsCall.data();
284
285
    }
285
286
 
286
 
    QDBusPendingCall pendingCall = mDBusClipboard->asyncCall("SetContents", clipboardContents);
 
287
    QDBusPendingCall pendingCall = mDBusClipboard->asyncCall(QStringLiteral("SetContents"), clipboardContents);
287
288
 
288
289
    mPendingSetContentsCall = new QDBusPendingCallWatcher(pendingCall, this);
289
290
 
290
 
    QObject::connect(mPendingSetContentsCall.data(), SIGNAL(finished(QDBusPendingCallWatcher*)),
291
 
                     this, SLOT(onDBusClipboardSetContentsFinished(QDBusPendingCallWatcher*)));
 
291
    QObject::connect(mPendingSetContentsCall.data(), &QDBusPendingCallWatcher::finished,
 
292
                     this, &UbuntuClipboard::onDBusClipboardSetContentsFinished);
292
293
}