From ae85aa33fd7b4ec57e65dad7628466f9d8fe7fa3 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sun, 9 Nov 2014 22:34:07 +0100 Subject: [PATCH] Adjust namespaces --- src/cmd/cmd.cpp | 2 +- src/cmd/netrcparser.cpp | 4 ++-- src/cmd/netrcparser.h | 4 ++-- src/cmd/simplesslerrorhandler.cpp | 2 +- src/cmd/simplesslerrorhandler.h | 4 ++-- src/gui/accountmigrator.cpp | 2 +- src/gui/accountmigrator.h | 2 +- src/gui/accountsettings.cpp | 4 ++-- src/gui/accountsettings.h | 4 ++-- src/gui/accountsettings.ui | 4 ++-- src/gui/application.cpp | 4 ++-- src/gui/application.h | 4 ++-- src/gui/cocoainitializer.h | 4 ++-- src/gui/cocoainitializer_mac.mm | 4 ++-- src/gui/folder.cpp | 4 ++-- src/gui/folder.h | 2 +- src/gui/folderman.cpp | 6 +++--- src/gui/folderman.h | 8 ++++---- src/gui/folderstatusmodel.cpp | 4 ++-- src/gui/folderstatusmodel.h | 4 ++-- src/gui/folderwatcher.cpp | 4 ++-- src/gui/folderwatcher.h | 2 +- src/gui/folderwatcher_linux.cpp | 2 +- src/gui/folderwatcher_linux.h | 2 +- src/gui/folderwatcher_mac.cpp | 2 +- src/gui/folderwatcher_mac.h | 2 +- src/gui/folderwatcher_qt.cpp | 4 ++-- src/gui/folderwatcher_qt.h | 2 +- src/gui/folderwatcher_win.cpp | 4 ++-- src/gui/folderwatcher_win.h | 2 +- src/gui/folderwizard.cpp | 2 +- src/gui/folderwizard.h | 4 ++-- src/gui/generalsettings.cpp | 4 ++-- src/gui/generalsettings.h | 4 ++-- src/gui/generalsettings.ui | 4 ++-- src/gui/ignorelisteditor.cpp | 4 ++-- src/gui/ignorelisteditor.h | 4 ++-- src/gui/ignorelisteditor.ui | 8 ++++---- src/gui/logbrowser.cpp | 2 +- src/gui/logbrowser.h | 2 +- src/gui/main.cpp | 4 ++-- src/gui/networksettings.cpp | 6 +++--- src/gui/networksettings.h | 4 ++-- src/gui/networksettings.ui | 4 ++-- src/gui/openfilemanager.cpp | 2 +- src/gui/openfilemanager.h | 2 +- src/gui/owncloudgui.cpp | 2 +- src/gui/owncloudgui.h | 4 ++-- src/gui/owncloudsetupwizard.cpp | 4 ++-- src/gui/owncloudsetupwizard.h | 2 +- src/gui/protocolwidget.cpp | 2 +- src/gui/protocolwidget.h | 2 +- src/gui/protocolwidget.ui | 4 ++-- src/gui/selectivesyncdialog.cpp | 2 +- src/gui/selectivesyncdialog.h | 2 +- src/gui/settingsdialog.cpp | 4 ++-- src/gui/settingsdialog.h | 2 +- src/gui/settingsdialog.ui | 4 ++-- src/gui/settingsdialogmac.cpp | 2 +- src/gui/settingsdialogmac.h | 2 +- src/gui/socketapi.cpp | 4 ++-- src/gui/socketapi.h | 2 +- src/gui/sslbutton.cpp | 4 ++-- src/gui/sslbutton.h | 4 ++-- src/gui/sslerrordialog.cpp | 2 +- src/gui/sslerrordialog.h | 2 +- src/gui/sslerrordialog.ui | 4 ++-- src/gui/syncrunfilelog.cpp | 2 +- src/gui/syncrunfilelog.h | 2 +- src/gui/systray.cpp | 4 ++-- src/gui/systray.h | 4 ++-- src/gui/updater/ocupdater.cpp | 2 +- src/gui/updater/ocupdater.h | 2 +- src/gui/updater/sparkleupdater.h | 4 ++-- src/gui/updater/sparkleupdater_mac.mm | 4 ++-- src/gui/updater/updateinfo.cpp | 4 ++-- src/gui/updater/updateinfo.h | 4 ++-- src/gui/updater/updater.cpp | 4 ++-- src/gui/updater/updater.h | 4 ++-- src/gui/wizard/abstractcredswizardpage.cpp | 2 +- src/gui/wizard/abstractcredswizardpage.h | 4 ++-- src/gui/wizard/owncloudadvancedsetuppage.cpp | 4 ++-- src/gui/wizard/owncloudadvancedsetuppage.h | 4 ++-- src/gui/wizard/owncloudhttpcredspage.cpp | 4 ++-- src/gui/wizard/owncloudhttpcredspage.h | 4 ++-- src/gui/wizard/owncloudsetuppage.cpp | 4 ++-- src/gui/wizard/owncloudsetuppage.h | 4 ++-- src/gui/wizard/owncloudshibbolethcredspage.cpp | 4 ++-- src/gui/wizard/owncloudshibbolethcredspage.h | 4 ++-- src/gui/wizard/owncloudwizard.cpp | 2 +- src/gui/wizard/owncloudwizard.h | 4 ++-- src/gui/wizard/owncloudwizardcommon.cpp | 4 ++-- src/gui/wizard/owncloudwizardcommon.h | 4 ++-- src/gui/wizard/owncloudwizardresultpage.cpp | 4 ++-- src/gui/wizard/owncloudwizardresultpage.h | 4 ++-- src/libsync/accessmanager.cpp | 4 ++-- src/libsync/accessmanager.h | 4 ++-- src/libsync/account.cpp | 4 ++-- src/libsync/account.h | 4 ++-- src/libsync/authenticationdialog.cpp | 4 ++-- src/libsync/authenticationdialog.h | 4 ++-- src/libsync/clientproxy.cpp | 4 ++-- src/libsync/clientproxy.h | 2 +- src/libsync/configfile.cpp | 2 +- src/libsync/configfile.h | 2 +- src/libsync/connectionvalidator.cpp | 4 ++-- src/libsync/connectionvalidator.h | 2 +- src/libsync/cookiejar.cpp | 4 ++-- src/libsync/cookiejar.h | 4 ++-- src/libsync/creds/abstractcredentials.cpp | 4 ++-- src/libsync/creds/abstractcredentials.h | 4 ++-- src/libsync/creds/credentialscommon.cpp | 4 ++-- src/libsync/creds/credentialscommon.h | 4 ++-- src/libsync/creds/credentialsfactory.cpp | 4 ++-- src/libsync/creds/credentialsfactory.h | 4 ++-- src/libsync/creds/dummycredentials.cpp | 4 ++-- src/libsync/creds/dummycredentials.h | 4 ++-- src/libsync/creds/http/httpconfigfile.cpp | 4 ++-- src/libsync/creds/http/httpconfigfile.h | 4 ++-- src/libsync/creds/httpcredentials.cpp | 4 ++-- src/libsync/creds/httpcredentials.h | 4 ++-- src/libsync/creds/shibboleth/shibbolethrefresher.cpp | 4 ++-- src/libsync/creds/shibboleth/shibbolethrefresher.h | 4 ++-- src/libsync/creds/shibboleth/shibbolethuserjob.cpp | 2 +- src/libsync/creds/shibboleth/shibbolethuserjob.h | 4 ++-- src/libsync/creds/shibboleth/shibbolethwebview.cpp | 4 ++-- src/libsync/creds/shibboleth/shibbolethwebview.h | 4 ++-- src/libsync/creds/shibbolethcredentials.cpp | 4 ++-- src/libsync/creds/shibbolethcredentials.h | 4 ++-- src/libsync/creds/tokencredentials.cpp | 4 ++-- src/libsync/creds/tokencredentials.h | 4 ++-- src/libsync/discoveryphase.cpp | 2 +- src/libsync/discoveryphase.h | 2 +- src/libsync/filesystem.cpp | 2 +- src/libsync/filesystem.h | 2 +- src/libsync/logger.cpp | 6 +++--- src/libsync/logger.h | 6 +++--- src/libsync/networkjobs.cpp | 4 ++-- src/libsync/networkjobs.h | 4 ++-- src/libsync/owncloudpropagator.cpp | 2 +- src/libsync/owncloudpropagator.h | 2 +- src/libsync/owncloudpropagator_p.h | 2 +- src/libsync/owncloudtheme.cpp | 2 +- src/libsync/owncloudtheme.h | 2 +- src/libsync/ownsql.cpp | 10 +++++----- src/libsync/ownsql.h | 4 ++-- src/libsync/progressdispatcher.cpp | 2 +- src/libsync/progressdispatcher.h | 2 +- src/libsync/propagator_legacy.cpp | 6 +++--- src/libsync/propagator_legacy.h | 2 +- src/libsync/propagator_qnam.cpp | 2 +- src/libsync/propagator_qnam.h | 2 +- src/libsync/propagatorjobs.cpp | 2 +- src/libsync/propagatorjobs.h | 2 +- src/libsync/quotainfo.cpp | 2 +- src/libsync/quotainfo.h | 4 ++-- src/libsync/syncengine.cpp | 6 +++--- src/libsync/syncengine.h | 2 +- src/libsync/syncfileitem.h | 4 ++-- src/libsync/syncfilestatus.cpp | 2 +- src/libsync/syncfilestatus.h | 2 +- src/libsync/syncjournaldb.cpp | 4 ++-- src/libsync/syncjournaldb.h | 4 ++-- src/libsync/syncjournalfilerecord.cpp | 2 +- src/libsync/syncjournalfilerecord.h | 2 +- src/libsync/syncresult.cpp | 2 +- src/libsync/syncresult.h | 2 +- src/libsync/theme.cpp | 2 +- src/libsync/theme.h | 2 +- src/libsync/utility.cpp | 4 ++-- src/libsync/utility.h | 2 +- 171 files changed, 288 insertions(+), 288 deletions(-) diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index a3171660e..3312bf9cf 100644 --- a/src/cmd/cmd.cpp +++ b/src/cmd/cmd.cpp @@ -45,7 +45,7 @@ #include #endif -using namespace Mirall; +using namespace OCC; struct CmdOptions { QString source_dir; diff --git a/src/cmd/netrcparser.cpp b/src/cmd/netrcparser.cpp index 7db8d2be4..0f1782213 100644 --- a/src/cmd/netrcparser.cpp +++ b/src/cmd/netrcparser.cpp @@ -18,7 +18,7 @@ #include "netrcparser.h" -namespace Mirall { +namespace OCC { namespace { QString defaultKeyword = QLatin1String("default"); @@ -94,4 +94,4 @@ NetrcParser::LoginPair NetrcParser::find(const QString &machine) } } -} // namespace Mirall +} // namespace OCC diff --git a/src/cmd/netrcparser.h b/src/cmd/netrcparser.h index 355333d43..9f93d1b2c 100644 --- a/src/cmd/netrcparser.h +++ b/src/cmd/netrcparser.h @@ -18,7 +18,7 @@ #include #include -namespace Mirall { +namespace OCC { class NetrcParser { @@ -36,6 +36,6 @@ private: QString _fileName; }; -} // namespace Mirall +} // namespace OCC #endif // NETRCPARSER_H diff --git a/src/cmd/simplesslerrorhandler.cpp b/src/cmd/simplesslerrorhandler.cpp index 6250ca7b8..5c28107fe 100644 --- a/src/cmd/simplesslerrorhandler.cpp +++ b/src/cmd/simplesslerrorhandler.cpp @@ -15,7 +15,7 @@ #include "account.h" #include "simplesslerrorhandler.h" -bool SimpleSslErrorHandler::handleErrors(QList errors, QList *certs, Mirall::Account *account) +bool SimpleSslErrorHandler::handleErrors(QList errors, QList *certs, OCC::Account *account) { (void) account; diff --git a/src/cmd/simplesslerrorhandler.h b/src/cmd/simplesslerrorhandler.h index b22e07d42..91e2af666 100644 --- a/src/cmd/simplesslerrorhandler.h +++ b/src/cmd/simplesslerrorhandler.h @@ -18,9 +18,9 @@ class QSslError; class QSslCertificate; -class SimpleSslErrorHandler : public Mirall::AbstractSslErrorHandler { +class SimpleSslErrorHandler : public OCC::AbstractSslErrorHandler { public: - bool handleErrors(QList errors, QList *certs, Mirall::Account*) Q_DECL_OVERRIDE; + bool handleErrors(QList errors, QList *certs, OCC::Account*) Q_DECL_OVERRIDE; }; #endif // SIMPLESSLERRORHANDLER_H diff --git a/src/gui/accountmigrator.cpp b/src/gui/accountmigrator.cpp index c679de0db..5a1e6740e 100644 --- a/src/gui/accountmigrator.cpp +++ b/src/gui/accountmigrator.cpp @@ -23,7 +23,7 @@ #include #include -namespace Mirall { +namespace OCC { // The purpose of this class is to migrate an existing account that // was set up with an unbranded client to an branded one. diff --git a/src/gui/accountmigrator.h b/src/gui/accountmigrator.h index 49e3fa04e..6e846530e 100644 --- a/src/gui/accountmigrator.h +++ b/src/gui/accountmigrator.h @@ -16,7 +16,7 @@ #include -namespace Mirall { +namespace OCC { class AccountMigrator { diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 0074516d3..cfc6c3758 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -42,7 +42,7 @@ #include "account.h" -namespace Mirall { +namespace OCC { static const char progressBarStyleC[] = "QProgressBar {" @@ -836,4 +836,4 @@ AccountSettings::~AccountSettings() delete ui; } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h index d3631ffa9..1be0af7e8 100644 --- a/src/gui/accountsettings.h +++ b/src/gui/accountsettings.h @@ -30,7 +30,7 @@ class QStandardItem; class QNetworkReply; class QListWidgetItem; -namespace Mirall { +namespace OCC { namespace Ui { class AccountSettings; @@ -104,6 +104,6 @@ private slots: void slotAccountChanged(Account*,Account*); }; -} // namespace Mirall +} // namespace OCC #endif // ACCOUNTSETTINGS_H diff --git a/src/gui/accountsettings.ui b/src/gui/accountsettings.ui index fa7a3d86b..82ea9e235 100644 --- a/src/gui/accountsettings.ui +++ b/src/gui/accountsettings.ui @@ -1,7 +1,7 @@ - Mirall::AccountSettings - + OCC::AccountSettings + 0 diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 49c4c687f..bbaedc358 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -47,7 +47,7 @@ class QSocket; -namespace Mirall { +namespace OCC { namespace { @@ -565,5 +565,5 @@ bool Application::giveHelp() { return _helpOnly; } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/application.h b/src/gui/application.h index 7ce40d62e..367141011 100644 --- a/src/gui/application.h +++ b/src/gui/application.h @@ -34,7 +34,7 @@ class QMessageBox; class QSystemTrayIcon; class QSocket; -namespace Mirall { +namespace OCC { class Theme; class Folder; class SslErrorDialog; @@ -111,6 +111,6 @@ private: friend class ownCloudGui; // for _startupNetworkError }; -} // namespace Mirall +} // namespace OCC #endif // APPLICATION_H diff --git a/src/gui/cocoainitializer.h b/src/gui/cocoainitializer.h index fd4200a98..63d199bb9 100644 --- a/src/gui/cocoainitializer.h +++ b/src/gui/cocoainitializer.h @@ -11,7 +11,7 @@ * for more details. */ -namespace Mirall { +namespace OCC { namespace Mac { /** CocoaInitializer provides an AutoRelease Pool via RIIA for use in main() */ @@ -25,4 +25,4 @@ private: }; } // namespace Mac -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/cocoainitializer_mac.mm b/src/gui/cocoainitializer_mac.mm index e1f904f19..c2e0d5e50 100644 --- a/src/gui/cocoainitializer_mac.mm +++ b/src/gui/cocoainitializer_mac.mm @@ -16,7 +16,7 @@ #import #import -namespace Mirall { +namespace OCC { namespace Mac { class CocoaInitializer::Private { @@ -36,4 +36,4 @@ CocoaInitializer::~CocoaInitializer() { } } // namespace Mac -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 0c23bc602..6b86c2b03 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -40,7 +40,7 @@ #include #include -namespace Mirall { +namespace OCC { static void csyncLogCatcher(int /*verbosity*/, const char */*function*/, @@ -985,5 +985,5 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel) QTimer::singleShot(50, this, SLOT(slotPollTimerTimeout())); } } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/folder.h b/src/gui/folder.h index 1ac11f64f..51f7b005c 100644 --- a/src/gui/folder.h +++ b/src/gui/folder.h @@ -37,7 +37,7 @@ class QThread; -namespace Mirall { +namespace OCC { class SyncEngine; diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index f06066c13..9133f50a7 100644 --- a/src/gui/folderman.cpp +++ b/src/gui/folderman.cpp @@ -34,7 +34,7 @@ #include #include -namespace Mirall { +namespace OCC { FolderMan* FolderMan::_instance = 0; @@ -79,7 +79,7 @@ FolderMan::~FolderMan() _instance = 0; } -Mirall::Folder::Map FolderMan::map() +OCC::Folder::Map FolderMan::map() { return _folderMap; } @@ -903,4 +903,4 @@ QString FolderMan::statusToString( SyncResult syncStatus, bool paused ) const return folderMessage; } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/folderman.h b/src/gui/folderman.h index 347aabb6e..74646b3de 100644 --- a/src/gui/folderman.h +++ b/src/gui/folderman.h @@ -27,7 +27,7 @@ class QSignalMapper; -namespace Mirall { +namespace OCC { class Application; class SyncResult; @@ -41,7 +41,7 @@ public: int setupFolders(); - Mirall::Folder::Map map(); + OCC::Folder::Map map(); /** * Add a folder definition to the config @@ -162,8 +162,8 @@ private: static FolderMan *_instance; explicit FolderMan(QObject *parent = 0); ~FolderMan(); - friend class Mirall::Application; + friend class OCC::Application; }; -} // namespace Mirall +} // namespace OCC #endif // FOLDERMAN_H diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 49a192e0d..32c7c803d 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -21,7 +21,7 @@ #include #endif -namespace Mirall { +namespace OCC { FolderStatusModel::FolderStatusModel() :QStandardItemModel() @@ -308,4 +308,4 @@ bool FolderStatusDelegate::editorEvent ( QEvent * /*event*/, QAbstractItemModel return false; } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h index 4cd36a9b0..b1cbf2b90 100644 --- a/src/gui/folderstatusmodel.h +++ b/src/gui/folderstatusmodel.h @@ -18,7 +18,7 @@ #include #include -namespace Mirall { +namespace OCC { class FolderStatusModel : public QStandardItemModel { @@ -59,6 +59,6 @@ class FolderStatusDelegate : public QStyledItemDelegate const QModelIndex& index ) Q_DECL_OVERRIDE; }; -} // namespace Mirall +} // namespace OCC #endif // FOLDERSTATUSMODEL_H diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp index cb4a4209d..486d0589e 100644 --- a/src/gui/folderwatcher.cpp +++ b/src/gui/folderwatcher.cpp @@ -33,7 +33,7 @@ #endif -namespace Mirall { +namespace OCC { FolderWatcher::FolderWatcher(const QString &root, QObject *parent) : QObject(parent) @@ -167,5 +167,5 @@ void FolderWatcher::removePath(const QString &path ) } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/folderwatcher.h b/src/gui/folderwatcher.h index bcdb5f0ee..e4945ea70 100644 --- a/src/gui/folderwatcher.h +++ b/src/gui/folderwatcher.h @@ -27,7 +27,7 @@ class QTimer; -namespace Mirall { +namespace OCC { class FolderWatcherPrivate; diff --git a/src/gui/folderwatcher_linux.cpp b/src/gui/folderwatcher_linux.cpp index 4d75047dc..0bb0e18cf 100644 --- a/src/gui/folderwatcher_linux.cpp +++ b/src/gui/folderwatcher_linux.cpp @@ -24,7 +24,7 @@ #include #include -namespace Mirall { +namespace OCC { FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p, const QString& path) : QObject(), diff --git a/src/gui/folderwatcher_linux.h b/src/gui/folderwatcher_linux.h index 0a8d23110..2ce091787 100644 --- a/src/gui/folderwatcher_linux.h +++ b/src/gui/folderwatcher_linux.h @@ -22,7 +22,7 @@ #include "folderwatcher.h" -namespace Mirall +namespace OCC { class FolderWatcherPrivate : public QObject { diff --git a/src/gui/folderwatcher_mac.cpp b/src/gui/folderwatcher_mac.cpp index ab03a95df..99077542a 100644 --- a/src/gui/folderwatcher_mac.cpp +++ b/src/gui/folderwatcher_mac.cpp @@ -23,7 +23,7 @@ -namespace Mirall { +namespace OCC { FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p, const QString& path) : _parent(p), diff --git a/src/gui/folderwatcher_mac.h b/src/gui/folderwatcher_mac.h index c2e3821d2..646200916 100644 --- a/src/gui/folderwatcher_mac.h +++ b/src/gui/folderwatcher_mac.h @@ -20,7 +20,7 @@ #include -namespace Mirall +namespace OCC { class FolderWatcherPrivate diff --git a/src/gui/folderwatcher_qt.cpp b/src/gui/folderwatcher_qt.cpp index eea3b4a59..c55215947 100644 --- a/src/gui/folderwatcher_qt.cpp +++ b/src/gui/folderwatcher_qt.cpp @@ -18,7 +18,7 @@ #include #include -namespace Mirall { +namespace OCC { FolderWatcherPrivate::FolderWatcherPrivate() :QObject(), _parent(0) @@ -104,4 +104,4 @@ void FolderWatcherPrivate::removePath(const QString &path ) } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/folderwatcher_qt.h b/src/gui/folderwatcher_qt.h index 5ae6ba335..03bb0f9d1 100644 --- a/src/gui/folderwatcher_qt.h +++ b/src/gui/folderwatcher_qt.h @@ -18,7 +18,7 @@ #include #include -namespace Mirall { +namespace OCC { class FolderWatcher; diff --git a/src/gui/folderwatcher_win.cpp b/src/gui/folderwatcher_win.cpp index a0ced2477..1e0bf2884 100644 --- a/src/gui/folderwatcher_win.cpp +++ b/src/gui/folderwatcher_win.cpp @@ -21,7 +21,7 @@ #include #include -namespace Mirall { +namespace OCC { void WatcherThread::run() { @@ -87,4 +87,4 @@ FolderWatcherPrivate::~FolderWatcherPrivate() delete _thread; } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/folderwatcher_win.h b/src/gui/folderwatcher_win.h index 56ddfccd0..7dff7541b 100644 --- a/src/gui/folderwatcher_win.h +++ b/src/gui/folderwatcher_win.h @@ -17,7 +17,7 @@ #include #include -namespace Mirall { +namespace OCC { class FolderWatcher; diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp index e2310c9c0..f9a6a9421 100644 --- a/src/gui/folderwizard.cpp +++ b/src/gui/folderwizard.cpp @@ -35,7 +35,7 @@ #include -namespace Mirall +namespace OCC { QString FormatWarningsWizardPage::formatWarnings(const QStringList &warnings) const diff --git a/src/gui/folderwizard.h b/src/gui/folderwizard.h index 157d29c24..bdf02e1c8 100644 --- a/src/gui/folderwizard.h +++ b/src/gui/folderwizard.h @@ -24,7 +24,7 @@ #include "ui_folderwizardsourcepage.h" #include "ui_folderwizardtargetpage.h" -namespace Mirall { +namespace OCC { class SelectiveSyncTreeView; @@ -136,6 +136,6 @@ private: }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index 5a04584a6..fcb36b540 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -26,7 +26,7 @@ #include #include -namespace Mirall { +namespace OCC { GeneralSettings::GeneralSettings(QWidget *parent) : QWidget(parent), @@ -110,4 +110,4 @@ void GeneralSettings::slotToggleOptionalDesktopNotifications(bool enable) cfgFile.setOptionalDesktopNotifications(enable); } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h index 50dfd7a6f..bf3961cd3 100644 --- a/src/gui/generalsettings.h +++ b/src/gui/generalsettings.h @@ -17,7 +17,7 @@ #include -namespace Mirall { +namespace OCC { namespace Ui { class GeneralSettings; @@ -44,5 +44,5 @@ private: }; -} // namespace Mirall +} // namespace OCC #endif // MIRALL_GENERALSETTINGS_H diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index 1ae6761bd..9ad0963db 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -1,7 +1,7 @@ - Mirall::GeneralSettings - + OCC::GeneralSettings + 0 diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp index a1a80fd09..651626f87 100644 --- a/src/gui/ignorelisteditor.cpp +++ b/src/gui/ignorelisteditor.cpp @@ -23,7 +23,7 @@ #include #include -namespace Mirall { +namespace OCC { IgnoreListEditor::IgnoreListEditor(QWidget *parent) : QDialog(parent), @@ -164,4 +164,4 @@ void IgnoreListEditor::readIgnoreFile(const QString &file, bool readOnly) } } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/ignorelisteditor.h b/src/gui/ignorelisteditor.h index 208e1e7df..e775563d5 100644 --- a/src/gui/ignorelisteditor.h +++ b/src/gui/ignorelisteditor.h @@ -18,7 +18,7 @@ class QListWidgetItem; -namespace Mirall { +namespace OCC { namespace Ui { class IgnoreListEditor; @@ -44,6 +44,6 @@ private: Ui::IgnoreListEditor *ui; }; -} // namespace Mirall +} // namespace OCC #endif // IGNORELISTEDITOR_H diff --git a/src/gui/ignorelisteditor.ui b/src/gui/ignorelisteditor.ui index f65d3cb0f..ad030f2e5 100644 --- a/src/gui/ignorelisteditor.ui +++ b/src/gui/ignorelisteditor.ui @@ -1,7 +1,7 @@ - Mirall::IgnoreListEditor - + OCC::IgnoreListEditor + 0 @@ -84,7 +84,7 @@ buttonBox accepted() - Mirall::IgnoreListEditor + OCC::IgnoreListEditor accept() @@ -100,7 +100,7 @@ buttonBox rejected() - Mirall::IgnoreListEditor + OCC::IgnoreListEditor reject() diff --git a/src/gui/logbrowser.cpp b/src/gui/logbrowser.cpp index d033f81f1..42421a82a 100644 --- a/src/gui/logbrowser.cpp +++ b/src/gui/logbrowser.cpp @@ -34,7 +34,7 @@ #include "mirallconfigfile.h" #include "logger.h" -namespace Mirall { +namespace OCC { // ============================================================================== diff --git a/src/gui/logbrowser.h b/src/gui/logbrowser.h index 24f2406bb..243c571a1 100644 --- a/src/gui/logbrowser.h +++ b/src/gui/logbrowser.h @@ -26,7 +26,7 @@ #include #include -namespace Mirall { +namespace OCC { class LogWidget : public QPlainTextEdit { diff --git a/src/gui/main.cpp b/src/gui/main.cpp index a592fd0f0..2caed2563 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -31,7 +31,7 @@ #include #include -using namespace Mirall; +using namespace OCC; void warnSystray() { @@ -50,7 +50,7 @@ int main(int argc, char **argv) #ifdef Q_OS_MAC Mac::CocoaInitializer cocoaInit; // RIIA #endif - Mirall::Application app(argc, argv); + OCC::Application app(argc, argv); #ifndef Q_OS_WIN signal(SIGPIPE, SIG_IGN); #endif diff --git a/src/gui/networksettings.cpp b/src/gui/networksettings.cpp index 40a55baf6..b0b7e20a1 100644 --- a/src/gui/networksettings.cpp +++ b/src/gui/networksettings.cpp @@ -23,7 +23,7 @@ #include -namespace Mirall { +namespace OCC { NetworkSettings::NetworkSettings(QWidget *parent) : QWidget(parent), @@ -75,7 +75,7 @@ NetworkSettings::~NetworkSettings() void NetworkSettings::loadProxySettings() { // load current proxy settings - Mirall::ConfigFile cfgFile; + OCC::ConfigFile cfgFile; int type = cfgFile.proxyType(); switch (type) { case QNetworkProxy::NoProxy: @@ -167,4 +167,4 @@ void NetworkSettings::saveBWLimitSettings() FolderMan::instance()->setDirtyNetworkLimits(); } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/networksettings.h b/src/gui/networksettings.h index cb93e3782..4a91fa66a 100644 --- a/src/gui/networksettings.h +++ b/src/gui/networksettings.h @@ -17,7 +17,7 @@ #include -namespace Mirall { +namespace OCC { namespace Ui { class NetworkSettings; @@ -43,5 +43,5 @@ private: }; -} // namespace Mirall +} // namespace OCC #endif // MIRALL_NETWORKSETTINGS_H diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui index 4f98f4b4a..70f1616ba 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -1,7 +1,7 @@ - Mirall::NetworkSettings - + OCC::NetworkSettings + 0 diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp index 698cc3dd9..5151dacc1 100644 --- a/src/gui/openfilemanager.cpp +++ b/src/gui/openfilemanager.cpp @@ -22,7 +22,7 @@ #include #include -namespace Mirall { +namespace OCC { // according to the QStandardDir impl from Qt5 static QStringList xdgDataDirs() diff --git a/src/gui/openfilemanager.h b/src/gui/openfilemanager.h index c395f15fe..d1dc1df99 100644 --- a/src/gui/openfilemanager.h +++ b/src/gui/openfilemanager.h @@ -14,7 +14,7 @@ #include -namespace Mirall { +namespace OCC { /** Open the file manager with the specified file pre-selected */ void showInFileManager(const QString &localPath); } diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index ff9b9a0b5..b83804a12 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -39,7 +39,7 @@ #include #endif -namespace Mirall { +namespace OCC { ownCloudGui::ownCloudGui(Application *parent) : QObject(parent), diff --git a/src/gui/owncloudgui.h b/src/gui/owncloudgui.h index 4c7f92d0a..e6cba6993 100644 --- a/src/gui/owncloudgui.h +++ b/src/gui/owncloudgui.h @@ -25,7 +25,7 @@ #include #include -namespace Mirall { +namespace OCC { class SettingsDialog; class SettingsDialogMac; @@ -110,6 +110,6 @@ private: QStringList _startupFails; }; -} // namespace Mirall +} // namespace OCC #endif // OWNCLOUDGUI_H diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index 15090eae4..5fd411d79 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -34,7 +34,7 @@ #include "creds/abstractcredentials.h" #include "creds/dummycredentials.h" -namespace Mirall { +namespace OCC { OwncloudSetupWizard::OwncloudSetupWizard(QObject* parent) : QObject( parent ), @@ -535,4 +535,4 @@ bool ValidateDavAuthJob::finished() return true; } -} // ns Mirall +} // namespace OCC diff --git a/src/gui/owncloudsetupwizard.h b/src/gui/owncloudsetupwizard.h index 06b478001..2c42c8f51 100644 --- a/src/gui/owncloudsetupwizard.h +++ b/src/gui/owncloudsetupwizard.h @@ -26,7 +26,7 @@ #include "wizard/owncloudwizardcommon.h" -namespace Mirall { +namespace OCC { class OwncloudWizard; class Account; diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp index 0681370c8..8a4c00886 100644 --- a/src/gui/protocolwidget.cpp +++ b/src/gui/protocolwidget.cpp @@ -31,7 +31,7 @@ #include -namespace Mirall { +namespace OCC { ProtocolWidget::ProtocolWidget(QWidget *parent) : QWidget(parent), diff --git a/src/gui/protocolwidget.h b/src/gui/protocolwidget.h index af112a8fa..bc09e2781 100644 --- a/src/gui/protocolwidget.h +++ b/src/gui/protocolwidget.h @@ -24,7 +24,7 @@ class QPushButton; -namespace Mirall { +namespace OCC { class SyncResult; namespace Ui { diff --git a/src/gui/protocolwidget.ui b/src/gui/protocolwidget.ui index b1b29106f..94b7bda79 100644 --- a/src/gui/protocolwidget.ui +++ b/src/gui/protocolwidget.ui @@ -1,7 +1,7 @@ - Mirall::ProtocolWidget - + OCC::ProtocolWidget + 0 diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index e36bbd827..5b7c5a847 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -28,7 +28,7 @@ #include #include -namespace Mirall { +namespace OCC { SelectiveSyncTreeView::SelectiveSyncTreeView(Account *account, QWidget* parent) : QTreeWidget(parent), _inserting(false), _account(account) diff --git a/src/gui/selectivesyncdialog.h b/src/gui/selectivesyncdialog.h index cbd05117b..6ecddc382 100644 --- a/src/gui/selectivesyncdialog.h +++ b/src/gui/selectivesyncdialog.h @@ -19,7 +19,7 @@ class QTreeWidgetItem; class QTreeWidget; class QLabel; -namespace Mirall { +namespace OCC { class Account; diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 90a0d2005..62c187aac 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -30,7 +30,7 @@ #include #include -namespace Mirall { +namespace OCC { QIcon createDummy() { QIcon icon; @@ -168,4 +168,4 @@ void SettingsDialog::showActivityPage() } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h index fd35e5140..a9d898cbf 100644 --- a/src/gui/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -22,7 +22,7 @@ class QStandardItemModel; class QListWidgetItem; -namespace Mirall { +namespace OCC { namespace Ui { class SettingsDialog; diff --git a/src/gui/settingsdialog.ui b/src/gui/settingsdialog.ui index 0f58d33f4..4acc77fb2 100644 --- a/src/gui/settingsdialog.ui +++ b/src/gui/settingsdialog.ui @@ -1,7 +1,7 @@ - Mirall::SettingsDialog - + OCC::SettingsDialog + 0 diff --git a/src/gui/settingsdialogmac.cpp b/src/gui/settingsdialogmac.cpp index f2aed6693..c656c96b1 100644 --- a/src/gui/settingsdialogmac.cpp +++ b/src/gui/settingsdialogmac.cpp @@ -31,7 +31,7 @@ #include #include -namespace Mirall { +namespace OCC { SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent) : MacPreferencesWindow(parent) diff --git a/src/gui/settingsdialogmac.h b/src/gui/settingsdialogmac.h index 91fa60528..90681628b 100644 --- a/src/gui/settingsdialogmac.h +++ b/src/gui/settingsdialogmac.h @@ -21,7 +21,7 @@ class QStandardItemModel; class QListWidgetItem; -namespace Mirall { +namespace OCC { class AccountSettings; class ProtocolWidget; diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp index 8890e038c..77d8211bb 100644 --- a/src/gui/socketapi.cpp +++ b/src/gui/socketapi.cpp @@ -63,7 +63,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path int csync_exclude_load(const char *fname, c_strlist_t **list); } -namespace Mirall { +namespace OCC { #define DEBUG qDebug() << "SocketApi: " @@ -611,5 +611,5 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/socketapi.h b/src/gui/socketapi.h index f5f5a63f1..75a490f2d 100644 --- a/src/gui/socketapi.h +++ b/src/gui/socketapi.h @@ -35,7 +35,7 @@ class QUrl; class QLocalSocket; class QStringList; -namespace Mirall { +namespace OCC { typedef QLocalSocket SocketType; diff --git a/src/gui/sslbutton.cpp b/src/gui/sslbutton.cpp index e75ca2273..15c5167bf 100644 --- a/src/gui/sslbutton.cpp +++ b/src/gui/sslbutton.cpp @@ -22,7 +22,7 @@ #include #include -namespace Mirall { +namespace OCC { SslButton::SslButton(QWidget *parent) : QToolButton(parent) @@ -220,4 +220,4 @@ void SslButton::updateAccountInfo(Account *account) } } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/sslbutton.h b/src/gui/sslbutton.h index 65bfe7fb0..0e717f4e4 100644 --- a/src/gui/sslbutton.h +++ b/src/gui/sslbutton.h @@ -22,7 +22,7 @@ class QAction; class QSslCertificate; class QSslConfiguration; -namespace Mirall { +namespace OCC { class Account; @@ -39,6 +39,6 @@ private: const QList& userApproved, int pos); }; -} // namespace Mirall +} // namespace OCC #endif // SSLBUTTON_H diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp index ee353ef4e..0b6fa59ae 100644 --- a/src/gui/sslerrordialog.cpp +++ b/src/gui/sslerrordialog.cpp @@ -24,7 +24,7 @@ #include "ui_sslerrordialog.h" -namespace Mirall +namespace OCC { #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) diff --git a/src/gui/sslerrordialog.h b/src/gui/sslerrordialog.h index 4be61f0c6..69a9a1e60 100644 --- a/src/gui/sslerrordialog.h +++ b/src/gui/sslerrordialog.h @@ -24,7 +24,7 @@ class QSslError; class QSslCertificate; -namespace Mirall +namespace OCC { namespace Ui { diff --git a/src/gui/sslerrordialog.ui b/src/gui/sslerrordialog.ui index 39adabdf5..4b8e98739 100644 --- a/src/gui/sslerrordialog.ui +++ b/src/gui/sslerrordialog.ui @@ -1,7 +1,7 @@ - Mirall::SslErrorDialog - + OCC::SslErrorDialog + 0 diff --git a/src/gui/syncrunfilelog.cpp b/src/gui/syncrunfilelog.cpp index 6175fefc5..4d6578744 100644 --- a/src/gui/syncrunfilelog.cpp +++ b/src/gui/syncrunfilelog.cpp @@ -18,7 +18,7 @@ #include "filesystem.h" #include -namespace Mirall { +namespace OCC { SyncRunFileLog::SyncRunFileLog() { diff --git a/src/gui/syncrunfilelog.h b/src/gui/syncrunfilelog.h index da1581447..1b6429e23 100644 --- a/src/gui/syncrunfilelog.h +++ b/src/gui/syncrunfilelog.h @@ -21,7 +21,7 @@ #include "syncfileitem.h" #include "utility.h" -namespace Mirall { +namespace OCC { class SyncFileItem; class SyncRunFileLog diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index c3f799db6..1e9c8fa8e 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -25,7 +25,7 @@ #define NOTIFICATIONS_IFACE "org.freedesktop.Notifications" #endif -namespace Mirall { +namespace OCC { void Systray::showMessage(const QString & title, const QString & message, MessageIcon icon, int millisecondsTimeoutHint) { @@ -49,4 +49,4 @@ void Systray::setToolTip(const QString &tip) QSystemTrayIcon::setToolTip(tr("%1: %2").arg(Theme::instance()->appNameGUI(), tip)); } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/systray.h b/src/gui/systray.h index 827f7c020..9dd1c2e25 100644 --- a/src/gui/systray.h +++ b/src/gui/systray.h @@ -19,7 +19,7 @@ class QIcon; -namespace Mirall { +namespace OCC { class Systray : public QSystemTrayIcon { @@ -29,6 +29,6 @@ public: void setToolTip(const QString &tip); }; -} // namespace Mirall +} // namespace OCC #endif //SYSTRAY_H diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp index fcdf053a7..bd7b06430 100644 --- a/src/gui/updater/ocupdater.cpp +++ b/src/gui/updater/ocupdater.cpp @@ -29,7 +29,7 @@ #include -namespace Mirall { +namespace OCC { static const char updateAvailableC[] = "Updater/updateAvailable"; static const char updateTargetVersionC[] = "Updater/updateTargetVersion"; diff --git a/src/gui/updater/ocupdater.h b/src/gui/updater/ocupdater.h index 3201e7c81..9843a30a1 100644 --- a/src/gui/updater/ocupdater.h +++ b/src/gui/updater/ocupdater.h @@ -26,7 +26,7 @@ class QNetworkAccessManager; class QNetworkReply; class QTimer; -namespace Mirall { +namespace OCC { /** @short Class that uses an ownCloud propritary XML format to fetch update information */ class OCUpdater : public QObject, public Updater diff --git a/src/gui/updater/sparkleupdater.h b/src/gui/updater/sparkleupdater.h index 373e8a25c..e058ecfa8 100644 --- a/src/gui/updater/sparkleupdater.h +++ b/src/gui/updater/sparkleupdater.h @@ -18,7 +18,7 @@ #include -namespace Mirall { +namespace OCC { class SparkleUpdater : public Updater { public: @@ -34,6 +34,6 @@ private: Private *d; }; -} // namespace Mirall +} // namespace OCC #endif // SPARKLEUPDATER_H diff --git a/src/gui/updater/sparkleupdater_mac.mm b/src/gui/updater/sparkleupdater_mac.mm index 4f0216fd8..1556faa74 100644 --- a/src/gui/updater/sparkleupdater_mac.mm +++ b/src/gui/updater/sparkleupdater_mac.mm @@ -57,7 +57,7 @@ @end -namespace Mirall { +namespace OCC { class SparkleUpdater::Private { @@ -109,4 +109,4 @@ void SparkleUpdater::backgroundCheckForUpdate() [d->updater checkForUpdatesInBackground]; } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/updater/updateinfo.cpp b/src/gui/updater/updateinfo.cpp index 7554a0d11..902df9209 100644 --- a/src/gui/updater/updateinfo.cpp +++ b/src/gui/updater/updateinfo.cpp @@ -9,7 +9,7 @@ #include #include -namespace Mirall { +namespace OCC { void UpdateInfo::setVersion( const QString &v ) { @@ -165,4 +165,4 @@ bool UpdateInfo::writeFile( const QString &filename ) return true; } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/updater/updateinfo.h b/src/gui/updater/updateinfo.h index 25d3e5488..4ed098579 100644 --- a/src/gui/updater/updateinfo.h +++ b/src/gui/updater/updateinfo.h @@ -7,7 +7,7 @@ #include #include -namespace Mirall { +namespace OCC { class UpdateInfo { @@ -36,6 +36,6 @@ class UpdateInfo QString mDownloadUrl; }; -} // namespace Mirall +} // namespace OCC #endif // UPDATEINFO_H diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp index f1b290a5c..c036a79e6 100644 --- a/src/gui/updater/updater.cpp +++ b/src/gui/updater/updater.cpp @@ -25,7 +25,7 @@ #include "config.h" -namespace Mirall { +namespace OCC { Updater *Updater::_instance = 0; @@ -123,4 +123,4 @@ QString Updater::clientVersion() return QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_FULL)); } -} // namespace Mirall +} // namespace OCC diff --git a/src/gui/updater/updater.h b/src/gui/updater/updater.h index be2088c6f..4dddeb3b5 100644 --- a/src/gui/updater/updater.h +++ b/src/gui/updater/updater.h @@ -18,7 +18,7 @@ class QUrl; -namespace Mirall { +namespace OCC { class Updater { public: @@ -45,6 +45,6 @@ private: static Updater *_instance; }; -} // namespace Mirall +} // namespace OCC #endif // UPDATER_H diff --git a/src/gui/wizard/abstractcredswizardpage.cpp b/src/gui/wizard/abstractcredswizardpage.cpp index cb17b422f..b9b2d477a 100644 --- a/src/gui/wizard/abstractcredswizardpage.cpp +++ b/src/gui/wizard/abstractcredswizardpage.cpp @@ -18,7 +18,7 @@ #include "wizard/abstractcredswizardpage.h" -namespace Mirall { +namespace OCC { void AbstractCredentialsWizardPage::cleanupPage() { diff --git a/src/gui/wizard/abstractcredswizardpage.h b/src/gui/wizard/abstractcredswizardpage.h index a2ef1fe9a..768a4f7ca 100644 --- a/src/gui/wizard/abstractcredswizardpage.h +++ b/src/gui/wizard/abstractcredswizardpage.h @@ -16,7 +16,7 @@ #include -namespace Mirall +namespace OCC { class AbstractCredentials; @@ -28,6 +28,6 @@ public: virtual AbstractCredentials* getCredentials() const = 0; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp index 344cdd691..c0e4ee07b 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.cpp +++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp @@ -29,7 +29,7 @@ #include "selectivesyncdialog.h" #include "creds/abstractcredentials.h" -namespace Mirall +namespace OCC { OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage() @@ -294,4 +294,4 @@ void OwncloudAdvancedSetupPage::slotSyncEverythingClicked() } -} // ns Mirall +} // namespace OCC diff --git a/src/gui/wizard/owncloudadvancedsetuppage.h b/src/gui/wizard/owncloudadvancedsetuppage.h index c085832bf..bf3b7dd77 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.h +++ b/src/gui/wizard/owncloudadvancedsetuppage.h @@ -23,7 +23,7 @@ class QProgressIndicator; -namespace Mirall { +namespace OCC { class OwncloudAdvancedSetupPage: public QWizardPage { @@ -71,6 +71,6 @@ private: QStringList _blacklist; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/gui/wizard/owncloudhttpcredspage.cpp b/src/gui/wizard/owncloudhttpcredspage.cpp index eb839f789..edad59aaf 100644 --- a/src/gui/wizard/owncloudhttpcredspage.cpp +++ b/src/gui/wizard/owncloudhttpcredspage.cpp @@ -23,7 +23,7 @@ #include "wizard/owncloudwizardcommon.h" #include "wizard/owncloudwizard.h" -namespace Mirall +namespace OCC { OwncloudHttpCredsPage::OwncloudHttpCredsPage() @@ -160,4 +160,4 @@ void OwncloudHttpCredsPage::setConfigExists(bool config) } } -} // ns Mirall +} // namespace OCC diff --git a/src/gui/wizard/owncloudhttpcredspage.h b/src/gui/wizard/owncloudhttpcredspage.h index 70356836c..07e2d45a4 100644 --- a/src/gui/wizard/owncloudhttpcredspage.h +++ b/src/gui/wizard/owncloudhttpcredspage.h @@ -22,7 +22,7 @@ class QProgressIndicator; -namespace Mirall { +namespace OCC { class OwncloudHttpCredsPage : public AbstractCredentialsWizardPage { @@ -55,6 +55,6 @@ private: QProgressIndicator* _progressIndi; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index bf0a8dbab..c6f5d84bf 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -26,7 +26,7 @@ #include "wizard/owncloudsetuppage.h" #include "theme.h" -namespace Mirall +namespace OCC { OwncloudSetupPage::OwncloudSetupPage() @@ -265,4 +265,4 @@ void OwncloudSetupPage::setConfigExists( bool config ) } } -} // ns Mirall +} // namespace OCC diff --git a/src/gui/wizard/owncloudsetuppage.h b/src/gui/wizard/owncloudsetuppage.h index 0d30e6a93..2974c0d88 100644 --- a/src/gui/wizard/owncloudsetuppage.h +++ b/src/gui/wizard/owncloudsetuppage.h @@ -25,7 +25,7 @@ class QLabel; class QVariant; class QProgressIndicator; -namespace Mirall { +namespace OCC { class OwncloudSetupPage: public QWizardPage { @@ -74,6 +74,6 @@ private: QString _remoteFolder; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/gui/wizard/owncloudshibbolethcredspage.cpp b/src/gui/wizard/owncloudshibbolethcredspage.cpp index 0a924b993..4ded63e10 100644 --- a/src/gui/wizard/owncloudshibbolethcredspage.cpp +++ b/src/gui/wizard/owncloudshibbolethcredspage.cpp @@ -22,7 +22,7 @@ #include "creds/shibbolethcredentials.h" #include "creds/shibboleth/shibbolethwebview.h" -namespace Mirall +namespace OCC { OwncloudShibbolethCredsPage::OwncloudShibbolethCredsPage() @@ -110,4 +110,4 @@ void OwncloudShibbolethCredsPage::slotBrowserRejected() wizard()->show(); } -} // ns Mirall +} // namespace OCC diff --git a/src/gui/wizard/owncloudshibbolethcredspage.h b/src/gui/wizard/owncloudshibbolethcredspage.h index 14296431d..03cde5945 100644 --- a/src/gui/wizard/owncloudshibbolethcredspage.h +++ b/src/gui/wizard/owncloudshibbolethcredspage.h @@ -22,7 +22,7 @@ #include "wizard/abstractcredswizardpage.h" -namespace Mirall { +namespace OCC { class Account; class ShibbolethWebView; @@ -57,6 +57,6 @@ private: QNetworkCookie _cookie; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp index eabe0c566..6ec063195 100644 --- a/src/gui/wizard/owncloudwizard.cpp +++ b/src/gui/wizard/owncloudwizard.cpp @@ -31,7 +31,7 @@ #include -namespace Mirall +namespace OCC { OwncloudWizard::OwncloudWizard(QWidget *parent) diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h index 0d2e77a2f..a2f45ad6e 100644 --- a/src/gui/wizard/owncloudwizard.h +++ b/src/gui/wizard/owncloudwizard.h @@ -20,7 +20,7 @@ #include "wizard/owncloudwizardcommon.h" -namespace Mirall { +namespace OCC { class Account; class OwncloudSetupPage; @@ -91,6 +91,6 @@ private: bool _configExists; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/gui/wizard/owncloudwizardcommon.cpp b/src/gui/wizard/owncloudwizardcommon.cpp index a843164be..0c4bcc07b 100644 --- a/src/gui/wizard/owncloudwizardcommon.cpp +++ b/src/gui/wizard/owncloudwizardcommon.cpp @@ -20,7 +20,7 @@ #include "wizard/owncloudwizardcommon.h" #include "theme.h" -namespace Mirall +namespace OCC { namespace WizardCommon @@ -68,4 +68,4 @@ void initErrorLabel(QLabel* errorLabel) } // ns WizardCommon -} // ns Mirall +} // namespace OCC diff --git a/src/gui/wizard/owncloudwizardcommon.h b/src/gui/wizard/owncloudwizardcommon.h index 9896f1192..1eeeef006 100644 --- a/src/gui/wizard/owncloudwizardcommon.h +++ b/src/gui/wizard/owncloudwizardcommon.h @@ -19,7 +19,7 @@ class QVariant; class QLabel; -namespace Mirall +namespace OCC { namespace WizardCommon @@ -50,6 +50,6 @@ enum Pages { } // ns WizardCommon -} // ns Mirall +} // namespace OCC #endif // MIRALL_OWNCLOUD_WIZARD_COMMON_H diff --git a/src/gui/wizard/owncloudwizardresultpage.cpp b/src/gui/wizard/owncloudwizardresultpage.cpp index d5903aaa6..30d0f9fed 100644 --- a/src/gui/wizard/owncloudwizardresultpage.cpp +++ b/src/gui/wizard/owncloudwizardresultpage.cpp @@ -22,7 +22,7 @@ #include "wizard/owncloudwizardcommon.h" #include "theme.h" -namespace Mirall +namespace OCC { OwncloudWizardResultPage::OwncloudWizardResultPage() @@ -113,4 +113,4 @@ void OwncloudWizardResultPage::slotOpenServer() QDesktopServices::openUrl(url); } -} // ns Mirall +} // namespace OCC diff --git a/src/gui/wizard/owncloudwizardresultpage.h b/src/gui/wizard/owncloudwizardresultpage.h index 0390087be..5622b56a7 100644 --- a/src/gui/wizard/owncloudwizardresultpage.h +++ b/src/gui/wizard/owncloudwizardresultpage.h @@ -20,7 +20,7 @@ #include "ui_owncloudwizardresultpage.h" -namespace Mirall { +namespace OCC { class OwncloudWizardResultPage : public QWizardPage { @@ -51,6 +51,6 @@ private: Ui_OwncloudWizardResultPage _ui; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp index e85648773..ae8ae34d1 100644 --- a/src/libsync/accessmanager.cpp +++ b/src/libsync/accessmanager.cpp @@ -22,7 +22,7 @@ #include "mirallaccessmanager.h" #include "utility.h" -namespace Mirall +namespace OCC { AccessManager::AccessManager(QObject* parent) @@ -88,4 +88,4 @@ void AccessManager::slotAuthenticationRequired(QNetworkReply *reply, QAuthentica } } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/accessmanager.h b/src/libsync/accessmanager.h index bba2f1733..53e7b865b 100644 --- a/src/libsync/accessmanager.h +++ b/src/libsync/accessmanager.h @@ -17,7 +17,7 @@ #include "owncloudlib.h" #include -namespace Mirall +namespace OCC { class OWNCLOUDSYNC_EXPORT AccessManager : public QNetworkAccessManager @@ -35,6 +35,6 @@ protected slots: }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index f43feb7c1..21c81dd29 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -33,7 +33,7 @@ #include -namespace Mirall { +namespace OCC { static const char urlC[] = "url"; static const char authTypeC[] = "authType"; @@ -425,4 +425,4 @@ void Account::setMigrated(bool mig) _wasMigrated = mig; } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/account.h b/src/libsync/account.h index 0c8026008..9e0c70820 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -29,7 +29,7 @@ class QNetworkReply; class QUrl; class QNetworkAccessManager; -namespace Mirall { +namespace OCC { class AbstractCredentials; class Account; @@ -180,6 +180,6 @@ private: } -Q_DECLARE_METATYPE(Mirall::Account*) +Q_DECLARE_METATYPE(OCC::Account*) #endif //SERVERCONNECTION_H diff --git a/src/libsync/authenticationdialog.cpp b/src/libsync/authenticationdialog.cpp index ef12ba8ba..f8e68d2e0 100644 --- a/src/libsync/authenticationdialog.cpp +++ b/src/libsync/authenticationdialog.cpp @@ -19,7 +19,7 @@ #include #include -namespace Mirall { +namespace OCC { AuthenticationDialog::AuthenticationDialog(const QString &realm, const QString &domain, QWidget *parent) : QDialog(parent) @@ -53,4 +53,4 @@ QString AuthenticationDialog::password() const return _password->text(); } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/authenticationdialog.h b/src/libsync/authenticationdialog.h index adcd5ca01..ce0fb3c82 100644 --- a/src/libsync/authenticationdialog.h +++ b/src/libsync/authenticationdialog.h @@ -18,7 +18,7 @@ class QLineEdit; -namespace Mirall { +namespace OCC { /** @brief Authenticate a user for a specific credential given his credentials */ class AuthenticationDialog : public QDialog { @@ -36,6 +36,6 @@ private: }; -} // namespace Mirall +} // namespace OCC #endif // MIRALL_AUTHENTICATIONDIALOG_H diff --git a/src/libsync/clientproxy.cpp b/src/libsync/clientproxy.cpp index b545bded5..753408adb 100644 --- a/src/libsync/clientproxy.cpp +++ b/src/libsync/clientproxy.cpp @@ -16,7 +16,7 @@ #include "mirallconfigfile.h" #include -namespace Mirall { +namespace OCC { ClientProxy::ClientProxy(QObject *parent) : QObject(parent) @@ -41,7 +41,7 @@ QNetworkProxy ClientProxy::proxyFromConfig(const ConfigFile& cfg) void ClientProxy::setupQtProxyFromConfig() { - Mirall::ConfigFile cfg; + OCC::ConfigFile cfg; int proxyType = QNetworkProxy::DefaultProxy; QNetworkProxy proxy; diff --git a/src/libsync/clientproxy.h b/src/libsync/clientproxy.h index 242bd30f5..bf6e7360b 100644 --- a/src/libsync/clientproxy.h +++ b/src/libsync/clientproxy.h @@ -20,7 +20,7 @@ #include #include "utility.h" -namespace Mirall { +namespace OCC { class ConfigFile; diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index cbe138299..bf27dece4 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -38,7 +38,7 @@ #define DEFAULT_REMOTE_POLL_INTERVAL 30000 // default remote poll time in milliseconds #define DEFAULT_MAX_LOG_LINES 20000 -namespace Mirall { +namespace OCC { static const char caCertsKeyC[] = "CaCertificates"; static const char remotePollIntervalC[] = "remotePollInterval"; diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h index b15b7c8ee..a82ea8280 100644 --- a/src/libsync/configfile.h +++ b/src/libsync/configfile.h @@ -23,7 +23,7 @@ class QWidget; class QHeaderView; -namespace Mirall { +namespace OCC { class AbstractCredentials; diff --git a/src/libsync/connectionvalidator.cpp b/src/libsync/connectionvalidator.cpp index f51f99483..bd2833b25 100644 --- a/src/libsync/connectionvalidator.cpp +++ b/src/libsync/connectionvalidator.cpp @@ -20,7 +20,7 @@ #include "networkjobs.h" #include -namespace Mirall { +namespace OCC { ConnectionValidator::ConnectionValidator(Account *account, QObject *parent) : QObject(parent), @@ -187,4 +187,4 @@ void ConnectionValidator::slotAuthSuccess() emit connectionResult(Connected); } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/connectionvalidator.h b/src/libsync/connectionvalidator.h index e1c7b07f6..373edd8da 100644 --- a/src/libsync/connectionvalidator.h +++ b/src/libsync/connectionvalidator.h @@ -20,7 +20,7 @@ #include #include -namespace Mirall { +namespace OCC { class Account; diff --git a/src/libsync/cookiejar.cpp b/src/libsync/cookiejar.cpp index 17e3745c6..ec94db9d9 100644 --- a/src/libsync/cookiejar.cpp +++ b/src/libsync/cookiejar.cpp @@ -20,7 +20,7 @@ #include #include -namespace Mirall { +namespace OCC { namespace { const unsigned int JAR_VERSION = 23; @@ -152,4 +152,4 @@ QString CookieJar::storagePath() const return cfg.configPath() + "/cookies.db"; } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/cookiejar.h b/src/libsync/cookiejar.h index 3166b547d..a336d5c80 100644 --- a/src/libsync/cookiejar.h +++ b/src/libsync/cookiejar.h @@ -18,7 +18,7 @@ #include "owncloudlib.h" -namespace Mirall { +namespace OCC { class OWNCLOUDSYNC_EXPORT CookieJar : public QNetworkCookieJar { @@ -46,6 +46,6 @@ private: }; -} // namespace Mirall +} // namespace OCC #endif // MIRALL_COOKIEJAR_H diff --git a/src/libsync/creds/abstractcredentials.cpp b/src/libsync/creds/abstractcredentials.cpp index c8b8b39bb..556ed4b24 100644 --- a/src/libsync/creds/abstractcredentials.cpp +++ b/src/libsync/creds/abstractcredentials.cpp @@ -17,7 +17,7 @@ #include "creds/abstractcredentials.h" -namespace Mirall +namespace OCC { QString AbstractCredentials::keychainKey(const QString &url, const QString &user) @@ -39,4 +39,4 @@ QString AbstractCredentials::keychainKey(const QString &url, const QString &user QString key = user+QLatin1Char(':')+u; return key; } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/abstractcredentials.h b/src/libsync/creds/abstractcredentials.h index 2c144b0d9..e132279ba 100644 --- a/src/libsync/creds/abstractcredentials.h +++ b/src/libsync/creds/abstractcredentials.h @@ -22,7 +22,7 @@ class QNetworkAccessManager; class QNetworkReply; -namespace Mirall +namespace OCC { class Account; @@ -56,6 +56,6 @@ Q_SIGNALS: void fetched(); }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/credentialscommon.cpp b/src/libsync/creds/credentialscommon.cpp index c34a0fe47..bf98f7794 100644 --- a/src/libsync/creds/credentialscommon.cpp +++ b/src/libsync/creds/credentialscommon.cpp @@ -26,7 +26,7 @@ #include "utility.h" #include "account.h" -namespace Mirall +namespace OCC { int handleNeonSSLProblems(const char* prompt, @@ -76,4 +76,4 @@ int handleNeonSSLProblems(const char* prompt, return re; } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/credentialscommon.h b/src/libsync/creds/credentialscommon.h index e0f26f741..35ade4a3f 100644 --- a/src/libsync/creds/credentialscommon.h +++ b/src/libsync/creds/credentialscommon.h @@ -16,7 +16,7 @@ #ifndef MIRALL_CREDS_COMMON_H #define MIRALL_CREDS_COMMON_H -namespace Mirall +namespace OCC { int handleNeonSSLProblems(const char* prompt, @@ -26,6 +26,6 @@ int handleNeonSSLProblems(const char* prompt, int verify, void* userdata); -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/credentialsfactory.cpp b/src/libsync/creds/credentialsfactory.cpp index f91081d0c..dbb6e95a3 100644 --- a/src/libsync/creds/credentialsfactory.cpp +++ b/src/libsync/creds/credentialsfactory.cpp @@ -22,7 +22,7 @@ #include "creds/shibbolethcredentials.h" #endif -namespace Mirall +namespace OCC { namespace CredentialsFactory @@ -50,4 +50,4 @@ AbstractCredentials* create(const QString& type) } // ns CredentialsFactory -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/credentialsfactory.h b/src/libsync/creds/credentialsfactory.h index 1a7dc77f6..26225d68f 100644 --- a/src/libsync/creds/credentialsfactory.h +++ b/src/libsync/creds/credentialsfactory.h @@ -18,7 +18,7 @@ class QString; -namespace Mirall +namespace OCC { class AbstractCredentials; @@ -29,6 +29,6 @@ OWNCLOUDSYNC_EXPORT AbstractCredentials* create(const QString& type); } // ns CredentialsFactory -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/dummycredentials.cpp b/src/libsync/creds/dummycredentials.cpp index df166d438..9075d3b20 100644 --- a/src/libsync/creds/dummycredentials.cpp +++ b/src/libsync/creds/dummycredentials.cpp @@ -14,7 +14,7 @@ #include "creds/dummycredentials.h" #include "mirallaccessmanager.h" -namespace Mirall +namespace OCC { void DummyCredentials::syncContextPreInit(CSYNC*) @@ -64,4 +64,4 @@ void DummyCredentials::fetch(Account*) void DummyCredentials::persist(Account*) {} -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/dummycredentials.h b/src/libsync/creds/dummycredentials.h index 516280fe7..a42bab7b6 100644 --- a/src/libsync/creds/dummycredentials.h +++ b/src/libsync/creds/dummycredentials.h @@ -16,7 +16,7 @@ #include "creds/abstractcredentials.h" -namespace Mirall +namespace OCC { class DummyCredentials : public AbstractCredentials @@ -40,6 +40,6 @@ public: void invalidateToken(Account *) Q_DECL_OVERRIDE {} }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/http/httpconfigfile.cpp b/src/libsync/creds/http/httpconfigfile.cpp index e1e7a734b..4066b3a33 100644 --- a/src/libsync/creds/http/httpconfigfile.cpp +++ b/src/libsync/creds/http/httpconfigfile.cpp @@ -13,7 +13,7 @@ #include "creds/http/httpconfigfile.h" -namespace Mirall +namespace OCC { namespace @@ -78,4 +78,4 @@ void HttpConfigFile::removeOldPassword() removeData(QString(), QLatin1String(oldPasswdC)); } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/http/httpconfigfile.h b/src/libsync/creds/http/httpconfigfile.h index 6755f2b90..31d4656a5 100644 --- a/src/libsync/creds/http/httpconfigfile.h +++ b/src/libsync/creds/http/httpconfigfile.h @@ -16,7 +16,7 @@ #include "mirallconfigfile.h" -namespace Mirall +namespace OCC { class HttpConfigFile : public ConfigFile @@ -35,6 +35,6 @@ private: void removeOldPassword(); }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp index 88998f6af..16ad60ad6 100644 --- a/src/libsync/creds/httpcredentials.cpp +++ b/src/libsync/creds/httpcredentials.cpp @@ -34,7 +34,7 @@ using namespace QKeychain; -namespace Mirall +namespace OCC { int getauth(const char *prompt, @@ -381,4 +381,4 @@ QString HttpCredentialsGui::queryPassword(bool *ok) } } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/httpcredentials.h b/src/libsync/creds/httpcredentials.h index ad14d36e0..834a6b4c0 100644 --- a/src/libsync/creds/httpcredentials.h +++ b/src/libsync/creds/httpcredentials.h @@ -27,7 +27,7 @@ namespace QKeychain { class Job; } -namespace Mirall +namespace OCC { class OWNCLOUDSYNC_EXPORT HttpCredentials : public AbstractCredentials @@ -76,6 +76,6 @@ public: QString queryPassword(bool *ok) Q_DECL_OVERRIDE; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/shibboleth/shibbolethrefresher.cpp b/src/libsync/creds/shibboleth/shibbolethrefresher.cpp index 375674b73..8971f1d7c 100644 --- a/src/libsync/creds/shibboleth/shibbolethrefresher.cpp +++ b/src/libsync/creds/shibboleth/shibbolethrefresher.cpp @@ -17,7 +17,7 @@ #include "creds/shibboleth/shibbolethrefresher.h" #include "creds/shibbolethcredentials.h" -namespace Mirall +namespace OCC { ShibbolethRefresher::ShibbolethRefresher(Account *account, ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent) @@ -52,4 +52,4 @@ void ShibbolethRefresher::onInvalidatedAndFetched(const QByteArray& cookies) csync_set_module_property(_csync_ctx, "session_key", myCookies.data()); } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/shibboleth/shibbolethrefresher.h b/src/libsync/creds/shibboleth/shibbolethrefresher.h index 242a5229a..2bc3a3c04 100644 --- a/src/libsync/creds/shibboleth/shibbolethrefresher.h +++ b/src/libsync/creds/shibboleth/shibbolethrefresher.h @@ -20,7 +20,7 @@ class QByteArray; -namespace Mirall +namespace OCC { class Account; @@ -44,6 +44,6 @@ private: CSYNC* _csync_ctx; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/shibboleth/shibbolethuserjob.cpp b/src/libsync/creds/shibboleth/shibbolethuserjob.cpp index 1752c4426..f422a0a02 100644 --- a/src/libsync/creds/shibboleth/shibbolethuserjob.cpp +++ b/src/libsync/creds/shibboleth/shibbolethuserjob.cpp @@ -16,7 +16,7 @@ #include #include -namespace Mirall { +namespace OCC { ShibbolethUserJob::ShibbolethUserJob(Account* account, QObject* parent) : AbstractNetworkJob(account, QLatin1String("ocs/v1.php/cloud/user"), parent) diff --git a/src/libsync/creds/shibboleth/shibbolethuserjob.h b/src/libsync/creds/shibboleth/shibbolethuserjob.h index 3f2c10b59..05a9edf86 100644 --- a/src/libsync/creds/shibboleth/shibbolethuserjob.h +++ b/src/libsync/creds/shibboleth/shibbolethuserjob.h @@ -16,7 +16,7 @@ #include -namespace Mirall +namespace OCC { /** @@ -38,5 +38,5 @@ private slots: }; -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/shibboleth/shibbolethwebview.cpp b/src/libsync/creds/shibboleth/shibbolethwebview.cpp index e9bef0b2d..e3f5cd074 100644 --- a/src/libsync/creds/shibboleth/shibbolethwebview.cpp +++ b/src/libsync/creds/shibboleth/shibbolethwebview.cpp @@ -27,7 +27,7 @@ #include "mirallaccessmanager.h" #include "theme.h" -namespace Mirall +namespace OCC { ShibbolethWebView::ShibbolethWebView(Account* account, QWidget* parent) @@ -119,4 +119,4 @@ void ShibbolethWebView::accept() _accepted = true; } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/shibboleth/shibbolethwebview.h b/src/libsync/creds/shibboleth/shibbolethwebview.h index 25eb03274..ac871cc2e 100644 --- a/src/libsync/creds/shibboleth/shibbolethwebview.h +++ b/src/libsync/creds/shibboleth/shibbolethwebview.h @@ -22,7 +22,7 @@ class QNetworkCookie; class QUrl; -namespace Mirall +namespace OCC { class ShibbolethCookieJar; @@ -58,6 +58,6 @@ private: bool _cursorOverriden; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/shibbolethcredentials.cpp b/src/libsync/creds/shibbolethcredentials.cpp index 5fd992e97..2ce132fca 100644 --- a/src/libsync/creds/shibbolethcredentials.cpp +++ b/src/libsync/creds/shibbolethcredentials.cpp @@ -39,7 +39,7 @@ using namespace QKeychain; -namespace Mirall +namespace OCC { namespace @@ -438,4 +438,4 @@ void ShibbolethCredentials::addToCookieJar(const QNetworkCookie &cookie) } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/shibbolethcredentials.h b/src/libsync/creds/shibbolethcredentials.h index 883735e08..069aa571f 100644 --- a/src/libsync/creds/shibbolethcredentials.h +++ b/src/libsync/creds/shibbolethcredentials.h @@ -28,7 +28,7 @@ namespace QKeychain { class QAuthenticator; -namespace Mirall +namespace OCC { class ShibbolethWebView; @@ -93,6 +93,6 @@ private: QString _user; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/creds/tokencredentials.cpp b/src/libsync/creds/tokencredentials.cpp index ecdac78f2..a5d7ebff1 100644 --- a/src/libsync/creds/tokencredentials.cpp +++ b/src/libsync/creds/tokencredentials.cpp @@ -26,7 +26,7 @@ #include "creds/tokencredentials.h" -namespace Mirall +namespace OCC { namespace @@ -209,4 +209,4 @@ void TokenCredentials::slotAuthentication(QNetworkReply* reply, QAuthenticator* reply->close(); } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/creds/tokencredentials.h b/src/libsync/creds/tokencredentials.h index d44fb2049..7005334cf 100644 --- a/src/libsync/creds/tokencredentials.h +++ b/src/libsync/creds/tokencredentials.h @@ -27,7 +27,7 @@ namespace QKeychain { class Job; } -namespace Mirall +namespace OCC { class TokenCredentialsAccessManager; @@ -64,6 +64,6 @@ private: bool _ready; }; -} // ns Mirall +} // namespace OCC #endif diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp index 5e72dacfc..e3f6f3067 100644 --- a/src/libsync/discoveryphase.cpp +++ b/src/libsync/discoveryphase.cpp @@ -18,7 +18,7 @@ #include -namespace Mirall { +namespace OCC { bool DiscoveryJob::isInSelectiveSyncBlackList(const QString& path) const { diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h index c0ec036d0..78c13bdd8 100644 --- a/src/libsync/discoveryphase.h +++ b/src/libsync/discoveryphase.h @@ -20,7 +20,7 @@ #include -namespace Mirall { +namespace OCC { /** * The Discovery Phase was once called "update" phase in csync therms. diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp index 59e2fbe78..9721bef42 100644 --- a/src/libsync/filesystem.cpp +++ b/src/libsync/filesystem.cpp @@ -37,7 +37,7 @@ extern "C" { #include "vio/csync_vio_local.h" } -namespace Mirall { +namespace OCC { bool FileSystem::fileEquals(const QString& fn1, const QString& fn2) { diff --git a/src/libsync/filesystem.h b/src/libsync/filesystem.h index 71cd1a229..c7592a871 100644 --- a/src/libsync/filesystem.h +++ b/src/libsync/filesystem.h @@ -18,7 +18,7 @@ #include -namespace Mirall { +namespace OCC { /** * This file contains file system helper. diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp index 61e1c3f4d..c73ac215a 100644 --- a/src/libsync/logger.cpp +++ b/src/libsync/logger.cpp @@ -18,7 +18,7 @@ #include #include -namespace Mirall { +namespace OCC { #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) // logging handler. @@ -115,7 +115,7 @@ void Logger::csyncLog( const QString& message ) void Logger::mirallLog( const QString& message ) { Log log_; - log_.source = Log::Mirall; + log_.source = Log::Occ; log_.timeStamp = QDateTime::currentDateTime(); log_.message = message; @@ -201,4 +201,4 @@ void Logger::enterNextLogFile() } } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/logger.h b/src/libsync/logger.h index 8e4fdbe6c..db9e1854c 100644 --- a/src/libsync/logger.h +++ b/src/libsync/logger.h @@ -24,11 +24,11 @@ #include "utility.h" -namespace Mirall { +namespace OCC { struct Log{ typedef enum{ - Mirall, + Occ, CSync } Source; @@ -84,6 +84,6 @@ private: }; -} // namespace Mirall +} // namespace OCC #endif // LOGGER_H diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index cbed6e182..341e5dc4f 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -37,7 +37,7 @@ Q_DECLARE_METATYPE(QTimer*) -namespace Mirall { +namespace OCC { bool AbstractNetworkJob::preOc7WasDetected = false; @@ -652,4 +652,4 @@ NetworkJobTimeoutPauser::~NetworkJobTimeoutPauser() } } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h index 14b88ec47..779b7e862 100644 --- a/src/libsync/networkjobs.h +++ b/src/libsync/networkjobs.h @@ -27,7 +27,7 @@ class QUrl; -namespace Mirall { +namespace OCC { class Account; class AbstractSslErrorHandler; @@ -241,6 +241,6 @@ private slots: virtual bool finished() Q_DECL_OVERRIDE; }; -} // namespace Mirall +} // namespace OCC #endif // NETWORKJOBS_H diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index 2d50bd2f3..a294da004 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -31,7 +31,7 @@ #include #include -namespace Mirall { +namespace OCC { /* The maximum number of active job in parallel */ static int maximumActiveJob() { diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index b1e3fab27..d9aaa72c5 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -27,7 +27,7 @@ struct ne_session_s; struct ne_decompress_s; typedef struct ne_prop_result_set_s ne_prop_result_set; -namespace Mirall { +namespace OCC { class SyncJournalDb; class OwncloudPropagator; diff --git a/src/libsync/owncloudpropagator_p.h b/src/libsync/owncloudpropagator_p.h index 3f98f6604..e99894fa8 100644 --- a/src/libsync/owncloudpropagator_p.h +++ b/src/libsync/owncloudpropagator_p.h @@ -15,7 +15,7 @@ #pragma once -namespace Mirall { +namespace OCC { inline QByteArray parseEtag(const char *header) { if (!header) diff --git a/src/libsync/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp index 7dd2ac268..e5e039c07 100644 --- a/src/libsync/owncloudtheme.cpp +++ b/src/libsync/owncloudtheme.cpp @@ -29,7 +29,7 @@ #include "version.h" #include "config.h" -namespace Mirall { +namespace OCC { ownCloudTheme::ownCloudTheme() : Theme() diff --git a/src/libsync/owncloudtheme.h b/src/libsync/owncloudtheme.h index 9ab83a9ab..733754b9b 100644 --- a/src/libsync/owncloudtheme.h +++ b/src/libsync/owncloudtheme.h @@ -17,7 +17,7 @@ #include "theme.h" -namespace Mirall { +namespace OCC { class ownCloudTheme : public Theme { diff --git a/src/libsync/ownsql.cpp b/src/libsync/ownsql.cpp index 157b00c85..a01c3bd94 100644 --- a/src/libsync/ownsql.cpp +++ b/src/libsync/ownsql.cpp @@ -26,7 +26,7 @@ _errId = (A); if(_errId != SQLITE_OK) { _error= QString::fromUtf8(sqlite3_errmsg(_db)); \ } } -namespace Mirall { +namespace OCC { SqlDatabase::SqlDatabase() :_db(0), @@ -137,7 +137,7 @@ int SqlQuery::prepare( const QString& sql) rc = sqlite3_prepare_v2(_db, _sql.toUtf8().constData(), -1, &_stmt, 0); if( (rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED) ) { n++; - Mirall::Utility::usleep(SQLITE_SLEEP_TIME_USEC); + OCC::Utility::usleep(SQLITE_SLEEP_TIME_USEC); } } while( (n < SQLITE_REPEAT_COUNT) && ((rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED))); _errId = rc; @@ -170,9 +170,9 @@ bool SqlQuery::exec() if( rc == SQLITE_LOCKED ) { rc = sqlite3_reset(_stmt); /* This will also return SQLITE_LOCKED */ n++; - Mirall::Utility::usleep(SQLITE_SLEEP_TIME_USEC); + OCC::Utility::usleep(SQLITE_SLEEP_TIME_USEC); } else if( rc == SQLITE_BUSY ) { - Mirall::Utility::usleep(SQLITE_SLEEP_TIME_USEC); + OCC::Utility::usleep(SQLITE_SLEEP_TIME_USEC); n++; } } while( (n < SQLITE_REPEAT_COUNT) && ((rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED))); @@ -292,4 +292,4 @@ void SqlQuery::reset() SQLITE_DO(sqlite3_reset(_stmt)); } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/ownsql.h b/src/libsync/ownsql.h index 055be3372..e6b69ab71 100644 --- a/src/libsync/ownsql.h +++ b/src/libsync/ownsql.h @@ -21,7 +21,7 @@ #include "owncloudlib.h" -namespace Mirall { +namespace OCC { class OWNCLOUDSYNC_EXPORT SqlDatabase { @@ -79,6 +79,6 @@ private: QString _sql; }; -} // namespace Mirall +} // namespace OCC #endif // OWNSQL_H diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp index b0f8a0be8..c2281975a 100644 --- a/src/libsync/progressdispatcher.cpp +++ b/src/libsync/progressdispatcher.cpp @@ -18,7 +18,7 @@ #include #include -namespace Mirall { +namespace OCC { ProgressDispatcher* ProgressDispatcher::_instance = 0; diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h index 66a8e411f..1540eb59f 100644 --- a/src/libsync/progressdispatcher.h +++ b/src/libsync/progressdispatcher.h @@ -22,7 +22,7 @@ #include #include "syncfileitem.h" -namespace Mirall { +namespace OCC { /** * @brief The FolderScheduler class schedules folders for sync diff --git a/src/libsync/propagator_legacy.cpp b/src/libsync/propagator_legacy.cpp index 7b6a9bf7d..3aba92122 100644 --- a/src/libsync/propagator_legacy.cpp +++ b/src/libsync/propagator_legacy.cpp @@ -42,7 +42,7 @@ #include -namespace Mirall { +namespace OCC { static QByteArray get_etag_from_reply(ne_request *req) { @@ -336,7 +336,7 @@ void PropagateNeonJob::limitBandwidth(qint64 progress, qint64 bandwidth_limit) int64_t wait_time = (1000000 * len / bandwidth_limit) - diff; if (wait_time > 0) { //qDebug() << "Limiting bandwidth to " << bandwidth_limit << "KB/s by waiting " << wait_time << " µs; "; - Mirall::Utility::usleep(wait_time); + OCC::Utility::usleep(wait_time); } } _lastProgress = progress; @@ -347,7 +347,7 @@ void PropagateNeonJob::limitBandwidth(qint64 progress, qint64 bandwidth_limit) // -bandwidth_limit is the % of bandwidth int64_t wait_time = -diff * (1 + 100.0 / bandwidth_limit); if (wait_time > 0) { - Mirall::Utility::usleep(qMin(wait_time, int64_t(1000000*10))); + OCC::Utility::usleep(qMin(wait_time, int64_t(1000000*10))); } } _lastTime.start(); diff --git a/src/libsync/propagator_legacy.h b/src/libsync/propagator_legacy.h index 80b7bb1d8..083230ef3 100644 --- a/src/libsync/propagator_legacy.h +++ b/src/libsync/propagator_legacy.h @@ -17,7 +17,7 @@ #include "propagatorjobs.h" -namespace Mirall { +namespace OCC { class PropagateUploadFileLegacy: public PropagateNeonJob { Q_OBJECT diff --git a/src/libsync/propagator_qnam.cpp b/src/libsync/propagator_qnam.cpp index c9b79aeba..544c1971f 100644 --- a/src/libsync/propagator_qnam.cpp +++ b/src/libsync/propagator_qnam.cpp @@ -25,7 +25,7 @@ #include #include -namespace Mirall { +namespace OCC { /** * The mtime of a file must be at least this many milliseconds in diff --git a/src/libsync/propagator_qnam.h b/src/libsync/propagator_qnam.h index 9ef37f373..0548aaed4 100644 --- a/src/libsync/propagator_qnam.h +++ b/src/libsync/propagator_qnam.h @@ -22,7 +22,7 @@ #include #include -namespace Mirall { +namespace OCC { class ChunkBlock { diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp index b3ea60e85..e9d6e510d 100644 --- a/src/libsync/propagatorjobs.cpp +++ b/src/libsync/propagatorjobs.cpp @@ -47,7 +47,7 @@ #include -namespace Mirall { +namespace OCC { // Code copied from Qt5's QDir::removeRecursively // (and modified to report the error) diff --git a/src/libsync/propagatorjobs.h b/src/libsync/propagatorjobs.h index 6e8e30cbe..786357be9 100644 --- a/src/libsync/propagatorjobs.h +++ b/src/libsync/propagatorjobs.h @@ -21,7 +21,7 @@ #include #include -namespace Mirall { +namespace OCC { /* Helper for QScopedPointer<>, to be used as the deleter. * QScopePointer will call the right overload of cleanup for the pointer it holds diff --git a/src/libsync/quotainfo.cpp b/src/libsync/quotainfo.cpp index 2a8eb286a..31eaacb93 100644 --- a/src/libsync/quotainfo.cpp +++ b/src/libsync/quotainfo.cpp @@ -19,7 +19,7 @@ #include #include -namespace Mirall { +namespace OCC { namespace { static const int defaultIntervalT = 30*1000; diff --git a/src/libsync/quotainfo.h b/src/libsync/quotainfo.h index 14ccbbf9f..4af6b27cd 100644 --- a/src/libsync/quotainfo.h +++ b/src/libsync/quotainfo.h @@ -19,7 +19,7 @@ class QTimer; -namespace Mirall { +namespace OCC { class Account; @@ -52,6 +52,6 @@ private: -} // namespace Mirall +} // namespace OCC #endif //QUOTAINFO_H diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index d293cc011..800899b92 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -46,11 +46,11 @@ #include #include -namespace Mirall { +namespace OCC { bool SyncEngine::_syncRunning = false; -SyncEngine::SyncEngine(CSYNC *ctx, const QString& localPath, const QString& remoteURL, const QString& remotePath, Mirall::SyncJournalDb* journal) +SyncEngine::SyncEngine(CSYNC *ctx, const QString& localPath, const QString& remoteURL, const QString& remotePath, OCC::SyncJournalDb* journal) : _csync_ctx(ctx) , _needsUpdate(false) , _localPath(localPath) @@ -1101,4 +1101,4 @@ void SyncEngine::abort() _propagator->abort(); } -} // ns Mirall +} // namespace OCC diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h index 208d392b7..6387334c8 100644 --- a/src/libsync/syncengine.h +++ b/src/libsync/syncengine.h @@ -37,7 +37,7 @@ class QProcess; -namespace Mirall { +namespace OCC { class SyncJournalFileRecord; diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h index 22a758159..2dce6c340 100644 --- a/src/libsync/syncfileitem.h +++ b/src/libsync/syncfileitem.h @@ -21,7 +21,7 @@ #include -namespace Mirall { +namespace OCC { class SyncFileItem { public: @@ -133,6 +133,6 @@ typedef QVector SyncFileItemVector; } -Q_DECLARE_METATYPE(Mirall::SyncFileItem) +Q_DECLARE_METATYPE(OCC::SyncFileItem) #endif // SYNCFILEITEM_H diff --git a/src/libsync/syncfilestatus.cpp b/src/libsync/syncfilestatus.cpp index dac10014d..21776ec49 100644 --- a/src/libsync/syncfilestatus.cpp +++ b/src/libsync/syncfilestatus.cpp @@ -15,7 +15,7 @@ #include -namespace Mirall { +namespace OCC { SyncFileStatus::SyncFileStatus() :_tag(STATUS_NONE), _sharedWithMe(false) { diff --git a/src/libsync/syncfilestatus.h b/src/libsync/syncfilestatus.h index 9e656f50b..319f4e4ac 100644 --- a/src/libsync/syncfilestatus.h +++ b/src/libsync/syncfilestatus.h @@ -18,7 +18,7 @@ #include "owncloudlib.h" -namespace Mirall { +namespace OCC { class OWNCLOUDSYNC_EXPORT SyncFileStatus { diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp index d5f97a4cc..401ab3a18 100644 --- a/src/libsync/syncjournaldb.cpp +++ b/src/libsync/syncjournaldb.cpp @@ -27,7 +27,7 @@ #include "../../csync/src/std/c_jhash.h" -namespace Mirall { +namespace OCC { SyncJournalDb::SyncJournalDb(const QString& path, QObject *parent) : QObject(parent), _transaction(0), _possibleUpgradeFromMirall_1_5(false) @@ -1234,4 +1234,4 @@ bool operator==(const SyncJournalDb::UploadInfo & lhs, && lhs._transferid == rhs._transferid; } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/syncjournaldb.h b/src/libsync/syncjournaldb.h index 44fe868b5..85608459f 100644 --- a/src/libsync/syncjournaldb.h +++ b/src/libsync/syncjournaldb.h @@ -22,7 +22,7 @@ #include "utility.h" #include "ownsql.h" -namespace Mirall { +namespace OCC { class SyncJournalFileRecord; class SyncJournalBlacklistRecord; @@ -151,5 +151,5 @@ bool operator==(const SyncJournalDb::DownloadInfo & lhs, bool operator==(const SyncJournalDb::UploadInfo & lhs, const SyncJournalDb::UploadInfo & rhs); -} // namespace Mirall +} // namespace OCC #endif // SYNCJOURNALDB_H diff --git a/src/libsync/syncjournalfilerecord.cpp b/src/libsync/syncjournalfilerecord.cpp index a751e97eb..91b6ae734 100644 --- a/src/libsync/syncjournalfilerecord.cpp +++ b/src/libsync/syncjournalfilerecord.cpp @@ -24,7 +24,7 @@ #include #endif -namespace Mirall { +namespace OCC { SyncJournalFileRecord::SyncJournalFileRecord() :_inode(0), _type(0), _mode(0) diff --git a/src/libsync/syncjournalfilerecord.h b/src/libsync/syncjournalfilerecord.h index 376c58ef6..3c8e1599e 100644 --- a/src/libsync/syncjournalfilerecord.h +++ b/src/libsync/syncjournalfilerecord.h @@ -19,7 +19,7 @@ #include "owncloudlib.h" -namespace Mirall { +namespace OCC { class SyncFileItem; diff --git a/src/libsync/syncresult.cpp b/src/libsync/syncresult.cpp index 20ab323ec..acefc9735 100644 --- a/src/libsync/syncresult.cpp +++ b/src/libsync/syncresult.cpp @@ -14,7 +14,7 @@ #include "syncresult.h" -namespace Mirall +namespace OCC { SyncResult::SyncResult() diff --git a/src/libsync/syncresult.h b/src/libsync/syncresult.h index 0a673f12a..576e05e4a 100644 --- a/src/libsync/syncresult.h +++ b/src/libsync/syncresult.h @@ -22,7 +22,7 @@ #include "owncloudlib.h" #include "syncfileitem.h" -namespace Mirall +namespace OCC { class OWNCLOUDSYNC_EXPORT SyncResult diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index f3c6f389b..6b33986c3 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -30,7 +30,7 @@ # include INCLUDE_FILE(THEME_INCLUDE) #endif -namespace Mirall { +namespace OCC { Theme* Theme::_instance = 0; diff --git a/src/libsync/theme.h b/src/libsync/theme.h index 208e6d84d..d1ead5fd8 100644 --- a/src/libsync/theme.h +++ b/src/libsync/theme.h @@ -24,7 +24,7 @@ class QObject; class QPixmap; class QColor; -namespace Mirall { +namespace OCC { class SyncResult; diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp index 1a64867a7..a91ee0e2c 100644 --- a/src/libsync/utility.cpp +++ b/src/libsync/utility.cpp @@ -50,7 +50,7 @@ #include "utility_unix.cpp" #endif -namespace Mirall { +namespace OCC { bool Utility::writeRandomFile( const QString& fname, int size ) { @@ -431,4 +431,4 @@ quint64 Utility::StopWatch::durationOfLap( const QString& lapName ) const } -} // namespace Mirall +} // namespace OCC diff --git a/src/libsync/utility.h b/src/libsync/utility.h index 81759a66a..849db9fab 100644 --- a/src/libsync/utility.h +++ b/src/libsync/utility.h @@ -24,7 +24,7 @@ class QWidget; -namespace Mirall { +namespace OCC { namespace Utility {