[Kde-bindings] KDE/kdebindings
Richard Dale
Richard_Dale at tipitina.demon.co.uk
Sat Apr 14 10:53:08 UTC 2007
SVN commit 653828 by rdale:
* Remove autoconf/automake files from kdebindings
* Fix some qyoto compile warnings
CCMAIL: kde-bindings at kde.org
M +15 -0 CMakeLists.txt
M +1 -1 CMakeLists.txt.qtruby
D Makefile.am.in
D Makefile.cvs
D configure.in.bot
D configure.in.in
A csharp/CMakeLists.txt
A csharp/qyoto/AUTHORS
M +1 -11 csharp/qyoto/CMakeLists.txt
A csharp/qyoto/COPYING
M +4 -0 csharp/qyoto/ChangeLog
A csharp/qyoto/INSTALL
M +2 -2 csharp/qyoto/src/handlers.cpp
M +6 -5 csharp/qyoto/src/qyoto.cpp
M +1 -1 csharp/qyoto/src/smokeqyoto.h
M +7 -8 csharp/qyoto/tools/uics/CMakeLists.txt
M +2 -1 ruby/korundum/CMakeLists.txt
D ruby/korundum/bin/Makefile.am
D ruby/korundum/src/Makefile.am
D ruby/korundum/src/lib/KDE/Makefile.am
D ruby/korundum/src/lib/Makefile.am
D ruby/korundum/tools/rbkconfig_compiler/Makefile.am
D ruby/korundum/tools/rbkconfig_compiler/tests/Makefile.am
D ruby/qtruby/bin/Makefile.am
D ruby/qtruby/src/Makefile.am
D ruby/qtruby/src/lib/Makefile.am
D ruby/qtruby/src/lib/Qt/Makefile.am
M +0 -3 ruby/qtruby/tools/CMakeLists.txt
D ruby/qtruby/tools/rbrcc/Makefile.am
M +1 -2 ruby/qtruby/tools/rbuic/CMakeLists.txt
D ruby/qtruby/tools/rbuic/Makefile.am
D smoke/Makefile.am
D smoke/kde/Makefile.am
D smoke/qt/Makefile.am
--- trunk/KDE/kdebindings/CMakeLists.txt #653827:653828
@@ -23,4 +23,19 @@
macro_optional_add_subdirectory(ruby)
macro_optional_add_subdirectory(python)
+# find 'gmcs'
+MESSAGE (STATUS "Looking for gmcs")
+FIND_PROGRAM (GMCS_PATH gmcs)
+IF (NOT GMCS_PATH)
+ MESSAGE (STATUS "Looking for gmcs - not found")
+ MESSAGE (FATAL_ERROR "gmcs was not found on your system")
+ELSE (NOT GMCS_PATH)
+ MESSAGE (STATUS "Looking for gmcs - found - ${GMCS_PATH}")
+ENDIF (NOT GMCS_PATH)
+
+# How does macro_optional_add_subdirectory work, should csharp use it?
+if(GMCS_PATH)
+ add_subdirectory( csharp )
+endif(GMCS_PATH)
+
macro_display_feature_log()
--- trunk/KDE/kdebindings/CMakeLists.txt.qtruby #653827:653828
@@ -23,6 +23,6 @@
add_subdirectory(smoke)
if(RUBY_EXECUTABLE)
- add_subdirectory( qtruby )
+ add_subdirectory( ruby )
endif(RUBY_EXECUTABLE)
--- trunk/KDE/kdebindings/csharp/qyoto/CMakeLists.txt #653827:653828
@@ -30,20 +30,10 @@
MESSAGE (STATUS "Looking for SMOKE library - found - ${SMOKE_PATH}")
ENDIF (NOT SMOKE_PATH)
-# find 'gmcs'
-MESSAGE (STATUS "Looking for gmcs")
-FIND_PROGRAM (GMCS_PATH gmcs)
-IF (NOT GMCS_PATH)
- MESSAGE (STATUS "Looking for gmcs - not found")
- MESSAGE (FATAL_ERROR "gmcs was not found on your system")
-ELSE (NOT GMCS_PATH)
- MESSAGE (STATUS "Looking for gmcs - found - ${GMCS_PATH}")
-ENDIF (NOT GMCS_PATH)
-
SET( UICS_PATH ${CMAKE_CURRENT_BINARY_DIR}/tools/uics/uics )
SET( CSRCC_PATH ${CMAKE_CURRENT_BINARY_DIR}/tools/csrcc/csrcc )
-INCLUDE_DIRECTORIES (${QT_INCLUDES})
+INCLUDE_DIRECTORIES (${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke)
ADD_LIBRARY (qyoto MODULE ${SRC_CPP})
TARGET_LINK_LIBRARIES (qyoto smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
--- trunk/KDE/kdebindings/csharp/qyoto/ChangeLog #653827:653828
@@ -1,3 +1,7 @@
+2007-04-14 Richard Dale <rdale at foton.es>
+
+ * Fixed some compiler warnings
+
2007-04-13 Arno Rehn <arno at arnorehn.de>
* Fixed CMakeLists.txt's to work with the new directory structure. Some lines of
--- trunk/KDE/kdebindings/csharp/qyoto/src/handlers.cpp #653827:653828
@@ -996,7 +996,7 @@
case Marshall::FromObject:
{
m->item().s_voidp = (*IntPtrToCharStarStar)(m->var().s_voidp);
- char ** temp = (char **) m->item().s_voidp;
+// char ** temp = (char **) m->item().s_voidp;
}
break;
@@ -1280,7 +1280,7 @@
ItemList *cpplist = new ItemList;
QList<void*>* list = (QList<void*>*) (*ListToPointerList)(m->var().s_voidp);
- for (int i; i < list->size(); ++i) {
+ for (int i = 0; i < list->size(); ++i) {
smokeqyoto_object * o = (smokeqyoto_object*) (*GetSmokeObject)(list->at(i));
void* ptr = o->ptr;
--- trunk/KDE/kdebindings/csharp/qyoto/src/qyoto.cpp #653827:653828
@@ -670,7 +670,7 @@
bool _called;
public:
EmitSignal(QObject *qobj, int id, int items, MocArgument * args, Smoke::StackItem *sp) :
- _qobj(qobj), _id(id), _sp(sp), _items(items), _args(args),
+ _qobj(qobj), _id(id), _args(args), _sp(sp), _items(items),
_cur(-1), _called(false)
{
_stack = new Smoke::StackItem[_items];
@@ -1558,12 +1558,12 @@
bool QyotoRegisterResourceData(int flag, const unsigned char * s, const unsigned char *n, const unsigned char *d)
{
- qRegisterResourceData(flag, s, n, d);
+ return qRegisterResourceData(flag, s, n, d);
}
bool QyotoUnregisterResourceData(int flag, const unsigned char * s, const unsigned char *n, const unsigned char *d)
{
- qUnregisterResourceData(flag, s, n, d);
+ return qUnregisterResourceData(flag, s, n, d);
}
void
@@ -1758,7 +1758,9 @@
QByteArray name = (*it).toLatin1();
QByteArray static_type = a.toLatin1();
- bool valid = setMocType(mocargs, i, name.constData(), static_type.constData());
+ if (!setMocType(mocargs, i, name.constData(), static_type.constData())) {
+ return 0;
+ }
}
}
@@ -1797,7 +1799,6 @@
break;
}
- Smoke::StackItem * result;
EmitSignal signal(qobj, i, items, args, sp);
signal.next();
--- trunk/KDE/kdebindings/csharp/qyoto/src/smokeqyoto.h #653827:653828
@@ -235,7 +235,7 @@
SmokeQyoto() : future_extension(0) {}
// don't need this, we're only defining an interface
-// virtual ~SmokeRuby() = 0;
+ virtual ~SmokeQyoto() = 0;
/**
* Registers a Smoke object
--- trunk/KDE/kdebindings/csharp/qyoto/tools/uics/CMakeLists.txt #653827:653828
@@ -1,6 +1,5 @@
-include_directories( ${CMAKE_SOURCE_DIR}/tools/uics )
-include_directories( ${CMAKE_SOURCE_DIR}/tools/uics/cs )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/cs )
########### next target ###############
@@ -12,12 +11,12 @@
ui4.cpp
uic.cpp
validator.cpp
- cs/cswritedeclaration.cpp
- cs/cswriteincludes.cpp
- cs/cswriteicondata.cpp
- cs/cswriteicondeclaration.cpp
- cs/cswriteiconinitialization.cpp
- cs/cswriteinitialization.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/cs/cswritedeclaration.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/cs/cswriteincludes.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/cs/cswriteicondata.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/cs/cswriteicondeclaration.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/cs/cswriteiconinitialization.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/cs/cswriteinitialization.cpp
main.cpp )
add_executable(uics_bin ${uics_bin_SRCS})
--- trunk/KDE/kdebindings/ruby/korundum/CMakeLists.txt #653827:653828
@@ -1,4 +1,5 @@
-add_subdirectory( rubylib )
+add_subdirectory( src )
+add_subdirectory( tools )
add_subdirectory( bin )
--- trunk/KDE/kdebindings/ruby/qtruby/tools/CMakeLists.txt #653827:653828
@@ -1,5 +1,2 @@
-FIND_PACKAGE (Qt4 REQUIRED)
-INCLUDE_DIRECTORIES (${QT_INCLUDES})
-
add_subdirectory( rbuic )
add_subdirectory( rbrcc )
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbuic/CMakeLists.txt #653827:653828
@@ -1,6 +1,5 @@
-include_directories( ${CMAKE_SOURCE_DIR}/qtruby/rubylib/designer/rbuic/ruby/ )
-include_directories( ${CMAKE_SOURCE_DIR}/qtruby/rubylib/designer/rbuic/ )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/ruby )
########### next target ###############
More information about the Kde-bindings
mailing list