Add travis file

Conflicts:
	src/CMakeLists.txt
	src/gui/accountsettings.cpp
	src/gui/folderwizard.cpp
	src/gui/settingsdialog.cpp
	src/libsync/syncengine.h

.travis.yml

@@ -0,0 +1,35 @@
+language: cpp
+
+compiler: 
+  - gcc
+  - clang
+
+env:
+  - QT=qt4
+  - QT=qt5 PATH=/opt/Qt/5.3/gcc_64/bin:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
+
+os:
+  - linux
+  - osx
+
+before_install:
+  - sh -c "if [ '$QT' = 'qt4' ]; then wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key; sudo apt-key add - < Release.key; fi"
+  - sudo sh -c "if [ '$QT' = 'qt4' ]; then echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' > /etc/apt/sources.list.d/qtkeychain.list; fi"
+  - sh -c "if [ '$QT' = 'qt4' ]; then sudo apt-get update -qq; sudo apt-get install -qq libqt4-dev qt4-dev-tools libqtkeychain-dev; fi"
+  - sh -c "if [ '$QT' = 'qt5' ]; then sudo apt-add-repository -y ppa:canonical-qt5-edgers/qt5-daily; sudo apt-get update -qq; sudo apt-get install -qq qtdeclarative5-dev libqt5webkit5-dev qttools5-dev; fi"
+  - sh -c "if [ '$QT' = 'qt5' ]; then wget http://download.opensuse.org/repositories/home:/DeepDiver1975:/branches:/isv:/ownCloud:/desktop/xUbuntu_13.10/Release.key; sudo apt-key add - < Release.key; fi"
+  - sudo sh -c "if [ '$QT' = 'qt5' ]; then echo 'deb http://download.opensuse.org/repositories/home:/DeepDiver1975:/branches:/isv:/ownCloud:/desktop/xUbuntu_13.10/ /' > /etc/apt/sources.list.d/qt5keychain.list; fi"
+  - sh -c "if [ '$QT' = 'qt5' ]; then wget http://download.owncloud.com/download/qt-5.3-travis.tar.xz; fi"
+  - sh -c "if [ '$QT' = 'qt5' ]; then sudo tar xif -C /opt ~/qt-5.3-travis.tar.xz; fi"
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq cmake sqlite3 libneon27-gnutls-dev
+
+before_script:
+  - mkdir build
+  - cd build
+  - cmake -DUNIT_TESTING=1 ..
+
+script: 
+  - make
+  - ctest --output-on-failure
+

CMakeLists.txt

@@ -20,7 +20,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/")
 
 #####
@@ -62,9 +61,9 @@ set(DATADIR ${DATA_INSTALL_DIR})
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
 if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
     set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
