From c153d5f83c85f8c5971f2a013ab571d9d4ca1d8b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 7 Feb 2013 11:06:42 -0600
Subject: Rename KAbout to avoid conflicts with KDE4

---
 korundum/rubylib/examples/uimodules/uidialogs.rb | 4 ++--
 korundum/rubylib/korundum/kdehandlers.cpp        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'korundum')

diff --git a/korundum/rubylib/examples/uimodules/uidialogs.rb b/korundum/rubylib/examples/uimodules/uidialogs.rb
index 0715fe12..8efed493 100644
--- a/korundum/rubylib/examples/uimodules/uidialogs.rb
+++ b/korundum/rubylib/examples/uimodules/uidialogs.rb
@@ -131,7 +131,7 @@ class MessageDlg < KDE::Dialog
 end
 
 
-def UIDialogs.dlgKAboutDialog(parent)
+def UIDialogs.dlgTDEAboutDialog(parent)
     dlg = KDE::AboutDialog.new(parent, 'about dialog', false)
     dlg.setLogo(TQt::Pixmap.new("rbtestimage.png"))
     dlg.setTitle("UISampler for Korundum")
@@ -150,7 +150,7 @@ def UIDialogs.dlgKBugReport(parent)
     dlg.exec()
 end
 
-def UIDialogs.dlgKAboutKDE(parent)
+def UIDialogs.dlgTDEAboutKDE(parent)
     dlg = KDE::AboutKDE.new(parent, "about kde", false)
     dlg.show()
 end
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index 83db54cf..01239684 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -1199,8 +1199,8 @@ void marshall_ValueItemList(Marshall *m) {
 #if TDE_VERSION >= 0x030200
 DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>, TDEConfigSkeleton::ItemEnum::Choice, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::Iterator )
 #endif
-DEF_VALUELIST_MARSHALLER( KAboutPersonList, TQValueList<KAboutPerson>, KAboutPerson, TQValueList<KAboutPerson>::Iterator )
-DEF_VALUELIST_MARSHALLER( KAboutTranslatorList, TQValueList<KAboutTranslator>, KAboutTranslator, TQValueList<KAboutTranslator>::Iterator )
+DEF_VALUELIST_MARSHALLER( TDEAboutPersonList, TQValueList<TDEAboutPerson>, TDEAboutPerson, TQValueList<TDEAboutPerson>::Iterator )
+DEF_VALUELIST_MARSHALLER( TDEAboutTranslatorList, TQValueList<TDEAboutTranslator>, TDEAboutTranslator, TQValueList<TDEAboutTranslator>::Iterator )
 DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, TQValueList<TDEIO::CopyInfo>, TDEIO::CopyInfo, TQValueList<TDEIO::CopyInfo>::Iterator )
 DEF_VALUELIST_MARSHALLER( KServiceOfferList, TQValueList<KServiceOffer>, KServiceOffer, TQValueList<KServiceOffer>::Iterator )
 DEF_VALUELIST_MARSHALLER( UDSEntry, TQValueList<TDEIO::UDSAtom>, TDEIO::UDSAtom, TQValueList<TDEIO::UDSAtom>::Iterator )
@@ -1422,8 +1422,8 @@ TypeHandler KDE_handlers[] = {
     { "TQPtrList<KServiceTypeProfile>&", marshall_KServiceTypeProfileList },
     { "TQValueList<TDEAction*>", marshall_TDEActionPtrList },
     { "TDEActionPtrList", marshall_TDEActionPtrList },
-    { "TQValueList<KAboutPerson>", marshall_KAboutPersonList },
-    { "TQValueList<KAboutTranslator>", marshall_KAboutTranslatorList },
+    { "TQValueList<TDEAboutPerson>", marshall_TDEAboutPersonList },
+    { "TQValueList<TDEAboutTranslator>", marshall_TDEAboutTranslatorList },
     { "TQValueList<TDEIO::CopyInfo>&", marshall_KIOCopyInfoList },
 	{ "TDEIO::UDSEntry&", marshall_UDSEntry },
     { "TDEIO::UDSEntryList&", marshall_UDSEntryList },
-- 
cgit v1.2.3