[pdfmod] Get rid of unnecessary 'private' specifiers



commit dc618ba6c00114a46e0d9fd5615c971250088ded
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Sat Sep 19 14:14:28 2009 -0700

    Get rid of unnecessary 'private' specifiers

 src/PdfMod/Core/Client.cs                    |    6 +-
 src/PdfMod/Core/Configuration.cs             |    8 ++--
 src/PdfMod/Gui/Actions.cs                    |   72 +++++++++++++-------------
 src/PdfMod/Gui/Client.cs                     |   23 ++++----
 src/PdfMod/Gui/DocumentIconView.cs           |   66 ++++++++++++------------
 src/PdfMod/Gui/MetadataEditorBox.cs          |   30 +++++-----
 src/PdfMod/Gui/PageCell.cs                   |    8 ++--
 src/PdfMod/Gui/PageListStore.cs              |    2 +-
 src/PdfMod/Gui/SelectMatchingBox.cs          |    8 ++--
 src/PdfMod/Main.cs                           |    2 +-
 src/PdfMod/Pdf/Actions/ExportImagesAction.cs |   10 ++--
 src/PdfMod/Pdf/Actions/MoveAction.cs         |    4 +-
 src/PdfMod/Pdf/Actions/RemoveAction.cs       |    2 +-
 src/PdfMod/Pdf/Actions/RotateAction.cs       |    2 +-
 src/PdfMod/Pdf/Document.cs                   |   31 ++++++-----
 src/PdfMod/Pdf/PageLabels.cs                 |   36 ++++++------
 16 files changed, 156 insertions(+), 154 deletions(-)
