diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:00 -0600 |
| commit | 2d84c9d3ad0aaea0620658024537d54e6a7939f4 (patch) | |
| tree | 35675532f42e78dbfcd56c6b344e1f0e79013a2e /qtruby | |
| parent | 980972d200e109a643e5a10037d7f9fcf02382ed (diff) | |
| download | tdebindings-2d84c9d3ad0aaea0620658024537d54e6a7939f4.tar.gz tdebindings-2d84c9d3ad0aaea0620658024537d54e6a7939f4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'qtruby')
| -rw-r--r-- | qtruby/ChangeLog | 4 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/Qt.cpp | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog index 3e402418..2c5b3013 100644 --- a/qtruby/ChangeLog +++ b/qtruby/ChangeLog @@ -481,7 +481,7 @@ 2005-02-21 Richard Dale <Richard_Dale@tipitina.demon.co.uk> * Upped the version to 1.0.7 for the KDE 3.4 release - * Removed the khtml:: namespace as it wasn't being used + * Removed the tdehtml:: namespace as it wasn't being used 2005-02-07 Richard Dale <Richard_Dale@tipitina.demon.co.uk> @@ -1365,7 +1365,7 @@ 2003-10-11 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * Added khtml:: namespace, although it isn't in the SmokeKDE runtime yet + * Added tdehtml:: namespace, although it isn't in the SmokeKDE runtime yet * Improved method_missing error messages if a method can't be resolved 2003-10-09 Richard Dale <Richard_Dale@tipitina.demon.co.uk> diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index ad0241fc..90cd759e 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -98,13 +98,13 @@ extern "C" { VALUE qt_module = Qnil; VALUE qext_scintilla_module = Qnil; VALUE kde_module = Qnil; -VALUE kparts_module = Qnil; +VALUE tdeparts_module = Qnil; VALUE kio_module = Qnil; VALUE kns_module = Qnil; VALUE dom_module = Qnil; VALUE kontact_module = Qnil; VALUE kate_module = Qnil; -VALUE ktexteditor_module = Qnil; +VALUE tdetexteditor_module = Qnil; VALUE koffice_module = Qnil; VALUE qt_internal_module = Qnil; VALUE qt_base_class = Qnil; @@ -2690,7 +2690,7 @@ static TQRegExp * scope_op = 0; klass = rb_define_class_under(kde_module, package+strlen("KDE::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); } else if (packageName.startsWith("KParts::")) { - klass = rb_define_class_under(kparts_module, package+strlen("KParts::"), base_class); + klass = rb_define_class_under(tdeparts_module, package+strlen("KParts::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); if (packageName == "KParts::ReadOnlyPart") { konsole_part_class = rb_define_class_under(kde_module, "KonsolePart", klass); @@ -2720,7 +2720,7 @@ static TQRegExp * scope_op = 0; klass = rb_define_class_under(kate_module, package+strlen("Kate"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); } else if (packageName.startsWith("KTextEditor::")) { - klass = rb_define_class_under(ktexteditor_module, package+strlen("KTextEditor::"), base_class); + klass = rb_define_class_under(tdetexteditor_module, package+strlen("KTextEditor::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); } else if (scope_op->search(packageName) != -1) { // If an unrecognised classname of the form 'XXXXXX::YYYYYY' is found, @@ -2831,9 +2831,9 @@ set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE)) rb_define_singleton_method(kde_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); rb_define_singleton_method(kde_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); - kparts_module = rb_define_module("KParts"); - rb_define_singleton_method(kparts_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); - rb_define_singleton_method(kparts_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); + tdeparts_module = rb_define_module("KParts"); + rb_define_singleton_method(tdeparts_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); + rb_define_singleton_method(tdeparts_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); kns_module = rb_define_module("KNS"); rb_define_singleton_method(kns_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); @@ -2851,9 +2851,9 @@ set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE)) rb_define_singleton_method(kontact_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); rb_define_singleton_method(kontact_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); - ktexteditor_module = rb_define_module("KTextEditor"); - rb_define_singleton_method(ktexteditor_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); - rb_define_singleton_method(ktexteditor_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); + tdetexteditor_module = rb_define_module("KTextEditor"); + rb_define_singleton_method(tdetexteditor_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); + rb_define_singleton_method(tdetexteditor_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); twin_class = rb_define_class_under(kde_module, "Win", qt_base_class); |