mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 05:45:42 +03:00
Namespace fixes
This commit is contained in:
parent
3016844dd7
commit
a42709f814
12 changed files with 15 additions and 15 deletions
|
@ -112,7 +112,7 @@ void AccessManager::slotAuthenticationRequired(QNetworkReply *reply, QAuthentica
|
|||
}
|
||||
#else
|
||||
Q_UNUSED(reply) Q_UNUSED(authenticator)
|
||||
Q_ASSERT(!"MirallAccessManager::slotAuthenticationRequired called");
|
||||
Q_ASSERT(!"OCC::AccessManager::slotAuthenticationRequired called");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <QTimer>
|
||||
#include <QObject>
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
// Because of the many layers of buffering inside Qt (and probably the OS and the network)
|
||||
// we cannot lower this value much more. If we do, the estimated bw will be very high
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <QTimer>
|
||||
#include <QIODevice>
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
class UploadDevice;
|
||||
class GETFileJob;
|
||||
|
|
|
@ -555,13 +555,13 @@ void ConfigFile::setMonoIcons(bool useMonoIcons)
|
|||
settings.setValue(QLatin1String(monoIconsC), useMonoIcons);
|
||||
}
|
||||
|
||||
bool MirallConfigFile::crashReporter() const
|
||||
bool ConfigFile::crashReporter() const
|
||||
{
|
||||
QSettings settings(configFile(), QSettings::IniFormat);
|
||||
return settings.value(QLatin1String(crashReporterC), true).toBool();
|
||||
}
|
||||
|
||||
void MirallConfigFile::setCrashReporter(bool enabled)
|
||||
void ConfigFile::setCrashReporter(bool enabled)
|
||||
{
|
||||
QSettings settings(configFile(), QSettings::IniFormat);
|
||||
settings.setValue(QLatin1String(crashReporterC), enabled);
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <QBuffer>
|
||||
#include <QFile>
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
class GETFileJob : public AbstractNetworkJob {
|
||||
Q_OBJECT
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "owncloudpropagator_p.h"
|
||||
#include "account.h"
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
DeleteJob::DeleteJob(Account* account, const QString& path, QObject* parent)
|
||||
: AbstractNetworkJob(account, path, parent)
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "owncloudpropagator.h"
|
||||
#include "networkjobs.h"
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
class DeleteJob : public AbstractNetworkJob {
|
||||
Q_OBJECT
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "syncjournalfilerecord.h"
|
||||
#include <QFile>
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
void PropagateRemoteMkdir::start()
|
||||
{
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "owncloudpropagator.h"
|
||||
#include "networkjobs.h"
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
class PropagateRemoteMkdir : public PropagateItemJob {
|
||||
Q_OBJECT
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "syncjournalfilerecord.h"
|
||||
#include <QFile>
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
MoveJob::MoveJob(Account* account, const QString& path,
|
||||
const QString &destination, QObject* parent)
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "owncloudpropagator.h"
|
||||
#include "networkjobs.h"
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
class MoveJob : public AbstractNetworkJob {
|
||||
Q_OBJECT
|
||||
|
@ -43,10 +43,10 @@ public:
|
|||
: PropagateItemJob(propagator, item) {}
|
||||
void start() Q_DECL_OVERRIDE;
|
||||
void abort() Q_DECL_OVERRIDE;
|
||||
JobParallelism parallelism() Q_DECL_OVERRIDE { return Mirall::PropagatorJob::WaitForFinishedInParentDirectory; }
|
||||
JobParallelism parallelism() Q_DECL_OVERRIDE { return OCC::PropagatorJob::WaitForFinishedInParentDirectory; }
|
||||
private slots:
|
||||
void slotMoveJobFinished();
|
||||
void finalize();
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <QDir>
|
||||
#include <cmath>
|
||||
|
||||
namespace Mirall {
|
||||
namespace OCC {
|
||||
|
||||
/**
|
||||
* The mtime of a file must be at least this many milliseconds in
|
||||
|
|
Loading…
Reference in a new issue