KDE/danbooru-client
1
0
Fork 0
Code Issues Pull requests Releases Activity

Run astyle-kdelibs on the source

Browse source
This commit is contained in:
Luca Beltrame 2014-10-05 09:53:19 +02:00
parent 4b85d63d68
commit 39aac8c95b
22 changed files with 1227 additions and 1264 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/danbooruconnectwidget.cpp
View file

@ -27,10 +27,10 @@
#include <KWallet>
using KWallet::Wallet;
namespace Danbooru {
namespace Danbooru
{
const QMap< QUrl, QString > initBoardSalts()
{
@ -38,13 +38,13 @@ const QMap< QUrl, QString > initBoardSalts()
QMap< QUrl, QString > boardSalts;
boardSalts.insert(QUrl("http://konachan.com"),
QString("So-I-Heard-You-Like-Mupkids-?--%1--"));
QString("So-I-Heard-You-Like-Mupkids-?--%1--"));
boardSalts.insert(QUrl("http://konachan.net"),
QString("So-I-Heard-You-Like-Mupkids-?--%1--"));
QString("So-I-Heard-You-Like-Mupkids-?--%1--"));
boardSalts.insert(QUrl("http://yande.re"),
QString("choujin-steiner--%1--"));
QString("choujin-steiner--%1--"));
boardSalts.insert(QUrl("http://danbooru.donmai.us"),
QString("choujin-steiner--%1--"));
QString("choujin-steiner--%1--"));
return boardSalts;
}
@ -52,9 +52,9 @@ const QMap< QUrl, QString > initBoardSalts()
const QMap<QUrl, QString> DanbooruConnectWidget::boardSalts = initBoardSalts();
DanbooruConnectWidget::DanbooruConnectWidget(QVector< QUrl > urlList,
QWidget* parent):
QWidget(parent),
m_wallet(0)
QWidget *parent):
QWidget(parent),
m_wallet(0)
{
setupUi(this);
@ -74,13 +74,13 @@ DanbooruConnectWidget::DanbooruConnectWidget(QVector< QUrl > urlList,
danbooruUrlComboBox->clear();
for (auto item: urlList) {
for (auto item : urlList) {
danbooruUrlComboBox->insertUrl(urlList.indexOf(item), item);
}
m_wallet = Wallet::openWallet(Wallet::NetworkWallet(), winid,
Wallet::Asynchronous
);
Wallet::Asynchronous
);
connect(m_wallet, &KWallet::Wallet::walletOpened, this, &DanbooruConnectWidget::checkWallet);
@ -122,7 +122,6 @@ void DanbooruConnectWidget::getWalletData()
if (m_wallet->hasEntry(key)) {
if (m_wallet->readMap(key, valueMap) != 0) {
return;
}
@ -133,7 +132,6 @@ void DanbooruConnectWidget::getWalletData()
}
}
void DanbooruConnectWidget::toggleLineEdits(int state)
{
if (state == Qt::Unchecked) {
@ -145,7 +143,6 @@ void DanbooruConnectWidget::toggleLineEdits(int state)
}
}
void DanbooruConnectWidget::emitRejected()
{
Q_EMIT rejected();
@ -161,7 +158,6 @@ QString DanbooruConnectWidget::username() const
return m_username;
}
QString DanbooruConnectWidget::password() const
{
return m_password;
@ -178,7 +174,7 @@ void DanbooruConnectWidget::accept()
if (!m_username.isEmpty() && !m_password.isEmpty()) {
if (m_wallet && !m_wallet->hasEntry(m_boardUrl.url())) {
QMap<QString,QString> dataMap;
QMap<QString, QString> dataMap;
dataMap.insert(QLatin1String("username"), m_username);
dataMap.insert(QLatin1String("password"), m_password);
m_wallet->writeMap(m_boardUrl.url(), dataMap);
@ -186,16 +182,15 @@ void DanbooruConnectWidget::accept()
hashedPassword = boardSalts.value(m_boardUrl).arg(m_password);
hashedPassword = QCryptographicHash::hash(hashedPassword.toUtf8(),
QCryptographicHash::Sha1
).toHex();
QCryptographicHash::Sha1
).toHex();
}
DanbooruService* service = new DanbooruService(m_boardUrl, m_username,
hashedPassword);
DanbooruService *service = new DanbooruService(m_boardUrl, m_username,
hashedPassword);
Q_EMIT(connectionEstablished(service));
hide();
}
}; // namespace Danbooru