Minor code improving.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@299 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/rfb_win32/ListViewControl.cxx b/rfb_win32/ListViewControl.cxx
index 3240d8bf7c67fdbaa7e59e80f1e8f58b60bd8897..492aa8b0de8199275f7138fcccf046dbe5a7ec39 100644 (file)
--- a/rfb_win32/ListViewControl.cxx
+++ b/rfb_win32/ListViewControl.cxx
@@ -15,74 +15,74 @@ ListViewControl::ListViewControl()
 }
 
 int ListViewControl::IsSelectedLVItem(DWORD idListView,
-                                                                                                                                                       HWND hDlg, int numberItem)
+                                      HWND hDlg, int numberItem)
 {      
-       return (ListView_GetItemState(GetDlgItem(hDlg, idListView),
-                                                                                                                               numberItem, LVIS_SELECTED) == LVIS_SELECTED);
+  return (ListView_GetItemState(GetDlgItem(hDlg, idListView),
+    numberItem, LVIS_SELECTED) == LVIS_SELECTED);
 }
 
 void SelectLVItem(DWORD idListView, HWND hDlg, int numberItem)
 {
-       ListView_SetItemState(GetDlgItem(hDlg, idListView),
-                                     numberItem, LVIS_SELECTED, LVIS_SELECTED);
+  ListView_SetItemState(GetDlgItem(hDlg, idListView),
+    numberItem, LVIS_SELECTED, LVIS_SELECTED);
 }
 
 BOOL ListViewControl::InitLVColumns(DWORD idListView, HWND hDlg, int width, int columns,
-                                                       TCHAR *title[], DWORD mask, DWORD LVStyle, DWORD format)
+                                    TCHAR *title[], DWORD mask, DWORD LVStyle, DWORD format)
 {
-       ListView_SetExtendedListViewStyle(GetDlgItem(hDlg, idListView), LVStyle);
-       TCHAR szText[256];      
-       LVCOLUMN lvc; 
-       int iCol;
-       
-       lvc.mask = mask; 
-       
-       for (iCol = 0; iCol < columns; iCol++) { 
-               lvc.iSubItem = iCol;
-               lvc.pszText = szText;   
-               lvc.cx = width;           
-               lvc.fmt = format;
-               
-               _tcscpy(szText, title[iCol]); 
-               if (ListView_InsertColumn(GetDlgItem(hDlg, idListView), iCol, &lvc) == -1) 
-                       return FALSE; 
-       } 
-       return TRUE; 
+  ListView_SetExtendedListViewStyle(GetDlgItem(hDlg, idListView), LVStyle);
+  TCHAR szText[256];      
+  LVCOLUMN lvc; 
+  int iCol;
+  
+  lvc.mask = mask; 
+  
+  for (iCol = 0; iCol < columns; iCol++) { 
+    lvc.iSubItem = iCol;
+    lvc.pszText = szText;      
+    lvc.cx = width;           
+    lvc.fmt = format;
+    
+    _tcscpy(szText, title[iCol]); 
+    if (ListView_InsertColumn(GetDlgItem(hDlg, idListView), iCol, &lvc) == -1) 
+      return FALSE; 
+  } 
+  return TRUE; 
 }
 
 BOOL ListViewControl::InsertLVItem(DWORD idListView, HWND hDlg, int number,  TCHAR * texts[],
-                                                       int columns)
+                                   int columns)
 {
-       int i;
-       LVITEM lvI;
-       lvI.mask = LVIF_TEXT| LVIF_STATE; 
-       lvI.state = 0; 
-       lvI.stateMask = 0; 
-       lvI.iItem = number; 
-       lvI.iSubItem = 0; 
-       lvI.pszText = texts[0];                                                                           
-       
-       if(ListView_InsertItem(GetDlgItem(hDlg, idListView), &lvI) == -1)
-               return NULL;
-       
-       for (i =1; i < columns; i++) {  
-               SetLVItemText(
-                       idListView, hDlg, 
-                       number, i, texts[i]);
-       }
-       return TRUE;
+  int i;
+  LVITEM lvI;
+  lvI.mask = LVIF_TEXT| LVIF_STATE; 
+  lvI.state = 0; 
+  lvI.stateMask = 0; 
+  lvI.iItem = number; 
+  lvI.iSubItem = 0; 
+  lvI.pszText = texts[0];                                                                        
+  
+  if(ListView_InsertItem(GetDlgItem(hDlg, idListView), &lvI) == -1)
+    return NULL;
+  
+  for (i =1; i < columns; i++) {       
+    SetLVItemText(
+      idListView, hDlg, 
+      number, i, texts[i]);
+  }
+  return TRUE;
 }
 
 void ListViewControl::SetLVItemText(DWORD idListView, HWND hDlg, int numberItem,
-                                                       int namberColumn, TCHAR * text)
+                                    int namberColumn, TCHAR * text)
 {
-       ListView_SetItemText(
-                       GetDlgItem(hDlg, idListView), 
-                       numberItem, namberColumn, text);
+  ListView_SetItemText(
+    GetDlgItem(hDlg, idListView), 
+    numberItem, namberColumn, text);
 }
 
 void ListViewControl::GetLVItemText(DWORD idListView, HWND hDlg, int numberItem,
-                                                       int namberColumn, TCHAR * text)
+                                    int namberColumn, TCHAR * text)
 {
         ListView_GetItemText(GetDlgItem(hDlg, idListView), numberItem,
                                                        namberColumn, text, 256);
@@ -90,13 +90,14 @@ void ListViewControl::GetLVItemText(DWORD idListView, HWND hDlg, int numberItem,
 
 void ListViewControl::DeleteLVItem(DWORD idListView, HWND hDlg, int number)
 {
-       ListView_DeleteItem(GetDlgItem(hDlg, idListView), number);
+  ListView_DeleteItem(GetDlgItem(hDlg, idListView), number);
 }
 
 void ListViewControl::DeleteAllLVItem(DWORD idListView, HWND hDlg)
 {
-       ListView_DeleteAllItems(GetDlgItem(hDlg, idListView));
+  ListView_DeleteAllItems(GetDlgItem(hDlg, idListView));
 }
+
 ListViewControl::~ListViewControl()
 {
 }

diff --git a/rfb_win32/ListViewControl.h b/rfb_win32/ListViewControl.h
index fa171998f2e098332bdd3301dcdcd1d9f15ac10f..aef916e0e3af0a5d536260b165ab3a7cdc39875b 100644 (file)
--- a/rfb_win32/ListViewControl.h
+++ b/rfb_win32/ListViewControl.h
@@ -9,26 +9,26 @@
 #include "commctrl.h"
 
 namespace rfb {
-
+  
   namespace win32 {
-               class ListViewControl  
-               {
-               public:
-                       ListViewControl();
-                       int IsSelectedLVItem(DWORD idListView, HWND hDlg, int numberItem);
-                       void SelectLVItem(DWORD idListView, HWND hDlg, int numberItem);
-                       BOOL InitLVColumns(DWORD idListView, HWND hDlg, int width, int columns,
-                                                       TCHAR * title[], DWORD mask, DWORD style, DWORD format);
-                       BOOL InsertLVItem(DWORD idListView, HWND hDlg, int number,  TCHAR * texts[],
-                                                       int columns);
-                       void SetLVItemText(DWORD idListView, HWND hDlg, int numberItem,
-                                                       int namberColumn, TCHAR * text);
-                       void GetLVItemText(DWORD idListView, HWND hDlg, int numberItem,
-                                                       int namberColumn, TCHAR * text);
-                       void DeleteLVItem(DWORD idListView, HWND hDlg, int number);
-                       void DeleteAllLVItem(DWORD idListView, HWND hDlg);
-                       virtual ~ListViewControl();     
-               };
+    class ListViewControl  
+    {
+    public:
+      ListViewControl();
+      int IsSelectedLVItem(DWORD idListView, HWND hDlg, int numberItem);
+      void SelectLVItem(DWORD idListView, HWND hDlg, int numberItem);
+      BOOL InitLVColumns(DWORD idListView, HWND hDlg, int width, int columns,
+        TCHAR * title[], DWORD mask, DWORD style, DWORD format);
+      BOOL InsertLVItem(DWORD idListView, HWND hDlg, int number,  TCHAR * texts[],
+        int columns);
+      void SetLVItemText(DWORD idListView, HWND hDlg, int numberItem,
+        int namberColumn, TCHAR * text);
+      void GetLVItemText(DWORD idListView, HWND hDlg, int numberItem,
+        int namberColumn, TCHAR * text);
+      void DeleteLVItem(DWORD idListView, HWND hDlg, int number);
+      void DeleteAllLVItem(DWORD idListView, HWND hDlg);
+      virtual ~ListViewControl();      
+    };
   };
 };
 

diff --git a/winvnc/ControlPanel.cxx b/winvnc/ControlPanel.cxx
index 8162068b2115df94374efe188839c8d294f32d35..60624ce699701f479ffda40caf6fc2ae97a5ef43 100644 (file)
--- a/winvnc/ControlPanel.cxx
+++ b/winvnc/ControlPanel.cxx
@@ -13,24 +13,24 @@ using namespace winvnc;
 
 bool ControlPanel::showDialog()
 {
-       return Dialog::showDialog(MAKEINTRESOURCE(IDD_CONTROL_PANEL), NULL);
+  return Dialog::showDialog(MAKEINTRESOURCE(IDD_CONTROL_PANEL), NULL);
 }
 
 void ControlPanel::initDialog()
 {
-       TCHAR *ColumnsStrings[] = {
+  TCHAR *ColumnsStrings[] = {
     "IP address",
     "Time connected",
     "Status"
   };
-       InitLVColumns(IDC_LIST_CONNECTIONS, handle, 120, 3, ColumnsStrings,
-                                                               LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM,
-                                                               LVS_EX_FULLROWSELECT, LVCFMT_LEFT);
+  InitLVColumns(IDC_LIST_CONNECTIONS, handle, 120, 3, ColumnsStrings,
+                LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM,
+                LVS_EX_FULLROWSELECT, LVCFMT_LEFT);
 }
 
 bool ControlPanel::onCommand(int cmd)
 {
-        switch (cmd) {
+  switch (cmd) {
   case IDC_PROPERTIES:
     SendMessage(m_hSTIcon, WM_COMMAND, ID_OPTIONS, 0);
     return false;
@@ -54,17 +54,17 @@ bool ControlPanel::onCommand(int cmd)
     }
   }
   return false;
-
+  
 }
 
 void ControlPanel::UpdateListView()
 {
-
+  
 }
 
 BOOL ControlPanel::dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-       switch (msg) {
+  switch (msg) {
   case WM_INITDIALOG:
     handle = hwnd;
     initDialog();
@@ -84,10 +84,10 @@ BOOL ControlPanel::dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
 void ControlPanel::getSelectedConn(std::list<network::Socket*>* selsockets)
 {
-
+  
 }
 
 ControlPanel::~ControlPanel()
 {
-
+  
 }

diff --git a/winvnc/ControlPanel.h b/winvnc/ControlPanel.h
index ed761ead5da92fe7ba71b2e99e896a2b78400aee..5f9bc2407eee03126402a16a71298d89b5dd28a9 100644 (file)
--- a/winvnc/ControlPanel.h
+++ b/winvnc/ControlPanel.h
@@ -18,13 +18,13 @@
 #include <rfb_win32/Win32Util.h>
 
 namespace winvnc {
-
+  
   class ControlPanel : rfb::win32::Dialog, rfb::win32::ListViewControl {
   public:
-       ControlPanel(VNCServerWin32 * server, HWND hSTIcon) : Dialog(GetModuleHandle(0)), ListViewControl(){
-               m_server = server;
-               m_hSTIcon = hSTIcon;
-       };
+    ControlPanel(VNCServerWin32 * server, HWND hSTIcon) : Dialog(GetModuleHandle(0)), ListViewControl(){
+      m_server = server;
+      m_hSTIcon = hSTIcon;
+    };
     virtual bool showDialog();
     virtual void initDialog();
     virtual bool onCommand(int cmd);
@@ -34,9 +34,9 @@ namespace winvnc {
   protected: 
     virtual BOOL dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
     void getSelectedConn(std::list<network::Socket*>* selsockets);
-               VNCServerWin32 * m_server;
-               std::list<network::Socket*> sockets;
-               HWND m_hSTIcon;
+    VNCServerWin32 * m_server;
+    std::list<network::Socket*> sockets;
+    HWND m_hSTIcon;
   };
 };