From fa1fa93b09c3136a011ce3750b3b91d8b7cd5716 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 24 Dec 2012 12:38:53 +0100
Subject: [PATCH] * Patch from Felix Paul Kuehne: Clean up mac includes to
 speed up compiling.

---
 src/libtomahawk/thirdparty/Qocoa/qbutton_mac.mm     |  4 +---
 src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h        |  2 +-
 .../thirdparty/Qocoa/qsearchfield_mac.mm            |  4 +---
 .../thirdparty/Qocoa/qtoolbartabdialog_mac.mm       |  3 +--
 src/libtomahawk/utils/TomahawkUtils_Mac.mm          |  3 +--
 .../widgets/SourceTreePopupDialog_mac.mm            |  4 +---
 src/mac/MacDelegate.h                               |  2 +-
 src/mac/TomahawkApp_Mac.mm                          | 13 +------------
 8 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/libtomahawk/thirdparty/Qocoa/qbutton_mac.mm b/src/libtomahawk/thirdparty/Qocoa/qbutton_mac.mm
index 9dfdf9672..e2b0aa360 100644
--- a/src/libtomahawk/thirdparty/Qocoa/qbutton_mac.mm
+++ b/src/libtomahawk/thirdparty/Qocoa/qbutton_mac.mm
@@ -24,9 +24,7 @@ THE SOFTWARE.
 
 #include "qocoa_mac.h"
 
-#import "Foundation/NSAutoreleasePool.h"
-#import "AppKit/NSButton.h"
-#import "AppKit/NSFont.h"
+#import <Cocoa/Cocoa.h>
 
 class QButtonPrivate : public QObject
 {
diff --git a/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h b/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
index 053f57a06..50c75c395 100644
--- a/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
+++ b/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef QCOCOA_MAC_H
 #define QCOCOA_MAC_H
 
-#include <Foundation/NSString.h>
+#import <Cocoa/Cocoa.h>
 #include <QString>
 #include <QVBoxLayout>
 #include <QMacCocoaViewContainer>
diff --git a/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm b/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm
index 40b109849..54fafd83c 100644
--- a/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm
+++ b/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm
@@ -26,9 +26,7 @@ THE SOFTWARE.
 
 #include "qocoa_mac.h"
 
-#import "Foundation/NSAutoreleasePool.h"
-#import "Foundation/NSNotification.h"
-#import "AppKit/NSSearchField.h"
+#import <Cocoa/Cocoa.h>
 
 #include <QApplication>
 #include <QClipboard>
diff --git a/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog_mac.mm b/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog_mac.mm
index 7c5fbced2..316e87f9d 100644
--- a/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog_mac.mm
+++ b/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog_mac.mm
@@ -24,8 +24,7 @@
 
 #include "qocoa_mac.h"
 
-#import <Foundation/NSAutoreleasePool.h>
-#import <AppKit/NSToolbar.h>
+#import <Cocoa/Cocoa.h>
 
 #include <QCoreApplication>
 #include <QIcon>
diff --git a/src/libtomahawk/utils/TomahawkUtils_Mac.mm b/src/libtomahawk/utils/TomahawkUtils_Mac.mm
index 28b03e0e3..04007b63c 100644
--- a/src/libtomahawk/utils/TomahawkUtils_Mac.mm
+++ b/src/libtomahawk/utils/TomahawkUtils_Mac.mm
@@ -18,8 +18,7 @@
 
 #include "mac/FileHelpers.h"
 
-#import <AppKit/NSApplication.h>
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 
 #include "TomahawkUtils.h"
 #include "TomahawkUtils_Mac.h"
diff --git a/src/libtomahawk/widgets/SourceTreePopupDialog_mac.mm b/src/libtomahawk/widgets/SourceTreePopupDialog_mac.mm
index 8ae495eaf..4babab457 100644
--- a/src/libtomahawk/widgets/SourceTreePopupDialog_mac.mm
+++ b/src/libtomahawk/widgets/SourceTreePopupDialog_mac.mm
@@ -20,9 +20,7 @@
 
 #include <QWidget>
 
-#import <Foundation/Foundation.h>
-#import <AppKit/NSView.h>
-#import <AppKit/NSWindow.h>
+#import <Cocoa/Cocoa.h>
 
 void
 SourceTreePopupHelper::clearBackground( QWidget* widget )
diff --git a/src/mac/MacDelegate.h b/src/mac/MacDelegate.h
index bf0ad9a6d..c9c0e0e3a 100644
--- a/src/mac/MacDelegate.h
+++ b/src/mac/MacDelegate.h
@@ -3,7 +3,7 @@
 
 // This file inspired by clementine's MacDelegate.h
 
-#import <AppKit/NSApplication.h>
+#import <Cocoa/Cocoa.h>
 
 #include "SPMediaKeyTap.h"
 
diff --git a/src/mac/TomahawkApp_Mac.mm b/src/mac/TomahawkApp_Mac.mm
index c9ab976a6..ef4e81e07 100644
--- a/src/mac/TomahawkApp_Mac.mm
+++ b/src/mac/TomahawkApp_Mac.mm
@@ -24,18 +24,7 @@
 #include "TomahawkWindow.h"
 #include "audio/AudioEngine.h"
 
-#import <AppKit/NSApplication.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSError.h>
-#import <Foundation/NSFileManager.h>
-#import <Foundation/NSPathUtilities.h>
-#import <Foundation/NSThread.h>
-#import <Foundation/NSTimer.h>
-#import <Foundation/NSAppleEventManager.h>
-#import <Foundation/NSURL.h>
-#import <AppKit/NSEvent.h>
-#import <AppKit/NSNibDeclarations.h>
+#import <Cocoa/Cocoa.h>
 
 #ifdef HAVE_SPARKLE
 #import <Sparkle/SUUpdater.h>