Merge branch 'jb46987' into 'master'

Increase delayed exit timeout to 60seconds See merge request mer-core/transfer-engine!12
sailfishos · Sep 20, 2019 · 0883342 · 0883342
2 parents c25f8d7 + 2866593
commit 0883342
Show file tree

Hide file tree

Showing 35 changed files with 822 additions and 820 deletions.
diff --git a/declarative/declarativetransfermodel.cpp b/declarative/declarativetransfermodel.cpp
@@ -1,28 +1,26 @@
-/****************************************************************************************
-**
-** Copyright (C) 2014-2016 Jolla Ltd.
-** Contact: Marko Mattila <marko.mattila@jolla.com>
-** All rights reserved.
-**
-** This file is part of Nemo Transfer Engine package.
-**
-** You may use this file under the terms of the GNU Lesser General
-** Public License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-****************************************************************************************/
+/*
+ * Copyright (c) 2014 - 2019 Jolla Ltd.
+ *
+ * All rights reserved.
+ *
+ * This file is part of Sailfish Transfer Engine package.
+ *
+ * You may use this file under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
 
 #include "declarativetransfermodel.h"
 #include "synchronizelists_p.h"

diff --git a/declarative/declarativetransfermodel.h b/declarative/declarativetransfermodel.h
@@ -1,28 +1,26 @@
-/****************************************************************************************
-**
-** Copyright (C) 2014-2016 Jolla Ltd.
-** Contact: Marko Mattila <marko.mattila@jolla.com>
-** All rights reserved.
-**
-** This file is part of Nemo Transfer Engine package.
-**
-** You may use this file under the terms of the GNU Lesser General
-** Public License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-****************************************************************************************/
+/*
+ * Copyright (c) 2014 - 2019 Jolla Ltd.
+ *
+ * All rights reserved.
+ *
+ * This file is part of Sailfish Transfer Engine package.
+ *
+ * You may use this file under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
 
 #ifndef DECLARATIVETRANSFERMODEL_HH
 #define DECLARATIVETRANSFERMODEL_HH

diff --git a/declarative/plugin.cpp b/declarative/plugin.cpp
@@ -1,28 +1,26 @@
-/****************************************************************************************
-**
-** Copyright (C) 2014 Jolla Ltd.
-** Contact: Marko Mattila <marko.mattila@jolla.com>
-** All rights reserved.
-**
-** This file is part of Nemo Transfer Engine package.
-**
-** You may use this file under the terms of the GNU Lesser General
-** Public License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-****************************************************************************************/
+/*
+ * Copyright (c) 2014 - 2019 Jolla Ltd.
+ *
+ * All rights reserved.
+ *
+ * This file is part of Sailfish Transfer Engine package.
+ *
+ * You may use this file under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
 
 #include <QtGlobal>
 #include <QtQml>

diff --git a/declarative/synchronizelists_p.h b/declarative/synchronizelists_p.h
@@ -1,28 +1,26 @@
-/****************************************************************************************
-**
-** Copyright (C) 2014 Jolla Ltd.
-** Contact: Andrew den Exter <andrew.den.exter@jolla.com>
-** All rights reserved.
-**
-** This file is part of Nemo Transfer Engine package.
-**
-** You may use this file under the terms of the GNU Lesser General
-** Public License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-****************************************************************************************/
+/*
+ * Copyright (c) 2014 - 2019 Jolla Ltd.
+ *
+ * All rights reserved.
+ *
+ * This file is part of Sailfish Transfer Engine package.
+ *
+ * You may use this file under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
 
 #ifndef SYNCHRONIZELISTS_P_H
 #define SYNCHRONIZELISTS_P_H

diff --git a/lib/imageoperation.cpp b/lib/imageoperation.cpp
@@ -1,28 +1,26 @@
-/****************************************************************************************
-**
-** Copyright (C) 2013 Jolla Ltd.
-** Contact: Marko Mattila <marko.mattila@jollamobile.com>
-** All rights reserved.
-**
-** This file is part of Nemo Transfer Engine package.
-**
-** You may use this file under the terms of the GNU Lesser General
-** Public License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-****************************************************************************************/
+/*
+ * Copyright (c) 2013 - 2019 Jolla Ltd.
+ *
+ * All rights reserved.
+ *
+ * This file is part of Sailfish Transfer Engine package.
+ *
+ * You may use this file under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
 
 #include "imageoperation.h"
 #include <QuillMetadata>

diff --git a/lib/imageoperation.h b/lib/imageoperation.h
@@ -1,28 +1,26 @@
-/****************************************************************************************
-**
-** Copyright (C) 2013 Jolla Ltd.
-** Contact: Marko Mattila <marko.mattila@jollamobile.com>
-** All rights reserved.
-**
-** This file is part of Nemo Transfer Engine package.
-**
-** You may use this file under the terms of the GNU Lesser General
-** Public License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-****************************************************************************************/
+/*
+ * Copyright (c) 2013 - 2019 Jolla Ltd.
+ *
+ * All rights reserved.
+ *
+ * This file is part of Sailfish Transfer Engine package.
+ *
+ * You may use this file under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
 
 #ifndef IMAGEOPERATION_H
 #define IMAGEOPERATION_H

diff --git a/lib/mediaitem.cpp b/lib/mediaitem.cpp
@@ -1,28 +1,26 @@
-/****************************************************************************************
-**
-** Copyright (C) 2013 Jolla Ltd.
-** Contact: Marko Mattila <marko.mattila@jollamobile.com>
-** All rights reserved.
-**
-** This file is part of Nemo Transfer Engine package.
-**
-** You may use this file under the terms of the GNU Lesser General
-** Public License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation
-** and appearing in the file license.lgpl included in the packaging
-** of this file.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-****************************************************************************************/
+/*
+ * Copyright (c) 2013 - 2019 Jolla Ltd.
+ *
+ * All rights reserved.
+ *
+ * This file is part of Sailfish Transfer Engine package.
+ *
+ * You may use this file under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file license.lgpl included in the packaging
+ * of this file.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
 
 #include "mediaitem.h"
 #include <QtDebug>