Commit f867f9cf authored by François Cartegnie's avatar François Cartegnie 🤞

Qt: move validators

parent c73cb845
......@@ -111,6 +111,7 @@ libqt4_plugin_la_SOURCES = \
util/qmenuview.cpp util/qmenuview.hpp \
util/qt_dirs.cpp util/qt_dirs.hpp \
util/pictureflow.cpp util/pictureflow.hpp \
util/validators.cpp util/validators.hpp \
util/buttons/BrowseButton.cpp util/buttons/BrowseButton.hpp \
util/buttons/DeckButtonsLayout.cpp util/buttons/DeckButtonsLayout.hpp \
util/buttons/RoundButton.cpp util/buttons/RoundButton.hpp \
......@@ -199,6 +200,7 @@ nodist_libqt4_plugin_la_SOURCES = \
util/qmenuview.moc.cpp \
util/qvlcapp.moc.cpp \
util/pictureflow.moc.cpp \
util/validators.moc.cpp \
util/buttons/RoundButton.moc.cpp \
util/buttons/DeckButtonsLayout.moc.cpp \
util/buttons/BrowseButton.moc.cpp \
......
......@@ -35,6 +35,7 @@
#include "dialogs/open.hpp"
#include "dialogs_provider.hpp" /* Open Subtitle file */
#include "util/qt_dirs.hpp"
#include "util/validators.hpp"
#include <vlc_intf_strings.h>
#include <vlc_modules.h>
#include <vlc_plugin.h>
......@@ -702,16 +703,6 @@ void NetOpenPanel::updateMRL()
emit mrlUpdated( qsl, "" );
}
QValidator::State UrlValidator::validate( QString& str, int& ) const
{
str = str.trimmed();
if( str.contains( ' ' ) )
return QValidator::Invalid;
if( !str.contains( "://" ) )
return QValidator::Intermediate;
return QValidator::Acceptable;
}
/**************************************************************************
* Open Capture device ( DVB, PVR, V4L, and similar ) *
**************************************************************************/
......
......@@ -148,14 +148,6 @@ public slots:
virtual void updateMRL();
};
class UrlValidator : public QValidator
{
Q_OBJECT
public:
UrlValidator( QObject *parent ) : QValidator( parent ) { }
virtual QValidator::State validate( QString&, int& ) const;
};
class DiscOpenPanel: public OpenPanel
{
Q_OBJECT
......
/*****************************************************************************
* validators.cpp : Custom Input validators
****************************************************************************
* Copyright (C) 2006-2013 the VideoLAN team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "validators.hpp"
QValidator::State UrlValidator::validate( QString& str, int& ) const
{
str = str.trimmed();
if( str.contains( ' ' ) )
return QValidator::Invalid;
if( !str.contains( "://" ) )
return QValidator::Intermediate;
return QValidator::Acceptable;
}
/*****************************************************************************
* validators.hpp : Custom Input validators
****************************************************************************
* Copyright (C) 2006-2013 the VideoLAN team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
#ifndef VALIDATORS_HPP
#define VALIDATORS_HPP
#include <QValidator>
class UrlValidator : public QValidator
{
Q_OBJECT
public:
UrlValidator( QObject *parent ) : QValidator( parent ) { }
virtual QValidator::State validate( QString&, int& ) const;
};
#endif // VALIDATORS_HPP
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