aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt
diff options
context:
space:
mode:
Diffstat (limited to 'qt')
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.h2
-rw-r--r--qt/ScintillaEdit/WidgetGen.py6
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp4
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.cpp12
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.h2
-rw-r--r--qt/ScintillaEditPy/sepbuild.py18
6 files changed, 22 insertions, 22 deletions
diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h
index 1d571a73c..510127f94 100644
--- a/qt/ScintillaEdit/ScintillaDocument.h
+++ b/qt/ScintillaEdit/ScintillaDocument.h
@@ -77,7 +77,7 @@ public:
int get_eol_mode();
void set_eol_mode(int eol_mode);
int move_position_outside_char(int pos, int move_dir, bool check_line_end);
-
+
int get_character(int pos); // Calls GetCharacterAndWidth(pos, NULL)
private:
diff --git a/qt/ScintillaEdit/WidgetGen.py b/qt/ScintillaEdit/WidgetGen.py
index 92ebfd687..2c8ef2033 100644
--- a/qt/ScintillaEdit/WidgetGen.py
+++ b/qt/ScintillaEdit/WidgetGen.py
@@ -107,7 +107,7 @@ def printHFile(f, options):
if feat in ["fun", "get", "set"]:
if checkTypes(name, v):
constDeclarator = " const" if feat == "get" else ""
- returnType = cppAlias(v["ReturnType"])
+ returnType = cppAlias(v["ReturnType"])
if returnType == "int":
returnType = "sptr_t"
stringResult = v["Param2Type"] == "stringresult"
@@ -230,7 +230,7 @@ def main(argv):
options = {"qtStyle": qtStyleInterface}
f = readInterface(cleanGenerated)
try:
- GenerateFile("ScintillaEdit.cpp.template", "ScintillaEdit.cpp",
+ GenerateFile("ScintillaEdit.cpp.template", "ScintillaEdit.cpp",
"/* ", True, printCPPFile(f, options))
GenerateFile("ScintillaEdit.h.template", "ScintillaEdit.h",
"/* ", True, printHFile(f, options))
@@ -256,6 +256,6 @@ def main(argv):
os.remove(file)
except OSError:
pass
-
+
if __name__ == "__main__":
main(sys.argv[1:])
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 35e4aee78..a31473948 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -984,7 +984,7 @@ void ListBoxImpl::RegisterQPixmapImage(int type, const QPixmap& pm)
if (list != NULL) {
QSize iconSize = list->iconSize();
if (pm.width() > iconSize.width() || pm.height() > iconSize.height())
- list->setIconSize(QSize(qMax(pm.width(), iconSize.width()),
+ list->setIconSize(QSize(qMax(pm.width(), iconSize.width()),
qMax(pm.height(), iconSize.height())));
}
@@ -1005,7 +1005,7 @@ void ListBoxImpl::RegisterRGBAImage(int type, int width, int height, const unsig
void ListBoxImpl::ClearRegisteredImages()
{
images.clear();
-
+
ListWidget *list = static_cast<ListWidget *>(wid);
if (list != NULL)
list->setIconSize(QSize(0, 0));
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index e2377edc4..6ca1ae1de 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -409,10 +409,10 @@ bool ScintillaEditBase::IsHangul(const QChar qchar)
const bool HangulJamoExtendedB = (0xD7B0 <= unicode && unicode <= 0xD7FF);
const bool HangulSyllable = (0xAC00 <= unicode && unicode <= 0xD7A3);
return HangulJamo || HangulCompatibleJamo || HangulSyllable ||
- HangulJamoExtendedA || HangulJamoExtendedB;
+ HangulJamoExtendedA || HangulJamoExtendedB;
}
-void ScintillaEditBase::MoveImeCarets(int offset)
+void ScintillaEditBase::MoveImeCarets(int offset)
{
// Move carets relatively by bytes
for (size_t r=0; r < sqt->sel.Count(); r++) {
@@ -421,8 +421,8 @@ void ScintillaEditBase::MoveImeCarets(int offset)
sqt->sel.Range(r).anchor.SetPosition(positionInsert + offset);
}
}
-
-void ScintillaEditBase::DrawImeIndicator(int indicator, int len)
+
+void ScintillaEditBase::DrawImeIndicator(int indicator, int len)
{
// Emulate the visual style of IME characters with indicators.
// Draw an indicator on the character before caret by the character bytes of len
@@ -506,7 +506,7 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
case QTextCharFormat::SpellCheckUnderline:
indicator = SC_INDICATOR_CONVERTED;
break;
-
+
default:
indicator = SC_INDICATOR_UNKNOWN;
}
@@ -555,7 +555,7 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
DrawImeIndicator(imeIndicator[i], oneCharLen);
#endif
i += ucWidth;
- }
+ }
sqt->recordingMacro = recording;
// Move IME carets.
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index c4453334c..7c52e5690 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -145,7 +145,7 @@ private:
int wheelDelta;
static bool IsHangul(const QChar qchar);
- void MoveImeCarets(int offset);
+ void MoveImeCarets(int offset);
void DrawImeIndicator(int indicator, int len);
};
diff --git a/qt/ScintillaEditPy/sepbuild.py b/qt/ScintillaEditPy/sepbuild.py
index c399eb3e9..8fa9b4b26 100644
--- a/qt/ScintillaEditPy/sepbuild.py
+++ b/qt/ScintillaEditPy/sepbuild.py
@@ -172,7 +172,7 @@ class SepBuilder:
self.qtStyleInterface = True
def _setPySideBase(self, base):
-
+
self.PySideBase = base
def _try_pkgconfig(var, package, *relpath):
try:
@@ -209,7 +209,7 @@ class SepBuilder:
f = WidgetGen.readInterface(False)
os.chdir(os.path.join("..", "ScintillaEditPy"))
options = {"qtStyle": self.qtStyleInterface}
- GenerateFile("typesystem_ScintillaEdit.xml.template", "typesystem_ScintillaEdit.xml",
+ GenerateFile("typesystem_ScintillaEdit.xml.template", "typesystem_ScintillaEdit.xml",
"<!-- ", True, printTypeSystemFile(f, options))
def runGenerator(self):
@@ -221,7 +221,7 @@ class SepBuilder:
if os.path.exists(name):
generatorrunner = name
break
-
+
args = [
generatorrunner,
"--generator-set=" + self.ShibokenGenerator,
@@ -263,7 +263,7 @@ class SepBuilder:
def cleanEverything(self):
self.generateAPI(["--clean"])
runProgram([self.MakeCommand, "distclean"], exitOnFailure=False)
- filesToRemove = [self.ProInclude, "typesystem_ScintillaEdit.xml",
+ filesToRemove = [self.ProInclude, "typesystem_ScintillaEdit.xml",
"../../bin/ScintillaEditPy.so", "../../bin/ScintillaConstants.py"]
for file in filesToRemove:
try:
@@ -282,7 +282,7 @@ class SepBuilder:
def buildEverything(self):
cleanGenerated = False
opts, args = getopt.getopt(sys.argv[1:], "hcdub",
- ["help", "clean", "debug=",
+ ["help", "clean", "debug=",
"underscore-names", "pyside-base="])
for opt, arg in opts:
if opt in ("-h", "--help"):
@@ -308,18 +308,18 @@ class SepBuilder:
self.runGenerator()
self.make()
self.copyScintillaConstants()
-
+
def copyScintillaConstants(self):
-
+
orig = 'ScintillaConstants.py'
dest = '../../bin/' + orig
if IsFileNewer(dest, orig):
return
-
+
f = open(orig, 'r')
contents = f.read()
f.close()
-
+
f = open(dest, 'w')
f.write(contents)
f.close()