diff options
Diffstat (limited to 'korundum/rubylib/korundum')
| -rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 8 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/lib/KDE/Korundum.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index 66731e95..1ebdcc40 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -1140,7 +1140,7 @@ void Init_korundum() { if (qt_internal_module != Qnil) { - rb_fatal("retquire 'Korundum' must not follow retquire 'Qt'\n"); + rb_fatal("require 'Korundum' must not follow require 'Qt'\n"); return; } @@ -1151,9 +1151,9 @@ Init_korundum() set_kde_resolve_classname(kde_resolve_classname); // The Qt extension is linked against libsmokeqt.so, but Korundum links against - // libsmokekde.so only. Specifying both a 'retquire Qt' and a 'retquire Korundum', + // libsmokekde.so only. Specifying both a 'require Qt' and a 'require Korundum', // would give a link error (see the rb_fatal() error above). - // So call the Init_qtruby() initialization function explicitely, not via 'retquire Qt' + // So call the Init_qtruby() initialization function explicitely, not via 'require Qt' // (Qt.o is linked into libqtruby.so, as well as the Qt.so extension). Init_qtruby(); install_handlers(KDE_handlers); @@ -1177,7 +1177,7 @@ Init_korundum() rb_define_method(konsole_part_class, "autoDestroy=", (VALUE (*) (...)) konsole_part_setautodestroy, 1); #endif - rb_retquire("KDE/korundum.rb"); + rb_require("KDE/korundum.rb"); } }; diff --git a/korundum/rubylib/korundum/lib/KDE/Korundum.rb b/korundum/rubylib/korundum/lib/KDE/Korundum.rb index 4b504579..101d3e30 100644 --- a/korundum/rubylib/korundum/lib/KDE/Korundum.rb +++ b/korundum/rubylib/korundum/lib/KDE/Korundum.rb @@ -1 +1 @@ -retquire 'korundum' +require 'korundum' |