Skip to content

Commit 55ea667

Browse files
TheOneRingTheOneRing
committed
Rename
1 parent a756930 commit 55ea667

File tree

7 files changed

+45
-47
lines changed

7 files changed

+45
-47
lines changed

‎src/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#---HELPER---
2-
add_library(openclouddolphinpluginhelper SHARED ownclouddolphinpluginhelper.cpp ownclouddolphinpluginhelper.h)
2+
add_library(openclouddolphinpluginhelper SHARED dolphinpluginhelper.cpp dolphinpluginhelper.h)
33
generate_export_header(openclouddolphinpluginhelper BASE_NAME openclouddolphinpluginhelper)
44
target_link_libraries(openclouddolphinpluginhelper Qt6::Core Qt6::Network Qt6::Gui)
55
target_compile_definitions(openclouddolphinpluginhelper PRIVATE QT_USE_QSTRINGBUILDER)
66

77

88
#---OVERLAY PLUGIN---
99
kcoreaddons_add_plugin(openclouddolphinoverlayplugin INSTALL_NAMESPACE "kf6/overlayicon"
10-
SOURCES ownclouddolphinoverlayplugin.cpp)
10+
SOURCES dolphinoverlayplugin.cpp)
1111
target_link_libraries(openclouddolphinoverlayplugin KF6::CoreAddons KF6::KIOCore KF6::KIOWidgets openclouddolphinpluginhelper)
1212

1313
#---ACTION PLUGIN---
14-
kcoreaddons_add_plugin(openclouddolphinactionplugin SOURCES ownclouddolphinactionplugin.cpp INSTALL_NAMESPACE "kf6/kfileitemaction")
14+
kcoreaddons_add_plugin(openclouddolphinactionplugin SOURCES dolphinactionplugin.cpp INSTALL_NAMESPACE "kf6/kfileitemaction")
1515
target_link_libraries(openclouddolphinactionplugin KF6::CoreAddons KF6::KIOCore KF6::KIOWidgets openclouddolphinpluginhelper)
1616

