mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix library build for windows, un-QOBJECTed the theme class.

Browse source
This commit is contained in:
Klaas Freitag 2012-07-12 14:33:58 +02:00
parent 973c2c1786
commit c3c8e512c8
3 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/CMakeLists.txt
View file

@ -34,8 +34,20 @@ set(libsync_SRCS
mirall/csyncthread.cpp mirall/csyncthread.cpp
mirall/fileutils.cpp mirall/fileutils.cpp
mirall/temporarydir.cpp mirall/temporarydir.cpp
mirall/theme.cpp
mirall/owncloudtheme.cpp
mirall/miralltheme.cpp
)
set(libsync_HEADERS
mirall/folderman.h
mirall/folder.h
mirall/folderwatcher.h
mirall/gitfolder.h
mirall/unisonfolder.h
mirall/csyncfolder.h
mirall/owncloudfolder.h
mirall/csyncthread.h
) )
set(libsync_HEADERS mirall/csyncfolder.h)
IF( USE_INOTIFY ) IF( USE_INOTIFY )
add_definitions( -DUSE_INOTIFY ) add_definitions( -DUSE_INOTIFY )
@ -48,6 +60,9 @@ qt4_wrap_cpp(syncMoc ${libsync_HEADERS})
add_library(mirallsync SHARED ${libsync_SRCS} ${syncMoc}) add_library(mirallsync SHARED ${libsync_SRCS} ${syncMoc})
add_library(owncloudsync SHARED ${libsync_SRCS} ${syncMoc}) add_library(owncloudsync SHARED ${libsync_SRCS} ${syncMoc})
set_target_properties( owncloudsync PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) set_target_properties( owncloudsync PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT)
target_link_libraries(mirallsync ${QT_LIBRARIES} ${CSYNC_LIBRARY} )
target_link_libraries(owncloudsync ${QT_LIBRARIES} ${CSYNC_LIBRARY} )
set(mirall_SRCS set(mirall_SRCS
mirall/application.cpp mirall/application.cpp
@ -60,26 +75,15 @@ set(mirall_SRCS
mirall/occinfo.cpp mirall/occinfo.cpp
mirall/sslerrordialog.cpp mirall/sslerrordialog.cpp
mirall/logbrowser.cpp mirall/logbrowser.cpp
mirall/theme.cpp
mirall/owncloudtheme.cpp
mirall/miralltheme.cpp
) )
set(mirall_HEADERS set(mirall_HEADERS
mirall/application.h mirall/application.h
mirall/folder.h
mirall/folderman.h
mirall/folderwatcher.h
mirall/folderwizard.h mirall/folderwizard.h
mirall/gitfolder.h
mirall/owncloudfolder.h
mirall/owncloudinfo.h mirall/owncloudinfo.h
mirall/owncloudsetupwizard.h mirall/owncloudsetupwizard.h
mirall/owncloudwizard.h mirall/owncloudwizard.h
mirall/statusdialog.h mirall/statusdialog.h
mirall/unisonfolder.h
mirall/theme.h
mirall/csyncthread.h
mirall/updatedetector.h mirall/updatedetector.h
mirall/sslerrordialog.h mirall/sslerrordialog.h
mirall/logbrowser.h mirall/logbrowser.h

15
src/mirall/theme.cpp
View file

@ -21,7 +21,6 @@
namespace Mirall { namespace Mirall {
Theme::Theme() Theme::Theme()
:QObject()
{ {
} }
@ -32,25 +31,25 @@ QString Theme::statusHeaderText( SyncResult::Status status ) const
switch( status ) { switch( status ) {
case SyncResult::Undefined: case SyncResult::Undefined:
resultStr = tr("Status undefined"); resultStr = QObject::tr("Status undefined");
break; break;
case SyncResult::NotYetStarted: case SyncResult::NotYetStarted:
resultStr = tr("Waiting to start sync"); resultStr = QObject::tr("Waiting to start sync");
break; break;
case SyncResult::SyncRunning: case SyncResult::SyncRunning:
resultStr = tr("Sync is running"); resultStr = QObject::tr("Sync is running");
break; break;
case SyncResult::Success: case SyncResult::Success:
resultStr = tr("Sync Success"); resultStr = QObject::tr("Sync Success");
break; break;
case SyncResult::Error: case SyncResult::Error:
resultStr = tr("Sync Error - Click info button for details."); resultStr = QObject::tr("Sync Error - Click info button for details.");
break; break;
case SyncResult::SetupError: case SyncResult::SetupError:
resultStr = tr( "Setup Error" ); resultStr = QObject::tr( "Setup Error" );
break; break;
default: default:
resultStr = tr("Status undefined"); resultStr = QObject::tr("Status undefined");
} }
return resultStr; return resultStr;
} }

3
src/mirall/theme.h
View file

@ -27,9 +27,8 @@ namespace Mirall {
class SyncResult; class SyncResult;
class Theme : public QObject class Theme
{ {
Q_OBJECT
public: public:
Theme(); Theme();