From d9a5bdc0327944f6697f3057db65cdddd19fa3df Mon Sep 17 00:00:00 2001
From: Adam Demasi <adam@hbang.com.au>
Date: Fri, 19 Aug 2016 17:08:01 +0930
Subject: [PATCH] [global] move all xm to x - we don't need c++ at all

---
 client/{Client.xm => Client.x}                                | 0
 ...atusBarForegroundView.xm => HBTSStatusBarForegroundView.x} | 4 ++++
 client/Makefile                                               | 2 +-
 messages/Makefile                                             | 2 +-
 ...ptRecieptsController.xm => TranscriptRecieptsController.x} | 0
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename client/{Client.xm => Client.x} (100%)
 rename client/{HBTSStatusBarForegroundView.xm => HBTSStatusBarForegroundView.x} (98%)
 rename messages/{TranscriptRecieptsController.xm => TranscriptRecieptsController.x} (100%)

diff --git a/client/Client.xm b/client/Client.x
similarity index 100%
rename from client/Client.xm
rename to client/Client.x
diff --git a/client/HBTSStatusBarForegroundView.xm b/client/HBTSStatusBarForegroundView.x
similarity index 98%
rename from client/HBTSStatusBarForegroundView.xm
rename to client/HBTSStatusBarForegroundView.x
index 39aba4f..5de5027 100644
--- a/client/HBTSStatusBarForegroundView.xm
+++ b/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
index 623a138..c96e153 100644
--- 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
index a5e519d..dbef923 100644
--- 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 b/messages/TranscriptRecieptsController.x
similarity index 100%
rename from messages/TranscriptRecieptsController.xm
rename to messages/TranscriptRecieptsController.x