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
49f0cd87
Commit
49f0cd87
authored
Feb 04, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: OpenUrlDialog ain't a Singleton anymore
And remove unnecessary killInstances
parent
af29c151
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
modules/gui/qt4/dialogs/openurl.hpp
modules/gui/qt4/dialogs/openurl.hpp
+2
-3
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+2
-5
No files found.
modules/gui/qt4/dialogs/openurl.hpp
View file @
49f0cd87
...
...
@@ -34,12 +34,11 @@
class
ClickLineEdit
;
class
OpenUrlDialog
:
public
QVLCDialog
,
public
Singleton
<
OpenUrlDialog
>
class
OpenUrlDialog
:
public
QVLCDialog
{
Q_OBJECT
private:
OpenUrlDialog
(
intf_thread_t
*
,
bool
bClipboard
=
true
);
QString
lastUrl
;
bool
bClipboard
,
bShouldEnqueue
;
ClickLineEdit
*
edit
;
...
...
@@ -49,6 +48,7 @@ private slots:
void
play
();
public:
OpenUrlDialog
(
intf_thread_t
*
,
bool
bClipboard
=
true
);
virtual
~
OpenUrlDialog
()
{}
QString
url
()
const
;
...
...
@@ -58,7 +58,6 @@ public:
public
slots
:
virtual
void
close
()
{
play
();
};
friend
class
Singleton
<
OpenUrlDialog
>
;
};
#endif
modules/gui/qt4/dialogs_provider.cpp
View file @
49f0cd87
...
...
@@ -91,14 +91,10 @@ DialogsProvider::~DialogsProvider()
ExtendedDialog
::
killInstance
();
BookmarksDialog
::
killInstance
();
HelpDialog
::
killInstance
();
AboutDialog
::
killInstance
();
#ifdef UPDATE_CHECK
UpdateDialog
::
killInstance
();
#endif
PluginDialog
::
killInstance
();
VLMDialog
::
killInstance
();
OpenUrlDialog
::
killInstance
();
GotoTimeDialog
::
killInstance
();
PodcastConfigDialog
::
killInstance
();
EpgDialog
::
killInstance
();
ErrorsDialog
::
killInstance
();
...
...
@@ -470,7 +466,7 @@ void DialogsProvider::simpleMLAppendDialog()
**/
void
DialogsProvider
::
openUrlDialog
()
{
OpenUrlDialog
*
oud
=
OpenUrlDialog
::
getInstance
(
p_intf
);
OpenUrlDialog
*
oud
=
new
OpenUrlDialog
(
p_intf
);
if
(
oud
->
exec
()
==
QDialog
::
Accepted
)
{
QString
url
=
oud
->
url
();
...
...
@@ -484,6 +480,7 @@ void DialogsProvider::openUrlDialog()
RecentsMRL
::
getInstance
(
p_intf
)
->
addRecent
(
url
);
}
}
delete
oud
;
}
/* Directory */
...
...
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