merge cleanup: fix whitespace

- A few of the merges done during integration introduced whitespace errors. Rather than clean them up from the middle of the merge branch this commit fixes them. [#29] Signed-off-by: Thell Fowler <git@tbfowler.name>
npp-community · Dec 21, 2009 · 609d422 · 609d422
1 parent c7b91fe
commit 609d422
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 41 deletions.
diff --git a/PowerEditor/bin/themes/vim Dark Blue.xml b/PowerEditor/bin/themes/vim Dark Blue.xml
@@ -728,5 +728,3 @@
         <WidgetStyle name="Saved change marker" styleID="0" bgColor="80FF00" />
     </GlobalStyles>
 </NotepadPlus>
-
-
diff --git a/PowerEditor/installer/nativeLang/japanese.xml b/PowerEditor/installer/nativeLang/japanese.xml
@@ -540,5 +540,3 @@
 		</Dialog>
     </Native-Langue>
 </NotepadPlus>
-
-
diff --git a/PowerEditor/src/MISC/Common/npp_session.cpp b/PowerEditor/src/MISC/Common/npp_session.cpp
@@ -19,7 +19,7 @@
 #include "npp_session.h"
 
 
-sessionFileInfo::sessionFileInfo( const TCHAR *fn ):
+sessionFileInfo::sessionFileInfo( const TCHAR *fn ) :
 	_encoding(-1)
 {
 	if (fn) _fileName = fn;
@@ -38,8 +38,8 @@ sessionFileInfo::sessionFileInfo(generic_string fn) :
 	_encoding(-1)
 {}
 
-sessionFileInfo::sessionFileInfo(generic_string fn, int encoding, Position pos) : 
-	Position(pos), 
+sessionFileInfo::sessionFileInfo(generic_string fn, int encoding, Position pos) :
+	Position(pos),
 	_fileName(fn),
 	_encoding(encoding)
 {}
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
@@ -3031,37 +3031,37 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 		{
 			assert(_autoCompleteMain);
 			assert(_autoCompleteSub);
-		    NppParameters *nppParam = NppParameters::getInstance();
-    
-		    // if it's searching/replacing, then do nothing
-		    if (nppParam->_isFindReplacing)
-			    break;
-    
-		    if (notification->nmhdr.hwndFrom != _pEditView->getHSelf())
-			    break;
-    
-            braceMatch();
-    
-		    NppGUI & nppGui = nppParam->getNppGUI();
-    
-		    if (nppGui._enableTagsMatchHilite)
-		    {
-			    XmlMatchedTagsHighlighter xmlTagMatchHiliter(_pEditView);
-			    xmlTagMatchHiliter.tagMatch(nppGui._enableTagAttrsHilite);
-		    }
-    
-		    if (nppGui._enableSmartHilite)
-		    {
-			    if (nppGui._disableSmartHiliteTmp)
-				    nppGui._disableSmartHiliteTmp = false;
-			    else
-				    _smartHighlighter->highlightView(notifyView);
-		    }
-    
-		    updateStatusBar();
-		    AutoCompletion * autoC = isFromPrimary?_autoCompleteMain:_autoCompleteSub;
-		    autoC->update(0);
-            break;
+			NppParameters *nppParam = NppParameters::getInstance();
+
+			// if it's searching/replacing, then do nothing
+			if (nppParam->_isFindReplacing)
+				break;
+
+			if (notification->nmhdr.hwndFrom != _pEditView->getHSelf())
+				break;
+
+			braceMatch();
+
+			NppGUI & nppGui = nppParam->getNppGUI();
+
+			if (nppGui._enableTagsMatchHilite)
+			{
+				XmlMatchedTagsHighlighter xmlTagMatchHiliter(_pEditView);
+				xmlTagMatchHiliter.tagMatch(nppGui._enableTagAttrsHilite);
+			}
+
+			if (nppGui._enableSmartHilite)
+			{
+				if (nppGui._disableSmartHiliteTmp)
+					nppGui._disableSmartHiliteTmp = false;
+				else
+					_smartHighlighter->highlightView(notifyView);
+			}
+
+			updateStatusBar();
+			AutoCompletion * autoC = isFromPrimary?_autoCompleteMain:_autoCompleteSub;
+			autoC->update(0);
+			break;
 		}
 
 		case SCN_SCROLLED:

diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h
@@ -226,8 +226,8 @@ struct NppGUI
 		_userDefineDlgStatus(UDD_DOCKED), _tabSize(8), _tabReplacedBySpace(false), _fileAutoDetection(cdEnabled),
 		_fileAutoDetectionOriginalValue(_fileAutoDetection), _checkHistoryFiles(true), _isMaximized(false), _isMinimizedToTray(false),
 		_rememberLastSession(true), _enableMouseWheelZoom(true),  _doTaskList(true), _maitainIndent(true), _enableSmartHilite(true),
-		_disableSmartHiliteTmp(false),_enableTagsMatchHilite(true), _enableTagAttrsHilite(true), _enableHiliteNonHTMLZone(false), 
-		_styleMRU(true), _styleURL(0), _isLangMenuCompact(false), _backup(bak_none), _useDir(false), _autocStatus(autoc_none), 
+		_disableSmartHiliteTmp(false),_enableTagsMatchHilite(true), _enableTagAttrsHilite(true), _enableHiliteNonHTMLZone(false),
+		_styleMRU(true), _styleURL(0), _isLangMenuCompact(false), _backup(bak_none), _useDir(false), _autocStatus(autoc_none),
 		_autocFromLen(1), _funcParams(false), _doesExistUpdater(false), _caretBlinkRate(250), _caretWidth(1),
 		_enableMultiSelection(false), _shortTitlebar(false), _openSaveDir(dir_followCurrent)
 	{

diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@@ -2911,7 +2911,7 @@ void ScintillaEditView::reapplyHotspotStyles()
 ScintillaEditView::ScintillaEditView() :
 	_pScintillaFunc(NULL),_pScintillaPtr(NULL),_callWindowProc(NULL),
 	_currentBufferID(BUFFER_INVALID), _currentBuffer(NULL),
-	_folderStyle(FOLDER_STYLE_BOX), _pParameter(NULL), _codepage(CP_ACP), 
+	_folderStyle(FOLDER_STYLE_BOX), _pParameter(NULL), _codepage(CP_ACP),
 	_lineNumbersShown(false), _wrapRestoreNeeded(false),
 	_currentHotspotStyleMap(NULL), _currentHotspotOriginMap(NULL)
 {