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

Rename qt4.hpp to qt.hpp

parent bd383a82
......@@ -33,7 +33,7 @@ gui_LTLIBRARIES = $(LTLIBqt)
EXTRA_LTLIBRARIES = libqt_plugin.la
libqt_plugin_la_SOURCES = \
qt.cpp qt4.hpp \
qt.cpp qt.hpp \
menus.cpp menus.hpp \
main_interface.cpp main_interface.hpp \
dialogs_provider.cpp dialogs_provider.hpp \
......
......@@ -28,7 +28,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "util/singleton.hpp"
#include <QObject>
......
......@@ -26,7 +26,7 @@
#include "seekpoints.hpp"
#include "qt4.hpp"
#include "qt.hpp"
#include "input_manager.hpp"
SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :
......
......@@ -23,7 +23,7 @@
# include <config.h>
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "variables.hpp"
QVLCVariable::QVLCVariable (vlc_object_t *obj, const char *varname, int type,
......
......@@ -25,7 +25,7 @@
# include <config.h>
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include <QObject>
#include <vlc_common.h>
......
......@@ -28,7 +28,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include <QFrame>
#include <QString>
......
......@@ -28,7 +28,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "input_manager.hpp"
#include <vlc_vout.h> /* vout_thread_t for aspect ratio combobox */
......
......@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "qt4.hpp"
#include "qt.hpp"
#include <vlc_epg.h>
......
......@@ -23,7 +23,7 @@
#ifndef EPGCHANNELS_HPP
#define EPGCHANNELS_HPP
#include "qt4.hpp"
#include "qt.hpp"
#include <QWidget>
......
......@@ -33,7 +33,7 @@
#include "EPGItem.hpp"
#include "EPGView.hpp"
#include "qt4.hpp"
#include "qt.hpp"
EPGItem::EPGItem( vlc_epg_event_t *data, EPGView *view )
: m_view( view )
......
......@@ -24,7 +24,7 @@
#ifndef EPGITEM_H
#define EPGITEM_H
#include "qt4.hpp"
#include "qt.hpp"
#include <vlc_epg.h>
#include <QGraphicsItem>
......
......@@ -24,7 +24,7 @@
#ifndef EPGRULER_H
#define EPGRULER_H
#include "qt4.hpp"
#include "qt.hpp"
#include <QWidget>
#include <QDateTime>
......
......@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "qt4.hpp"
#include "qt.hpp"
#include <vlc_epg.h>
......
......@@ -24,7 +24,7 @@
#ifndef EPGVIEW_H
#define EPGVIEW_H
#include "qt4.hpp"
#include "qt.hpp"
#include <vlc_epg.h>
......
......@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "qt4.hpp"
#include "qt.hpp"
#include <vlc_epg.h>
#include "input_manager.hpp"
......
......@@ -24,7 +24,7 @@
#ifndef EPGWIDGET_H
#define EPGWIDGET_H
#include "qt4.hpp"
#include "qt.hpp"
#include <vlc_epg.h>
......
......@@ -42,7 +42,7 @@
#include "components/extended_panels.hpp"
#include "dialogs/preferences.hpp"
#include "qt4.hpp"
#include "qt.hpp"
#include "input_manager.hpp"
#include "util/qt_dirs.hpp"
#include "util/customwidgets.hpp"
......
......@@ -31,7 +31,7 @@
#include <vlc_common.h>
#include "qt4.hpp"
#include "qt.hpp"
#include "ui/equalizer.h"
#include "ui/video_effects.h"
......
......@@ -27,7 +27,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "components/info_panels.hpp"
#include "components/interface_widgets.hpp"
#include "info_widgets.hpp"
......
......@@ -30,7 +30,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include <vlc_common.h>
#include <QWidget>
......
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "qt4.hpp"
#include "qt.hpp"
#include "info_widgets.hpp"
#include <QGridLayout>
......
......@@ -28,7 +28,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "components/interface_widgets.hpp"
#include "dialogs_provider.hpp"
#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
......
......@@ -30,7 +30,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "components/open_panels.hpp"
#include "dialogs/open.hpp"
#include "dialogs_provider.hpp" /* Open Subtitle file */
......
......@@ -30,7 +30,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
//#include <vlc_playlist.h>
......
......@@ -28,7 +28,7 @@
#include <assert.h>
#include "qt4.hpp"
#include "qt.hpp"
#include "playlist_item.hpp"
#include <vlc_input_item.h>
......
......@@ -27,7 +27,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "components/playlist/playlist_model.hpp"
#include "input_manager.hpp" /* THEMIM */
#include "util/qt_dirs.hpp"
......
......@@ -26,7 +26,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "components/playlist/selector.hpp"
#include "playlist_model.hpp" /* plMimeData */
#include "input_manager.hpp" /* MainInputManager, for podcast */
......
......@@ -29,7 +29,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "util/customwidgets.hpp" /* QFramelessButton */
#include <QTreeWidget>
......
......@@ -28,7 +28,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "components/playlist/playlist.hpp"
#include "components/playlist/vlc_model.hpp"
......
......@@ -28,7 +28,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "sorting.h"
#include "playlist_item.hpp"
......
......@@ -30,7 +30,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include <assert.h>
#include <QWidget>
......
......@@ -24,7 +24,7 @@
#ifndef VLC_QT_PROFILE_SELECTOR_HPP_
#define VLC_QT_PROFILE_SELECTOR_HPP_
#include "qt4.hpp"
#include "qt.hpp"
#include <QWidget>
#include <QSet>
......
......@@ -24,7 +24,7 @@
#ifndef SOUT_WIDGETS_H
#define SOUT_WIDGETS_H
#include "qt4.hpp"
#include "qt.hpp"
#include <QGroupBox>
......
......@@ -40,7 +40,7 @@
#include <QTimer>
#include <QDateTime>
#include "qt4.hpp"
#include "qt.hpp"
#include "input_manager.hpp"
EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
......
......@@ -24,7 +24,7 @@
#ifndef EXTENSIONS_HPP
#define EXTENSIONS_HPP
#include "qt4.hpp"
#include "qt.hpp"
#include <vlc_extensions.h>
#include "assert.h"
......
......@@ -24,7 +24,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include <QDialog>
#include <vlc_interface.h>
......
......@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "qt4.hpp"
#include "qt.hpp"
#include <QWidget>
#include <QSettings>
......
......@@ -26,7 +26,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "dialogs/help.hpp"
#include "util/qt_dirs.hpp"
......
......@@ -28,7 +28,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "util/qvlcframe.hpp"
#include "util/singleton.hpp"
......
......@@ -35,7 +35,7 @@
#include "util/buttons/BrowseButton.hpp"
#include "util/buttons/RoundButton.hpp"
#include "qt4.hpp"
#include "qt.hpp"
#include "input_manager.hpp"
#include <vlc_vout.h> /* vout_thread_t for aspect ratio combobox */
......
......@@ -28,7 +28,7 @@
#include <vlc_intf_strings.h>
#include "qt4.hpp"
#include "qt.hpp"
#include "dialogs_provider.hpp"
#include "input_manager.hpp" /* Load Subtitles */
#include "menus.hpp"
......
......@@ -31,7 +31,7 @@
#include <assert.h>
#include "qt4.hpp"
#include "qt.hpp"
#include "dialogs/open.hpp"
#include <QObject>
......
......@@ -30,7 +30,7 @@
#include <vlc_extensions.h>
#include "qt4.hpp"
#include "qt.hpp"
#include <QObject>
#include <QMenu>
......
......@@ -31,7 +31,7 @@
#include <vlc_input.h>
#include "qt4.hpp"
#include "qt.hpp"
#include "util/singleton.hpp"
#include "adapters/variables.hpp"
......
......@@ -27,7 +27,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp" // Creation
......
......@@ -25,7 +25,7 @@
#ifndef QVLC_MAIN_INTERFACE_H_
#define QVLC_MAIN_INTERFACE_H_
#include "qt4.hpp"
#include "qt.hpp"
#include "util/qvlcframe.hpp"
......
......@@ -25,7 +25,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "util/singleton.hpp"
#include <vlc_events.h>
......
......@@ -25,7 +25,7 @@
#ifndef QVLC_MENUS_H_
#define QVLC_MENUS_H_
#include "qt4.hpp"
#include "qt.hpp"
#include <QObject>
#include <QMenu>
......
......@@ -32,7 +32,7 @@
#include <QDate>
#include <QMutex>
#include "qt4.hpp"
#include "qt.hpp"
#include "input_manager.hpp" /* THEMIM destruction */
#include "dialogs_provider.hpp" /* THEDP creation */
......
/*****************************************************************************
* qt4.hpp : Qt interface
* qt.hpp : Qt interface
****************************************************************************
* Copyright (C) 2006-2009 the VideoLAN team
* $Id$
......
......@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "qt4.hpp"
#include "qt.hpp"
#include "recents.hpp"
#include "dialogs_provider.hpp"
#include "menus.hpp"
......
......@@ -25,7 +25,7 @@
#ifndef QVLC_RECENTS_H_
#define QVLC_RECENTS_H_
#include "qt4.hpp"
#include "qt.hpp"
#include "util/singleton.hpp"
#include <QObject>
......
......@@ -23,7 +23,7 @@
#ifndef SEEKSTYLE_HPP
#define SEEKSTYLE_HPP
#include "qt4.hpp"
#include "qt.hpp"
#include <inttypes.h>
#include <QProxyStyle>
......
......@@ -19,7 +19,7 @@
*****************************************************************************/
#include "animators.hpp"
#include "qt4.hpp"
#include "qt.hpp"
#include <QWidget>
#include <QPixmap>
......
......@@ -21,7 +21,7 @@
#ifndef ANIMATORS_HPP
#define ANIMATORS_HPP
#include "qt4.hpp"
#include "qt.hpp"
#include <QObject>
#include <QList>
......
......@@ -29,7 +29,7 @@
#endif
#include "customwidgets.hpp"
#include "qt4.hpp" /* needed for qtr, but not necessary */
#include "qt.hpp" /* needed for qtr, but not necessary */
#include <QPainter>
#include <QRect>
......
......@@ -38,7 +38,7 @@
#include <QDial>
#include "animators.hpp"
#include "qt4.hpp"
#include "qt.hpp"
class QWidget;
......
......@@ -27,7 +27,7 @@
# include "config.h"
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "util/input_slider.hpp"
#include "util/timetooltip.hpp"
......
......@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "qt4.hpp"
#include "qt.hpp"
#include "util/qmenuview.hpp"
#include "components/playlist/vlc_model.hpp" /* data( IsCurrentRole ) */
......
......@@ -22,7 +22,7 @@
# include <config.h>
#endif
#include "qt4.hpp"
#include "qt.hpp"
#include "qt_dirs.hpp"
#include <vlc_url.h>
......
......@@ -29,7 +29,7 @@
#include <QEvent>
#if defined(Q_OS_WIN)
# include "qt4.hpp"
# include "qt.hpp"
# include <windows.h>
# include "input_manager.hpp"
#endif
......
......@@ -34,7 +34,7 @@
#include <QSettings>
#include <QStyle>
#include "qt4.hpp"
#include "qt.hpp"
class QVLCTools
{
......
......@@ -31,7 +31,7 @@
#include "searchlineedit.hpp"
#include "customwidgets.hpp"
#include "qt4.hpp" /*needed for qtr and CONNECT, but not necessary */
#include "qt.hpp" /*needed for qtr and CONNECT, but not necessary */
#include <QPainter>
#include <QRect>
......
......@@ -28,9 +28,9 @@
#define VLC_QT_SEARCHLINEEDIT_HPP_
#ifdef __APPLE__
#include "../qt4.hpp"
#include "../qt.hpp"
#else
#include "qt4.hpp"
#include "qt.hpp"
#endif
#include <QLineEdit>
......
......@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <vlc_threads.h>
#include "qt4.hpp"
#include "qt.hpp"
template <typename T>
class Singleton
......
......@@ -22,7 +22,7 @@
#ifndef TIMETOOLTIP_H
#define TIMETOOLTIP_H
#include "qt4.hpp"
#include "qt.hpp"
#include <QWidget>
#include <QBitmap>
......
......@@ -21,7 +21,7 @@
#ifndef VALIDATORS_HPP
#define VALIDATORS_HPP
#include "qt4.hpp"
#include "qt.hpp"
#include <QValidator>
......
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