Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
22168eab
Commit
22168eab
authored
Oct 20, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Qt] Split the QtWinApp to its own file and rename it.
parent
1ec9641c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
44 deletions
+6
-44
modules/gui/qt4/Modules.am
modules/gui/qt4/Modules.am
+1
-0
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+1
-0
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-0
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+2
-13
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+1
-31
No files found.
modules/gui/qt4/Modules.am
View file @
22168eab
...
@@ -242,6 +242,7 @@ noinst_HEADERS = \
...
@@ -242,6 +242,7 @@ noinst_HEADERS = \
util/input_slider.hpp \
util/input_slider.hpp \
util/customwidgets.hpp \
util/customwidgets.hpp \
util/qvlcframe.hpp \
util/qvlcframe.hpp \
util/qvlcapp.hpp \
util/registry.hpp
util/registry.hpp
EXTRA_DIST += \
EXTRA_DIST += \
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
22168eab
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#include "menus.hpp"
#include "menus.hpp"
#include "input_manager.hpp"
#include "input_manager.hpp"
#include "recents.hpp"
#include "recents.hpp"
#include "util/qvlcapp.hpp"
/* The dialogs */
/* The dialogs */
#include "dialogs/playlist.hpp"
#include "dialogs/playlist.hpp"
...
...
modules/gui/qt4/main_interface.cpp
View file @
22168eab
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#include "main_interface.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp"
#include "input_manager.hpp"
#include "util/qvlcframe.hpp"
#include "util/qvlcframe.hpp"
#include "util/qvlcapp.hpp"
#include "util/customwidgets.hpp"
#include "util/customwidgets.hpp"
#include "dialogs_provider.hpp"
#include "dialogs_provider.hpp"
#include "components/interface_widgets.hpp"
#include "components/interface_widgets.hpp"
...
...
modules/gui/qt4/qt4.cpp
View file @
22168eab
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
* along with this program; if not, write to the Free Software
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#ifdef HAVE_CONFIG_H
# include "config.h"
# include "config.h"
#endif
#endif
...
@@ -40,6 +41,7 @@
...
@@ -40,6 +41,7 @@
#include "main_interface.hpp"
#include "main_interface.hpp"
#include "dialogs/help.hpp"
/* update */
#include "dialogs/help.hpp"
/* update */
#include "recents.hpp"
#include "recents.hpp"
#include "util/qvlcapp.hpp"
#ifdef HAVE_X11_XLIB_H
#ifdef HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#include <X11/Xlib.h>
...
@@ -232,19 +234,6 @@ vlc_module_begin();
...
@@ -232,19 +234,6 @@ vlc_module_begin();
#endif
#endif
vlc_module_end
();
vlc_module_end
();
#if defined(Q_WS_WIN)
bool
WinQtApp
::
winEventFilter
(
MSG
*
msg
,
long
*
result
)
{
switch
(
msg
->
message
)
{
case
0x0319
:
/* WM_APPCOMMAND 0x0319 */
DefWindowProc
(
msg
->
hwnd
,
msg
->
message
,
msg
->
wParam
,
msg
->
lParam
);
break
;
}
return
false
;
}
#endif
/* Q_WS_WIN */
/*****************************************************************************
/*****************************************************************************
* Module callbacks
* Module callbacks
*****************************************************************************/
*****************************************************************************/
...
...
modules/gui/qt4/qt4.hpp
View file @
22168eab
/*****************************************************************************
/*****************************************************************************
* qt4.hpp : QT4 interface
* qt4.hpp : QT4 interface
****************************************************************************
****************************************************************************
* Copyright (C) 2006-200
7
the VideoLAN team
* Copyright (C) 2006-200
8
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Authors: Clément Stenac <zorglub@videolan.org>
...
@@ -63,20 +63,6 @@ class DialogsProvider;
...
@@ -63,20 +63,6 @@ class DialogsProvider;
class
VideoWidget
;
class
VideoWidget
;
class
QSettings
;
class
QSettings
;
#include <QApplication>
#if defined(Q_WS_WIN)
class
WinQtApp
:
public
QApplication
{
public:
WinQtApp
(
int
&
argc
,
char
**
argv
,
bool
GUIenabled
)
:
QApplication
(
argc
,
argv
,
GUIenabled
)
{}
~
WinQtApp
()
{}
protected:
bool
winEventFilter
(
MSG
*
msg
,
long
*
result
);
};
#endif
/* Q_WS_WIN */
struct
intf_sys_t
struct
intf_sys_t
{
{
QApplication
*
p_app
;
QApplication
*
p_app
;
...
@@ -162,20 +148,4 @@ static inline QString removeTrailingSlash( QString s )
...
@@ -162,20 +148,4 @@ static inline QString removeTrailingSlash( QString s )
#define toNativeSepNoSlash( a ) toNativeSeparators( removeTrailingSlash( a ) )
#define toNativeSepNoSlash( a ) toNativeSeparators( removeTrailingSlash( a ) )
class
DialogEvent
:
public
QEvent
{
public:
DialogEvent
(
int
_i_dialog
,
int
_i_arg
,
intf_dialog_args_t
*
_p_arg
)
:
QEvent
(
(
QEvent
::
Type
)(
DialogEvent_Type
)
)
{
i_dialog
=
_i_dialog
;
i_arg
=
_i_arg
;
p_arg
=
_p_arg
;
};
virtual
~
DialogEvent
()
{};
int
i_arg
,
i_dialog
;
intf_dialog_args_t
*
p_arg
;
};
#endif
#endif
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