diff --git a/QsLog/QsLog.cpp b/QsLog/QsLog.cpp index 7eafd151..3114e4f6 100644 --- a/QsLog/QsLog.cpp +++ b/QsLog/QsLog.cpp @@ -220,7 +220,7 @@ Logger::Helper::~Helper() catch(std::exception&) { // you shouldn't throw exceptions from a sink assert(!"exception in logger helper destructor"); - throw; + //CHANGED throw; } } diff --git a/YACReader/render.cpp b/YACReader/render.cpp index fd8f636b..ff4177c9 100644 --- a/YACReader/render.cpp +++ b/YACReader/render.cpp @@ -876,7 +876,7 @@ void Render::nextDoublePage() update(); emit pageChanged(currentIndex); } - else if (hasLoadedComic() && (currentIndex >= numPages()-2)) + else if (hasLoadedComic() && ((unsigned int)currentIndex >= numPages()-2)) { emit isLast(); } diff --git a/YACReader/yacreader_local_client.cpp b/YACReader/yacreader_local_client.cpp index a6175b99..5f246426 100644 --- a/YACReader/yacreader_local_client.cpp +++ b/YACReader/yacreader_local_client.cpp @@ -95,10 +95,10 @@ bool YACReaderLocalClient::requestComicInfo(quint64 libraryId, ComicDB & comic, tries = 0; int dataRead = 0; localSocket->waitForReadyRead(1000); - while(data.length() < totalSize && tries < 20 ) + while((unsigned int)data.length() < totalSize && tries < 20 ) { data.append(localSocket->readAll()); - if(data.length() < totalSize) + if((unsigned int)data.length() < totalSize) localSocket->waitForReadyRead(100); if(data.length() == dataRead) tries++; diff --git a/shortcuts_management/actions_groups_model.cpp b/shortcuts_management/actions_groups_model.cpp index cc5e1488..4dbb1a9b 100644 --- a/shortcuts_management/actions_groups_model.cpp +++ b/shortcuts_management/actions_groups_model.cpp @@ -7,11 +7,15 @@ ActionsGroupsModel::ActionsGroupsModel(QObject *parent) : int ActionsGroupsModel::rowCount(const QModelIndex &parent) const { + Q_UNUSED(parent); + return groups.length(); } int ActionsGroupsModel::columnCount(const QModelIndex &parent) const { + Q_UNUSED(parent); + return 1; } @@ -39,6 +43,8 @@ QVariant ActionsGroupsModel::data(const QModelIndex &index, int role) const QModelIndex ActionsGroupsModel::parent(const QModelIndex &index) const { + Q_UNUSED(index); + return QModelIndex(); } diff --git a/shortcuts_management/actions_shortcuts_model.cpp b/shortcuts_management/actions_shortcuts_model.cpp index ba9b98bc..13408d1f 100644 --- a/shortcuts_management/actions_shortcuts_model.cpp +++ b/shortcuts_management/actions_shortcuts_model.cpp @@ -11,11 +11,15 @@ ActionsShortcutsModel::ActionsShortcutsModel(QObject *parent) : int ActionsShortcutsModel::rowCount(const QModelIndex &parent) const { + Q_UNUSED(parent); + return actions.length(); } int ActionsShortcutsModel::columnCount(const QModelIndex &parent) const { + Q_UNUSED(parent); + return 3; } @@ -78,6 +82,8 @@ QVariant ActionsShortcutsModel::data(const QModelIndex &index, int role) const bool ActionsShortcutsModel::setData(const QModelIndex &index, const QVariant &value, int role) { + Q_UNUSED(role); + if(index.column() == KEYS) { ShortcutsManager sm = ShortcutsManager::getShortcutsManager(); @@ -95,6 +101,8 @@ bool ActionsShortcutsModel::setData(const QModelIndex &index, const QVariant &va QModelIndex ActionsShortcutsModel::parent(const QModelIndex &index) const { + Q_UNUSED(index); + return QModelIndex(); } diff --git a/shortcuts_management/edit_shortcut_item_delegate.cpp b/shortcuts_management/edit_shortcut_item_delegate.cpp index 14c8e906..2fb0a4d9 100644 --- a/shortcuts_management/edit_shortcut_item_delegate.cpp +++ b/shortcuts_management/edit_shortcut_item_delegate.cpp @@ -9,6 +9,9 @@ EditShortcutItemDelegate::EditShortcutItemDelegate(QObject *parent) : QWidget *EditShortcutItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const { + Q_UNUSED(option); + Q_UNUSED(index); + KeySequenceLineEdit * editor = new KeySequenceLineEdit(parent); connect(editor,SIGNAL(editingFinished()),this,SLOT(closeShortcutEditor())); return editor; @@ -31,6 +34,8 @@ void EditShortcutItemDelegate::setModelData(QWidget *editor, QAbstractItemModel void EditShortcutItemDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &mi) const { + Q_UNUSED(mi); + editor->setGeometry(option.rect); } diff --git a/shortcuts_management/edit_shortcuts_dialog.cpp b/shortcuts_management/edit_shortcuts_dialog.cpp index 46dea7a6..c309b907 100644 --- a/shortcuts_management/edit_shortcuts_dialog.cpp +++ b/shortcuts_management/edit_shortcuts_dialog.cpp @@ -86,6 +86,8 @@ void EditShortcutsDialog::resetToDefaults() void EditShortcutsDialog::loadShortcuts(const QModelIndex &mi,const QModelIndex &mi2) { + Q_UNUSED(mi2); + actionsModel->addActions(groupsModel->getActions(mi)); }