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

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

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

Log Message:
-----------
Cleaned up the SiteEntry header.

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

Modified: trunk/themis/framework/SiteEntry.cpp
===================================================================
--- trunk/themis/framework/SiteEntry.cpp	2010-11-19 22:47:54 UTC (rev 567)
+++ trunk/themis/framework/SiteEntry.cpp	2010-11-21 15:11:47 UTC (rev 568)
@@ -2,9 +2,16 @@
  * SiteEntry.cpp
  */
 
+// BeOS headers
+#include <Bitmap.h>
+#include <String.h>
+
+// Standard C headers
 #include <stdio.h>
 
+// Themis headers
 #include "SiteEntry.h"
+#include "UrlEntry.h"
 
 SiteEntry::SiteEntry(
 	int32 id,

Modified: trunk/themis/framework/SiteEntry.h
===================================================================
--- trunk/themis/framework/SiteEntry.h	2010-11-19 22:47:54 UTC (rev 567)
+++ trunk/themis/framework/SiteEntry.h	2010-11-21 15:11:47 UTC (rev 568)
@@ -5,83 +5,54 @@
 #ifndef SITEENTRY_H
 #define SITEENTRY_H
 
-#include <Bitmap.h>
-#include <String.h>
-
+// Standard C++ headers
 #include <vector.h>
 
-#include "SiteEntry.h"
-#include "UrlEntry.h"
-
+// Namespaces used
 using namespace std;
 
-class SiteEntry
-{
-	public:
-									SiteEntry(
-										int32 id,
-										const char* url );
-									
-									~SiteEntry();
-		
-		void						AddEntry(
-										int32 id,
-										const char* url );
-		
-		bool						GetCookiesDisabled();
-		
-		BBitmap*					GetFavIcon();
-		
-		UrlEntry*					GetEntry(
-										int32 id );
-		
-		int32						GetID();
+// Declarations used
+class BString;
+class BBitmap;
+class UrlEntry;
 
-		int8						GetLoadingProgress();
-		
-		bool						GetSecureConnection();
-		
-		const char*					GetStatusText();
-		
-		const char*					GetTitle();
-		
-		const char*					GetUrl();
-		
-		void						Print();
-		
-		void						SetCookiesDisabled(
-										bool value );
-		
-		void						SetFavIcon(
-										BBitmap* bmp );
-		
-		void						SetLoadingProgress(
-										int8 loadingprogress );
-		
-		void						SetSecureConnection(
-										bool value );		
-		
-		void						SetStatusText(
-										const char* text );
-				
-		void						SetTitle(
-										const char* title );
-									
+class SiteEntry {
+
 	private:
-		vector< UrlEntry* >			fEntryList;
+		vector<UrlEntry*> fEntryList;
+		int32 fID;
+		int8 fLoadingProgress;
+		BString * fUrl;
+		BString * fTitle;
+		BString * fStatusText;
+		bool fCookiesDisabled;
+		bool fSecureConnection;
+		BBitmap * fFavIcon;
+
+	public:
+		SiteEntry(int32 id,
+				  const char* url);
+	    ~SiteEntry();
 		
-		int32						fID;
-		
-		int8						fLoadingProgress;
-		
-		BString*					fUrl;
-		BString*					fTitle;
-		BString*					fStatusText;
-		
-		bool						fCookiesDisabled;
-		bool						fSecureConnection;
-		
-		BBitmap*					fFavIcon;
+		void AddEntry(int32 id,
+					  const char* url);
+		bool GetCookiesDisabled();
+		BBitmap * GetFavIcon();
+		UrlEntry * GetEntry(int32 id);
+		int32 GetID();
+		int8 GetLoadingProgress();
+		bool GetSecureConnection();
+		const char * GetStatusText();
+		const char * GetTitle();
+		const char * GetUrl();
+		void Print();
+		void SetCookiesDisabled(bool value);
+		void SetFavIcon(BBitmap* bmp);
+		void SetLoadingProgress(int8 loadingprogress);
+		void SetSecureConnection(bool value);		
+		void SetStatusText(const char* text);
+		void SetTitle(const char* title);
+									
 };
 
 #endif

Modified: trunk/themis/framework/SiteHandler.cpp
===================================================================
--- trunk/themis/framework/SiteHandler.cpp	2010-11-19 22:47:54 UTC (rev 567)
+++ trunk/themis/framework/SiteHandler.cpp	2010-11-21 15:11:47 UTC (rev 568)
@@ -2,13 +2,16 @@
  * SiteHandler.cpp
  */
 
+// Standard C headers
 #include <stdio.h>
 
+// Themis headers
 #include "app.h"
 #include "plugman.h"
 #include "ThemisIcons.h"
+#include "../common/commondefs.h"
+#include "UrlEntry.h"
 #include "SiteHandler.h"
-#include "../common/commondefs.h"
 
 extern plugman* PluginManager;
 


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