[Kde-bindings] branches/work/kdebindings-smoke2
Arno Rehn
kde at arnorehn.de
Sun Jan 20 00:55:26 UTC 2008
SVN commit 763648 by arnorehn:
* Removed classlist from smoke/qt as it is not needed.
* Updated smoke/kde. Strangely there are just a few basic methods
(qt_metacall, tr, metaObject) generated for KPageModel, so the build will
fail. If you remove KPageModel from the classlist, it builds all fine.
Still investigating, what that is, but it seems like an error in kalyptus
itself, not in the smoke generator.
* Added kalyptusCxxToClasslist module for classlist generation. Might come
in handy when writing classlists for new modules.
CCMAIL: kde-bindings at kde.org
M +11 -0 ChangeLog
M +1 -1 kalyptus/kalyptus
A kalyptus/kalyptusCxxToClasslist.pm
M +2 -1 kalyptus/kalyptusCxxToSmoke.pm
M +24 -49 smoke/kde/CMakeLists.txt
A smoke/kde/classlist
M +1 -1 smoke/kde/generate.pl.cmake
M +40 -24 smoke/kde/kde_header_list
D smoke/qt/classlist
M +1 -1 smoke/qt/generate.pl.cmake
--- branches/work/kdebindings-smoke2/ChangeLog #763647:763648
@@ -1,3 +1,14 @@
+2007-01-20 Arno Rehn <arno at arnorehn.de>
+
+ * Removed classlist from smoke/qt as it is not needed.
+ * Updated smoke/kde. Strangely there are just a few basic methods
+ (qt_metacall, tr, metaObject) generated for KPageModel, so the build will
+ fail. If you remove KPageModel from the classlist, it builds all fine.
+ Still investigating, what that is, but it seems like an error in kalyptus
+ itself, not in the smoke generator.
+ * Added kalyptusCxxToClasslist module for classlist generation. Might come
+ in handy when writing classlists for new modules.
+
2207-01-15 Arno Rehn <arno at arnorehn.de>
* If no classlist is given, process all classes.
--- branches/work/kdebindings-smoke2/kalyptus/kalyptus #763647:763648
@@ -108,7 +108,7 @@
# Supported formats
%formats = ( "smoke" => "kalyptusCxxToSmoke", "kimono" => "kalyptusCxxToKimono",
- "ECMA" => "kalyptusCxxToECMA", "swig" => "kalyptusCxxToSwig",
+ "classlist" => "kalyptusCxxToClasslist", "ECMA" => "kalyptusCxxToECMA", "swig" => "kalyptusCxxToSwig",
"KDOMECMA" => "kalyptusKDOMEcma");
# these are for expansion of method flags
--- branches/work/kdebindings-smoke2/kalyptus/kalyptusCxxToSmoke.pm #763647:763648
@@ -2145,7 +2145,7 @@
if ($firstClass) {
$firstClass = 0;
- print OUT "\t{ 0L, 0, 0, 0, 0 }, \t// 0 (no class)\n";
+ print OUT "\t{ 0L, false, 0, 0, 0, 0 }, \t// 0 (no class)\n";
}
if (defined($externClasses{$className})) {
@@ -2266,6 +2266,7 @@
sub { my ($classNode, $m ) = @_;
my $methName = $m->{astNodeName};
+ print "method: $methName\n" if $className eq "KPageModel";
# For destructors, get a proper signature that includes the '~'
if ( $m->{ReturnType} eq '~' )
{
--- branches/work/kdebindings-smoke2/smoke/kde/CMakeLists.txt #763647:763648
@@ -18,8 +18,6 @@
set(all_includes "-I${filename} ${all_includes}")
ENDFOREACH(filename)
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )
-configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY)
# macro is defined in qt-copy/src/qbase.pri but couldn't be found by qtguess, so I append it manually
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/qtdefines "QT_NO_CAST_TO_ASCII\n")
@@ -81,6 +79,28 @@
${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
)
+# Needed to make QSqlRelationalDelegate compile
+ADD_DEFINITIONS (-DQT_GUI_LIB)
+
+INCLUDE(${QT_USE_FILE})
+# At this point, QT_LIBRARIES will contain a list of the found Qt Libs
+# and QT_INCLUDES contains the directories of the found includes
+
+FOREACH(filename ${QT_INCLUDES})
+ set(all_includes "-I${filename} ${all_includes}")
+ENDFOREACH(filename)
+
+FOREACH(incname ${QT_INCLUDES})
+ SET(qt_incs "'${incname}', ${qt_incs}")
+ENDFOREACH(incname)
+
+FOREACH(libname ${QT_LIBRARIES})
+ set(all_libs "${libname} ${all_libs}")
+ENDFOREACH(libname)
+
+configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )
+configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY)
+
kde4_add_library(smokekde SHARED ${smokekde_LIB_SRCS})
target_link_libraries(smokekde
@@ -101,53 +121,8 @@
${KDE4_KDE3SUPPORT_LIBS}
${KDE4_KUTILS_LIBS}
kmediaplayer
- kntlm )
+ kntlm
+ smokeqt )
set_target_properties(smokekde PROPERTIES VERSION 2.0.0 SOVERSION 2 )
install(TARGETS smokekde DESTINATION ${LIB_INSTALL_DIR} )
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#
-#
-#lib_LTLIBRARIES = libsmokekde.la
-#
-## set the include path for X, qt and KDE
-#INCLUDES = -I$(srcdir)/.. $(all_includes) -I$(qt_includes)/QtUiTools \
-# -I$(qt_includes)/QtDBus
-#
-#EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
-#
-## the library search path.
-#libsmokekde_la_LDFLAGS = -version-info 2:0:0 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
-#
-## the libraries to link against.
-#libsmokekde_la_LIBADD = $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \
-# $(LIB_QTOPENGL) $(LIB_QTSQL) $(LIB_QTCORE) $(LIB_QTXML) $(LIB_QTSVG) \
-# $(GLLIB) $(LIBQSCINTILLA) \
-# -lQtSvg -lQtUiTools $(LIBQTDBUS) \
-# $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) \
-# $(LIB_KUTILS) $(LIB_KDEPRINT)
-#
-#x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
-# x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
-# x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
-#
-## which sources should be compiled for perlqtkde
-#libsmokekde_la_SOURCES = smokedata.cpp $(x_sources)
-#
-#$(x_sources) smokedata.cpp:
-# perl generate.pl
-#
-#CLEANFILES = $(libsmokekde_la_SOURCES)
-#
-#
-#
-#
-#
--- branches/work/kdebindings-smoke2/smoke/kde/generate.pl.cmake #763647:763648
@@ -169,7 +169,7 @@
# Launch kalyptus
chdir "../smoke/kde";
-system "perl -I at kdebindings_SOURCE_DIR@/kalyptus @kdebindings_SOURCE_DIR@/kalyptus/kalyptus @ARGV --qt4 --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers @kdeheaders";
+system "perl -I at kdebindings_SOURCE_DIR@/kalyptus @kdebindings_SOURCE_DIR@/kalyptus/kalyptus @ARGV --qt4 --globspace -fsmoke --name=kde --init-modules=qt --classlist=@CMAKE_CURRENT_SOURCE_DIR@/classlist $macros --no-cache --outputdir=$outdir @headers @kdeheaders";
my $exit = $? >> 8;
exit $exit if ($exit);
chdir "$kalyptusdir";
--- branches/work/kdebindings-smoke2/smoke/kde/kde_header_list #763647:763648
@@ -29,7 +29,9 @@
dom/html_table.h
fixx11h.h
k3procio.h
+kaboutapplicationdialog.h
kaboutdata.h
+kabstractwidgetjobtracker.h
kacceleratormanager.h
kaccelgen.h
kacl.h
@@ -39,6 +41,7 @@
kactionselector.h
kactivelabel.h
kallocator.h
+kanimatedbutton.h
kapplication.h
karchive.h
kar.h
@@ -47,6 +50,7 @@
kassistantdialog.h
kauthorized.h
kautomount.h
+kautosavefile.h
kautostart.h
kbookmarkdombuilder.h
kbookmarkexporter.h
@@ -58,13 +62,11 @@
kbookmarkimporter_opera.h
kbookmarkmanager.h
kbookmarkmenu.h
-kbookmarknotifier.h
kbugreport.h
kbuildsycocaprogressdialog.h
kbuttongroup.h
kcalendarsystemfactory.h
kcalendarsystem.h
-kcatalog.h
kcharselect.h
kcharsets.h
kcmdlineargs.h
@@ -74,31 +76,34 @@
kcmoduleloader.h
kcmoduleproxy.h
kcmultidialog.h
+kcodecaction.h
kcodecs.h
kcolorbutton.h
+kcolorchoosermode.h
+kcolorcollection.h
kcolorcombo.h
+kcolordialog.h
kcolormimedata.h
+kcolorscheme.h
+kcolorutils.h
kcolorvalueselector.h
-kcombiview.h
kcombobox.h
kcompletionbox.h
kcompletion.h
kcomponentdata.h
kcompositejob.h
-kconfigbackend.h
kconfigbase.h
-kconfigdata.h
kconfigdialog.h
kconfigdialogmanager.h
-kconfigflags.h
kconfiggroup.h
kconfig.h
kconfigskeleton.h
-kcpuinfo.h
+kcoreconfigskeleton.h
kcrash.h
kcursor.h
kdatatool.h
kdatepicker.h
+kdatetable.h
kdatetime.h
kdatetimewidget.h
kdatewidget.h
@@ -107,8 +112,6 @@
kdedmodule.h
kde_file.h
kdemacros.h
-kdeprint/kpreloadobject.h
-kdeprint/kprintdialogpage.h
kdesktopfile.h
kde_terminal_interface.h
kdeversion.h
@@ -121,18 +124,14 @@
kdiroperator.h
kdirselectdialog.h
kdirwatch.h
-kdrawutil.h
keditlistbox.h
kedittoolbar.h
kemailsettings.h
kencodingfiledialog.h
kfiledialog.h
kfilefiltercombo.h
-kfilefilter.h
-kfile.h
kfileitem.h
kfilemetainfo.h
-kfilepreview.h
kfileshare.h
kfiletreebranch.h
kfileview.h
@@ -141,6 +140,7 @@
kfinddialog.h
kfind.h
kfontaction.h
+kfontchooser.h
kfontdialog.h
kfontrequester.h
kfontsizeaction.h
@@ -151,26 +151,31 @@
kguiitem.h
khbox.h
khelpmenu.h
+khistorycombobox.h
khtmldefaults.h
khtml_events.h
khtml_part.h
khtml_settings.h
khtmlview.h
+khuesaturationselect.h
kiconeffect.h
kicon.h
kiconloader.h
kicontheme.h
-kimageeffect.h
kimagefilepreview.h
kimageio.h
kinputdialog.h
+kplotaxis.h
+kplotobject.h
+kplotpoint.h
+kplotwidget.h
kio/authinfo.h
kio/chmodjob.h
kio/connection.h
kio/copyjob.h
kio/davjob.h
kio/deletejob.h
-kio/file.h
+kio/directorysizejob.h
kio/filejob.h
kio/forwardingslavebase.h
kio/global.h
@@ -180,9 +185,12 @@
kio/jobclasses.h
kio/job.h
kio/jobuidelegate.h
+kio/kio_export.h
+kio/kntlm_export.h
kio/kntlm.h
kio/metainfojob.h
kio/netaccess.h
+kio/passworddialog.h
kio/paste.h
kio/previewjob.h
kio/renamedialog.h
@@ -197,8 +205,11 @@
kio/slaveinterface.h
kio/tcpslavebase.h
kio/thumbcreator.h
+kio/udsentry.h
kjob.h
+kjobtrackerinterface.h
kjobuidelegate.h
+kkeysequencewidget.h
kkeyserver.h
kkeyserver_x11.h
klanguagebutton.h
@@ -207,6 +218,7 @@
klibloader.h
klineedit.h
klistwidget.h
+klistwidgetsearchline.h
klocale.h
klocalizedstring.h
klockfile.h
@@ -225,6 +237,7 @@
kmimetyperesolver.h
kmimetypetrader.h
kmultitabbar.h
+knewpassworddialog.h
knfsshare.h
knotification.h
knotificationrestrictions.h
@@ -252,16 +265,12 @@
kpassivepopupmessagehandler.h
kpassworddialog.h
kpastetextaction.h
-kpixmapeffect.h
kpixmapprovider.h
-kpixmapregionselectordialog.h
-kpixmapregionselectorwidget.h
-kpixmapsplitter.h
+kpluginfactory.h
kplugininfo.h
+kpluginloader.h
kpluginselector.h
kpreviewwidgetbase.h
-kprintaction.h
-kprinter.h
kprogressdialog.h
kpropertiesdialog.h
kpropsdlg.h
@@ -286,12 +295,12 @@
kselectaction.h
kselector.h
kseparator.h
+kserviceaction.h
kservicegroup.h
kservice.h
kservicetype.h
kservicetypeprofile.h
kservicetypetrader.h
-ksettings/componentsdialog.h
ksettings/dialog.h
ksettings/dispatcher.h
ksettings/pluginpage.h
@@ -299,14 +308,18 @@
kshellcompletion.h
kshell.h
kshortcut.h
+kshortcutsdialog.h
+kshortcutseditor.h
+kshortcutwidget.h
ksimpleconfig.h
-ksmimecrypto.h
ksortablelist.h
ksplashscreen.h
ksqueezedtextlabel.h
+kstandardaction.h
kstandarddirs.h
+kstandardguiitem.h
+kstandardshortcut.h
kstartupinfo.h
-kstaticdeleter.h
kstatusbar.h
kstdaccel.h
kstdaction.h
@@ -328,6 +341,7 @@
ktimezone.h
ktimezonewidget.h
ktip.h
+ktitlewidget.h
ktoggleaction.h
ktogglefullscreenaction.h
ktoggletoolbaraction.h
@@ -340,6 +354,8 @@
ktreewidgetsearchline.h
ktypelist.h
ktzfiletimezone.h
+kuiserverjobtracker.h
+kundostack.h
kuniqueapplication.h
kurifilter.h
kurlcombobox.h
--- branches/work/kdebindings-smoke2/smoke/qt/generate.pl.cmake #763647:763648
@@ -189,7 +189,7 @@
# Launch kalyptus
chdir "../smoke/qt";
-system "perl -I at kdebindings_SOURCE_DIR@/kalyptus @kdebindings_SOURCE_DIR@/kalyptus/kalyptus @ARGV --qt4 --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir --classlist='@CMAKE_CURRENT_SOURCE_DIR@/classlist' @headers";
+system "perl -I at kdebindings_SOURCE_DIR@/kalyptus @kdebindings_SOURCE_DIR@/kalyptus/kalyptus @ARGV --qt4 --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers";
my $exit = $? >> 8;
exit $exit if ($exit);
chdir "$kalyptusdir";
More information about the Kde-bindings
mailing list