Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
e8f77e2d
Commit
e8f77e2d
authored
Jun 06, 2012
by
Tristan Matthews
Browse files
kde/callview: removed trailing whitespace
parent
4c9d4247
Changes
2
Hide whitespace changes
Inline
Side-by-side
kde/src/CallView.cpp
View file @
e8f77e2d
...
...
@@ -94,7 +94,7 @@ CallView::CallView(QWidget* parent) : QTreeWidget(parent),m_pActiveOverlay(0),m_
setDragEnabled
(
true
);
setAnimated
(
true
);
setUniformRowHeights
(
false
);
CallTreeItemDelegate
*
delegate
=
new
CallTreeItemDelegate
(
this
);
setItemDelegate
(
delegate
);
setSizePolicy
(
QSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Expanding
));
...
...
@@ -106,7 +106,7 @@ CallView::CallView(QWidget* parent) : QTreeWidget(parent),m_pActiveOverlay(0),m_
m_pTransferLE
=
new
KLineEdit
(
m_pTransferOverlay
);
QGridLayout
*
gl
=
new
QGridLayout
(
m_pTransferOverlay
);
QLabel
*
lblImg
=
new
QLabel
(
image
);
m_pTransferOverlay
->
setVisible
(
false
);
m_pTransferOverlay
->
resize
(
size
());
m_pTransferOverlay
->
setCornerWidget
(
lblImg
);
...
...
@@ -114,7 +114,7 @@ CallView::CallView(QWidget* parent) : QTreeWidget(parent),m_pActiveOverlay(0),m_
m_pTransferB
->
setText
(
i18n
(
"Transfer"
));
m_pTransferB
->
setMaximumSize
(
70
,
9000
);
gl
->
addItem
(
new
QSpacerItem
(
0
,
0
,
QSizePolicy
::
Expanding
,
QSizePolicy
::
Minimum
),
0
,
0
,
1
,
3
);
gl
->
addWidget
(
m_pTransferLE
,
1
,
1
,
1
,
2
);
gl
->
addWidget
(
m_pTransferB
,
1
,
4
,
1
,
2
);
...
...
@@ -428,7 +428,7 @@ void CallView::transfer()
SFLPhoneAccessibility
::
getInstance
()
->
say
(
i18n
(
"You call have been transferred to "
)
+
m_pTransferLE
->
text
());
}
}
m_pCallPendingTransfer
=
0
;
m_pTransferLE
->
clear
();
...
...
@@ -467,9 +467,9 @@ void CallView::hideOverlay()
disconnect
(
m_pCallPendingTransfer
,
SIGNAL
(
changed
()),
this
,
SLOT
(
hideOverlay
()));
m_pActiveOverlay
->
setVisible
(
false
);
}
m_pActiveOverlay
=
0
;
m_pCallPendingTransfer
=
0
;
}
//hideOverlay
...
...
@@ -566,7 +566,7 @@ CallTreeItem* CallView::insertItem(QTreeWidgetItem* item, QTreeWidgetItem* paren
{
if
(
!
dynamic_cast
<
QTreeWidgetItem
*>
(
item
)
&&
SFLPhone
::
model
()
->
getCall
(
item
)
&&
!
dynamic_cast
<
QTreeWidgetItem
*>
(
parent
))
return
nullptr
;
if
(
!
item
)
{
kDebug
()
<<
"This is not a valid call"
;
return
0
;
...
...
@@ -782,7 +782,7 @@ CallViewOverlay::CallViewOverlay(QWidget* parent) : QWidget(parent),m_pIcon(0),m
CallViewOverlay
::~
CallViewOverlay
()
{
}
///Add a widget (usually an icon) in the corner
...
...
@@ -845,4 +845,4 @@ void CallViewOverlay::changeVisibility() {
void
CallViewOverlay
::
setAccessMessage
(
QString
message
)
{
m_accessMessage
=
message
;
}
\ No newline at end of file
}
kde/src/CallView.h
View file @
e8f77e2d
...
...
@@ -43,7 +43,7 @@ typedef CallModel<CallTreeItem*,QTreeWidgetItem*> TreeWidgetCallModel;
///@class CallViewOverlay Display overlay on top of the call tree
class
CallViewOverlay
:
public
QWidget
{
Q_OBJECT
public:
//Constructor
CallViewOverlay
(
QWidget
*
parent
);
...
...
@@ -74,7 +74,7 @@ private slots:
class
CallView
:
public
QTreeWidget
{
Q_OBJECT
friend
class
CallTreeItemDelegate
;
public:
CallView
(
QWidget
*
parent
=
0
);
~
CallView
(
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment