[global] move all xm to x - we don't need c++ at all

hbang · Aug 19, 2016 · d9a5bdc · d9a5bdc
1 parent 93f6af5
commit d9a5bdc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/client/Client.xm → client/Client.x b/client/Client.xm → client/Client.x
diff --git a/client/HBTSStatusBarForegroundView.xm → client/HBTSStatusBarForegroundView.x b/client/HBTSStatusBarForegroundView.xm → client/HBTSStatusBarForegroundView.x
@@ -56,18 +56,22 @@
 %end
 
 %new - (void)_typeStatus_init {
+HBLogDebug(@"a");
 	self.containerView = [[UIView alloc] init];
 	self.containerView.translatesAutoresizingMaskIntoConstraints = NO;
 	[self addSubview:self.containerView];
+	HBLogDebug(@"a");
 
 	// these UIStatusBarItems leak, but there’s not much we can do about that
 	self.iconItemView = [[%c(HBTSStatusBarIconItemView) alloc] initWithItem:[[%c(UIStatusBarItem) alloc] init] data:nil actions:kNilOptions style:self.foregroundStyle];
 	self.iconItemView.translatesAutoresizingMaskIntoConstraints = NO;
 	[self.containerView addSubview:self.iconItemView];
+	HBLogDebug(@"a");
 
 	self.contentItemView = [[%c(HBTSStatusBarContentItemView) alloc] initWithItem:[[%c(UIStatusBarItem) alloc] init] data:nil actions:kNilOptions style:self.foregroundStyle];
 	self.contentItemView.translatesAutoresizingMaskIntoConstraints = NO;
 	[self.containerView addSubview:self.contentItemView];
+	HBLogDebug(@"a");
 }
 
 %new - (void)_typeStatus_setUpLayout {

diff --git a/client/Makefile b/client/Makefile
@@ -2,7 +2,7 @@ include $(THEOS)/makefiles/common.mk
 
 TWEAK_NAME = TypeStatusClient
 
-TypeStatusClient_FILES = $(wildcard *.x) $(wildcard *.xm) $(wildcard *.m) ../global/HBTSPreferences.m
+TypeStatusClient_FILES = $(wildcard *.x) $(wildcard *.m) ../global/HBTSPreferences.m
 TypeStatusClient_FRAMEWORKS = UIKit CoreGraphics
 TypeStatusClient_EXTRA_FRAMEWORKS = Cephei
 TypeStatusClient_CFLAGS = -I../global -include ../global/Global.h -fobjc-arc

diff --git a/messages/Makefile b/messages/Makefile
@@ -1,7 +1,7 @@
 include $(THEOS)/makefiles/common.mk
 
 TWEAK_NAME = TypeStatusMessages
-TypeStatusMessages_FILES = $(wildcard *.xm) $(wildcard *.m) ../global/HBTSConversationPreferences.x
+TypeStatusMessages_FILES = $(wildcard *.m) ../global/HBTSConversationPreferences.x
 TypeStatusMessages_FRAMEWORKS = UIKit
 TypeStatusMessages_PRIVATE_FRAMEWORKS = ChatKit
 TypeStatusMessages_EXTRA_FRAMEWORKS = Cephei

diff --git a/messages/TranscriptRecieptsController.xm → messages/TranscriptRecieptsController.x b/messages/TranscriptRecieptsController.xm → messages/TranscriptRecieptsController.x