diff options
author | Daniel Molkentin <danimo@owncloud.com> | 2014-07-11 02:31:24 +0400 |
---|---|---|
committer | Daniel Molkentin <danimo@owncloud.com> | 2014-07-11 13:07:31 +0400 |
commit | df3c3bca025a7cdb5f20e55fc2ecc37618e7cc8d (patch) | |
tree | 22fa58b5a09ec9f93ad376dce2edd6272483fc1a | |
parent | d1b991e1984ef0c4ed803c5c5ead1ce3bfe00266 (diff) |
Split into three separate projects: library, gui and cmd
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/CMakeLists.txt | 445 | ||||
-rw-r--r-- | src/cmd/CMakeLists.txt | 40 | ||||
-rw-r--r-- | src/cmd/cmd.cpp (renamed from src/owncloudcmd/owncloudcmd.cpp) | 27 | ||||
-rw-r--r-- | src/cmd/cmd.h (renamed from src/owncloudcmd/owncloudcmd.h) | 8 | ||||
-rw-r--r-- | src/cmd/simplesslerrorhandler.cpp (renamed from src/owncloudcmd/simplesslerrorhandler.cpp) | 6 | ||||
-rw-r--r-- | src/cmd/simplesslerrorhandler.h (renamed from src/owncloudcmd/simplesslerrorhandler.h) | 2 | ||||
-rw-r--r-- | src/gui/CMakeLists.txt | 253 | ||||
-rw-r--r-- | src/gui/accountsettings.cpp (renamed from src/mirall/accountsettings.cpp) | 24 | ||||
-rw-r--r-- | src/gui/accountsettings.h (renamed from src/mirall/accountsettings.h) | 4 | ||||
-rw-r--r-- | src/gui/accountsettings.ui (renamed from src/mirall/accountsettings.ui) | 0 | ||||
-rw-r--r-- | src/gui/application.cpp (renamed from src/mirall/application.cpp) | 24 | ||||
-rw-r--r-- | src/gui/application.h (renamed from src/mirall/application.h) | 14 | ||||
-rw-r--r-- | src/gui/cocoainitializer.h (renamed from src/mirall/cocoainitializer.h) | 0 | ||||
-rw-r--r-- | src/gui/cocoainitializer_mac.mm (renamed from src/mirall/cocoainitializer_mac.mm) | 0 | ||||
-rw-r--r-- | src/gui/folder.cpp (renamed from src/mirall/folder.cpp) | 24 | ||||
-rw-r--r-- | src/gui/folder.h (renamed from src/mirall/folder.h) | 10 | ||||
-rw-r--r-- | src/gui/folderman.cpp (renamed from src/mirall/folderman.cpp) | 10 | ||||
-rw-r--r-- | src/gui/folderman.h (renamed from src/mirall/folderman.h) | 6 | ||||
-rw-r--r-- | src/gui/folderstatusmodel.cpp (renamed from src/mirall/folderstatusmodel.cpp) | 4 | ||||
-rw-r--r-- | src/gui/folderstatusmodel.h (renamed from src/mirall/folderstatusmodel.h) | 0 | ||||
-rw-r--r-- | src/gui/folderwatcher.cpp (renamed from src/mirall/folderwatcher.cpp) | 8 | ||||
-rw-r--r-- | src/gui/folderwatcher.h (renamed from src/mirall/folderwatcher.h) | 0 | ||||
-rw-r--r-- | src/gui/folderwatcher_linux.cpp (renamed from src/mirall/folderwatcher_linux.cpp) | 4 | ||||
-rw-r--r-- | src/gui/folderwatcher_linux.h (renamed from src/mirall/folderwatcher_linux.h) | 2 | ||||
-rw-r--r-- | src/gui/folderwatcher_mac.cpp (renamed from src/mirall/folderwatcher_mac.cpp) | 6 | ||||
-rw-r--r-- | src/gui/folderwatcher_mac.h (renamed from src/mirall/folderwatcher_mac.h) | 0 | ||||
-rw-r--r-- | src/gui/folderwatcher_qt.cpp (renamed from src/mirall/folderwatcher_qt.cpp) | 4 | ||||
-rw-r--r-- | src/gui/folderwatcher_qt.h (renamed from src/mirall/folderwatcher_qt.h) | 0 | ||||
-rw-r--r-- | src/gui/folderwatcher_win.cpp (renamed from src/mirall/folderwatcher_win.cpp) | 4 | ||||
-rw-r--r-- | src/gui/folderwatcher_win.h (renamed from src/mirall/folderwatcher_win.h) | 0 | ||||
-rw-r--r-- | src/gui/folderwizard.cpp (renamed from src/mirall/folderwizard.cpp) | 12 | ||||
-rw-r--r-- | src/gui/folderwizard.h (renamed from src/mirall/folderwizard.h) | 0 | ||||
-rw-r--r-- | src/gui/folderwizardsourcepage.ui (renamed from src/mirall/folderwizardsourcepage.ui) | 0 | ||||
-rw-r--r-- | src/gui/folderwizardtargetpage.ui (renamed from src/mirall/folderwizardtargetpage.ui) | 0 | ||||
-rw-r--r-- | src/gui/generalsettings.cpp (renamed from src/mirall/generalsettings.cpp) | 10 | ||||
-rw-r--r-- | src/gui/generalsettings.h (renamed from src/mirall/generalsettings.h) | 0 | ||||
-rw-r--r-- | src/gui/generalsettings.ui (renamed from src/mirall/generalsettings.ui) | 0 | ||||
-rw-r--r-- | src/gui/ignorelisteditor.cpp (renamed from src/mirall/ignorelisteditor.cpp) | 2 | ||||
-rw-r--r-- | src/gui/ignorelisteditor.h (renamed from src/mirall/ignorelisteditor.h) | 0 | ||||
-rw-r--r-- | src/gui/ignorelisteditor.ui (renamed from src/mirall/ignorelisteditor.ui) | 0 | ||||
-rw-r--r-- | src/gui/logbrowser.cpp (renamed from src/mirall/logbrowser.cpp) | 4 | ||||
-rw-r--r-- | src/gui/logbrowser.h (renamed from src/mirall/logbrowser.h) | 0 | ||||
-rw-r--r-- | src/gui/main.cpp (renamed from src/main.cpp) | 8 | ||||
-rw-r--r-- | src/gui/networksettings.cpp (renamed from src/mirall/networksettings.cpp) | 12 | ||||
-rw-r--r-- | src/gui/networksettings.h (renamed from src/mirall/networksettings.h) | 0 | ||||
-rw-r--r-- | src/gui/networksettings.ui (renamed from src/mirall/networksettings.ui) | 0 | ||||
-rw-r--r-- | src/gui/openfilemanager.cpp (renamed from src/mirall/openfilemanager.cpp) | 0 | ||||
-rw-r--r-- | src/gui/openfilemanager.h (renamed from src/mirall/openfilemanager.h) | 0 | ||||
-rw-r--r-- | src/gui/owncloudgui.cpp (renamed from src/mirall/owncloudgui.cpp) | 26 | ||||
-rw-r--r-- | src/gui/owncloudgui.h (renamed from src/mirall/owncloudgui.h) | 8 | ||||
-rw-r--r-- | src/gui/owncloudsetuppage.ui (renamed from src/mirall/owncloudsetuppage.ui) | 0 | ||||
-rw-r--r-- | src/gui/owncloudsetupwizard.cpp (renamed from src/mirall/owncloudsetupwizard.cpp) | 16 | ||||
-rw-r--r-- | src/gui/owncloudsetupwizard.h (renamed from src/mirall/owncloudsetupwizard.h) | 4 | ||||
-rw-r--r-- | src/gui/protocolwidget.cpp (renamed from src/mirall/protocolwidget.cpp) | 18 | ||||
-rw-r--r-- | src/gui/protocolwidget.h (renamed from src/mirall/protocolwidget.h) | 2 | ||||
-rw-r--r-- | src/gui/protocolwidget.ui (renamed from src/mirall/protocolwidget.ui) | 0 | ||||
-rw-r--r-- | src/gui/settingsdialog.cpp (renamed from src/mirall/settingsdialog.cpp) | 18 | ||||
-rw-r--r-- | src/gui/settingsdialog.h (renamed from src/mirall/settingsdialog.h) | 2 | ||||
-rw-r--r-- | src/gui/settingsdialog.ui (renamed from src/mirall/settingsdialog.ui) | 0 | ||||
-rw-r--r-- | src/gui/settingsdialogmac.cpp (renamed from src/mirall/settingsdialogmac.cpp) | 18 | ||||
-rw-r--r-- | src/gui/settingsdialogmac.h (renamed from src/mirall/settingsdialogmac.h) | 2 | ||||
-rw-r--r-- | src/gui/socketapi.cpp (renamed from src/mirall/socketapi.cpp) | 18 | ||||
-rw-r--r-- | src/gui/socketapi.h (renamed from src/mirall/socketapi.h) | 2 | ||||
-rw-r--r-- | src/gui/sslbutton.cpp (renamed from src/mirall/sslbutton.cpp) | 10 | ||||
-rw-r--r-- | src/gui/sslbutton.h (renamed from src/mirall/sslbutton.h) | 0 | ||||
-rw-r--r-- | src/gui/sslerrordialog.cpp (renamed from src/mirall/sslerrordialog.cpp) | 6 | ||||
-rw-r--r-- | src/gui/sslerrordialog.h (renamed from src/mirall/sslerrordialog.h) | 2 | ||||
-rw-r--r-- | src/gui/sslerrordialog.ui (renamed from src/mirall/sslerrordialog.ui) | 0 | ||||
-rw-r--r-- | src/gui/syncrunfilelog.cpp (renamed from src/mirall/syncrunfilelog.cpp) | 4 | ||||
-rw-r--r-- | src/gui/syncrunfilelog.h (renamed from src/mirall/syncrunfilelog.h) | 4 | ||||
-rw-r--r-- | src/gui/systray.cpp (renamed from src/mirall/systray.cpp) | 2 | ||||
-rw-r--r-- | src/gui/systray.h (renamed from src/mirall/systray.h) | 0 | ||||
-rw-r--r-- | src/gui/updater/CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/gui/updater/ocupdater.cpp (renamed from src/updater/ocupdater.cpp) | 10 | ||||
-rw-r--r-- | src/gui/updater/ocupdater.h (renamed from src/updater/ocupdater.h) | 0 | ||||
-rw-r--r-- | src/gui/updater/sparkleupdater.h (renamed from src/updater/sparkleupdater.h) | 0 | ||||
-rw-r--r-- | src/gui/updater/sparkleupdater_mac.mm (renamed from src/updater/sparkleupdater_mac.mm) | 0 | ||||
-rw-r--r-- | src/gui/updater/updateinfo.cpp (renamed from src/updater/updateinfo.cpp) | 0 | ||||
-rw-r--r-- | src/gui/updater/updateinfo.h (renamed from src/updater/updateinfo.h) | 0 | ||||
-rw-r--r-- | src/gui/updater/updater.cpp (renamed from src/updater/updater.cpp) | 6 | ||||
-rw-r--r-- | src/gui/updater/updater.h (renamed from src/updater/updater.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/abstractcredswizardpage.cpp (renamed from src/wizard/abstractcredswizardpage.cpp) | 2 | ||||
-rw-r--r-- | src/gui/wizard/abstractcredswizardpage.h (renamed from src/wizard/abstractcredswizardpage.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudadvancedsetuppage.cpp (renamed from src/wizard/owncloudadvancedsetuppage.cpp) | 6 | ||||
-rw-r--r-- | src/gui/wizard/owncloudadvancedsetuppage.h (renamed from src/wizard/owncloudadvancedsetuppage.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudadvancedsetuppage.ui (renamed from src/wizard/owncloudadvancedsetuppage.ui) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudhttpcredspage.cpp (renamed from src/wizard/owncloudhttpcredspage.cpp) | 6 | ||||
-rw-r--r-- | src/gui/wizard/owncloudhttpcredspage.h (renamed from src/wizard/owncloudhttpcredspage.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudhttpcredspage.ui (renamed from src/wizard/owncloudhttpcredspage.ui) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudsetupnocredspage.ui (renamed from src/wizard/owncloudsetupnocredspage.ui) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudsetuppage.cpp (renamed from src/wizard/owncloudsetuppage.cpp) | 2 | ||||
-rw-r--r-- | src/gui/wizard/owncloudsetuppage.h (renamed from src/wizard/owncloudsetuppage.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudshibbolethcredspage.cpp (renamed from src/wizard/owncloudshibbolethcredspage.cpp) | 6 | ||||
-rw-r--r-- | src/gui/wizard/owncloudshibbolethcredspage.h (renamed from src/wizard/owncloudshibbolethcredspage.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudwizard.cpp (renamed from src/wizard/owncloudwizard.cpp) | 6 | ||||
-rw-r--r-- | src/gui/wizard/owncloudwizard.h (renamed from src/wizard/owncloudwizard.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudwizardcommon.cpp (renamed from src/wizard/owncloudwizardcommon.cpp) | 2 | ||||
-rw-r--r-- | src/gui/wizard/owncloudwizardcommon.h (renamed from src/wizard/owncloudwizardcommon.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudwizardresultpage.cpp (renamed from src/wizard/owncloudwizardresultpage.cpp) | 2 | ||||
-rw-r--r-- | src/gui/wizard/owncloudwizardresultpage.h (renamed from src/wizard/owncloudwizardresultpage.h) | 0 | ||||
-rw-r--r-- | src/gui/wizard/owncloudwizardresultpage.ui (renamed from src/wizard/owncloudwizardresultpage.ui) | 0 | ||||
-rw-r--r-- | src/libsync/CMakeLists.txt | 182 | ||||
-rw-r--r-- | src/libsync/account.cpp (renamed from src/mirall/account.cpp) | 14 | ||||
-rw-r--r-- | src/libsync/account.h (renamed from src/mirall/account.h) | 0 | ||||
-rw-r--r-- | src/libsync/clientproxy.cpp (renamed from src/mirall/clientproxy.cpp) | 3 | ||||
-rw-r--r-- | src/libsync/clientproxy.h (renamed from src/mirall/clientproxy.h) | 0 | ||||
-rw-r--r-- | src/libsync/connectionvalidator.cpp (renamed from src/mirall/connectionvalidator.cpp) | 8 | ||||
-rw-r--r-- | src/libsync/connectionvalidator.h (renamed from src/mirall/connectionvalidator.h) | 0 | ||||
-rw-r--r-- | src/libsync/cookiejar.cpp (renamed from src/mirall/cookiejar.cpp) | 2 | ||||
-rw-r--r-- | src/libsync/cookiejar.h (renamed from src/mirall/cookiejar.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/abstractcredentials.cpp (renamed from src/creds/abstractcredentials.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/creds/abstractcredentials.h (renamed from src/creds/abstractcredentials.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/credentialscommon.cpp (renamed from src/creds/credentialscommon.cpp) | 4 | ||||
-rw-r--r-- | src/libsync/creds/credentialscommon.h (renamed from src/creds/credentialscommon.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/credentialsfactory.cpp (renamed from src/creds/credentialsfactory.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/creds/credentialsfactory.h (renamed from src/creds/credentialsfactory.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/dummycredentials.cpp (renamed from src/creds/dummycredentials.cpp) | 2 | ||||
-rw-r--r-- | src/libsync/creds/dummycredentials.h (renamed from src/creds/dummycredentials.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/http/httpconfigfile.cpp (renamed from src/creds/http/httpconfigfile.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/creds/http/httpconfigfile.h (renamed from src/creds/http/httpconfigfile.h) | 2 | ||||
-rw-r--r-- | src/libsync/creds/httpcredentials.cpp (renamed from src/creds/httpcredentials.cpp) | 8 | ||||
-rw-r--r-- | src/libsync/creds/httpcredentials.h (renamed from src/creds/httpcredentials.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/shibboleth/authenticationdialog.cpp (renamed from src/creds/shibboleth/authenticationdialog.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/creds/shibboleth/authenticationdialog.h (renamed from src/creds/shibboleth/authenticationdialog.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/shibboleth/shibbolethrefresher.cpp (renamed from src/creds/shibboleth/shibbolethrefresher.cpp) | 2 | ||||
-rw-r--r-- | src/libsync/creds/shibboleth/shibbolethrefresher.h (renamed from src/creds/shibboleth/shibbolethrefresher.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/shibboleth/shibbolethuserjob.cpp (renamed from src/creds/shibboleth/shibbolethuserjob.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/creds/shibboleth/shibbolethuserjob.h (renamed from src/creds/shibboleth/shibbolethuserjob.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/shibboleth/shibbolethwebview.cpp (renamed from src/creds/shibboleth/shibbolethwebview.cpp) | 8 | ||||
-rw-r--r-- | src/libsync/creds/shibboleth/shibbolethwebview.h (renamed from src/creds/shibboleth/shibbolethwebview.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/shibbolethcredentials.cpp (renamed from src/creds/shibbolethcredentials.cpp) | 8 | ||||
-rw-r--r-- | src/libsync/creds/shibbolethcredentials.h (renamed from src/creds/shibbolethcredentials.h) | 0 | ||||
-rw-r--r-- | src/libsync/creds/tokencredentials.cpp (renamed from src/creds/tokencredentials.cpp) | 8 | ||||
-rw-r--r-- | src/libsync/creds/tokencredentials.h (renamed from src/creds/tokencredentials.h) | 0 | ||||
-rw-r--r-- | src/libsync/filesystem.cpp (renamed from src/mirall/filesystem.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/filesystem.h (renamed from src/mirall/filesystem.h) | 0 | ||||
-rw-r--r-- | src/libsync/logger.cpp (renamed from src/mirall/logger.cpp) | 2 | ||||
-rw-r--r-- | src/libsync/logger.h (renamed from src/mirall/logger.h) | 0 | ||||
-rw-r--r-- | src/libsync/mirallaccessmanager.cpp (renamed from src/mirall/mirallaccessmanager.cpp) | 6 | ||||
-rw-r--r-- | src/libsync/mirallaccessmanager.h (renamed from src/mirall/mirallaccessmanager.h) | 0 | ||||
-rw-r--r-- | src/libsync/mirallconfigfile.cpp (renamed from src/mirall/mirallconfigfile.cpp) | 7 | ||||
-rw-r--r-- | src/libsync/mirallconfigfile.h (renamed from src/mirall/mirallconfigfile.h) | 0 | ||||
-rw-r--r-- | src/libsync/networkjobs.cpp (renamed from src/mirall/networkjobs.cpp) | 4 | ||||
-rw-r--r-- | src/libsync/networkjobs.h (renamed from src/mirall/networkjobs.h) | 0 | ||||
-rw-r--r-- | src/libsync/owncloudpropagator.cpp (renamed from src/mirall/owncloudpropagator.cpp) | 4 | ||||
-rw-r--r-- | src/libsync/owncloudpropagator.h (renamed from src/mirall/owncloudpropagator.h) | 0 | ||||
-rw-r--r-- | src/libsync/owncloudpropagator_p.h (renamed from src/mirall/owncloudpropagator_p.h) | 0 | ||||
-rw-r--r-- | src/libsync/owncloudtheme.cpp (renamed from src/mirall/owncloudtheme.cpp) | 2 | ||||
-rw-r--r-- | src/libsync/owncloudtheme.h (renamed from src/mirall/owncloudtheme.h) | 0 | ||||
-rw-r--r-- | src/libsync/progressdispatcher.cpp (renamed from src/mirall/progressdispatcher.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/progressdispatcher.h (renamed from src/mirall/progressdispatcher.h) | 0 | ||||
-rw-r--r-- | src/libsync/propagator_legacy.cpp (renamed from src/mirall/propagator_legacy.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/propagator_legacy.h (renamed from src/mirall/propagator_legacy.h) | 0 | ||||
-rw-r--r-- | src/libsync/propagator_qnam.cpp (renamed from src/mirall/propagator_qnam.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/propagator_qnam.h (renamed from src/mirall/propagator_qnam.h) | 0 | ||||
-rw-r--r-- | src/libsync/propagatorjobs.cpp (renamed from src/mirall/propagatorjobs.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/propagatorjobs.h (renamed from src/mirall/propagatorjobs.h) | 0 | ||||
-rw-r--r-- | src/libsync/quotainfo.cpp (renamed from src/mirall/quotainfo.cpp) | 6 | ||||
-rw-r--r-- | src/libsync/quotainfo.h (renamed from src/mirall/quotainfo.h) | 0 | ||||
-rw-r--r-- | src/libsync/syncengine.cpp (renamed from src/mirall/syncengine.cpp) | 6 | ||||
-rw-r--r-- | src/libsync/syncengine.h (renamed from src/mirall/syncengine.h) | 6 | ||||
-rw-r--r-- | src/libsync/syncfileitem.h (renamed from src/mirall/syncfileitem.h) | 0 | ||||
-rw-r--r-- | src/libsync/syncfilestatus.cpp (renamed from src/mirall/syncfilestatus.cpp) | 2 | ||||
-rw-r--r-- | src/libsync/syncfilestatus.h (renamed from src/mirall/syncfilestatus.h) | 0 | ||||
-rw-r--r-- | src/libsync/syncjournaldb.cpp (renamed from src/mirall/syncjournaldb.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/syncjournaldb.h (renamed from src/mirall/syncjournaldb.h) | 0 | ||||
-rw-r--r-- | src/libsync/syncjournalfilerecord.cpp (renamed from src/mirall/syncjournalfilerecord.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/syncjournalfilerecord.h (renamed from src/mirall/syncjournalfilerecord.h) | 0 | ||||
-rw-r--r-- | src/libsync/syncresult.cpp (renamed from src/mirall/syncresult.cpp) | 2 | ||||
-rw-r--r-- | src/libsync/syncresult.h (renamed from src/mirall/syncresult.h) | 2 | ||||
-rw-r--r-- | src/libsync/theme.cpp (renamed from src/mirall/theme.cpp) | 2 | ||||
-rw-r--r-- | src/libsync/theme.h (renamed from src/mirall/theme.h) | 2 | ||||
-rw-r--r-- | src/libsync/utility.cpp (renamed from src/mirall/utility.cpp) | 8 | ||||
-rw-r--r-- | src/libsync/utility.h (renamed from src/mirall/utility.h) | 0 | ||||
-rw-r--r-- | src/libsync/utility_mac.cpp (renamed from src/mirall/utility_mac.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/utility_unix.cpp (renamed from src/mirall/utility_unix.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/utility_win.cpp (renamed from src/mirall/utility_win.cpp) | 0 | ||||
-rw-r--r-- | src/libsync/version.h.in (renamed from src/mirall/version.h.in) | 0 | ||||
-rw-r--r-- | test/manual/favlink/main.cpp | 2 | ||||
-rw-r--r-- | test/testfolderwatcher.h | 4 | ||||
-rw-r--r-- | test/testinotifywatcher.h | 4 | ||||
-rw-r--r-- | test/testutility.h | 2 |
183 files changed, 785 insertions, 736 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 670759dfe..1e3e63fcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,6 @@ if (NOT DEFINED APPLICATION_SHORTNAME) endif() include(${CMAKE_SOURCE_DIR}/VERSION.cmake) -configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" ) include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/") ##### diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec15a250a..118f47809 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,416 +1,11 @@ -set(CMAKE_AUTOMOC TRUE) -include(GenerateExportHeader) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) - -qt_add_resources(MIRALL_RC_SRC ../mirall.qrc) -if ( IS_DIRECTORY ${OEM_THEME_DIR} ) - qt_add_resources(MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc) - set(theme_dir ${OEM_THEME_DIR}/theme) -else() - qt_add_resources(MIRALL_RC_SRC ../theme.qrc) - set(theme_dir ${CMAKE_CURRENT_SOURCE_DIR}/../theme) -endif() +# TODO: OSX and LIB_ONLY seem to require this to go to binary dir only +set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) -if ( APPLE ) - list(APPEND OS_SPECIFIC_LINK_LIBRARIES - /System/Library/Frameworks/CoreServices.framework - /System/Library/Frameworks/Foundation.framework - /System/Library/Frameworks/AppKit.framework - ) -endif() - -IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - list(APPEND OS_SPECIFIC_LINK_LIBRARIES - inotify - ) -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - -if(SPARKLE_FOUND AND NOT BUILD_LIBRARIES_ONLY) - list (APPEND OS_SPECIFIC_LINK_LIBRARIES ${SPARKLE_LIBRARY}) -endif() - -set(3rdparty_SRC -3rdparty/qtsingleapplication/qtsingleapplication.cpp -3rdparty/qtsingleapplication/qtlocalpeer.cpp -3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp -3rdparty/qtlockedfile/qtlockedfile.cpp -3rdparty/fancylineedit/fancylineedit.cpp -3rdparty/QProgressIndicator/QProgressIndicator.cpp -) - -if (APPLE) - list(APPEND 3rdparty_SRC - 3rdparty/qtmacgoodies/src/macpreferenceswindow.mm - 3rdparty/qtmacgoodies/src/macstandardicon.mm - ) -endif() - -if(NOT WIN32) - list(APPEND 3rdparty_SRC 3rdparty/qtlockedfile/qtlockedfile_unix.cpp) -else() - list(APPEND 3rdparty_SRC 3rdparty/qtlockedfile/qtlockedfile_win.cpp ) -endif() - -set(3rdparty_INC - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtlockedfile - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/QProgressIndicator - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/fancylineedit - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtmacgoodies/src - ) - -set(libsync_SRCS - mirall/syncresult.cpp - mirall/mirallconfigfile.cpp - mirall/syncengine.cpp - mirall/owncloudpropagator.cpp - mirall/propagatorjobs.cpp - mirall/propagator_qnam.cpp - mirall/propagator_legacy.cpp - mirall/syncjournalfilerecord.cpp - mirall/syncjournaldb.cpp - mirall/theme.cpp - mirall/owncloudtheme.cpp - mirall/logger.cpp - mirall/utility.cpp - mirall/filesystem.cpp - mirall/connectionvalidator.cpp - mirall/progressdispatcher.cpp - mirall/mirallaccessmanager.cpp - mirall/networkjobs.cpp - mirall/account.cpp - mirall/quotainfo.cpp - mirall/clientproxy.cpp - mirall/cookiejar.cpp - mirall/syncfilestatus.cpp - creds/dummycredentials.cpp - creds/abstractcredentials.cpp - creds/credentialsfactory.cpp - creds/http/httpconfigfile.cpp - creds/credentialscommon.cpp - 3rdparty/qjson/json.cpp -) -if(TOKEN_AUTH_ONLY) - set (libsync_SRCS - ${libsync_SRCS} - creds/tokencredentials.cpp - ) -else() - set (libsync_SRCS - ${libsync_SRCS} - creds/httpcredentials.cpp - creds/shibbolethcredentials.cpp - creds/shibboleth/shibbolethwebview.cpp - creds/shibboleth/shibbolethrefresher.cpp - creds/shibboleth/authenticationdialog.cpp - creds/shibboleth/shibbolethuserjob.cpp - ) -endif() - -# These headers are installed for libowncloudsync to be used by 3rd party apps -set(owncloudsync_HEADERS - mirall/account.h - mirall/syncengine.h - mirall/mirallconfigfile.h - mirall/networkjobs.h - mirall/progressdispatcher.h - mirall/syncfileitem.h - mirall/syncjournaldb.h - mirall/syncresult.h -) - -set(creds_HEADERS - creds/abstractcredentials.h - creds/httpcredentials.h -) - -IF (NOT APPLE) - INSTALL( - FILES ${owncloudsync_HEADERS} - DESTINATION ${INCLUDE_INSTALL_DIR}/${synclib_NAME}/mirall - ) - INSTALL( - FILES ${creds_HEADERS} - DESTINATION ${INCLUDE_INSTALL_DIR}/${synclib_NAME}/creds - ) -ENDIF(NOT APPLE) - -list(APPEND libsync_LINK_TARGETS - ${QT_LIBRARIES} - ocsync - httpbf - ${OS_SPECIFIC_LINK_LIBRARIES} -) - -if(QTKEYCHAIN_FOUND OR QT5KEYCHAIN_FOUND) - list(APPEND libsync_LINK_TARGETS ${QTKEYCHAIN_LIBRARY}) - include_directories(${QTKEYCHAIN_INCLUDE_DIR}) -endif() - -if(NEON_FOUND) - list(APPEND libsync_LINK_TARGETS ${NEON_LIBRARIES}) - include_directories(${NEON_INCLUDE_DIRS}) - - if(NEON_WITH_LFS) - add_definitions(-DNE_LFS) - endif() - -endif() - -add_library(${synclib_NAME} SHARED ${libsync_SRCS} ${syncMoc}) -GENERATE_EXPORT_HEADER( ${synclib_NAME} - BASE_NAME ${synclib_NAME} - EXPORT_MACRO_NAME OWNCLOUDSYNC_EXPORT - EXPORT_FILE_NAME owncloudlib.h - STATIC_DEFINE OWNCLOUD_BUILT_AS_STATIC -) - - -if(TOKEN_AUTH_ONLY) - qt5_use_modules(${synclib_NAME} Network Xml Sql) -else() - qt5_use_modules(${synclib_NAME} Widgets Network Xml WebKitWidgets Sql) -endif() - -set_target_properties( ${synclib_NAME} PROPERTIES - VERSION ${MIRALL_VERSION} - SOVERSION ${MIRALL_SOVERSION} -) -set_target_properties( ${synclib_NAME} PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) - -target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} ) - -if(BUILD_LIBRARIES_ONLY) - #add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc}) - #qt5_use_modules(${synclib_NAME}_static Widgets Network Xml Sql) - - #set_target_properties( ${synclib_NAME}_static PROPERTIES - # VERSION ${MIRALL_VERSION} - # SOVERSION ${MIRALL_SOVERSION} - #) - - #target_link_libraries(${synclib_NAME}_static ${libsync_LINK_TARGETS} ) -endif() - - - -if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) - install(TARGETS ${synclib_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - if(NOT WIN32) - configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in - ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop DESTINATION share/applications ) - endif() -else() - install(TARGETS ${synclib_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS) - if (SPARKLE_FOUND) - install(DIRECTORY "${SPARKLE_LIBRARY}" - DESTINATION "${OWNCLOUD_OSX_BUNDLE}/Contents/Frameworks") - endif (SPARKLE_FOUND) - -endif() - -set(mirall_UI -mirall/folderwizardsourcepage.ui -mirall/folderwizardtargetpage.ui -mirall/sslerrordialog.ui -mirall/settingsdialog.ui -mirall/generalsettings.ui -mirall/networksettings.ui -mirall/accountsettings.ui -mirall/ignorelisteditor.ui -mirall/protocolwidget.ui -wizard/owncloudsetupnocredspage.ui -wizard/owncloudhttpcredspage.ui -wizard/owncloudwizardresultpage.ui -wizard/owncloudadvancedsetuppage.ui -) - -qt_wrap_ui(mirall_UI_SRCS ${mirall_UI}) - -set(mirall_SRCS - mirall/application.cpp - mirall/systray.cpp - mirall/folderman.cpp - mirall/folder.cpp - mirall/folderwatcher.cpp - mirall/folderwizard.cpp - mirall/folderstatusmodel.cpp - mirall/protocolwidget.cpp - mirall/openfilemanager.cpp - wizard/owncloudwizard.cpp - wizard/owncloudsetuppage.cpp - wizard/owncloudhttpcredspage.cpp - wizard/abstractcredswizardpage.cpp - wizard/owncloudwizardresultpage.cpp - wizard/owncloudwizardcommon.cpp - wizard/owncloudshibbolethcredspage.cpp - wizard/owncloudadvancedsetuppage.cpp - mirall/owncloudsetupwizard.cpp - mirall/sslerrordialog.cpp - mirall/logbrowser.cpp - mirall/settingsdialog.cpp - mirall/generalsettings.cpp - mirall/networksettings.cpp - mirall/accountsettings.cpp - mirall/ignorelisteditor.cpp - mirall/owncloudgui.cpp - mirall/socketapi.cpp - mirall/sslbutton.cpp - mirall/syncrunfilelog.cpp -) - - -set(updater_SRCS - updater/updateinfo.cpp - updater/updater.cpp - updater/ocupdater.cpp -) - -IF( APPLE ) - list(APPEND mirall_SRCS mirall/cocoainitializer_mac.mm) - - list(APPEND mirall_SRCS mirall/settingsdialogmac.cpp) - - if(SPARKLE_FOUND) - # Define this, we need to check in updater.cpp - add_definitions( -DHAVE_SPARKLE ) - list(APPEND updater_SRCS updater/sparkleupdater_mac.mm) - endif() -ENDIF() - -IF( NOT WIN32 AND NOT APPLE ) -set(mirall_SRCS ${mirall_SRCS} mirall/folderwatcher_linux.cpp) -ENDIF() -IF( WIN32 ) -set(mirall_SRCS ${mirall_SRCS} mirall/folderwatcher_win.cpp) -ENDIF() -IF( APPLE ) -list(APPEND mirall_SRCS mirall/folderwatcher_mac.cpp) -ENDIF() - -# csync is required. -include_directories(../csync/src ../csync/src/httpbf/src ${CMAKE_CURRENT_BINARY_DIR}/../csync ${CMAKE_CURRENT_BINARY_DIR}/../csync/src ) -include_directories(${3rdparty_INC}) - -qt_add_translation(mirall_I18N ${TRANSLATIONS}) - -set( final_src - ${MIRALL_RC_SRC} - ${mirall_SRCS} - ${mirall_UI_SRCS} - ${mirallMoc} - ${mirall_I18N} - ${3rdparty_SRC} - ${3rdparty_MOC} -) - -# add executable icon on windows and osx -include( AddAppIconMacro ) -set(ownCloud_old ${ownCloud}) - -# set an icon_app_name. For historical reasons we can not use the -# application_shortname for ownCloud but must rather set it manually. -if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake ) - set(ICON_APP_NAME ${APPLICATION_SHORTNAME}) -else() - set(ICON_APP_NAME "owncloud") -endif() - -kde4_add_app_icon( ownCloud "${theme_dir}/colored/${ICON_APP_NAME}-icon*.png") -list(APPEND final_src ${ownCloud}) -set(ownCloud ${ownCloud_old}) - -if (WITH_DBUS) - set(ADDITIONAL_APP_MODULES DBus) -endif(WITH_DBUS) - -if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY) - set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") - - if(NOT WIN32) - file( GLOB _icons "${theme_dir}/colored/${ICON_APP_NAME}-icon-*.png" ) - foreach( _file ${_icons} ) - string( REPLACE "${theme_dir}/colored/${ICON_APP_NAME}-icon-" "" _res ${_file} ) - string( REPLACE ".png" "" _res ${_res} ) - install( FILES ${_file} RENAME ${ICON_APP_NAME}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps ) - endforeach( _file ) - endif(NOT WIN32) - - install(FILES ${mirall_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}/i18n) - - # we may not add MACOSX_BUNDLE here, if not building one - - # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src}) - add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src}) - qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES}) -elseif(NOT BUILD_LIBRARIES_ONLY) - set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") - if (Qt5Core_FOUND) - include(DeployQt5) - else(Qt5Core_FOUND) - include(DeployQt4) - endif(Qt5Core_FOUND) - - set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf. - set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns") - - # we must add MACOSX_BUNDLE only if building a bundle - add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src}) - qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES}) - - set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations) - install(FILES ${mirall_I18N} DESTINATION ${QM_DIR}) - file(GLOB qt_I18N ${QT_TRANSLATIONS_DIR}/qt_??.qm ${QT_TRANSLATIONS_DIR}/qt_??_??.qm) - install(FILES ${qt_I18N} DESTINATION ${QM_DIR}) - file(GLOB qtkeychain_I18N ${QT_TRANSLATIONS_DIR}/qtkeychain*.qm) - install(FILES ${qtkeychain_I18N} DESTINATION ${QM_DIR}) -endif() - -if(NOT BUILD_LIBRARIES_ONLY) - add_library(updater STATIC ${updater_SRCS} ${updaterMoc}) - target_link_libraries(updater ${synclib_NAME}) - qt5_use_modules(updater Widgets Network Xml) - - set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} - ) - set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) - - target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} ) - target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) - target_link_libraries( ${APPLICATION_EXECUTABLE} updater ) - target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} ) - - install(TARGETS ${APPLICATION_EXECUTABLE} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - BUNDLE DESTINATION "." - ) -endif() - - -#FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary -# currently it needs to be done because the code right above needs to be executed no matter -# if building a bundle or not and the install_qt4_executable needs to be called afterwards -if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY) - if(Qt5Core_FOUND) - install_qt5_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite;qcocoa") - else(Qt5Core_FOUND) - install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite") - endif(Qt5Core_FOUND) -endif() +add_subdirectory(libsync) +add_subdirectory(gui) +add_subdirectory(cmd) find_program(KRAZY2_EXECUTABLE krazy2) if(KRAZY2_EXECUTABLE) @@ -421,33 +16,3 @@ if(KRAZY2_EXECUTABLE) ${PROJECT_SOURCE_DIR}/src/mirall/*.cpp ) endif() - -set(owncloudcmd_NAME ${APPLICATION_EXECUTABLE}cmd) -set(OWNCLOUDCMD_SRC owncloudcmd/simplesslerrorhandler.cpp owncloudcmd/owncloudcmd.cpp) -if(NOT BUILD_LIBRARIES_ONLY) - - add_executable(${owncloudcmd_NAME} ${OWNCLOUDCMD_SRC}) - qt5_use_modules(${owncloudcmd_NAME} Network Sql) - set_target_properties(${owncloudcmd_NAME} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) - set_target_properties(${owncloudcmd_NAME} PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) - - target_link_libraries(${owncloudcmd_NAME} ${synclib_NAME}) -endif() - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mirall) -if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY) - install(TARGETS ${owncloudcmd_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS) - if (SPARKLE_FOUND) - install(FILES ${CMAKE_SOURCE_DIR}/admin/osx/deny_autoupdate_com.owncloud.desktopclient.plist - DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources) - install(FILES ${CMAKE_SOURCE_DIR}/admin/osx/sparkle/dsa_pub.pem - DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources) - endif() -elseif(NOT BUILD_LIBRARIES_ONLY) - install(TARGETS ${owncloudcmd_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -endif() diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt new file mode 100644 index 000000000..bc7a9b2a4 --- /dev/null +++ b/src/cmd/CMakeLists.txt @@ -0,0 +1,40 @@ +project(cmd) +set(CMAKE_AUTOMOC TRUE) + +set(cmd_NAME ${APPLICATION_EXECUTABLE}cmd) +set(cmd_SRC + cmd.cpp + simplesslerrorhandler.cpp + ) +include_directories(${CMAKE_SOURCE_DIR}/src/libsync + ${CMAKE_BINARY_DIR}/src/libsync + ) + +# csync is required. +include_directories(${CMAKE_SOURCE_DIR}/csync/src + ${CMAKE_SOURCE_DIR}/csync/src/httpbf/src + ${CMAKE_BINARY_DIR}/csync + ${CMAKE_BINARY_DIR}/csync/src + ) + +if(NOT BUILD_LIBRARIES_ONLY) + + add_executable(${cmd_NAME} ${cmd_SRC}) + qt5_use_modules(${cmd_NAME} Network Sql) + set_target_properties(${cmd_NAME} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) + set_target_properties(${cmd_NAME} PROPERTIES + INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) + + target_link_libraries(${cmd_NAME} ${synclib_NAME}) +endif() + +if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY) + install(TARGETS ${cmd_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS) +elseif(NOT BUILD_LIBRARIES_ONLY) + install(TARGETS ${cmd_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() + diff --git a/src/owncloudcmd/owncloudcmd.cpp b/src/cmd/cmd.cpp index 23c660270..0e25c5037 100644 --- a/src/owncloudcmd/owncloudcmd.cpp +++ b/src/cmd/cmd.cpp @@ -22,14 +22,16 @@ #include <neon/ne_socket.h> -#include "mirall/syncengine.h" -#include "mirall/syncjournaldb.h" -#include "csync.h" -#include "mirall/clientproxy.h" -#include "mirall/account.h" +#include "account.h" +#include "clientproxy.h" #include "creds/httpcredentials.h" -#include "owncloudcmd.h" +#include "csync.h" #include "simplesslerrorhandler.h" +#include "syncengine.h" +#include "syncjournaldb.h" +#include "config.h" + +#include "cmd.h" using namespace Mirall; @@ -63,12 +65,13 @@ int getauth(const char* prompt, char* buf, size_t len, int a, int b, void *userd void help() { - std::cout << "owncloudcmd - command line ownCloud client tool." << std::endl; + const char* appName = APPLICATION_EXECUTABLE "cmd"; + std::cout << appName << " - command line " APPLICATION_NAME " client tool." << std::endl; std::cout << "" << std::endl; - std::cout << "Usage: owncloudcmd <sourcedir> <owncloudurl>" << std::endl; + std::cout << "Usage: " << appName << " <source_dir> <server_url>" << std::endl; std::cout << "" << std::endl; - std::cout << "A proxy can either be set manually using --httpproxy or it" << std::endl; - std::cout << "uses the setting from a configured sync client." << std::endl; + std::cout << "A proxy can either be set manually using --httpproxy." << std::endl; + std::cout << "Otherwise, the setting from a configured sync client will be used." << std::endl; std::cout << std::endl; std::cout << "Options:" << std::endl; std::cout << " --silent Don't be so verbose" << std::endl; @@ -214,12 +217,12 @@ int main(int argc, char **argv) { clientProxy.setCSyncProxy(QUrl(url), _csync_ctx); } - OwncloudCmd owncloudCmd; + Cmd cmd; SyncJournalDb db(options.source_dir); SyncEngine engine(_csync_ctx, options.source_dir, QUrl(options.target_url).path(), folder, &db); QObject::connect(&engine, SIGNAL(finished()), &app, SLOT(quit())); - QObject::connect(&engine, SIGNAL(transmissionProgress(Progress::Info)), &owncloudCmd, SLOT(transmissionProgressSlot())); + QObject::connect(&engine, SIGNAL(transmissionProgress(Progress::Info)), &cmd, SLOT(transmissionProgressSlot())); // Have to be done async, else, an error before exec() does not terminate the event loop. QMetaObject::invokeMethod(&engine, "startSync", Qt::QueuedConnection); diff --git a/src/owncloudcmd/owncloudcmd.h b/src/cmd/cmd.h index ae55305b0..ebbff8699 100644 --- a/src/owncloudcmd/owncloudcmd.h +++ b/src/cmd/cmd.h @@ -13,16 +13,16 @@ * for more details. */ -#ifndef OWNCLOUDCMD_H -#define OWNCLOUDCMD_H +#ifndef CMD_H +#define CMD_H #include <QObject> -class OwncloudCmd : public QObject { +class Cmd : public QObject { Q_OBJECT public: - OwncloudCmd() : QObject() { } + Cmd() : QObject() { } public slots: void transmissionProgressSlot() { } diff --git a/src/owncloudcmd/simplesslerrorhandler.cpp b/src/cmd/simplesslerrorhandler.cpp index 8a52266f7..6250ca7b8 100644 --- a/src/owncloudcmd/simplesslerrorhandler.cpp +++ b/src/cmd/simplesslerrorhandler.cpp @@ -10,9 +10,9 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -#include "mirall/mirallconfigfile.h" -#include "mirall/utility.h" -#include "mirall/account.h" +#include "mirallconfigfile.h" +#include "utility.h" +#include "account.h" #include "simplesslerrorhandler.h" bool SimpleSslErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, Mirall::Account *account) diff --git a/src/owncloudcmd/simplesslerrorhandler.h b/src/cmd/simplesslerrorhandler.h index 8e6876161..b22e07d42 100644 --- a/src/owncloudcmd/simplesslerrorhandler.h +++ b/src/cmd/simplesslerrorhandler.h @@ -13,7 +13,7 @@ #ifndef SIMPLESSLERRORHANDLER_H #define SIMPLESSLERRORHANDLER_H -#include "mirall/account.h" +#include "account.h" class QSslError; class QSslCertificate; diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt new file mode 100644 index 000000000..e04d3c974 --- /dev/null +++ b/src/gui/CMakeLists.txt @@ -0,0 +1,253 @@ +project(gui) +set(CMAKE_AUTOMOC TRUE) + +add_subdirectory(updater) + +#TODO Move resources files +qt_add_resources(MIRALL_RC_SRC ../../mirall.qrc) +if ( IS_DIRECTORY ${OEM_THEME_DIR} ) + qt_add_resources(MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc) + set(theme_dir ${OEM_THEME_DIR}/theme) +else() + qt_add_resources(MIRALL_RC_SRC ../../theme.qrc) + set(theme_dir ${CMAKE_SOURCE_DIR}/theme) +endif() + +set(mirall_UI + accountsettings.ui + folderwizardsourcepage.ui + folderwizardtargetpage.ui + generalsettings.ui + ignorelisteditor.ui + networksettings.ui + protocolwidget.ui + settingsdialog.ui + sslerrordialog.ui + wizard/owncloudadvancedsetuppage.ui + wizard/owncloudhttpcredspage.ui + wizard/owncloudsetupnocredspage.ui + wizard/owncloudwizardresultpage.ui +) + +qt_wrap_ui(mirall_UI_SRCS ${mirall_UI}) + +set(mirall_SRCS + accountsettings.cpp + application.cpp + folder.cpp + folderman.cpp + folderstatusmodel.cpp + folderwatcher.cpp + folderwizard.cpp + generalsettings.cpp + ignorelisteditor.cpp + logbrowser.cpp + networksettings.cpp + openfilemanager.cpp + owncloudgui.cpp + owncloudsetupwizard.cpp + protocolwidget.cpp + settingsdialog.cpp + socketapi.cpp + sslbutton.cpp + sslerrordialog.cpp + syncrunfilelog.cpp + systray.cpp + wizard/abstractcredswizardpage.cpp + wizard/owncloudadvancedsetuppage.cpp + wizard/owncloudhttpcredspage.cpp + wizard/owncloudsetuppage.cpp + wizard/owncloudshibbolethcredspage.cpp + wizard/owncloudwizardcommon.cpp + wizard/owncloudwizard.cpp + wizard/owncloudwizardresultpage.cpp +) + + +set(updater_SRCS + updater/ocupdater.cpp + updater/updateinfo.cpp + updater/updater.cpp +) + +IF( APPLE ) + list(APPEND mirall_SRCS cocoainitializer_mac.mm) + + list(APPEND mirall_SRCS settingsdialogmac.cpp) + + if(SPARKLE_FOUND) + # Define this, we need to check in updater.cpp + add_definitions( -DHAVE_SPARKLE ) + list(APPEND updater_SRCS updater/sparkleupdater_mac.mm) + endif() +ENDIF() + +IF( NOT WIN32 AND NOT APPLE ) +set(mirall_SRCS ${mirall_SRCS} folderwatcher_linux.cpp) +ENDIF() +IF( WIN32 ) +set(mirall_SRCS ${mirall_SRCS} folderwatcher_win.cpp) +ENDIF() +IF( APPLE ) +list(APPEND mirall_SRCS folderwatcher_mac.cpp) +ENDIF() + +set(3rdparty_SRC + ../3rdparty/fancylineedit/fancylineedit.cpp + ../3rdparty/QProgressIndicator/QProgressIndicator.cpp + ../3rdparty/qtlockedfile/qtlockedfile.cpp + ../3rdparty/qtsingleapplication/qtlocalpeer.cpp + ../3rdparty/qtsingleapplication/qtsingleapplication.cpp + ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp + ) + +if (APPLE) + list(APPEND 3rdparty_SRC + ../3rdparty/qtmacgoodies/src/macpreferenceswindow.mm + ../3rdparty/qtmacgoodies/src/macstandardicon.mm + ) +endif() + +if(NOT WIN32) + list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp) +else() + list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp ) +endif() + +set(3rdparty_INC + ${CMAKE_SOURCE_DIR}/src/3rdparty/fancylineedit + ${CMAKE_SOURCE_DIR}/src/3rdparty/qjson + ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator + ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile + ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src + ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication + ) + +include_directories(${3rdparty_INC}) + +# csync is required. +include_directories(${CMAKE_SOURCE_DIR}/csync/src + ${CMAKE_SOURCE_DIR}/csync/src/httpbf/src + ${CMAKE_BINARY_DIR}/csync + ${CMAKE_BINARY_DIR}/csync/src + ) +include_directories(../libsync ${CMAKE_CURRENT_BINARY_DIR}/../libsync) +include_directories(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + + +qt_add_translation(mirall_I18N ${TRANSLATIONS}) + +set( final_src + ${MIRALL_RC_SRC} + ${mirall_SRCS} + ${mirall_UI_SRCS} + ${mirallMoc} + ${mirall_I18N} + ${3rdparty_SRC} + ${3rdparty_MOC} +) + +# add executable icon on windows and osx +include( AddAppIconMacro ) +set(ownCloud_old ${ownCloud}) + +# set an icon_app_name. For historical reasons we can not use the +# application_shortname for ownCloud but must rather set it manually. +if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake ) + set(ICON_APP_NAME ${APPLICATION_SHORTNAME}) +else() + set(ICON_APP_NAME "owncloud") +endif() + +kde4_add_app_icon( ownCloud "${theme_dir}/colored/${ICON_APP_NAME}-icon*.png") +list(APPEND final_src ${ownCloud}) +set(ownCloud ${ownCloud_old}) + +if (WITH_DBUS) + set(ADDITIONAL_APP_MODULES DBus) +endif(WITH_DBUS) + +if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY) + + if(NOT WIN32) + file( GLOB _icons "${theme_dir}/colored/${ICON_APP_NAME}-icon-*.png" ) + foreach( _file ${_icons} ) + string( REPLACE "${theme_dir}/colored/${ICON_APP_NAME}-icon-" "" _res ${_file} ) + string( REPLACE ".png" "" _res ${_res} ) + install( FILES ${_file} RENAME ${ICON_APP_NAME}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps ) + endforeach( _file ) + endif(NOT WIN32) + + install(FILES ${mirall_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}/i18n) + + # we may not add MACOSX_BUNDLE here, if not building one + + # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src}) + add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src}) + qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES}) +elseif(NOT BUILD_LIBRARIES_ONLY) + if (Qt5Core_FOUND) + include(DeployQt5) + else(Qt5Core_FOUND) + include(DeployQt4) + endif(Qt5Core_FOUND) + + set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf. + set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns") + + # we must add MACOSX_BUNDLE only if building a bundle + add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src}) + qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES}) + + set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations) + install(FILES ${mirall_I18N} DESTINATION ${QM_DIR}) + file(GLOB qt_I18N ${QT_TRANSLATIONS_DIR}/qt_??.qm ${QT_TRANSLATIONS_DIR}/qt_??_??.qm) + install(FILES ${qt_I18N} DESTINATION ${QM_DIR}) + file(GLOB qtkeychain_I18N ${QT_TRANSLATIONS_DIR}/qtkeychain*.qm) + install(FILES ${qtkeychain_I18N} DESTINATION ${QM_DIR}) +endif() + +if(NOT BUILD_LIBRARIES_ONLY) + add_library(updater STATIC ${updater_SRCS} ${updaterMoc}) + target_link_libraries(updater ${synclib_NAME}) + qt5_use_modules(updater Widgets Network Xml) + + set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} + ) + set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES + INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) + + target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} ) + target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) + target_link_libraries( ${APPLICATION_EXECUTABLE} updater ) + target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} ) + + install(TARGETS ${APPLICATION_EXECUTABLE} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + BUNDLE DESTINATION "." + ) +endif() + + +#FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary +# currently it needs to be done because the code right above needs to be executed no matter +# if building a bundle or not and the install_qt4_executable needs to be called afterwards +if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY) + if(Qt5Core_FOUND) + install_qt5_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite;qcocoa") + else(Qt5Core_FOUND) + install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite") + endif(Qt5Core_FOUND) +endif() + +if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32) + configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in + ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop DESTINATION share/applications ) +endif() + diff --git a/src/mirall/accountsettings.cpp b/src/gui/accountsettings.cpp index 6259d4493..f0a7fe339 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -15,17 +15,17 @@ #include "accountsettings.h" #include "ui_accountsettings.h" -#include "mirall/theme.h" -#include "mirall/folderman.h" -#include "mirall/folderwizard.h" -#include "mirall/folderstatusmodel.h" -#include "mirall/utility.h" -#include "mirall/application.h" -#include "mirall/owncloudsetupwizard.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/ignorelisteditor.h" -#include "mirall/account.h" -#include "mirall/quotainfo.h" +#include "theme.h" +#include "folderman.h" +#include "folderwizard.h" +#include "folderstatusmodel.h" +#include "utility.h" +#include "application.h" +#include "owncloudsetupwizard.h" +#include "mirallconfigfile.h" +#include "ignorelisteditor.h" +#include "account.h" +#include "quotainfo.h" #include "creds/abstractcredentials.h" #include <math.h> @@ -39,7 +39,7 @@ #include <QIcon> #include <QVariant> -#include "mirall/account.h" +#include "account.h" namespace Mirall { diff --git a/src/mirall/accountsettings.h b/src/gui/accountsettings.h index 4e64ea25e..df74464ac 100644 --- a/src/mirall/accountsettings.h +++ b/src/gui/accountsettings.h @@ -21,8 +21,8 @@ #include <QTimer> #include <QStandardItem> -#include "mirall/folder.h" -#include "mirall/progressdispatcher.h" +#include "folder.h" +#include "progressdispatcher.h" class QStandardItemModel; class QModelIndex; diff --git a/src/mirall/accountsettings.ui b/src/gui/accountsettings.ui index 133dfaab0..133dfaab0 100644 --- a/src/mirall/accountsettings.ui +++ b/src/gui/accountsettings.ui diff --git a/src/mirall/application.cpp b/src/gui/application.cpp index aac84b079..bc8b0904c 100644 --- a/src/mirall/application.cpp +++ b/src/gui/application.cpp @@ -19,18 +19,18 @@ #include "config.h" -#include "mirall/account.h" -#include "mirall/application.h" -#include "mirall/connectionvalidator.h" -#include "mirall/folder.h" -#include "mirall/folderman.h" -#include "mirall/logger.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/socketapi.h" -#include "mirall/sslerrordialog.h" -#include "mirall/theme.h" -#include "mirall/utility.h" -#include "mirall/clientproxy.h" +#include "account.h" +#include "application.h" +#include "connectionvalidator.h" +#include "folder.h" +#include "folderman.h" +#include "logger.h" +#include "mirallconfigfile.h" +#include "socketapi.h" +#include "sslerrordialog.h" +#include "theme.h" +#include "utility.h" +#include "clientproxy.h" #include "updater/updater.h" #include "creds/abstractcredentials.h" diff --git a/src/mirall/application.h b/src/gui/application.h index 36d3baa5c..97c6ee617 100644 --- a/src/mirall/application.h +++ b/src/gui/application.h @@ -22,13 +22,13 @@ #include "qtsingleapplication.h" -#include "mirall/syncresult.h" -#include "mirall/logbrowser.h" -#include "mirall/owncloudgui.h" -#include "mirall/connectionvalidator.h" -#include "mirall/progressdispatcher.h" -#include "mirall/clientproxy.h" -#include "mirall/folderman.h" +#include "syncresult.h" +#include "logbrowser.h" +#include "owncloudgui.h" +#include "connectionvalidator.h" +#include "progressdispatcher.h" +#include "clientproxy.h" +#include "folderman.h" class QMessageBox; class QSystemTrayIcon; diff --git a/src/mirall/cocoainitializer.h b/src/gui/cocoainitializer.h index fd4200a98..fd4200a98 100644 --- a/src/mirall/cocoainitializer.h +++ b/src/gui/cocoainitializer.h diff --git a/src/mirall/cocoainitializer_mac.mm b/src/gui/cocoainitializer_mac.mm index b65804bda..b65804bda 100644 --- a/src/mirall/cocoainitializer_mac.mm +++ b/src/gui/cocoainitializer_mac.mm diff --git a/src/mirall/folder.cpp b/src/gui/folder.cpp index 5f14ae913..3d26dd710 100644 --- a/src/mirall/folder.cpp +++ b/src/gui/folder.cpp @@ -15,18 +15,18 @@ */ #include "config.h" -#include "mirall/account.h" -#include "mirall/folder.h" -#include "mirall/folderman.h" -#include "mirall/logger.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/networkjobs.h" -#include "mirall/syncjournalfilerecord.h" -#include "mirall/syncresult.h" -#include "mirall/utility.h" -#include "mirall/clientproxy.h" -#include "mirall/syncengine.h" -#include "mirall/syncrunfilelog.h" +#include "account.h" +#include "folder.h" +#include "folderman.h" +#include "logger.h" +#include "mirallconfigfile.h" +#include "networkjobs.h" +#include "syncjournalfilerecord.h" +#include "syncresult.h" +#include "utility.h" +#include "clientproxy.h" +#include "syncengine.h" +#include "syncrunfilelog.h" #include "creds/abstractcredentials.h" diff --git a/src/mirall/folder.h b/src/gui/folder.h index 8a9d55411..ba369c29d 100644 --- a/src/mirall/folder.h +++ b/src/gui/folder.h @@ -17,11 +17,11 @@ #ifndef MIRALL_FOLDER_H #define MIRALL_FOLDER_H -#include "mirall/syncresult.h" -#include "mirall/progressdispatcher.h" -#include "mirall/syncjournaldb.h" -#include "mirall/clientproxy.h" -#include "mirall/syncfilestatus.h" +#include "syncresult.h" +#include "progressdispatcher.h" +#include "syncjournaldb.h" +#include "clientproxy.h" +#include "syncfilestatus.h" #include <csync.h> diff --git a/src/mirall/folderman.cpp b/src/gui/folderman.cpp index 496608b8d..09aef71ed 100644 --- a/src/mirall/folderman.cpp +++ b/src/gui/folderman.cpp @@ -12,11 +12,11 @@ * for more details. */ -#include "mirall/folderman.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/folder.h" -#include "mirall/syncresult.h" -#include "mirall/theme.h" +#include "folderman.h" +#include "mirallconfigfile.h" +#include "folder.h" +#include "syncresult.h" +#include "theme.h" #include <neon/ne_socket.h> diff --git a/src/mirall/folderman.h b/src/gui/folderman.h index 82f69701d..4e3550a1d 100644 --- a/src/mirall/folderman.h +++ b/src/gui/folderman.h @@ -20,9 +20,9 @@ #include <QQueue> #include <QList> -#include "mirall/folder.h" -#include "mirall/folderwatcher.h" -#include "mirall/syncfileitem.h" +#include "folder.h" +#include "folderwatcher.h" +#include "syncfileitem.h" class QSignalMapper; diff --git a/src/mirall/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index b94239a35..19949a4b8 100644 --- a/src/mirall/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -12,8 +12,8 @@ * for more details. */ -#include "mirall/folderstatusmodel.h" -#include "mirall/utility.h" +#include "folderstatusmodel.h" +#include "utility.h" #include <QtCore> #include <QtGui> diff --git a/src/mirall/folderstatusmodel.h b/src/gui/folderstatusmodel.h index 74acaa08a..74acaa08a 100644 --- a/src/mirall/folderstatusmodel.h +++ b/src/gui/folderstatusmodel.h diff --git a/src/mirall/folderwatcher.cpp b/src/gui/folderwatcher.cpp index 7813a1e7f..001114fca 100644 --- a/src/mirall/folderwatcher.cpp +++ b/src/gui/folderwatcher.cpp @@ -12,7 +12,7 @@ */ // event masks -#include "mirall/folderwatcher.h" +#include "folderwatcher.h" #include <stdint.h> @@ -25,11 +25,11 @@ #include <QTimer> #if defined(Q_OS_WIN) -#include "mirall/folderwatcher_win.h" +#include "folderwatcher_win.h" #elif defined(Q_OS_MAC) -#include "mirall/folderwatcher_mac.h" +#include "folderwatcher_mac.h" #elif defined(Q_OS_UNIX) -#include "mirall/folderwatcher_linux.h" +#include "folderwatcher_linux.h" #endif diff --git a/src/mirall/folderwatcher.h b/src/gui/folderwatcher.h index bcdb5f0ee..bcdb5f0ee 100644 --- a/src/mirall/folderwatcher.h +++ b/src/gui/folderwatcher.h diff --git a/src/mirall/folderwatcher_linux.cpp b/src/gui/folderwatcher_linux.cpp index c44fdd622..4d75047dc 100644 --- a/src/mirall/folderwatcher_linux.cpp +++ b/src/gui/folderwatcher_linux.cpp @@ -15,8 +15,8 @@ #include <sys/inotify.h> -#include "mirall/folder.h" -#include "mirall/folderwatcher_linux.h" +#include "folder.h" +#include "folderwatcher_linux.h" #include <cerrno> #include <QDebug> diff --git a/src/mirall/folderwatcher_linux.h b/src/gui/folderwatcher_linux.h index f033a92c6..0a8d23110 100644 --- a/src/mirall/folderwatcher_linux.h +++ b/src/gui/folderwatcher_linux.h @@ -20,7 +20,7 @@ #include <QHash> #include <QDir> -#include "mirall/folderwatcher.h" +#include "folderwatcher.h" namespace Mirall { diff --git a/src/mirall/folderwatcher_mac.cpp b/src/gui/folderwatcher_mac.cpp index abeec707c..ab03a95df 100644 --- a/src/mirall/folderwatcher_mac.cpp +++ b/src/gui/folderwatcher_mac.cpp @@ -12,9 +12,9 @@ */ #include "config.h" -#include "mirall/folder.h" -#include "mirall/folderwatcher.h" -#include "mirall/folderwatcher_mac.h" +#include "folder.h" +#include "folderwatcher.h" +#include "folderwatcher_mac.h" #include <cerrno> diff --git a/src/mirall/folderwatcher_mac.h b/src/gui/folderwatcher_mac.h index c2e3821d2..c2e3821d2 100644 --- a/src/mirall/folderwatcher_mac.h +++ b/src/gui/folderwatcher_mac.h diff --git a/src/mirall/folderwatcher_qt.cpp b/src/gui/folderwatcher_qt.cpp index 103e063a8..eea3b4a59 100644 --- a/src/mirall/folderwatcher_qt.cpp +++ b/src/gui/folderwatcher_qt.cpp @@ -11,8 +11,8 @@ * for more details. */ -#include "mirall/folderwatcher.h" -#include "mirall/folderwatcher_qt.h" +#include "folderwatcher.h" +#include "folderwatcher_qt.h" #include <QDir> #include <QFileInfo> diff --git a/src/mirall/folderwatcher_qt.h b/src/gui/folderwatcher_qt.h index 5ae6ba335..5ae6ba335 100644 --- a/src/mirall/folderwatcher_qt.h +++ b/src/gui/folderwatcher_qt.h diff --git a/src/mirall/folderwatcher_win.cpp b/src/gui/folderwatcher_win.cpp index c6c8242fa..a0ced2477 100644 --- a/src/mirall/folderwatcher_win.cpp +++ b/src/gui/folderwatcher_win.cpp @@ -14,8 +14,8 @@ #include <QThread> #include <QDebug> -#include "mirall/folderwatcher.h" -#include "mirall/folderwatcher_win.h" +#include "folderwatcher.h" +#include "folderwatcher_win.h" #include <stdlib.h> #include <stdio.h> diff --git a/src/mirall/folderwatcher_win.h b/src/gui/folderwatcher_win.h index 56ddfccd0..56ddfccd0 100644 --- a/src/mirall/folderwatcher_win.h +++ b/src/gui/folderwatcher_win.h diff --git a/src/mirall/folderwizard.cpp b/src/gui/folderwizard.cpp index e5792abe0..4bbea026a 100644 --- a/src/mirall/folderwizard.cpp +++ b/src/gui/folderwizard.cpp @@ -12,12 +12,12 @@ * for more details. */ -#include "mirall/folderwizard.h" -#include "mirall/folderman.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/theme.h" -#include "mirall/networkjobs.h" -#include "mirall/account.h" +#include "folderwizard.h" +#include "folderman.h" +#include "mirallconfigfile.h" +#include "theme.h" +#include "networkjobs.h" +#include "account.h" #include <QDebug> #include <QDesktopServices> diff --git a/src/mirall/folderwizard.h b/src/gui/folderwizard.h index 8db9b1319..8db9b1319 100644 --- a/src/mirall/folderwizard.h +++ b/src/gui/folderwizard.h diff --git a/src/mirall/folderwizardsourcepage.ui b/src/gui/folderwizardsourcepage.ui index 5dc05c4fc..5dc05c4fc 100644 --- a/src/mirall/folderwizardsourcepage.ui +++ b/src/gui/folderwizardsourcepage.ui diff --git a/src/mirall/folderwizardtargetpage.ui b/src/gui/folderwizardtargetpage.ui index 483178ae9..483178ae9 100644 --- a/src/mirall/folderwizardtargetpage.ui +++ b/src/gui/folderwizardtargetpage.ui diff --git a/src/mirall/generalsettings.cpp b/src/gui/generalsettings.cpp index 6c8fe5914..66575a78f 100644 --- a/src/mirall/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -14,11 +14,11 @@ #include "generalsettings.h" #include "ui_generalsettings.h" -#include "mirall/theme.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/application.h" -#include "mirall/utility.h" -#include "mirall/mirallconfigfile.h" +#include "theme.h" +#include "mirallconfigfile.h" +#include "application.h" +#include "utility.h" +#include "mirallconfigfile.h" #include "updater/updater.h" #include "updater/ocupdater.h" diff --git a/src/mirall/generalsettings.h b/src/gui/generalsettings.h index 50dfd7a6f..50dfd7a6f 100644 --- a/src/mirall/generalsettings.h +++ b/src/gui/generalsettings.h diff --git a/src/mirall/generalsettings.ui b/src/gui/generalsettings.ui index 1ae6761bd..1ae6761bd 100644 --- a/src/mirall/generalsettings.ui +++ b/src/gui/generalsettings.ui diff --git a/src/mirall/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp index 7d3beb9fa..53a23110d 100644 --- a/src/mirall/ignorelisteditor.cpp +++ b/src/gui/ignorelisteditor.cpp @@ -11,7 +11,7 @@ * for more details. */ -#include "mirall/mirallconfigfile.h" +#include "mirallconfigfile.h" #include "ignorelisteditor.h" #include "ui_ignorelisteditor.h" diff --git a/src/mirall/ignorelisteditor.h b/src/gui/ignorelisteditor.h index 208e1e7df..208e1e7df 100644 --- a/src/mirall/ignorelisteditor.h +++ b/src/gui/ignorelisteditor.h diff --git a/src/mirall/ignorelisteditor.ui b/src/gui/ignorelisteditor.ui index f65d3cb0f..f65d3cb0f 100644 --- a/src/mirall/ignorelisteditor.ui +++ b/src/gui/ignorelisteditor.ui diff --git a/src/mirall/logbrowser.cpp b/src/gui/logbrowser.cpp index db41fc803..55e3c3c6a 100644 --- a/src/mirall/logbrowser.cpp +++ b/src/gui/logbrowser.cpp @@ -31,8 +31,8 @@ #include <QSettings> #include <QAction> -#include "mirall/mirallconfigfile.h" -#include "mirall/logger.h" +#include "mirallconfigfile.h" +#include "logger.h" namespace Mirall { diff --git a/src/mirall/logbrowser.h b/src/gui/logbrowser.h index 24f2406bb..24f2406bb 100644 --- a/src/mirall/logbrowser.h +++ b/src/gui/logbrowser.h diff --git a/src/main.cpp b/src/gui/main.cpp index ba1fa8e0a..8b7921859 100644 --- a/src/main.cpp +++ b/src/gui/main.cpp @@ -21,10 +21,10 @@ #include <sys/resource.h> #endif -#include "mirall/application.h" -#include "mirall/theme.h" -#include "mirall/utility.h" -#include "mirall/cocoainitializer.h" +#include "application.h" +#include "theme.h" +#include "utility.h" +#include "cocoainitializer.h" #include "updater/updater.h" diff --git a/src/mirall/networksettings.cpp b/src/gui/networksettings.cpp index 6aecfd165..4acbba5fc 100644 --- a/src/mirall/networksettings.cpp +++ b/src/gui/networksettings.cpp @@ -14,12 +14,12 @@ #include "networksettings.h" #include "ui_networksettings.h" -#include "mirall/theme.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/application.h" -#include "mirall/utility.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/folderman.h" +#include "theme.h" +#include "mirallconfigfile.h" +#include "application.h" +#include "utility.h" +#include "mirallconfigfile.h" +#include "folderman.h" #include <QNetworkProxy> diff --git a/src/mirall/networksettings.h b/src/gui/networksettings.h index cb93e3782..cb93e3782 100644 --- a/src/mirall/networksettings.h +++ b/src/gui/networksettings.h diff --git a/src/mirall/networksettings.ui b/src/gui/networksettings.ui index 4f98f4b4a..4f98f4b4a 100644 --- a/src/mirall/networksettings.ui +++ b/src/gui/networksettings.ui diff --git a/src/mirall/openfilemanager.cpp b/src/gui/openfilemanager.cpp index 397c5c56a..397c5c56a 100644 --- a/src/mirall/openfilemanager.cpp +++ b/src/gui/openfilemanager.cpp diff --git a/src/mirall/openfilemanager.h b/src/gui/openfilemanager.h index c395f15fe..c395f15fe 100644 --- a/src/mirall/openfilemanager.h +++ b/src/gui/openfilemanager.h diff --git a/src/mirall/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 7de5c5cb0..585ff351a 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -11,22 +11,22 @@ * for more details. */ -#include "mirall/application.h" -#include "mirall/owncloudgui.h" -#include "mirall/theme.h" -#include "mirall/folderman.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/utility.h" -#include "mirall/progressdispatcher.h" -#include "mirall/owncloudsetupwizard.h" +#include "application.h" +#include "owncloudgui.h" +#include "theme.h" +#include "folderman.h" +#include "mirallconfigfile.h" +#include "utility.h" +#include "progressdispatcher.h" +#include "owncloudsetupwizard.h" #if defined(Q_OS_MAC) -# include "mirall/settingsdialogmac.h" +# include "settingsdialogmac.h" #else -# include "mirall/settingsdialog.h" +# include "settingsdialog.h" #endif -#include "mirall/logger.h" -#include "mirall/logbrowser.h" -#include "mirall/account.h" +#include "logger.h" +#include "logbrowser.h" +#include "account.h" #include "openfilemanager.h" #include "creds/abstractcredentials.h" diff --git a/src/mirall/owncloudgui.h b/src/gui/owncloudgui.h index c67e43c21..7d6b3b983 100644 --- a/src/mirall/owncloudgui.h +++ b/src/gui/owncloudgui.h @@ -14,10 +14,10 @@ #ifndef OWNCLOUDGUI_H #define OWNCLOUDGUI_H -#include "mirall/systray.h" -#include "mirall/connectionvalidator.h" -#include "mirall/progressdispatcher.h" -#include "mirall/quotainfo.h" +#include "systray.h" +#include "connectionvalidator.h" +#include "progressdispatcher.h" +#include "quotainfo.h" #include <QObject> #include <QPointer> diff --git a/src/mirall/owncloudsetuppage.ui b/src/gui/owncloudsetuppage.ui index 6190119d0..6190119d0 100644 --- a/src/mirall/owncloudsetuppage.ui +++ b/src/gui/owncloudsetuppage.ui diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index a7d866b51..a7debe820 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -21,14 +21,14 @@ #include "wizard/owncloudwizardcommon.h" #include "wizard/owncloudwizard.h" -#include "mirall/owncloudsetupwizard.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/folderman.h" -#include "mirall/utility.h" -#include "mirall/mirallaccessmanager.h" -#include "mirall/account.h" -#include "mirall/networkjobs.h" -#include "mirall/sslerrordialog.h" +#include "owncloudsetupwizard.h" +#include "mirallconfigfile.h" +#include "folderman.h" +#include "utility.h" +#include "mirallaccessmanager.h" +#include "account.h" +#include "networkjobs.h" +#include "sslerrordialog.h" #include "creds/credentialsfactory.h" #include "creds/abstractcredentials.h" diff --git a/src/mirall/owncloudsetupwizard.h b/src/gui/owncloudsetupwizard.h index a35c57c2b..8a094aed9 100644 --- a/src/mirall/owncloudsetupwizard.h +++ b/src/gui/owncloudsetupwizard.h @@ -21,8 +21,8 @@ #include <QNetworkReply> #include <QPointer> -#include "mirall/theme.h" -#include "mirall/networkjobs.h" +#include "theme.h" +#include "networkjobs.h" #include "wizard/owncloudwizardcommon.h" diff --git a/src/mirall/protocolwidget.cpp b/src/gui/protocolwidget.cpp index f15b0aba4..bd696d7a2 100644 --- a/src/mirall/protocolwidget.cpp +++ b/src/gui/protocolwidget.cpp @@ -16,15 +16,15 @@ #include <QtWidgets> #endif -#include "mirall/protocolwidget.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/syncresult.h" -#include "mirall/logger.h" -#include "mirall/utility.h" -#include "mirall/theme.h" -#include "mirall/folderman.h" -#include "mirall/syncfileitem.h" -#include "mirall/folder.h" +#include "protocolwidget.h" +#include "mirallconfigfile.h" +#include "syncresult.h" +#include "logger.h" +#include "utility.h" +#include "theme.h" +#include "folderman.h" +#include "syncfileitem.h" +#include "folder.h" #include "openfilemanager.h" #include "ui_protocolwidget.h" diff --git a/src/mirall/protocolwidget.h b/src/gui/protocolwidget.h index 88e2ee722..20750bc50 100644 --- a/src/mirall/protocolwidget.h +++ b/src/gui/protocolwidget.h @@ -18,7 +18,7 @@ #include <QDateTime> #include <QLocale> -#include "mirall/progressdispatcher.h" +#include "progressdispatcher.h" #include "ui_protocolwidget.h" diff --git a/src/mirall/protocolwidget.ui b/src/gui/protocolwidget.ui index b1b29106f..b1b29106f 100644 --- a/src/mirall/protocolwidget.ui +++ b/src/gui/protocolwidget.ui diff --git a/src/mirall/settingsdialog.cpp b/src/gui/settingsdialog.cpp index ff44af869..fde290f9e 100644 --- a/src/mirall/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -14,15 +14,15 @@ #include "settingsdialog.h" #include "ui_settingsdialog.h" -#include "mirall/folderman.h" -#include "mirall/theme.h" -#include "mirall/generalsettings.h" -#include "mirall/networksettings.h" -#include "mirall/accountsettings.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/progressdispatcher.h" -#include "mirall/owncloudgui.h" -#include "mirall/protocolwidget.h" +#include "folderman.h" +#include "theme.h" +#include "generalsettings.h" +#include "networksettings.h" +#include "accountsettings.h" +#include "mirallconfigfile.h" +#include "progressdispatcher.h" +#include "owncloudgui.h" +#include "protocolwidget.h" #include <QLabel> #include <QStandardItemModel> diff --git a/src/mirall/settingsdialog.h b/src/gui/settingsdialog.h index fe82e77e5..8c8765aa9 100644 --- a/src/mirall/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -17,7 +17,7 @@ #include <QDialog> #include <QStyledItemDelegate> -#include "mirall/progressdispatcher.h" +#include "progressdispatcher.h" class QStandardItemModel; class QListWidgetItem; diff --git a/src/mirall/settingsdialog.ui b/src/gui/settingsdialog.ui index 0f58d33f4..0f58d33f4 100644 --- a/src/mirall/settingsdialog.ui +++ b/src/gui/settingsdialog.ui diff --git a/src/mirall/settingsdialogmac.cpp b/src/gui/settingsdialogmac.cpp index 23466c6b9..baba18de5 100644 --- a/src/mirall/settingsdialogmac.cpp +++ b/src/gui/settingsdialogmac.cpp @@ -2,15 +2,15 @@ #include "macstandardicon.h" -#include "mirall/folderman.h" -#include "mirall/theme.h" -#include "mirall/generalsettings.h" -#include "mirall/networksettings.h" -#include "mirall/accountsettings.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/progressdispatcher.h" -#include "mirall/owncloudgui.h" -#include "mirall/protocolwidget.h" +#include "folderman.h" +#include "theme.h" +#include "generalsettings.h" +#include "networksettings.h" +#include "accountsettings.h" +#include "mirallconfigfile.h" +#include "progressdispatcher.h" +#include "owncloudgui.h" +#include "protocolwidget.h" #include <QLabel> #include <QStandardItemModel> diff --git a/src/mirall/settingsdialogmac.h b/src/gui/settingsdialogmac.h index c44fbc9de..10c084703 100644 --- a/src/mirall/settingsdialogmac.h +++ b/src/gui/settingsdialogmac.h @@ -1,7 +1,7 @@ #ifndef SETTINGSDIALOGMAC_H #define SETTINGSDIALOGMAC_H -#include "mirall/progressdispatcher.h" +#include "progressdispatcher.h" #include "macpreferenceswindow.h" class QStandardItemModel; diff --git a/src/mirall/socketapi.cpp b/src/gui/socketapi.cpp index 8a0b7c629..70cb1d33c 100644 --- a/src/mirall/socketapi.cpp +++ b/src/gui/socketapi.cpp @@ -12,15 +12,15 @@ * for more details. */ -#include "mirall/socketapi.h" - -#include "mirall/mirallconfigfile.h" -#include "mirall/folderman.h" -#include "mirall/folder.h" -#include "mirall/utility.h" -#include "mirall/theme.h" -#include "mirall/syncjournalfilerecord.h" -#include "mirall/syncfileitem.h" +#include "socketapi.h" + +#include "mirallconfigfile.h" +#include "folderman.h" +#include "folder.h" +#include "utility.h" +#include "theme.h" +#include "syncjournalfilerecord.h" +#include "syncfileitem.h" #include <QDebug> #include <QUrl> diff --git a/src/mirall/socketapi.h b/src/gui/socketapi.h index 6bf28bbf0..035ca33a5 100644 --- a/src/mirall/socketapi.h +++ b/src/gui/socketapi.h @@ -20,7 +20,7 @@ #include <QTcpSocket> #include <QTcpServer> -#include "mirall/syncfileitem.h" +#include "syncfileitem.h" class QUrl; class QLocalSocket; diff --git a/src/mirall/sslbutton.cpp b/src/gui/sslbutton.cpp index e103b36bf..f31308989 100644 --- a/src/mirall/sslbutton.cpp +++ b/src/gui/sslbutton.cpp @@ -11,9 +11,9 @@ * for more details. */ -#include "mirall/sslbutton.h" -#include "mirall/account.h" -#include "mirall/utility.h" +#include "sslbutton.h" +#include "account.h" +#include "utility.h" #include <QMenu> #include <QUrl> @@ -177,7 +177,7 @@ void SslButton::updateAccountInfo(Account *account) setVisible(true); } if (account->url().scheme() == QLatin1String("https")) { - setIcon(QIcon(QPixmap(":/mirall/resources/lock-https.png"))); + setIcon(QIcon(QPixmap(":/resources/lock-https.png"))); QSslCipher cipher = account->sslConfiguration().sessionCipher(); setToolTip(tr("This connection is encrypted using %1 bit %2.\n").arg(cipher.usedBits()).arg(cipher.name())); QMenu *menu = new QMenu(this); @@ -210,7 +210,7 @@ void SslButton::updateAccountInfo(Account *account) } setMenu(menu); } else { - setIcon(QIcon(QPixmap(":/mirall/resources/lock-http.png"))); + setIcon(QIcon(QPixmap(":/resources/lock-http.png"))); setToolTip(tr("This connection is NOT secure as it is not encrypted.\n")); setMenu(0); } diff --git a/src/mirall/sslbutton.h b/src/gui/sslbutton.h index 65bfe7fb0..65bfe7fb0 100644 --- a/src/mirall/sslbutton.h +++ b/src/gui/sslbutton.h diff --git a/src/mirall/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp index 2193ed3c6..0ee283321 100644 --- a/src/mirall/sslerrordialog.cpp +++ b/src/gui/sslerrordialog.cpp @@ -11,9 +11,9 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -#include "mirall/mirallconfigfile.h" -#include "mirall/utility.h" -#include "mirall/sslerrordialog.h" +#include "mirallconfigfile.h" +#include "utility.h" +#include "sslerrordialog.h" #include <QtGui> #include <QtNetwork> diff --git a/src/mirall/sslerrordialog.h b/src/gui/sslerrordialog.h index b8639844a..4be61f0c6 100644 --- a/src/mirall/sslerrordialog.h +++ b/src/gui/sslerrordialog.h @@ -19,7 +19,7 @@ #include <QSslCertificate> #include <QList> -#include "mirall/account.h" +#include "account.h" class QSslError; class QSslCertificate; diff --git a/src/mirall/sslerrordialog.ui b/src/gui/sslerrordialog.ui index 39adabdf5..39adabdf5 100644 --- a/src/mirall/sslerrordialog.ui +++ b/src/gui/sslerrordialog.ui diff --git a/src/mirall/syncrunfilelog.cpp b/src/gui/syncrunfilelog.cpp index 908406c4b..6175fefc5 100644 --- a/src/mirall/syncrunfilelog.cpp +++ b/src/gui/syncrunfilelog.cpp @@ -13,8 +13,8 @@ #include <QRegExp> -#include "mirall/syncrunfilelog.h" -#include "mirall/utility.h" +#include "syncrunfilelog.h" +#include "utility.h" #include "filesystem.h" #include <qfileinfo.h> diff --git a/src/mirall/syncrunfilelog.h b/src/gui/syncrunfilelog.h index eb6dd5e4f..da1581447 100644 --- a/src/mirall/syncrunfilelog.h +++ b/src/gui/syncrunfilelog.h @@ -18,8 +18,8 @@ #include <QTextStream> #include <QScopedPointer> -#include "mirall/syncfileitem.h" -#include "mirall/utility.h" +#include "syncfileitem.h" +#include "utility.h" namespace Mirall { class SyncFileItem; diff --git a/src/mirall/systray.cpp b/src/gui/systray.cpp index 617d1408b..c3f799db6 100644 --- a/src/mirall/systray.cpp +++ b/src/gui/systray.cpp @@ -13,7 +13,7 @@ */ #include "systray.h" -#include "mirall/theme.h" +#include "theme.h" #ifdef USE_FDO_NOTIFICATIONS #include <QDBusConnection> diff --git a/src/mirall/systray.h b/src/gui/systray.h index 827f7c020..827f7c020 100644 --- a/src/mirall/systray.h +++ b/src/gui/systray.h diff --git a/src/gui/updater/CMakeLists.txt b/src/gui/updater/CMakeLists.txt new file mode 100644 index 000000000..ecfba6318 --- /dev/null +++ b/src/gui/updater/CMakeLists.txt @@ -0,0 +1,9 @@ +if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY) + if (SPARKLE_FOUND) + install(FILES ${CMAKE_SOURCE_DIR}/admin/osx/deny_autoupdate_com.owncloud.desktopclient.plist + DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources) + install(FILES ${CMAKE_SOURCE_DIR}/admin/osx/sparkle/dsa_pub.pem + DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources) + endif() +endif() + diff --git a/src/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp index e4ed9073f..2dc20035f 100644 --- a/src/updater/ocupdater.cpp +++ b/src/gui/updater/ocupdater.cpp @@ -12,11 +12,11 @@ * for more details. */ -#include "mirall/theme.h" -#include "mirall/version.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/utility.h" -#include "mirall/mirallaccessmanager.h" +#include "theme.h" +#include "version.h" +#include "mirallconfigfile.h" +#include "utility.h" +#include "mirallaccessmanager.h" #include "updater/ocupdater.h" diff --git a/src/updater/ocupdater.h b/src/gui/updater/ocupdater.h index 1041517bc..1041517bc 100644 --- a/src/updater/ocupdater.h +++ b/src/gui/updater/ocupdater.h diff --git a/src/updater/sparkleupdater.h b/src/gui/updater/sparkleupdater.h index 373e8a25c..373e8a25c 100644 --- a/src/updater/sparkleupdater.h +++ b/src/gui/updater/sparkleupdater.h diff --git a/src/updater/sparkleupdater_mac.mm b/src/gui/updater/sparkleupdater_mac.mm index e1dea1ce6..e1dea1ce6 100644 --- a/src/updater/sparkleupdater_mac.mm +++ b/src/gui/updater/sparkleupdater_mac.mm diff --git a/src/updater/updateinfo.cpp b/src/gui/updater/updateinfo.cpp index 7554a0d11..7554a0d11 100644 --- a/src/updater/updateinfo.cpp +++ b/src/gui/updater/updateinfo.cpp diff --git a/src/updater/updateinfo.h b/src/gui/updater/updateinfo.h index 25d3e5488..25d3e5488 100644 --- a/src/updater/updateinfo.h +++ b/src/gui/updater/updateinfo.h diff --git a/src/updater/updater.cpp b/src/gui/updater/updater.cpp index f0dd46512..58c42ed33 100644 --- a/src/updater/updater.cpp +++ b/src/gui/updater/updater.cpp @@ -19,9 +19,9 @@ #include "updater/sparkleupdater.h" #include "updater/ocupdater.h" -#include "mirall/version.h" -#include "mirall/theme.h" -#include "mirall/utility.h" +#include "version.h" +#include "theme.h" +#include "utility.h" #include "config.h" diff --git a/src/updater/updater.h b/src/gui/updater/updater.h index be2088c6f..be2088c6f 100644 --- a/src/updater/updater.h +++ b/src/gui/updater/updater.h diff --git a/src/wizard/abstractcredswizardpage.cpp b/src/gui/wizard/abstractcredswizardpage.cpp index 83d1a92bd..cb17b422f 100644 --- a/src/wizard/abstractcredswizardpage.cpp +++ b/src/gui/wizard/abstractcredswizardpage.cpp @@ -13,7 +13,7 @@ #include "creds/abstractcredentials.h" #include "creds/credentialsfactory.h" -#include "mirall/account.h" +#include "account.h" #include "wizard/owncloudwizard.h" #include "wizard/abstractcredswizardpage.h" diff --git a/src/wizard/abstractcredswizardpage.h b/src/gui/wizard/abstractcredswizardpage.h index a2ef1fe9a..a2ef1fe9a 100644 --- a/src/wizard/abstractcredswizardpage.h +++ b/src/gui/wizard/abstractcredswizardpage.h diff --git a/src/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp index a4e49ed2d..1a0bafcad 100644 --- a/src/wizard/owncloudadvancedsetuppage.cpp +++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp @@ -23,9 +23,9 @@ #include "wizard/owncloudwizard.h" #include "wizard/owncloudwizardcommon.h" #include "wizard/owncloudadvancedsetuppage.h" -#include "mirall/account.h" -#include "mirall/theme.h" -#include "mirall/mirallconfigfile.h" +#include "account.h" +#include "theme.h" +#include "mirallconfigfile.h" #include "creds/abstractcredentials.h" namespace Mirall diff --git a/src/wizard/owncloudadvancedsetuppage.h b/src/gui/wizard/owncloudadvancedsetuppage.h index 1d897fe77..1d897fe77 100644 --- a/src/wizard/owncloudadvancedsetuppage.h +++ b/src/gui/wizard/owncloudadvancedsetuppage.h diff --git a/src/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui index c5a4eed04..c5a4eed04 100644 --- a/src/wizard/owncloudadvancedsetuppage.ui +++ b/src/gui/wizard/owncloudadvancedsetuppage.ui diff --git a/src/wizard/owncloudhttpcredspage.cpp b/src/gui/wizard/owncloudhttpcredspage.cpp index e150af2d3..e6e6bef25 100644 --- a/src/wizard/owncloudhttpcredspage.cpp +++ b/src/gui/wizard/owncloudhttpcredspage.cpp @@ -16,9 +16,9 @@ #include "QProgressIndicator.h" #include "creds/httpcredentials.h" -#include "mirall/theme.h" -#include "mirall/account.h" -#include "mirall/mirallconfigfile.h" +#include "theme.h" +#include "account.h" +#include "mirallconfigfile.h" #include "wizard/owncloudhttpcredspage.h" #include "wizard/owncloudwizardcommon.h" #include "wizard/owncloudwizard.h" diff --git a/src/wizard/owncloudhttpcredspage.h b/src/gui/wizard/owncloudhttpcredspage.h index 70356836c..70356836c 100644 --- a/src/wizard/owncloudhttpcredspage.h +++ b/src/gui/wizard/owncloudhttpcredspage.h diff --git a/src/wizard/owncloudhttpcredspage.ui b/src/gui/wizard/owncloudhttpcredspage.ui index fe8fc126d..fe8fc126d 100644 --- a/src/wizard/owncloudhttpcredspage.ui +++ b/src/gui/wizard/owncloudhttpcredspage.ui diff --git a/src/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index 4c18586ae..4c18586ae 100644 --- a/src/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui diff --git a/src/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index da1e54a83..487591500 100644 --- a/src/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -23,7 +23,7 @@ #include "wizard/owncloudwizardcommon.h" #include "wizard/owncloudsetuppage.h" -#include "mirall/theme.h" +#include "theme.h" namespace Mirall { diff --git a/src/wizard/owncloudsetuppage.h b/src/gui/wizard/owncloudsetuppage.h index 0d30e6a93..0d30e6a93 100644 --- a/src/wizard/owncloudsetuppage.h +++ b/src/gui/wizard/owncloudsetuppage.h diff --git a/src/wizard/owncloudshibbolethcredspage.cpp b/src/gui/wizard/owncloudshibbolethcredspage.cpp index 653570778..0a924b993 100644 --- a/src/wizard/owncloudshibbolethcredspage.cpp +++ b/src/gui/wizard/owncloudshibbolethcredspage.cpp @@ -14,9 +14,9 @@ #include <QVariant> #include "wizard/owncloudshibbolethcredspage.h" -#include "mirall/theme.h" -#include "mirall/account.h" -#include "mirall/cookiejar.h" +#include "theme.h" +#include "account.h" +#include "cookiejar.h" #include "wizard/owncloudwizardcommon.h" #include "wizard/owncloudwizard.h" #include "creds/shibbolethcredentials.h" diff --git a/src/wizard/owncloudshibbolethcredspage.h b/src/gui/wizard/owncloudshibbolethcredspage.h index 14296431d..14296431d 100644 --- a/src/wizard/owncloudshibbolethcredspage.h +++ b/src/gui/wizard/owncloudshibbolethcredspage.h diff --git a/src/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp index 94e3559ca..391be3b50 100644 --- a/src/wizard/owncloudwizard.cpp +++ b/src/gui/wizard/owncloudwizard.cpp @@ -13,9 +13,9 @@ * for more details. */ -#include "mirall/account.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/theme.h" +#include "account.h" +#include "mirallconfigfile.h" +#include "theme.h" #include "wizard/owncloudwizard.h" #include "wizard/owncloudsetuppage.h" diff --git a/src/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h index db3154446..db3154446 100644 --- a/src/wizard/owncloudwizard.h +++ b/src/gui/wizard/owncloudwizard.h diff --git a/src/wizard/owncloudwizardcommon.cpp b/src/gui/wizard/owncloudwizardcommon.cpp index 752c3a7fa..a843164be 100644 --- a/src/wizard/owncloudwizardcommon.cpp +++ b/src/gui/wizard/owncloudwizardcommon.cpp @@ -18,7 +18,7 @@ #include <QVariant> #include "wizard/owncloudwizardcommon.h" -#include "mirall/theme.h" +#include "theme.h" namespace Mirall { diff --git a/src/wizard/owncloudwizardcommon.h b/src/gui/wizard/owncloudwizardcommon.h index 9896f1192..9896f1192 100644 --- a/src/wizard/owncloudwizardcommon.h +++ b/src/gui/wizard/owncloudwizardcommon.h diff --git a/src/wizard/owncloudwizardresultpage.cpp b/src/gui/wizard/owncloudwizardresultpage.cpp index 27a6fc1ee..2ac186522 100644 --- a/src/wizard/owncloudwizardresultpage.cpp +++ b/src/gui/wizard/owncloudwizardresultpage.cpp @@ -20,7 +20,7 @@ #include "wizard/owncloudwizardresultpage.h" #include "wizard/owncloudwizardcommon.h" -#include "mirall/theme.h" +#include "theme.h" namespace Mirall { diff --git a/src/wizard/owncloudwizardresultpage.h b/src/gui/wizard/owncloudwizardresultpage.h index 0390087be..0390087be 100644 --- a/src/wizard/owncloudwizardresultpage.h +++ b/src/gui/wizard/owncloudwizardresultpage.h diff --git a/src/wizard/owncloudwizardresultpage.ui b/src/gui/wizard/owncloudwizardresultpage.ui index 67f262ab1..67f262ab1 100644 --- a/src/wizard/owncloudwizardresultpage.ui +++ b/src/gui/wizard/owncloudwizardresultpage.ui diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt new file mode 100644 index 000000000..3bcfb4e7d --- /dev/null +++ b/src/libsync/CMakeLists.txt @@ -0,0 +1,182 @@ +project(libsync) +set(CMAKE_AUTOMOC TRUE) +include(GenerateExportHeader) + +configure_file( version.h.in "${CMAKE_CURRENT_BINARY_DIR}/version.h" ) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +# csync is required. +include_directories(${CMAKE_SOURCE_DIR}/csync/src + ${CMAKE_SOURCE_DIR}/csync/src/httpbf/src + ${CMAKE_BINARY_DIR}/csync + ${CMAKE_BINARY_DIR}/csync/src + ) +include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qjson) + +if ( APPLE ) + list(APPEND OS_SPECIFIC_LINK_LIBRARIES + /System/Library/Frameworks/CoreServices.framework + /System/Library/Frameworks/Foundation.framework + /System/Library/Frameworks/AppKit.framework + ) +endif() + +IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + list(APPEND OS_SPECIFIC_LINK_LIBRARIES + inotify + ) +ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + +if(SPARKLE_FOUND AND NOT BUILD_LIBRARIES_ONLY) + list (APPEND OS_SPECIFIC_LINK_LIBRARIES ${SPARKLE_LIBRARY}) +endif() + +set(libsync_SRCS + mirallconfigfile.cpp + syncengine.cpp + owncloudpropagator.cpp + propagatorjobs.cpp + propagator_qnam.cpp + propagator_legacy.cpp + syncjournalfilerecord.cpp + syncjournaldb.cpp + theme.cpp + logger.cpp + utility.cpp + filesystem.cpp + connectionvalidator.cpp + progressdispatcher.cpp + mirallaccessmanager.cpp + networkjobs.cpp + account.cpp + quotainfo.cpp + clientproxy.cpp + cookiejar.cpp + syncfilestatus.cpp + syncresult.cpp + owncloudtheme.cpp + creds/dummycredentials.cpp + creds/abstractcredentials.cpp + creds/credentialsfactory.cpp + creds/http/httpconfigfile.cpp + creds/credentialscommon.cpp + ../3rdparty/qjson/json.cpp +) +if(TOKEN_AUTH_ONLY) + set (libsync_SRCS + ${libsync_SRCS} + creds/tokencredentials.cpp + ) +else() + set (libsync_SRCS + ${libsync_SRCS} + creds/httpcredentials.cpp + creds/shibbolethcredentials.cpp + creds/shibboleth/shibbolethwebview.cpp + creds/shibboleth/shibbolethrefresher.cpp + creds/shibboleth/authenticationdialog.cpp + creds/shibboleth/shibbolethuserjob.cpp + ) +endif() + +# These headers are installed for libowncloudsync to be used by 3rd party apps +set(owncloudsync_HEADERS + account.h + syncengine.h + mirallconfigfile.h + networkjobs.h + progressdispatcher.h + syncfileitem.h + syncjournaldb.h + syncresult.h +) + +set(creds_HEADERS + creds/abstractcredentials.h + creds/httpcredentials.h +) + +IF (NOT APPLE) + INSTALL( + FILES ${owncloudsync_HEADERS} + DESTINATION ${INCLUDE_INSTALL_DIR}/${synclib_NAME}/mirall + ) + INSTALL( + FILES ${creds_HEADERS} + DESTINATION ${INCLUDE_INSTALL_DIR}/${synclib_NAME}/creds + ) +ENDIF(NOT APPLE) + +list(APPEND libsync_LINK_TARGETS + ${QT_LIBRARIES} + ocsync + httpbf + ${OS_SPECIFIC_LINK_LIBRARIES} +) + +if(QTKEYCHAIN_FOUND OR QT5KEYCHAIN_FOUND) + list(APPEND libsync_LINK_TARGETS ${QTKEYCHAIN_LIBRARY}) + include_directories(${QTKEYCHAIN_INCLUDE_DIR}) +endif() + +if(NEON_FOUND) + list(APPEND libsync_LINK_TARGETS ${NEON_LIBRARIES}) + include_directories(${NEON_INCLUDE_DIRS}) + + if(NEON_WITH_LFS) + add_definitions(-DNE_LFS) + endif() + +endif() + +add_library(${synclib_NAME} SHARED ${libsync_SRCS} ${syncMoc}) +GENERATE_EXPORT_HEADER( ${synclib_NAME} + BASE_NAME ${synclib_NAME} + EXPORT_MACRO_NAME OWNCLOUDSYNC_EXPORT + EXPORT_FILE_NAME owncloudlib.h + STATIC_DEFINE OWNCLOUD_BUILT_AS_STATIC +) + + +if(TOKEN_AUTH_ONLY) + qt5_use_modules(${synclib_NAME} Network Xml Sql) +else() + qt5_use_modules(${synclib_NAME} Widgets Network Xml WebKitWidgets Sql) +endif() + +set_target_properties( ${synclib_NAME} PROPERTIES + VERSION ${MIRALL_VERSION} + SOVERSION ${MIRALL_SOVERSION} +) +set_target_properties( ${synclib_NAME} PROPERTIES + INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) + +target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} ) + +if(BUILD_LIBRARIES_ONLY) + #add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc}) + #qt5_use_modules(${synclib_NAME}_static Widgets Network Xml Sql) + + #set_target_properties( ${synclib_NAME}_static PROPERTIES + # VERSION ${MIRALL_VERSION} + # SOVERSION ${MIRALL_SOVERSION} + #) + + #target_link_libraries(${synclib_NAME}_static ${libsync_LINK_TARGETS} ) +endif() + +if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) + install(TARGETS ${synclib_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) +else() + install(TARGETS ${synclib_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS) + if (SPARKLE_FOUND) + install(DIRECTORY "${SPARKLE_LIBRARY}" + DESTINATION "${OWNCLOUD_OSX_BUNDLE}/Contents/Frameworks") + endif (SPARKLE_FOUND) +endif() + + diff --git a/src/mirall/account.cpp b/src/libsync/account.cpp index a41369197..f1bd41edf 100644 --- a/src/mirall/account.cpp +++ b/src/libsync/account.cpp @@ -11,13 +11,13 @@ * for more details. */ -#include "mirall/account.h" -#include "mirall/cookiejar.h" -#include "mirall/theme.h" -#include "mirall/networkjobs.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/mirallaccessmanager.h" -#include "mirall/quotainfo.h" +#include "account.h" +#include "cookiejar.h" +#include "theme.h" +#include "networkjobs.h" +#include "mirallconfigfile.h" +#include "mirallaccessmanager.h" +#include "quotainfo.h" #include "creds/abstractcredentials.h" #include "creds/credentialsfactory.h" diff --git a/src/mirall/account.h b/src/libsync/account.h index d782a7498..d782a7498 100644 --- a/src/mirall/account.h +++ b/src/libsync/account.h diff --git a/src/mirall/clientproxy.cpp b/src/libsync/clientproxy.cpp index 4b03b8b7f..bf95f49b7 100644 --- a/src/mirall/clientproxy.cpp +++ b/src/libsync/clientproxy.cpp @@ -13,8 +13,7 @@ #include "clientproxy.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/folderman.h" +#include "mirallconfigfile.h" #include <QUrl> namespace Mirall { diff --git a/src/mirall/clientproxy.h b/src/libsync/clientproxy.h index 4fe372938..4fe372938 100644 --- a/src/mirall/clientproxy.h +++ b/src/libsync/clientproxy.h diff --git a/src/mirall/connectionvalidator.cpp b/src/libsync/connectionvalidator.cpp index 24954f548..d902cd952 100644 --- a/src/mirall/connectionvalidator.cpp +++ b/src/libsync/connectionvalidator.cpp @@ -14,10 +14,10 @@ #include <QtCore> #include <QNetworkReply> -#include "mirall/connectionvalidator.h" -#include "mirall/theme.h" -#include "mirall/account.h" -#include "mirall/networkjobs.h" +#include "connectionvalidator.h" +#include "theme.h" +#include "account.h" +#include "networkjobs.h" #include <creds/abstractcredentials.h> namespace Mirall { diff --git a/src/mirall/connectionvalidator.h b/src/libsync/connectionvalidator.h index e930ccdd4..e930ccdd4 100644 --- a/src/mirall/connectionvalidator.h +++ b/src/libsync/connectionvalidator.h diff --git a/src/mirall/cookiejar.cpp b/src/libsync/cookiejar.cpp index 53539ac6c..440ff2c52 100644 --- a/src/mirall/cookiejar.cpp +++ b/src/libsync/cookiejar.cpp @@ -13,7 +13,7 @@ #include "cookiejar.h" -#include "mirall/mirallconfigfile.h" +#include "mirallconfigfile.h" #include <QDebug> #include <QFile> diff --git a/src/mirall/cookiejar.h b/src/libsync/cookiejar.h index 3166b547d..3166b547d 100644 --- a/src/mirall/cookiejar.h +++ b/src/libsync/cookiejar.h diff --git a/src/creds/abstractcredentials.cpp b/src/libsync/creds/abstractcredentials.cpp index b248b39f5..b248b39f5 100644 --- a/src/creds/abstractcredentials.cpp +++ b/src/libsync/creds/abstractcredentials.cpp diff --git a/src/creds/abstractcredentials.h b/src/libsync/creds/abstractcredentials.h index 2c144b0d9..2c144b0d9 100644 --- a/src/creds/abstractcredentials.h +++ b/src/libsync/creds/abstractcredentials.h diff --git a/src/creds/credentialscommon.cpp b/src/libsync/creds/credentialscommon.cpp index 7b0e4da8c..c34a0fe47 100644 --- a/src/creds/credentialscommon.cpp +++ b/src/libsync/creds/credentialscommon.cpp @@ -23,8 +23,8 @@ #include "creds/credentialscommon.h" -#include "mirall/utility.h" -#include "mirall/account.h" +#include "utility.h" +#include "account.h" namespace Mirall { diff --git a/src/creds/credentialscommon.h b/src/libsync/creds/credentialscommon.h index e0f26f741..e0f26f741 100644 --- a/src/creds/credentialscommon.h +++ b/src/libsync/creds/credentialscommon.h diff --git a/src/creds/credentialsfactory.cpp b/src/libsync/creds/credentialsfactory.cpp index 83f9711c5..83f9711c5 100644 --- a/src/creds/credentialsfactory.cpp +++ b/src/libsync/creds/credentialsfactory.cpp diff --git a/src/creds/credentialsfactory.h b/src/libsync/creds/credentialsfactory.h index 1a7dc77f6..1a7dc77f6 100644 --- a/src/creds/credentialsfactory.h +++ b/src/libsync/creds/credentialsfactory.h diff --git a/src/creds/dummycredentials.cpp b/src/libsync/creds/dummycredentials.cpp index 1b3122f1b..54117f691 100644 --- a/src/creds/dummycredentials.cpp +++ b/src/libsync/creds/dummycredentials.cpp @@ -12,7 +12,7 @@ */ #include "creds/dummycredentials.h" -#include "mirall/mirallaccessmanager.h" +#include "mirallaccessmanager.h" namespace Mirall { diff --git a/src/creds/dummycredentials.h b/src/libsync/creds/dummycredentials.h index 516280fe7..516280fe7 100644 --- a/src/creds/dummycredentials.h +++ b/src/libsync/creds/dummycredentials.h diff --git a/src/creds/http/httpconfigfile.cpp b/src/libsync/creds/http/httpconfigfile.cpp index e1e7a734b..e1e7a734b 100644 --- a/src/creds/http/httpconfigfile.cpp +++ b/src/libsync/creds/http/httpconfigfile.cpp diff --git a/src/creds/http/httpconfigfile.h b/src/libsync/creds/http/httpconfigfile.h index 2e690054f..04705a187 100644 --- a/src/creds/http/httpconfigfile.h +++ b/src/libsync/creds/http/httpconfigfile.h @@ -14,7 +14,7 @@ #ifndef MIRALL_CREDS_HTTP_CONFIG_FILE_H #define MIRALL_CREDS_HTTP_CONFIG_FILE_H -#include "mirall/mirallconfigfile.h" +#include "mirallconfigfile.h" namespace Mirall { diff --git a/src/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp index 1312ee33e..d1166c6d7 100644 --- a/src/creds/httpcredentials.cpp +++ b/src/libsync/creds/httpcredentials.cpp @@ -25,10 +25,10 @@ #include <qtkeychain/keychain.h> #endif -#include "mirall/account.h" -#include "mirall/mirallaccessmanager.h" -#include "mirall/utility.h" -#include "mirall/theme.h" +#include "account.h" +#include "mirallaccessmanager.h" +#include "utility.h" +#include "theme.h" #include "creds/credentialscommon.h" #include "creds/httpcredentials.h" diff --git a/src/creds/httpcredentials.h b/src/libsync/creds/httpcredentials.h index 92360f376..92360f376 100644 --- a/src/creds/httpcredentials.h +++ b/src/libsync/creds/httpcredentials.h diff --git a/src/creds/shibboleth/authenticationdialog.cpp b/src/libsync/creds/shibboleth/authenticationdialog.cpp index ef12ba8ba..ef12ba8ba 100644 --- a/src/creds/shibboleth/authenticationdialog.cpp +++ b/src/libsync/creds/shibboleth/authenticationdialog.cpp diff --git a/src/creds/shibboleth/authenticationdialog.h b/src/libsync/creds/shibboleth/authenticationdialog.h index adcd5ca01..adcd5ca01 100644 --- a/src/creds/shibboleth/authenticationdialog.h +++ b/src/libsync/creds/shibboleth/authenticationdialog.h diff --git a/src/creds/shibboleth/shibbolethrefresher.cpp b/src/libsync/creds/shibboleth/shibbolethrefresher.cpp index a301330e8..375674b73 100644 --- a/src/creds/shibboleth/shibbolethrefresher.cpp +++ b/src/libsync/creds/shibboleth/shibbolethrefresher.cpp @@ -13,7 +13,7 @@ #include <QEventLoop> -#include "mirall/account.h" +#include "account.h" #include "creds/shibboleth/shibbolethrefresher.h" #include "creds/shibbolethcredentials.h" diff --git a/src/creds/shibboleth/shibbolethrefresher.h b/src/libsync/creds/shibboleth/shibbolethrefresher.h index 242a5229a..242a5229a 100644 --- a/src/creds/shibboleth/shibbolethrefresher.h +++ b/src/libsync/creds/shibboleth/shibbolethrefresher.h diff --git a/src/creds/shibboleth/shibbolethuserjob.cpp b/src/libsync/creds/shibboleth/shibbolethuserjob.cpp index 1752c4426..1752c4426 100644 --- a/src/creds/shibboleth/shibbolethuserjob.cpp +++ b/src/libsync/creds/shibboleth/shibbolethuserjob.cpp diff --git a/src/creds/shibboleth/shibbolethuserjob.h b/src/libsync/creds/shibboleth/shibbolethuserjob.h index 3f2c10b59..3f2c10b59 100644 --- a/src/creds/shibboleth/shibbolethuserjob.h +++ b/src/libsync/creds/shibboleth/shibbolethuserjob.h diff --git a/src/creds/shibboleth/shibbolethwebview.cpp b/src/libsync/creds/shibboleth/shibbolethwebview.cpp index 8a9f6d9db..293b2d934 100644 --- a/src/creds/shibboleth/shibbolethwebview.cpp +++ b/src/libsync/creds/shibboleth/shibbolethwebview.cpp @@ -22,10 +22,10 @@ #include "creds/shibboleth/shibbolethwebview.h" #include "creds/shibbolethcredentials.h" -#include "mirall/account.h" -#include "mirall/logger.h" -#include "mirall/mirallaccessmanager.h" -#include "mirall/theme.h" +#include "account.h" +#include "logger.h" +#include "mirallaccessmanager.h" +#include "theme.h" namespace Mirall { diff --git a/src/creds/shibboleth/shibbolethwebview.h b/src/libsync/creds/shibboleth/shibbolethwebview.h index 29e642a1f..29e642a1f 100644 --- a/src/creds/shibboleth/shibbolethwebview.h +++ b/src/libsync/creds/shibboleth/shibbolethwebview.h diff --git a/src/creds/shibbolethcredentials.cpp b/src/libsync/creds/shibbolethcredentials.cpp index 5b83f701f..ef2872562 100644 --- a/src/creds/shibbolethcredentials.cpp +++ b/src/libsync/creds/shibbolethcredentials.cpp @@ -27,10 +27,10 @@ #include "shibboleth/shibbolethuserjob.h" #include "creds/credentialscommon.h" -#include "mirall/mirallaccessmanager.h" -#include "mirall/account.h" -#include "mirall/theme.h" -#include "mirall/cookiejar.h" +#include "mirallaccessmanager.h" +#include "account.h" +#include "theme.h" +#include "cookiejar.h" #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include <qt5keychain/keychain.h> diff --git a/src/creds/shibbolethcredentials.h b/src/libsync/creds/shibbolethcredentials.h index 5a58fac4f..5a58fac4f 100644 --- a/src/creds/shibbolethcredentials.h +++ b/src/libsync/creds/shibbolethcredentials.h diff --git a/src/creds/tokencredentials.cpp b/src/libsync/creds/tokencredentials.cpp index 7e9a56238..b1597b18b 100644 --- a/src/creds/tokencredentials.cpp +++ b/src/libsync/creds/tokencredentials.cpp @@ -18,10 +18,10 @@ #include <QNetworkReply> #include <QSettings> -#include "mirall/account.h" -#include "mirall/mirallaccessmanager.h" -#include "mirall/utility.h" -#include "mirall/theme.h" +#include "account.h" +#include "mirallaccessmanager.h" +#include "utility.h" +#include "theme.h" #include "creds/credentialscommon.h" #include "creds/tokencredentials.h" diff --git a/src/creds/tokencredentials.h b/src/libsync/creds/tokencredentials.h index d44fb2049..d44fb2049 100644 --- a/src/creds/tokencredentials.h +++ b/src/libsync/creds/tokencredentials.h diff --git a/src/mirall/filesystem.cpp b/src/libsync/filesystem.cpp index b317b320d..b317b320d 100644 --- a/src/mirall/filesystem.cpp +++ b/src/libsync/filesystem.cpp diff --git a/src/mirall/filesystem.h b/src/libsync/filesystem.h index c8e10ceb0..c8e10ceb0 100644 --- a/src/mirall/filesystem.h +++ b/src/libsync/filesystem.h diff --git a/src/mirall/logger.cpp b/src/libsync/logger.cpp index 0bc8d1ccb..72e647680 100644 --- a/src/mirall/logger.cpp +++ b/src/libsync/logger.cpp @@ -12,7 +12,7 @@ * for more details. */ -#include "mirall/logger.h" +#include "logger.h" #include <QDir> #include <QStringList> diff --git a/src/mirall/logger.h b/src/libsync/logger.h index 8e4fdbe6c..8e4fdbe6c 100644 --- a/src/mirall/logger.h +++ b/src/libsync/logger.h diff --git a/src/mirall/mirallaccessmanager.cpp b/src/libsync/mirallaccessmanager.cpp index ddb9be013..83b89b049 100644 --- a/src/mirall/mirallaccessmanager.cpp +++ b/src/libsync/mirallaccessmanager.cpp @@ -16,9 +16,9 @@ #include <QAuthenticator> #include <QSslConfiguration> -#include "mirall/cookiejar.h" -#include "mirall/mirallaccessmanager.h" -#include "mirall/utility.h" +#include "cookiejar.h" +#include "mirallaccessmanager.h" +#include "utility.h" namespace Mirall { diff --git a/src/mirall/mirallaccessmanager.h b/src/libsync/mirallaccessmanager.h index d2fc0e531..d2fc0e531 100644 --- a/src/mirall/mirallaccessmanager.h +++ b/src/libsync/mirallaccessmanager.h diff --git a/src/mirall/mirallconfigfile.cpp b/src/libsync/mirallconfigfile.cpp index 8988a05fa..21d3d8742 100644 --- a/src/mirall/mirallconfigfile.cpp +++ b/src/libsync/mirallconfigfile.cpp @@ -14,10 +14,9 @@ #include "config.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/owncloudtheme.h" -#include "mirall/theme.h" -#include "mirall/utility.h" +#include "mirallconfigfile.h" +#include "theme.h" +#include "utility.h" #include "creds/abstractcredentials.h" #include "creds/credentialsfactory.h" diff --git a/src/mirall/mirallconfigfile.h b/src/libsync/mirallconfigfile.h index 8b7423fc8..8b7423fc8 100644 --- a/src/mirall/mirallconfigfile.h +++ b/src/libsync/mirallconfigfile.h diff --git a/src/mirall/networkjobs.cpp b/src/libsync/networkjobs.cpp index 7034f148e..1af8fe585 100644 --- a/src/mirall/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -29,8 +29,8 @@ #include "json.h" -#include "mirall/networkjobs.h" -#include "mirall/account.h" +#include "networkjobs.h" +#include "account.h" #include "creds/credentialsfactory.h" #include "creds/abstractcredentials.h" diff --git a/src/mirall/networkjobs.h b/src/libsync/networkjobs.h index 5b8c196d3..5b8c196d3 100644 --- a/src/mirall/networkjobs.h +++ b/src/libsync/networkjobs.h diff --git a/src/mirall/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index 876e97d94..8c2ba742b 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -19,8 +19,8 @@ #include "propagator_qnam.h" #include "propagatorjobs.h" #include "propagator_legacy.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/utility.h" +#include "mirallconfigfile.h" +#include "utility.h" #ifdef Q_OS_WIN #include <windef.h> diff --git a/src/mirall/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index cfec6653b..cfec6653b 100644 --- a/src/mirall/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h diff --git a/src/mirall/owncloudpropagator_p.h b/src/libsync/owncloudpropagator_p.h index 3f98f6604..3f98f6604 100644 --- a/src/mirall/owncloudpropagator_p.h +++ b/src/libsync/owncloudpropagator_p.h diff --git a/src/mirall/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp index f73aa7c55..73e32724e 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/libsync/owncloudtheme.cpp @@ -26,7 +26,7 @@ #include <QDebug> -#include "mirall/version.h" +#include "version.h" #include "config.h" namespace Mirall { diff --git a/src/mirall/owncloudtheme.h b/src/libsync/owncloudtheme.h index 33b33e2a9..33b33e2a9 100644 --- a/src/mirall/owncloudtheme.h +++ b/src/libsync/owncloudtheme.h diff --git a/src/mirall/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp index 384b78d03..384b78d03 100644 --- a/src/mirall/progressdispatcher.cpp +++ b/src/libsync/progressdispatcher.cpp diff --git a/src/mirall/progressdispatcher.h b/src/libsync/progressdispatcher.h index a3a1e0a31..a3a1e0a31 100644 --- a/src/mirall/progressdispatcher.h +++ b/src/libsync/progressdispatcher.h diff --git a/src/mirall/propagator_legacy.cpp b/src/libsync/propagator_legacy.cpp index ff1d34113..ff1d34113 100644 --- a/src/mirall/propagator_legacy.cpp +++ b/src/libsync/propagator_legacy.cpp diff --git a/src/mirall/propagator_legacy.h b/src/libsync/propagator_legacy.h index eee25c0dd..eee25c0dd 100644 --- a/src/mirall/propagator_legacy.h +++ b/src/libsync/propagator_legacy.h diff --git a/src/mirall/propagator_qnam.cpp b/src/libsync/propagator_qnam.cpp index 475a5b98a..475a5b98a 100644 --- a/src/mirall/propagator_qnam.cpp +++ b/src/libsync/propagator_qnam.cpp diff --git a/src/mirall/propagator_qnam.h b/src/libsync/propagator_qnam.h index fee64cf5a..fee64cf5a 100644 --- a/src/mirall/propagator_qnam.h +++ b/src/libsync/propagator_qnam.h diff --git a/src/mirall/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp index a94c04a75..a94c04a75 100644 --- a/src/mirall/propagatorjobs.cpp +++ b/src/libsync/propagatorjobs.cpp diff --git a/src/mirall/propagatorjobs.h b/src/libsync/propagatorjobs.h index df7a5e472..df7a5e472 100644 --- a/src/mirall/propagatorjobs.h +++ b/src/libsync/propagatorjobs.h diff --git a/src/mirall/quotainfo.cpp b/src/libsync/quotainfo.cpp index 71fd29ccd..2a8eb286a 100644 --- a/src/mirall/quotainfo.cpp +++ b/src/libsync/quotainfo.cpp @@ -11,9 +11,9 @@ * for more details. */ -#include "mirall/quotainfo.h" -#include "mirall/account.h" -#include "mirall/networkjobs.h" +#include "quotainfo.h" +#include "account.h" +#include "networkjobs.h" #include "creds/abstractcredentials.h" #include <QTimer> diff --git a/src/mirall/quotainfo.h b/src/libsync/quotainfo.h index 14ccbbf9f..14ccbbf9f 100644 --- a/src/mirall/quotainfo.h +++ b/src/libsync/quotainfo.h diff --git a/src/mirall/syncengine.cpp b/src/libsync/syncengine.cpp index ddfe6eac1..0d9d1b388 100644 --- a/src/mirall/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -13,9 +13,9 @@ * for more details. */ -#include "mirall/syncengine.h" -#include "mirall/account.h" -#include "mirall/theme.h" +#include "syncengine.h" +#include "account.h" +#include "theme.h" #include "owncloudpropagator.h" #include "syncjournaldb.h" #include "syncjournalfilerecord.h" diff --git a/src/mirall/syncengine.h b/src/libsync/syncengine.h index c4a9af7bb..eab8d68eb 100644 --- a/src/mirall/syncengine.h +++ b/src/libsync/syncengine.h @@ -26,9 +26,9 @@ #include <csync.h> -#include "mirall/syncfileitem.h" -#include "mirall/progressdispatcher.h" -#include "mirall/utility.h" +#include "syncfileitem.h" +#include "progressdispatcher.h" +#include "utility.h" class QProcess; diff --git a/src/mirall/syncfileitem.h b/src/libsync/syncfileitem.h index 4ce515f4a..4ce515f4a 100644 --- a/src/mirall/syncfileitem.h +++ b/src/libsync/syncfileitem.h diff --git a/src/mirall/syncfilestatus.cpp b/src/libsync/syncfilestatus.cpp index 8c8770ae3..dac10014d 100644 --- a/src/mirall/syncfilestatus.cpp +++ b/src/libsync/syncfilestatus.cpp @@ -11,7 +11,7 @@ * for more details. */ -#include "mirall/syncfilestatus.h" +#include "syncfilestatus.h" #include <QDebug> diff --git a/src/mirall/syncfilestatus.h b/src/libsync/syncfilestatus.h index 9e656f50b..9e656f50b 100644 --- a/src/mirall/syncfilestatus.h +++ b/src/libsync/syncfilestatus.h diff --git a/src/mirall/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp index 6f7497a12..6f7497a12 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/libsync/syncjournaldb.cpp diff --git a/src/mirall/syncjournaldb.h b/src/libsync/syncjournaldb.h index bf11f11c6..bf11f11c6 100644 --- a/src/mirall/syncjournaldb.h +++ b/src/libsync/syncjournaldb.h diff --git a/src/mirall/syncjournalfilerecord.cpp b/src/libsync/syncjournalfilerecord.cpp index f29ec8876..f29ec8876 100644 --- a/src/mirall/syncjournalfilerecord.cpp +++ b/src/libsync/syncjournalfilerecord.cpp diff --git a/src/mirall/syncjournalfilerecord.h b/src/libsync/syncjournalfilerecord.h index 7ba8c3b45..7ba8c3b45 100644 --- a/src/mirall/syncjournalfilerecord.h +++ b/src/libsync/syncjournalfilerecord.h diff --git a/src/mirall/syncresult.cpp b/src/libsync/syncresult.cpp index b10a1a459..ecfec53e6 100644 --- a/src/mirall/syncresult.cpp +++ b/src/libsync/syncresult.cpp @@ -12,7 +12,7 @@ * for more details. */ -#include "mirall/syncresult.h" +#include "syncresult.h" namespace Mirall { diff --git a/src/mirall/syncresult.h b/src/libsync/syncresult.h index 3350eda72..9d2e58881 100644 --- a/src/mirall/syncresult.h +++ b/src/libsync/syncresult.h @@ -20,7 +20,7 @@ #include <QDateTime> #include "owncloudlib.h" -#include "mirall/syncfileitem.h" +#include "syncfileitem.h" namespace Mirall { diff --git a/src/mirall/theme.cpp b/src/libsync/theme.cpp index f69d327ab..cfa7cd53a 100644 --- a/src/mirall/theme.cpp +++ b/src/libsync/theme.cpp @@ -21,7 +21,7 @@ #include <QtGui> #endif -#include "mirall/owncloudtheme.h" +#include "owncloudtheme.h" #ifdef THEME_INCLUDE # define QUOTEME(M) #M diff --git a/src/mirall/theme.h b/src/libsync/theme.h index 7f8166e6c..0d96171b8 100644 --- a/src/mirall/theme.h +++ b/src/libsync/theme.h @@ -15,7 +15,7 @@ #ifndef _THEME_H #define _THEME_H -#include "mirall/syncresult.h" +#include "syncresult.h" class QIcon; diff --git a/src/mirall/utility.cpp b/src/libsync/utility.cpp index 1b4956fc9..2bf470f29 100644 --- a/src/mirall/utility.cpp +++ b/src/libsync/utility.cpp @@ -14,7 +14,7 @@ #include "utility.h" -#include "mirall/version.h" +#include "version.h" #include <QCoreApplication> #include <QSettings> @@ -43,11 +43,11 @@ #include <stdarg.h> #if defined(Q_OS_WIN) -#include "mirall/utility_win.cpp" +#include "utility_win.cpp" #elif defined(Q_OS_MAC) -#include "mirall/utility_mac.cpp" +#include "utility_mac.cpp" #else -#include "mirall/utility_unix.cpp" +#include "utility_unix.cpp" #endif namespace Mirall { diff --git a/src/mirall/utility.h b/src/libsync/utility.h index 0d46146b9..0d46146b9 100644 --- a/src/mirall/utility.h +++ b/src/libsync/utility.h diff --git a/src/mirall/utility_mac.cpp b/src/libsync/utility_mac.cpp index a71bbd79a..a71bbd79a 100644 --- a/src/mirall/utility_mac.cpp +++ b/src/libsync/utility_mac.cpp diff --git a/src/mirall/utility_unix.cpp b/src/libsync/utility_unix.cpp index df90ed37e..df90ed37e 100644 --- a/src/mirall/utility_unix.cpp +++ b/src/libsync/utility_unix.cpp diff --git a/src/mirall/utility_win.cpp b/src/libsync/utility_win.cpp index 90aac54d7..90aac54d7 100644 --- a/src/mirall/utility_win.cpp +++ b/src/libsync/utility_win.cpp diff --git a/src/mirall/version.h.in b/src/libsync/version.h.in index 29740f11a..29740f11a 100644 --- a/src/mirall/version.h.in +++ b/src/libsync/version.h.in diff --git a/test/manual/favlink/main.cpp b/test/manual/favlink/main.cpp index 8e0c6d202..992eb7e21 100644 --- a/test/manual/favlink/main.cpp +++ b/test/manual/favlink/main.cpp @@ -10,7 +10,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -#include "../../../src/mirall/utility.h" +#include "../../../src/utility.h" #include <QDir> diff --git a/test/testfolderwatcher.h b/test/testfolderwatcher.h index f7a0dd6ca..f94a0d603 100644 --- a/test/testfolderwatcher.h +++ b/test/testfolderwatcher.h @@ -10,8 +10,8 @@ #include <QtTest> -#include "mirall/folderwatcher_linux.h" -#include "mirall/utility.h" +#include "folderwatcher_linux.h" +#include "utility.h" using namespace Mirall; diff --git a/test/testinotifywatcher.h b/test/testinotifywatcher.h index 331da8cd3..57e72ea55 100644 --- a/test/testinotifywatcher.h +++ b/test/testinotifywatcher.h @@ -9,8 +9,8 @@ #include <QtTest> -#include "mirall/folderwatcher_linux.h" -#include "mirall/utility.h" +#include "folderwatcher_linux.h" +#include "utility.h" using namespace Mirall; diff --git a/test/testutility.h b/test/testutility.h index de871741e..e49c77ff7 100644 --- a/test/testutility.h +++ b/test/testutility.h @@ -9,7 +9,7 @@ #include <QtTest> -#include "mirall/utility.h" +#include "utility.h" using namespace Mirall::Utility; |