From 95c43a0f38217a41c246b1b324c92cc2cba78e5e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:17:51 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- korundum/README | 2 +- korundum/rubylib/examples/RubberDoc.rb | 2 +- korundum/rubylib/examples/rbKHTMLPart.rb | 2 +- korundum/rubylib/examples/systray.rb | 2 +- korundum/rubylib/templates/annotated/basicapp.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'korundum') diff --git a/korundum/README b/korundum/README index 5a1614cf..1ac68089 100644 --- a/korundum/README +++ b/korundum/README @@ -4,7 +4,7 @@ KDE Specific Infomation: - Instead of require 'Qt', use require 'Korundum' for KDE programs. - - The KDE K* classes such as KApplication are renamed as KDE::Application. + - The KDE K* classes such as TDEApplication are renamed as KDE::Application. The other KDE classes are in the KParts::, KIO:: or DOM:: namespaces, with the same names as their C++ counterparts. diff --git a/korundum/rubylib/examples/RubberDoc.rb b/korundum/rubylib/examples/RubberDoc.rb index a2c5c13b..f7b88255 100755 --- a/korundum/rubylib/examples/RubberDoc.rb +++ b/korundum/rubylib/examples/RubberDoc.rb @@ -1251,7 +1251,7 @@ can't get tabwidget working. umm... wonder what i'm messing up... (RECHECK) wierd khtml bug @rightpane.setResizeMode @viewed, TQt::Splitter::KeepSize -in order to use KURL's as constants one must place this KApplication init +in order to use KURL's as constants one must place this TDEApplication init at the top of the file otherwise KInstance isn't init'ed before KURL usage class ProjectSelectDialog < KDE::DialogBase diff --git a/korundum/rubylib/examples/rbKHTMLPart.rb b/korundum/rubylib/examples/rbKHTMLPart.rb index 8d28e303..2b191e78 100644 --- a/korundum/rubylib/examples/rbKHTMLPart.rb +++ b/korundum/rubylib/examples/rbKHTMLPart.rb @@ -193,7 +193,7 @@ aboutData = KDE::AboutData.new("rbKHTMLPart", "rbHTMLPart", aboutData.addAuthor("Jim Bublitz", "Example for PyKDE", "jbublitz@nwinternet.com") aboutData.addAuthor('Richard Dale', 'Example for Korundum', 'Richard_Dale@tipitina.demon.co.uk') -# This MUST go here (before KApplication () is called) +# This MUST go here (before TDEApplication () is called) KDE::CmdLineArgs.init(ARGV, aboutData) app = KDE::Application.new() diff --git a/korundum/rubylib/examples/systray.rb b/korundum/rubylib/examples/systray.rb index b09f0408..b1517a25 100644 --- a/korundum/rubylib/examples/systray.rb +++ b/korundum/rubylib/examples/systray.rb @@ -50,7 +50,7 @@ aboutData = KDE::AboutData.new("systry", "Systray test",\ aboutData.addAuthor('Jim Bublitz', 'Example for PyKDE', 'jbublitz@nwinternet.com') aboutData.addAuthor('Richard Dale', 'For Korundum', 'Richard_Dale@tipitina.demon.co.uk') -# This MUST go here (before KApplication () is called) +# This MUST go here (before TDEApplication () is called) KDE::CmdLineArgs.init(ARGV, aboutData) app = KDE::Application.new() mainWindow = MainWin.new(nil, "main window") diff --git a/korundum/rubylib/templates/annotated/basicapp.rb b/korundum/rubylib/templates/annotated/basicapp.rb index 3602a1c6..fe512f77 100644 --- a/korundum/rubylib/templates/annotated/basicapp.rb +++ b/korundum/rubylib/templates/annotated/basicapp.rb @@ -91,7 +91,7 @@ KDE::CmdLineArgs.addCmdLineOptions([["+files", "File to open", ""]]) # instantiate KDE::Application - no other TQObject # or TQWidget based classes can be instantiated -# until there is a KApplication instance +# until there is a TDEApplication instance app = KDE::Application.new() # instantiate the subclass of KMainWindow -- cgit v1.2.1