Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
354315a7
Commit
354315a7
authored
13 years ago
by
Emmanuel Lepage
Browse files
Options
Downloads
Patches
Plain Diff
[ #7901 ] Fix compiler warnings
parent
b17f51cf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
kde/src/CallView.cpp
+1
-7
1 addition, 7 deletions
kde/src/CallView.cpp
kde/src/CallView.h
+3
-2
3 additions, 2 deletions
kde/src/CallView.h
kde/src/widgets/TranslucentButtons.cpp
+1
-1
1 addition, 1 deletion
kde/src/widgets/TranslucentButtons.cpp
with
5 additions
and
10 deletions
kde/src/CallView.cpp
+
1
−
7
View file @
354315a7
...
...
@@ -48,7 +48,7 @@
///Retrieve current and older calls from the daemon, fill history and the calls TreeView and enable drag n' drop
CallView
::
CallView
(
QWidget
*
parent
)
:
QTreeWidget
(
parent
),
m_pCallPendingTransfer
(
0
)
,
m_pActiveOverlay
(
0
)
CallView
::
CallView
(
QWidget
*
parent
)
:
QTreeWidget
(
parent
),
m_
pActiveOverlay
(
0
),
m_
pCallPendingTransfer
(
0
)
{
//Widget part
setAcceptDrops
(
true
);
...
...
@@ -116,12 +116,6 @@ void CallView::dragLeaveEvent ( QDragLeaveEvent *e )
e
->
accept
();
}
///Add some child to the QTreeWidgetItem to show drop options (conference or transfer)
void
CallView
::
showDropOptions
(
CallTreeItem
*
widget
)
{
//TODO remove?
}
///Proxy to handle transfer mime data
void
CallView
::
transferDropEvent
(
Call
*
call
,
QMimeData
*
data
)
{
...
...
This diff is collapsed.
Click to expand it.
kde/src/CallView.h
+
3
−
2
View file @
354315a7
...
...
@@ -56,7 +56,7 @@ class CallTreeItemDelegate : public QItemDelegate
class
CallViewOverlay
:
public
QWidget
{
Q_OBJECT
public:
CallViewOverlay
(
QWidget
*
parent
)
:
QWidget
(
parent
),
m_pIcon
(
0
),
m_enabled
(
true
),
black
(
"black"
)
,
m_pTimer
(
0
)
CallViewOverlay
(
QWidget
*
parent
)
:
QWidget
(
parent
),
m_pIcon
(
0
),
m_
pTimer
(
0
),
m_
enabled
(
true
),
black
(
"black"
)
{
black
.
setAlpha
(
75
);
}
...
...
@@ -86,10 +86,12 @@ public:
}
protected
:
void
paintEvent
(
QPaintEvent
*
event
)
{
Q_UNUSED
(
event
)
QPainter
customPainter
(
this
);
customPainter
.
fillRect
(
rect
(),
black
);
}
virtual
void
resizeEvent
(
QResizeEvent
*
e
)
{
Q_UNUSED
(
e
)
if
(
m_pIcon
)
{
m_pIcon
->
setMinimumSize
(
100
,
100
);
m_pIcon
->
move
(
width
()
-
100
,
height
()
-
100
);
...
...
@@ -156,7 +158,6 @@ class CallView : public QTreeWidget {
Call
*
addConference
(
Call
*
conf
);
bool
conferenceChanged
(
Call
*
conf
);
void
conferenceRemoved
(
Call
*
conf
);
void
showDropOptions
(
CallTreeItem
*
widget
);
virtual
void
keyPressEvent
(
QKeyEvent
*
event
);
...
...
This diff is collapsed.
Click to expand it.
kde/src/widgets/TranslucentButtons.cpp
+
1
−
1
View file @
354315a7
...
...
@@ -26,7 +26,7 @@ TranslucentButtons::~TranslucentButtons()
void
TranslucentButtons
::
paintEvent
(
QPaintEvent
*
event
)
{
Q_UNUSED
(
event
)
QPainter
customPainter
(
this
);
//kDebug() << m_CurrentColor.name();
//customPainter.setBackgroundMode( Qt::OpaqueMode );
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment