[Themis-devcvs] SF.net SVN: themis:[570] trunk/themis/framework

[CVS C. to T. <the...@li...>]

Revision: 570
          http://themis.svn.sourceforge.net/themis/?rev=570&view=rev
Author:   mark_hellegers
Date:     2010-11-21 15:35:10 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
Cleaned up SiteHandler header.

Modified Paths:
--------------
    trunk/themis/framework/SiteHandler.cpp
    trunk/themis/framework/SiteHandler.h

Modified: trunk/themis/framework/SiteHandler.cpp
===================================================================
--- trunk/themis/framework/SiteHandler.cpp	2010-11-21 15:23:15 UTC (rev 569)
+++ trunk/themis/framework/SiteHandler.cpp	2010-11-21 15:35:10 UTC (rev 570)
@@ -2,6 +2,9 @@
  * SiteHandler.cpp
  */
 
+// BeOS headers
+#include <Locker.h>
+
 // Standard C headers
 #include <stdio.h>
 
@@ -10,7 +13,9 @@
 #include "plugman.h"
 #include "ThemisIcons.h"
 #include "../common/commondefs.h"
+#include "../common/cacheplug.h"
 #include "UrlEntry.h"
+#include "SiteEntry.h"
 #include "SiteHandler.h"
 
 extern plugman* PluginManager;

Modified: trunk/themis/framework/SiteHandler.h
===================================================================
--- trunk/themis/framework/SiteHandler.h	2010-11-21 15:23:15 UTC (rev 569)
+++ trunk/themis/framework/SiteHandler.h	2010-11-21 15:35:10 UTC (rev 570)
@@ -5,64 +5,47 @@
 #ifndef SITEHANDLER_H
 #define SITEHANDLER_H
 
-#include <Locker.h>
-
+// Standard C++ headers
 #include <vector.h>
 
+// Themis headers
 #include "msgsystem.h"
-#include "../common/cacheplug.h"
-#include "SiteEntry.h"
 
+// Namespaces used
 using namespace std;
 
-class SiteHandler : public MessageSystem 
-{
+// Declarations used
+class BLocker;
+class BBitmap;
+class BMessage;
+class SiteEntry;
+class CachePlug;
+
+class SiteHandler : public MessageSystem {
+
+	private:
+		SiteEntry * GetEntry(int32 id);
+		CachePlug *	fCachePlug;
+		uint32 fCacheUserToken;
+		BLocker * fLocker;
+		vector<SiteEntry*> fEntryList;
+
 	public:
-									SiteHandler();
-									
-									~SiteHandler();
-		
-		void						BroadcastFinished();
-									
-		uint32						BroadcastTarget();
-		
-		status_t					BroadcastReply(
-										BMessage* msg );
+		SiteHandler();
+		~SiteHandler();
 
-		bool						EntryValid(
-										int32 id );		
-		
-		BBitmap*					GetFavIconFor(
-										int32 id );
-		
-		int8						GetLoadingProgressFor(
-										int32 id );
-		
-		const char*					GetStatusTextFor(
-										int32 id );
-		
-		const char*					GetTitleFor(
-										int32 id );
-		
-		const char*					GetUrlFor(
-										int32 id );
-		
-		status_t					ReceiveBroadcast(
-										BMessage* msg );
-		
-		void						RemoveEntry(
-										int32 id );
+		void BroadcastFinished();
+		uint32 BroadcastTarget();
+		status_t BroadcastReply(BMessage * msg);
+		bool EntryValid(int32 id);
+		BBitmap * GetFavIconFor(int32 id);
+		int8 GetLoadingProgressFor(int32 id);
+		const char * GetStatusTextFor(int32 id);
+		const char * GetTitleFor(int32 id);
+		const char * GetUrlFor(int32 id);
+		status_t ReceiveBroadcast(BMessage* msg);
+		void RemoveEntry(int32 id);
 														
-	private:
-		SiteEntry*					GetEntry(
-										int32 id );
-		
-		CachePlug*					fCachePlug;
-		uint32						fCacheUserToken;
-		
-		BLocker*					fLocker;
-		
-		vector< SiteEntry* >		fEntryList;
 };
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.