diff --git a/Tools/SOGoToolBackup.h b/Tools/SOGoToolBackup.h deleted file mode 100644 index bce547928..000000000 --- a/Tools/SOGoToolBackup.h +++ /dev/null @@ -1,36 +0,0 @@ -/* SOGoToolBackup.h - this file is part of SOGo - * - * Copyright (C) 2009 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef SOGOTOOLBACKUP_H -#define SOGOTOOLBACKUP_H - -#import "SOGoTool.h" - -@interface SOGoToolBackup : SOGoTool -{ - NSString *directory; - NSArray *userIDs; -} - -@end - -#endif /* SOGOTOOLBACKUP_H */ diff --git a/Tools/SOGoToolBackup.m b/Tools/SOGoToolBackup.m index 2b76824d6..81a68f1ce 100644 --- a/Tools/SOGoToolBackup.m +++ b/Tools/SOGoToolBackup.m @@ -42,7 +42,7 @@ #import #import -#import "SOGoToolBackup.h" +#import "SOGoTool.h" /* TODO: - handle database connectivity errors @@ -50,6 +50,14 @@ - allow more than one user specifier on the command-line */ +@interface SOGoToolBackup : SOGoTool +{ + NSString *directory; + NSArray *userIDs; +} + +@end + @implementation SOGoToolBackup + (NSString *) command diff --git a/Tools/SOGoToolCheckDoubles.h b/Tools/SOGoToolCheckDoubles.h deleted file mode 100644 index a8e44140f..000000000 --- a/Tools/SOGoToolCheckDoubles.h +++ /dev/null @@ -1,35 +0,0 @@ -/* SOGoToolCheckDoubles.h - this file is part of SOGo - * - * Copyright (C) 2009 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef SOGOTOOLCHECKDOUBLES_H -#define SOGOTOOLCHECKDOUBLES_H - -#import "SOGoTool.h" - -@interface SOGoToolCheckDoubles : SOGoTool -{ - unsigned int warningLimit; -} - -@end - -#endif /* SOGOTOOLCHECKDOUBLES_H */ diff --git a/Tools/SOGoToolCheckDoubles.m b/Tools/SOGoToolCheckDoubles.m index 17c9964fc..75c8263c5 100644 --- a/Tools/SOGoToolCheckDoubles.m +++ b/Tools/SOGoToolCheckDoubles.m @@ -37,7 +37,14 @@ #import #import -#import "SOGoToolCheckDoubles.h" +#import "SOGoTool.h" + +@interface SOGoToolCheckDoubles : SOGoTool +{ + unsigned int warningLimit; +} + +@end @implementation SOGoToolCheckDoubles diff --git a/Tools/SOGoToolRemoveDoubles.h b/Tools/SOGoToolRemoveDoubles.h deleted file mode 100644 index ad83f666a..000000000 --- a/Tools/SOGoToolRemoveDoubles.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SOGoToolRemoveDoubles.h - this file is part of SOGo - * - * Copyright (C) 2009 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef SOGOTOOLREMOVEDOUBLES_H -#define SOGOTOOLREMOVEDOUBLES_H - -#import "SOGoTool.h" - -@interface SOGoToolRemoveDoubles : SOGoTool - -@end - -#endif /* SOGOTOOLREMOVEDOUBLES_H */ diff --git a/Tools/SOGoToolRemoveDoubles.m b/Tools/SOGoToolRemoveDoubles.m index b5aa8a1fb..b268177e9 100644 --- a/Tools/SOGoToolRemoveDoubles.m +++ b/Tools/SOGoToolRemoveDoubles.m @@ -46,7 +46,7 @@ #import #import -#import "SOGoToolRemoveDoubles.h" +#import "SOGoTool.h" @interface NGVList (RemoveDoubles) @@ -74,6 +74,9 @@ @end +@interface SOGoToolRemoveDoubles : SOGoTool +@end + @implementation SOGoToolRemoveDoubles + (NSString *) command diff --git a/Tools/SOGoToolRestore.h b/Tools/SOGoToolRestore.h deleted file mode 100644 index c86a39696..000000000 --- a/Tools/SOGoToolRestore.h +++ /dev/null @@ -1,46 +0,0 @@ -/* SOGoToolRestore.h - this file is part of SOGo - * - * Copyright (C) 2009 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef SOGOTOOLRESTORE_H -#define SOGOTOOLRESTORE_H - -#import "SOGoTool.h" - -typedef enum SOGoToolRestoreMode { - SOGoToolRestoreFolderMode, - SOGoToolRestoreFolderDestructiveMode, - SOGoToolRestoreListFoldersMode, - SOGoToolRestorePreferencesMode -} SOGoToolRestoreMode; - -@interface SOGoToolRestore : SOGoTool -{ - NSString *directory; - NSString *userID; - NSString *restoreFolder; - BOOL destructive; /* destructive mode not handled */ - SOGoToolRestoreMode restoreMode; -} - -@end - -#endif /* SOGOTOOLRESTORE_H */ diff --git a/Tools/SOGoToolRestore.m b/Tools/SOGoToolRestore.m index 2cc24a953..21205c1c9 100644 --- a/Tools/SOGoToolRestore.m +++ b/Tools/SOGoToolRestore.m @@ -42,7 +42,7 @@ #import #import -#import "SOGoToolRestore.h" +#import "SOGoTool.h" /* TODO: - respond to "--help restore" @@ -51,7 +51,23 @@ - write methods in GDLContentStore to get/update displayname and storing roles */ -#import +typedef enum SOGoToolRestoreMode { + SOGoToolRestoreFolderMode, + SOGoToolRestoreFolderDestructiveMode, + SOGoToolRestoreListFoldersMode, + SOGoToolRestorePreferencesMode +} SOGoToolRestoreMode; + +@interface SOGoToolRestore : SOGoTool +{ + NSString *directory; + NSString *userID; + NSString *restoreFolder; + BOOL destructive; /* destructive mode not handled */ + SOGoToolRestoreMode restoreMode; +} + +@end @implementation SOGoToolRestore