mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Build after merge

Browse source
This commit is contained in:
Daniel Molkentin 2013-08-05 20:14:22 +02:00
parent 0932ee6051
commit c9ddb12b5a
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mirall/application.h
View file

@ -105,7 +105,6 @@ protected slots:
void slotProgressSyncProblem(const QString& folder, const Progress::SyncProblem &problem);
void slotDisplayIdle();
void slotHelp();
void slotShowRecentChanges();
void slotCredentialsFetched();
private:
void setHelp();

2
src/mirall/folder.cpp
View file

@ -21,6 +21,7 @@
#include "mirall/syncresult.h"
#include "mirall/logger.h"
#include "mirall/owncloudinfo.h"
#include "mirall/utility.h"
#include "creds/abstractcredentials.h"
#include <QDebug>
@ -44,7 +45,6 @@ void csyncLogCatcher(CSYNC */*ctx*/,
Folder::Folder(const QString &alias, const QString &path, const QString& secondPath, QObject *parent)
: QObject(parent)
, _pollTimer(new QTimer(this))
, _path(path)
, _secondPath(secondPath)
, _alias(alias)