aboutsummaryrefslogtreecommitdiff
path: root/backends/cloud
diff options
context:
space:
mode:
authorPeter Bozsó2016-05-28 20:10:38 +0200
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commit81c34adaef269524b1f53adcac722aa6a9730075 (patch)
treeda867e32df6a20b06b2e433948e5f94e17ec73f7 /backends/cloud
parentf4dfaed19d14c309e44d390b44bff571566779a5 (diff)
downloadscummvm-rg350-81c34adaef269524b1f53adcac722aa6a9730075.tar.gz
scummvm-rg350-81c34adaef269524b1f53adcac722aa6a9730075.tar.bz2
scummvm-rg350-81c34adaef269524b1f53adcac722aa6a9730075.zip
Fix comment formatting
Diffstat (limited to 'backends/cloud')
-rw-r--r--backends/cloud/downloadrequest.cpp2
-rw-r--r--backends/cloud/downloadrequest.h2
-rw-r--r--backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp4
-rw-r--r--backends/cloud/dropbox/dropboxlistdirectoryrequest.h4
-rw-r--r--backends/cloud/dropbox/dropboxstorage.cpp4
-rw-r--r--backends/cloud/dropbox/dropboxstorage.h35
-rw-r--r--backends/cloud/folderdownloadrequest.cpp2
-rw-r--r--backends/cloud/folderdownloadrequest.h2
-rw-r--r--backends/cloud/iso8601.cpp4
-rw-r--r--backends/cloud/iso8601.h4
-rw-r--r--backends/cloud/manager.cpp2
-rw-r--r--backends/cloud/manager.h2
-rw-r--r--backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp4
-rw-r--r--backends/cloud/onedrive/onedrivelistdirectoryrequest.h4
-rw-r--r--backends/cloud/onedrive/onedrivestorage.cpp4
-rw-r--r--backends/cloud/onedrive/onedrivestorage.h49
-rw-r--r--backends/cloud/onedrive/onedrivetokenrefresher.cpp4
-rw-r--r--backends/cloud/onedrive/onedrivetokenrefresher.h4
-rw-r--r--backends/cloud/storage.h3
-rw-r--r--backends/cloud/storagefile.cpp2
-rw-r--r--backends/cloud/storagefile.h11
-rw-r--r--backends/cloud/storageinfo.h2
22 files changed, 75 insertions, 79 deletions
diff --git a/backends/cloud/downloadrequest.cpp b/backends/cloud/downloadrequest.cpp
index c7f6f75346..8d5e244e45 100644
--- a/backends/cloud/downloadrequest.cpp
+++ b/backends/cloud/downloadrequest.cpp
@@ -100,4 +100,4 @@ void DownloadRequest::finishBool(bool success) {
if (_boolCallback) (*_boolCallback)(Storage::BoolResponse(this, success));
}
-} //end of namespace Cloud
+} // End of namespace Cloud
diff --git a/backends/cloud/downloadrequest.h b/backends/cloud/downloadrequest.h
index c9c243be44..0bad5df279 100644
--- a/backends/cloud/downloadrequest.h
+++ b/backends/cloud/downloadrequest.h
@@ -50,6 +50,6 @@ public:
virtual void finish();
};
-} //end of namespace Cloud
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
index 04fbf46ac6..6ea90c150d 100644
--- a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
@@ -136,5 +136,5 @@ void DropboxListDirectoryRequest::finishFiles(Common::Array<StorageFile> &files)
if (_filesCallback) (*_filesCallback)(Storage::FileArrayResponse(this, files));
}
-} //end of namespace Dropbox
-} //end of namespace Cloud
+} // End of namespace Dropbox
+} // End of namespace Cloud
diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.h b/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
index e2a9ebf3a4..8539be1e1e 100644
--- a/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
+++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
@@ -55,7 +55,7 @@ public:
virtual void finish();
};
-} //end of namespace Dropbox
-} //end of namespace Cloud
+} // End of namespace Dropbox
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp
index ad6702c967..b1dd865ee2 100644
--- a/backends/cloud/dropbox/dropboxstorage.cpp
+++ b/backends/cloud/dropbox/dropboxstorage.cpp
@@ -248,5 +248,5 @@ void DropboxStorage::getAccessToken(Common::String code) {
ConnMan.addRequest(request);
}
-} //end of namespace Dropbox
-} //end of namespace Cloud
+} // End of namespace Dropbox
+} // End of namespace Cloud
diff --git a/backends/cloud/dropbox/dropboxstorage.h b/backends/cloud/dropbox/dropboxstorage.h
index 59dea9d210..da508d7844 100644
--- a/backends/cloud/dropbox/dropboxstorage.h
+++ b/backends/cloud/dropbox/dropboxstorage.h
@@ -51,17 +51,16 @@ public:
virtual ~DropboxStorage();
/**
- * Storage methods, which are used by CloudManager to save
- * storage in configuration file.
- */
+ * Storage methods, which are used by CloudManager to save
+ * storage in configuration file.
+ */
/**
- * Save storage data using ConfMan.
- * @param keyPrefix all saved keys must start with this prefix.
- * @note every Storage must write keyPrefix + "type" key
- * with common value (e.g. "Dropbox").
- */
-
+ * Save storage data using ConfMan.
+ * @param keyPrefix all saved keys must start with this prefix.
+ * @note every Storage must write keyPrefix + "type" key
+ * with common value (e.g. "Dropbox").
+ */
virtual void saveConfig(Common::String keyPrefix);
/** Public Cloud API comes down there. */
@@ -106,23 +105,23 @@ public:
virtual bool isWorking() { return false; } //TODO
/**
- * Load token and user id from configs and return DropboxStorage for those.
- * @return pointer to the newly created DropboxStorage or 0 if some problem occured.
- */
+ * Load token and user id from configs and return DropboxStorage for those.
+ * @return pointer to the newly created DropboxStorage or 0 if some problem occured.
+ */
static DropboxStorage *loadFromConfig(Common::String keyPrefix);
/**
- * Returns Dropbox auth link.
- */
+ * Returns Dropbox auth link.
+ */
static Common::String getAuthLink();
/**
- * Show message with Dropbox auth instructions. (Temporary)
- */
+ * Show message with Dropbox auth instructions. (Temporary)
+ */
static void authThroughConsole();
};
-} //end of namespace Dropbox
-} //end of namespace Cloud
+} // End of namespace Dropbox
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/folderdownloadrequest.cpp b/backends/cloud/folderdownloadrequest.cpp
index cbd3501772..9c2e8b173a 100644
--- a/backends/cloud/folderdownloadrequest.cpp
+++ b/backends/cloud/folderdownloadrequest.cpp
@@ -115,4 +115,4 @@ void FolderDownloadRequest::finishFiles(Common::Array<StorageFile> &files) {
if (_fileArrayCallback) (*_fileArrayCallback)(Storage::FileArrayResponse(this, files));
}
-} //end of namespace Cloud
+} // End of namespace Cloud
diff --git a/backends/cloud/folderdownloadrequest.h b/backends/cloud/folderdownloadrequest.h
index 949bcad6ee..33fa5992c6 100644
--- a/backends/cloud/folderdownloadrequest.h
+++ b/backends/cloud/folderdownloadrequest.h
@@ -54,6 +54,6 @@ public:
virtual void finish();
};
-} //end of namespace Cloud
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/iso8601.cpp b/backends/cloud/iso8601.cpp
index 12cbb742b8..3bc169ae85 100644
--- a/backends/cloud/iso8601.cpp
+++ b/backends/cloud/iso8601.cpp
@@ -87,5 +87,5 @@ uint32 convertToTimestamp(const Common::String &iso8601Date) {
return minutes * 60 + s;
}
-} //end of namespace ISO8601
-} //end of namespace Cloud
+} // End of namespace ISO8601
+} // End of namespace Cloud
diff --git a/backends/cloud/iso8601.h b/backends/cloud/iso8601.h
index a53b3bb501..6e11322cdb 100644
--- a/backends/cloud/iso8601.h
+++ b/backends/cloud/iso8601.h
@@ -31,7 +31,7 @@ namespace ISO8601 {
/** Returns timestamp corresponding to given ISO 8601 date */
uint32 convertToTimestamp(const Common::String &iso8601Date);
-} //end of namespace ISO8601
-} //end of namespace Cloud
+} // End of namespace ISO8601
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/manager.cpp b/backends/cloud/manager.cpp
index 9e11f0d4bd..959f395243 100644
--- a/backends/cloud/manager.cpp
+++ b/backends/cloud/manager.cpp
@@ -105,4 +105,4 @@ void Manager::syncSaves(Storage::BoolCallback callback) {
if (storage) storage->syncSaves(callback);
}
-} //end of namespace Cloud
+} // End of namespace Cloud
diff --git a/backends/cloud/manager.h b/backends/cloud/manager.h
index 08106e0513..6eaf17bc91 100644
--- a/backends/cloud/manager.h
+++ b/backends/cloud/manager.h
@@ -44,6 +44,6 @@ public:
virtual void syncSaves(Storage::BoolCallback callback);
};
-} //end of namespace Cloud
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp b/backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp
index 2c47852fd1..452c47ac13 100644
--- a/backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp
+++ b/backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp
@@ -134,5 +134,5 @@ void OneDriveListDirectoryRequest::finishFiles(Common::Array<StorageFile> &files
if (_filesCallback) (*_filesCallback)(Storage::FileArrayResponse(this, files));
}
-} //end of namespace OneDrive
-} //end of namespace Cloud
+} // End of namespace OneDrive
+} // End of namespace Cloud
diff --git a/backends/cloud/onedrive/onedrivelistdirectoryrequest.h b/backends/cloud/onedrive/onedrivelistdirectoryrequest.h
index 61eebb2669..ce407c041e 100644
--- a/backends/cloud/onedrive/onedrivelistdirectoryrequest.h
+++ b/backends/cloud/onedrive/onedrivelistdirectoryrequest.h
@@ -58,7 +58,7 @@ public:
virtual void finish();
};
-} //end of namespace OneDrive
-} //end of namespace Cloud
+} // End of namespace OneDrive
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/onedrive/onedrivestorage.cpp b/backends/cloud/onedrive/onedrivestorage.cpp
index c924dbf093..c8b4ab1ad3 100644
--- a/backends/cloud/onedrive/onedrivestorage.cpp
+++ b/backends/cloud/onedrive/onedrivestorage.cpp
@@ -271,5 +271,5 @@ void OneDriveStorage::authThroughConsole() {
debug("http://wiki.scummvm.org/index.php/User_Manual/Configuring_ScummVM#Using_the_configuration_file_to_configure_ScummVM\n");
}
-} //end of namespace OneDrive
-} //end of namespace Cloud
+} // End of namespace OneDrive
+} // End of namespace Cloud
diff --git a/backends/cloud/onedrive/onedrivestorage.h b/backends/cloud/onedrive/onedrivestorage.h
index 674d13634d..3dc5b7a7ad 100644
--- a/backends/cloud/onedrive/onedrivestorage.h
+++ b/backends/cloud/onedrive/onedrivestorage.h
@@ -41,9 +41,9 @@ class OneDriveStorage: public Cloud::Storage {
OneDriveStorage(Common::String token, Common::String uid, Common::String refreshToken);
/**
- * This private constructor is called from authThroughConsole() (phase 2).
- * It uses OAuth code flow to get tokens.
- */
+ * This private constructor is called from authThroughConsole() (phase 2).
+ * It uses OAuth code flow to get tokens.
+ */
OneDriveStorage(Common::String code);
void tokenRefreshed(BoolCallback callback, Networking::JsonResponse pair);
@@ -58,17 +58,16 @@ public:
virtual ~OneDriveStorage();
/**
- * Storage methods, which are used by CloudManager to save
- * storage in configuration file.
- */
+ * Storage methods, which are used by CloudManager to save
+ * storage in configuration file.
+ */
/**
- * Save storage data using ConfMan.
- * @param keyPrefix all saved keys must start with this prefix.
- * @note every Storage must write keyPrefix + "type" key
- * with common value (e.g. "Dropbox").
- */
-
+ * Save storage data using ConfMan.
+ * @param keyPrefix all saved keys must start with this prefix.
+ * @note every Storage must write keyPrefix + "type" key
+ * with common value (e.g. "Dropbox").
+ */
virtual void saveConfig(Common::String keyPrefix);
/** Public Cloud API comes down there. */
@@ -110,32 +109,32 @@ public:
virtual bool isWorking() { return false; } //TODO
/**
- * Load token and user id from configs and return OneDriveStorage for those.
- * @return pointer to the newly created OneDriveStorage or 0 if some problem occured.
- */
+ * Load token and user id from configs and return OneDriveStorage for those.
+ * @return pointer to the newly created OneDriveStorage or 0 if some problem occured.
+ */
static OneDriveStorage *loadFromConfig(Common::String keyPrefix);
/**
- * Returns OneDrive auth link.
- */
+ * Returns OneDrive auth link.
+ */
static Common::String getAuthLink();
/**
- * Show message with OneDrive auth instructions. (Temporary)
- */
+ * Show message with OneDrive auth instructions. (Temporary)
+ */
static void authThroughConsole();
/**
- * Gets new access_token. If <code> passed is "", refresh_token is used.
- * Use "" in order to refresh token and pass a callback, so you could
- * continue your work when new token is available.
- */
+ * Gets new access_token. If <code> passed is "", refresh_token is used.
+ * Use "" in order to refresh token and pass a callback, so you could
+ * continue your work when new token is available.
+ */
void getAccessToken(BoolCallback callback, Common::String code = "");
Common::String accessToken() { return _token; }
};
-} //end of namespace OneDrive
-} //end of namespace Cloud
+} // End of namespace OneDrive
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/onedrive/onedrivetokenrefresher.cpp b/backends/cloud/onedrive/onedrivetokenrefresher.cpp
index 94214834b0..d932f9ab17 100644
--- a/backends/cloud/onedrive/onedrivetokenrefresher.cpp
+++ b/backends/cloud/onedrive/onedrivetokenrefresher.cpp
@@ -93,5 +93,5 @@ void OneDriveTokenRefresher::setHeaders(Common::Array<Common::String> &headers)
}
-} //end of namespace OneDrive
-} //end of namespace Cloud
+} // End of namespace OneDrive
+} // End of namespace Cloud
diff --git a/backends/cloud/onedrive/onedrivetokenrefresher.h b/backends/cloud/onedrive/onedrivetokenrefresher.h
index 08212bf6f5..90ca9d603a 100644
--- a/backends/cloud/onedrive/onedrivetokenrefresher.h
+++ b/backends/cloud/onedrive/onedrivetokenrefresher.h
@@ -50,7 +50,7 @@ public:
}
};
-} //end of namespace OneDrive
-} //end of namespace Cloud
+} // End of namespace OneDrive
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/storage.h b/backends/cloud/storage.h
index 8009075d0c..ac74f90b57 100644
--- a/backends/cloud/storage.h
+++ b/backends/cloud/storage.h
@@ -58,7 +58,6 @@ public:
* @note every Storage must write keyPrefix + "type" key
* with common value (e.g. "Dropbox").
*/
-
virtual void saveConfig(Common::String keyPrefix) = 0;
/**
@@ -106,6 +105,6 @@ public:
virtual bool isWorking() = 0;
};
-} //end of namespace Cloud
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/storagefile.cpp b/backends/cloud/storagefile.cpp
index c0f8d3a9bc..b37b5e0d53 100644
--- a/backends/cloud/storagefile.cpp
+++ b/backends/cloud/storagefile.cpp
@@ -53,4 +53,4 @@ StorageFile::StorageFile(Common::String pth, uint32 sz, uint32 ts, bool dir) {
_isDirectory = dir;
}
-} //end of namespace Cloud
+} // End of namespace Cloud
diff --git a/backends/cloud/storagefile.h b/backends/cloud/storagefile.h
index ced99fae30..704a03867f 100644
--- a/backends/cloud/storagefile.h
+++ b/backends/cloud/storagefile.h
@@ -28,11 +28,10 @@
namespace Cloud {
/**
-* StorageFile represents a file storaged on remote cloud storage.
-* It contains basic information about a file, and might be used
-* when listing directories or syncing files.
-*/
-
+ * StorageFile represents a file storaged on remote cloud storage.
+ * It contains basic information about a file, and might be used
+ * when listing directories or syncing files.
+ */
class StorageFile {
Common::String _path, _name;
uint32 _size, _timestamp;
@@ -49,6 +48,6 @@ public:
bool isDirectory() const { return _isDirectory; }
};
-} //end of namespace Cloud
+} // End of namespace Cloud
#endif
diff --git a/backends/cloud/storageinfo.h b/backends/cloud/storageinfo.h
index f09563570f..1492898a6c 100644
--- a/backends/cloud/storageinfo.h
+++ b/backends/cloud/storageinfo.h
@@ -48,6 +48,6 @@ public:
};
-} //end of namespace Cloud
+} // End of namespace Cloud
#endif