From 4d435abb233873589ab1c75c08d7bdcbccb9cfeb Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Tue, 20 Aug 2019 13:41:02 -0400
Subject: [PATCH] cleanup: fix compiler and qt warnings
Change-Id: I7efee7318a119af5985718ae9279a208028f7052
---
contactpickeritemdelegate.cpp | 2 --
settingswidget.ui | 4 ++--
videooverlay.cpp | 7 +++----
videooverlay.h | 4 ++--
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/contactpickeritemdelegate.cpp b/contactpickeritemdelegate.cpp
index b86bf5b..28b277d 100644
--- a/contactpickeritemdelegate.cpp
+++ b/contactpickeritemdelegate.cpp
@@ -140,7 +140,6 @@ ContactPickerItemDelegate::paintRingContactItem(QPainter* painter,
}
auto leftMargin = dx_ + sizeImage_ + dx_;
- auto rightMargin = dx_;
auto topMargin = 4;
auto bottomMargin = 8;
@@ -202,7 +201,6 @@ ContactPickerItemDelegate::paintSIPContactItem(QPainter* painter,
}
auto leftMargin = dx_ + sizeImage_ + dx_;
- auto rightMargin = dx_;
auto topMargin = 4;
auto bottomMargin = 8;
diff --git a/settingswidget.ui b/settingswidget.ui
index 98ae9fd..a0b9cfe 100644
--- a/settingswidget.ui
+++ b/settingswidget.ui
@@ -716,7 +716,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
+ <normaloff>images/icons/round-folder-24px.svg</normaloff>images/icons/round-folder-24px.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -1061,7 +1061,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
+ <normaloff>images/icons/round-folder-24px.svg</normaloff>images/icons/round-folder-24px.svg</iconset>
</property>
<property name="iconSize">
<size>
diff --git a/videooverlay.cpp b/videooverlay.cpp
index 09c1755..03ee6ff 100644
--- a/videooverlay.cpp
+++ b/videooverlay.cpp
@@ -49,8 +49,7 @@ VideoOverlay::VideoOverlay(QWidget* parent) :
contactPicker_->setVisible(false);
contactPicker_->setTitle(QObject::tr("Select peer to transfer to"));
- connect(ui->transferCallButton, &QPushButton::toggled, this, &VideoOverlay::on_transferButton_toggled);
- connect(contactPicker_, &ContactPicker::contactWillDoTransfer, this, &VideoOverlay::on_transferCall_requested);
+ connect(contactPicker_, &ContactPicker::contactWillDoTransfer, this, &VideoOverlay::slotWillDoTransfer);
}
VideoOverlay::~VideoOverlay()
@@ -190,7 +189,7 @@ VideoOverlay::setTransferCallAvailability(bool visible)
}
void
-VideoOverlay::on_transferButton_toggled(bool checked)
+VideoOverlay::on_transferCallButton_toggled(bool checked)
{
if (callId_.empty() || !checked) {
return;
@@ -224,7 +223,7 @@ VideoOverlay::on_transferButton_toggled(bool checked)
}
void
-VideoOverlay::on_transferCall_requested(const std::string& callId, const std::string& contactUri)
+VideoOverlay::slotWillDoTransfer(const std::string& callId, const std::string& contactUri)
{
auto callModel = LRCInstance::getCurrentCallModel();
contactPicker_->hide();
diff --git a/videooverlay.h b/videooverlay.h
index c7b1c67..6b585f8 100644
--- a/videooverlay.h
+++ b/videooverlay.h
@@ -58,8 +58,8 @@ private slots:
void on_noMicButton_toggled(bool checked);
void on_noVideoButton_toggled(bool checked);
void on_recButton_clicked();
- void on_transferButton_toggled(bool checked);
- void on_transferCall_requested(const std::string& callId, const std::string& contactUri);
+ void on_transferCallButton_toggled(bool checked);
+ void slotWillDoTransfer(const std::string& callId, const std::string& contactUri);
private:
Ui::VideoOverlay* ui;
--
GitLab