monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 08:17:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consistency in if/else statements and MACROS

Browse source
This commit is contained in:
pazos 2018-04-25 17:11:19 +02:00
parent 74233bf459
commit 59a4afef3c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
main.cpp
View file

@ -79,7 +79,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// platform dependant settings // platform dependant settings
#if ! defined(Q_OS_ANDROID) && ! defined(Q_OS_IOS) #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
bool isDesktop = true; bool isDesktop = true;
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID)
bool isAndroid = true; bool isAndroid = true;
@ -229,7 +229,7 @@ int main(int argc, char *argv[])
// to save the wallet file (.keys, .bin), they have to be user-accessible for // to save the wallet file (.keys, .bin), they have to be user-accessible for
// backups - I reckon we save that in My Documents\Monero Accounts\ on // backups - I reckon we save that in My Documents\Monero Accounts\ on
// Windows, ~/Monero Accounts/ on nix / osx // Windows, ~/Monero Accounts/ on nix / osx
#if defined (Q_OS_WIN) || defined(Q_OS_IOS) #if defined(Q_OS_WIN) || defined(Q_OS_IOS)
QStringList moneroAccountsRootDir = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation); QStringList moneroAccountsRootDir = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation);
#else #else
QStringList moneroAccountsRootDir = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); QStringList moneroAccountsRootDir = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
@ -248,7 +248,8 @@ int main(int argc, char *argv[])
#endif #endif
if (!moneroAccountsRootDir.empty()) { if (!moneroAccountsRootDir.empty())
{
QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Monero/wallets"; QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Monero/wallets";
engine.rootContext()->setContextProperty("moneroAccountsDir", moneroAccountsDir); engine.rootContext()->setContextProperty("moneroAccountsDir", moneroAccountsDir);
} }
@ -256,12 +257,10 @@ int main(int argc, char *argv[])
// Get default account name // Get default account name
QString accountName = qgetenv("USER"); // mac/linux QString accountName = qgetenv("USER"); // mac/linux
if (accountName.isEmpty()){ if (accountName.isEmpty())
accountName = qgetenv("USERNAME"); // Windows accountName = qgetenv("USERNAME"); // Windows
} if (accountName.isEmpty())
if (accountName.isEmpty()) {
accountName = "My monero Account"; accountName = "My monero Account";
}
engine.rootContext()->setContextProperty("defaultAccountName", accountName); engine.rootContext()->setContextProperty("defaultAccountName", accountName);
engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath()); engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath());
@ -288,14 +287,15 @@ int main(int argc, char *argv[])
#ifdef WITH_SCANNER #ifdef WITH_SCANNER
QObject *qmlCamera = rootObject->findChild<QObject*>("qrCameraQML"); QObject *qmlCamera = rootObject->findChild<QObject*>("qrCameraQML");
if( qmlCamera ){ if (qmlCamera)
{
qDebug() << "QrCodeScanner : object found"; qDebug() << "QrCodeScanner : object found";
QCamera *camera_ = qvariant_cast<QCamera*>(qmlCamera->property("mediaObject")); QCamera *camera_ = qvariant_cast<QCamera*>(qmlCamera->property("mediaObject"));
QObject *qmlFinder = rootObject->findChild<QObject*>("QrFinder"); QObject *qmlFinder = rootObject->findChild<QObject*>("QrFinder");
qobject_cast<QrCodeScanner*>(qmlFinder)->setSource(camera_); qobject_cast<QrCodeScanner*>(qmlFinder)->setSource(camera_);
} else {
qDebug() << "QrCodeScanner : something went wrong !";
} }
else
qDebug() << "QrCodeScanner : something went wrong !";
#endif #endif
QObject::connect(eventFilter, SIGNAL(sequencePressed(QVariant,QVariant)), rootObject, SLOT(sequencePressed(QVariant,QVariant))); QObject::connect(eventFilter, SIGNAL(sequencePressed(QVariant,QVariant)), rootObject, SLOT(sequencePressed(QVariant,QVariant)));