Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-windows
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
savoirfairelinux
jami-client-windows
Commits
01f23849
Commit
01f23849
authored
Jun 22, 2015
by
Edric Milaret
Committed by
Guillaume Roguez
Jun 23, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some memory leaks
Refs #76119 Change-Id: I516d471ec23deeb4bde8eb87bea03f83a7e1a55e
parent
5927d04a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
7 deletions
+28
-7
callwidget.cpp
callwidget.cpp
+6
-4
callwidget.h
callwidget.h
+5
-0
configurationwidget.cpp
configurationwidget.cpp
+3
-2
configurationwidget.h
configurationwidget.h
+2
-0
mainwindow.cpp
mainwindow.cpp
+1
-0
navstack.cpp
navstack.cpp
+5
-1
videoview.cpp
videoview.cpp
+3
-0
wizarddialog.cpp
wizarddialog.cpp
+3
-0
No files found.
callwidget.cpp
View file @
01f23849
...
...
@@ -32,8 +32,6 @@
#include "wizarddialog.h"
#include "windowscontactbackend.h"
#include "historydelegate.h"
#include "contactdelegate.h"
CallWidget
::
CallWidget
(
QWidget
*
parent
)
:
NavWidget
(
Main
,
parent
),
...
...
@@ -92,7 +90,8 @@ CallWidget::CallWidget(QWidget *parent) :
ui
->
historyList
->
setModel
(
CategorizedHistoryModel
::
SortedProxy
::
instance
()
->
model
());
CategorizedHistoryModel
::
SortedProxy
::
instance
()
->
model
()
->
sort
(
0
,
Qt
::
DescendingOrder
);
ui
->
historyList
->
setHeaderHidden
(
true
);
ui
->
historyList
->
setItemDelegate
(
new
HistoryDelegate
());
historyDelegate_
=
new
HistoryDelegate
();
ui
->
historyList
->
setItemDelegate
(
historyDelegate_
);
auto
idx
=
CategorizedHistoryModel
::
SortedProxy
::
instance
()
->
model
()
->
index
(
0
,
0
);
if
(
idx
.
isValid
())
ui
->
historyList
->
setExpanded
(
idx
,
true
);
...
...
@@ -101,7 +100,8 @@ CallWidget::CallWidget(QWidget *parent) :
CategorizedContactModel
::
instance
()
->
setSortAlphabetical
(
false
);
ui
->
contactView
->
setModel
(
CategorizedContactModel
::
instance
());
ui
->
contactView
->
setItemDelegate
(
new
ContactDelegate
());
contactDelegate_
=
new
ContactDelegate
();
ui
->
contactView
->
setItemDelegate
(
contactDelegate_
);
findRingAccount
();
...
...
@@ -115,6 +115,8 @@ CallWidget::~CallWidget()
delete
ui
;
delete
spinner_
;
delete
menu_
;
delete
historyDelegate_
;
delete
contactDelegate_
;
}
void
...
...
callwidget.h
View file @
01f23849
...
...
@@ -28,6 +28,8 @@
#include "navwidget.h"
#include "instantmessagingwidget.h"
#include "historydelegate.h"
#include "contactdelegate.h"
#include "callmodel.h"
#include "video/renderer.h"
...
...
@@ -73,6 +75,9 @@ private:
int
inputVolume_
;
QMenu
*
menu_
;
QMovie
*
spinner_
;
HistoryDelegate
*
historyDelegate_
;
ContactDelegate
*
contactDelegate_
;
private:
void
findRingAccount
();
void
setActualCall
(
Call
*
value
);
...
...
configurationwidget.cpp
View file @
01f23849
...
...
@@ -28,7 +28,6 @@
#include "video/previewmanager.h"
#include "accountserializationadapter.h"
#include "accountstatedelegate.h"
#include "accountmodel.h"
#include "protocolmodel.h"
...
...
@@ -49,7 +48,8 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
ui
->
setupUi
(
this
);
ui
->
accountView
->
setModel
(
accountModel_
);
ui
->
accountView
->
setItemDelegate
(
new
AccountStateDelegate
());
accountStateDelegate_
=
new
AccountStateDelegate
();
ui
->
accountView
->
setItemDelegate
(
accountStateDelegate_
);
isLoading_
=
true
;
ui
->
deviceBox
->
setModel
(
deviceModel_
);
...
...
@@ -81,6 +81,7 @@ void ConfigurationWidget::atExit() {
ConfigurationWidget
::~
ConfigurationWidget
()
{
delete
ui
;
delete
accountStateDelegate_
;
}
void
...
...
configurationwidget.h
View file @
01f23849
...
...
@@ -24,6 +24,7 @@
#include "navwidget.h"
#include "accountdetails.h"
#include "accountstatedelegate.h"
#include "accountmodel.h"
#include "video/devicemodel.h"
...
...
@@ -68,6 +69,7 @@ private:
CodecModel
*
codecModel_
;
bool
isLoading_
;
AccountDetails
*
accountDetails_
;
AccountStateDelegate
*
accountStateDelegate_
;
};
#endif // CONFIGURATIONWIDGET_H
mainwindow.cpp
View file @
01f23849
...
...
@@ -51,6 +51,7 @@ MainWindow::MainWindow(QWidget *parent) :
MainWindow
::~
MainWindow
()
{
delete
ui
;
delete
navStack_
;
}
void
...
...
navstack.cpp
View file @
01f23849
...
...
@@ -42,7 +42,11 @@ NavStack::NavStack(QStackedWidget* bar, QStackedWidget* stack, QWidget *parent)
}
NavStack
::~
NavStack
()
{}
{
for
(
int
i
=
0
;
i
<
END
;
i
++
)
{
delete
navList_
[
i
];
}
}
void
NavStack
::
onNavigationRequested
(
ScreenEnum
screen
)
{
...
...
videoview.cpp
View file @
01f23849
...
...
@@ -70,6 +70,9 @@ VideoView::VideoView(QWidget *parent) :
VideoView
::~
VideoView
()
{
delete
ui
;
delete
overlay_
;
delete
timerLength_
;
delete
fadeAnim_
;
}
void
...
...
wizarddialog.cpp
View file @
01f23849
...
...
@@ -48,6 +48,9 @@ WizardDialog::WizardDialog(QWidget *parent) :
WizardDialog
::~
WizardDialog
()
{
if
(
ui
->
spinnerLabel
->
movie
())
{
delete
ui
->
spinnerLabel
->
movie
();
}
delete
ui
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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