Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Jonas Kvinge 2018-11-17 15:49:29 +01:00 committed by John Maguire
parent 8c198a99a5
commit 1d5783b846
9 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/qocoa/qocoa_mac.h vendored
View File

@ -22,10 +22,10 @@ THE SOFTWARE.
#include <AppKit/NSImage.h>
#include <Foundation/NSString.h>
#include <QMacCocoaViewContainer>
#include <QString>
#include <QVBoxLayout>
#include <QtMacExtras>
#include <QMacCocoaViewContainer>
static inline NSString* fromQString(const QString &string)
{
@ -47,8 +47,7 @@ static inline NSImage* fromQPixmap(const QPixmap &pixmap)
return [[NSImage alloc] initWithCGImage:cgImage size:NSZeroSize];
}
static inline void setupLayout(NSView *cocoaView, QWidget *parent)
{
static inline void setupLayout(NSView* cocoaView, QWidget* parent) {
parent->setAttribute(Qt::WA_NativeWindow);
QVBoxLayout* layout = new QVBoxLayout(parent);
layout->setMargin(0);

3
3rdparty/qtsingleapplication/qtlocalpeer.cpp vendored
View File

@ -111,8 +111,7 @@ bool QtLocalPeer::isClient()
if (lockFile.isLocked())
return false;
if (!lockFile.lock(QtLockedFile::WriteLock, false))
return true;
if (!lockFile.lock(QtLockedFile::WriteLock, false)) return true;
bool res = server->listen(socketName);
#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(4,5,0))

19
3rdparty/qtsingleapplication/qtlockedfile_win.cpp vendored
View File

@ -60,7 +60,10 @@ Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)
if (doCreate) {
#if (QT_VERSION < 0x050000)
QT_WA({ mutex = CreateMutexW(nullptr, FALSE, (WCHAR*)mname.utf16()); },
{ mutex = CreateMutexA(nullptr, FALSE, mname.toLocal8Bit().constData()); } );
{
mutex =
CreateMutexA(nullptr, FALSE, mname.toLocal8Bit().constData());
});
#else
mutex = CreateMutexW(nullptr, FALSE, (WCHAR*)mname.utf16());
#endif
@ -71,10 +74,18 @@ Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)
}
else {
#if (QT_VERSION < 0x050000)
QT_WA( { mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (WCHAR*)mname.utf16()); },
{ mutex = OpenMutexA(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, mname.toLocal8Bit().constData()); } );
QT_WA(
{
mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE,
(WCHAR*)mname.utf16());
},
{
mutex = OpenMutexA(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE,
mname.toLocal8Bit().constData());
});
#else
mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (WCHAR*)mname.utf16());
mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE,
(WCHAR*)mname.utf16());
#endif
if (!mutex) {
if (GetLastError() != ERROR_FILE_NOT_FOUND)

4
src/core/gnomeglobalshortcutbackend.cpp
View File

@ -18,10 +18,10 @@
*/
#include "config.h"
#include "gnomeglobalshortcutbackend.h"
#include "globalshortcuts.h"
#include "core/closure.h"
#include "core/logging.h"
#include "globalshortcuts.h"
#include "gnomeglobalshortcutbackend.h"
#ifdef HAVE_DBUS
#include <dbus/gnomesettingsdaemon.h>

2
src/covers/albumcoverloader.h
View File

@ -21,8 +21,8 @@
#ifndef COVERS_ALBUMCOVERLOADER_H_
#define COVERS_ALBUMCOVERLOADER_H_
#include "config.h"
#include "albumcoverloaderoptions.h"
#include "config.h"
#include "core/song.h"
#include <QImage>