1717
install(TARGETS openclouddolphinpluginhelper LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

src/ownclouddolphinactionplugin.cpp renamed to src/dolphinactionplugin.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@
2929
#include <QTimer>
3030
#include <QEventLoop>
3131

32-
#include "ownclouddolphinpluginhelper.h"
33-
#include "ownclouddolphinactionplugin.h"
32+
#include "dolphinpluginhelper.h"
33+
#include "dolphinactionplugin.h"
3434

3535

36-
K_PLUGIN_CLASS_WITH_JSON(OwncloudDolphinPluginAction, "ownclouddolphinactionplugin.json")
36+
K_PLUGIN_CLASS_WITH_JSON(OpenCloudDolphinPluginAction, "dolphinactionplugin.json")
3737

38-
OwncloudDolphinPluginAction::OwncloudDolphinPluginAction(QObject* parent, const QList<QVariant>&)
38+
OpenCloudDolphinPluginAction::OpenCloudDolphinPluginAction(QObject* parent, const QList<QVariant>&)
3939
: KAbstractFileItemActionPlugin(parent)
4040
{
4141

4242
}
4343

44-
QList<QAction*> OwncloudDolphinPluginAction::actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget)
44+
QList<QAction*> OpenCloudDolphinPluginAction::actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget)
4545
{
46-
auto helper = OwncloudDolphinPluginHelper::instance();
46+
auto helper = OpenCloudDolphinPluginHelper::instance();
4747
if (!helper->isConnected() || !fileItemInfos.isLocal())
4848
return {};
4949

@@ -70,7 +70,7 @@ QList<QAction*> OwncloudDolphinPluginAction::actions(const KFileItemListProperti
7070

7171
auto menu = new QMenu(parentWidget);
7272
QEventLoop loop;
73-
auto con = connect(helper, &OwncloudDolphinPluginHelper::commandReceived, this, [&](const QByteArray &cmd) {
73+
auto con = connect(helper, &OpenCloudDolphinPluginHelper::commandReceived, this, [&](const QByteArray &cmd) {
7474
if (cmd.startsWith("GET_MENU_ITEMS:END")) {
7575
loop.quit();
7676
} else if (cmd.startsWith("MENU_ITEM:")) {
@@ -109,14 +109,14 @@ QList<QAction*> OwncloudDolphinPluginAction::actions(const KFileItemListProperti
109109
}
110110

111111

112-
QList<QAction *> OwncloudDolphinPluginAction::legacyActions(const KFileItemListProperties &fileItemInfos, QWidget *parentWidget)
112+
QList<QAction *> OpenCloudDolphinPluginAction::legacyActions(const KFileItemListProperties &fileItemInfos, QWidget *parentWidget)
113113
{
114114
QList<QUrl> urls = fileItemInfos.urlList();
115115
if (urls.count() != 1)
116116
return {};
117117
QDir localPath(urls.first().toLocalFile());
118118
auto localFile = localPath.canonicalPath();
119-
auto helper = OwncloudDolphinPluginHelper::instance();
119+
auto helper = OpenCloudDolphinPluginHelper::instance();
120120
auto menuaction = new QAction(parentWidget);
121121
menuaction->setText(helper->contextMenuTitle());
122122
auto menu = new QMenu(parentWidget);
@@ -143,4 +143,4 @@ QList<QAction *> OwncloudDolphinPluginAction::legacyActions(const KFileItemListP
143143
return { menuaction };
144144
}
145145

146-
#include "ownclouddolphinactionplugin.moc"
146+
#include "dolphinactionplugin.moc"

src/ownclouddolphinactionplugin.h renamed to src/dolphinactionplugin.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,14 @@
2626
class QAction;
2727
class QWidget;
2828

29-
class OwncloudDolphinPluginAction : public KAbstractFileItemActionPlugin
29+
class OpenCloudDolphinPluginAction : public KAbstractFileItemActionPlugin
3030
{
3131
Q_OBJECT
3232
public:
33-
explicit OwncloudDolphinPluginAction(QObject *parent, const QVariantList &args);
33+
explicit OpenCloudDolphinPluginAction(QObject *parent, const QVariantList &args);
3434

3535
QList<QAction *> actions(const KFileItemListProperties &fileItemInfos, QWidget *parentWidget) override;
3636

3737
private:
3838
QList<QAction *> legacyActions(const KFileItemListProperties &fileItemInfos, QWidget *parentWidget);
3939
};
40-
41-

src/ownclouddolphinactionplugin.json renamed to src/dolphinactionplugin.json

File renamed without changes.

src/ownclouddolphinoverlayplugin.cpp renamed to src/dolphinoverlayplugin.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#include <QDir>
2525
#include <QTimer>
2626

27-
#include "ownclouddolphinpluginhelper.h"
27+
#include "dolphinpluginhelper.h"
2828

29-
class OwncloudDolphinPlugin : public KOverlayIconPlugin
29+
class OpenCloudDolphinPlugin : public KOverlayIconPlugin
3030
{
3131
Q_PLUGIN_METADATA(IID "eu.opencloud.ovarlayiconplugin")
3232
Q_OBJECT
@@ -36,14 +36,14 @@ class OwncloudDolphinPlugin : public KOverlayIconPlugin
3636

3737
public:
3838

39-
OwncloudDolphinPlugin() {
40-
auto helper = OwncloudDolphinPluginHelper::instance();
41-
QObject::connect(helper, &OwncloudDolphinPluginHelper::commandReceived,
42-
this, &OwncloudDolphinPlugin::slotCommandReceived);
39+
OpenCloudDolphinPlugin() {
40+
auto helper = OpenCloudDolphinPluginHelper::instance();
41+
QObject::connect(helper, &OpenCloudDolphinPluginHelper::commandReceived,
42+
this, &OpenCloudDolphinPlugin::slotCommandReceived);
4343
}
4444

4545
QStringList getOverlays(const QUrl& url) override {
46-
auto helper = OwncloudDolphinPluginHelper::instance();
46+
auto helper = OpenCloudDolphinPluginHelper::instance();
4747
if (!helper->isConnected())
4848
return QStringList();
4949
if (!url.isLocalFile())
@@ -101,4 +101,4 @@ class OwncloudDolphinPlugin : public KOverlayIconPlugin
101101
}
102102
};
103103

104-
#include "ownclouddolphinoverlayplugin.moc"
104+
#include "dolphinoverlayplugin.moc"

src/ownclouddolphinpluginhelper.cpp renamed to src/dolphinpluginhelper.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,33 @@
1717
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
1818
******************************************************************************/
1919

20-
#include <QtNetwork/QLocalSocket>
21-
#include <qcoreevent.h>
22-
#include <QStandardPaths>
20+
#include "dolphinpluginhelper.h"
21+
2322
#include <QFile>
24-
#include <QLoggingCategory>
25-
#include "ownclouddolphinpluginhelper.h"
26-
#include <QJsonObject>
2723
#include <QJsonDocument>
24+
#include <QJsonObject>
25+
#include <QLoggingCategory>
26+
#include <QStandardPaths>
27+
#include <QTimerEvent>
28+
#include <QtNetwork/QLocalSocket>
2829

2930
Q_LOGGING_CATEGORY(lcPluginHelper, "opencloud.dolphin", QtInfoMsg)
3031

31-
OwncloudDolphinPluginHelper* OwncloudDolphinPluginHelper::instance()
32+
OpenCloudDolphinPluginHelper* OpenCloudDolphinPluginHelper::instance()
3233
{
33-
static OwncloudDolphinPluginHelper self;
34+
static OpenCloudDolphinPluginHelper self;
3435
return &self;
3536
}
3637

37-
OwncloudDolphinPluginHelper::OwncloudDolphinPluginHelper()
38+
OpenCloudDolphinPluginHelper::OpenCloudDolphinPluginHelper()
3839
{
39-
QObject::connect(&_socket, &QLocalSocket::connected, this, &OwncloudDolphinPluginHelper::slotConnected);
40-
connect(&_socket, &QLocalSocket::readyRead, this, &OwncloudDolphinPluginHelper::slotReadyRead);
40+
QObject::connect(&_socket, &QLocalSocket::connected, this, &OpenCloudDolphinPluginHelper::slotConnected);
41+
connect(&_socket, &QLocalSocket::readyRead, this, &OpenCloudDolphinPluginHelper::slotReadyRead);
4142
_connectTimer.start(45 * 1000, Qt::VeryCoarseTimer, this);
4243
tryConnect();
4344
}
4445

45-
void OwncloudDolphinPluginHelper::timerEvent(QTimerEvent *e)
46+
void OpenCloudDolphinPluginHelper::timerEvent(QTimerEvent *e)
4647
{
4748
if (e->timerId() == _connectTimer.timerId()) {
4849
tryConnect();
@@ -51,18 +52,18 @@ void OwncloudDolphinPluginHelper::timerEvent(QTimerEvent *e)
5152
QObject::timerEvent(e);
5253
}
5354

54-
bool OwncloudDolphinPluginHelper::isConnected() const
55+
bool OpenCloudDolphinPluginHelper::isConnected() const
5556
{
5657
return _socket.state() == QLocalSocket::ConnectedState;
5758
}
5859

59-
void OwncloudDolphinPluginHelper::sendCommand(const QByteArray& data)
60+
void OpenCloudDolphinPluginHelper::sendCommand(const QByteArray& data)
6061
{
6162
_socket.write(data);
6263
_socket.flush();
6364
}
6465

65-
void OwncloudDolphinPluginHelper::sendGetClientIconCommand(int size)
66+
void OpenCloudDolphinPluginHelper::sendGetClientIconCommand(int size)
6667
{
6768
const QByteArray cmd{"V2/GET_CLIENT_ICON:"};
6869
const QByteArray newLine{"\n"};
@@ -73,13 +74,13 @@ void OwncloudDolphinPluginHelper::sendGetClientIconCommand(int size)
7374
sendCommand(cmd + json + newLine);
7475
}
7576

76-
void OwncloudDolphinPluginHelper::slotConnected()
77+
void OpenCloudDolphinPluginHelper::slotConnected()
7778
{
7879
sendCommand("VERSION:\n");
7980
sendCommand("GET_STRINGS:\n");
8081
}
8182

82-
void OwncloudDolphinPluginHelper::tryConnect()
83+
void OpenCloudDolphinPluginHelper::tryConnect()
8384
{
8485
if (_socket.state() != QLocalSocket::UnconnectedState) {
8586
return;
@@ -94,7 +95,7 @@ void OwncloudDolphinPluginHelper::tryConnect()
9495
_socket.connectToServer(socketPath + QLatin1String("/socket"));
9596
}
9697

97-
void OwncloudDolphinPluginHelper::slotReadyRead()
98+
void OpenCloudDolphinPluginHelper::slotReadyRead()
9899
{
99100
while (_socket.bytesAvailable()) {
100101
_line += _socket.readLine();
@@ -165,4 +166,3 @@ void OwncloudDolphinPluginHelper::slotReadyRead()
165166
Q_EMIT commandReceived(line);
166167
}
167168
}
168-

src/ownclouddolphinpluginhelper.h renamed to src/dolphinpluginhelper.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#include <QPixmap>
2626
#include "openclouddolphinpluginhelper_export.h"
2727

28-
class OPENCLOUDDOLPHINPLUGINHELPER_EXPORT OwncloudDolphinPluginHelper : public QObject {
28+
class OPENCLOUDDOLPHINPLUGINHELPER_EXPORT OpenCloudDolphinPluginHelper : public QObject {
2929
Q_OBJECT
3030
public:
31-
static OwncloudDolphinPluginHelper *instance();
31+
static OpenCloudDolphinPluginHelper *instance();
3232

3333
bool isConnected() const;
3434
void sendCommand(const QByteArray&);
@@ -61,7 +61,7 @@ class OPENCLOUDDOLPHINPLUGINHELPER_EXPORT OwncloudDolphinPluginHelper : public Q
6161
void timerEvent(QTimerEvent*) override;
6262

6363
private:
64-
OwncloudDolphinPluginHelper();
64+
OpenCloudDolphinPluginHelper();
6565
void slotConnected();
6666
void slotReadyRead();
6767
void tryConnect();

0 commit comments

Comments
 (0)