ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Fixed clang errors and warnings, incremented storage version

Browse Source
This commit is contained in:
Eberhard Graether
2017-02-13 00:32:52 +01:00
parent 97fd40fe9b
commit 17d9c87a5d
9 changed files with 70 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtBookmark.cpp
+3 -5
View File
@@ -100,8 +100,6 @@ void QtBookmark::setBookmark(const std::shared_ptr<Bookmark> bookmark)
m_activateButton->setText(bookmark->getDisplayName().c_str());
bool isValid = m_bookmark->isValid();
if (m_bookmark->isValid() == false)
{
m_activateButton->setEnabled(false);
@@ -173,8 +171,8 @@ void QtBookmark::deleteClicked()
QMessageBox msgBox;
msgBox.setText("Delete Bookmark");
msgBox.setInformativeText("Do you really want to delete this bookmark?");
QAbstractButton* yesButton = msgBox.addButton("Delete", QMessageBox::ButtonRole::YesRole);
QAbstractButton* noButton = msgBox.addButton("Keep", QMessageBox::ButtonRole::NoRole);
msgBox.addButton("Delete", QMessageBox::ButtonRole::YesRole);
msgBox.addButton("Keep", QMessageBox::ButtonRole::NoRole);
msgBox.setIcon(QMessageBox::Icon::Question);
int ret = msgBox.exec();
@@ -235,7 +233,7 @@ std::string QtBookmark::getDateString() const
std::string result = "n/a";
TimePoint creationDate = m_bookmark->getTimeStamp();
float delta = TimePoint::now() - creationDate;
if (delta < 3600.0f) // less than an hour ago
src/lib_gui/qt/element/QtBookmarkBar.cpp
+5 -5
View File
@@ -137,13 +137,13 @@ void QtBookmarkBar::createBookmarkClicked()
QMessageBox msgBox;
msgBox.setText("Edit Bookmark");
msgBox.setInformativeText("Do you want to update or delete the Bookmark for the active Token?");
QAbstractButton* editButton = msgBox.addButton("Edit", QMessageBox::ButtonRole::YesRole);
QAbstractButton* deleteButton = msgBox.addButton("Delete", QMessageBox::ButtonRole::DestructiveRole);
QAbstractButton* cancelButton = msgBox.addButton("Cancel", QMessageBox::ButtonRole::NoRole);
msgBox.addButton("Edit", QMessageBox::ButtonRole::YesRole);
msgBox.addButton("Delete", QMessageBox::ButtonRole::DestructiveRole);
msgBox.addButton("Cancel", QMessageBox::ButtonRole::NoRole);
msgBox.setIcon(QMessageBox::Icon::Question);
int ret = msgBox.exec();
if (ret == 0) // QMessageBox::Yes)
if (ret == 0) // QMessageBox::Yes
{
MessageDisplayBookmarkCreator().dispatch();
}
@@ -214,7 +214,7 @@ void QtBookmarkBar::doDisplayBookmarks(const std::vector<std::shared_ptr<Bookmar
m_bookmarkBrowser = new QtBookmarkBrowser();
m_bookmarkBrowser->setupBookmarkBrowser();
}
m_bookmarkBrowser->setBookmarks(bookmarks);
m_bookmarkBrowser->show();
}
src/lib_gui/qt/element/QtBookmarkCategory.cpp
+6 -6
View File
@@ -9,11 +9,11 @@
#include "qt/utility/utilityQt.h"
QtBookmarkCategory::QtBookmarkCategory()
: m_name(NULL)
, m_layout(NULL)
: m_layout(NULL)
, m_name(NULL)
, m_deleteButton(NULL)
, m_id(-1)
, m_treeItem(NULL)
, m_id(-1)
{
setObjectName("bookmark_category");
@@ -133,12 +133,12 @@ void QtBookmarkCategory::deleteClicked()
QMessageBox msgBox;
msgBox.setText("Delete Category");
msgBox.setInformativeText("Do you really want to delete this category AND all containing bookmarks?");
QAbstractButton* yesButton = msgBox.addButton("Delete", QMessageBox::ButtonRole::YesRole);
QAbstractButton* noButton = msgBox.addButton("Keep", QMessageBox::ButtonRole::NoRole);
msgBox.addButton("Delete", QMessageBox::ButtonRole::YesRole);
msgBox.addButton("Keep", QMessageBox::ButtonRole::NoRole);
msgBox.setIcon(QMessageBox::Icon::Question);
int ret = msgBox.exec();
if (ret == 0)
if (ret == 0) // QMessageBox::Yes
{
MessageDeleteBookmarkCategoryWithBookmarks(m_id).dispatch();
}
src/lib_gui/qt/window/QtStartScreen.cpp
+6 -9
View File
@@ -51,20 +51,17 @@ void QtRecentProjectButton::handleButtonClick()
}
else
{
std::string text = "Couldn't find " + m_projectFilePath.str()
+ " in your filesystem. Delete it from this recent Proejct list?";
// int ret = QMessageBox::question(this, "Missing Project File", text.c_str(), QMessageBox::Yes | QMessageBox::No);
QMessageBox msgBox;
msgBox.setText("Missing Project File");
msgBox.setInformativeText(text.c_str());
QAbstractButton* yesButton = msgBox.addButton("Delete", QMessageBox::ButtonRole::YesRole);
QAbstractButton* noButton = msgBox.addButton("Keep", QMessageBox::ButtonRole::NoRole);
msgBox.setInformativeText((
"Couldn't find " + m_projectFilePath.str() + " in your filesystem. Delete it from this recent Proejct list?"
).c_str());
msgBox.addButton("Delete", QMessageBox::ButtonRole::YesRole);
msgBox.addButton("Keep", QMessageBox::ButtonRole::NoRole);
msgBox.setIcon(QMessageBox::Icon::Question);
int ret = msgBox.exec();
if (ret == 0) // QMessageBox::Yes)
if (ret == 0) // QMessageBox::Yes
{
std::vector<FilePath> recentProjects = ApplicationSettings::getInstance()->getRecentProjects();
const int maxRecentProjectsCount = ApplicationSettings::getInstance()->getMaxRecentProjectsCount();