Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-11-17 09:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Utils: remove unused functions' (#315) from tobtoht/feather:utils_cleanup into master

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/315
This commit is contained in:
tobtoht 2021-01-29 15:43:28 +00:00
commit 9d8897d29c
2 changed files with 0 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
src/utils/utils.cpp
View file

@ -21,12 +21,6 @@
QVector<logMessage> applicationLog = QVector<logMessage>(); // todo: replace with ring buffer
QMutex logMutex;
void Utils::openWindow(QWidget *w) {
auto first_screen = QApplication::screens()[0];
w->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, w->size(), first_screen->availableGeometry()));
w->show();
}
bool Utils::fileExists(const QString &path) {
QFileInfo check_file(path);
return check_file.exists() && check_file.isFile();
@ -69,16 +63,6 @@ bool Utils::fileWrite(const QString &path, const QString &data) {
return false;
}
QString Utils::systemAccountName(){
QString accountName = qgetenv("USER"); // mac/linux
if (accountName.isEmpty())
return qgetenv("USERNAME"); // Windows
if (accountName.isEmpty())
qDebug() << "accountName was empty";
return "";
}
bool Utils::validateJSON(const QByteArray &blob) {
QJsonDocument doc = QJsonDocument::fromJson(blob);
QString jsonString = doc.toJson(QJsonDocument::Indented);
@ -96,18 +80,6 @@ bool Utils::writeJsonFile(QIODevice &device, const QSettings::SettingsMap &map)
return true;
}
QStringList Utils::readJsonStringToQStringList(const QString &input) {
QStringList data;
QJsonDocument doc = QJsonDocument::fromJson(input.toUtf8());
QJsonObject object = doc.object();
QJsonArray array = doc.array();
for(auto &&entry: array)
data << entry.toString();
return data;
}
void Utils::applicationLogHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
const QString fn = context.function ? QString::fromUtf8(context.function) : "";
const QString date = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss");
@ -147,19 +119,6 @@ void Utils::applicationLogHandler(QtMsgType type, const QMessageLogContext &cont
//emit applicationLogUpdated(message);
}
QByteArray Utils::zipExtract(const QString &path, const QString& destination) {
Q_UNUSED(path)
Q_UNUSED(destination)
return QByteArray();
}
bool Utils::isDigit(const QString& inp) {
for (auto &&i : inp) {
if(!i.isDigit()) return false;
}
return true;
}
void Utils::desktopNotify(const QString &title, const QString &message, int duration) {
QStringList notify_send = QStringList() << title << message << "-t" << QString::number(duration);
QStringList kdialog = QStringList() << title << message;
@ -193,20 +152,6 @@ QString Utils::barrayToString(const QByteArray &data) {
return QString(QTextCodec::codecForMib(106)->toUnicode(data));
}
QByteArray Utils::readSocket(QTcpSocket &socket, int buffer_size) {
QByteArray data;
if(!socket.waitForReadyRead(6000))
return data;
while(buffer_size > 0 && socket.bytesAvailable() > 0){
QByteArray _data = socket.read(buffer_size);
buffer_size -= _data.size();
data += _data;
}
return data;
}
void Utils::externalLinkWarning(QWidget *parent, const QString &url){
if(!config()->get(Config::warnOnExternalLink).toBool()) {
QDesktopServices::openUrl(QUrl(url));
@ -262,12 +207,6 @@ QStringList Utils::fileFind(const QRegExp &pattern, const QString &baseDir, int
return rtn;
}
bool Utils::walletExists(QString name, const QString &path) {
name = name.replace(".keys", "");
auto walletPath = QDir(path).filePath(name + ".keys");
return Utils::fileExists(walletPath);
}
void Utils::copyToClipboard(const QString &string){
QClipboard * clipboard = QApplication::clipboard();
if (!clipboard) {
@ -321,45 +260,6 @@ QString Utils::blockExplorerLink(const QString &blockExplorer, NetworkType::Type
return QString("");
}
QList<processStruct> Utils::procList() {
// windows maybe: https://stackoverflow.com/a/13635377/2054778
QList<processStruct> rtn;
QProcess process;
#if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
#if defined(Q_OS_MAC)
process.start("ps", QStringList() << "-wwaxo" << "pid,command");
#elif defined(Q_OS_LINUX)
process.start("ps", QStringList() << "-wwaxo" << "pid,command");
#endif
process.waitForFinished(-1);
QString stdout = process.readAllStandardOutput();
QString stderr = process.readAllStandardError();
if(stdout.isEmpty())
return rtn;
QStringList spl = stdout.split("\n");
if(spl.count() >= 1)
spl.removeAt(0);
for (auto& line: spl) {
line = line.trimmed();
if(line.isEmpty())
continue;
QStringList _spl = line.split(" ");
processStruct ps;
if(_spl.length() >= 2) {
ps.pid = _spl.at(0).toInt();
ps.command = _spl.at(1);
rtn.append(ps);
}
}
#endif
return rtn;
}
QStandardItem *Utils::qStandardItem(const QString& text) {
auto font = QApplication::font();
return Utils::qStandardItem(text, font);

28
src/utils/utils.h
View file

@ -4,15 +4,10 @@
#ifndef FEATHER_UTILS_H
#define FEATHER_UTILS_H
#include <cstdio>
#include <cstdlib>
#include <QRegExp>
#include <QStandardItemModel>
#include <QtNetwork>
#include <QApplication>
#include <QMainWindow>
#include <QTextCharFormat>
#include <sstream>
#include <monero_seed/monero_seed.hpp>
@ -31,18 +26,6 @@ struct logMessage
QString fn;
};
struct networkPeer {
QString host;
quint16 port;
bool active = false;
};
struct processStruct {
int pid = 0;
QString command;
QFileInfo fileInfo;
};
struct xdgDesktopEntryPaths {
QString pathApp;
QString pathIcon;
@ -60,28 +43,19 @@ class Utils
public:
static bool portOpen(const QString &hostname, quint16 port);
static bool isDigit(const QString &inp);
static bool fileExists(const QString &path);
static QByteArray fileOpen(const QString &path);
static QByteArray fileOpenQRC(const QString &path);
static void desktopNotify(const QString &title, const QString &message, int duration);
static bool fileWrite(const QString &path, const QString &data);
static QStringList fileFind(const QRegExp &pattern, const QString &baseDir, int level, int depth, int maxPerDir);
static QString systemAccountName();
static QByteArray zipExtract(const QString &path, const QString& destination);
static bool validateJSON(const QByteArray &blob);
static bool readJsonFile(QIODevice &device, QSettings::SettingsMap &map);
static bool walletExists(QString name, const QString &path);
static bool writeJsonFile(QIODevice &device, const QSettings::SettingsMap &map);
static QStringList readJsonStringToQStringList(const QString &input);
static void applicationLogHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
static void openWindow(QWidget *w);
static void externalLinkWarning(QWidget *parent, const QString &url);
static QList<processStruct> procList();
static bool dirExists(const QString &path);
static QString barrayToString(const QByteArray &data);
static QByteArray readSocket(QTcpSocket &socket, int buffer_size);
static QStandardItem *qStandardItem(const QString &text);
static QStandardItem *qStandardItem(const QString &text, QFont &font);
static void copyToClipboard(const QString &string);
@ -112,6 +86,4 @@ public:
class AppContext; // forward declaration
#endif //FEATHER_UTILS_H