Commit bad8f53f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

qt4 - Include cleanup.

parent aa48a792
......@@ -24,10 +24,11 @@
#ifndef _PREFSTREE_H_
#define _PREFSTREE_H_
#include <QTreeWidget>
#include <vlc/vlc.h>
#include <vlc_interface.h>
#include <QTreeWidget>
enum
{
TYPE_CATEGORY,
......
......@@ -26,6 +26,7 @@
#include <vlc/vlc.h>
#include <vlc_aout.h>
#include "ui/equalizer.h"
#include "ui/video_effects.h"
......
......@@ -35,6 +35,8 @@
#include <QPushButton>
#include <QHBoxLayout>
#include <QMenu>
#include <QPalette>
#include <QResizeEvent>
#define ICON_SIZE 128
......
......@@ -31,10 +31,10 @@
#include <QWidget>
#include <QFrame>
#include <QPalette>
#include <QResizeEvent>
#include <QPixmap>
class ResizeEvent;
class QPalette;
class QPixmap;
class QLabel;
class QHBoxLayout;
......
......@@ -26,6 +26,7 @@
#define _OPENPANELS_H_
#include <vlc/vlc.h>
#include <QFileDialog>
#include "ui/open_file.h"
......
......@@ -36,21 +36,16 @@
#include "util/customwidgets.hpp"
#include "qt4.hpp"
#include <QLineEdit>
#include <vlc_keys.h>
#include <QString>
#include <QSpinBox>
#include <QDoubleSpinBox>
#include <QVariant>
#include <QComboBox>
#include <QGridLayout>
#include <QPushButton>
#include <QSlider>
#include <QFileDialog>
#include <QFontDialog>
#include <QGroupBox>
#include <vlc_keys.h>
#include <QTreeWidgetItem>
QString formatTooltip(const QString & tooltip)
{
......
......@@ -25,24 +25,30 @@
#ifndef _INFOPANELS_H_
#define _INFOPANELS_H_
#include <vlc/vlc.h>
#include "qt4.hpp"
#include <assert.h>
#include <QWidget>
#include <QTreeWidget>
#include <QCheckBox>
#include <QComboBox>
#include <QLineEdit>
#include <QTreeWidget>
#include <QSpinBox>
#include <QLabel>
#include <QDoubleSpinBox>
#include <QComboBox>
#include <QCheckBox>
#include <QPushButton>
#include <QVector>
#include <QDialog>
#include <QLabel>
#include <QFile>
#include <QPushButton>
#include <QGroupBox>
#include "qt4.hpp"
#include <assert.h>
class QFile;
class QTreeWidget;
class QTreeWidgetItem;
class QGroupBox;
class QGridLayout;
class ConfigControl : public QObject
......
......@@ -23,18 +23,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QString>
#include <QFont>
#include <QToolButton>
#include <QButtonGroup>
#include <QUrl>
#include "components/simple_preferences.hpp"
#include "components/preferences_widgets.hpp"
#include "qt4.hpp"
#include <vlc_config_cat.h>
#include "ui/sprefs_audio.h"
#include "ui/sprefs_input.h"
#include "ui/sprefs_video.h"
......@@ -42,6 +34,15 @@
#include "ui/sprefs_hotkeys.h"
#include "ui/sprefs_interface.h"
#include <vlc_config_cat.h>
#include <QString>
#include <QFont>
#include <QToolButton>
#include <QButtonGroup>
#include <QUrl>
#include <QVBoxLayout>
#define ICON_HEIGHT 64
#define BUTTON_HEIGHT 74
......
......@@ -24,11 +24,11 @@
#ifndef _SIMPLEPREFS_H_
#define _SIMPLEPREFS_H_
#include <QListWidget>
#include <QVBoxLayout>
#include <vlc/vlc.h>
#include <vlc_interface.h>
#include <QWidget>
enum {
SPrefsInterface = 0,
SPrefsAudio,
......
......@@ -21,14 +21,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QTabWidget>
#include <QBoxLayout>
#include "qt4.hpp"
#include "dialogs/extended.hpp"
#include "dialogs_provider.hpp"
#include "util/qvlcframe.hpp"
#include "components/extended_panels.hpp"
#include "qt4.hpp"
#include <QTabWidget>
#include <QBoxLayout>
#include <QHBoxLayout>
ExtendedDialog *ExtendedDialog::instance = NULL;
......
......@@ -18,14 +18,13 @@
*
* You should have received a copy of the GNU General Public License
* 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.
*****************************************************************************/
#ifndef _EXTENDED_DIALOG_H_
#define _EXTENDED_DIALOG_H_
#include "util/qvlcframe.hpp"
#include <QHBoxLayout>
class ExtendedDialog : public QVLCFrame
{
......
......@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* 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.
*****************************************************************************/
#ifndef _INTERACTION_H_
......@@ -26,6 +26,7 @@
#include <vlc/vlc.h>
#include <vlc_interface.h>
#include <QWidget>
class QPushButton;
......
......@@ -26,9 +26,8 @@
#define _MEDIAINFO_DIALOG_H_
#include "util/qvlcframe.hpp"
#include <QTabWidget>
#include <QBoxLayout>
class QTabWidget;
class InfoTab;
class MediaInfoDialog : public QVLCFrame
......
......@@ -28,7 +28,6 @@
#include "util/qvlcframe.hpp"
#include "dialogs_provider.hpp"
#include "ui/open.h"
#include "components/open.hpp"
......
......@@ -18,15 +18,16 @@
*
* You should have received a copy of the GNU General Public License
* 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.
*****************************************************************************/
#ifndef _PLAYLIST_DIALOG_H_
#define _PLAYLIST_DIALOG_H_
#include <QModelIndex>
#include "util/qvlcframe.hpp"
#include <QModelIndex>
class QSignalMapper;
class PLSelector;
class PLPanel;
......
......@@ -23,7 +23,9 @@
#ifndef _SOUT_DIALOG_H_
#define _SOUT_DIALOG_H_
#include <vlc/vlc.h>
#include "ui/sout.h"
#include "util/qvlcframe.hpp"
......
......@@ -25,16 +25,16 @@
#ifndef _DIALOGS_PROVIDER_H_
#define _DIALOGS_PROVIDER_H_
#include <QObject>
#include <QTimer>
#include <QApplication>
#include "dialogs/interaction.hpp"
#include <assert.h>
#include <vlc/vlc.h>
#include <vlc_interface.h>
#include "dialogs/interaction.hpp"
#include <QObject>
#include <QTimer>
#include <QApplication>
#define EXT_FILTER_MEDIA 0x01
#define EXT_FILTER_VIDEO 0x02
#define EXT_FILTER_AUDIO 0x04
......
......@@ -24,10 +24,11 @@
#ifndef _INPUT_MANAGER_H_
#define _INPUT_MANAGER_H_
#include <QObject>
#include <vlc/vlc.h>
#include <vlc_input.h>
#include <QObject>
class InputManager : public QObject
{
Q_OBJECT;
......
......@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* 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.
*****************************************************************************/
#include "qt4.hpp"
......@@ -39,6 +39,8 @@
#include <QKeyEvent>
#include <QUrl>
#include <QSystemTrayIcon>
#include <QSize>
#include <QMenu>
#include <assert.h>
#include <vlc_keys.h>
......
......@@ -18,20 +18,20 @@
*
* You should have received a copy of the GNU General Public License
* 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.
*****************************************************************************/
#ifndef _MAIN_INTERFACE_H_
#define _MAIN_INTERFACE_H_
#include "qt4.hpp"
#include <vlc_aout.h>
#include "ui/main_interface.h"
#include "util/qvlcframe.hpp"
#include <QSize>
#include <vlc_aout.h>
#include <QSystemTrayIcon>
#include <QMenu>
class QSettings;
class QCloseEvent;
......@@ -47,6 +47,7 @@ class VolumeClickHandler;
class VisualSelector;
class ControlsWidget;
class QMenu;
class QSize;
class MainInterface : public QVLCMW
{
......
......@@ -24,6 +24,7 @@
#define _MENUS_H_
#include "qt4.hpp"
#include <QObject>
#include <vector>
......
......@@ -24,15 +24,15 @@
#ifndef _PLAYLIST_MODEL_H_
#define _PLAYLIST_MODEL_H_
#include <vlc/vlc.h>
#include <vlc_input.h>
#include <vlc_playlist.h>
#include <QModelIndex>
#include <QObject>
#include <QEvent>
#include <QMimeData>
#include <vlc/vlc.h>
#include <vlc_input.h>
#include <vlc_playlist.h>
class PLModel;
class PLItem
......
......@@ -27,6 +27,7 @@
#include <vlc/vlc.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <QEvent>
class QApplication;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment