Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
e0a09aa3
Commit
e0a09aa3
authored
Mar 15, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: cleaning the singletons implementation.
parent
ef65c998
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
43 additions
and
31 deletions
+43
-31
modules/gui/qt4/actions_manager.hpp
modules/gui/qt4/actions_manager.hpp
+4
-2
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/extended_panels.cpp
+1
-2
modules/gui/qt4/dialogs/bookmarks.hpp
modules/gui/qt4/dialogs/bookmarks.hpp
+3
-2
modules/gui/qt4/dialogs/extended.hpp
modules/gui/qt4/dialogs/extended.hpp
+3
-2
modules/gui/qt4/dialogs/help.hpp
modules/gui/qt4/dialogs/help.hpp
+5
-3
modules/gui/qt4/dialogs/mediainfo.hpp
modules/gui/qt4/dialogs/mediainfo.hpp
+3
-3
modules/gui/qt4/dialogs/messages.hpp
modules/gui/qt4/dialogs/messages.hpp
+3
-2
modules/gui/qt4/dialogs/open.hpp
modules/gui/qt4/dialogs/open.hpp
+2
-2
modules/gui/qt4/dialogs/playlist.hpp
modules/gui/qt4/dialogs/playlist.hpp
+2
-2
modules/gui/qt4/dialogs/toolbar.hpp
modules/gui/qt4/dialogs/toolbar.hpp
+3
-2
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+4
-3
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+4
-2
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-1
modules/gui/qt4/recents.hpp
modules/gui/qt4/recents.hpp
+5
-3
No files found.
modules/gui/qt4/actions_manager.hpp
View file @
e0a09aa3
...
...
@@ -66,11 +66,13 @@ public:
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
ActionsManager
();
private:
virtual
~
ActionsManager
();
static
ActionsManager
*
instance
;
ActionsManager
(
intf_thread_t
*
_p_i
,
QObject
*
_parent
);
intf_thread_t
*
p_intf
;
...
...
modules/gui/qt4/components/extended_panels.cpp
View file @
e0a09aa3
...
...
@@ -615,7 +615,6 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent )
ExtV4l2
::~
ExtV4l2
()
{
if
(
box
)
delete
box
;
}
...
...
modules/gui/qt4/dialogs/bookmarks.hpp
View file @
e0a09aa3
...
...
@@ -42,12 +42,13 @@ public:
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
BookmarksDialog
();
private:
BookmarksDialog
(
intf_thread_t
*
);
virtual
~
BookmarksDialog
();
static
BookmarksDialog
*
instance
;
void
update
();
QTreeWidget
*
bookmarksList
;
...
...
modules/gui/qt4/dialogs/extended.hpp
View file @
e0a09aa3
...
...
@@ -42,13 +42,14 @@ public:
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
ExtendedDialog
();
void
showTab
(
int
i
);
private:
ExtendedDialog
(
intf_thread_t
*
);
virtual
~
ExtendedDialog
();
static
ExtendedDialog
*
instance
;
SyncControls
*
syncW
;
...
...
modules/gui/qt4/dialogs/help.hpp
View file @
e0a09aa3
...
...
@@ -50,12 +50,14 @@ public:
return
instance
;
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
instance
=
NULL
;}
virtual
~
HelpDialog
();
{
delete
instance
;
instance
=
NULL
;}
private:
HelpDialog
(
intf_thread_t
*
);
virtual
~
HelpDialog
();
static
HelpDialog
*
instance
;
public
slots
:
void
close
();
};
...
...
@@ -99,7 +101,7 @@ public:
return
instance
;
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
instance
=
NULL
;}
{
delete
instance
;
instance
=
NULL
;}
void
updateNotify
(
bool
);
...
...
modules/gui/qt4/dialogs/mediainfo.hpp
View file @
e0a09aa3
...
...
@@ -45,18 +45,18 @@ public:
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
MediaInfoDialog
();
void
showTab
(
int
);
#if 0
void setInput( input_item_t * );
#endif
private:
virtual
~
MediaInfoDialog
();
static
MediaInfoDialog
*
instance
;
bool
isMainInputInfo
;
...
...
modules/gui/qt4/dialogs/messages.hpp
View file @
e0a09aa3
...
...
@@ -47,14 +47,15 @@ public:
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
MessagesDialog
();
private:
MessagesDialog
(
intf_thread_t
*
);
virtual
~
MessagesDialog
();
static
MessagesDialog
*
instance
;
QTabWidget
*
mainTab
;
QSpinBox
*
verbosityBox
;
...
...
modules/gui/qt4/dialogs/open.hpp
View file @
e0a09aa3
...
...
@@ -64,10 +64,9 @@ public:
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
OpenDialog
();
void
showTab
(
int
=
OPEN_FILE_TAB
);
QString
getMRL
(
bool
b
=
true
);
...
...
@@ -82,6 +81,7 @@ public slots:
private:
OpenDialog
(
QWidget
*
parent
,
intf_thread_t
*
,
bool
b_selectMode
,
int
_action_flag
=
0
,
bool
b_pl
=
true
);
virtual
~
OpenDialog
();
static
OpenDialog
*
instance
;
input_thread_t
*
p_input
;
...
...
modules/gui/qt4/dialogs/playlist.hpp
View file @
e0a09aa3
...
...
@@ -48,12 +48,12 @@ public:
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
PlaylistDialog
();
private:
PlaylistDialog
(
intf_thread_t
*
);
virtual
~
PlaylistDialog
();
void
dropEvent
(
QDropEvent
*
);
void
dragEnterEvent
(
QDragEnterEvent
*
);
...
...
modules/gui/qt4/dialogs/toolbar.hpp
View file @
e0a09aa3
...
...
@@ -69,13 +69,14 @@ public:
return
instance
;
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
instance
=
NULL
;}
virtual
~
ToolbarEditDialog
();
{
delete
instance
;
instance
=
NULL
;}
int
getOptions
()
{
return
flatBox
->
isChecked
()
*
WIDGET_FLAT
+
bigBox
->
isChecked
()
*
WIDGET_BIG
+
!
shinyBox
->
isChecked
()
*
WIDGET_SHINY
;
}
private:
ToolbarEditDialog
(
intf_thread_t
*
);
virtual
~
ToolbarEditDialog
();
static
ToolbarEditDialog
*
instance
;
QCheckBox
*
flatBox
,
*
bigBox
,
*
shinyBox
;
...
...
modules/gui/qt4/dialogs_provider.hpp
View file @
e0a09aa3
...
...
@@ -103,14 +103,13 @@ public:
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
static
bool
isAlive
()
{
return
(
instance
!=
NULL
);
}
virtual
~
DialogsProvider
();
QStringList
showSimpleOpen
(
QString
help
=
QString
(),
int
filters
=
EXT_FILTER_MEDIA
|
...
...
@@ -126,8 +125,10 @@ protected:
private:
DialogsProvider
(
intf_thread_t
*
);
intf_thread_t
*
p_intf
;
virtual
~
DialogsProvider
()
;
static
DialogsProvider
*
instance
;
intf_thread_t
*
p_intf
;
bool
b_isDying
;
void
openDialog
(
int
);
...
...
modules/gui/qt4/input_manager.hpp
View file @
e0a09aa3
...
...
@@ -213,9 +213,9 @@ public:
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
MainInputManager
();
input_thread_t
*
getInput
()
{
return
p_input
;
};
InputManager
*
getIM
()
{
return
im
;
};
...
...
@@ -225,6 +225,8 @@ public:
private:
MainInputManager
(
intf_thread_t
*
);
virtual
~
MainInputManager
();
static
MainInputManager
*
instance
;
void
customEvent
(
QEvent
*
);
...
...
modules/gui/qt4/main_interface.cpp
View file @
e0a09aa3
...
...
@@ -291,7 +291,7 @@ MainInterface::~MainInterface()
ActionsManager
::
killInstance
();
/* Delete the FSC controller */
if
(
fullscreenControls
)
delete
fullscreenControls
;
delete
fullscreenControls
;
/* Save states */
settings
->
beginGroup
(
"MainWindow"
);
...
...
modules/gui/qt4/recents.hpp
View file @
e0a09aa3
...
...
@@ -47,10 +47,9 @@ public:
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
delete
instance
;
instance
=
NULL
;
}
virtual
~
RecentsMRL
();
void
addRecent
(
const
QString
&
);
QList
<
QString
>
recents
();
...
...
@@ -58,9 +57,12 @@ public:
private:
RecentsMRL
(
intf_thread_t
*
_p_intf
);
virtual
~
RecentsMRL
();
static
RecentsMRL
*
instance
;
void
load
();
void
save
();
static
RecentsMRL
*
instance
;
intf_thread_t
*
p_intf
;
QList
<
QString
>
*
stack
;
bool
isActive
;
...
...
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