Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
111cbd6a
Commit
111cbd6a
authored
Mar 12, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup: Use the available QSingleton, instead of re-implementing it.
parent
37f37d5d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
33 deletions
+15
-33
src/Gui/About.cpp
src/Gui/About.cpp
+0
-10
src/Gui/About.h
src/Gui/About.h
+5
-5
src/Gui/DockWidgetManager.cpp
src/Gui/DockWidgetManager.cpp
+0
-10
src/Gui/DockWidgetManager.h
src/Gui/DockWidgetManager.h
+5
-3
src/Gui/MainWindow.cpp
src/Gui/MainWindow.cpp
+5
-5
No files found.
src/Gui/About.cpp
View file @
111cbd6a
...
...
@@ -26,8 +26,6 @@
#include <QPlainTextEdit>
#include "About.h"
About
*
About
::
m_instance
=
NULL
;
About
::
About
(
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
@@ -55,14 +53,6 @@ void About::changeEvent( QEvent *e )
}
}
About
*
About
::
instance
()
{
if
(
m_instance
)
return
m_instance
;
m_instance
=
new
About
();
return
m_instance
;
}
void
About
::
setText
(
const
QString
&
filename
,
QPlainTextEdit
*
widget
)
{
QFile
file
(
filename
);
...
...
src/Gui/About.h
View file @
111cbd6a
...
...
@@ -24,17 +24,16 @@
#define ABOUT_H
#include <QDialog>
#include "QSingleton.hpp"
#include "ui_About.h"
class
QPlainTextEdit
;
class
About
:
public
QDialog
class
About
:
public
QDialog
,
public
QSingleton
<
About
>
{
Q_OBJECT
Q_DISABLE_COPY
(
About
)
public:
static
About
*
instance
();
protected:
virtual
void
changeEvent
(
QEvent
*
e
);
...
...
@@ -42,7 +41,8 @@ private:
explicit
About
(
QWidget
*
parent
=
0
);
void
setText
(
const
QString
&
filename
,
QPlainTextEdit
*
widget
);
Ui
::
AboutVLMC
m_ui
;
static
About
*
m_instance
;
friend
class
QSingleton
<
About
>
;
};
#endif // ABOUT_H
src/Gui/DockWidgetManager.cpp
View file @
111cbd6a
...
...
@@ -27,16 +27,6 @@
#include "DockWidgetManager.h"
#include "MainWindow.h"
DockWidgetManager
*
DockWidgetManager
::
m_instance
=
0
;
DockWidgetManager
*
DockWidgetManager
::
instance
(
QObject
*
parent
)
{
if
(
m_instance
==
0
)
m_instance
=
new
DockWidgetManager
(
parent
);
return
(
m_instance
);
}
void
DockWidgetManager
::
setMainWindow
(
MainWindow
*
mainWin
)
{
m_mainWin
=
mainWin
;
...
...
src/Gui/DockWidgetManager.h
View file @
111cbd6a
...
...
@@ -23,6 +23,8 @@
#ifndef DOCKWIDGETMANAGER_H
#define DOCKWIDGETMANAGER_H
#include "QSingleton.hpp"
#include <QObject>
#include <QWidget>
#include <QDockWidget>
...
...
@@ -31,7 +33,7 @@
class
MainWindow
;
class
DockWidgetManager
:
public
QObject
class
DockWidgetManager
:
public
QObject
,
public
QSingleton
<
DockWidgetManager
>
{
Q_OBJECT
...
...
@@ -55,10 +57,10 @@ class DockWidgetManager : public QObject
MainWindow
*
m_mainWin
;
QMap
<
QString
,
QDockWidget
*>
m_dockWidgets
;
static
DockWidgetManager
*
m_instance
;
public
slots
:
void
transLateWidgetTitle
();
friend
class
QSingleton
<
DockWidgetManager
>
;
};
#endif
src/Gui/MainWindow.cpp
View file @
111cbd6a
...
...
@@ -84,7 +84,7 @@ MainWindow::MainWindow( QWidget *parent ) :
initVlmcPreferences
();
// GUI
DockWidgetManager
::
i
nstance
(
this
)
->
setMainWindow
(
this
);
DockWidgetManager
::
getI
nstance
(
this
)
->
setMainWindow
(
this
);
createGlobalPreferences
();
createProjectPreferences
();
initializeDockWidgets
();
...
...
@@ -95,7 +95,7 @@ MainWindow::MainWindow( QWidget *parent ) :
// Translations
connect
(
this
,
SIGNAL
(
translateDockWidgetTitle
()
),
DockWidgetManager
::
i
nstance
(),
SLOT
(
transLateWidgetTitle
()
)
);
DockWidgetManager
::
getI
nstance
(),
SLOT
(
transLateWidgetTitle
()
)
);
// Zoom
connect
(
m_zoomSlider
,
SIGNAL
(
valueChanged
(
int
)
),
...
...
@@ -242,7 +242,7 @@ MainWindow::setupLibrary()
const
ClipRenderer
*
clipRenderer
=
qobject_cast
<
const
ClipRenderer
*>
(
m_clipPreview
->
getGenericRenderer
()
);
Q_ASSERT
(
clipRenderer
!=
NULL
);
DockWidgetManager
::
i
nstance
()
->
addDockedWidget
(
libraryWidget
,
tr
(
"Media Library"
),
DockWidgetManager
::
getI
nstance
()
->
addDockedWidget
(
libraryWidget
,
tr
(
"Media Library"
),
Qt
::
AllDockWidgetAreas
,
QDockWidget
::
AllDockWidgetFeatures
,
Qt
::
LeftDockWidgetArea
);
...
...
@@ -343,7 +343,7 @@ void MainWindow::initializeDockWidgets( void )
m_timeline
->
show
();
setCentralWidget
(
m_timeline
);
DockWidgetManager
*
dockManager
=
DockWidgetManager
::
i
nstance
();
DockWidgetManager
*
dockManager
=
DockWidgetManager
::
getI
nstance
();
m_clipPreview
=
new
PreviewWidget
(
new
ClipRenderer
,
this
);
dockManager
->
addDockedWidget
(
m_clipPreview
,
...
...
@@ -413,7 +413,7 @@ void MainWindow::on_actionPreferences_triggered()
void
MainWindow
::
on_actionAbout_triggered
()
{
About
::
i
nstance
()
->
exec
();
About
::
getI
nstance
()
->
exec
();
}
void
MainWindow
::
on_actionTranscode_triggered
()
...
...
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