-    set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
-    set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
-    set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(OWNCLOUD_OSX_BUNDLE "bin/${APPLICATION_EXECUTABLE}.app")
+    set(LIB_INSTALL_DIR "bin/${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(BIN_INSTALL_DIR "bin/${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
 
 # BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
 elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)

admin/win/nsi/l10n/Swedish.nsh

@@ -15,6 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "Avinstallera ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstallera ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Välj underhålls alternativ att utföra."
 StrCpy $SEC_APPLICATION_DETAILS "Installerar ${APPLICATION_NAME} väsentligheter."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Statusikoner för Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installerar statusikoner för Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start-meny program genväg"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lägger till genväg för ${APPLICATION_NAME} till Start-menyn."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrivbordsgenväg"
@@ -42,5 +44,3 @@ StrCpy $INIT_INSTALLER_RUNNING "Installationsprogrammet körs redan."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörs rättigheter, försök igen"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"

cmake/modules/NSIS.template.in

@@ -384,10 +384,10 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
    File "${BUILD_PATH}\bin\${APPLICATION_CMD_EXECUTABLE}"
    File "${BUILD_PATH}\bin\socketapiclient.exe"
-   File "${BUILD_PATH}\src\lib${APPLICATION_SHORTNAME}sync.dll"
+   File "${BUILD_PATH}\src\libsync\lib${APPLICATION_SHORTNAME}sync.dll"
    File "${BUILD_PATH}\csync\src\libocsync.dll"
 
-   File "${BUILD_PATH}\src\mirall_*.qm"
+   File "${BUILD_PATH}\src\gui\mirall_*.qm"
    ; Make sure only to copy qt, not qt_help, etc
    File "${MING_SHARE}\qt5\translations\qt_??.qm"
    File "${MING_SHARE}\qt5\translations\qt_??_??.qm"

src/CMakeLists.txt

@@ -1,456 +1,25 @@
-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
-        3rdparty/qtmacgoodies/src/macwindow.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/authenticationdialog.cpp
-    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
-    mirall/discoveryphase.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/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
-    mirall/selectivesyncdialog.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)
+if (NOT BUILD_LIBRARIES_ONLY)
+    add_subdirectory(gui)
+    add_subdirectory(cmd)
+endif(NOT BUILD_LIBRARIES_ONLY)
 
 find_program(KRAZY2_EXECUTABLE krazy2)
 if(KRAZY2_EXECUTABLE)
     # s/y k/y ALL k/ for building this target always
     add_custom_target( krazy krazy2 --check-sets c++,qt4,foss
-                       ${PROJECT_SOURCE_DIR}/src/mirall/*.ui
-                       ${PROJECT_SOURCE_DIR}/src/mirall/*.h
-                       ${PROJECT_SOURCE_DIR}/src/mirall/*.cpp
+                       ${PROJECT_SOURCE_DIR}/src/libsync/*.ui
+                       ${PROJECT_SOURCE_DIR}/src/libsync/*.h
+                       ${PROJECT_SOURCE_DIR}/src/libsync/*.cpp
+                       ${PROJECT_SOURCE_DIR}/src/gui/*.ui
+                       ${PROJECT_SOURCE_DIR}/src/gui/*.h
+                       ${PROJECT_SOURCE_DIR}/src/gui/*.cpp
+                       ${PROJECT_SOURCE_DIR}/src/cmd/*.h
+                       ${PROJECT_SOURCE_DIR}/src/cmd/*.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()

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
+                   )
+include_directories(${NEON_INCLUDE_DIRS})
+
+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)
+    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()
+

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);

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() {
     }

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)

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;

src/gui/CMakeLists.txt

@@ -0,0 +1,254 @@
+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
+    selectivesyncdialog.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(${NEON_INCLUDE_DIRS})
+
+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)
+
+    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()
+    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()
+
+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 "."
+ )
+
+
+#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)
+    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()
+

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 "selectivesyncdialog.h"
 #include "creds/abstractcredentials.h"
 
@@ -40,7 +40,7 @@
 #include <QIcon>
 #include <QVariant>
 
-#include "mirall/account.h"
+#include "account.h"
 
 namespace Mirall {
 

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;

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"

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;

src/gui/cocoainitializer_mac.mm

@@ -11,7 +11,7 @@
  * for more details.
  */
 
-#include "mirall/cocoainitializer.h"
+#include "cocoainitializer.h"
 
 #import <Foundation/NSAutoreleasePool.h>
 #import <AppKit/NSApplication.h>

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"
 

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>
 

src/gui/folderman.cpp

@@ -12,12 +12,12 @@
  * for more details.
  */
 
-#include "mirall/folderman.h"
-#include "mirall/mirallconfigfile.h"
-#include "mirall/folder.h"
-#include "mirall/syncresult.h"
-#include "mirall/theme.h"
-#include "mirall/socketapi.h"
+#include "folderman.h"
+#include "mirallconfigfile.h"
+#include "folder.h"
+#include "syncresult.h"
+#include "theme.h"
+#include "socketapi.h"
 
 #include <neon/ne_socket.h>
 

src/gui/folderman.h

@@ -21,9 +21,9 @@
 #include <QList>
 #include <QPointer>
 
-#include "mirall/folder.h"
-#include "mirall/folderwatcher.h"
-#include "mirall/syncfileitem.h"
+#include "folder.h"
+#include "folderwatcher.h"
+#include "syncfileitem.h"
 
 class QSignalMapper;
 

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>

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
 
 

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>

src/gui/folderwatcher_linux.h

@@ -20,7 +20,7 @@
 #include <QHash>
 #include <QDir>
 
-#include "mirall/folderwatcher.h"
+#include "folderwatcher.h"
 
 namespace Mirall
 {

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>

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>

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>

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 "selectivesyncdialog.h"
 
 #include <QDebug>

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"

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"

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 {
 

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"
 

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>
 

src/gui/owncloudgui.cpp

@@ -11,23 +11,23 @@
  * 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 "macwindow.h" // qtmacgoodies
 #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"
 

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>

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"

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"
 

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"

src/gui/protocolwidget.h

@@ -18,7 +18,7 @@
 #include <QDateTime>
 #include <QLocale>
 
-#include "mirall/progressdispatcher.h"
+#include "progressdispatcher.h"
 
 #include "ui_protocolwidget.h"
 

src/gui/settingsdialog.cpp

@@ -14,14 +14,15 @@
 #include "settingsdialog.h"
 #include "ui_settingsdialog.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>

src/gui/settingsdialog.h

@@ -17,7 +17,7 @@
 #include <QDialog>
 #include <QStyledItemDelegate>
 
-#include "mirall/progressdispatcher.h"
+#include "progressdispatcher.h"
 
 class QStandardItemModel;
 class QListWidgetItem;

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>

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;

src/gui/socketapi.cpp

@@ -13,15 +13,15 @@
  * for more details.
  */
 
-#include "mirall/socketapi.h"
+#include "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 "mirallconfigfile.h"
+#include "folderman.h"
+#include "folder.h"
+#include "utility.h"
+#include "theme.h"
+#include "syncjournalfilerecord.h"
+#include "syncfileitem.h"
 
 #include <QDebug>
 #include <QUrl>

src/gui/socketapi.h

@@ -24,7 +24,7 @@ extern "C" {
 #include <QTcpSocket>
 #include <QTcpServer>
 
-#include "mirall/syncfileitem.h"
+#include "syncfileitem.h"
 
 class QUrl;
 class QLocalSocket;

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);
     }

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>

src/gui/sslerrordialog.h

@@ -19,7 +19,7 @@
 #include <QSslCertificate>
 #include <QList>
 
-#include "mirall/account.h"
+#include "account.h"
 
 class QSslError;
 class QSslCertificate;

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>
 

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;

src/gui/systray.cpp

@@ -13,7 +13,7 @@
  */
 
 #include "systray.h"
-#include "mirall/theme.h"
+#include "theme.h"
 
 #ifdef USE_FDO_NOTIFICATIONS
 #include <QDBusConnection>

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()
+

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"
 

src/gui/updater/sparkleupdater_mac.mm

@@ -19,7 +19,8 @@
 
 #include "updater/sparkleupdater.h"
 
-#include "mirall/utility.h"
+#include "utility.h"
+
 #include <QDebug>
 
 // Does not work yet

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"
 

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"

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

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"

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
 {

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"