From 259ffc02528c0a87b4c5c7a4673efbd4eb27b4b1 Mon Sep 17 00:00:00 2001
From: Alex Wilson <yourpalal2@gmail.com>
Date: Sat, 21 Jan 2012 16:13:24 +1300
Subject: [PATCH] Style cleanup in notification_server: #includes

---
 src/servers/notification/AppGroupView.cpp       |  2 +-
 src/servers/notification/NotificationServer.cpp |  1 +
 src/servers/notification/NotificationView.cpp   | 13 +++++++++----
 src/servers/notification/NotificationView.h     | 10 +++++++---
 src/servers/notification/NotificationWindow.cpp |  6 ++++--
 src/servers/notification/NotificationWindow.h   | 11 ++++-------
 6 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/servers/notification/AppGroupView.cpp b/src/servers/notification/AppGroupView.cpp
index 53e085eab8..9f3dc98994 100644
--- a/src/servers/notification/AppGroupView.cpp
+++ b/src/servers/notification/AppGroupView.cpp
@@ -100,7 +100,7 @@ AppGroupView::Draw(BRect updateRect)
 }
 
 
-	void
+void
 AppGroupView::MouseDown(BPoint point)
 {
 	if (fCloseRect.Contains(point)) {
diff --git a/src/servers/notification/NotificationServer.cpp b/src/servers/notification/NotificationServer.cpp
index 0b528c24af..ef1d49e626 100644
--- a/src/servers/notification/NotificationServer.cpp
+++ b/src/servers/notification/NotificationServer.cpp
@@ -8,6 +8,7 @@
 
 #include <Beep.h>
 #include <Notifications.h>
+#include <PropertyInfo.h>
 
 #include "NotificationWindow.h"
 #include "NotificationServer.h"
diff --git a/src/servers/notification/NotificationView.cpp b/src/servers/notification/NotificationView.cpp
index 613ecc542f..14c21df7ee 100644
--- a/src/servers/notification/NotificationView.cpp
+++ b/src/servers/notification/NotificationView.cpp
@@ -13,19 +13,24 @@
  *		Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
  */
 
-#include <ControlLook.h>
+
+#include "NotificationView.h"
+
+
+#include <Bitmap.h>
 #include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
-#include <Layout.h>
 #include <LayoutUtils.h>
+#include <MessageRunner.h>
 #include <Messenger.h>
+#include <Notification.h>
 #include <Path.h>
+#include <PropertyInfo.h>
 #include <Roster.h>
 #include <StatusBar.h>
 
-#include "NotificationView.h"
 #include "NotificationWindow.h"
 
+
 static const int kIconStripeWidth = 32;
 
 property_info message_prop_list[] = {
diff --git a/src/servers/notification/NotificationView.h b/src/servers/notification/NotificationView.h
index 62d12ec83b..b5ada59e5f 100644
--- a/src/servers/notification/NotificationView.h
+++ b/src/servers/notification/NotificationView.h
@@ -10,15 +10,19 @@
 
 #include <list>
 
-#include <Bitmap.h>
-#include <MessageRunner.h>
-#include <Notification.h>
+#include <String.h>
 #include <View.h>
 
+
+class BBitmap;
+class BMessageRunner;
+class BNotification;
+
 class NotificationWindow;
 
 const uint32 kRemoveView = 'ReVi';
 
+
 class NotificationView : public BView {
 public:
 								NotificationView(NotificationWindow* win,
diff --git a/src/servers/notification/NotificationWindow.cpp b/src/servers/notification/NotificationWindow.cpp
index c4e39c2d9e..08d434da5c 100644
--- a/src/servers/notification/NotificationWindow.cpp
+++ b/src/servers/notification/NotificationWindow.cpp
@@ -17,13 +17,15 @@
 #include <Alert.h>
 #include <Application.h>
 #include <Catalog.h>
+#include <Deskbar.h>
+#include <Directory.h>
 #include <File.h>
+#include <FindDirectory.h>
 #include <GroupLayout.h>
-#include <Layout.h>
 #include <NodeMonitor.h>
+#include <Notifications.h>
 #include <Path.h>
 #include <PropertyInfo.h>
-#include <private/interface/WindowPrivate.h>
 
 #include "AppGroupView.h"
 #include "AppUsage.h"
diff --git a/src/servers/notification/NotificationWindow.h b/src/servers/notification/NotificationWindow.h
index 84cb81b72d..9837c18deb 100644
--- a/src/servers/notification/NotificationWindow.h
+++ b/src/servers/notification/NotificationWindow.h
@@ -12,21 +12,18 @@
 #include <vector>
 #include <map>
 
-#include <Directory.h>
-#include <Deskbar.h>
-#include <Entry.h>
-#include <FindDirectory.h>
-#include <Message.h>
-#include <Notifications.h>
-#include <PropertyInfo.h>
+#include <AppFileInfo.h>
 #include <String.h>
 #include <Window.h>
 
 #include "NotificationView.h"
 
+
 class AppGroupView;
 class AppUsage;
 
+struct property_info;
+
 typedef std::map<BString, AppGroupView*> appview_t;
 typedef std::map<BString, AppUsage*> appfilter_t;
 typedef std::vector<NotificationView*> views_t;