Commit 7f829bd1 authored by Filip Roséen's avatar Filip Roséen Committed by Jean-Baptiste Kempf

Qt: fixed include-guards for util

  * renamed include-guards to fix issues with reserved identifiers
  * replaced comments at `#endif` corresponding to include-guards
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent db7a417b
......@@ -24,8 +24,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _CUSTOMWIDGETS_H_
#define _CUSTOMWIDGETS_H_
#ifndef VLC_QT_CUSTOMWIDGETS_HPP_
#define VLC_QT_CUSTOMWIDGETS_HPP_
#include <QLineEdit>
#include <QPushButton>
......
......@@ -23,8 +23,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _INPUTSLIDER_H_
#define _INPUTSLIDER_H_
#ifndef VLC_QT_INPUT_SLIDER_HPP_
#define VLC_QT_INPUT_SLIDER_HPP_
#ifdef HAVE_CONFIG_H
# include "config.h"
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _QMENU_VIEW_H_
#define _QMENU_VIEW_H_
#ifndef VLC_QT_QMENUVIEW_HPP_
#define VLC_QT_QMENUVIEW_HPP_
#include <QMenu>
#include <QAbstractItemModel>
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _QT_DIR_H_
#define _QT_DIR_H_
#ifndef VLC_QT_QT_DIRS_HPP_
#define VLC_QT_QT_DIRS_HPP_
#include <QString>
#include <QDir>
......
......@@ -22,8 +22,8 @@
*****************************************************************************/
#ifndef _QVLC_APP_H_
#define _QVLC_APP_H_
#ifndef VLC_QT_QVLCAPP_HPP_
#define VLC_QT_QVLCAPP_HPP_
#include <QApplication>
#include <QEvent>
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _QVLCFRAME_H_
#define _QVLCFRAME_H_
#ifndef VLC_QT_QVLCFRAME_HPP_
#define VLC_QT_QVLCFRAME_HPP_
#include <QWidget>
#include <QDialog>
......
......@@ -24,8 +24,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _SEARCHLINEEDIT_H_
#define _SEARCHLINEEDIT_H_
#ifndef VLC_QT_SEARCHLINEEDIT_HPP_
#define VLC_QT_SEARCHLINEEDIT_HPP_
#ifdef __APPLE__
#include "../qt4.hpp"
......
......@@ -20,8 +20,8 @@
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _SINGLETON_HPP_
#define _SINGLETON_HPP_
#ifndef VLC_QT_SINGLETON_HPP_
#define VLC_QT_SINGLETON_HPP_
#include <stdlib.h>
#include <vlc_threads.h>
......@@ -68,4 +68,4 @@ T* Singleton<T>::m_instance = NULL;
template <typename T>
vlc_mutex_t Singleton<T>::m_mutex = VLC_STATIC_MUTEX;
#endif // _SINGLETON_HPP_
#endif // include-guard
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