Skip to content

Commit 3b10d76

Browse files
uglideuglide
committed
Clean up code
1 parent 660ee60 commit 3b10d76

File tree

17 files changed

+41
-65
lines changed

17 files changed

+41
-65
lines changed

‎src/app/app.cpp

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ Application::Application(int& argc, char** argv)
4444
: QApplication(argc, argv),
4545
m_engine(this),
4646
m_qmlUtils(QSharedPointer<QmlUtils>(new QmlUtils())),
47-
m_events(QSharedPointer<Events>(new Events())) {
47+
m_events(QSharedPointer<Events>(new Events()))
48+
{
4849
// Init components required for models and qml
4950
initAppInfo();
5051
initProxySettings();
@@ -62,11 +63,6 @@ Application::Application(int& argc, char** argv)
6263
installTranslator();
6364
}
6465

65-
Application::~Application()
66-
{
67-
m_connections.clear();
68-
}
69-
7066
void Application::initModels() {
7167
ConfigManager confManager(m_settingsDir);
7268

@@ -117,11 +113,12 @@ void Application::initModels() {
117113

118114
auto srvStatsFactory = [this](QSharedPointer<RedisClient::Connection> c,
119115
int dbIndex, QList<QByteArray> initCmd) {
120-
auto rawModelPtr = new ServerStats::Model(c, dbIndex, initCmd);
121-
auto model = QSharedPointer<TabModel>(rawModelPtr, &QObject::deleteLater);
116+
auto model = QSharedPointer<TabModel>(
117+
new ServerStats::Model(c, dbIndex, initCmd), &QObject::deleteLater);
122118

123-
QObject::connect(rawModelPtr, &ServerStats::Model::openConsoleTerminal,
124-
m_events.data(), &Events::openConsole);
119+
QObject::connect(model.staticCast<ServerStats::Model>().data(),
120+
&ServerStats::Model::openConsoleTerminal, m_events.data(),
121+
&Events::openConsole);
125122

126123
return model;
127124
};
@@ -353,12 +350,12 @@ void Application::installTranslator() {
353350
locale = preferredLocale;
354351
}
355352

356-
QTranslator* translator = new QTranslator((QObject*)this);
357-
if (translator->load(QString(":/translations/rdm_") + locale)) {
353+
m_translator = QSharedPointer<QTranslator>(new QTranslator((QObject*)this));
354+
if (m_translator->load(QString(":/translations/rdm_") + locale)) {
358355
qDebug() << "Load translations file for locale:" << locale;
359-
QCoreApplication::installTranslator(translator);
356+
QCoreApplication::installTranslator(m_translator.data());
360357
} else {
361-
delete translator;
358+
m_translator.clear();
362359
}
363360
}
364361

‎src/app/app.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class Application : public QApplication {
3737

3838
public:
3939
Application(int &argc, char **argv);
40-
~Application() override;
4140

4241
void initModels();
4342
void initQml();
@@ -75,4 +74,5 @@ class Application : public QApplication {
7574
QString m_settingsDir;
7675
QString m_formattersDir;
7776
QString m_renderingBackend;
77+
QSharedPointer<QTranslator> m_translator = nullptr;
7878
};

‎src/app/jsonutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ std::string escape_string(const std::string_view& s) noexcept
119119
if (c >= 0x00 and c <= 0x1f)
120120
{
121121
// print character c as \uxxxx
122-
sprintf(&result[pos + 1], "u%04x", int(c));
122+
std::snprintf(&result[pos + 1], 7, "u%04x", int(c));
123123
pos += 6;
124124
// overwrite trailing null character
125125
result[pos] = '\\';

‎src/app/models/configmanager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class ConfigManager
88
{
99
public:
10-
ConfigManager(const QString& basePath = QDir::homePath());
10+
explicit ConfigManager(const QString& basePath = QDir::homePath());
1111
QString getApplicationConfigPath(const QString &, bool checkPath=true);
1212
public:
1313
static QString getConfigPath(QString basePath = QDir::homePath());

‎src/app/models/connectionconf.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ ServerConfig::ServerConfig(const QVariantHash &options)
1313

1414
}
1515

16-
ServerConfig::ServerConfig(const ServerConfig &other)
17-
{
18-
m_parameters = other.m_parameters;
19-
m_owner = other.m_owner;
20-
}
21-
2216
QString ServerConfig::keysPattern() const
2317
{
2418
return param<QString>("keys_pattern", QString(DEFAULT_KEYS_GLOB_PATTERN));

‎src/app/models/connectionconf.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ class ServerConfig : public RedisClient::ConnectionConfig
5151
ServerConfig(const QString & host = "127.0.0.1", const QString & auth = "",
5252
const uint port = DEFAULT_REDIS_PORT, const QString & name = "");
5353

54-
ServerConfig(const QVariantHash& options);
55-
56-
ServerConfig(const ServerConfig& options);
54+
explicit ServerConfig(const QVariantHash& options);
5755

5856
QString keysPattern() const;
5957
void setKeysPattern(QString keyGlobPattern);

‎src/app/models/connectionsmanager.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ ConnectionsManager::ConnectionsManager(const QString& configPath,
2121
&Events::error);
2222
}
2323

24-
ConnectionsManager::~ConnectionsManager(void) {}
25-
2624
void ConnectionsManager::loadConnections() {
2725
if (!m_configPath.isEmpty() && QFile::exists(m_configPath)) {
2826
loadConnectionsConfigFromFile(m_configPath);
@@ -113,17 +111,19 @@ bool ConnectionsManager::loadConnectionsConfigFromFile(const QString& config,
113111

114112
auto obj = connection.toObject();
115113

116-
if (obj.contains("type") && obj.contains("connections") &&
117-
obj.contains("name") && obj["connections"].isArray() &&
118-
obj["type"].toString().toLower() == "group") {
114+
bool isValidGroup = obj.contains("type") && obj.contains("connections") &&
115+
obj.contains("name") && obj["connections"].isArray() &&
116+
obj["type"].toString().toLower() == "group";
117+
118+
if (isValidGroup) {
119119
auto groupConnections = obj["connections"].toArray();
120120

121121
auto group = QSharedPointer<ConnectionsTree::ServerGroup>(
122122
new ConnectionsTree::ServerGroup(
123123
obj["name"].toString(),
124124
*static_cast<ConnectionsTree::Model*>(this)));
125125

126-
for (QJsonValue c : groupConnections) {
126+
for (const QJsonValue &c : qAsConst(groupConnections)) {
127127
if (!c.isObject()) continue;
128128

129129
ServerConfig conf(c.toObject().toVariantHash());
@@ -287,7 +287,7 @@ bool ConnectionsManager::isRedisConnectionStringValid(const QString& connectionS
287287
int ConnectionsManager::size() {
288288
int connectionsCount = 0;
289289

290-
for (auto item : m_treeItems) {
290+
for (auto item : qAsConst(m_treeItems)) {
291291
if (item->type() == "server_group") {
292292
connectionsCount += item->childCount();
293293
} else if (item->type() == "server") {

‎src/app/models/connectionsmanager.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ class ConnectionsManager : public ConnectionsTree::Model,
2828

2929
public:
3030
ConnectionsManager(const QString& m_configPath,
31-
QSharedPointer<Events> events);
32-
33-
~ConnectionsManager(void);
31+
QSharedPointer<Events> events);
3432

3533
void loadConnections();
3634

@@ -61,7 +59,7 @@ class ConnectionsManager : public ConnectionsTree::Model,
6159

6260
void saveConfig();
6361

64-
Q_INVOKABLE int size();
62+
Q_INVOKABLE int size() override;
6563

6664
// BulkOperations model methods
6765
QSharedPointer<RedisClient::Connection> getByIndex(int index) override;

‎src/app/models/key-models/abstractkey.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ class KeyModel : public ValueEditor::Model {
3030
m_scanCursor(0),
3131
m_notifier(new ValueEditor::ModelSignals(), &QObject::deleteLater) {}
3232

33-
virtual ~KeyModel() {
34-
m_notifier.clear();
35-
m_connection.clear();
36-
}
37-
3833
virtual QString getKeyName() override {
3934
return printableString(m_keyFullPath);
4035
}

‎src/app/models/key-models/newkeyrequest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ void NewKeyRequest::loadAdditionalKeyTypesInfo(QJSValue jsCallback) {
3333

3434
QJSValueList supportedKeyTypesExposedByModules;
3535

36-
for (QString module : loadedModules) {
37-
if (module == "ReJSON")
38-
supportedKeyTypesExposedByModules.append(QJSValue(module));
36+
for (QString mod : loadedModules) {
37+
if (mod == "ReJSON")
38+
supportedKeyTypesExposedByModules.append(QJSValue(mod));
3939
}
4040

4141
m_jsCallback.call(supportedKeyTypesExposedByModules);

‎src/app/models/key-models/newkeyrequest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class NewKeyRequest {
5353
Q_INVOKABLE void loadAdditionalKeyTypesInfo(QJSValue jsCallback);
5454

5555
private:
56-
QSharedPointer<RedisClient::Connection> m_connection;
57-
int m_dbIndex;
56+
QSharedPointer<RedisClient::Connection> m_connection = nullptr;
57+
int m_dbIndex = -1;
5858
std::function<void()> m_callback;
5959
QJSValue m_jsCallback;
6060
QString m_keyName;

‎src/app/qmlutils.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,14 @@ void QmlUtils::addNewValueToDynamicChart(QtCharts::QXYSeries *series,
257257
ax->setMin(QDateTime::currentDateTime());
258258
}
259259

260-
bool dataNotChangedLastFivePoints = (
261-
totalPoints > 10
262-
&& value
263-
== series->at(totalPoints - 1).y()
264-
== series->at(totalPoints - 2).y()
265-
== series->at(totalPoints - 3).y()
266-
== series->at(totalPoints - 4).y()
267-
== series->at(totalPoints - 5).y()
268-
);
260+
bool dataNotChangedLastFivePoints = totalPoints > 10;
261+
262+
for (int i = 1; dataNotChangedLastFivePoints && i < 6; i++) {
263+
if (value != series->at(totalPoints - i).y()) {
264+
dataNotChangedLastFivePoints = false;
265+
break;
266+
}
267+
}
269268

270269
if (dataNotChangedLastFivePoints) {
271270
series->replace(totalPoints - 1, QDateTime::currentDateTime().toMSecsSinceEpoch(), value);

‎src/modules/connections-tree/items/databaseitem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ QVariantList DatabaseItem::filterHistoryTop10() const {
374374
}
375375
std::sort(filterHistoryRating.begin(), filterHistoryRating.end(), [](FilterUsage i, FilterUsage j) { return (i.second > j.second); });
376376

377-
for (int i = 0; filterHistoryRating.size(); i++) {
377+
for (int i = 0; filterHistoryRating.size() > 0; i++) {
378378
if (i >= 10) break;
379379
filterHistoryList.append(filterHistoryRating.takeFirst().first);
380380
}

‎src/modules/connections-tree/model.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ void Model::sendEvent(const QModelIndex &index, QString event) {
317317
item->handleEvent(event);
318318
}
319319

320-
unsigned int Model::size() { return m_treeItems.size(); }
320+
int Model::size() { return m_treeItems.size(); }
321321

322322
void Model::setExpanded(const QModelIndex &index) {
323323
TreeItem *item = getItemFromIndex(index);

‎src/modules/connections-tree/model.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class Model : public QAbstractItemModel {
9595

9696
void sendEvent(const QModelIndex &index, QString event);
9797

98-
unsigned int size();
98+
virtual int size();
9999

100100
void setExpanded(const QModelIndex &index);
101101

‎src/modules/console/consolemodel.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ Model::Model(QSharedPointer<RedisClient::Connection> connection, int dbIndex,
3131
QString Model::getName() const { return m_connection->getConfig().name(); }
3232

3333
void Model::executeCommand(const QString& cmd) {
34-
if (cmd == "segfault") { // crash
35-
delete reinterpret_cast<QString*>(0xFEE1DEAD);
36-
return;
37-
}
38-
3934
return execCmd(RedisClient::Command::splitCommandString(cmd));
4035
}
4136

‎src/py/formatters/msgpack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def default(o):
5050

5151
elif isinstance(o, bytes):
5252
try:
53-
return o.decode()
53+
return o.decode("utf-8")
5454
except UnicodeDecodeError:
5555
return base64.b64encode(o)
5656
else:

0 commit comments

Comments
 (0)