Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
2b417691
Commit
2b417691
authored
May 18, 2013
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: make the extensionsManager also available for qt4 as a dialog provider.
parent
f9ec3543
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+0
-4
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+4
-0
No files found.
modules/gui/qt4/main_interface.cpp
View file @
2b417691
...
@@ -32,7 +32,6 @@
...
@@ -32,7 +32,6 @@
#include "main_interface.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp" // Creation
#include "input_manager.hpp" // Creation
#include "actions_manager.hpp" // killInstance
#include "actions_manager.hpp" // killInstance
#include "extensions_manager.hpp" // killInstance
#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
#include "util/qt_dirs.hpp" // toNativeSeparators
#include "util/qt_dirs.hpp" // toNativeSeparators
...
@@ -281,9 +280,6 @@ MainInterface::~MainInterface()
...
@@ -281,9 +280,6 @@ MainInterface::~MainInterface()
/* Be sure to kill the actionsManager... Only used in the MI and control */
/* Be sure to kill the actionsManager... Only used in the MI and control */
ActionsManager
::
killInstance
();
ActionsManager
::
killInstance
();
/* Idem */
ExtensionsManager
::
killInstance
();
/* Delete the FSC controller */
/* Delete the FSC controller */
delete
fullscreenControls
;
delete
fullscreenControls
;
...
...
modules/gui/qt4/qt4.cpp
View file @
2b417691
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#include "input_manager.hpp"
/* THEMIM destruction */
#include "input_manager.hpp"
/* THEMIM destruction */
#include "dialogs_provider.hpp"
/* THEDP creation */
#include "dialogs_provider.hpp"
/* THEDP creation */
#include "main_interface.hpp"
/* MainInterface creation */
#include "main_interface.hpp"
/* MainInterface creation */
#include "extensions_manager.hpp"
/* Extensions manager */
#include "dialogs/help.hpp"
/* Launch Update */
#include "dialogs/help.hpp"
/* Launch Update */
#include "recents.hpp"
/* Recents Item destruction */
#include "recents.hpp"
/* Recents Item destruction */
#include "util/qvlcapp.hpp"
/* QVLCApplication definition */
#include "util/qvlcapp.hpp"
/* QVLCApplication definition */
...
@@ -563,6 +564,9 @@ static void *Thread( void *obj )
...
@@ -563,6 +564,9 @@ static void *Thread( void *obj )
delete
p_mi
;
delete
p_mi
;
}
}
/* */
ExtensionsManager
::
killInstance
();
/* Destroy all remaining windows,
/* Destroy all remaining windows,
because some are connected to some slots
because some are connected to some slots
in the MainInputManager
in the MainInputManager
...
...
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