Commit 4d435abb authored by Andreas Traczyk's avatar Andreas Traczyk

cleanup: fix compiler and qt warnings

Change-Id: I7efee7318a119af5985718ae9279a208028f7052
parent fbbbe4a6
......@@ -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;
......
......@@ -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>
......
......@@ -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();
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment