1 files changed, 54 insertions, 56 deletions
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index 105b44b..0c3127c 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -22,90 +22,88 @@ if env["SCONS_STAGE"] == "build" :
     myenv.UseFlags(env["SWIFTEN_FLAGS"])
     myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
     myenv.StaticLibrary("SwiftControllers", [
+            "AdHocController.cpp",
+            "AdHocManager.cpp",
+            "BlockListController.cpp",
             "Chat/ChatController.cpp",
             "Chat/ChatControllerBase.cpp",
+            "Chat/ChatMessageParser.cpp",
             "Chat/ChatsManager.cpp",
             "Chat/MUCController.cpp",
             "Chat/MUCSearchController.cpp",
             "Chat/UserSearchController.cpp",
-            "Chat/ChatMessageParser.cpp",
-            "ContactSuggester.cpp",
-            "MainController.cpp",
-            "ProfileController.cpp",
-            "ShowProfileController.cpp",
+            "ChatMessageSummarizer.cpp",
+            "Contact.cpp",
             "ContactEditController.cpp",
+            "ContactProvider.cpp",
+            "ContactSuggester.cpp",
+            "ContactsFromXMPPRoster.cpp",
+            "EventNotifier.cpp",
+            "EventWindowController.cpp",
             "FileTransfer/FileTransferController.cpp",
             "FileTransfer/FileTransferOverview.cpp",
             "FileTransfer/FileTransferProgressInfo.cpp",
-            "Roster/RosterController.cpp",
-            "Roster/RosterGroupExpandinessPersister.cpp",
+            "FileTransferListController.cpp",
+            "Highlighting/HighlightAction.cpp",
+            "Highlighting/HighlightEditorController.cpp",
+            "Highlighting/HighlightManager.cpp",
+            "Highlighting/Highlighter.cpp",
+            "HistoryController.cpp",
+            "HistoryViewController.cpp",
+            "MainController.cpp",
+            "PresenceNotifier.cpp",
+            "PreviousStatusStore.cpp",
+            "ProfileController.cpp",
+            "ProfileSettingsProvider.cpp",
             "Roster/ContactRosterItem.cpp",
             "Roster/GroupRosterItem.cpp",
-            "Roster/RosterItem.cpp",
             "Roster/Roster.cpp",
+            "Roster/RosterController.cpp",
+            "Roster/RosterGroupExpandinessPersister.cpp",
+            "Roster/RosterItem.cpp",
             "Roster/RosterVCardProvider.cpp",
             "Roster/TableRoster.cpp",
-            "EventWindowController.cpp",
-            "SoundEventController.cpp",
-            "SystemTrayController.cpp",
-            "XMLConsoleController.cpp",
-            "HistoryViewController.cpp",
-            "HistoryController.cpp",
-            "FileTransferListController.cpp",
-            "BlockListController.cpp",
-            "StatusTracker.cpp",
-            "PresenceNotifier.cpp",
-            "EventNotifier.cpp",
-            "AdHocManager.cpp",
-            "AdHocController.cpp",
-            "XMPPEvents/EventController.cpp",
-            "UIEvents/UIEvent.cpp",
-            "UIInterfaces/XMLConsoleWidget.cpp",
-            "UIInterfaces/ChatListWindow.cpp",
-            "UIInterfaces/HighlightEditorWindow.cpp",
-            "PreviousStatusStore.cpp",
-            "ProfileSettingsProvider.cpp",
+            "SettingConstants.cpp",
             "Settings/SettingsProviderHierachy.cpp",
             "Settings/XMLSettingsProvider.cpp",
-            "Storages/CertificateStorageFactory.cpp",
-            "Storages/CertificateStorage.cpp",
+            "ShowProfileController.cpp",
+            "SoundEventController.cpp",
+            "StatusCache.cpp",
+            "StatusTracker.cpp",
+            "StatusUtil.cpp",
+            "Storages/AvatarFileStorage.cpp",
+            "Storages/CapsFileStorage.cpp",
             "Storages/CertificateFileStorage.cpp",
             "Storages/CertificateMemoryStorage.cpp",
-            "Storages/AvatarFileStorage.cpp",
+            "Storages/CertificateStorage.cpp",
+            "Storages/CertificateStorageFactory.cpp",
             "Storages/FileStorages.cpp",
             "Storages/RosterFileStorage.cpp",
-            "Storages/CapsFileStorage.cpp",
             "Storages/VCardFileStorage.cpp",
-            "StatusUtil.cpp",
+            "SystemTrayController.cpp",
             "Translator.cpp",
-            "XMPPURIController.cpp",
-            "ChatMessageSummarizer.cpp",
-            "SettingConstants.cpp",
+            "UIEvents/UIEvent.cpp",
+            "UIInterfaces/ChatListWindow.cpp",
+            "UIInterfaces/HighlightEditorWindow.cpp",
+            "UIInterfaces/XMLConsoleWidget.cpp",
             "WhiteboardManager.cpp",
-            "StatusCache.cpp",
-            "HighlightAction.cpp",
-            "HighlightEditorController.cpp",
-            "HighlightManager.cpp",
-            "HighlightRule.cpp",
-            "Highlighter.cpp",
-            "ContactsFromXMPPRoster.cpp",
-            "ContactProvider.cpp",
-            "Contact.cpp"
+            "XMLConsoleController.cpp",
+            "XMPPEvents/EventController.cpp",
+            "XMPPURIController.cpp",
         ])
 
     env.Append(UNITTEST_SOURCES = [
-            File("Roster/UnitTest/RosterControllerTest.cpp"),
-            File("Roster/UnitTest/RosterTest.cpp"),
-            File("Roster/UnitTest/LeastCommonSubsequenceTest.cpp"),
-            File("Roster/UnitTest/TableRosterTest.cpp"),    
-            File("UnitTest/PreviousStatusStoreTest.cpp"),
-            File("UnitTest/PresenceNotifierTest.cpp"),
+            File("Chat/UnitTest/ChatMessageParserTest.cpp"),
             File("Chat/UnitTest/ChatsManagerTest.cpp"),
             File("Chat/UnitTest/MUCControllerTest.cpp"),
-            File("Chat/UnitTest/ChatMessageParserTest.cpp"),
-            File("UnitTest/MockChatWindow.cpp"),
-            File("UnitTest/ChatMessageSummarizerTest.cpp"),
+            File("Roster/UnitTest/LeastCommonSubsequenceTest.cpp"),
+            File("Roster/UnitTest/RosterControllerTest.cpp"),
+            File("Roster/UnitTest/RosterTest.cpp"),
+            File("Roster/UnitTest/TableRosterTest.cpp"),
             File("Settings/UnitTest/SettingsProviderHierachyTest.cpp"),
-            File("UnitTest/HighlightRuleTest.cpp"),
-            File("UnitTest/ContactSuggesterTest.cpp")
+            File("UnitTest/ChatMessageSummarizerTest.cpp"),
+            File("UnitTest/ContactSuggesterTest.cpp"),
+            File("UnitTest/MockChatWindow.cpp"),
+            File("UnitTest/PresenceNotifierTest.cpp"),
+            File("UnitTest/PreviousStatusStoreTest.cpp"),
         ])