mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

CentOS: More build fixes

Browse Source
This commit is contained in:
Markus Goetz 2017-02-08 11:39:28 +01:00
parent e7be4faac8
commit df773ea8bb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/socketapi.cpp
View File

@ -60,9 +60,6 @@
#define DEBUG qDebug() << "SocketApi: "
Q_DECLARE_METATYPE(OCC::SocketListener)
static inline QString removeTrailingSlash(QString path)
{
Q_ASSERT(path.endsWith(QLatin1Char('/')));
@ -113,7 +110,7 @@ class SocketListener {
public:
QIODevice* socket;
SocketListener(QIODevice* socket = nullptr) : socket(socket) { }
SocketListener(QIODevice* socket = 0) : socket(socket) { }
void sendMessage(const QString& message, bool doWait = false) const
{
@ -517,3 +514,5 @@ QString SocketApi::buildRegisterPathMessage(const QString& path)
}
} // namespace OCC
Q_DECLARE_METATYPE(OCC::SocketListener)

2
test/syncenginetestutils.h
View File

@ -226,7 +226,7 @@ public:
etag = file->etag;
return file;
}
return nullptr;
return 0;
}
FileInfo *createDir(const QString &relativePath) {