diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:31:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:31:43 -0600 |
| commit | 24b85b785334e8436c975a4323fcbb75d61f6e72 (patch) | |
| tree | 95703ced216baabc95ecb169839c6f302bbcc5af /qtruby | |
| parent | 5baaa6b5ff2b9d30279cf9e9658b9509fcdf884c (diff) | |
| download | tdebindings-24b85b785334e8436c975a4323fcbb75d61f6e72.tar.gz tdebindings-24b85b785334e8436c975a4323fcbb75d61f6e72.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'qtruby')
| -rw-r--r-- | qtruby/ChangeLog | 4 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/Qt.cpp | 6 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/handlers.cpp | 2 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/lib/Qt/qtruby.rb | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog index d94429ea..3e402418 100644 --- a/qtruby/ChangeLog +++ b/qtruby/ChangeLog @@ -496,7 +496,7 @@ * Made some changes to get code generated by the rbkconfig_compiler to work. When an argument is a non-const reference to a primitive type, or a TQString or TQStringList, then don't delete it after the - method call. This is because a class like KConfigSkeleton takes + method call. This is because a class like TDEConfigSkeleton takes references, and then 'stquirrels them away' - before the references were just pointing to junk on the stack. * The method 'isImmutable' is added to KDE::ConfigSkeletonItems @@ -1370,7 +1370,7 @@ 2003-10-09 Richard Dale <[email protected]> - * Added KIO:: and KParts:: namespaces for the new classes in libsmokekde + * Added TDEIO:: and KParts:: namespaces for the new classes in libsmokekde 2003-10-08 Richard Dale <[email protected]> diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index b264d446..ad0241fc 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -2698,10 +2698,10 @@ static TQRegExp * scope_op = 0; } else if (packageName.startsWith("KNS::")) { klass = rb_define_class_under(kns_module, package+strlen("KNS::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); - } else if (packageName.startsWith("KIO::")) { - klass = rb_define_class_under(kio_module, package+strlen("KIO::"), base_class); + } else if (packageName.startsWith("TDEIO::")) { + klass = rb_define_class_under(kio_module, package+strlen("TDEIO::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); - if (packageName == "KIO::UDSAtom") { + if (packageName == "TDEIO::UDSAtom") { kio_udsatom_class = klass; } } else if (packageName.startsWith("DOM::")) { diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index 46afca59..f56884ad 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -1908,7 +1908,7 @@ TypeHandler Qt_handlers[] = { { "TTQ_INT64&", marshall_longlong }, { "TTQ_LLONG", marshall_longlong }, { "TTQ_LLONG&", marshall_longlong }, - { "KIO::filesize_t", marshall_longlong }, + { "TDEIO::filesize_t", marshall_longlong }, { "DOM::DOMTimeStamp", marshall_ulonglong }, { "unsigned long long int", marshall_ulonglong }, { "unsigned long long int&", marshall_ulonglong }, diff --git a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb index a8bb72a0..d0fd9783 100644 --- a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb +++ b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb @@ -1353,7 +1353,7 @@ module Qt now = classname.sub(/^Qext(?=[A-Z])/,'Qext::') elsif classname =~ /^Q/ now = classname.sub(/^Q(?=[A-Z])/,'TQt::') - elsif classname =~ /^(KConfigSkeleton|KWin)::/ + elsif classname =~ /^(TDEConfigSkeleton|KWin)::/ now = classname.sub(/^K?(?=[A-Z])/,'KDE::') elsif classname !~ /::/ now = classname.sub(/^K?(?=[A-Z])/,'KDE::') @@ -1511,7 +1511,7 @@ module Qt if method == "new" method = classname.dup - method.gsub!(/^(KParts|KIO|KNS|DOM|Kontact|Kate|KTextEditor|KConfigSkeleton::ItemEnum|KConfigSkeleton|KWin)::/,"") + method.gsub!(/^(KParts|KIO|KNS|DOM|Kontact|Kate|KTextEditor|TDEConfigSkeleton::ItemEnum|TDEConfigSkeleton|KWin)::/,"") end method = "operator" + method.sub("@","") if method !~ /[a-zA-Z]+/ # Change foobar= to setFoobar() |