[Kde-bindings] KDE/kdebindings/ruby

[Richard Dale]

SVN commit 814473 by rdale:

* Rename the qsciruby extension as 'qscintilla'

CCMAIL: kde-bindings at kde.org

 M  +7 -7      CMakeLists.txt  
 D             qsci (directory)  
 A             qscintilla (directory)   qsci#814452
 M  +5 -6      qscintilla/CMakeLists.txt  
 M  +1 -2      qscintilla/example.rb  
 D             qscintilla/lib (directory)  
 M  +2 -2      qscintilla/qscintilla.cpp  
 M  +1 -1      qscintilla/qscintilla.rb  


--- trunk/KDE/kdebindings/ruby/CMakeLists.txt #814472:814473
@@ -5,7 +5,7 @@
 
 OPTION(ENABLE_QTRUBY "build QtRuby" ON)
 OPTION(ENABLE_KORUNDUM "build Korundum" ON)
-OPTION(ENABLE_QSCIRUBY "build QsciRuby" OFF)
+OPTION(ENABLE_QSCINTILLA "build QScintilla" OFF)
 OPTION(ENABLE_SOPRANO "build Soprano" OFF)
 OPTION(ENABLE_AKONADI "build Akonadi" OFF)
 
@@ -14,7 +14,7 @@
 
 set(QTRUBY_ENABLED "no")
 set(KORUNDUM_ENABLED "no")
-set(QSCIRUBY_ENABLED "no")
+set(QSCINTILLA_ENABLED "no")
 set(SOPRANO_ENABLED "no")
 set(AKONADI_ENABLED "no")
 
@@ -39,17 +39,17 @@
         add_subdirectory( akonadi )
         set(AKONADI_ENABLED "yes")
     endif(ENABLE_AKONADI)
-    if(ENABLE_QSCIRUBY)
-        add_subdirectory( qsci )
-        set(QSCI_ENABLED "yes")
-    endif(ENABLE_QSCIRUBY)
+    if(ENABLE_QSCINTILLA)
+        add_subdirectory( qscintilla )
+        set(QSCINTILLA_ENABLED "yes")
+    endif(ENABLE_QSCINTILLA)
 endif(RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
 message(STATUS "Build QtRuby... " ${QTRUBY_ENABLED})
 message(STATUS "Build Korundum... " ${KORUNDUM_ENABLED})
 # message(STATUS "Build Plasma... " ${PLASMA_ENABLED})
 message(STATUS "Build Soprano... " ${SOPRANO_ENABLED})
 message(STATUS "Build Akonadi... " ${AKONADI_ENABLED})
-message(STATUS "Build QsciRuby... " ${QSCIRUBY_ENABLED})
+message(STATUS "Build QScintilla... " ${QSCINTILLA_ENABLED})
 
 #####################################################################
 # Kross Ruby
--- trunk/KDE/kdebindings/ruby/qscintilla/CMakeLists.txt #814452:814473
@@ -2,9 +2,8 @@
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
 set(qsci_LIBRARY_SRC qscintilla.cpp)
-add_library(qsciruby MODULE ${qsci_LIBRARY_SRC})
-target_link_libraries(qsciruby ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqsci qtruby4shared)
-set_target_properties(qsciruby PROPERTIES PREFIX "")
-install(TARGETS qsciruby DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
-install(FILES qscintilla.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/Qsci)
-install(FILES lib/QScintilla.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR})
+add_library(qscintilla MODULE ${qsci_LIBRARY_SRC})
+target_link_libraries(qscintilla ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqsci qtruby4shared)
+set_target_properties(qscintilla PROPERTIES PREFIX "")
+install(TARGETS qscintilla DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+install(FILES qscintilla.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qscintilla)
--- trunk/KDE/kdebindings/ruby/qscintilla/example.rb #814452:814473
@@ -1,7 +1,6 @@
 #/usr/bin/ruby
 
-require 'Qt'
-require 'QScintilla'
+require 'qscintilla'
 
 app = Qt::Application.new(ARGV)
 w = Qsci::Scintilla.new
--- trunk/KDE/kdebindings/ruby/qscintilla/qscintilla.cpp #814452:814473
@@ -32,7 +32,7 @@
 VALUE qscintilla_internal_module;
 
 Q_DECL_EXPORT void
-Init_qsciruby()
+Init_qscintilla()
 {
     rb_require("Qt4");    // need to initialize the core runtime first
     init_qsci_Smoke();
@@ -49,7 +49,7 @@
 
     rb_define_singleton_method(qscintilla_internal_module, "getClassList", (VALUE (*) (...)) getClassList, 0);
 
-    rb_require("Qsci/qscintilla.rb");
+    rb_require("qscintilla/qscintilla.rb");
     rb_funcall(qscintilla_internal_module, rb_intern("init_all_classes"), 0);
 }
 
--- trunk/KDE/kdebindings/ruby/qscintilla/qscintilla.rb #814452:814473
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-require 'Qt'
+require 'Qt4'
 
 module Qsci
     module Internal