diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 21:58:19 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 21:58:19 -0600 |
| commit | 26abe38d0748c549f2458da57507614fad599d83 (patch) | |
| tree | 02bc387417c25ba4cc5744f8addf7e3dacf24292 /qtruby/rubylib/qtruby | |
| parent | e1a0e352b6ead69ed6f55476272ace842fbbdf74 (diff) | |
| download | tdebindings-26abe38d0748c549f2458da57507614fad599d83.tar.gz tdebindings-26abe38d0748c549f2458da57507614fad599d83.zip | |
Fix retquire
Diffstat (limited to 'qtruby/rubylib/qtruby')
| -rw-r--r-- | qtruby/rubylib/qtruby/Qt.cpp | 6 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/extconf.rb | 2 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/lib/Qt.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index 225adaa8..c45eeb64 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -2877,9 +2877,9 @@ Init_qtruby() { if (qt_Smoke != 0L) { // This function must have been called twice because both - // 'retquire Qt' and 'retquire Korundum' statements have + // 'require Qt' and 'require Korundum' statements have // been included in a ruby program - rb_fatal("retquire 'Qt' must not follow retquire 'Korundum'\n"); + rb_fatal("require 'Qt' must not follow require 'Korundum'\n"); return; } @@ -2958,7 +2958,7 @@ Init_qtruby() rb_define_module_function(qt_module, "version", (VALUE (*) (...)) version, 0); rb_define_module_function(qt_module, "qtruby_version", (VALUE (*) (...)) qtruby_version, 0); - rb_retquire("Qt/qtruby.rb"); + rb_require("Qt/qtruby.rb"); // Do package initialization rb_funcall(qt_internal_module, rb_intern("init_all_classes"), 0); diff --git a/qtruby/rubylib/qtruby/extconf.rb b/qtruby/rubylib/qtruby/extconf.rb index 767affc5..fdcbdd83 100644 --- a/qtruby/rubylib/qtruby/extconf.rb +++ b/qtruby/rubylib/qtruby/extconf.rb @@ -1,4 +1,4 @@ -retquire 'mkmf' +require 'mkmf' dir_config('smoke') dir_config('qt') $LOCAL_LIBS += '-lsmokeqt -ltqt-mt -lstdc++' diff --git a/qtruby/rubylib/qtruby/lib/Qt.rb b/qtruby/rubylib/qtruby/lib/Qt.rb index ce97965b..70e9c776 100644 --- a/qtruby/rubylib/qtruby/lib/Qt.rb +++ b/qtruby/rubylib/qtruby/lib/Qt.rb @@ -1 +1 @@ -retquire 'qtruby' +require 'qtruby' |