cleanup: better project hierarchy
- adapt file names to match our convention
- sort code in subgroups (no more Sources and Headers groups)
Refs #71037
Change-Id: I585b85b9ba8f86407efc9127f29010117b5ee674
diff --git a/src/ConversationsViewController.h b/src/ConversationsVC.h
similarity index 94%
rename from src/ConversationsViewController.h
rename to src/ConversationsVC.h
index 09d4e3b..af8843d 100644
--- a/src/ConversationsViewController.h
+++ b/src/ConversationsVC.h
@@ -33,7 +33,7 @@
#import <Cocoa/Cocoa.h>
#import "QNSTreeController.h"
-@interface ConversationsViewController : NSViewController <NSOutlineViewDelegate> {
+@interface ConversationsVC : NSViewController <NSOutlineViewDelegate> {
}
diff --git a/src/ConversationsViewController.mm b/src/ConversationsVC.mm
similarity index 97%
rename from src/ConversationsViewController.mm
rename to src/ConversationsVC.mm
index 4b7ce22..c7dabad 100644
--- a/src/ConversationsViewController.mm
+++ b/src/ConversationsVC.mm
@@ -27,7 +27,7 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-#import "ConversationsViewController.h"
+#import "ConversationsVC.h"
#import <callmodel.h>
#import <QtCore/qitemselectionmodel.h>
@@ -36,7 +36,7 @@
#define COLUMNID_CONVERSATIONS @"ConversationsColumn" // the single column name in our outline view
-@interface ConversationsViewController ()
+@interface ConversationsVC ()
@property CurrentCallVC* currentVC;
@property (assign) IBOutlet NSView *currentCallView;
@@ -45,7 +45,7 @@
@end
-@implementation ConversationsViewController
+@implementation ConversationsVC
@synthesize conversationsView;
@synthesize treeController;
@synthesize currentVC;
diff --git a/src/HistoryViewController.h b/src/HistoryVC.h
similarity index 94%
rename from src/HistoryViewController.h
rename to src/HistoryVC.h
index 4c4dbea..fe6b7b4 100644
--- a/src/HistoryViewController.h
+++ b/src/HistoryVC.h
@@ -32,7 +32,7 @@
#import <Cocoa/Cocoa.h>
-@interface HistoryViewController : NSViewController <NSOutlineViewDelegate> {
+@interface HistoryVC : NSViewController <NSOutlineViewDelegate> {
}
diff --git a/src/HistoryViewController.mm b/src/HistoryVC.mm
similarity index 98%
rename from src/HistoryViewController.mm
rename to src/HistoryVC.mm
index 60d05b0..4073320 100644
--- a/src/HistoryViewController.mm
+++ b/src/HistoryVC.mm
@@ -27,7 +27,7 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-#import "HistoryViewController.h"
+#import "HistoryVC.h"
#import <categorizedhistorymodel.h>
#import <QSortFilterProxyModel>
@@ -42,14 +42,14 @@
#define COLUMNID_CONTACTMETHOD @"ContactMethodColumn" // the single column name in our outline view
#define COLUMNID_DATE @"DateColumn" // the single column name in our outline view
-@interface HistoryViewController()
+@interface HistoryVC()
@property NSTreeController *treeController;
@property (assign) IBOutlet NSOutlineView *historyView;
@property QSortFilterProxyModel *historyProxyModel;
@end
-@implementation HistoryViewController
+@implementation HistoryVC
@synthesize treeController;
@synthesize historyView;
@synthesize historyProxyModel;
diff --git a/src/PreferencesViewController.h b/src/PreferencesVC.h
similarity index 96%
rename from src/PreferencesViewController.h
rename to src/PreferencesVC.h
index ac0400c..583e2e5 100644
--- a/src/PreferencesViewController.h
+++ b/src/PreferencesVC.h
@@ -32,7 +32,7 @@
#import <Cocoa/Cocoa.h>
-@interface PreferencesViewController : NSViewController <NSToolbarDelegate>
+@interface PreferencesVC : NSViewController <NSToolbarDelegate>
- (void) close;
@property (nonatomic, assign) NSViewController *currentVC;
diff --git a/src/PreferencesViewController.mm b/src/PreferencesVC.mm
similarity index 98%
rename from src/PreferencesViewController.mm
rename to src/PreferencesVC.mm
index 5ccde7a..ebc4991 100644
--- a/src/PreferencesViewController.mm
+++ b/src/PreferencesVC.mm
@@ -27,7 +27,7 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-#import "PreferencesViewController.h"
+#import "PreferencesVC.h"
#import <QuartzCore/QuartzCore.h>
@@ -39,13 +39,13 @@
#import "AudioPrefsVC.h"
#import "VideoPrefsVC.h"
-@interface PreferencesViewController ()
+@interface PreferencesVC ()
@property NSButton* toggleAdvancedSettings;
@end
-@implementation PreferencesViewController
+@implementation PreferencesVC
@synthesize toggleAdvancedSettings;
static NSString* const kProfilePrefsIdentifier = @"ProfilesPrefsIdentifier";
diff --git a/src/RingWindowController.h b/src/RingWindowController.h
index 77c93c4..86b104b 100644
--- a/src/RingWindowController.h
+++ b/src/RingWindowController.h
@@ -31,14 +31,14 @@
#define RINGWINDOWCONTROLLER_H
#import <Cocoa/Cocoa.h>
-#import "HistoryViewController.h"
-#import "PreferencesViewController.h"
+#import "HistoryVC.h"
+#import "PreferencesVC.h"
@interface RingWindowController : NSWindowController <NSToolbarDelegate, NSTextFieldDelegate>{
IBOutlet NSView *currentView;
}
@property (nonatomic, assign) NSViewController *myCurrentViewController;
-@property PreferencesViewController* preferencesViewController;
+@property PreferencesVC* preferencesViewController;
- (IBAction)openPreferences:(id)sender;
- (IBAction)closePreferences:(NSToolbarItem *)sender;
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index f46bf66..48a5c0c 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -62,7 +62,7 @@
}
NSToolbar* tb = [[NSToolbar alloc] initWithIdentifier: @"PreferencesToolbar"];
- self.preferencesViewController = [[PreferencesViewController alloc] initWithNibName:@"PreferencesScreen" bundle:nil];
+ self.preferencesViewController = [[PreferencesVC alloc] initWithNibName:@"PreferencesScreen" bundle:nil];
self.myCurrentViewController = self.preferencesViewController;
NSLayoutConstraint* test = [NSLayoutConstraint constraintWithItem:self.preferencesViewController.view