From e1ced4ac653cd2e58da94cd521e68ec13100a7f8 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 4 May 2016 09:43:27 -0400 Subject: [PATCH] (fix) moved SOGoDirectAction from CommonUI to SOGoUI --- UI/Common/GNUmakefile | 2 -- UI/Common/UIxFolderActions.h | 2 +- UI/Common/UIxObjectActions.h | 2 +- UI/Common/UIxParentFolderActions.h | 2 +- UI/Contacts/UIxContactActions.m | 2 +- UI/Contacts/UIxContactsListActions.h | 2 +- UI/MailPartViewers/UIxMailPartICalActions.h | 2 +- UI/MailerUI/UIxMailAccountActions.h | 2 +- UI/MailerUI/UIxMailActions.h | 2 +- UI/MailerUI/UIxMailFolderActions.h | 2 +- UI/MailerUI/UIxMailListActions.h | 2 +- UI/MailerUI/UIxMailSourceView.h | 2 +- UI/PreferencesUI/UIxJSONPreferences.h | 2 +- UI/SOGoUI/GNUmakefile | 8 +++++--- UI/{Common => SOGoUI}/SOGoDirectAction.h | 0 UI/{Common => SOGoUI}/SOGoDirectAction.m | 0 UI/Scheduler/UIxAppointmentActions.h | 2 +- UI/Scheduler/UIxCalListingActions.h | 2 +- UI/Scheduler/UIxCalMainActions.h | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) rename UI/{Common => SOGoUI}/SOGoDirectAction.h (100%) rename UI/{Common => SOGoUI}/SOGoDirectAction.m (100%) diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile index 58b4cfdc4..5a3ad9b23 100644 --- a/UI/Common/GNUmakefile +++ b/UI/Common/GNUmakefile @@ -20,8 +20,6 @@ CommonUI_OBJC_FILES += \ \ UIxTopnavToolbar.m \ UIxToolbar.m \ - \ - SOGoDirectAction.m \ CommonUI_RESOURCE_FILES += \ product.plist diff --git a/UI/Common/UIxFolderActions.h b/UI/Common/UIxFolderActions.h index 495237f79..f606b3c40 100644 --- a/UI/Common/UIxFolderActions.h +++ b/UI/Common/UIxFolderActions.h @@ -30,7 +30,7 @@ @class SOGoGCSFolder; @class SOGoUserSettings; -#include "SOGoDirectAction.h" +#include @interface UIxFolderActions : SOGoDirectAction { diff --git a/UI/Common/UIxObjectActions.h b/UI/Common/UIxObjectActions.h index c0f19c04e..b9493e0eb 100644 --- a/UI/Common/UIxObjectActions.h +++ b/UI/Common/UIxObjectActions.h @@ -21,7 +21,7 @@ #ifndef UIXOBJECTACTIONS_H #define UIXOBJECTACTIONS_H -#include "SOGoDirectAction.h" +#include @class WOResponse; diff --git a/UI/Common/UIxParentFolderActions.h b/UI/Common/UIxParentFolderActions.h index 23e58483d..2a87bf4ef 100644 --- a/UI/Common/UIxParentFolderActions.h +++ b/UI/Common/UIxParentFolderActions.h @@ -21,7 +21,7 @@ #ifndef UIXPARENTFOLDERACTIONS_H #define UIXPARENTFOLDERACTIONS_H -#include "SOGoDirectAction.h" +#include @interface UIxParentFolderActions : SOGoDirectAction @end diff --git a/UI/Contacts/UIxContactActions.m b/UI/Contacts/UIxContactActions.m index 1d50d8f2b..87c5d769f 100644 --- a/UI/Contacts/UIxContactActions.m +++ b/UI/Contacts/UIxContactActions.m @@ -28,7 +28,7 @@ #import -#import +#import @interface NGVCard (SOGoActionCategory) diff --git a/UI/Contacts/UIxContactsListActions.h b/UI/Contacts/UIxContactsListActions.h index f775c6676..8813b873d 100644 --- a/UI/Contacts/UIxContactsListActions.h +++ b/UI/Contacts/UIxContactsListActions.h @@ -22,7 +22,7 @@ #ifndef __UIxContactsListActions_H__ #define __UIxContactsListActions_H__ -#import +#import @class NSDictionary; @class NSString; diff --git a/UI/MailPartViewers/UIxMailPartICalActions.h b/UI/MailPartViewers/UIxMailPartICalActions.h index 620e6075a..e4541ca5d 100644 --- a/UI/MailPartViewers/UIxMailPartICalActions.h +++ b/UI/MailPartViewers/UIxMailPartICalActions.h @@ -25,7 +25,7 @@ @class SOGoMailBodyPart; @class WOResponse; -#import +#import @interface UIxMailPartICalActions : SOGoDirectAction diff --git a/UI/MailerUI/UIxMailAccountActions.h b/UI/MailerUI/UIxMailAccountActions.h index 8f54aac89..83f4fc206 100644 --- a/UI/MailerUI/UIxMailAccountActions.h +++ b/UI/MailerUI/UIxMailAccountActions.h @@ -21,7 +21,7 @@ #ifndef UIXMAILACCOUNTACTIONS_H #define UIXMAILACCOUNTACTIONS_H -#import +#import @class WOResponse; diff --git a/UI/MailerUI/UIxMailActions.h b/UI/MailerUI/UIxMailActions.h index 7cfdecce1..53f575333 100644 --- a/UI/MailerUI/UIxMailActions.h +++ b/UI/MailerUI/UIxMailActions.h @@ -21,7 +21,7 @@ #ifndef UIXMAILACTIONS_H #define UIXMAILACTIONS_H -#import +#import @interface UIxMailActions : SOGoDirectAction @end diff --git a/UI/MailerUI/UIxMailFolderActions.h b/UI/MailerUI/UIxMailFolderActions.h index 685b1f2f1..67e9c617d 100644 --- a/UI/MailerUI/UIxMailFolderActions.h +++ b/UI/MailerUI/UIxMailFolderActions.h @@ -21,7 +21,7 @@ #ifndef UIXMAILFOLDERACTIONS_H #define UIXMAILFOLDERACTIONS_H -#import +#import @class WOResponse; diff --git a/UI/MailerUI/UIxMailListActions.h b/UI/MailerUI/UIxMailListActions.h index 2f7af144b..80e360baf 100644 --- a/UI/MailerUI/UIxMailListActions.h +++ b/UI/MailerUI/UIxMailListActions.h @@ -27,7 +27,7 @@ @class SOGoDateFormatter; @class UIxMailSizeFormatter; -#import +#import @interface UIxMailListActions : SOGoDirectAction { diff --git a/UI/MailerUI/UIxMailSourceView.h b/UI/MailerUI/UIxMailSourceView.h index 41e1757b3..8a75eb10f 100644 --- a/UI/MailerUI/UIxMailSourceView.h +++ b/UI/MailerUI/UIxMailSourceView.h @@ -21,7 +21,7 @@ #ifndef UIXMAILSOURCEVIEW_H #define UIXMAILSOURCEVIEW_H -#import +#import @interface UIxMailSourceView : SOGoDirectAction diff --git a/UI/PreferencesUI/UIxJSONPreferences.h b/UI/PreferencesUI/UIxJSONPreferences.h index 42d4353f5..77bee9685 100644 --- a/UI/PreferencesUI/UIxJSONPreferences.h +++ b/UI/PreferencesUI/UIxJSONPreferences.h @@ -21,7 +21,7 @@ #ifndef UIXJSONPREFERENCES_H #define UIXJSONPREFERENCES_H -#import +#import @interface UIxJSONPreferences : SOGoDirectAction diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile index 7ec6f08dc..5e8948055 100644 --- a/UI/SOGoUI/GNUmakefile +++ b/UI/SOGoUI/GNUmakefile @@ -17,7 +17,8 @@ libSOGoUI_HEADER_FILES += \ \ UIxJSClose.h \ UIxComponent.h \ - SOGoAptFormatter.h + SOGoAptFormatter.h \ + SOGoDirectAction.h libSOGoUI_OBJC_FILES += \ \ @@ -25,8 +26,9 @@ libSOGoUI_OBJC_FILES += \ UIxComponent.m \ UIxModuleAccessDenied.m \ SOGoAptFormatter.m \ - SOGoACLAdvisory.m \ - SOGoFolderAdvisory.m + SOGoACLAdvisory.m \ + SOGoFolderAdvisory.m \ + SOGoDirectAction.m # make diff --git a/UI/Common/SOGoDirectAction.h b/UI/SOGoUI/SOGoDirectAction.h similarity index 100% rename from UI/Common/SOGoDirectAction.h rename to UI/SOGoUI/SOGoDirectAction.h diff --git a/UI/Common/SOGoDirectAction.m b/UI/SOGoUI/SOGoDirectAction.m similarity index 100% rename from UI/Common/SOGoDirectAction.m rename to UI/SOGoUI/SOGoDirectAction.m diff --git a/UI/Scheduler/UIxAppointmentActions.h b/UI/Scheduler/UIxAppointmentActions.h index fa012e411..e20574f28 100644 --- a/UI/Scheduler/UIxAppointmentActions.h +++ b/UI/Scheduler/UIxAppointmentActions.h @@ -21,7 +21,7 @@ #ifndef UIXAPPOINTMENTACTIONS_H #define UIXAPPOINTMENTACTIONS_H -#import +#import @interface UIxAppointmentActions : SOGoDirectAction diff --git a/UI/Scheduler/UIxCalListingActions.h b/UI/Scheduler/UIxCalListingActions.h index b4aec4ffb..7a0dbbe1f 100644 --- a/UI/Scheduler/UIxCalListingActions.h +++ b/UI/Scheduler/UIxCalListingActions.h @@ -21,7 +21,7 @@ #ifndef UIXCALLISTINGACTIONVIEW_H #define UIXCALLISTINGACTIONVIEW_H -#import +#import @class NSCalendarDate; @class NSMutableDictionary; diff --git a/UI/Scheduler/UIxCalMainActions.h b/UI/Scheduler/UIxCalMainActions.h index 53fdc451a..2c69e6463 100644 --- a/UI/Scheduler/UIxCalMainActions.h +++ b/UI/Scheduler/UIxCalMainActions.h @@ -21,7 +21,7 @@ #ifndef UIXCALMAINACTIONS_H #define UIXCALMAINACTIONS_H -#import +#import @interface UIxCalMainActions : SOGoDirectAction