Commit 0c989038 authored by Harald Sitter's avatar Harald Sitter 🏳️‍🌈
Browse files

some krazy fixes

parent fccb71d3
......@@ -53,7 +53,8 @@ public:
/**
* Constructs a device info object and sets it's device identifiers.
*/
DeviceInfo(const QByteArray& name, const QString& description = "", bool isAdvanced = true);
explicit DeviceInfo(const QByteArray &name, const QString &description = "",
bool isAdvanced = true);
int id;
QByteArray name;
......
......@@ -208,7 +208,7 @@ QStringList LibVLC::findAllLibVlcPaths()
QSettings settings(QSettings::SystemScope, "VideoLAN", "VLC");
QString vlcVersion = settings.value("Version").toString();
QString vlcInstallDir = settings.value("InstallDir").toString();
if (vlcVersion.startsWith("1.1") && !vlcInstallDir.isEmpty()) {
if (vlcVersion.startsWith(QLatin1String("1.1")) && !vlcInstallDir.isEmpty()) {
paths << vlcInstallDir % QLatin1Char('\\') % QLatin1Literal("libvlc.dll");
return paths;
} else {
......
......@@ -317,7 +317,7 @@ void MediaObject::setSource(const MediaSource &source)
mrl = url.toEncoded();
}
loadMedia(mrl);
} // Keep these braces and the follwing break as-is, some compilers fall over the var decl above.
} // Keep these braces and the following break as-is, some compilers fall over the var decl above.
break;
case MediaSource::Disc:
switch (source.discType()) {
......@@ -359,13 +359,13 @@ void MediaObject::setSource(const MediaSource &source)
*
* TODO investigate what happens
*/
if (deviceName.startsWith("default")) {
if (deviceName.startsWith(QLatin1String("default"))) {
deviceName.replace(0, 7, "hw");
}
if (deviceName.startsWith("plughw")) {
if (deviceName.startsWith(QLatin1String("plughw"))) {
deviceName.replace(0, 6, "hw");
}
if (deviceName.startsWith("x-phonon")) {
if (deviceName.startsWith(QLatin1String("x-phonon"))) {
deviceName.replace(0, 8, "hw");
}
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
*****************************************************************************/
#ifndef PHONON_VLC_WIDGETNOPAINTEVENT_H
#define PHONON_VLC_WIDGETNOPAINTEVENT_H
#ifndef PHONON_VLC_OVERLAYWIDGET_H
#define PHONON_VLC_OVERLAYWIDGET_H
#include <QtGui/QWidget>
......@@ -72,4 +72,4 @@ protected:
}
} // Namespace Phonon::VLC
#endif // PHONON_VLC_WIDGETNOPAINTEVENT_H
#endif // PHONON_VLC_OVERLAYWIDGET_H
......@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PHONON_IODEVICEREADER_H
#define PHONON_IODEVICEREADER_H
#ifndef PHONON_STREAMREADER_H
#define PHONON_STREAMREADER_H
#include <phonon/mediasource.h>
#include <phonon/streaminterface.h>
......@@ -29,9 +29,6 @@
#include <QtCore/QMutex>
#include <QtCore/QWaitCondition>
QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
namespace Phonon
......@@ -111,6 +108,4 @@ protected:
#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
QT_END_NAMESPACE
#endif
#endif // PHONON_STREAMREADER_H
......@@ -109,7 +109,7 @@ public:
* This function is public so that the compiler does not fall over.
*
* @param data pointer to 'this'
* @param id TODO: dont know that off the top of my head
* @param id TODO: don't know that off the top of my head
* @param pixels the pixel buffer of the current frame
*
* @see lock()
......
......@@ -181,7 +181,7 @@ public:
* This function is public so that the compiler does not fall over.
*
* \param data pointer to 'this'
* \param id TODO: dont know that off the top of my head
* \param id TODO: don't know that off the top of my head
* \param pixels the pixel buffer of the current frame
*
* \see lock()
......@@ -281,7 +281,7 @@ private:
QImage *m_img;
/**
* Pending video adjusts the appliction tried to set before we actually
* Pending video adjusts the application tried to set before we actually
* had a video to set them on.
*/
QHash<QByteArray, qreal> m_pendingAdjusts;
......
#ifndef VLCMACWIDGET_H
#define VLCMACWIDGET_H
#include <QtGui>
#include <QtGui/QMacCocoaViewContainer>
#import <qmaccocoaviewcontainer_mac.h>
......
......@@ -2,7 +2,7 @@
#import <Cocoa/Cocoa.h>
#import "nsvideoview.h"
#include <QtDebug>
#include <QtCore/QtDebug>
VlcMacWidget::VlcMacWidget(QWidget *parent) : QMacCocoaViewContainer(0, parent)
{
......
Supports Markdown
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