[Kde-bindings] KDE/kdebindings/ruby
Arno Rehn
kde at arnorehn.de
Sun Jan 24 15:00:05 UTC 2010
SVN commit 1079589 by arnorehn:
Fix build with current smoke.h.
Link against smokekdecore instead of smokekde.
CCMAIL: kde-bindings at kde.org
M +1 -2 akonadi/CMakeLists.txt
M +1 -1 khtml/CMakeLists.txt
M +3 -3 korundum/src/Korundum.cpp
M +1 -1 korundum/src/kdehandlers.cpp
M +2 -2 ktexteditor/CMakeLists.txt
M +2 -2 nepomuk/CMakeLists.txt
M +3 -3 nepomuk/nepomukhandlers.cpp
M +2 -2 okular/CMakeLists.txt
M +1 -1 qtruby/src/Qt.cpp
M +19 -19 qtruby/src/handlers.cpp
M +8 -8 qtruby/src/qtruby.cpp
M +4 -2 qwt/CMakeLists.txt
--- trunk/KDE/kdebindings/ruby/akonadi/CMakeLists.txt #1079588:1079589
@@ -10,8 +10,7 @@
${RUBY_LIBRARY}
${KDEPIMLIBS_AKONADI_LIBS}
${KDEPIMLIBS_AKONADI_KMIME_LIBS}
- smokeqt
- smokekde
+ smokeqtcore
smokeakonadi
qtruby4shared)
set_target_properties(rubyakonadi PROPERTIES PREFIX "" OUTPUT_NAME akonadi)
--- trunk/KDE/kdebindings/ruby/khtml/CMakeLists.txt #1079588:1079589
@@ -2,7 +2,7 @@
set(rubykhtml_LIBRARY_SRC khtml.cpp khtmlhandlers.cpp)
add_library(rubykhtml MODULE ${rubykhtml_LIBRARY_SRC})
-target_link_libraries(rubykhtml ${KHTML_LIBS} ${RUBY_LIBRARY} smokeqt smokekde smokekhtml qtruby4shared)
+target_link_libraries(rubykhtml ${KHTML_LIBS} ${RUBY_LIBRARY} smokeqtcore smokekdecore smokekhtml qtruby4shared)
set_target_properties(rubykhtml PROPERTIES PREFIX "" OUTPUT_NAME khtml)
install(TARGETS rubykhtml DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
install(FILES khtml.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/khtml)
--- trunk/KDE/kdebindings/ruby/korundum/src/Korundum.cpp #1079588:1079589
@@ -143,11 +143,11 @@
while (meth.smoke->ambiguousMethodList[i] != 0) {
if ( ( qstrcmp( meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args + 1]].name,
"QAction*" ) == 0
- && a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "QAction")
- && !a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "KAction") )
+ && a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "QAction")
+ && !a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "KAction") )
|| ( qstrcmp( meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args + 1]].name,
"KAction*" ) == 0
- && a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "KAction") ) )
+ && a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "KAction") ) )
{
_current_method.smoke = meth.smoke;
_current_method.index = meth.smoke->ambiguousMethodList[i];
--- trunk/KDE/kdebindings/ruby/korundum/src/kdehandlers.cpp #1079588:1079589
@@ -56,7 +56,7 @@
const char*
resolve_classname_kde(smokeruby_object * o)
{
- if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "KArchiveEntry")) {
+ if (o->smoke->isDerivedFrom(o->smoke->classes[o->classId].className, "KArchiveEntry")) {
KArchiveEntry * entry = (KArchiveEntry *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("KArchiveEntry").index);
if (entry->isDirectory()) {
return "KDE::ArchiveDirectory";
--- trunk/KDE/kdebindings/ruby/ktexteditor/CMakeLists.txt #1079588:1079589
@@ -7,8 +7,8 @@
target_link_libraries(rubyktexteditor
${QT_QTCORE_LIBRARY}
${RUBY_LIBRARY}
- smokeqt
- smokekde
+ smokeqtcore
+ smokekdecore
smokektexteditor
qtruby4shared)
set_target_properties(rubyktexteditor PROPERTIES PREFIX "" OUTPUT_NAME ktexteditor)
--- trunk/KDE/kdebindings/ruby/nepomuk/CMakeLists.txt #1079588:1079589
@@ -7,9 +7,9 @@
target_link_libraries(rubynepomuk
${RUBY_LIBRARY}
${NEPOMUK_LIBRARIES}
- smokeqt
+ smokeqtcore
smokesoprano
- smokekde
+ smokekdecore
smokenepomuk
qtruby4shared)
set_target_properties(rubynepomuk PROPERTIES PREFIX "" OUTPUT_NAME nepomuk)
--- trunk/KDE/kdebindings/ruby/nepomuk/nepomukhandlers.cpp #1079588:1079589
@@ -20,7 +20,7 @@
#include <QtCore/qhash.h>
#include <QtCore/qurl.h>
-#include <smoke/qt_smoke.h>
+#include <smoke/qtcore_smoke.h>
#include <qtruby.h>
#include <smokeruby.h>
#include <marshall_macros.h>
@@ -81,8 +81,8 @@
if (key == Qnil) {
smokeruby_object * k = alloc_smokeruby_object( true,
- qt_Smoke,
- qt_Smoke->idClass("QUrl").index,
+ qtcore_Smoke,
+ qtcore_Smoke->idClass("QUrl").index,
keyPtr );
key = set_obj_info("Qt::Url", k);
}
--- trunk/KDE/kdebindings/ruby/okular/CMakeLists.txt #1079588:1079589
@@ -8,8 +8,8 @@
${QT_QTCORE_LIBRARY}
${RUBY_LIBRARY}
${OKULAR_LIBRARIES}
- smokeqt
- smokekde
+ smokeqtcore
+ smokekdecore
smokeokular
qtruby4shared)
set_target_properties(rubyokular PROPERTIES PREFIX "" OUTPUT_NAME okular)
--- trunk/KDE/kdebindings/ruby/qtruby/src/Qt.cpp #1079588:1079589
@@ -461,7 +461,7 @@
const char *
resolve_classname(smokeruby_object * o)
{
- if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QObject")) {
+ if (o->smoke->isDerivedFrom(o->smoke->classes[o->classId].className, "QObject")) {
QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
const QMetaObject * meta = qobject->metaObject();
--- trunk/KDE/kdebindings/ruby/qtruby/src/handlers.cpp #1079588:1079589
@@ -197,7 +197,7 @@
if (do_debug & qtdb_gc) qWarning("Checking for mark (%s*)%p", className, o->ptr);
if (o->ptr && o->allocated) {
- if (o->smoke->isDerivedFromByName(className, "QObject")) {
+ if (o->smoke->isDerivedFrom(className, "QObject")) {
QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
// Only mark the QObject tree if the current item doesn't have a parent.
// This avoids marking parts of a tree more than once.
@@ -206,7 +206,7 @@
}
}
- if (o->smoke->isDerivedFromByName(className, "QWidget")) {
+ if (o->smoke->isDerivedFrom(className, "QWidget")) {
QWidget * widget = (QWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QWidget").index);
QLayout * layout = widget->layout();
if (layout != 0) {
@@ -218,7 +218,7 @@
}
}
- if (o->smoke->isDerivedFromByName(className, "QListWidget")) {
+ if (o->smoke->isDerivedFrom(className, "QListWidget")) {
QListWidget * listwidget = (QListWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QListWidget").index);
for (int i = 0; i < listwidget->count(); i++) {
@@ -232,7 +232,7 @@
return;
}
- if (o->smoke->isDerivedFromByName(className, "QTableWidget")) {
+ if (o->smoke->isDerivedFrom(className, "QTableWidget")) {
QTableWidget * table = (QTableWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QTableWidget").index);
QTableWidgetItem *item;
@@ -249,7 +249,7 @@
return;
}
- if (o->smoke->isDerivedFromByName(className, "QTreeWidget")) {
+ if (o->smoke->isDerivedFrom(className, "QTreeWidget")) {
QTreeWidget * qtreewidget = (QTreeWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QTreeWidget").index);
for (int i = 0; i < qtreewidget->topLevelItemCount(); i++) {
@@ -264,7 +264,7 @@
return;
}
- if (o->smoke->isDerivedFromByName(className, "QLayout")) {
+ if (o->smoke->isDerivedFrom(className, "QLayout")) {
QLayout * qlayout = (QLayout *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QLayout").index);
for (int i = 0; i < qlayout->count(); ++i) {
QLayoutItem * item = qlayout->itemAt(i);
@@ -279,7 +279,7 @@
return;
}
- if (o->smoke->isDerivedFromByName(className, "QStandardItemModel")) {
+ if (o->smoke->isDerivedFrom(className, "QStandardItemModel")) {
QStandardItemModel * model = (QStandardItemModel *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QStandardItemModel").index);
for (int row = 0; row < model->rowCount(); row++) {
for (int column = 0; column < model->columnCount(); column++) {
@@ -299,7 +299,7 @@
return;
}
- if (o->smoke->isDerivedFromByName(className, "QGraphicsWidget")) {
+ if (o->smoke->isDerivedFrom(className, "QGraphicsWidget")) {
QGraphicsWidget * widget = (QGraphicsWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsWidget").index);
QGraphicsLayout * layout = widget->layout();
if (layout != 0) {
@@ -311,7 +311,7 @@
}
}
- if (o->smoke->isDerivedFromByName(className, "QGraphicsLayout")) {
+ if (o->smoke->isDerivedFrom(className, "QGraphicsLayout")) {
QGraphicsLayout * qlayout = (QGraphicsLayout *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsLayout").index);
for (int i = 0; i < qlayout->count(); ++i) {
QGraphicsLayoutItem * item = qlayout->itemAt(i);
@@ -326,7 +326,7 @@
return;
}
- if (o->smoke->isDerivedFromByName(className, "QGraphicsItem")) {
+ if (o->smoke->isDerivedFrom(className, "QGraphicsItem")) {
QGraphicsItem * item = (QGraphicsItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsItem").index);
// Only mark the QGraphicsItem tree if the current item doesn't have a parent.
// This avoids marking parts of a tree more than once.
@@ -335,7 +335,7 @@
}
}
- if (o->smoke->isDerivedFromByName(className, "QGraphicsScene")) {
+ if (o->smoke->isDerivedFrom(className, "QGraphicsScene")) {
QGraphicsScene * scene = (QGraphicsScene *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsScene").index);
QList<QGraphicsItem *> list = scene->items();
for (int i = 0; i < list.size(); i++) {
@@ -379,13 +379,13 @@
unmapPointer(o, o->classId, 0);
object_count --;
- if (o->smoke->isDerivedFromByName(className, "QLayoutItem")) {
+ if (o->smoke->isDerivedFrom(className, "QLayoutItem")) {
QLayoutItem * item = (QLayoutItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QLayoutItem").index);
if (item->layout() != 0 || item->widget() != 0 || item->spacerItem() != 0) {
free_smokeruby_object(o);
return;
}
- } else if (o->smoke->isDerivedFromByName(className, "QStandardItem")) {
+ } else if (o->smoke->isDerivedFrom(className, "QStandardItem")) {
QStandardItem * item = (QStandardItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QStandardItem").index);
if (item->model() != 0 || item->parent() != 0) {
free_smokeruby_object(o);
@@ -397,19 +397,19 @@
free_smokeruby_object(o);
return;
}
- } else if (o->smoke->isDerivedFromByName(className, "QTableWidgetItem")) {
+ } else if (o->smoke->isDerivedFrom(className, "QTableWidgetItem")) {
QTableWidgetItem * item = (QTableWidgetItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QTableWidgetItem").index);
if (item->tableWidget() != 0) {
free_smokeruby_object(o);
return;
}
- } else if (o->smoke->isDerivedFromByName(className, "QWidget")) {
+ } else if (o->smoke->isDerivedFrom(className, "QWidget")) {
QWidget * qwidget = (QWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QWidget").index);
if (qwidget->parentWidget() != 0) {
free_smokeruby_object(o);
return;
}
- } else if (o->smoke->isDerivedFromByName(className, "QObject")) {
+ } else if (o->smoke->isDerivedFrom(className, "QObject")) {
QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
if (qobject->parent() != 0) {
free_smokeruby_object(o);
@@ -444,7 +444,7 @@
Q_DECL_EXPORT const char *
resolve_classname_qt(smokeruby_object * o)
{
- if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QEvent")) {
+ if (o->smoke->isDerivedFrom(o->smoke->classes[o->classId].className, "QEvent")) {
QEvent * qevent = (QEvent *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QEvent").index);
switch (qevent->type()) {
case QEvent::Timer:
@@ -667,7 +667,7 @@
default:
break;
}
- } else if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QGraphicsItem")) {
+ } else if (o->smoke->isDerivedFrom(o->smoke->classes[o->classId].className, "QGraphicsItem")) {
QGraphicsItem * item = (QGraphicsItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsItem").index);
switch (item->type()) {
case 1:
@@ -700,7 +700,7 @@
o->classId = o->smoke->idClass("QGraphicsItemGroup").index;
break;
}
- } else if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QLayoutItem")) {
+ } else if (o->smoke->isDerivedFrom(o->smoke->classes[o->classId].className, "QLayoutItem")) {
QLayoutItem * item = (QLayoutItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QLayoutItem").index);
if (item->widget() != 0) {
o->classId = o->smoke->idClass("QWidgetItem").index;
--- trunk/KDE/kdebindings/ruby/qtruby/src/qtruby.cpp #1079588:1079589
@@ -925,11 +925,11 @@
while (meth.smoke->ambiguousMethodList[i] != 0) {
if ( ( qstrcmp( meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name,
"QObject*" ) == 0
- && a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "QObject")
- && !a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "QWidget") )
+ && a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "QObject")
+ && !a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") )
|| ( qstrcmp( meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name,
"QWidget*" ) == 0
- && a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "QWidget") ) )
+ && a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") ) )
{
_current_method.smoke = meth.smoke;
_current_method.index = meth.smoke->ambiguousMethodList[i];
@@ -961,11 +961,11 @@
while (meth.smoke->ambiguousMethodList[i] != 0) {
if ( ( qstrcmp( meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args + 1]].name,
"QObject*" ) == 0
- && a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "QObject")
- && !a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "QWidget") )
+ && a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "QObject")
+ && !a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") )
|| ( qstrcmp( meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args + 1]].name,
"QWidget*" ) == 0
- && a->smoke->isDerivedFromByName(a->smoke->classes[a->classId].className, "QWidget") ) )
+ && a->smoke->isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") ) )
{
_current_method.smoke = meth.smoke;
_current_method.index = meth.smoke->ambiguousMethodList[i];
@@ -1720,7 +1720,7 @@
{
char *className = StringValuePtr(className_value);
char *base = StringValuePtr(base_value);
- return qt_Smoke->isDerivedFromByName(className, base) ? Qtrue : Qfalse;
+ return qt_Smoke->isDerivedFrom(className, base) ? Qtrue : Qfalse;
}
static VALUE
@@ -1978,7 +1978,7 @@
{
const char* classname = strdup(StringValuePtr(c));
- return qt_Smoke->isDerivedFromByName(classname, "QObject");
+ return qt_Smoke->isDerivedFrom(classname, "QObject");
free((void*) classname);
}
--- trunk/KDE/kdebindings/ruby/qwt/CMakeLists.txt #1079588:1079589
@@ -1,9 +1,11 @@
+find_package(Qwt5 REQUIRED)
+
include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
-INCLUDE_DIRECTORIES (${QT_INCLUDES})
+INCLUDE_DIRECTORIES (${QT_INCLUDES} ${Qwt5_INCLUDE_DIR} )
set(rubyqwt_LIBRARY_SRC qwt.cpp qwthandlers.cpp)
add_library(rubyqwt MODULE ${rubyqwt_LIBRARY_SRC})
-target_link_libraries(rubyqwt ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqwt qtruby4shared)
+target_link_libraries(rubyqwt ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${Qwt5_Qt4_LIBRARY} smokeqt smokeqwt qtruby4shared)
set_target_properties(rubyqwt PROPERTIES PREFIX "" OUTPUT_NAME qwt)
install(TARGETS rubyqwt DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
install(FILES qwt.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qwt)
More information about the Kde-bindings
mailing list