Commit: 552257e3e3ccf811b137250d0010f2027e6629c7 - nlite (git)

Commit MetaInfo

• Revision: 552257e3e3ccf811b137250d0010f2027e6629c7 (tree)
• Time: 2012-02-26 21:22:32
• Author: qwerty2501 <riot313@gmai...>
• Commiter: qwerty2501

Log Message

プロパティクラスのアクセス修飾子を修正

Change Summary

• modified: nlite.suo
• modified: nlite/nlite.h
• modified: nlite/nlite_chatData.cpp
• modified: nlite/nlite_commentview.cpp
• modified: nlite/nlite_commentview.h
• modified: nlite/nlite_common.cpp
• modified: nlite/nlite_common.h
• modified: nlite/nlite_mainframe.cpp
• modified: nlite/nlite_property.cpp
• modified: nlite/nlite_property.h

Incremental Difference

Binary files a/nlite.suo and b/nlite.suo differ

--- a/nlite/nlite.h
+++ b/nlite/nlite.h
@@ -7,15 +7,15 @@ namespace nlite{
 	//クラス先行宣言
 	class CApplicationInfo;
 	class CListenerList;
-	struct Property;
-	struct GeneralProperty;
+	class CProperty;
+	class CGeneralProperty;
 	class CListenerData;
 
 	
 
 
 	//アプリケーションプロパティ
-	extern Property nliteProperty;						
+	extern CProperty nliteProperty;						
 	const static UINT_PTR COMMENTVIEW_HEADERITEMSIZE = 5;
 	enum MESSAGE{
 		UM_COMMENTVIEW_SETCTRL = WM_USER + 1,

--- a/nlite/nlite_chatData.cpp
+++ b/nlite/nlite_chatData.cpp
@@ -124,7 +124,7 @@ VOID CChatData::SetChat(NicoLiveChat &chat_in,CListenerData &listener){
 		
 		const tstring &name = results.str(results.size() - 1).c_str();
 		
-		if(nliteProperty.gp.numberNameFlag == TRUE || _tcstol(name.c_str(),NULL,10) == 0){
+		if(nliteProperty.GetGeneralProperty().IsNumberName() == TRUE || _tcstol(name.c_str(),NULL,10) == 0){
 			this->listenerData->SetUserName(name.c_str());
 		}
 		
@@ -271,7 +271,7 @@ CCommentList::iterator CCommentList::OnChatReceve(NicoLiveChat_P chatData_in,LPC
 	if(empty() == TRUE || back().date <= chatData.date){
 		chatList.push_back(chatData);
 		rslt = (--chatList.end());
-		if(nlite::nliteProperty.crp.commentReadFlag == TRUE){
+		if(nlite::nliteProperty.GetCommentReadProperty().IsCommentRead() == TRUE){
 			
 			g_speaker.SynthesisAsync((const speaker::TChar_P)(LPCTSTR)rslt->chatBuf);
 		}

--- a/nlite/nlite_commentview.cpp
+++ b/nlite/nlite_commentview.cpp
@@ -30,12 +30,12 @@ namespace nlite{
 			defaultFormat.dwMask |=  CFM_COLOR;
 			if(chat.GetPremium() == 2 || chat.GetPremium() == 3){
 
-				defaultFormat.crTextColor = m_master.viewproperty.ownerStringColor;
+				defaultFormat.crTextColor = m_master.viewproperty.GetOwnerStringColor();
 			}
 			
 			else {
 
-				defaultFormat.crTextColor = m_master.viewproperty.baseStringColor;
+				defaultFormat.crTextColor = m_master.viewproperty.GetBaseStringColor();
 
 			}
 
@@ -162,7 +162,7 @@ namespace nlite{
 
 		if (comment.IsSelect() == TRUE)
 		{
-			bkColor = m_master.viewproperty.selectBackColor;
+			bkColor = m_master.viewproperty.GetSelectBackColor();
 
 		}
 		else  
@@ -180,7 +180,7 @@ namespace nlite{
 
 			} else {
 
-				bkColor = m_master.viewproperty.backColor;
+				bkColor = m_master.viewproperty.GetBackColor();
 
 
 
@@ -262,7 +262,7 @@ namespace nlite{
 
 				if(ctrlsBegin == ctrlsEnd)ctrlsBegin = Extend();
 
-				ctrlsBegin->SetCtrl(hdwp,tmpRect,*chatDataBegin,m_hMaster.viewproperty.commentFoldingFlag);
+				ctrlsBegin->SetCtrl(hdwp,tmpRect,*chatDataBegin,m_hMaster.viewproperty.IsCommentFoldingFlag());
 
 				heightSum = tmpRect.bottom;
 
@@ -385,7 +385,7 @@ namespace nlite{
 		return nMax;
 	}
 
-	VOID CCommentView::SetProperty(const CommentViewProperty &setProperty,const GeneralProperty &in_generalProperty){
+	VOID CCommentView::SetProperty(const CCommentViewProperty &setProperty,const CGeneralProperty &in_generalProperty){
 
 		
 		viewproperty = setProperty;
@@ -395,7 +395,7 @@ namespace nlite{
 		return;
 	}
 
-	CommentViewProperty &CCommentView::GetProperty(){
+	CCommentViewProperty &CCommentView::GetProperty(){
 
 		return viewproperty;
 
@@ -424,7 +424,7 @@ namespace nlite{
 
 			GetTextExtentPoint32(hdc , columns[index] , _tcslen(columns[index]) , &size);
 			UINT_PTR holsize = holizenSize[index] + size.cx + 15;
-			holizenSize[index] = viewproperty.headerholSize[index] >= 0 ? viewproperty.headerholSize[index] : holsize;
+			holizenSize[index] = viewproperty.GetHeaderHolSize()[index] >= 0 ? viewproperty.GetHeaderHolSize()[index] : holsize;
 		}
 
 		SelectObject(hdc,hOld);
@@ -436,7 +436,7 @@ namespace nlite{
 
 		AddHeader(&headersinfo);
 
-		m_header.SetOrderArray(ARRAY_LENGTH(viewproperty.headerOrderArray),viewproperty.headerOrderArray);
+		m_header.SetOrderArray(viewproperty.GetHeaderOrderArrayLength(),viewproperty.GetHeaderOrderArray());
 
 		
 		
@@ -636,13 +636,13 @@ namespace nlite{
 
 
 	VOID CCommentView::OnDestroy(){
-		m_header.GetOrderArray(ARRAY_LENGTH(viewproperty.headerOrderArray),viewproperty.headerOrderArray);
+		m_header.GetOrderArray(viewproperty.GetHeaderOrderArrayLength(),viewproperty.GetHeaderOrderArray());
 		INT_PTR headerItemcount = m_header.GetItemCount();
 		RECT headerItemRect;
 		for(INT_PTR itemindex = 0;itemindex < headerItemcount;itemindex++){
 
 			m_header.GetItemRect(itemindex,&headerItemRect);
-			viewproperty.headerholSize[itemindex] = headerItemRect.right - headerItemRect.left;
+			viewproperty.GetHeaderHolSize()[itemindex] = headerItemRect.right - headerItemRect.left;
 		}
 		commentlist.OnDestroy();
 		m_header.DestroyWindow();
@@ -892,11 +892,11 @@ namespace nlite{
 		if(selectSellLinePen.IsNull() ==FALSE)selectSellLinePen.DeleteObject();
 		if(selectBkBrush.IsNull() == FALSE)selectBkBrush.DeleteObject();
 
-		collLinePen.CreatePen(PS_SOLID,1,self.viewproperty.colLineColor);
-		normalSellLinePen.CreatePen(PS_SOLID,1,self.viewproperty.normalSellLineColor);
-		normalBkBrush.CreateSolidBrush(self.viewproperty.backColor);
-		selectSellLinePen.CreatePen(PS_SOLID,1,self.viewproperty.selectSellLineColor);
-		selectBkBrush.CreateSolidBrush(self.viewproperty.selectBackColor);
+		collLinePen.CreatePen(PS_SOLID,1,self.viewproperty.GetColLineColor());
+		normalSellLinePen.CreatePen(PS_SOLID,1,self.viewproperty.GetNormalLineColor());
+		normalBkBrush.CreateSolidBrush(self.viewproperty.GetBackColor());
+		selectSellLinePen.CreatePen(PS_SOLID,1,self.viewproperty.GetSelectSellLineColor());
+		selectBkBrush.CreateSolidBrush(self.viewproperty.GetSelectBackColor());
 
 
 		if(IsWindow() == TRUE)this->SetRedraw(TRUE);
@@ -1177,7 +1177,7 @@ overclientrect:
 		//選択状態かチェック
 		if (chatData.IsSelect() == TRUE)
 		{
-			bkColor = self.viewproperty.selectBackColor;
+			bkColor = self.viewproperty.GetSelectBackColor();
 			
 			dc.SelectBrush(this->selectBkBrush);
 			dc.SelectPen(this->selectSellLinePen);
@@ -1212,7 +1212,7 @@ overclientrect:
 				dc.SelectBrush(originBkBrush);
 			} else {
 
-				bkColor = self.viewproperty.backColor;
+				bkColor = self.viewproperty.GetBackColor();
 				dc.SelectBrush(this->normalBkBrush);
 				dc.SelectBrush(this->normalBkBrush);
 
@@ -1234,14 +1234,14 @@ overclientrect:
 		
 		const CNLiteString &viewUserName = chatData.GetListnerData().GetName().Length() == 0 ? chatData.GetListnerData().GetUserID() : chatData.GetListnerData().GetName();
 		dc.SelectFont(linkFont);
-		dc.SetTextColor(chatData.GetListnerData().GetNameColor() != CListenerData::INIT_COLOR ? chatData.GetListnerData().GetNameColor() : self.viewproperty.linkStringColor);
+		dc.SetTextColor(chatData.GetListnerData().GetNameColor() != CListenerData::INIT_COLOR ? chatData.GetListnerData().GetNameColor() : self.viewproperty.GetLinkStringColor());
 		//テキスト描画
 		dc.DrawTextW(noString,_tcslen(noString),&noViewRect,DT_WORD_ELLIPSIS);
 
 		
 		dc.DrawTextW(viewUserName,viewUserName.Length(),&userNameViewRect,DT_WORD_ELLIPSIS);
 		dc.SelectFont(::AtlGetDefaultGuiFont());
-		dc.SetTextColor(chatData.GetStringColor() == CChatData::ViewData::INIT_COLOR ? chatData.GetStringColor() :self.viewproperty.baseStringColor);
+		dc.SetTextColor(chatData.GetStringColor() == CChatData::ViewData::INIT_COLOR ? chatData.GetStringColor() :self.viewproperty.GetBaseStringColor());
 		dc.DrawTextW(dateString,_tcslen(dateString),&timeViewRect,DT_WORD_ELLIPSIS);
 
 		return;

--- a/nlite/nlite_commentview.h
+++ b/nlite/nlite_commentview.h
@@ -370,9 +370,9 @@ namespace nlite{
 		CHeaderCtrl m_header;						//ヘッダーコントロール
 		CCommentListWindow  m_commentListWindow;	//コメントリストウィンドウ
 		CNicoLiveStream &stream;					//放送オブジェクト
-		GeneralProperty generalProperty;			//一般設定
+		CGeneralProperty generalProperty;			//一般設定
 		CCommentList commentlist;					//コメントリスト
-		CommentViewProperty viewproperty;			//表示プロパティ
+		CCommentViewProperty viewproperty;			//表示プロパティ
 		HFONT hHeaderFontNew;						//ヘッダーフォント
 		CNicoVideoAuth &refAuth;					//ニコニコ生放送認証オブジェクト参照
 		CChatChildCtrlsList chatChildCtrlsList;		//子ウィンドウリスト
@@ -435,12 +435,12 @@ namespace nlite{
 		///
 		///プロパティ設定
 		///
-		VOID SetProperty(const CommentViewProperty &setProperty,const GeneralProperty &in_generalProperty);
+		VOID SetProperty(const CCommentViewProperty &setProperty,const CGeneralProperty &in_generalProperty);
 
 		///
 		///プロパティ取得
 		///
-		CommentViewProperty &GetProperty();
+		CCommentViewProperty &GetProperty();
 
 		///
 		///ウィンドウ作成

--- a/nlite/nlite_common.cpp
+++ b/nlite/nlite_common.cpp
@@ -22,7 +22,7 @@ namespace nlite{
 		const  tregex LILNKREGEX(text::LINK_TEXT);
 		const tregex NAMESERTCHREGEX(text::SEARTCH_AT_MARK);
 	}
-	Property nliteProperty;	
+	CProperty nliteProperty;	
 	CListenerList nlite::listenerList;
 	TCHAR appFolderPath[_MAX_PATH];
 	CString ncvAppSettingPath;
@@ -30,7 +30,7 @@ namespace nlite{
 	speaker::ISpeaker &g_speaker = speaker::ISpeaker::GetMeiNormal(TEXT("libs\\Voice\\mei_normal\\"),TEXT("libs\\open_jtalk_dic\\"));
 	VOID nlite::UnexpectedErrorMessageShow(LPCTSTR headMessage,LPCTSTR summary,UINT line,LPCTSTR fileName,LPCTSTR function){
 		
-		CString errLogFilePath(nliteProperty.propertySaveFolderPath);
+		CString errLogFilePath(nliteProperty.GetPropertySaveFolderPath());
 		CAtlFile errFile;
 		TCHAR errfile[_MAX_PATH];
 
@@ -70,17 +70,17 @@ namespace nlite{
 		return;
 	}
 
-	HINSTANCE OpenURL(HWND hwnd,const GeneralProperty &gp,LPCTSTR url ,INT nShowCommand){
+	HINSTANCE OpenURL(HWND hwnd,const CGeneralProperty &gp,LPCTSTR url ,INT nShowCommand){
 
 		HINSTANCE rslt;
 
-		if(gp.browserPath.Length() == 0){
+		if(gp.GetBrowserPath().Length() == 0){
 
 			rslt = ShellExecute(hwnd, NULL, url, NULL, NULL, nShowCommand);
 
 		} else{
 
-			rslt = ShellExecute(hwnd, NULL, gp.browserPath, url, NULL, nShowCommand);
+			rslt = ShellExecute(hwnd, NULL, gp.GetBrowserPath(), url, NULL, nShowCommand);
 
 		}
 

--- a/nlite/nlite_common.h
+++ b/nlite/nlite_common.h
@@ -13,7 +13,7 @@ namespace nlite{
 	//グローバル関数
 	extern VOID UnexpectedErrorMessageShow(LPCTSTR headMessage,LPCTSTR summary,UINT line,LPCTSTR fileName,LPCTSTR function);
 	
-	extern HINSTANCE OpenURL(HWND hwnd,const GeneralProperty &gp,LPCTSTR url ,INT nShowCommand);
+	extern HINSTANCE OpenURL(HWND hwnd,const CGeneralProperty &gp,LPCTSTR url ,INT nShowCommand);
 
 	///
 	///指定されたディレクトリにファイルまたはディレクトリを作成

--- a/nlite/nlite_mainframe.cpp
+++ b/nlite/nlite_mainframe.cpp
@@ -158,8 +158,8 @@ LRESULT CNliteMainFrame::OnCreate(LPCREATESTRUCT lpcs){
 	this->GetWindowRect(&wndRect);
 	
 	LONG cyMaxImized = GetSystemMetrics (SM_CYMAXIMIZED);
-	wndRect.bottom = nliteProperty.mfp.windowSize.cy != 0 ? nliteProperty.mfp.windowSize.cy : (LONG)cyMaxImized / 2;
-	wndRect.right = nliteProperty.mfp.windowSize.cx != 0 ? nliteProperty.mfp.windowSize.cx : commentViewSize.left + commentViewSize.right + 20 + commentView.GetColumnHolSizeSum();
+	wndRect.bottom = nliteProperty.GetMainFrameProperty().GetWindowSize().cy != 0 ? nliteProperty.GetMainFrameProperty().GetWindowSize().cy : (LONG)cyMaxImized / 2;
+	wndRect.right = nliteProperty.GetMainFrameProperty().GetWindowSize().cx != 0 ? nliteProperty.GetMainFrameProperty().GetWindowSize().cx : commentViewSize.left + commentViewSize.right + 20 + commentView.GetColumnHolSizeSum();
 
 	
 
@@ -174,10 +174,10 @@ LRESULT CNliteMainFrame::OnCreate(LPCREATESTRUCT lpcs){
 	
 	listenerSettingWindow.Create(*this);
 	
-	this->SetMenuItemCheck(IDM_FRONT_WINDOW_CHECK,nliteProperty.mfp.windowFrontFlag);
-	this->SetMenuItemCheck(IDM_SPEAK_COMMENT_CHECK,nliteProperty.crp.commentReadFlag);
+	this->SetMenuItemCheck(IDM_FRONT_WINDOW_CHECK,nliteProperty.GetMainFrameProperty().IsWindowFront());
+	this->SetMenuItemCheck(IDM_SPEAK_COMMENT_CHECK,nliteProperty.GetCommentReadProperty().IsCommentRead());
 	
-	this->SetWindowPos(nliteProperty.mfp.windowFrontFlag == TRUE ? HWND_TOPMOST : HWND_NOTOPMOST,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE);
+	this->SetWindowPos(nliteProperty.GetMainFrameProperty().IsWindowFront() == TRUE ? HWND_TOPMOST : HWND_NOTOPMOST,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE);
 
 	return 0;
 }
@@ -190,31 +190,31 @@ VOID CNliteMainFrame::Initialize(LPCTSTR localAppDataPath){
 		nliteProperty.ReadProperty();
 
 	
-		if((nliteProperty.gp.ncvUserSettingReadedFlag == FALSE) && 
+		if((nliteProperty.GetGeneralProperty().IsNCVUserSettingReaded() == FALSE) && 
 			((PathFileExists(ncvAppSettingPath) &&  (!::PathIsDirectory( ncvAppSettingPath ))))){
 		
 			if((::MessageBox(NULL,TEXT("NCVのリスナー情報と同期しますか？"),TEXT("リスナー情報読み込み"),MB_OK | MB_OKCANCEL) == IDOK)){
 				listenerList.ReadProperty(GetNCVListenerInfoFilePath());
 			}
-			nliteProperty.gp.ncvUserSettingReadedFlag = TRUE;
+			nliteProperty.GetGeneralProperty().SetNCVUSerSettingReaded(TRUE);
 		
 
 			
 			
 		}
 
-		listenerList.ReadProperty(nliteProperty.listenerDataPath);
+		listenerList.ReadProperty(nliteProperty.GetListenerDataPath());
 
-		commentView.SetProperty(nliteProperty.cvp,nliteProperty.gp);
-		if(nliteProperty.gp.browserType == BT_NOSETTING){
+		commentView.SetProperty(nliteProperty.GetCommentViewProperty(),nliteProperty.GetGeneralProperty());
+		if(nliteProperty.GetGeneralProperty().GetBrowserType() == BT_NOSETTING){
 			nliteProperty.CookieSetting();
-			while(nliteProperty.gp.browserType == BT_NOSETTING){
+			while(nliteProperty.GetGeneralProperty().GetBrowserType() == BT_NOSETTING){
 				::MessageBox(NULL,TEXT("ブラウザタイプを指定してください。これ以外のブラウザは現在使用することはできません"),TEXT("ブラウザタイプ指定エラー"),MB_OK);
 				nliteProperty.CookieSetting();
 			}
 		}
 			
-		nicoVideoAuth.SetBrowserType(nliteProperty.gp.browserType);
+		nicoVideoAuth.SetBrowserType(nliteProperty.GetGeneralProperty().GetBrowserType());
 		nicoLiveStream.SetResFrom(200);
 	}catch(Exception &e){
 
@@ -279,9 +279,9 @@ VOID CNliteMainFrame::OnMenuAbount(UINT uNotifyCode,int nID,HWND hWndCtl){
 
 VOID CNliteMainFrame::Finalaize(){
 
-	nliteProperty.cvp = commentView.GetProperty();
+	nliteProperty.SetCommentViewProperty(commentView.GetProperty());
 	nliteProperty.WriteProperty();
-	listenerList.WriteProperty(nliteProperty.listenerDataPath);
+	listenerList.WriteProperty(nliteProperty.GetListenerDataPath());
 }
 
 VOID CNliteMainFrame::OnViewPreference(UINT uNotifyCode,int nID,HWND hWndCtl){
@@ -302,13 +302,13 @@ LRESULT CNliteMainFrame::OnUnlockLvNoBuffer(UINT uMsg,WPARAM wParam,LPARAM lPara
 VOID CNliteMainFrame::OnCookie(UINT uNotifyCode,int nID,HWND hWndCtl){
 	nliteProperty.CookieSetting();
 			
-	while(nliteProperty.gp.browserType == BT_NOSETTING){
+	while(nliteProperty.GetGeneralProperty().GetBrowserType() == BT_NOSETTING){
 		::MessageBox(NULL,TEXT("ブラウザタイプを指定してください。これ以外のブラウザは現在使用することはできません"),TEXT("ブラウザタイプ指定エラー"),MB_OK);
 		nliteProperty.CookieSetting();
 	}
 			
 	try {
-		nicoVideoAuth.SetBrowserType(nliteProperty.gp.browserType);
+		nicoVideoAuth.SetBrowserType(nliteProperty.GetGeneralProperty().GetBrowserType());
 	} catch(NLIBException &e){
 
 		MessageBox(e.what(),TEXT("クッキー取得失敗"),MB_OK | MB_ICONERROR);
@@ -321,8 +321,8 @@ VOID CNliteMainFrame::OnCookie(UINT uNotifyCode,int nID,HWND hWndCtl){
 VOID CNliteMainFrame::OnSpeakCommentCheck(UINT uNotifyCode,int nID,HWND hWndCtl){
 
 
-	nliteProperty.crp.commentReadFlag = !IsMenuItemChecked(IDM_SPEAK_COMMENT_CHECK);
-	SetMenuItemCheck(IDM_SPEAK_COMMENT_CHECK,nliteProperty.crp.commentReadFlag );
+	nliteProperty.GetCommentReadProperty().SetCommentRead(!IsMenuItemChecked(IDM_SPEAK_COMMENT_CHECK));
+	SetMenuItemCheck(IDM_SPEAK_COMMENT_CHECK,nliteProperty.GetCommentReadProperty().IsCommentRead() );
 	
 	return;
 }
@@ -330,9 +330,9 @@ VOID CNliteMainFrame::OnSpeakCommentCheck(UINT uNotifyCode,int nID,HWND hWndCtl)
 VOID CNliteMainFrame::OnFrontWindowCheck(UINT uNotifyCode,int nID,HWND hWndCtl){
 
 
-	nliteProperty.mfp.windowFrontFlag = !IsMenuItemChecked(IDM_FRONT_WINDOW_CHECK);
-	SetMenuItemCheck(IDM_FRONT_WINDOW_CHECK,nliteProperty.mfp.windowFrontFlag );
-	this->SetWindowPos(nliteProperty.mfp.windowFrontFlag == TRUE ? HWND_TOPMOST : HWND_NOTOPMOST,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE);
+	nliteProperty.GetMainFrameProperty().SetWindowFront(!IsMenuItemChecked(IDM_FRONT_WINDOW_CHECK));
+	SetMenuItemCheck(IDM_FRONT_WINDOW_CHECK,nliteProperty.GetMainFrameProperty().IsWindowFront() );
+	this->SetWindowPos(nliteProperty.GetMainFrameProperty().IsWindowFront() == TRUE ? HWND_TOPMOST : HWND_NOTOPMOST,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE);
 	return;
 }
 

--- a/nlite/nlite_property.cpp
+++ b/nlite/nlite_property.cpp
@@ -48,7 +48,7 @@ namespace nlite{
 
 
 
-	CommentViewProperty::CommentViewProperty():
+	CCommentViewProperty::CCommentViewProperty():
 	commentFoldingFlag(TRUE),
 		commentTimeType(StreamingTimeType),
 		baseStringColor(PALETTERGB(0,0,0)),
@@ -72,8 +72,68 @@ namespace nlite{
 
 
 
+COLORREF CCommentViewProperty::GetOwnerStringColor()const{
 
-	CommentReadProperty::CommentReadProperty():
+	return this->ownerStringColor;
+}
+
+COLORREF CCommentViewProperty::GetBaseStringColor()const{
+
+	return this->baseStringColor;
+}
+
+
+COLORREF CCommentViewProperty::GetSelectBackColor()const{
+
+	return this->selectBackColor;
+}
+
+COLORREF CCommentViewProperty::GetSelectSellLineColor()const{
+
+	return this->selectBackColor;
+}
+
+COLORREF CCommentViewProperty::GetBackColor()const{
+
+	return this->backColor;
+}
+
+COLORREF CCommentViewProperty::GetNormalLineColor()const{
+
+	return this->normalSellLineColor;
+}
+
+COLORREF CCommentViewProperty::GetLinkStringColor()const{
+
+	return this->linkStringColor;
+}
+
+COLORREF CCommentViewProperty::GetColLineColor()const{
+
+	return this->colLineColor;
+}
+
+BOOL CCommentViewProperty::IsCommentFoldingFlag()const{
+
+	return this->commentFoldingFlag;
+}
+
+INT_PTR *CCommentViewProperty::GetHeaderHolSize(){
+
+	return this->headerholSize;
+
+}
+
+INT_PTR *CCommentViewProperty::GetHeaderOrderArray(){
+
+	return this->headerOrderArray;
+}
+
+UINT_PTR CCommentViewProperty::GetHeaderOrderArrayLength()const{
+
+	return ARRAY_LENGTH(this->headerOrderArray);
+}
+	CCommentReadProperty::CCommentReadProperty():
 	commentReadFlag(FALSE),
 		ngWordReadFlag(TRUE),
 		ngUserReadFlag(TRUE),
@@ -83,10 +143,19 @@ namespace nlite{
 		teropReadFlag(TRUE)
 	{}
 
+	VOID CCommentReadProperty::SetCommentRead(BOOL flag){
+
+		this->commentReadFlag = flag;
+	}
+
+	BOOL CCommentReadProperty::IsCommentRead()const{
+
+		return this->commentReadFlag;
+	}
 
 
 
-	GeneralProperty::GeneralProperty():
+	CGeneralProperty::CGeneralProperty():
 	userCountUpdateFlag(TRUE),
 		commentLogAutoSaveFlag(FALSE),
 		defaultBrowserFlag(TRUE),
@@ -99,20 +168,57 @@ namespace nlite{
 		ncvUserSettingReadedFlag(FALSE)
 	{}
 
+	VOID CGeneralProperty::SetNCVUSerSettingReaded(BOOL flag){
+		this->ncvUserSettingReadedFlag = flag;
+		return;
+	}
 
+	BOOL CGeneralProperty::IsNCVUserSettingReaded()const{
 
-	MainFrameProperty::MainFrameProperty():
+		return this->ncvUserSettingReadedFlag;
+
+	}
+
+	BOOL CGeneralProperty::IsNumberName()const{
+
+		return this->numberNameFlag;
+	}
+
+	BROWSERTYPE CGeneralProperty::GetBrowserType()const{
+
+		return this->browserType;
+	}
+
+	const CNLiteString &CGeneralProperty::GetBrowserPath()const{
+
+		return this->browserPath;
+	}
+
+	CMainFrameProperty::CMainFrameProperty():
 	windowFrontFlag(TRUE)
 	{
 
 		ZeroMemory(&windowSize,sizeof(windowSize));
 
 	}
+	VOID CMainFrameProperty::SetWindowFront(BOOL flag){
+		this->windowFrontFlag = flag;
+		return;
+	}
+
+	const SIZE &CMainFrameProperty::GetWindowSize()const{
+
+		return this->windowSize;
+	}
+
+	BOOL CMainFrameProperty::IsWindowFront()const{
 
+		return this->windowFrontFlag;
+	}
 
 
 
-	Property::Property()
+	CProperty::CProperty()
 	{
 		TCHAR localAppPath[_MAX_PATH];
 		SHGetFolderPathW(0,CSIDL_LOCAL_APPDATA,0,SHGFP_TYPE_CURRENT,localAppPath);
@@ -120,19 +226,19 @@ namespace nlite{
 		this->appLocalPath = localAppPath;
 	}
 
-	Property::~Property()
+	CProperty::~CProperty()
 	{
 
 
 	}
 
-	VOID Property::Initialize(){
-		this->~Property();
-		new(this) Property;
+	VOID CProperty::Initialize(){
+		this->~CProperty();
+		new(this) CProperty;
 
 	}
 
-	BROWSERTYPE Property::CookieSetting(){
+	BROWSERTYPE CProperty::CookieSetting(){
 
 		CCookieSettingWindow cookieSettingwindow;
 
@@ -149,7 +255,34 @@ namespace nlite{
 
 	}
 
-	VOID Property::ReadProperty(){
+	VOID CProperty::SetCommentViewProperty(const CCommentViewProperty& commentViewProperty){
+
+		this->cvp = commentViewProperty;
+		return;
+	}
+
+	CCommentViewProperty &CProperty::GetCommentViewProperty(){
+
+		return this->cvp;
+	}
+
+	CMainFrameProperty &CProperty::GetMainFrameProperty(){
+
+		return this->mfp;
+	}
+
+	CGeneralProperty &CProperty::GetGeneralProperty(){
+
+		return this->gp;
+	}
+
+	CCommentReadProperty &CProperty::GetCommentReadProperty(){
+
+		return this->crp;
+
+	}
+
+	VOID CProperty::ReadProperty(){
 
 		CreatePropertyFile();
 		CAtlFile	propertyFile;
@@ -169,7 +302,7 @@ namespace nlite{
 		
 		LPSTR propertyTagStart = strstr(&propertyBuf[0],"<");
 		if(propertyTagStart != NULL){
-			ReadPropertyXML reader(*this);
+			CReadPropertyXML reader(*this);
 			reader.Parse(propertyTagStart);
 		}
 
@@ -179,8 +312,18 @@ namespace nlite{
 		return;
 	}
 
+	const CNLiteString &CProperty::GetListenerDataPath()const{
+
+		return this->listenerDataPath;
+	}
+
+	const CNLiteString &CProperty::GetPropertySaveFolderPath()const{
+
+		return this->propertyFolderPath;
+	}
+
 
-	VOID Property::CreatePropertyFile(){
+	VOID CProperty::CreatePropertyFile(){
 
 		CString iniFile;
 		iniFile = appLocalPath;
@@ -218,7 +361,7 @@ namespace nlite{
 	}
 
 
-	VOID Property::WriteProperty(){
+	VOID CProperty::WriteProperty(){
 
 		CreatePropertyFile();
 		CComPtr<IXmlWriter> pWriter;
@@ -310,7 +453,7 @@ namespace nlite{
 	///
 	///コンストラクタ
 	///
-	ReadPropertyXML::ReadPropertyXML(Property &in_property):nliteProperty(in_property),propertyType(Node::None){
+	CReadPropertyXML::CReadPropertyXML(CProperty &in_property):nliteProperty(in_property),propertyType(Node::None){
 
 		return;
 	}
@@ -322,7 +465,7 @@ namespace nlite{
 	//
 
 #define NLITE_PSZNAME_CMP(t,p) (_tcscmp(NLITE_GET_TYPENAME(t),(LPCTSTR)(p)) == 0)
-	void ReadPropertyXML::OnStartElement (const XML_Char *pszName, const XML_Char **papszAttrs){
+	void CReadPropertyXML::OnStartElement (const XML_Char *pszName, const XML_Char **papszAttrs){
 
 		switch(propertyType){
 
@@ -330,29 +473,29 @@ namespace nlite{
 
 			if(NLITE_PSZNAME_CMP(nliteProperty.crp,pszName)){
 
-				propertyType = Node::CommentReadProperty;
+				propertyType = Node::CCommentReadProperty;
 
 			} else if(NLITE_PSZNAME_CMP(nliteProperty.cvp,pszName)){
 
-				propertyType = Node::CommentViewProperty;
+				propertyType = Node::CCommentViewProperty;
 
 			} else if(NLITE_PSZNAME_CMP(nliteProperty.mfp,pszName)){
 
-				propertyType = Node::MainFrameProperty;
+				propertyType = Node::CMainFrameProperty;
 
 			} else if(NLITE_PSZNAME_CMP(nliteProperty.gp,pszName)){
 
-				propertyType = Node::GeneralProperty;
+				propertyType = Node::CGeneralProperty;
 
 			}
 
 			break;
 
 
-		case Node::CommentReadProperty:
-		case Node::CommentViewProperty:
-		case Node::GeneralProperty:
-		case Node::MainFrameProperty:
+		case Node::CCommentReadProperty:
+		case Node::CCommentViewProperty:
+		case Node::CGeneralProperty:
+		case Node::CMainFrameProperty:
 
 			nodeName = (LPCTSTR)pszName;
 			break;
@@ -368,7 +511,7 @@ namespace nlite{
 
 
 
-	void ReadPropertyXML::OnEndElement (const XML_Char *pszName){
+	void CReadPropertyXML::OnEndElement (const XML_Char *pszName){
 
 		if(NLITE_PSZNAME_CMP(nliteProperty.crp,pszName) || 
 			NLITE_PSZNAME_CMP(nliteProperty.cvp,pszName)||
@@ -410,7 +553,7 @@ namespace nlite{
 
 #define NLITE_NAME(n) (#n)
 
-	void ReadPropertyXML::OnCharacterData (const XML_Char *pszData, int nLength){
+	void CReadPropertyXML::OnCharacterData (const XML_Char *pszData, int nLength){
 
 		if (nodeName.empty() == true)return;
 
@@ -418,7 +561,7 @@ namespace nlite{
 
 
 
-		case Node::CommentReadProperty:
+		case Node::CCommentReadProperty:
 
 			NLITE_R_X_P_S(nliteProperty,crp,shortComment);
 			NLITE_R_X_P_I(nliteProperty,crp,administratorCommentReadFlag);
@@ -435,7 +578,7 @@ namespace nlite{
 			NLITE_R_X_P_I(nliteProperty,crp,userCommentReadFlag);
 
 			break;
-		case Node::CommentViewProperty:
+		case Node::CCommentViewProperty:
 			NLITE_R_X_P_I(nliteProperty,cvp,anonymousIDLinkColor);
 			NLITE_R_X_P_I(nliteProperty,cvp,backColor);
 			NLITE_R_X_P_I(nliteProperty,cvp,baseStringColor);
@@ -451,7 +594,7 @@ namespace nlite{
 			NLITE_R_X_P_I(nliteProperty,cvp,ownerStringColor);
 			
 			break;
-		case Node::GeneralProperty:
+		case Node::CGeneralProperty:
 			NLITE_R_X_P_I(nliteProperty,gp,activeCountTimeFlag);
 			NLITE_R_X_P_I(nliteProperty,gp,autoColorRegisterFlag);
 			NLITE_R_X_P_I(nliteProperty,gp,autoNameRegisterFlag);
@@ -465,7 +608,7 @@ namespace nlite{
 			NLITE_R_X_P_I(nliteProperty,gp,userCountUpdateFlag);
 			NLITE_R_X_P_I(nliteProperty,gp,ncvUserSettingReadedFlag);
 			break;
-		case Node::MainFrameProperty:
+		case Node::CMainFrameProperty:
 			NLITE_R_X_P_I(nliteProperty,mfp,windowSize.cx);
 			NLITE_R_X_P_I(nliteProperty,mfp,windowSize.cy);
 			NLITE_R_X_P_I(nliteProperty,mfp,windowFrontFlag);

--- a/nlite/nlite_property.h
+++ b/nlite/nlite_property.h
@@ -1,15 +1,15 @@
 #pragma once
-
+#include "nlite_propertyWindow.h"
 namespace nlite{
 
-
-
+	class CProperty;
+	class CReadPropertyXML;
 	///
 	///コメントビュー設定
 	///
-	struct CommentViewProperty{
-
-		
+	class CCommentViewProperty{
+		friend CProperty;
+		friend CReadPropertyXML;
 		enum CommentTimeType{
 			WriteTimeType,
 			StreamingTimeType
@@ -19,7 +19,7 @@ namespace nlite{
 	
 	
 
-	public:
+	private:
 		INT_PTR headerholSize[COMMENTVIEW_HEADERITEMSIZE];			//ヘッダ横サイズ
 		INT_PTR headerOrderArray[COMMENTVIEW_HEADERITEMSIZE];		//ヘッダ並び順配列
 		BOOL commentFoldingFlag;									//コメント折りたたみフラグ
@@ -35,18 +35,47 @@ namespace nlite{
 		COLORREF colLineColor;										//項目の縦線
 
 
+	public:
 		///
 		///コンストラクタ
 		///
-		CommentViewProperty();
+		CCommentViewProperty();
+
+
+		//ゲッター
+	public:
+		COLORREF GetOwnerStringColor()const;
+
+		COLORREF GetBaseStringColor()const;
+
+		COLORREF GetSelectBackColor()const;
+
+		COLORREF GetSelectSellLineColor()const;
+
+		COLORREF GetBackColor()const;
+
+		COLORREF GetNormalLineColor()const;
+
+		COLORREF GetLinkStringColor()const;
+
+		COLORREF GetColLineColor()const;
+
+		BOOL IsCommentFoldingFlag()const;
+
+		INT_PTR *GetHeaderHolSize();
+
+		INT_PTR *GetHeaderOrderArray();
+
+		UINT_PTR GetHeaderOrderArrayLength()const;
 	};
 
 	///
 	///コメント読み上げ設定
 	///
-	struct CommentReadProperty{
-
-	public:
+	class CCommentReadProperty{
+		friend CReadPropertyXML;
+		friend CProperty;
+	private:
 
 		BOOL commentReadFlag;								//コメント読み上げフラグ
 		BOOL ngWordReadFlag;								//NGワード読み上げフラグ
@@ -61,18 +90,32 @@ namespace nlite{
 		CNLiteString shortComment;							//省略時に読み上げる文字列
 		CNLiteString outString;								//読み上げ除外文字列
 		
+	public:
 		///
 		///コンストラクタ
 		///
-		CommentReadProperty();
+		CCommentReadProperty();
+
+		//セッター
+	public:
+		VOID SetCommentRead(BOOL flag);
+
+		//ゲッター
+	public:
+		///
+		///コメント読み上げフラグ取得
+		///
+		BOOL IsCommentRead()const;
+
 	};
 
 	///
 	///一般設定
 	///
-	struct GeneralProperty{
-
-	public:
+	class CGeneralProperty{
+		friend CProperty;
+		friend CReadPropertyXML;
+	private:
 		CNLiteString browserPath;					//ブラウザのパス
 		BOOL userCountUpdateFlag;					//来場者数を更新するかのフラグ
 		BOOL commentLogAutoSaveFlag;				//コメント自動保存用のフラグ
@@ -87,53 +130,98 @@ namespace nlite{
 		BOOL ncvUserSettingReadedFlag;				//ncvリスナーデータ読み込み済みフラグ
 		
 
+	public:
 		///
 		///コンストラクタ
 		///
-		GeneralProperty();
+		CGeneralProperty();
+
+
+		//セッター
+	public:
+		VOID SetNCVUSerSettingReaded(BOOL flag);
+
+		//ゲッター
+	public:
+		///
+		///ncvリスナーデータ読み込みフラグ判定
+		///
+		BOOL IsNCVUserSettingReaded()const;
 		
+		BOOL IsNumberName()const;
+
+		///
+		///ブラウザタイプ取得
+		///
+		BROWSERTYPE GetBrowserType()const;
+
+		///
+		///ブラウザパス取得
+		///
+		const CNLiteString &GetBrowserPath()const;
 	};
 	
 
 	///
 	///メイン設定
 	///
-	struct MainFrameProperty{
-
-
-	public:
+	class CMainFrameProperty{
+		friend CReadPropertyXML;
+		friend CProperty;
+	private:
 
 		SIZE windowSize;							//ウィンドウサイズ
 		BOOL windowFrontFlag;						//ウィンドウ最前面表示フラグ
 
 
+	public:
 		///
 		///コンストラクタ
 		///
-		MainFrameProperty();
+		CMainFrameProperty();
 		
+
+		//セッター
+	public:
+		VOID SetWindowFront(BOOL flag);
+
+		//ゲッター
+	public:
+
+		///
+		///ウィンドウサイズの取得
+		///
+		const SIZE &GetWindowSize()const;
 		
 
+		///
+		///ウィンドウ全面表示フラグの取得
+		///
+		BOOL IsWindowFront()const;
+
 	};
 
 	///
 	///nlite設定
 	///
-	struct Property{
-
-	public:
-		CommentViewProperty cvp;					//コメントビュープロパティ
-		MainFrameProperty mfp;						//メインウィンドウプロパティ
-		GeneralProperty gp;							//共有プロパティ
-		CommentReadProperty crp;					//コメント読み上げプロパティ
+	class CProperty{
+		friend CReadPropertyXML;
+	private:
+		CCommentViewProperty cvp;					//コメントビュープロパティ
+		CMainFrameProperty mfp;						//メインウィンドウプロパティ
+		CGeneralProperty gp;							//共有プロパティ
+		CCommentReadProperty crp;					//コメント読み上げプロパティ
 		CNLiteString appLocalPath;					//ローカルフォルダパス
 		CNLiteString propertyFolderPath;			//プロパティ配置が記載されたフォルダ
 		CNLiteString propertySaveFolderPath;		//プロパティデータ保存先フォルダ
 		CNLiteString propertyPath;					//プロパティファイルパス
 		CNLiteString listenerDataPath;				//リスナー情報設定ファイルパス
-		Property();
+		
+
+	public:
+		CProperty();
 
-		~Property();
+		~CProperty();
 
 		
 
@@ -150,28 +238,47 @@ namespace nlite{
 
 		BROWSERTYPE CookieSetting();
 
+		//セッター
+	public:
+		VOID SetCommentViewProperty(const CCommentViewProperty& commentViewProperty);
 		
+		//ゲッター
+
+	public:
+		CCommentViewProperty &GetCommentViewProperty();
+
+		CMainFrameProperty &GetMainFrameProperty();
+
+		CGeneralProperty &GetGeneralProperty();
 
+		CCommentReadProperty &GetCommentReadProperty();
+
+
+		const CNLiteString &GetListenerDataPath()const;
+
+		const CNLiteString &GetPropertySaveFolderPath()const;
+
+		
 	};
 
 
 	///
 	///設定ファイルのxml読み取り用クラス
 	///
-	class ReadPropertyXML:public CXmlParser{
+	class CReadPropertyXML:public CXmlParser{
 
 	private:
 
-		Property &nliteProperty;
+		CProperty &nliteProperty;
 
 		struct Node{
 
 			enum type{
 				None,
-				CommentReadProperty,
-				CommentViewProperty,
-				MainFrameProperty,
-				GeneralProperty
+				CCommentReadProperty,
+				CCommentViewProperty,
+				CMainFrameProperty,
+				CGeneralProperty
 			};
 		};
 
@@ -185,7 +292,7 @@ namespace nlite{
 		///
 		///コンストラクタ
 		///
-		ReadPropertyXML(Property &in_property);
+		CReadPropertyXML(CProperty &in_property);