From 8f7ac92d27834427c1fa2a4a350d70d05529bbf4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:16:43 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- qtruby/ChangeLog | 2 +- qtruby/rubylib/qtruby/handlers.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qtruby') diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog index 170ef5ab..d94429ea 100644 --- a/qtruby/ChangeLog +++ b/qtruby/ChangeLog @@ -1394,7 +1394,7 @@ the new libsmokekde.so. You can now write KDE programs in Ruby, here is Hello World: - about = KDE::KAboutData.new("one", "two", "three") + about = KDE::TDEAboutData.new("one", "two", "three") KDE::TDECmdLineArgs.init(1, ["four"], about) a = KDE::TDEApplication.new() hello = KDE::KPushButton.new(nil) { setText "Hello World" } diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index 97f30f76..46afca59 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -200,7 +200,7 @@ smokeruby_free(void * p) || tqstrcmp(className, "KCommand") == 0 || tqstrcmp(className, "KNamedCommand") == 0 || tqstrcmp(className, "KMacroCommand") == 0 - || tqstrcmp(className, "KAboutData") == 0 + || tqstrcmp(className, "TDEAboutData") == 0 || tqstrcmp(className, "TDECmdLineArgs") == 0 || tqstrcmp(className, "TQSqlCursor") == 0 ) { -- cgit v1.2.3