From f5b90dae47e5f1c76a3a2a039863ac39be810e6b Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@gmail.com>
Date: Fri, 20 Mar 2015 18:13:54 -0400
Subject: [PATCH] cosmetics: remove log and unused objects
Refs #67102
Change-Id: Ib9db6e5b062b04abbe4ce6e4a98ce1ff12e00167
---
AccRing.xib | 1 -
AppDelegate.h | 5 -----
CurrentCall.xib | 1 -
CurrentCallVC.mm | 5 -----
GeneralPrefsVC.h | 4 +++-
GeneralPrefsVC.mm | 5 +----
HistoryViewController.mm | 1 -
MainMenu.xib | 2 +-
MinimalHistoryBackend.mm | 1 -
QNSTreeController.mm | 14 +++-----------
RingWindow.xib | 3 ---
RingWindowController.mm | 8 --------
12 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/AccRing.xib b/AccRing.xib
index 89cfff07..f29b09de 100644
--- a/AccRing.xib
+++ b/AccRing.xib
@@ -9,7 +9,6 @@
<connections>
<outlet property="aliasTextField" destination="D7f-4A-xXM" id="i9Y-jZ-iWM"/>
<outlet property="autoAnswerButton" destination="6uh-UC-6i9" id="6e1-1I-OY3"/>
- <outlet property="boostrapField" destination="phb-wW-DQS" id="61p-oU-ZOv"/>
<outlet property="bootstrapField" destination="phb-wW-DQS" id="kcY-7z-bjM"/>
<outlet property="hashField" destination="c6M-WV-uVk" id="Jhb-0k-sBc"/>
<outlet property="typeLabel" destination="vov-vT-UPq" id="cy7-xb-0xG"/>
diff --git a/AppDelegate.h b/AppDelegate.h
index 3513a3dc..303ed551 100644
--- a/AppDelegate.h
+++ b/AppDelegate.h
@@ -38,11 +38,6 @@
@interface AppDelegate : NSObject <NSApplicationDelegate>
@property RingWindowController* ringWindowController;
-@property PreferencesWindowController* preferencesWindowController;
-
-+ (void)restoreWindowWithIdentifier:(NSString *)identifier
- state:(NSCoder *)state
- completionHandler:(void (^)(NSWindow *, NSError *))completionHandler;
@end
diff --git a/CurrentCall.xib b/CurrentCall.xib
index 70b804d0..3eb80250 100644
--- a/CurrentCall.xib
+++ b/CurrentCall.xib
@@ -7,7 +7,6 @@
<customObject id="-2" userLabel="File's Owner" customClass="CurrentCallVC">
<connections>
<outlet property="controlsPanel" destination="Eoi-B8-iL6" id="4xn-3b-SNn"/>
- <outlet property="coucou" destination="bg3-hB-nE8" id="BU2-jT-bfz"/>
<outlet property="hangUpButton" destination="Kjq-iM-NBL" id="Puz-4L-Okl"/>
<outlet property="holdOnOffButton" destination="anb-Y8-JQi" id="HSl-pE-Kwg"/>
<outlet property="personLabel" destination="bg3-hB-nE8" id="t6l-1B-JxI"/>
diff --git a/CurrentCallVC.mm b/CurrentCallVC.mm
index 404e75a8..42b57298 100644
--- a/CurrentCallVC.mm
+++ b/CurrentCallVC.mm
@@ -98,9 +98,6 @@
@synthesize previewHolder;
@synthesize videoHolder;
-
-
-
- (void) updateActions
{
for(int i = 0 ; i <= CallModel::instance()->userActionModel()->rowCount() ; i++) {
@@ -169,8 +166,6 @@
//actionHash[ (int)UserActionModel::Action::MUTE_AUDIO ] = action_mute_capture;
//actionHash[ (int)UserActionModel::Action::SERVER_TRANSFER ] = action_transfer;
-
-
videoLayer = [CALayer layer];
[videoView setWantsLayer:YES];
[videoView setLayer:videoLayer];
diff --git a/GeneralPrefsVC.h b/GeneralPrefsVC.h
index cffd689d..a0e496bf 100644
--- a/GeneralPrefsVC.h
+++ b/GeneralPrefsVC.h
@@ -32,7 +32,9 @@
#import <Cocoa/Cocoa.h>
-@interface GeneralPrefsVC : NSViewController
+@interface GeneralPrefsVC : NSViewController {
+
+}
@end
diff --git a/GeneralPrefsVC.mm b/GeneralPrefsVC.mm
index b74990c8..e5ea5280 100644
--- a/GeneralPrefsVC.mm
+++ b/GeneralPrefsVC.mm
@@ -33,11 +33,8 @@
@end
-@implementation GeneralPrefsVC
+@implementation GeneralPrefsVC {
-- (void)viewDidLoad {
- [super viewDidLoad];
- // Do view setup here.
}
@end
diff --git a/HistoryViewController.mm b/HistoryViewController.mm
index f33e57f9..336e1837 100644
--- a/HistoryViewController.mm
+++ b/HistoryViewController.mm
@@ -76,7 +76,6 @@
[historyView setDoubleAction:@selector(placeCall:)];
NSInteger idx = [historyView columnWithIdentifier:COLUMNID_DAY];
- [[[[self.historyView tableColumns] objectAtIndex:idx] headerCell] setStringValue:@"Name"];
CategorizedHistoryModel::instance()->addCollection<MinimalHistoryBackend>(LoadOptions::FORCE_ENABLED);
diff --git a/MainMenu.xib b/MainMenu.xib
index a959effb..276dc831 100644
--- a/MainMenu.xib
+++ b/MainMenu.xib
@@ -122,7 +122,7 @@
</object>
<object class="NSMenuItem" id="755159360">
<reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Hide test-mac</string>
+ <string key="NSTitle">Hide Ring</string>
<string key="NSKeyEquiv">h</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
diff --git a/MinimalHistoryBackend.mm b/MinimalHistoryBackend.mm
index 00ce09b0..4581cb50 100644
--- a/MinimalHistoryBackend.mm
+++ b/MinimalHistoryBackend.mm
@@ -239,7 +239,6 @@ CollectionInterface::SupportedFeatures MinimalHistoryBackend::supportedFeatures(
bool MinimalHistoryBackend::clear()
{
- /* TODO: insert confirm dialog? */
QFile::remove(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/') + "history.ini");
return true;
}
diff --git a/QNSTreeController.mm b/QNSTreeController.mm
index 6c1dd9e9..75533c25 100644
--- a/QNSTreeController.mm
+++ b/QNSTreeController.mm
@@ -134,14 +134,6 @@
}
);
- QObject::connect(self->privateQModel,
- &QAbstractItemModel::rowsAboutToBeRemoved,
- [=](const QModelIndex & parent, int first, int last) {
- NSLog(@"rows about to be removed");
-
- }
- );
-
QObject::connect(self->privateQModel,
&QAbstractItemModel::rowsAboutToBeRemoved,
[=](const QModelIndex & parent, int first, int last) {
@@ -152,7 +144,7 @@
QObject::connect(self->privateQModel,
&QAbstractItemModel::rowsRemoved,
[=](const QModelIndex & parent, int first, int last) {
- NSLog(@"rows removed");
+ //NSLog(@"rows removed");
for( int row = first; row <= last; row++) {
if(parent.isValid())
{
@@ -170,14 +162,14 @@
QObject::connect(self->privateQModel,
&QAbstractItemModel::layoutChanged,
[=]() {
- NSLog(@"layout changed");
+ //NSLog(@"layout changed");
}
);
QObject::connect(self->privateQModel,
&QAbstractItemModel::dataChanged,
[=](const QModelIndex &topLeft, const QModelIndex &bottomRight) {
- NSLog(@"data changed");
+ //NSLog(@"data changed");
for(int row = topLeft.row() ; row <= bottomRight.row() ; ++row)
{
QModelIndex tmpIdx = self->privateQModel->index(row, 0);
diff --git a/RingWindow.xib b/RingWindow.xib
index 384dad70..1c85b025 100644
--- a/RingWindow.xib
+++ b/RingWindow.xib
@@ -295,7 +295,4 @@
</connections>
</viewController>
</objects>
- <resources>
- <image name="NSActionTemplate" width="14" height="14"/>
- </resources>
</document>
diff --git a/RingWindowController.mm b/RingWindowController.mm
index c423d733..3ab4e4da 100644
--- a/RingWindowController.mm
+++ b/RingWindowController.mm
@@ -188,14 +188,6 @@ static NSString* const kCallButtonIdentifer = @"CallButtonIdentifier";
}
-
-- (IBAction)placeCall:(id)sender
-{
- Call* c = CallModel::instance()->dialingCall();
- c->setDialNumber(QString::fromNSString([callField stringValue]));
- c << Call::Action::ACCEPT;
-}
-
-(NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
{
return [NSArray arrayWithObjects:
--
GitLab