---
diff --git a/src/PdfMod/Core/Client.cs b/src/PdfMod/Core/Client.cs
index 0e07080..fd2199a 100644
--- a/src/PdfMod/Core/Client.cs
+++ b/src/PdfMod/Core/Client.cs
@@ -28,8 +28,8 @@ namespace PdfMod.Core
 {
     public abstract class Client
     {
-        private static readonly string old_cache_dir = Path.Combine (System.Environment.GetFolderPath (System.Environment.SpecialFolder.ApplicationData), "pdfmod");
-        private static readonly string CacheDir = Path.Combine (XdgBaseDirectorySpec.GetUserDirectory ("XDG_CACHE_HOME", ".cache"), "pdfmod");
+        static readonly string old_cache_dir = Path.Combine (System.Environment.GetFolderPath (System.Environment.SpecialFolder.ApplicationData), "pdfmod");
+        static readonly string CacheDir = Path.Combine (XdgBaseDirectorySpec.GetUserDirectory ("XDG_CACHE_HOME", ".cache"), "pdfmod");
 
         public Document Document { get; protected set; }
         public static Configuration Configuration { get; private set; }
@@ -70,7 +70,7 @@ namespace PdfMod.Core
 
         public abstract void LoadPath (string path, string suggestedFilename);
 
-        private static void InitCache ()
+        static void InitCache ()
         {
             // Remove the old "cache" dir that really ended up being ~/.config/
             if (Directory.Exists (old_cache_dir)) {
diff --git a/src/PdfMod/Core/Configuration.cs b/src/PdfMod/Core/Configuration.cs
index 5b5d9e4..66539a9 100644
--- a/src/PdfMod/Core/Configuration.cs
+++ b/src/PdfMod/Core/Configuration.cs
@@ -20,14 +20,14 @@ namespace PdfMod.Core
 {    
     public class Configuration
     {
-        private GConf.Client client = new GConf.Client ();
-        private string ns = "/apps/pdfmod/";
+        GConf.Client client = new GConf.Client ();
+        string ns = "/apps/pdfmod/";
 
         public Configuration()
         {
         }
 
-        private T Get<T> (string key, T fallback)
+        T Get<T> (string key, T fallback)
         {
             try {
                 return (T) client.Get (ns + key);
@@ -36,7 +36,7 @@ namespace PdfMod.Core
             }
         }
 
-        private void Set<T> (string key, T val)
+        void Set<T> (string key, T val)
         {
             client.Set (ns + key, val);
         }
diff --git a/src/PdfMod/Gui/Actions.cs b/src/PdfMod/Gui/Actions.cs
index 3aa542d..1b54404 100644
--- a/src/PdfMod/Gui/Actions.cs
+++ b/src/PdfMod/Gui/Actions.cs
@@ -38,16 +38,16 @@ namespace PdfMod.Gui
 {
     public class Actions : HyenaActionGroup
     {
-        private Client app;
-        private UndoManager undo_manager;
-        private const string WIKI_URL = "http://live.gnome.org/PdfMod";;
+        Client app;
+        UndoManager undo_manager;
+        const string WIKI_URL = "http://live.gnome.org/PdfMod";;
 
-        private static string [] require_doc_actions = new string[] {
+        static string [] require_doc_actions = new string[] {
             "Save", "SaveAs", "Properties", "Undo", "Redo", "ZoomFit", "OpenInViewer",
             "SelectAll", "SelectEvens", "SelectOdds", "SelectMatching", "InsertFrom", "ExportImages"
         };
 
-        private static string [] require_page_actions = new string[] {
+        static string [] require_page_actions = new string[] {
             "Remove", "Extract", "RotateRight", "RotateLeft"
         };
 
@@ -154,12 +154,12 @@ namespace PdfMod.Gui
             recent_item.Submenu = recent_chooser_item;
         }
 
-        private void OnChanged (object o, EventArgs args)
+        void OnChanged (object o, EventArgs args)
         {
             Update ();
         }
 
-        private void Update ()
+        void Update ()
         {
             bool have_doc = app.Document != null;
             foreach (string action in require_doc_actions)
@@ -203,7 +203,7 @@ namespace PdfMod.Gui
 
 #region Action Handlers
 
-        private void OnOpen (object o, EventArgs args)
+        void OnOpen (object o, EventArgs args)
         {
             var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Select PDF"), app.Window, FileChooserAction.Open);
             chooser.AddFilter (GtkUtilities.GetFileFilter (Catalog.GetString ("PDF Documents"), new string [] {"pdf"}));
@@ -231,12 +231,12 @@ namespace PdfMod.Gui
             }
         }
 
-        private void OnOpenInViewer (object o, EventArgs args)
+        void OnOpenInViewer (object o, EventArgs args)
         {
             System.Diagnostics.Process.Start (app.Document.CurrentStateUri);
         }
 
-        private void OnFullScreenView (object o, EventArgs args)
+        void OnFullScreenView (object o, EventArgs args)
         {
             bool fullscreen = (this["FullScreenView"] as ToggleAction).Active;
 
@@ -247,7 +247,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private void OnInsertFrom (object o, EventArgs args)
+        void OnInsertFrom (object o, EventArgs args)
         {
             var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Select PDF"), app.Window, FileChooserAction.Open);
             chooser.AddFilter (GtkUtilities.GetFileFilter ("PDF Documents", new string [] {"pdf"}));
@@ -267,13 +267,13 @@ namespace PdfMod.Gui
             }
         }
 
-        private void OnSave (object o, EventArgs args)
+        void OnSave (object o, EventArgs args)
         {
             app.Document.Save (app.Document.SuggestedSavePath);
             undo_manager.Clear ();
         }
 
-        private void OnSaveAs (object o, EventArgs args)
+        void OnSaveAs (object o, EventArgs args)
         {
             var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Save as..."), app.Window, FileChooserAction.Save);
             chooser.SelectMultiple = false;
@@ -297,7 +297,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private void OnProperties (object o, EventArgs args)
+        void OnProperties (object o, EventArgs args)
         {
             app.EditorBox.Visible = (this["Properties"] as ToggleAction).Active;
             if (app.EditorBox.Visible) {
@@ -305,7 +305,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private void OnRemove (object o, EventArgs args)
+        void OnRemove (object o, EventArgs args)
         {
             var action = new RemoveAction (app.Document, app.IconView.SelectedPages);
             action.Do ();
@@ -313,7 +313,7 @@ namespace PdfMod.Gui
             //undo_manager.AddUndoAction (action);
         }
 
-        private void OnExtractPages (object o, EventArgs args)
+        void OnExtractPages (object o, EventArgs args)
         {
             var doc = new PdfDocument ();
             var pages = new List<Page> (app.IconView.SelectedPages);
@@ -333,7 +333,7 @@ namespace PdfMod.Gui
             ));
         }
 
-        private void OnExportImages (object o, EventArgs args)
+        void OnExportImages (object o, EventArgs args)
         {
             var action = new ExportImagesAction (app.Document, app.Document.Pages);
             if (action.ExportableImageCount == 0) {
@@ -364,20 +364,20 @@ namespace PdfMod.Gui
             System.Diagnostics.Process.Start (export_path);
         }
 
-        private void OnUndo (object o, EventArgs args)
+        void OnUndo (object o, EventArgs args)
         {
             undo_manager.Undo ();
         }
 
-        private void OnRedo (object o, EventArgs args)
+        void OnRedo (object o, EventArgs args)
         {
             undo_manager.Redo ();
         }
 
         [DllImport ("glib-2.0.dll")]
-        private static extern IntPtr g_get_language_names ();
+        static extern IntPtr g_get_language_names ();
 
-        private string CombinePaths (params string [] parts)
+        string CombinePaths (params string [] parts)
         {
             string path = parts[0];
             for (int i = 1; i < parts.Length; i++) {
@@ -386,7 +386,7 @@ namespace PdfMod.Gui
             return path;
         }
 
-        private void OnHelp (object o, EventArgs args)
+        void OnHelp (object o, EventArgs args)
         {
             bool shown = false;
             try {
@@ -430,7 +430,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private void OnAbout (object o, EventArgs args)
+        void OnAbout (object o, EventArgs args)
         {
             Gtk.AboutDialog.SetUrlHook ((dlg, link) => { System.Diagnostics.Process.Start (link); });
 
@@ -483,63 +483,63 @@ namespace PdfMod.Gui
             dialog.Destroy ();
         }
 
-        private void OnPageContextMenu (object o, EventArgs args)
+        void OnPageContextMenu (object o, EventArgs args)
         {
             ShowContextMenu ("/PageContextMenu");
         }
 
-        private void OnSelectAll (object o, EventArgs args)
+        void OnSelectAll (object o, EventArgs args)
         {
             app.IconView.SetPageSelectionMode (PageSelectionMode.All);
         }
 
-        private void OnSelectEvens (object o, EventArgs args)
+        void OnSelectEvens (object o, EventArgs args)
         {
             app.IconView.SetPageSelectionMode (PageSelectionMode.Evens);
         }
 
-        private void OnSelectOdds (object o, EventArgs args)
+        void OnSelectOdds (object o, EventArgs args)
         {
             app.IconView.SetPageSelectionMode (PageSelectionMode.Odds);
         }
 
-        private void OnSelectMatching (object o, EventArgs args)
+        void OnSelectMatching (object o, EventArgs args)
         {
             app.ToggleMatchQuery ();
         }
 
-        private void OnZoomIn (object o, EventArgs args)
+        void OnZoomIn (object o, EventArgs args)
         {
             app.IconView.Zoom (10);
         }
 
-        private void OnZoomOut (object o, EventArgs args)
+        void OnZoomOut (object o, EventArgs args)
         {
             app.IconView.Zoom (-10);
         }
 
-        private void OnZoomFit (object o, EventArgs args)
+        void OnZoomFit (object o, EventArgs args)
         {
             app.IconView.ZoomFit ();
         }
 
-        private void OnViewToolbar (object o, EventArgs args)
+        void OnViewToolbar (object o, EventArgs args)
         {
             bool show = (this["ViewToolbar"] as ToggleAction).Active;
             Client.Configuration.ShowToolbar = app.HeaderToolbar.Visible = show;
         }
 
-        private void OnRotateRight (object o, EventArgs args)
+        void OnRotateRight (object o, EventArgs args)
         {
             Rotate (90);
         }
 
-        private void OnRotateLeft (object o, EventArgs args)
+        void OnRotateLeft (object o, EventArgs args)
         {
             Rotate (-90);
         }
 
-        private void Rotate (int degrees)
+        void Rotate (int degrees)
         {
             if (!(app.Window.Focus is Gtk.Entry)) {
                 var action = new RotateAction (app.Document, app.IconView.SelectedPages, degrees);
@@ -548,7 +548,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private void OnClose (object o, EventArgs args)
+        void OnClose (object o, EventArgs args)
         {
             app.Quit ();
         }
diff --git a/src/PdfMod/Gui/Client.cs b/src/PdfMod/Gui/Client.cs
index fc00fb2..9e90280 100644
--- a/src/PdfMod/Gui/Client.cs
+++ b/src/PdfMod/Gui/Client.cs
@@ -35,13 +35,17 @@ namespace PdfMod.Gui
 {
     public class Client : Core.Client
     {
-        private static int app_count = 0;
-        private static string accel_map_file = Path.Combine (Path.Combine (
+        static int app_count = 0;
+        static string accel_map_file = Path.Combine (Path.Combine (
             XdgBaseDirectorySpec.GetUserDirectory ("XDG_CONFIG_HOME", ".config"), "pdfmod"), "gtk_accel_map");
 
-        private Gtk.MenuBar menu_bar;
-        private Gtk.Label status_label;
-        private QueryBox query_box;
+        Gtk.MenuBar menu_bar;
+        Gtk.Label status_label;
+        QueryBox query_box;
+
+        bool loading;
+        string original_size_string = null;
+        long original_size;
 
         public ActionManager ActionManager { get; private set; }
         public Gtk.Toolbar HeaderToolbar;
@@ -180,7 +184,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private bool PromptIfUnsavedChanges ()
+        bool PromptIfUnsavedChanges ()
         {
             if (Document != null && Document.HasUnsavedChanged) {
                 var message_dialog = new Hyena.Widgets.HigMessageDialog (
@@ -236,7 +240,6 @@ namespace PdfMod.Gui
             }
         }
 
-        private bool loading;
         public override void LoadPath (string path, string suggestedFilename)
         {
             lock (this) {
@@ -291,9 +294,7 @@ namespace PdfMod.Gui
             });
         }
 
-        private string original_size_string = null;
-        private long original_size;
-        private void UpdateForDocument ()
+        void UpdateForDocument ()
         {
             var current_size = Document.FileSize;
             string size_str = null;
@@ -360,7 +361,7 @@ namespace PdfMod.Gui
             reset_event.WaitOne ();
         }
 
-        private static void OnLogNotify (LogNotifyArgs args)
+        static void OnLogNotify (LogNotifyArgs args)
         {
             ThreadAssist.ProxyToMain (delegate {
                 Gtk.MessageType mtype;
diff --git a/src/PdfMod/Gui/DocumentIconView.cs b/src/PdfMod/Gui/DocumentIconView.cs
index 42a4e86..0573958 100644
--- a/src/PdfMod/Gui/DocumentIconView.cs
+++ b/src/PdfMod/Gui/DocumentIconView.cs
@@ -44,24 +44,24 @@ namespace PdfMod.Gui
         public const int MIN_WIDTH = 128;
         public const int MAX_WIDTH = 2054;
 
-        private enum Target {
+        enum Target {
             UriSrc,
             UriDest,
             MoveInternal,
             MoveExternal
         }
 
-        private static readonly TargetEntry uri_src_target = new TargetEntry ("text/uri-list", 0, (uint)Target.UriSrc);
-        private static readonly TargetEntry uri_dest_target = new TargetEntry ("text/uri-list", TargetFlags.OtherApp, (uint)Target.UriDest);
-        private static readonly TargetEntry move_internal_target = new TargetEntry ("pdfmod/page-list", TargetFlags.Widget, (uint)Target.MoveInternal);
-        private static readonly TargetEntry move_external_target = new TargetEntry ("pdfmod/page-list-external", 0, (uint)Target.MoveExternal);
+        static readonly TargetEntry uri_src_target = new TargetEntry ("text/uri-list", 0, (uint)Target.UriSrc);
+        static readonly TargetEntry uri_dest_target = new TargetEntry ("text/uri-list", TargetFlags.OtherApp, (uint)Target.UriDest);
+        static readonly TargetEntry move_internal_target = new TargetEntry ("pdfmod/page-list", TargetFlags.Widget, (uint)Target.MoveInternal);
+        static readonly TargetEntry move_external_target = new TargetEntry ("pdfmod/page-list-external", 0, (uint)Target.MoveExternal);
 
-        private Client app;
-        private Document document;
-        private PageListStore store;
-        private PageCell page_renderer;
-        private PageSelectionMode page_selection_mode = PageSelectionMode.None;
-        private bool highlighted;
+        Client app;
+        Document document;
+        PageListStore store;
+        PageCell page_renderer;
+        PageSelectionMode page_selection_mode = PageSelectionMode.None;
+        bool highlighted;
 
         public PageListStore Store { get { return store; } }
         public bool CanZoomIn { get; private set; }
@@ -129,21 +129,21 @@ namespace PdfMod.Gui
             }
         }
 
-        private void HandleSizeAllocated (object o, EventArgs args)
+        void HandleSizeAllocated (object o, EventArgs args)
         {
             if (!zoom_manually_set) {
                 ZoomFit ();
             }
         }
 
-        private void HandleSelectionChanged (object o, EventArgs args)
+        void HandleSelectionChanged (object o, EventArgs args)
         {
             if (!refreshing_selection) {
                 page_selection_mode = PageSelectionMode.None;
             }
         }
 
-        private void HandleButtonPressEvent (object o, ButtonPressEventArgs args)
+        void HandleButtonPressEvent (object o, ButtonPressEventArgs args)
         {
             if (args.Event.Button == 3) {
                 var path = GetPathAtPos ((int)args.Event.X, (int)args.Event.Y);
@@ -176,7 +176,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private void HandlePopupMenu (object o, PopupMenuArgs args)
+        void HandlePopupMenu (object o, PopupMenuArgs args)
         {
             app.Actions["PageContextMenu"].Activate ();
         }
@@ -185,7 +185,7 @@ namespace PdfMod.Gui
 
         #region Drag and Drop event handling
 
-        private void HandleDragLeave (object o, DragLeaveArgs args)
+        void HandleDragLeave (object o, DragLeaveArgs args)
         {
             if (highlighted) {
                 Gtk.Drag.Unhighlight (this);
@@ -231,7 +231,7 @@ namespace PdfMod.Gui
             return false;
         }
 
-        private void SetDestInfo (int x, int y)
+        void SetDestInfo (int x, int y)
         {
             TreePath path;
             IconViewDropPosition pos;
@@ -239,7 +239,7 @@ namespace PdfMod.Gui
             SetDragDestItem (path, pos);
         }
 
-        private void HandleDragDataGet(object o, DragDataGetArgs args)
+        void HandleDragDataGet(object o, DragDataGetArgs args)
         {
             if (args.Info == move_internal_target.Info) {
                 var pages = new Hyena.Gui.DragDropList<Page> ();
@@ -257,7 +257,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private void GetCorrectedPathAndPosition (int x, int y, out TreePath path, out IconViewDropPosition pos)
+        void GetCorrectedPathAndPosition (int x, int y, out TreePath path, out IconViewDropPosition pos)
         {
             GetDestItemAtPos (x, y, out path, out pos);
 
@@ -271,7 +271,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private int GetDropIndex (int x, int y)
+        int GetDropIndex (int x, int y)
         {
             TreePath path;
             TreeIter iter;
@@ -293,8 +293,8 @@ namespace PdfMod.Gui
             return to_index;
         }
 
-        private static string [] newline = new string [] { "\r\n" };
-        private void HandleDragDataReceived (object o, DragDataReceivedArgs args)
+        static string [] newline = new string [] { "\r\n" };
+        void HandleDragDataReceived (object o, DragDataReceivedArgs args)
         {
             args.RetVal = false;
             string target = (string)args.SelectionData.Target;
@@ -369,7 +369,7 @@ namespace PdfMod.Gui
             GrabFocus ();
         }
 
-        private void OnPagesAdded (int index, Page [] pages)
+        void OnPagesAdded (int index, Page [] pages)
         {
             foreach (var page in pages) {
                 store.InsertWithValues (index, store.GetValuesForPage (page));
@@ -379,7 +379,7 @@ namespace PdfMod.Gui
             Refresh ();
         }
 
-        private void OnPagesChanged (Page [] pages)
+        void OnPagesChanged (Page [] pages)
         {
             /*foreach (var page in pages) {
                 var iter = store.GetIterForPage (page);
@@ -391,7 +391,7 @@ namespace PdfMod.Gui
             Refresh ();
         }
 
-        private void OnPagesRemoved (Page [] pages)
+        void OnPagesRemoved (Page [] pages)
         {
             foreach (var page in pages) {
                 var iter = store.GetIterForPage (page);
@@ -404,13 +404,13 @@ namespace PdfMod.Gui
             Refresh ();
         }
 
-        private void OnPagesMoved ()
+        void OnPagesMoved ()
         {
             UpdateAllPages ();
             Refresh ();
         }
 
-        private void Refresh ()
+        void Refresh ()
         {
             if (!zoom_manually_set) {
                 ZoomFit ();
@@ -418,7 +418,7 @@ namespace PdfMod.Gui
             RefreshSelection ();
         }
 
-        private void UpdateAllPages ()
+        void UpdateAllPages ()
         {
             foreach (var page in document.Pages) {
                 var iter = store.GetIterForPage (page);
@@ -431,7 +431,7 @@ namespace PdfMod.Gui
 
         #endregion
 
-        private bool zoom_manually_set;
+        bool zoom_manually_set;
         public void Zoom (int pixels)
         {
             CanZoomIn = CanZoomOut = true;
@@ -462,7 +462,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private int last_zoom, before_last_zoom;
+        int last_zoom, before_last_zoom;
         public void ZoomFit ()
         {
             if (document == null)
@@ -507,7 +507,7 @@ namespace PdfMod.Gui
 
         #region Selection
 
-        private string selection_match_query;
+        string selection_match_query;
         public void SetSelectionMatchQuery (string query)
         {
             selection_match_query = query;
@@ -520,8 +520,8 @@ namespace PdfMod.Gui
             RefreshSelection ();
         }
 
-        private bool refreshing_selection;
-        private void RefreshSelection ()
+        bool refreshing_selection;
+        void RefreshSelection ()
         {
             refreshing_selection = true;
             if (page_selection_mode == PageSelectionMode.None) {
diff --git a/src/PdfMod/Gui/MetadataEditorBox.cs b/src/PdfMod/Gui/MetadataEditorBox.cs
index 59a7e3b..1e94832 100644
--- a/src/PdfMod/Gui/MetadataEditorBox.cs
+++ b/src/PdfMod/Gui/MetadataEditorBox.cs
@@ -25,13 +25,13 @@ namespace PdfMod.Gui
 {
     public class MetadataEditorBox : EventBox
     {
-        private Client app;
-        private Table table;
-        private Button revert_button;
-        private Document doc;
+        Client app;
+        Table table;
+        Button revert_button;
+        Document doc;
 
-        private TextProperty [] properties;
-        private TextProperty title, author, keywords, subject;
+        TextProperty [] properties;
+        TextProperty title, author, keywords, subject;
 
         public MetadataEditorBox (Client app)
         {
@@ -58,7 +58,7 @@ namespace PdfMod.Gui
             ShowAll ();
         }
 
-        private void BuildEditor ()
+        void BuildEditor ()
         {
             title    = new TextProperty (Catalog.GetString ("_Title:"),    t => doc.Title = t);
             author   = new TextProperty (Catalog.GetString ("_Author:"),   t => doc.Author = t);
@@ -81,7 +81,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private void BuildButtons ()
+        void BuildButtons ()
         {
             revert_button = new Hyena.Widgets.ImageButton (Catalog.GetString ("_Revert Properties"), "revert") {
                 TooltipText = Catalog.GetString ("Change the document's properties back to the original values")
@@ -99,7 +99,7 @@ namespace PdfMod.Gui
             table.Attach (close_button, 4, 5, 1, 2, AttachOptions.Fill, 0, 0, 0);
         }
 
-        private void UpdateSensitivity ()
+        void UpdateSensitivity ()
         {
             Sensitive = app.Document != null;
 
@@ -112,7 +112,7 @@ namespace PdfMod.Gui
 
         #region Event handlers
 
-        private void HandleDocumentLoaded (object o, EventArgs e)
+        void HandleDocumentLoaded (object o, EventArgs e)
         {
             doc = app.Document;
             var pdf = app.Document.Pdf;
@@ -154,7 +154,7 @@ namespace PdfMod.Gui
             UpdateSensitivity ();
         }
 
-        private void HandleRevert (object o, EventArgs args)
+        void HandleRevert (object o, EventArgs args)
         {
             foreach (var prop in properties) {
                 prop.Revert ();
@@ -180,14 +180,14 @@ namespace PdfMod.Gui
 
         #endregion
 
-        private class TextProperty
+        class TextProperty
         {
             public Entry Entry { get; private set; }
             public Label Label { get; private set; }
-            private string initial_value;
+            string initial_value;
 
-            private Hyena.Gui.EditableUndoAdapter<Entry> undo_adapter;
-            private Action<string> on_updated;
+            Hyena.Gui.EditableUndoAdapter<Entry> undo_adapter;
+            Action<string> on_updated;
 
             public TextProperty (string label, Action<string> onUpdated)
             {
diff --git a/src/PdfMod/Gui/PageCell.cs b/src/PdfMod/Gui/PageCell.cs
index 1d3d3e5..04f92a8 100644
--- a/src/PdfMod/Gui/PageCell.cs
+++ b/src/PdfMod/Gui/PageCell.cs
@@ -31,8 +31,8 @@ namespace PdfMod.Gui
     {
         const int scale_every = 400;
 
-        private ThumbnailLruCache surface_cache;
-        private IconView parent;
+        ThumbnailLruCache surface_cache;
+        IconView parent;
 
         public PageCell (IconView parent)
         {
@@ -120,7 +120,7 @@ namespace PdfMod.Gui
             cr.Paint ();
         }
 
-        private void PaintDocumentBorder (Context cr, double doc_width, double doc_height, double border_width)
+        void PaintDocumentBorder (Context cr, double doc_width, double doc_height, double border_width)
         {
             // Paint a nice document-like border around it
             var thin = 0.25 * border_width;
@@ -147,7 +147,7 @@ namespace PdfMod.Gui
             cr.Translate (border_width, border_width);
         }
 
-        private class ThumbnailLruCache : LruCache<Page, PageThumbnail>
+        class ThumbnailLruCache : LruCache<Page, PageThumbnail>
         {
             public ThumbnailLruCache () : base (60, 0.8)
             {
diff --git a/src/PdfMod/Gui/PageListStore.cs b/src/PdfMod/Gui/PageListStore.cs
index a23c259..b7ac848 100644
--- a/src/PdfMod/Gui/PageListStore.cs
+++ b/src/PdfMod/Gui/PageListStore.cs
@@ -64,7 +64,7 @@ namespace PdfMod.Gui
             }
         }
         
-        private string GetPageTooltip (Page page)
+        string GetPageTooltip (Page page)
         {
             var label = page.Document.Labels[page];
             string page_no = Catalog.GetString (String.Format ("Page {0}", page.Index + 1));
diff --git a/src/PdfMod/Gui/SelectMatchingBox.cs b/src/PdfMod/Gui/SelectMatchingBox.cs
index 8c5a9dd..f585557 100644
--- a/src/PdfMod/Gui/SelectMatchingBox.cs
+++ b/src/PdfMod/Gui/SelectMatchingBox.cs
@@ -24,8 +24,8 @@ namespace PdfMod.Gui
 {
     public class QueryBox : EventBox
     {
-        private Client app;
-        private HBox hbox;
+        Client app;
+        HBox hbox;
         public Entry Entry { get; private set; }
 
         public QueryBox (Client app)
@@ -67,7 +67,7 @@ namespace PdfMod.Gui
             app.IconView.GrabFocus ();
         }
 
-        private void OnActivated (object o, EventArgs args)
+        void OnActivated (object o, EventArgs args)
         {
             Hide ();
             if (!String.IsNullOrEmpty (Entry.Text.Trim ())) {
@@ -75,7 +75,7 @@ namespace PdfMod.Gui
             }
         }
 
-        private bool changing_style;
+        bool changing_style;
         protected override void OnStyleSet (Style style)
         {
             if (!changing_style) {
diff --git a/src/PdfMod/Main.cs b/src/PdfMod/Main.cs
index e0ee93f..1f18cf7 100644
--- a/src/PdfMod/Main.cs
+++ b/src/PdfMod/Main.cs
@@ -39,7 +39,7 @@ namespace PdfMod
             new Gui.Client (true);
         }
 
-        private static void InitCatalog (params string [] dirs)
+        static void InitCatalog (params string [] dirs)
         {
             foreach (var dir in dirs) {
                 var test_file = Path.Combine (dir, "fr/LC_MESSAGES/pdfmod.mo");
diff --git a/src/PdfMod/Pdf/Actions/ExportImagesAction.cs b/src/PdfMod/Pdf/Actions/ExportImagesAction.cs
index e8289e0..450bee6 100644
--- a/src/PdfMod/Pdf/Actions/ExportImagesAction.cs
+++ b/src/PdfMod/Pdf/Actions/ExportImagesAction.cs
@@ -45,7 +45,7 @@ namespace PdfMod.Pdf.Actions
 {
     public class ExportImagesAction
     {
-        private List<ImageInfo> image_objects;
+        List<ImageInfo> image_objects;
 
         public ExportImagesAction (Document document, IEnumerable<Page> pages)
         {
@@ -63,7 +63,7 @@ namespace PdfMod.Pdf.Actions
             }
         }
 
-        private IEnumerable<ImageInfo> GetImageObjectsFrom (IEnumerable<Page> pages)
+        IEnumerable<ImageInfo> GetImageObjectsFrom (IEnumerable<Page> pages)
         {
             // Doesn't seem like you can get the images just on one page; the following
             // gets all the images in the whole document, so only need to do it from one page
@@ -94,7 +94,7 @@ namespace PdfMod.Pdf.Actions
             //}
         }
 
-        private bool IsExportable (ImageInfo image)
+        bool IsExportable (ImageInfo image)
         {
             var filter = image.ImageObject.Elements.GetName("/Filter");
             return filter == "/DCTDecode" || filter == "/FlateDecode";
@@ -116,7 +116,7 @@ namespace PdfMod.Pdf.Actions
             }
         }
 
-        private static string GetFilename (ImageInfo image, string to_path, string ext)
+        static string GetFilename (ImageInfo image, string to_path, string ext)
         {
             var name = image.ImageObject.Elements.GetName ("/Name");
             var name_fragment = String.IsNullOrEmpty (name) ? null : String.Format (" ({0})", name);
@@ -162,7 +162,7 @@ namespace PdfMod.Pdf.Actions
             }
         }
 
-        private class ImageInfo {
+        class ImageInfo {
             public Page Page { get; set; }
             public PdfDictionary ImageObject { get; set; }
             public int PageIndex { get; set; }
diff --git a/src/PdfMod/Pdf/Actions/MoveAction.cs b/src/PdfMod/Pdf/Actions/MoveAction.cs
index ef2c8c9..10c6d94 100644
--- a/src/PdfMod/Pdf/Actions/MoveAction.cs
+++ b/src/PdfMod/Pdf/Actions/MoveAction.cs
@@ -14,8 +14,8 @@ namespace PdfMod.Pdf.Actions
 {
     public class MoveAction : BasePageAction
     {
-        private int [] old_indices;
-        private int to_index;
+        int [] old_indices;
+        int to_index;
 
         public MoveAction (Document document, IEnumerable<Page> pages, int to_index) : base (document, pages)
         {
diff --git a/src/PdfMod/Pdf/Actions/RemoveAction.cs b/src/PdfMod/Pdf/Actions/RemoveAction.cs
index a36e463..4ea6b5e 100644
--- a/src/PdfMod/Pdf/Actions/RemoveAction.cs
+++ b/src/PdfMod/Pdf/Actions/RemoveAction.cs
@@ -13,7 +13,7 @@ namespace PdfMod.Pdf.Actions
 {
     public class RemoveAction : BasePageAction
     {
-        private int [] old_indices;
+        int [] old_indices;
 
         public RemoveAction (Document document, IEnumerable<Page> pages) : base (document, pages)
         {
diff --git a/src/PdfMod/Pdf/Actions/RotateAction.cs b/src/PdfMod/Pdf/Actions/RotateAction.cs
index ca940e0..3aa3ecd 100644
--- a/src/PdfMod/Pdf/Actions/RotateAction.cs
+++ b/src/PdfMod/Pdf/Actions/RotateAction.cs
@@ -8,7 +8,7 @@ namespace PdfMod.Pdf.Actions
 {
     public class RotateAction : BasePageAction
     {
-        private int rotation;
+        int rotation;
 
         public RotateAction (Document document, IEnumerable<Page> pages, int rotation) : base (document, pages)
         {
diff --git a/src/PdfMod/Pdf/Document.cs b/src/PdfMod/Pdf/Document.cs
index e8df52f..2f6a48f 100644
--- a/src/PdfMod/Pdf/Document.cs
+++ b/src/PdfMod/Pdf/Document.cs
@@ -30,11 +30,14 @@ namespace PdfMod.Pdf
 {
     public class Document : IDisposable
     {
-        private PdfDocument pdf_document;
-        private List<Page> pages = new List<Page> ();
-        private string tmp_path;
-        private string tmp_uri;
-        private PageLabels page_labels;
+        PdfDocument pdf_document;
+        List<Page> pages = new List<Page> ();
+        string tmp_path;
+        string tmp_uri;
+        PageLabels page_labels;
+        Poppler.Document poppler_doc;
+        uint save_timeout_id = 0;
+
         internal string CurrentStateUri { get { return tmp_uri ?? Uri; } }
 
         public PageLabels Labels { get { return page_labels; } }
@@ -315,8 +318,7 @@ namespace PdfMod.Pdf
             }
         }
 
-        private Poppler.Document poppler_doc;
-        private Poppler.Document PopplerDoc {
+        Poppler.Document PopplerDoc {
             get {
                 if (poppler_doc == null) {
                     poppler_doc = Poppler.Document.NewFromFile (tmp_uri ?? Uri, Password ?? "");
@@ -325,7 +327,7 @@ namespace PdfMod.Pdf
             }
         }
 
-        private void ExpireThumbnails (IEnumerable<Page> update_pages)
+        void ExpireThumbnails (IEnumerable<Page> update_pages)
         {
             if (poppler_doc != null) {
                 poppler_doc.Dispose ();
@@ -357,15 +359,14 @@ namespace PdfMod.Pdf
             }
         }
 
-        private void Reindex ()
+        void Reindex ()
         {
             for (int i = 0; i < pages.Count; i++) {
                 pages[i].Index = i;
             }
         }
 
-        private uint save_timeout_id = 0;
-        private void StartSaveTempTimeout ()
+        void StartSaveTempTimeout ()
         {
             if (save_timeout_id != 0) {
                 GLib.Source.Remove (save_timeout_id);
@@ -374,14 +375,14 @@ namespace PdfMod.Pdf
             save_timeout_id = GLib.Timeout.Add (100, OnSaveTempTimeout);
         }
 
-        private bool OnSaveTempTimeout ()
+        bool OnSaveTempTimeout ()
         {
             save_timeout_id = 0;
             SaveTemp ();
             return false;
         }
 
-        private void SaveTemp ()
+        void SaveTemp ()
         {
             try {
                 if (tmp_path == null) {
@@ -401,7 +402,7 @@ namespace PdfMod.Pdf
             }
         }
 
-        private void OnPagesChanged (Page [] changed_pages)
+        void OnPagesChanged (Page [] changed_pages)
         {
             Reindex ();
             SaveTemp ();
@@ -414,7 +415,7 @@ namespace PdfMod.Pdf
             OnChanged ();
         }
 
-        private void OnChanged ()
+        void OnChanged ()
         {
             var handler = Changed;
             if (handler != null) {
diff --git a/src/PdfMod/Pdf/PageLabels.cs b/src/PdfMod/Pdf/PageLabels.cs
index 7bdcb7c..bf1c751 100644
--- a/src/PdfMod/Pdf/PageLabels.cs
+++ b/src/PdfMod/Pdf/PageLabels.cs
@@ -34,25 +34,25 @@ namespace PdfMod.Pdf
 
     public class PageLabels
     {
-        private const string name_labels = "/PageLabels";
-        private const string name_numtree = "/Nums";
+        const string name_labels = "/PageLabels";
+        const string name_numtree = "/Nums";
 
         // Keys (PdfNames) for formatting attributes
-        private const string name_fmt = "/S";
-        private const string name_start_at = "/St";
-        private const string name_prefix = "/P";
+        const string name_fmt = "/S";
+        const string name_start_at = "/St";
+        const string name_prefix = "/P";
 
         // Possible values for the numbering style
-        private const string alpha_upper = "/A";
-        private const string alpha_lower = "/a";
-        private const string roman_upper = "/R";
-        private const string roman_lower = "/r";
-        private const string arabic = "/D";
+        const string alpha_upper = "/A";
+        const string alpha_lower = "/a";
+        const string roman_upper = "/R";
+        const string roman_lower = "/r";
+        const string arabic = "/D";
 
-        private SortedDictionary<int, PageLabelFormat> page_labels;
-        private PdfDictionary.DictionaryElements pdf_elements;
-        private PdfDocument pdf_document;
-        private bool edited;
+        SortedDictionary<int, PageLabelFormat> page_labels;
+        PdfDictionary.DictionaryElements pdf_elements;
+        PdfDocument pdf_document;
+        bool edited;
 
         public string this[Page page] { get { return this[page.Index]; } }
 
@@ -145,7 +145,7 @@ namespace PdfMod.Pdf
         }
 
         // Determine which formatting rules apply to page index.  Returns the start of the formatting range
-        private int GetFormat (int index)
+        int GetFormat (int index)
         {
             // TODO: find the correct range using a binary search
 
@@ -161,7 +161,7 @@ namespace PdfMod.Pdf
         }
 
         // Render the value index in the proper format (case-agnostic)
-        private string RenderVal (int index, string fmt)
+        string RenderVal (int index, string fmt)
         {
             if (arabic == fmt) {
                 return index.ToString ();
@@ -175,7 +175,7 @@ namespace PdfMod.Pdf
         }
 
         // Convert val into Roman numerals
-        private string ToRoman (int val)
+        string ToRoman (int val)
         {
             StringBuilder roman_val = new StringBuilder ();
             // TODO: see if there's a more elegant conversion
@@ -233,7 +233,7 @@ namespace PdfMod.Pdf
         }
 
         // Convert val into the alpha representation. 1 -> a, 2 -> b, ... 26 -> z, 27 -> aa, 28 -> bb, etc.
-        private string ToAlpha (int val)
+        string ToAlpha (int val)
         {
             char letter = (char)((val - 1) % 26 + 'a');
             int rep_count = (val - 1)/26 + 1;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]