--- a/QTfrontend/CMakeLists.txt	Sun Jan 27 01:20:50 2013 +0100
+++ b/QTfrontend/CMakeLists.txt	Sun Jan 27 02:09:02 2013 +0100
@@ -123,6 +123,7 @@
 file(GLOB ModelHdr model/*.h)
 file(GLOB NetHdr net/*.h)
 file(GLOB_RECURSE UIhdr ui/*.h)
+list(REMOVE_ITEM UIhdr "${CMAKE_CURRENT_SOURCE_DIR}/ui/widget/flowlayout.h")
 file(GLOB UtilHdr util/*.h)
 
 
@@ -138,7 +139,6 @@
     team.h
     util/DataManager.h
     util/LibavInteraction.h
-    util/MessageDialog.h
     )
 
 set(hwfr_hdrs

--- a/QTfrontend/util/platform/M3InstallController.m	Sun Jan 27 01:20:50 2013 +0100
+++ b/QTfrontend/util/platform/M3InstallController.m	Sun Jan 27 02:09:02 2013 +0100
@@ -70,21 +70,43 @@
 
     //Delete the app that is installed
     if ([[NSFileManager defaultManager] fileExistsAtPath:appsPath]) {
-        [[NSFileManager defaultManager] removeFileAtPath:appsPath handler:nil];
+        if ([NSFileManager instancesRespondToSelector:@selector(removeItemAtPath:error:)])
+            [[NSFileManager defaultManager] removeItemAtPath:appsPath error:nil];
+        else
+            //casting hides the deprecation warning
+            [(id)[NSFileManager defaultManager] removeFileAtPath:appsPath handler:nil];
     }
     //Delete the app that is installed
-    if ([[NSFileManager defaultManager] copyPath:[[NSBundle mainBundle] bundlePath] toPath:appsPath
-                                          handler:nil]) {
+    BOOL success = NO;
+    if ([NSFileManager instancesRespondToSelector:@selector(copyItemAtPath:toPath:error:)])
+        success = [[NSFileManager defaultManager] copyItemAtPath:[[NSBundle mainBundle] bundlePath]
+                                                          toPath:appsPath
+                                                           error:nil];
+    else
+        success = [(id)[NSFileManager defaultManager] copyPath:[[NSBundle mainBundle] bundlePath]
+                                                        toPath:appsPath
+                                                       handler:nil];
+    if (success) {
         NSRunAlertPanel([NSString stringWithFormat:NSLocalizedString(@"%@ installed successfully", @"App Name installed successfully"), appName],
                         [NSString stringWithFormat:NSLocalizedString(@"%@ was installed in /Applications", @"App Name was installed in /Applications"), appName],
                         NSLocalizedString(@"Quit", @"Quit"), nil, nil);
     } else {
         if ([[NSFileManager defaultManager] fileExistsAtPath:userAppsPath]) {
-            [[NSFileManager defaultManager] removeFileAtPath:userAppsPath handler:nil];
+            if ([NSFileManager instancesRespondToSelector:@selector(removeItemAtPath:error:)])
+                [[NSFileManager defaultManager] removeItemAtPath:userAppsPath error:nil];
+            else
+                [(id)[NSFileManager defaultManager] removeFileAtPath:userAppsPath handler:nil];
         }
-        if ([[NSFileManager defaultManager] copyPath:[[NSBundle mainBundle] bundlePath] toPath:userAppsPath
-                                                handler:nil]) {
-        NSRunAlertPanel([NSString stringWithFormat:NSLocalizedString(@"%@ installed successfully", @"AppName installed successfully"), appName],
+        if ([NSFileManager instancesRespondToSelector:@selector(copyItemAtPath:toPath:error:)])
+            success = [[NSFileManager defaultManager] copyItemAtPath:[[NSBundle mainBundle] bundlePath]
+                                                              toPath:userAppsPath
+                                                               error:nil];
+        else
+            success = [(id)[NSFileManager defaultManager] copyPath:[[NSBundle mainBundle] bundlePath]
+                                                            toPath:userAppsPath
+                                                           handler:nil];
+        if (success) {
+            NSRunAlertPanel([NSString stringWithFormat:NSLocalizedString(@"%@ installed successfully", @"AppName installed successfully"), appName],
                 [NSString stringWithFormat:NSLocalizedString(@"%@ was installed in %@", @"App Name was installed in %@"), appName, [[NSString stringWithString:@"~/Applications"] stringByExpandingTildeInPath]],
                         NSLocalizedString(@"Quit", @"Quit"), nil, nil);
         } else {