[Kde-bindings] KDE/kdebindings
Arno Rehn
kde at arnorehn.de
Sat May 31 10:43:31 UTC 2008
SVN commit 814808 by arnorehn:
* Added qscintilla classes and headers from the 2.2 release
* Updated the C# qscintilla classes
* Added classlist support for the kimono target
* Added support for --smoke-invocation in kalyptus for easier
generation of additional classes
* Updated the AssemblyInfo.cs files
* Fixed qtruby.cpp's header
* Don't embed qtruby in korundum, link against qtruby4shared instead
CCMAIL: kde-bindings at kde.org
M +4 -0 csharp/qscintilla/qsci/QsciLexer.cs
A csharp/qscintilla/qsci/QsciLexerCMake.cs
A csharp/qscintilla/qsci/QsciLexerD.cs
M +3 -0 csharp/qscintilla/qsci/QsciLexerPerl.cs
M +4 -0 csharp/qscintilla/qsci/QsciLexerPython.cs
A csharp/qscintilla/qsci/QsciLexerVHDL.cs
M +1 -1 csharp/qscintilla/qsci/QsciScintilla.cs
M +47 -5 csharp/qscintilla/qsci/QsciScintillaBase.cs
M +1 -1 csharp/qscintilla/src/AssemblyInfo.cs
M +5 -0 csharp/qyoto/ChangeLog
M +1 -1 csharp/qyoto/src/AssemblyInfo.cs
M +5 -0 kalyptus/ChangeLog
M +27 -3 kalyptus/kalyptusCxxToKimono.pm
M +5 -0 ruby/korundum/ChangeLog
M +1 -4 ruby/korundum/src/CMakeLists.txt
M +4 -0 ruby/qtruby/ChangeLog
M +17 -0 ruby/qtruby/src/qtruby.cpp
M +3 -0 smoke/qsci/classlist
M +3 -1 smoke/qsci/qscintilla2_header_list
--- trunk/KDE/kdebindings/csharp/qscintilla/qsci/QsciLexer.cs #814807:814808
@@ -123,6 +123,10 @@
public virtual QFont Font(int style) {
return (QFont) interceptor.Invoke("font$", "font(int) const", typeof(QFont), typeof(int), style);
}
+ [SmokeMethod("indentationGuideView() const")]
+ public virtual int IndentationGuideView() {
+ return (int) interceptor.Invoke("indentationGuideView", "indentationGuideView() const", typeof(int));
+ }
[SmokeMethod("keywords(int) const")]
public virtual string Keywords(int set) {
return (string) interceptor.Invoke("keywords$", "keywords(int) const", typeof(string), typeof(int), set);
--- trunk/KDE/kdebindings/csharp/qscintilla/qsci/QsciLexerPerl.cs #814807:814808
@@ -42,6 +42,9 @@
public const int QuotedStringQR = 29;
public const int QuotedStringQW = 30;
public const int PODVerbatim = 31;
+ public const int SubroutinePrototype = 40;
+ public const int FormatIdentifier = 41;
+ public const int FormatBody = 42;
public QsciLexerPerl(QObject parent) : this((Type) null) {
CreateProxy();
--- trunk/KDE/kdebindings/csharp/qscintilla/qsci/QsciLexerPython.cs #814807:814808
@@ -102,6 +102,10 @@
public override QColor DefaultPaper(int style) {
return (QColor) interceptor.Invoke("defaultPaper$", "defaultPaper(int) const", typeof(QColor), typeof(int), style);
}
+ [SmokeMethod("indentationGuideView() const")]
+ public override int IndentationGuideView() {
+ return (int) interceptor.Invoke("indentationGuideView", "indentationGuideView() const", typeof(int));
+ }
[SmokeMethod("keywords(int) const")]
public override string Keywords(int set) {
return (string) interceptor.Invoke("keywords$", "keywords(int) const", typeof(string), typeof(int), set);
--- trunk/KDE/kdebindings/csharp/qscintilla/qsci/QsciScintilla.cs #814807:814808
@@ -894,7 +894,7 @@
[Q_SIGNAL("void linesChanged()")]
void LinesChanged();
[Q_SIGNAL("void marginClicked(int, int, Qt::KeyboardModifiers)")]
- void MarginClicked(int margin, int line, int state);
+ void MarginClicked(int margin, int line, uint state);
[Q_SIGNAL("void modificationAttempted()")]
void ModificationAttempted();
[Q_SIGNAL("void modificationChanged(bool)")]
--- trunk/KDE/kdebindings/csharp/qscintilla/qsci/QsciScintillaBase.cs #814807:814808
@@ -462,6 +462,25 @@
public const int SCI_GETHOTSPOTACTIVEBACK = 2495;
public const int SCI_GETHOTSPOTACTIVEUNDERLINE = 2496;
public const int SCI_GETHOTSPOTSINGLELINE = 2497;
+ public const int SCI_SETINDICATORCURRENT = 2500;
+ public const int SCI_GETINDICATORCURRENT = 2501;
+ public const int SCI_SETINDICATORVALUE = 2502;
+ public const int SCI_GETINDICATORVALUE = 2503;
+ public const int SCI_INDICATORFILLRANGE = 2504;
+ public const int SCI_INDICATORCLEARRANGE = 2505;
+ public const int SCI_INDICATORALLONFOR = 2506;
+ public const int SCI_INDICATORVALUEAT = 2507;
+ public const int SCI_INDICATORSTART = 2508;
+ public const int SCI_INDICATOREND = 2509;
+ public const int SCI_INDICSETUNDER = 2510;
+ public const int SCI_INDICGETUNDER = 2511;
+ public const int SCI_SETCARETSTYLE = 2512;
+ public const int SCI_GETCARETSTYLE = 2513;
+ public const int SCI_SETPOSITIONCACHE = 2514;
+ public const int SCI_GETPOSITIONCACHE = 2515;
+ public const int SCI_SETSCROLLWIDTHTRACKING = 2516;
+ public const int SCI_GETSCROLLWIDTHTRACKING = 2517;
+ public const int SCI_DELWORDRIGHTEND = 2518;
public const int SCI_STARTRECORD = 3001;
public const int SCI_STOPRECORD = 3002;
public const int SCI_SETLEXER = 4001;
@@ -554,7 +573,7 @@
public const int STYLE_INDENTGUIDE = 37;
public const int STYLE_CALLTIP = 38;
public const int STYLE_LASTPREDEFINED = 39;
- public const int STYLE_MAX = 127;
+ public const int STYLE_MAX = 255;
public const int SC_CHARSET_ANSI = 0;
public const int SC_CHARSET_DEFAULT = 1;
@@ -581,7 +600,12 @@
public const int SC_CASE_UPPER = 1;
public const int SC_CASE_LOWER = 2;
- public const int INDIC_MAX = 7;
+ public const int SC_IV_NONE = 0;
+ public const int SC_IV_REAL = 1;
+ public const int SC_IV_LOOKFORWARD = 2;
+ public const int SC_IV_LOOKBOTH = 3;
+
+ public const int INDIC_MAX = 31;
public const int INDIC_PLAIN = 0;
public const int INDIC_SQUIGGLE = 1;
public const int INDIC_TT = 2;
@@ -590,6 +614,7 @@
public const int INDIC_HIDDEN = 5;
public const int INDIC_BOX = 6;
public const int INDIC_ROUNDBOX = 7;
+ public const int INDIC_CONTAINER = 8;
public const int INDIC0_MASK = 0x20;
public const int INDIC1_MASK = 0x40;
public const int INDIC2_MASK = 0x80;
@@ -649,6 +674,10 @@
public const int CARET_JUMPS = 0x10;
public const int CARET_EVEN = 0x08;
+ public const int CARETSTYLE_INVISIBLE = 0;
+ public const int CARETSTYLE_LINE = 1;
+ public const int CARETSTYLE_BLOCK = 2;
+
public const int SC_MOD_INSERTTEXT = 0x1;
public const int SC_MOD_DELETETEXT = 0x2;
public const int SC_MOD_CHANGESTYLE = 0x4;
@@ -663,7 +692,9 @@
public const int SC_MOD_BEFOREDELETE = 0x800;
public const int SC_MULTILINEUNDOREDO = 0x1000;
public const int SC_STARTACTION = 0x2000;
- public const int SC_MODEVENTMASKALL = 0x2fff;
+ public const int SC_MOD_CHANGEINDICATOR = 0x4000;
+ public const int SC_MOD_CHANGELINESTATE = 0x8000;
+ public const int SC_MODEVENTMASKALL = 0xffff;
public const int SCK_DOWN = 300;
public const int SCK_UP = 301;
@@ -771,7 +802,15 @@
public const int SCLEX_SPICE = 78;
public const int SCLEX_D = 79;
public const int SCLEX_CMAKE = 80;
+ public const int SCLEX_GAP = 81;
+ public const int SCLEX_PLM = 82;
+ public const int SCLEX_PROGRESS = 83;
+ public const int SCLEX_ABAQUS = 84;
+ public const int SCLEX_ASYMPTOTE = 85;
+ public const int SCLEX_R = 86;
+ // long SendScintilla(unsigned int arg1,unsigned long arg2,void* arg3); >>>> NOT CONVERTED
+ // void* SendScintillaPtrResult(unsigned int arg1); >>>> NOT CONVERTED
public QsciScintillaBase(QWidget parent) : this((Type) null) {
CreateProxy();
interceptor.Invoke("QsciScintillaBase#", "QsciScintillaBase(QWidget*)", typeof(void), typeof(QWidget), parent);
@@ -928,8 +967,11 @@
void SCN_HOTSPOTCLICK(int position, int modifiers);
[Q_SIGNAL("void SCN_HOTSPOTDOUBLECLICK(int, int)")]
void SCN_HOTSPOTDOUBLECLICK(int position, int modifiers);
- [Q_SIGNAL("void SCN_MACRORECORD(unsigned, long, long)")]
- void SCN_MACRORECORD(uint arg1, long arg2, long arg3);
+ [Q_SIGNAL("void SCN_INDICATORCLICK(int, int)")]
+ void SCN_INDICATORCLICK(int position, int modifiers);
+ [Q_SIGNAL("void SCN_INDICATORRELEASE(int, int)")]
+ void SCN_INDICATORRELEASE(int position, int modifiers);
+ // void SCN_MACRORECORD(unsigned arg1,long arg2,void* arg3); >>>> NOT CONVERTED
[Q_SIGNAL("void SCN_MARGINCLICK(int, int, int)")]
void SCN_MARGINCLICK(int position, int modifiers, int margin);
[Q_SIGNAL("void SCN_MODIFIED(int, int, const char*, int, int, int, int, int)")]
--- trunk/KDE/kdebindings/csharp/qscintilla/src/AssemblyInfo.cs #814807:814808
@@ -3,7 +3,7 @@
// Version number is the same as the version of the latest QScintilla
// for which the classes have been generated.
-[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
// Unnecessary, as the keyfile is given to the compiler as a parameter.
// It may be useful to have it here, though.
--- trunk/KDE/kdebindings/csharp/qyoto/ChangeLog #814807:814808
@@ -1,3 +1,8 @@
+2008-05-31 Arno Rehn <arno at arnorehn.de>
+
+ * Updated AssemblyInfo.cs
+ * Regenerated the QScintilla sources from the 2.2 release.
+
2008-05-17 Arno Rehn <arno at arnorehn.de>
* Don't build kimono because the classes won't compile.
--- trunk/KDE/kdebindings/csharp/qyoto/src/AssemblyInfo.cs #814807:814808
@@ -3,7 +3,7 @@
// Version number is the same as the version of the latest Qt version
// for which the Qyoto runtime has been programmed.
-[assembly: AssemblyVersion("4.3.0.0")]
+[assembly: AssemblyVersion("4.4.0.0")]
// Unnecessary, as the keyfile is given to the compiler as a parameter.
// It may be useful to have it here, though.
--- trunk/KDE/kdebindings/kalyptus/ChangeLog #814807:814808
@@ -1,3 +1,8 @@
+2008-05-31 Arno Rehn <arno at arnorehn.de>
+
+ * Added classlist support for the kimono target.
+ * Added support for --smoke-invocation for easier generation of additional classes.
+
2006-04-18 Richard Dale <rdale at foton.es>
* The Smoke library generated code now builds on Windows
--- trunk/KDE/kdebindings/kalyptus/kalyptusCxxToKimono.pm #814807:814808
@@ -36,7 +36,7 @@
$libname $rootnode $outputdir $opt $debug
$methodNumber
%builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %maptypeslist %arraytypeslist %mungedTypeMap %csharpImports
- %skippedClasses %partial_classes %operatorNames %new_classidx %interfacemap *CLASS /;
+ %skippedClasses %excludeClasses %partial_classes %operatorNames %new_classidx %interfacemap *CLASS /;
BEGIN
{
@@ -644,8 +644,29 @@
print STDERR "Starting writeDoc for $libname...\n";
+ # if no classlist is given, process all classes
+ if ($main::classlist) {
+ my %includeClasses;
+ open DAT, "$main::classlist";
+ foreach my $class (<DAT>) {
+ chop($class);
+ $includeClasses{$class} = 1;
+ }
+ close DAT;
+
+ Iter::LocalCompounds( $rootnode, sub {
+ my $classNode = shift;
+ my $className = join( '::', kdocAstUtil::heritage($classNode) );
+ $excludeClasses{$className} = 1 unless defined $includeClasses{$className};
+ });
+ }
+
$debug = $main::debuggen;
+ if (!$main::smokeInvocation) {
+ $main::smokeInvocation = "SmokeInvocation"
+ }
+
mkpath( $outputdir ) unless -f $outputdir;
print STDERR "Preparsing...\n";
@@ -683,6 +704,9 @@
# Generate *cs file for each class
Iter::LocalCompounds( $rootnode, sub {
+ my $classNode = $_[0];
+ my $className = join( "::", kdocAstUtil::heritage($classNode) );
+ return if defined($excludeClasses{$className});
writeClassDoc( shift );
} );
@@ -1369,13 +1393,13 @@
} else {
$classCode .= "$indent\t\tprotected new void CreateProxy() {\n";
}
- $classCode .= "$indent\t\t\tinterceptor = new SmokeInvocation(typeof($csharpClassName), this);\n$indent\t\t}\n";
+ $classCode .= "$indent\t\t\tinterceptor = new $main::smokeInvocation(typeof($csharpClassName), this);\n$indent\t\t}\n";
}
if ($proxyInterfaceCode ne '') {
$classCode .= "$indent\t\tprivate static SmokeInvocation staticInterceptor = null;\n";
$classCode .= "$indent\t\tstatic $csharpClassName() {\n";
- $classCode .= "$indent\t\t\tstaticInterceptor = new SmokeInvocation(typeof($csharpClassName), null);\n";
+ $classCode .= "$indent\t\t\tstaticInterceptor = new $main::smokeInvocation(typeof($csharpClassName), null);\n";
$classCode .= "$indent\t\t}\n";
}
--- trunk/KDE/kdebindings/ruby/korundum/ChangeLog #814807:814808
@@ -1,3 +1,8 @@
+2008-05-31 Arno Rehn <arno at arnorehn.de>
+
+ * Don't embed qtruby into korundum, but link against qtruby4shared
+ instead.
+
2008-05-29 Richard Dale <richard.j.dale at gmail.com>
* Fix the KDE::CmdLineArgs.init() method to work with Ruby Strings and
--- trunk/KDE/kdebindings/ruby/korundum/src/CMakeLists.txt #814807:814808
@@ -10,9 +10,6 @@
set(korundum_LIB_SRCS
Korundum.cpp
kdehandlers.cpp
- ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/Qt.cpp
- ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/handlers.cpp
- ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/marshall_types.cpp
)
set(factory_SRCS
@@ -23,7 +20,7 @@
kde4_add_library(korundum4 SHARED ${korundum_LIB_SRCS})
-target_link_libraries(korundum4 ${KDE4_KDECORE_LIBS} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokeqt smokekde )
+target_link_libraries(korundum4 ${KDE4_KDECORE_LIBS} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokeqt smokekde qtruby4shared)
set_target_properties(korundum4 PROPERTIES PREFIX "")
--- trunk/KDE/kdebindings/ruby/qtruby/ChangeLog #814807:814808
@@ -1,3 +1,7 @@
+2008-05-31 Arno Rehn <arno at arnorehn.de>
+
+ * Updated qtruby.cpp's header.
+
2008-05-29 Richard Dale <richard.j.dale at gmail.com>
* Fixed bug in the FindAllMethods() f'n, and made the debug logging work
--- trunk/KDE/kdebindings/ruby/qtruby/src/qtruby.cpp #814807:814808
@@ -1,3 +1,20 @@
+/***************************************************************************
+ qtruby.cpp - description
+ -------------------
+ begin : Fri Jul 4 2003
+ copyright : (C) 2003-2006 by Richard Dale
+ email : Richard_Dale at tipitina.demon.co.uk
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
#include <QtCore/qabstractitemmodel.h>
#include <QtCore/qglobal.h>
#include <QtCore/qhash.h>
--- trunk/KDE/kdebindings/smoke/qsci/classlist #814807:814808
@@ -7,9 +7,11 @@
QsciLexer::StyleDataMap
QsciLexerBash
QsciLexerBatch
+QsciLexerCMake
QsciLexerCPP
QsciLexerCSS
QsciLexerCSharp
+QsciLexerD
QsciLexerDiff
QsciLexerHTML
QsciLexerIDL
@@ -24,6 +26,7 @@
QsciLexerRuby
QsciLexerSQL
QsciLexerTeX
+QsciLexerVHDL
QsciMacro
QsciMacro::Macro
QsciPrinter
--- trunk/KDE/kdebindings/smoke/qsci/qscintilla2_header_list #814807:814808
@@ -5,9 +5,11 @@
qsciglobal.h
qscilexerbash.h
qscilexerbatch.h
+qscilexercmake.h
qscilexercpp.h
qscilexercsharp.h
qscilexercss.h
+qscilexerd.h
qscilexerdiff.h
qscilexer.h
qscilexerhtml.h
@@ -23,8 +25,8 @@
qscilexerruby.h
qscilexersql.h
qscilexertex.h
+qscilexervhdl.h
qscimacro.h
-qscintilla2_header_list
qsciprinter.h
qsciscintillabase.h
qsciscintilla.h
More information about the Kde-bindings
mailing list