Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix EOLs

Browse Source
This commit is contained in:
dail8859 2018-02-27 20:31:22 -05:00
parent f0a8c61d07
commit 8c84e92349
6 changed files with 83 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PowerEditor/installer/APIs/cmake.xml
View File

@ -215,5 +215,4 @@
<KeyWord name="OFF" /> <KeyWord name="OFF" />
<KeyWord name="ON" /> <KeyWord name="ON" />
</AutoComplete> </AutoComplete>
</NotepadPlus> </NotepadPlus>

2
PowerEditor/installer/themes/vim Dark Blue.xml
View File

@ -746,5 +746,3 @@
<WidgetStyle name="Saved change marker" styleID="0" bgColor="80FF00" /> <WidgetStyle name="Saved change marker" styleID="0" bgColor="80FF00" />
</GlobalStyles> </GlobalStyles>
</NotepadPlus> </NotepadPlus>

6
PowerEditor/src/Notepad_plus.h
View File

@ -51,9 +51,9 @@
#include "ScintillaCtrls.h" #include "ScintillaCtrls.h"
#include "lesDlgs.h" #include "lesDlgs.h"
#include "pluginsAdmin.h" #include "pluginsAdmin.h"
#include "localization.h" #include "localization.h"
#include "documentSnapshot.h" #include "documentSnapshot.h"
#include "md5Dlgs.h" #include "md5Dlgs.h"
#include <vector> #include <vector>
#include <iso646.h> #include <iso646.h>

2
PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
View File

@ -295,7 +295,7 @@ bool FunctionListPanel::serialize(const generic_string & outputFilename)
} }
} }
std::ofstream file(fname2write); std::ofstream file(fname2write);
file << j; file << j;
return true; return true;

152
PowerEditor/src/uchardet/nsPkgInt.h
View File

@ -1,65 +1,65 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
* *
* The contents of this file are subject to the Mozilla Public License Version * The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with * 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at * the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/ * http://www.mozilla.org/MPL/
* *
* Software distributed under the License is distributed on an "AS IS" basis, * Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the * for the specific language governing rights and limitations under the
* License. * License.
* *
* The Original Code is mozilla.org code. * The Original Code is mozilla.org code.
* *
* The Initial Developer of the Original Code is * The Initial Developer of the Original Code is
* Netscape Communications Corporation. * Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998 * Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved. * the Initial Developer. All Rights Reserved.
* *
* Contributor(s): * Contributor(s):
* *
* Alternatively, the contents of this file may be used under the terms of * Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or * either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead * in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only * of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to * under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your * use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice * decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete * and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under * the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL. * the terms of any one of the MPL, the GPL or the LGPL.
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#ifndef nsPkgInt_h__ #ifndef nsPkgInt_h__
#define nsPkgInt_h__ #define nsPkgInt_h__
#include "nscore.h" #include "nscore.h"
typedef enum { typedef enum {
eIdxSft4bits = 3, eIdxSft4bits = 3,
eIdxSft8bits = 2, eIdxSft8bits = 2,
eIdxSft16bits = 1 eIdxSft16bits = 1
} nsIdxSft; } nsIdxSft;
typedef enum { typedef enum {
eSftMsk4bits = 7, eSftMsk4bits = 7,
eSftMsk8bits = 3, eSftMsk8bits = 3,
eSftMsk16bits = 1 eSftMsk16bits = 1
} nsSftMsk; } nsSftMsk;
typedef enum { typedef enum {
eBitSft4bits = 2, eBitSft4bits = 2,
eBitSft8bits = 3, eBitSft8bits = 3,
eBitSft16bits = 4 eBitSft16bits = 4
} nsBitSft; } nsBitSft;
typedef enum { typedef enum {
eUnitMsk4bits = 0x0000000FL, eUnitMsk4bits = 0x0000000FL,
eUnitMsk8bits = 0x000000FFL, eUnitMsk8bits = 0x000000FFL,
eUnitMsk16bits = 0x0000FFFFL eUnitMsk16bits = 0x0000FFFFL
} nsUnitMsk; } nsUnitMsk;
@ -77,17 +77,17 @@ struct nsPkgInt {
#define PCK16BITS(a,b) ((PRUint32)(((b) << 16) | (a))) #define PCK16BITS(a,b) ((PRUint32)(((b) << 16) | (a)))
#define PCK8BITS(a,b,c,d) PCK16BITS( ((PRUint32)(((b) << 8) | (a))), \ #define PCK8BITS(a,b,c,d) PCK16BITS( ((PRUint32)(((b) << 8) | (a))), \
((PRUint32)(((d) << 8) | (c)))) ((PRUint32)(((d) << 8) | (c))))
#define PCK4BITS(a,b,c,d,e,f,g,h) PCK8BITS( ((PRUint32)(((b) << 4) | (a))), \ #define PCK4BITS(a,b,c,d,e,f,g,h) PCK8BITS( ((PRUint32)(((b) << 4) | (a))), \
((PRUint32)(((d) << 4) | (c))), \ ((PRUint32)(((d) << 4) | (c))), \
((PRUint32)(((f) << 4) | (e))), \ ((PRUint32)(((f) << 4) | (e))), \
((PRUint32)(((h) << 4) | (g))) ) ((PRUint32)(((h) << 4) | (g))) )
#define GETFROMPCK(i, c) \ #define GETFROMPCK(i, c) \
(((((c).data)[(i)>>(c).idxsft])>>(((i)&(c).sftmsk)<<(c).bitsft))&(c).unitmsk) (((((c).data)[(i)>>(c).idxsft])>>(((i)&(c).sftmsk)<<(c).bitsft))&(c).unitmsk)
#endif /* nsPkgInt_h__ */ #endif /* nsPkgInt_h__ */

4
scintilla/boostregex/UTF8DocumentIterator.h
View File

@ -16,8 +16,8 @@
#include <Document.h> #include <Document.h>
#ifdef SCI_NAMESPACE #ifdef SCI_NAMESPACE
namespace Scintilla { namespace Scintilla {
#endif #endif